From ea3be17220697326d3e508fc8c77d4e9bfbcf59f Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 2 Aug 2022 15:17:54 -0300
Subject: feat: add widget for a text browser with image support

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/CMakeLists.txt                          |   4 +
 launcher/ui/widgets/ProjectDescriptionPage.cpp   |  17 ++++
 launcher/ui/widgets/ProjectDescriptionPage.h     |  24 +++++
 launcher/ui/widgets/VariableSizedImageObject.cpp | 118 +++++++++++++++++++++++
 launcher/ui/widgets/VariableSizedImageObject.h   |  55 +++++++++++
 5 files changed, 218 insertions(+)
 create mode 100644 launcher/ui/widgets/ProjectDescriptionPage.cpp
 create mode 100644 launcher/ui/widgets/ProjectDescriptionPage.h
 create mode 100644 launcher/ui/widgets/VariableSizedImageObject.cpp
 create mode 100644 launcher/ui/widgets/VariableSizedImageObject.h

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 0bdfcd44..044160a4 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -855,6 +855,10 @@ SET(LAUNCHER_SOURCES
     ui/widgets/PageContainer.cpp
     ui/widgets/PageContainer.h
     ui/widgets/PageContainer_p.h
+    ui/widgets/ProjectDescriptionPage.h
+    ui/widgets/ProjectDescriptionPage.cpp
+    ui/widgets/VariableSizedImageObject.h
+    ui/widgets/VariableSizedImageObject.cpp
     ui/widgets/ProjectItem.h
     ui/widgets/ProjectItem.cpp
     ui/widgets/VersionListView.cpp
diff --git a/launcher/ui/widgets/ProjectDescriptionPage.cpp b/launcher/ui/widgets/ProjectDescriptionPage.cpp
new file mode 100644
index 00000000..2e6f6d97
--- /dev/null
+++ b/launcher/ui/widgets/ProjectDescriptionPage.cpp
@@ -0,0 +1,17 @@
+#include "ProjectDescriptionPage.h"
+
+#include "VariableSizedImageObject.h"
+
+#include <QDebug>
+
+ProjectDescriptionPage::ProjectDescriptionPage(QWidget* parent) : QTextBrowser(parent), m_image_text_object(new VariableSizedImageObject)
+{
+    m_image_text_object->setParent(this);
+    document()->documentLayout()->registerHandler(QTextFormat::ImageObject, m_image_text_object.get());
+}
+
+void ProjectDescriptionPage::setMetaEntry(QString entry)
+{
+    if (m_image_text_object)
+        m_image_text_object->setMetaEntry(entry);
+}
diff --git a/launcher/ui/widgets/ProjectDescriptionPage.h b/launcher/ui/widgets/ProjectDescriptionPage.h
new file mode 100644
index 00000000..8387d3fb
--- /dev/null
+++ b/launcher/ui/widgets/ProjectDescriptionPage.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <QTextBrowser>
+
+#include "QObjectPtr.h"
+
+QT_BEGIN_NAMESPACE
+class VariableSizedImageObject;
+QT_END_NAMESPACE
+
+/** This subclasses QTextBrowser to provide additional capabilities
+ *  to it, like allowing for images to be shown.
+ */
+class ProjectDescriptionPage final : public QTextBrowser {
+    Q_OBJECT
+
+   public:
+    ProjectDescriptionPage(QWidget* parent = nullptr);
+
+    void setMetaEntry(QString entry);
+
+   private:
+    shared_qobject_ptr<VariableSizedImageObject> m_image_text_object;
+};
diff --git a/launcher/ui/widgets/VariableSizedImageObject.cpp b/launcher/ui/widgets/VariableSizedImageObject.cpp
new file mode 100644
index 00000000..0efdecab
--- /dev/null
+++ b/launcher/ui/widgets/VariableSizedImageObject.cpp
@@ -0,0 +1,118 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *
+ *  This program 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, version 3.
+ *
+ *  This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "VariableSizedImageObject.h"
+
+#include <QAbstractTextDocumentLayout>
+#include <QDebug>
+#include <QPainter>
+#include <QTextObject>
+
+#include "Application.h"
+
+#include "net/NetJob.h"
+
+enum FormatProperties { ImageData = QTextFormat::UserProperty + 1 };
+
+QSizeF VariableSizedImageObject::intrinsicSize(QTextDocument* doc, int posInDocument, const QTextFormat& format)
+{
+    Q_UNUSED(posInDocument);
+
+    auto image = qvariant_cast<QImage>(format.property(ImageData));
+    auto size = image.size();
+
+    // Get the width of the text content to make the image similar sized.
+    // doc->textWidth() includes the margin, so we need to remove it.
+    auto doc_width = doc->textWidth() - 2 * doc->documentMargin();
+
+    if (size.width() > doc_width)
+        size *= doc_width / (double)size.width();
+
+    return { size };
+}
+void VariableSizedImageObject::drawObject(QPainter* painter,
+                                          const QRectF& rect,
+                                          QTextDocument* doc,
+                                          int posInDocument,
+                                          const QTextFormat& format)
+{
+    if (!format.hasProperty(ImageData)) {
+        QUrl image_url{ qvariant_cast<QString>(format.property(QTextFormat::ImageName)) };
+        if (m_fetching_images.contains(image_url))
+            return;
+
+        loadImage(doc, image_url, posInDocument);
+        return;
+    }
+
+    auto image = qvariant_cast<QImage>(format.property(ImageData));
+
+    painter->setRenderHint(QPainter::RenderHint::SmoothPixmapTransform);
+    painter->drawImage(rect, image);
+}
+
+void VariableSizedImageObject::parseImage(QTextDocument* doc, QImage image, int posInDocument)
+{
+    QTextCursor cursor(doc);
+    cursor.setPosition(posInDocument);
+    cursor.setKeepPositionOnInsert(true);
+
+    auto image_char_format = cursor.charFormat();
+
+    image_char_format.setObjectType(QTextFormat::ImageObject);
+    image_char_format.setProperty(ImageData, image);
+
+    // Qt doesn't allow us to modify the properties of an existing object in the document.
+    // So we remove the old one and add the new one with the ImageData property set.
+    cursor.deleteChar();
+    cursor.insertText(QString(QChar::ObjectReplacementCharacter), image_char_format);
+}
+
+void VariableSizedImageObject::loadImage(QTextDocument* doc, const QUrl& source, int posInDocument)
+{
+    m_fetching_images.append(source);
+
+    MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry(
+        m_meta_entry,
+        QString("images/%1").arg(QString(QCryptographicHash::hash(source.toEncoded(), QCryptographicHash::Algorithm::Sha1).toHex())));
+
+    auto job = new NetJob(QString("Load Image: %1").arg(source.fileName()), APPLICATION->network());
+    job->addNetAction(Net::Download::makeCached(source, entry));
+
+    auto full_entry_path = entry->getFullPath();
+    auto source_url = source;
+    connect(job, &NetJob::succeeded, [this, doc, full_entry_path, source_url, posInDocument] {
+        qDebug() << "Loaded resource at" << full_entry_path;
+
+        QImage image(full_entry_path);
+        doc->addResource(QTextDocument::ImageResource, source_url, image);
+
+        parseImage(doc, image, posInDocument);
+
+        // This size hack is needed to prevent the content from being laid out in an area smaller
+        // than the total width available (weird).
+        auto size = doc->pageSize();
+        doc->adjustSize();
+        doc->setPageSize(size);
+
+        m_fetching_images.removeOne(source_url);
+    });
+    connect(job, &NetJob::finished, job, &NetJob::deleteLater);
+
+    job->start();
+}
diff --git a/launcher/ui/widgets/VariableSizedImageObject.h b/launcher/ui/widgets/VariableSizedImageObject.h
new file mode 100644
index 00000000..11563a37
--- /dev/null
+++ b/launcher/ui/widgets/VariableSizedImageObject.h
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *
+ *  This program 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, version 3.
+ *
+ *  This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QString>
+#include <QTextObjectInterface>
+#include <QUrl>
+
+/** Custom image text object to be used instead of the normal one in ProjectDescriptionPage.
+ *
+ *  Why? Because we want to re-scale images dynamically based on the document's size, in order to
+ *  not have images being weirdly cropped out in different resolutions.
+ */
+class VariableSizedImageObject : public QObject, public QTextObjectInterface {
+    Q_OBJECT
+    Q_INTERFACES(QTextObjectInterface)
+
+   public:
+    QSizeF intrinsicSize(QTextDocument* doc, int posInDocument, const QTextFormat& format) override;
+    void drawObject(QPainter* painter, const QRectF& rect, QTextDocument* doc, int posInDocument, const QTextFormat& format) override;
+
+    void setMetaEntry(QString meta_entry) { m_meta_entry = meta_entry; }
+
+   protected:
+    /** Adds the image to the document, in the given position.
+     */
+    void parseImage(QTextDocument* doc, QImage image, int posInDocument);
+
+    /** Loads an image from an external source, and adds it to the document.
+     *
+     *  This uses m_meta_entry to cache the image.
+     */
+    void loadImage(QTextDocument* doc, const QUrl& source, int posInDocument);
+
+    QString m_meta_entry;
+
+    QList<QUrl> m_fetching_images;
+};
-- 
cgit 


From db158a5735e18442f76118f1f6a060e6c3680e33 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sat, 10 Sep 2022 18:49:00 -0300
Subject: feat: add image support for mod pages

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/ui/pages/modplatform/ModPage.ui                   | 9 ++++++++-
 launcher/ui/pages/modplatform/flame/FlameModPage.cpp       | 2 ++
 launcher/ui/pages/modplatform/modrinth/ModrinthModPage.cpp | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/launcher/ui/pages/modplatform/ModPage.ui b/launcher/ui/pages/modplatform/ModPage.ui
index afcd9bb7..943f02aa 100644
--- a/launcher/ui/pages/modplatform/ModPage.ui
+++ b/launcher/ui/pages/modplatform/ModPage.ui
@@ -14,7 +14,7 @@
    <item row="1" column="0" colspan="4">
     <layout class="QGridLayout" name="gridLayout_3">
      <item row="1" column="2">
-      <widget class="QTextBrowser" name="packDescription">
+      <widget class="ProjectDescriptionPage" name="packDescription">
        <property name="openExternalLinks">
         <bool>true</bool>
        </property>
@@ -98,6 +98,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ProjectDescriptionPage</class>
+   <extends>QTextBrowser</extends>
+   <header>ui/widgets/ProjectDescriptionPage.h</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>searchEdit</tabstop>
   <tabstop>searchButton</tabstop>
diff --git a/launcher/ui/pages/modplatform/flame/FlameModPage.cpp b/launcher/ui/pages/modplatform/flame/FlameModPage.cpp
index 772fd2e0..b497d1fe 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModPage.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModPage.cpp
@@ -59,6 +59,8 @@ FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance* instance)
     connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FlameModPage::onSelectionChanged);
     connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FlameModPage::onVersionSelectionChanged);
     connect(ui->modSelectionButton, &QPushButton::clicked, this, &FlameModPage::onModSelected);
+
+    ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
 auto FlameModPage::validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, ModAPI::ModLoaderTypes loaders) const -> bool
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModPage.cpp
index 5fa00b9b..62e417c8 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModPage.cpp
@@ -59,6 +59,8 @@ ModrinthModPage::ModrinthModPage(ModDownloadDialog* dialog, BaseInstance* instan
     connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &ModrinthModPage::onSelectionChanged);
     connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &ModrinthModPage::onVersionSelectionChanged);
     connect(ui->modSelectionButton, &QPushButton::clicked, this, &ModrinthModPage::onModSelected);
+
+    ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
 auto ModrinthModPage::validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, ModAPI::ModLoaderTypes loaders) const -> bool
-- 
cgit 


From d99976f5d7e13f0e2432028b9dd8b38ded8bcc18 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 2 Aug 2022 15:14:25 -0300
Subject: fix: make mod and modpack caches separate for Modrinth

This makes it similar to CF mods / modpacks. The mods cache is
maintained with the same name because it most likely has more data it
in, so this commit will affect existing caches as minimally as possible.

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/Application.cpp                                 | 1 +
 launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index e08ea7f4..64adc6e9 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -809,6 +809,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_metacache->addBase("FlamePacks", QDir("cache/FlamePacks").absolutePath());
         m_metacache->addBase("FlameMods", QDir("cache/FlameMods").absolutePath());
         m_metacache->addBase("ModrinthPacks", QDir("cache/ModrinthPacks").absolutePath());
+        m_metacache->addBase("ModrinthModpacks", QDir("cache/ModrinthModpacks").absolutePath());
         m_metacache->addBase("root", QDir::currentPath());
         m_metacache->addBase("translations", QDir("translations").absolutePath());
         m_metacache->addBase("icons", QDir("cache/icons").absolutePath());
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index fd7a3537..a0e9ab19 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -218,7 +218,7 @@ void ModpackListModel::getLogo(const QString& logo, const QString& logoUrl, Logo
 {
     if (m_logoMap.contains(logo)) {
         callback(APPLICATION->metacache()
-                     ->resolveEntry("ModrinthPacks", QString("logos/%1").arg(logo.section(".", 0, 0)))
+                     ->resolveEntry(m_parent->metaEntryBase(), QString("logos/%1").arg(logo.section(".", 0, 0)))
                      ->getFullPath());
     } else {
         requestLogo(logo, logoUrl);
@@ -232,7 +232,7 @@ void ModpackListModel::requestLogo(QString logo, QString url)
     }
 
     MetaEntryPtr entry =
-        APPLICATION->metacache()->resolveEntry("ModrinthPacks", QString("logos/%1").arg(logo.section(".", 0, 0)));
+        APPLICATION->metacache()->resolveEntry(m_parent->metaEntryBase(), QString("logos/%1").arg(logo.section(".", 0, 0)));
     auto job = new NetJob(QString("%1 Icon Download %2").arg(m_parent->debugName()).arg(logo), APPLICATION->network());
     job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
 
-- 
cgit 


From 60f19f305e4e4540f337a4dbcc96536c14e23e82 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sat, 10 Sep 2022 18:49:31 -0300
Subject: feat: add image support for modrinth modpack pages

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp | 1 +
 launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui  | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index cea6cdee..70f1388a 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -74,6 +74,7 @@ ModrinthPage::ModrinthPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget
     connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &ModrinthPage::onVersionSelectionChanged);
 
     ui->packView->setItemDelegate(new ProjectItemDelegate(this));
+    ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
 ModrinthPage::~ModrinthPage()
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui
index 6a34701d..6d8b2b67 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.ui
@@ -66,7 +66,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QTextBrowser" name="packDescription">
+      <widget class="ProjectDescriptionPage" name="packDescription">
        <property name="openExternalLinks">
         <bool>true</bool>
        </property>
@@ -99,6 +99,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ProjectDescriptionPage</class>
+   <extends>QTextBrowser</extends>
+   <header>ui/widgets/ProjectDescriptionPage.h</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>searchEdit</tabstop>
   <tabstop>searchButton</tabstop>
-- 
cgit 


From d7992ab29d07c6d26377f6db1cfca6059aace471 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sat, 10 Sep 2022 19:00:47 -0300
Subject: feat: add image support for FTB packs

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/ui/pages/modplatform/ftb/FtbPage.cpp | 2 ++
 launcher/ui/pages/modplatform/ftb/FtbPage.ui  | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
index 8975d74e..34734eaf 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
+++ b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
@@ -73,6 +73,8 @@ FtbPage::FtbPage(NewInstanceDialog* dialog, QWidget *parent)
     connect(ui->sortByBox, &QComboBox::currentTextChanged, this, &FtbPage::onSortingSelectionChanged);
     connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FtbPage::onSelectionChanged);
     connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FtbPage::onVersionSelectionChanged);
+
+    ui->packDescription->setMetaEntry("FTBPacks");
 }
 
 FtbPage::~FtbPage()
diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.ui b/launcher/ui/pages/modplatform/ftb/FtbPage.ui
index 850bf091..8de0f4e6 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbPage.ui
+++ b/launcher/ui/pages/modplatform/ftb/FtbPage.ui
@@ -57,7 +57,7 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QTextBrowser" name="packDescription">
+      <widget class="ProjectDescriptionPage" name="packDescription">
        <property name="openExternalLinks">
         <bool>true</bool>
        </property>
@@ -70,6 +70,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ProjectDescriptionPage</class>
+   <extends>QTextBrowser</extends>
+   <header>ui/widgets/ProjectDescriptionPage.h</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>searchEdit</tabstop>
   <tabstop>versionSelectionBox</tabstop>
-- 
cgit 


From d194b02e28132df3ea3da961299e969614b8a185 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 11 Oct 2022 14:19:29 -0300
Subject: fix: prevent images overriding content when changing pages

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/ui/pages/modplatform/ModPage.cpp               |  1 +
 launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp |  1 +
 launcher/ui/widgets/ProjectDescriptionPage.cpp          |  6 ++++++
 launcher/ui/widgets/ProjectDescriptionPage.h            |  8 ++++++++
 launcher/ui/widgets/VariableSizedImageObject.cpp        | 13 +++++++++++--
 launcher/ui/widgets/VariableSizedImageObject.h          | 15 ++++++++++++---
 6 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/launcher/ui/pages/modplatform/ModPage.cpp b/launcher/ui/pages/modplatform/ModPage.cpp
index 4fce0242..153bb049 100644
--- a/launcher/ui/pages/modplatform/ModPage.cpp
+++ b/launcher/ui/pages/modplatform/ModPage.cpp
@@ -350,4 +350,5 @@ void ModPage::updateUi()
 
     HoeDown h;
     ui->packDescription->setHtml(text + (current.extraData.body.isEmpty() ? current.description : h.process(current.extraData.body.toUtf8())));
+    ui->packDescription->flush();
 }
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index 70f1388a..4482774c 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -284,6 +284,7 @@ void ModrinthPage::updateUI()
     text += h.process(current.extra.body.toUtf8());
 
     ui->packDescription->setHtml(text + current.description);
+    ui->packDescription->flush();
 }
 
 void ModrinthPage::suggestCurrent()
diff --git a/launcher/ui/widgets/ProjectDescriptionPage.cpp b/launcher/ui/widgets/ProjectDescriptionPage.cpp
index 2e6f6d97..c7e79a17 100644
--- a/launcher/ui/widgets/ProjectDescriptionPage.cpp
+++ b/launcher/ui/widgets/ProjectDescriptionPage.cpp
@@ -15,3 +15,9 @@ void ProjectDescriptionPage::setMetaEntry(QString entry)
     if (m_image_text_object)
         m_image_text_object->setMetaEntry(entry);
 }
+
+void ProjectDescriptionPage::flush()
+{
+    if (m_image_text_object)
+        m_image_text_object->flush();
+}
diff --git a/launcher/ui/widgets/ProjectDescriptionPage.h b/launcher/ui/widgets/ProjectDescriptionPage.h
index 8387d3fb..3dd85302 100644
--- a/launcher/ui/widgets/ProjectDescriptionPage.h
+++ b/launcher/ui/widgets/ProjectDescriptionPage.h
@@ -19,6 +19,14 @@ class ProjectDescriptionPage final : public QTextBrowser {
 
     void setMetaEntry(QString entry);
 
+   public slots:
+    /** Flushes the current processing happening in the page.
+     *
+     *  Should be called when changing the page's content entirely, to
+     *  prevent old tasks from changing the new content.
+     */
+    void flush();
+
    private:
     shared_qobject_ptr<VariableSizedImageObject> m_image_text_object;
 };
diff --git a/launcher/ui/widgets/VariableSizedImageObject.cpp b/launcher/ui/widgets/VariableSizedImageObject.cpp
index 0efdecab..e57f7e95 100644
--- a/launcher/ui/widgets/VariableSizedImageObject.cpp
+++ b/launcher/ui/widgets/VariableSizedImageObject.cpp
@@ -66,6 +66,11 @@ void VariableSizedImageObject::drawObject(QPainter* painter,
     painter->drawImage(rect, image);
 }
 
+void VariableSizedImageObject::flush()
+{
+    m_fetching_images.clear();
+}
+
 void VariableSizedImageObject::parseImage(QTextDocument* doc, QImage image, int posInDocument)
 {
     QTextCursor cursor(doc);
@@ -85,7 +90,7 @@ void VariableSizedImageObject::parseImage(QTextDocument* doc, QImage image, int
 
 void VariableSizedImageObject::loadImage(QTextDocument* doc, const QUrl& source, int posInDocument)
 {
-    m_fetching_images.append(source);
+    m_fetching_images.insert(source);
 
     MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry(
         m_meta_entry,
@@ -99,6 +104,10 @@ void VariableSizedImageObject::loadImage(QTextDocument* doc, const QUrl& source,
     connect(job, &NetJob::succeeded, [this, doc, full_entry_path, source_url, posInDocument] {
         qDebug() << "Loaded resource at" << full_entry_path;
 
+        // If we flushed, don't proceed.
+        if (!m_fetching_images.contains(source_url))
+            return;
+
         QImage image(full_entry_path);
         doc->addResource(QTextDocument::ImageResource, source_url, image);
 
@@ -110,7 +119,7 @@ void VariableSizedImageObject::loadImage(QTextDocument* doc, const QUrl& source,
         doc->adjustSize();
         doc->setPageSize(size);
 
-        m_fetching_images.removeOne(source_url);
+        m_fetching_images.remove(source_url);
     });
     connect(job, &NetJob::finished, job, &NetJob::deleteLater);
 
diff --git a/launcher/ui/widgets/VariableSizedImageObject.h b/launcher/ui/widgets/VariableSizedImageObject.h
index 11563a37..137487ee 100644
--- a/launcher/ui/widgets/VariableSizedImageObject.h
+++ b/launcher/ui/widgets/VariableSizedImageObject.h
@@ -28,7 +28,7 @@
  *  Why? Because we want to re-scale images dynamically based on the document's size, in order to
  *  not have images being weirdly cropped out in different resolutions.
  */
-class VariableSizedImageObject : public QObject, public QTextObjectInterface {
+class VariableSizedImageObject final : public QObject, public QTextObjectInterface {
     Q_OBJECT
     Q_INTERFACES(QTextObjectInterface)
 
@@ -38,7 +38,15 @@ class VariableSizedImageObject : public QObject, public QTextObjectInterface {
 
     void setMetaEntry(QString meta_entry) { m_meta_entry = meta_entry; }
 
-   protected:
+   public slots:
+    /** Stops all currently loading images from modifying the document.
+     *
+     *  This does not stop the ongoing network tasks, it only prevents their result
+     *  from impacting the document any further.
+     */
+    void flush();
+
+   private:
     /** Adds the image to the document, in the given position.
      */
     void parseImage(QTextDocument* doc, QImage image, int posInDocument);
@@ -49,7 +57,8 @@ class VariableSizedImageObject : public QObject, public QTextObjectInterface {
      */
     void loadImage(QTextDocument* doc, const QUrl& source, int posInDocument);
 
+   private:
     QString m_meta_entry;
 
-    QList<QUrl> m_fetching_images;
+    QSet<QUrl> m_fetching_images;
 };
-- 
cgit 


From fda3f1352e203bc119f092e30b25356345342c18 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 11 Oct 2022 16:11:08 -0300
Subject: feat: add image support for the news reader :^)

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/ui/dialogs/NewsDialog.cpp | 4 ++++
 launcher/ui/dialogs/NewsDialog.ui  | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/launcher/ui/dialogs/NewsDialog.cpp b/launcher/ui/dialogs/NewsDialog.cpp
index d3b21627..e1b5dd74 100644
--- a/launcher/ui/dialogs/NewsDialog.cpp
+++ b/launcher/ui/dialogs/NewsDialog.cpp
@@ -20,7 +20,9 @@ NewsDialog::NewsDialog(QList<NewsEntryPtr> entries, QWidget* parent) : QDialog(p
 
     auto article_entry = m_entries.constFind(first_item->text()).value();
     ui->articleTitleLabel->setText(QString("<a href='%1'>%2</a>").arg(article_entry->link, first_item->text()));
+
     ui->currentArticleContentBrowser->setText(article_entry->content);
+    ui->currentArticleContentBrowser->flush();
 }
 
 NewsDialog::~NewsDialog()
@@ -33,7 +35,9 @@ void NewsDialog::selectedArticleChanged(const QString& new_title)
     auto const& article_entry = m_entries.constFind(new_title).value();
 
     ui->articleTitleLabel->setText(QString("<a href='%1'>%2</a>").arg(article_entry->link, new_title));
+
     ui->currentArticleContentBrowser->setText(article_entry->content);
+    ui->currentArticleContentBrowser->flush();
 }
 
 void NewsDialog::toggleArticleList()
diff --git a/launcher/ui/dialogs/NewsDialog.ui b/launcher/ui/dialogs/NewsDialog.ui
index 2aaa08f1..08f35a0b 100644
--- a/launcher/ui/dialogs/NewsDialog.ui
+++ b/launcher/ui/dialogs/NewsDialog.ui
@@ -49,7 +49,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QTextBrowser" name="currentArticleContentBrowser">
+        <widget class="ProjectDescriptionPage" name="currentArticleContentBrowser">
          <property name="textInteractionFlags">
           <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
          </property>
@@ -91,6 +91,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ProjectDescriptionPage</class>
+   <extends>QTextBrowser</extends>
+   <header>ui/widgets/ProjectDescriptionPage.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>
-- 
cgit 


From 83654a193e8856e00bcdbe4f87d209e52c380a62 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Thu, 13 Oct 2022 13:27:52 -0300
Subject: refactor+fix: Make FTB install task similar to other install tasks

In particular, this changes the order so that the instance gets created
before downloading the mods (like other install tasks), and the mod download
directly puts the files in the staging folder (like the others), instead
of that weird makeCached and copy stuff.

This fixes some issues with modpack downloads from FTB, like creating an
instance with no mods in it.

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 .../modplatform/modpacksch/FTBPackInstallTask.cpp  | 144 +++++++++------------
 .../modplatform/modpacksch/FTBPackInstallTask.h    |   7 +-
 2 files changed, 64 insertions(+), 87 deletions(-)

diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
index 97ce1dc6..cc926d45 100644
--- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
+++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
@@ -58,6 +58,9 @@ PackInstallTask::PackInstallTask(Modpack pack, QString version, QWidget* parent)
 
 bool PackInstallTask::abort()
 {
+    if (!canAbort())
+        return false;
+
     bool aborted = true;
 
     if (m_net_job)
@@ -65,14 +68,12 @@ bool PackInstallTask::abort()
     if (m_mod_id_resolver_task)
         aborted &= m_mod_id_resolver_task->abort();
 
-    if (aborted)
-        emitAborted();
-
-    return aborted;
+    return aborted ? InstanceTask::abort() : false;
 }
 
 void PackInstallTask::executeTask()
 {
+    setAbortable(true);
     setStatus(tr("Getting the manifest..."));
 
     // Find pack version
@@ -129,6 +130,7 @@ void PackInstallTask::onManifestDownloadSucceeded()
 
 void PackInstallTask::resolveMods()
 {
+    setAbortable(true);
     setStatus(tr("Resolving mods..."));
     setProgress(0, 100);
 
@@ -169,8 +171,6 @@ void PackInstallTask::resolveMods()
 
 void PackInstallTask::onResolveModsSucceeded()
 {
-    m_abortable = false;
-
     QString text;
     QList<QUrl> urls;
     auto anyBlocked = false;
@@ -209,94 +209,23 @@ void PackInstallTask::onResolveModsSucceeded()
                                                    urls);
 
         if (message_dialog->exec() == QDialog::Accepted)
-            downloadPack();
+            createInstance();
         else
             abort();
     } else {
-        downloadPack();
-    }
-}
-
-void PackInstallTask::downloadPack()
-{
-    setStatus(tr("Downloading mods..."));
-
-    auto* jobPtr = new NetJob(tr("Mod download"), APPLICATION->network());
-    for (auto const& file : m_version.files) {
-        if (file.serverOnly || file.url.isEmpty())
-            continue;
-
-        QFileInfo file_info(file.name);
-        auto cacheName = file_info.completeBaseName() + "-" + file.sha1 + "." + file_info.suffix();
-
-        auto entry = APPLICATION->metacache()->resolveEntry("ModpacksCHPacks", cacheName);
-        entry->setStale(true);
-
-        auto relpath = FS::PathCombine("minecraft", file.path, file.name);
-        auto path = FS::PathCombine(m_stagingPath, relpath);
-
-        if (m_files_to_copy.contains(path)) {
-            qWarning() << "Ignoring" << file.url << "as a file of that path is already downloading.";
-            continue;
-        }
-
-        qDebug() << "Will download" << file.url << "to" << path;
-        m_files_to_copy[path] = entry->getFullPath();
-
-        auto dl = Net::Download::makeCached(file.url, entry);
-        if (!file.sha1.isEmpty()) {
-            auto rawSha1 = QByteArray::fromHex(file.sha1.toLatin1());
-            dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawSha1));
-        }
-
-        jobPtr->addNetAction(dl);
+        createInstance();
     }
-
-    connect(jobPtr, &NetJob::succeeded, this, &PackInstallTask::onModDownloadSucceeded);
-    connect(jobPtr, &NetJob::failed, this, &PackInstallTask::onModDownloadFailed);
-    connect(jobPtr, &NetJob::progress, this, &PackInstallTask::setProgress);
-
-    m_net_job = jobPtr;
-    jobPtr->start();
-
-    m_abortable = true;
 }
 
-void PackInstallTask::onModDownloadSucceeded()
+void PackInstallTask::createInstance()
 {
-    m_net_job.reset();
-    install();
-}
-
-void PackInstallTask::install()
-{
-    setStatus(tr("Copying modpack files..."));
-    setProgress(0, m_files_to_copy.size());
-    QCoreApplication::processEvents();
-
-    m_abortable = false;
-
-    int i = 0;
-    for (auto iter = m_files_to_copy.constBegin(); iter != m_files_to_copy.constEnd(); iter++) {
-        auto& to = iter.key();
-        auto& from = iter.value();
-        FS::copy fileCopyOperation(from, to);
-        if (!fileCopyOperation()) {
-            qWarning() << "Failed to copy" << from << "to" << to;
-            emitFailed(tr("Failed to copy files"));
-            return;
-        }
-
-        setProgress(i++, m_files_to_copy.size());
-        QCoreApplication::processEvents();
-    }
+    setAbortable(false);
 
-    setStatus(tr("Installing modpack..."));
+    setStatus(tr("Creating the instance..."));
     QCoreApplication::processEvents();
 
     auto instanceConfigPath = FS::PathCombine(m_stagingPath, "instance.cfg");
     auto instanceSettings = std::make_shared<INISettingsObject>(instanceConfigPath);
-    instanceSettings->suspendSave();
 
     MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath);
     auto components = instance.getPackProfile();
@@ -337,8 +266,53 @@ void PackInstallTask::install()
     instance.setName(name());
     instance.setIconKey(m_instIcon);
     instance.setManagedPack("modpacksch", QString::number(m_pack.id), m_pack.name, QString::number(m_version.id), m_version.name);
-    instanceSettings->resumeSave();
 
+    instance.saveNow();
+
+    onCreateInstanceSucceeded();
+}
+
+void PackInstallTask::onCreateInstanceSucceeded()
+{
+    downloadPack();
+}
+
+void PackInstallTask::downloadPack()
+{
+    setAbortable(true);
+
+    setStatus(tr("Downloading mods..."));
+
+    auto* jobPtr = new NetJob(tr("Mod download"), APPLICATION->network());
+    for (auto const& file : m_version.files) {
+        if (file.serverOnly || file.url.isEmpty())
+            continue;
+
+        auto path = FS::PathCombine(m_stagingPath, ".minecraft", file.path, file.name);
+        qDebug() << "Will try to download" << file.url << "to" << path;
+
+        QFileInfo file_info(file.name);
+
+        auto dl = Net::Download::makeFile(file.url, path);
+        if (!file.sha1.isEmpty()) {
+            auto rawSha1 = QByteArray::fromHex(file.sha1.toLatin1());
+            dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawSha1));
+        }
+
+        jobPtr->addNetAction(dl);
+    }
+
+    connect(jobPtr, &NetJob::succeeded, this, &PackInstallTask::onModDownloadSucceeded);
+    connect(jobPtr, &NetJob::failed, this, &PackInstallTask::onModDownloadFailed);
+    connect(jobPtr, &NetJob::progress, this, &PackInstallTask::setProgress);
+
+    m_net_job = jobPtr;
+    jobPtr->start();
+}
+
+void PackInstallTask::onModDownloadSucceeded()
+{
+    m_net_job.reset();
     emitSucceeded();
 }
 
@@ -352,6 +326,10 @@ void PackInstallTask::onResolveModsFailed(QString reason)
     m_net_job.reset();
     emitFailed(reason);
 }
+void PackInstallTask::onCreateInstanceFailed(QString reason)
+{
+    emitFailed(reason);
+}
 void PackInstallTask::onModDownloadFailed(QString reason)
 {
     m_net_job.reset();
diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.h b/launcher/modplatform/modpacksch/FTBPackInstallTask.h
index e63ca0df..7c6fbeb9 100644
--- a/launcher/modplatform/modpacksch/FTBPackInstallTask.h
+++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.h
@@ -56,7 +56,6 @@ public:
     explicit PackInstallTask(Modpack pack, QString version, QWidget* parent = nullptr);
     ~PackInstallTask() override = default;
 
-    bool canAbort() const override { return m_abortable; }
     bool abort() override;
 
 protected:
@@ -65,20 +64,20 @@ protected:
 private slots:
     void onManifestDownloadSucceeded();
     void onResolveModsSucceeded();
+    void onCreateInstanceSucceeded();
     void onModDownloadSucceeded();
 
     void onManifestDownloadFailed(QString reason);
     void onResolveModsFailed(QString reason);
+    void onCreateInstanceFailed(QString reason);
     void onModDownloadFailed(QString reason);
 
 private:
     void resolveMods();
+    void createInstance();
     void downloadPack();
-    void install();
 
 private:
-    bool m_abortable = true;
-
     NetJob::Ptr m_net_job = nullptr;
     shared_qobject_ptr<Flame::FileResolvingTask> m_mod_id_resolver_task = nullptr;
 
-- 
cgit 


From f26be005716818b643a0c8b1373dbe83e4cdcfbf Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Thu, 13 Oct 2022 13:49:06 -0300
Subject: fix: abort search if we're already trying to download a pack

Meaning we don't have to wait for the searches to finish in the
background to finally start the modpack download, when we have already
selected it -_-

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/ui/dialogs/NewInstanceDialog.cpp          |  8 ++++++++
 launcher/ui/pages/modplatform/ftb/FtbListModel.cpp | 11 +++++++++++
 launcher/ui/pages/modplatform/ftb/FtbListModel.h   |  5 +++++
 launcher/ui/pages/modplatform/ftb/FtbPage.cpp      |  6 ++++++
 launcher/ui/pages/modplatform/ftb/FtbPage.h        |  1 +
 5 files changed, 31 insertions(+)

diff --git a/launcher/ui/dialogs/NewInstanceDialog.cpp b/launcher/ui/dialogs/NewInstanceDialog.cpp
index d203795a..df182f09 100644
--- a/launcher/ui/dialogs/NewInstanceDialog.cpp
+++ b/launcher/ui/dialogs/NewInstanceDialog.cpp
@@ -139,6 +139,10 @@ NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, const QString
 void NewInstanceDialog::reject()
 {
     APPLICATION->settings()->set("NewInstanceGeometry", saveGeometry().toBase64());
+
+    // This is just so that the pages get the close() call and can react to it, if needed.
+    m_container->prepareToClose();
+
     QDialog::reject();
 }
 
@@ -146,6 +150,10 @@ void NewInstanceDialog::accept()
 {
     APPLICATION->settings()->set("NewInstanceGeometry", saveGeometry().toBase64());
     importIconNow();
+
+    // This is just so that the pages get the close() call and can react to it, if needed.
+    m_container->prepareToClose();
+
     QDialog::accept();
 }
 
diff --git a/launcher/ui/pages/modplatform/ftb/FtbListModel.cpp b/launcher/ui/pages/modplatform/ftb/FtbListModel.cpp
index ad15b6e6..3a149944 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbListModel.cpp
+++ b/launcher/ui/pages/modplatform/ftb/FtbListModel.cpp
@@ -103,6 +103,8 @@ void ListModel::getLogo(const QString &logo, const QString &logoUrl, LogoCallbac
 
 void ListModel::request()
 {
+    m_aborted = false;
+
     beginResetModel();
     modpacks.clear();
     endResetModel();
@@ -117,6 +119,12 @@ void ListModel::request()
     QObject::connect(netJob, &NetJob::failed, this, &ListModel::requestFailed);
 }
 
+void ListModel::abortRequest()
+{
+    m_aborted = jobPtr->abort();
+    jobPtr.reset();
+}
+
 void ListModel::requestFinished()
 {
     jobPtr.reset();
@@ -162,6 +170,9 @@ void ListModel::requestPack()
 
 void ListModel::packRequestFinished()
 {
+    if (!jobPtr || m_aborted)
+        return;
+
     jobPtr.reset();
     remainingPacks.removeOne(currentPack);
 
diff --git a/launcher/ui/pages/modplatform/ftb/FtbListModel.h b/launcher/ui/pages/modplatform/ftb/FtbListModel.h
index 314cb789..cbf215c4 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbListModel.h
+++ b/launcher/ui/pages/modplatform/ftb/FtbListModel.h
@@ -47,9 +47,12 @@ public:
     QVariant data(const QModelIndex &index, int role) const override;
 
     void request();
+    void abortRequest();
 
     void getLogo(const QString &logo, const QString &logoUrl, LogoCallback callback);
 
+    [[nodiscard]] bool isMakingRequest() const { return jobPtr.get(); }
+
 private slots:
     void requestFinished();
     void requestFailed(QString reason);
@@ -65,6 +68,8 @@ private:
     void requestLogo(QString file, QString url);
 
 private:
+    bool m_aborted = false;
+
     QList<ModpacksCH::Modpack> modpacks;
     LogoMap m_logoMap;
 
diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
index 8975d74e..1fe28124 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
+++ b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
@@ -114,6 +114,12 @@ void FtbPage::openedImpl()
     suggestCurrent();
 }
 
+void FtbPage::closedImpl()
+{
+    if (listModel->isMakingRequest())
+        listModel->abortRequest();
+}
+
 void FtbPage::suggestCurrent()
 {
     if(!isOpened)
diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.h b/launcher/ui/pages/modplatform/ftb/FtbPage.h
index 90c8e7fd..631ae7f5 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbPage.h
+++ b/launcher/ui/pages/modplatform/ftb/FtbPage.h
@@ -78,6 +78,7 @@ public:
     void retranslate() override;
 
     void openedImpl() override;
+    void closedImpl() override;
 
     bool eventFilter(QObject * watched, QEvent * event) override;
 
-- 
cgit 


From dfa220ef02f23ff734dec6247f4a124a7a144c7a Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Thu, 13 Oct 2022 15:10:35 -0300
Subject: fix: issues with aborts (again)

i hate it

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/modplatform/flame/FileResolvingTask.cpp       |  5 +++--
 launcher/modplatform/modpacksch/FTBPackInstallTask.cpp | 15 +++++++++++----
 launcher/ui/dialogs/ProgressDialog.cpp                 |  5 +++--
 launcher/ui/pages/modplatform/ftb/FtbListModel.h       |  1 +
 launcher/ui/pages/modplatform/ftb/FtbPage.cpp          |  2 +-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 058d2471..1e7f5559 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -9,9 +9,10 @@ Flame::FileResolvingTask::FileResolvingTask(const shared_qobject_ptr<QNetworkAcc
 
 bool Flame::FileResolvingTask::abort()
 {
+    bool aborted = true;
     if (m_dljob)
-        return m_dljob->abort();
-    return true;
+        aborted &= m_dljob->abort();
+    return aborted ? Task::abort() : false;
 }
 
 void Flame::FileResolvingTask::executeTask()
diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
index cc926d45..7b112d8f 100644
--- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
+++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
@@ -73,8 +73,8 @@ bool PackInstallTask::abort()
 
 void PackInstallTask::executeTask()
 {
-    setAbortable(true);
     setStatus(tr("Getting the manifest..."));
+    setAbortable(false);
 
     // Find pack version
     auto version_it = std::find_if(m_pack.versions.constBegin(), m_pack.versions.constEnd(),
@@ -94,10 +94,12 @@ void PackInstallTask::executeTask()
 
     QObject::connect(netJob, &NetJob::succeeded, this, &PackInstallTask::onManifestDownloadSucceeded);
     QObject::connect(netJob, &NetJob::failed, this, &PackInstallTask::onManifestDownloadFailed);
+    QObject::connect(netJob, &NetJob::aborted, this, &PackInstallTask::abort);
     QObject::connect(netJob, &NetJob::progress, this, &PackInstallTask::setProgress);
 
     m_net_job = netJob;
 
+    setAbortable(true);
     netJob->start();
 }
 
@@ -130,8 +132,8 @@ void PackInstallTask::onManifestDownloadSucceeded()
 
 void PackInstallTask::resolveMods()
 {
-    setAbortable(true);
     setStatus(tr("Resolving mods..."));
+    setAbortable(false);
     setProgress(0, 100);
 
     m_file_id_map.clear();
@@ -164,8 +166,11 @@ void PackInstallTask::resolveMods()
 
     connect(m_mod_id_resolver_task.get(), &Flame::FileResolvingTask::succeeded, this, &PackInstallTask::onResolveModsSucceeded);
     connect(m_mod_id_resolver_task.get(), &Flame::FileResolvingTask::failed, this, &PackInstallTask::onResolveModsFailed);
+    connect(m_mod_id_resolver_task.get(), &Flame::FileResolvingTask::aborted, this, &PackInstallTask::abort);
     connect(m_mod_id_resolver_task.get(), &Flame::FileResolvingTask::progress, this, &PackInstallTask::setProgress);
 
+    setAbortable(true);
+
     m_mod_id_resolver_task->start();
 }
 
@@ -279,9 +284,8 @@ void PackInstallTask::onCreateInstanceSucceeded()
 
 void PackInstallTask::downloadPack()
 {
-    setAbortable(true);
-
     setStatus(tr("Downloading mods..."));
+    setAbortable(false);
 
     auto* jobPtr = new NetJob(tr("Mod download"), APPLICATION->network());
     for (auto const& file : m_version.files) {
@@ -304,9 +308,12 @@ void PackInstallTask::downloadPack()
 
     connect(jobPtr, &NetJob::succeeded, this, &PackInstallTask::onModDownloadSucceeded);
     connect(jobPtr, &NetJob::failed, this, &PackInstallTask::onModDownloadFailed);
+    connect(jobPtr, &NetJob::aborted, this, &PackInstallTask::abort);
     connect(jobPtr, &NetJob::progress, this, &PackInstallTask::setProgress);
 
     m_net_job = jobPtr;
+
+    setAbortable(true);
     jobPtr->start();
 }
 
diff --git a/launcher/ui/dialogs/ProgressDialog.cpp b/launcher/ui/dialogs/ProgressDialog.cpp
index 258a32e4..68dd4d17 100644
--- a/launcher/ui/dialogs/ProgressDialog.cpp
+++ b/launcher/ui/dialogs/ProgressDialog.cpp
@@ -25,6 +25,7 @@ ProgressDialog::ProgressDialog(QWidget* parent) : QDialog(parent), ui(new Ui::Pr
 {
     ui->setupUi(this);
     this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    setAttribute(Qt::WidgetAttribute::WA_QuitOnClose, true);
     setSkipButton(false);
     changeProgress(0, 100);
 }
@@ -67,7 +68,7 @@ int ProgressDialog::execWithTask(Task* task)
         return QDialog::DialogCode::Accepted;
     }
 
-    QDialog::DialogCode result;
+    QDialog::DialogCode result {};
     if (handleImmediateResult(result)) {
         return result;
     }
@@ -80,7 +81,7 @@ int ProgressDialog::execWithTask(Task* task)
     connect(task, &Task::stepStatus, this, &ProgressDialog::changeStatus);
     connect(task, &Task::progress, this, &ProgressDialog::changeProgress);
 
-    connect(task, &Task::aborted, [this] { QDialog::reject(); });
+    connect(task, &Task::aborted, this, &ProgressDialog::hide);
     connect(task, &Task::abortStatusChanged, ui->skipButton, &QPushButton::setEnabled);
 
     m_is_multi_step = task->isMultiStep();
diff --git a/launcher/ui/pages/modplatform/ftb/FtbListModel.h b/launcher/ui/pages/modplatform/ftb/FtbListModel.h
index cbf215c4..d7a120f0 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbListModel.h
+++ b/launcher/ui/pages/modplatform/ftb/FtbListModel.h
@@ -52,6 +52,7 @@ public:
     void getLogo(const QString &logo, const QString &logoUrl, LogoCallback callback);
 
     [[nodiscard]] bool isMakingRequest() const { return jobPtr.get(); }
+    [[nodiscard]] bool wasAborted() const { return m_aborted; }
 
 private slots:
     void requestFinished();
diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
index 1fe28124..34a3d1c0 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
+++ b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
@@ -105,7 +105,7 @@ void FtbPage::retranslate()
 
 void FtbPage::openedImpl()
 {
-    if(!initialised)
+    if(!initialised || listModel->wasAborted())
     {
         listModel->request();
         initialised = true;
-- 
cgit 


From c90a88b6b6cf1b7d0fe2b6784de880762201f4a9 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Fri, 14 Oct 2022 12:18:06 -0300
Subject: fix: correct ftb legacy too

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 .../modplatform/legacy_ftb/PackInstallTask.cpp     | 41 ++++++++++------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
index 209ad884..06b3788b 100644
--- a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
@@ -65,48 +65,42 @@ void PackInstallTask::executeTask()
 void PackInstallTask::downloadPack()
 {
     setStatus(tr("Downloading zip for %1").arg(m_pack.name));
+    setAbortable(false);
 
-    auto packoffset = QString("%1/%2/%3").arg(m_pack.dir, m_version.replace(".", "_"), m_pack.file);
-    auto entry = APPLICATION->metacache()->resolveEntry("FTBPacks", packoffset);
-    netJobContainer = new NetJob("Download FTB Pack", m_network);
+    archivePath = QString("%1/%2/%3").arg(m_pack.dir, m_version.replace(".", "_"), m_pack.file);
 
-    entry->setStale(true);
+    netJobContainer = new NetJob("Download FTB Pack", m_network);
     QString url;
-    if(m_pack.type == PackType::Private)
-    {
-        url = QString(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "privatepacks/%1").arg(packoffset);
+    if (m_pack.type == PackType::Private) {
+        url = QString(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "privatepacks/%1").arg(archivePath);
+    } else {
+        url = QString(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "modpacks/%1").arg(archivePath);
     }
-    else
-    {
-        url = QString(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "modpacks/%1").arg(packoffset);
-    }
-    netJobContainer->addNetAction(Net::Download::makeCached(url, entry));
-    archivePath = entry->getFullPath();
+    netJobContainer->addNetAction(Net::Download::makeFile(url, archivePath));
 
     connect(netJobContainer.get(), &NetJob::succeeded, this, &PackInstallTask::onDownloadSucceeded);
     connect(netJobContainer.get(), &NetJob::failed, this, &PackInstallTask::onDownloadFailed);
     connect(netJobContainer.get(), &NetJob::progress, this, &PackInstallTask::onDownloadProgress);
     connect(netJobContainer.get(), &NetJob::aborted, this, &PackInstallTask::onDownloadAborted);
+
     netJobContainer->start();
 
+    setAbortable(true);
     progress(1, 4);
 }
 
 void PackInstallTask::onDownloadSucceeded()
 {
-    abortable = false;
     unzip();
 }
 
 void PackInstallTask::onDownloadFailed(QString reason)
 {
-    abortable = false;
     emitFailed(reason);
 }
 
 void PackInstallTask::onDownloadProgress(qint64 current, qint64 total)
 {
-    abortable = true;
     progress(current, total * 4);
     setStatus(tr("Downloading zip for %1 (%2%)").arg(m_pack.name).arg(current / 10));
 }
@@ -118,8 +112,10 @@ void PackInstallTask::onDownloadAborted()
 
 void PackInstallTask::unzip()
 {
-    progress(2, 4);
     setStatus(tr("Extracting modpack"));
+    setAbortable(false);
+    progress(2, 4);
+
     QDir extractDir(m_stagingPath);
 
     m_packZip.reset(new QuaZip(archivePath));
@@ -151,8 +147,8 @@ void PackInstallTask::onUnzipCanceled()
 
 void PackInstallTask::install()
 {
-    progress(3, 4);
     setStatus(tr("Installing modpack"));
+    progress(3, 4);
     QDir unzipMcDir(m_stagingPath + "/unzip/minecraft");
     if(unzipMcDir.exists())
     {
@@ -247,11 +243,12 @@ void PackInstallTask::install()
 
 bool PackInstallTask::abort()
 {
-    if(abortable)
-    {
-        return netJobContainer->abort();
+    if (!canAbort()) {
+        return false;
     }
-    return false;
+
+    netJobContainer->abort();
+    return InstanceTask::abort();
 }
 
 }
-- 
cgit 


From 801e7da5ee07521b81f405dae1af5097be45fccf Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 18 Oct 2022 11:00:28 -0300
Subject: feat: allow specifying fallbacks to INI files

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/settings/INISettingsObject.cpp | 23 ++++++++++++++++++++++-
 launcher/settings/INISettingsObject.h   |  5 ++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/launcher/settings/INISettingsObject.cpp b/launcher/settings/INISettingsObject.cpp
index 12513403..3677e238 100644
--- a/launcher/settings/INISettingsObject.cpp
+++ b/launcher/settings/INISettingsObject.cpp
@@ -16,7 +16,28 @@
 #include "INISettingsObject.h"
 #include "Setting.h"
 
-INISettingsObject::INISettingsObject(const QString &path, QObject *parent)
+#include <QDebug>
+#include <QFile>
+
+INISettingsObject::INISettingsObject(QStringList paths, QObject *parent)
+    : SettingsObject(parent)
+{
+    auto first_path = paths.constFirst();
+    auto path = paths.takeFirst();
+    while (!QFile::exists(path))
+        path = paths.takeFirst();
+
+    if (path != first_path && QFile::exists(path)) {
+        // Copy the fallback to the preferred path.
+        QFile::copy(path, first_path);
+        qDebug() << "Copied settings from" << path << "to" << first_path;
+    }
+
+    m_filePath = first_path;
+    m_ini.loadFile(first_path);
+}
+
+INISettingsObject::INISettingsObject(QString path, QObject* parent)
     : SettingsObject(parent)
 {
     m_filePath = path;
diff --git a/launcher/settings/INISettingsObject.h b/launcher/settings/INISettingsObject.h
index 26cc32e5..d2f448a9 100644
--- a/launcher/settings/INISettingsObject.h
+++ b/launcher/settings/INISettingsObject.h
@@ -28,7 +28,10 @@ class INISettingsObject : public SettingsObject
 {
     Q_OBJECT
 public:
-    explicit INISettingsObject(const QString &path, QObject *parent = 0);
+    /** 'paths' is a list of INI files to try, in order, for fallback support. */
+    explicit INISettingsObject(QStringList paths, QObject* parent = nullptr);
+
+    explicit INISettingsObject(QString path, QObject*  parent = nullptr);
 
     /*!
      * \brief Gets the path to the INI file.
-- 
cgit 


From 32cdfb871c5cb0008cd34b5d5c1ff133920382d9 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 18 Oct 2022 12:00:47 -0300
Subject: fix: add fallback for polymc.cfg

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/Application.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index e94e96a9..b85729f0 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -488,7 +488,8 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
 
     // Initialize application settings
     {
-        m_settings.reset(new INISettingsObject(BuildConfig.LAUNCHER_CONFIGFILE, this));
+        // Provide a fallback for migration from PolyMC
+        m_settings.reset(new INISettingsObject({ BuildConfig.LAUNCHER_CONFIGFILE, "polymc.cfg" }, this));
         // Updates
         // Multiple channels are separated by spaces
         m_settings->registerSetting("UpdateChannel", BuildConfig.VERSION_CHANNEL);
-- 
cgit 


From 83ceb26151ff7cd406bb6b741e40870629626674 Mon Sep 17 00:00:00 2001
From: Cleo John <waterdev@galaxycrow.de>
Date: Tue, 18 Oct 2022 17:28:23 +0200
Subject: Streamline Button changes to improve source readability.

---
 launcher/ui/pages/instance/ExternalResourcesPage.cpp | 4 ----
 launcher/ui/pages/instance/ModFolderPage.cpp         | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.cpp b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
index f31e8325..b6c873cc 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.cpp
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
@@ -103,10 +103,6 @@ void ExternalResourcesPage::runningStateChanged(bool running)
         return;
     
     m_controlsEnabled = !running;
-    ui->actionAddItem->setEnabled(m_controlsEnabled);
-    ui->actionDisableItem->setEnabled(m_controlsEnabled);
-    ui->actionEnableItem->setEnabled(m_controlsEnabled);
-    ui->actionRemoveItem->setEnabled(m_controlsEnabled);
 }
 
 bool ExternalResourcesPage::shouldDisplay() const
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index 28a874c2..f0106066 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -117,6 +117,10 @@ void ModFolderPage::runningStateChanged(bool running)
     ExternalResourcesPage::runningStateChanged(running);
     ui->actionDownloadItem->setEnabled(!running);
     ui->actionUpdateItem->setEnabled(!running);
+    ui->actionAddItem->setEnabled(!running);
+    ui->actionEnableItem->setEnabled(!running);
+    ui->actionDisableItem->setEnabled(!running);
+    ui->actionRemoveItem->setEnabled(!running);
 }
 
 bool ModFolderPage::shouldDisplay() const
-- 
cgit 


From 1f0ca9ed92bf081e4bf6604293df38c311d74d6b Mon Sep 17 00:00:00 2001
From: Jitter <64605731+jitterdev@users.noreply.github.com>
Date: Tue, 18 Oct 2022 10:34:11 -0500
Subject: Update README.md

Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dbcf809c..72599cd8 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Prism Launcher is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
 
-We are working on a website and other media, for more info we have a [Discord server](https://discord.gg/hX4g537UNE). Logo and branding also coming soon.
+We are working on a website and other media, for more info we have a [Discord server](https://discord.gg/prismlauncher). Logo and branding are also coming soon.
 
 ## Installation
 
@@ -17,7 +17,7 @@ Portable builds are provided for AppImage on Linux, Windows, and macOS.
 
 ## Help & Support
 
-- Join the [Discord Server](https://discord.gg/hX4g537UNE) for now. 
+- Join the [Discord Server](https://discord.gg/prismlauncher) for now. 
 
 ## License
 
-- 
cgit 


From 6befd2be81152049bff589bad798140332aa50ef Mon Sep 17 00:00:00 2001
From: Jitter <64605731+jitterdev@users.noreply.github.com>
Date: Tue, 18 Oct 2022 10:34:27 -0500
Subject: Update README.md

Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 72599cd8..b35e2a01 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Prism Launcher is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
 
-We are working on a website and other media, for more info we have a [Discord server](https://discord.gg/prismlauncher). Logo and branding are also coming soon.
+We are working on a website and other media, for more info we have a [Discord Server](https://discord.gg/prismlauncher). Logo and branding are also coming soon.
 
 ## Installation
 
-- 
cgit 


From 54281e53a1c9ce89827c649fb429062f38aa359e Mon Sep 17 00:00:00 2001
From: Jitter <64605731+jitterdev@users.noreply.github.com>
Date: Tue, 18 Oct 2022 10:35:00 -0500
Subject: Update README.md

Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b35e2a01..a7b09f26 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ We are working on a website and other media, for more info we have a [Discord Se
 ## Installation
 
 - All downloads and instructions for Prism Launcher will soon be available.
-- Last build status: <https://github.com/PrismLauncher/PrismLauncher/actions>
+- Last build status can be found [here](https://github.com/PrismLauncher/PrismLauncher/actions).
 
 ### Development Builds
 
-- 
cgit 


From aec3e7b0fc840a4daec6ed7661f862f4d4495410 Mon Sep 17 00:00:00 2001
From: Jitter <64605731+jitterdev@users.noreply.github.com>
Date: Tue, 18 Oct 2022 11:14:27 -0500
Subject: correct non-proper noun

Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a7b09f26..046473b8 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Prism Launcher is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
 
-We are working on a website and other media, for more info we have a [Discord Server](https://discord.gg/prismlauncher). Logo and branding are also coming soon.
+We are working on a website and other media, for more info we have a [Discord server](https://discord.gg/prismlauncher). Logo and branding are also coming soon.
 
 ## Installation
 
@@ -17,7 +17,7 @@ Portable builds are provided for AppImage on Linux, Windows, and macOS.
 
 ## Help & Support
 
-- Join the [Discord Server](https://discord.gg/prismlauncher) for now. 
+- Join the [Discord server](https://discord.gg/prismlauncher) for now. 
 
 ## License
 
-- 
cgit 


From b1b85313ae61192c8c84ee49007c2de34956edd6 Mon Sep 17 00:00:00 2001
From: 雪鈴 SnowLin <113241163+nightsnowlinouo@users.noreply.github.com>
Date: Wed, 19 Oct 2022 01:03:00 +0800
Subject: Fix hosted weblate translation website URL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 雪鈴 SnowLin <113241163+nightsnowlinouo@users.noreply.github.com>
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e149ce1..a3b74a73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,7 @@ set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can g
 set(Launcher_BUG_TRACKER_URL "https://github.com/PrismLauncher/PrismLauncher/issues" CACHE STRING "URL for the bug tracker.")
 
 # Translations Platform URL
-set(Launcher_TRANSLATIONS_URL "https://hosted.weblate.org/projects/prismlauncher/prismlauncher/" CACHE STRING "URL for the translations platform.")
+set(Launcher_TRANSLATIONS_URL "https://hosted.weblate.org/projects/prismlauncher/launcher/" CACHE STRING "URL for the translations platform.")
 
 # Matrix Space
 set(Launcher_MATRIX_URL "https://matrix.to/#/#prismlauncher:matrix.org" CACHE STRING "URL to the Matrix Space")
-- 
cgit 


From 5eec7cc7886f50cb25d1ded73f5bd50fa7a0aec7 Mon Sep 17 00:00:00 2001
From: Gideon9212 <gideon_gallagher@zoho.com>
Date: Tue, 18 Oct 2022 11:40:23 -0700
Subject: Change discord invite to a banner

To help direct people to support with a big banner.

Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dbcf809c..9126b9a3 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Portable builds are provided for AppImage on Linux, Windows, and macOS.
 
 ## Help & Support
 
-- Join the [Discord Server](https://discord.gg/hX4g537UNE) for now. 
+[![Support server invite](https://discordapp.com/api/guilds/1031648380885147709/widget.png?style=banner3)](https://discord.gg/hX4g537UNE)
 
 ## License
 
-- 
cgit 


From c4edffb38811bd0c05e7b48ffa32e464308eab70 Mon Sep 17 00:00:00 2001
From: Gideon9212 <gideon_gallagher@zoho.com>
Date: Tue, 18 Oct 2022 12:10:29 -0700
Subject: Update banner

Changed to Join instead of Support server.

Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9126b9a3..e06193dc 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Portable builds are provided for AppImage on Linux, Windows, and macOS.
 
 ## Help & Support
 
-[![Support server invite](https://discordapp.com/api/guilds/1031648380885147709/widget.png?style=banner3)](https://discord.gg/hX4g537UNE)
+[![Join the Discord Server](https://discordapp.com/api/guilds/1031648380885147709/widget.png?style=banner3)](https://discord.gg/hX4g537UNE)
 
 ## License
 
-- 
cgit 


From 3a95a3b7c18519943b6f6d13f43710f708553db3 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 18 Oct 2022 16:51:42 -0300
Subject: fix: don't take item from a possibly empty list

The list gets destroyed when we take the last object, so things explode.
:pensive:

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/settings/INISettingsObject.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/launcher/settings/INISettingsObject.cpp b/launcher/settings/INISettingsObject.cpp
index 3677e238..da962ee9 100644
--- a/launcher/settings/INISettingsObject.cpp
+++ b/launcher/settings/INISettingsObject.cpp
@@ -23,14 +23,16 @@ INISettingsObject::INISettingsObject(QStringList paths, QObject *parent)
     : SettingsObject(parent)
 {
     auto first_path = paths.constFirst();
-    auto path = paths.takeFirst();
-    while (!QFile::exists(path))
-        path = paths.takeFirst();
+    for (auto path : paths) {
+        if (!QFile::exists(path))
+            continue;
 
-    if (path != first_path && QFile::exists(path)) {
-        // Copy the fallback to the preferred path.
-        QFile::copy(path, first_path);
-        qDebug() << "Copied settings from" << path << "to" << first_path;
+        if (path != first_path && QFile::exists(path)) {
+            // Copy the fallback to the preferred path.
+            QFile::copy(path, first_path);
+            qDebug() << "Copied settings from" << path << "to" << first_path;
+            break;
+        }
     }
 
     m_filePath = first_path;
-- 
cgit 


From 888a87463ee2a81632cc85d4225fbc0b8b984026 Mon Sep 17 00:00:00 2001
From: Fayne Aldan <FayneAldan@gmail.com>
Date: Tue, 18 Oct 2022 14:40:34 -0600
Subject: Add fallback for multimc.cfg

Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
---
 launcher/Application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index b85729f0..d07ad99e 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -489,7 +489,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
     // Initialize application settings
     {
         // Provide a fallback for migration from PolyMC
-        m_settings.reset(new INISettingsObject({ BuildConfig.LAUNCHER_CONFIGFILE, "polymc.cfg" }, this));
+        m_settings.reset(new INISettingsObject({ BuildConfig.LAUNCHER_CONFIGFILE, "polymc.cfg", "multimc.cfg" }, this));
         // Updates
         // Multiple channels are separated by spaces
         m_settings->registerSetting("UpdateChannel", BuildConfig.VERSION_CHANNEL);
-- 
cgit 


From c9f81f56e9161a46fdf78b482f18827cf1a4bb00 Mon Sep 17 00:00:00 2001
From: Gideon9212 <gideon_gallagher@zoho.com>
Date: Tue, 18 Oct 2022 18:35:03 -0700
Subject: Fix banner

Removed boosted URL for plain

Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bd7751aa..25509222 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Portable builds are provided for AppImage on Linux, Windows, and macOS.
 ## Help & Support
 
 
-[![Join the Discord Server](https://discordapp.com/api/guilds/1031648380885147709/widget.png?style=banner3)](https://discord.gg/prismlauncher)
+[![Join the Discord Server](https://discordapp.com/api/guilds/1031648380885147709/widget.png?style=banner3)](https://discord.gg/hX4g537UNE)
 
 
 ## License
-- 
cgit 


From 8201d1df0279693ab70a00e205a2612878b1d6b5 Mon Sep 17 00:00:00 2001
From: Samisafool <thenerdiestguy@gmail.com>
Date: Tue, 18 Oct 2022 20:07:04 +0530
Subject: Rename

Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
---
 launcher/java/JavaUtils.cpp                        |   2 +-
 launcher/minecraft/Library.h                       |  14 +-
 launcher/minecraft/VersionFile.h                   |  30 ++--
 launcher/minecraft/auth/AccountList.h              |   2 +-
 launcher/minecraft/auth/MinecraftAccount.h         |   2 +-
 launcher/minecraft/launch/LauncherPartLaunch.cpp   |   2 +-
 .../minecraft/launch/MinecraftServerTarget.cpp     |   2 +-
 launcher/settings/Setting.h                        |   2 +-
 launcher/ui/MainWindow.cpp                         |   2 +-
 launcher/ui/dialogs/AboutDialog.cpp                |   8 +-
 launcher/ui/dialogs/UpdateDialog.cpp               |   8 +-
 launcher/updater/DownloadTask.h                    |   2 +-
 launcher/updater/GoUpdate.cpp                      |   2 +-
 libraries/README.md                                |   4 +-
 libraries/katabasis/README.md                      |   2 +-
 libraries/launcher/CMakeLists.txt                  |  20 +--
 libraries/launcher/org/polymc/EntryPoint.java      | 164 ------------------
 libraries/launcher/org/polymc/Launcher.java        |  23 ---
 libraries/launcher/org/polymc/LauncherFactory.java |  80 ---------
 .../launcher/org/polymc/applet/LegacyFrame.java    | 163 ------------------
 .../exception/ParameterNotFoundException.java      |  25 ---
 .../org/polymc/exception/ParseException.java       |  25 ---
 .../launcher/org/polymc/impl/OneSixLauncher.java   | 190 ---------------------
 .../launcher/org/polymc/utils/Parameters.java      |  78 ---------
 libraries/launcher/org/polymc/utils/Utils.java     |  49 ------
 .../launcher/org/prismlauncher/EntryPoint.java     | 164 ++++++++++++++++++
 libraries/launcher/org/prismlauncher/Launcher.java |  23 +++
 .../org/prismlauncher/LauncherFactory.java         |  80 +++++++++
 .../org/prismlauncher/applet/LegacyFrame.java      | 163 ++++++++++++++++++
 .../exception/ParameterNotFoundException.java      |  25 +++
 .../prismlauncher/exception/ParseException.java    |  25 +++
 .../org/prismlauncher/impl/OneSixLauncher.java     | 190 +++++++++++++++++++++
 .../org/prismlauncher/utils/Parameters.java        |  78 +++++++++
 .../launcher/org/prismlauncher/utils/Utils.java    |  49 ++++++
 nix/NIX.md                                         |  16 +-
 program_info/prismlauncher.6.scd                   |  22 +--
 36 files changed, 868 insertions(+), 868 deletions(-)
 delete mode 100644 libraries/launcher/org/polymc/EntryPoint.java
 delete mode 100644 libraries/launcher/org/polymc/Launcher.java
 delete mode 100644 libraries/launcher/org/polymc/LauncherFactory.java
 delete mode 100644 libraries/launcher/org/polymc/applet/LegacyFrame.java
 delete mode 100644 libraries/launcher/org/polymc/exception/ParameterNotFoundException.java
 delete mode 100644 libraries/launcher/org/polymc/exception/ParseException.java
 delete mode 100644 libraries/launcher/org/polymc/impl/OneSixLauncher.java
 delete mode 100644 libraries/launcher/org/polymc/utils/Parameters.java
 delete mode 100644 libraries/launcher/org/polymc/utils/Utils.java
 create mode 100644 libraries/launcher/org/prismlauncher/EntryPoint.java
 create mode 100644 libraries/launcher/org/prismlauncher/Launcher.java
 create mode 100644 libraries/launcher/org/prismlauncher/LauncherFactory.java
 create mode 100644 libraries/launcher/org/prismlauncher/applet/LegacyFrame.java
 create mode 100644 libraries/launcher/org/prismlauncher/exception/ParameterNotFoundException.java
 create mode 100644 libraries/launcher/org/prismlauncher/exception/ParseException.java
 create mode 100644 libraries/launcher/org/prismlauncher/impl/OneSixLauncher.java
 create mode 100644 libraries/launcher/org/prismlauncher/utils/Parameters.java
 create mode 100644 libraries/launcher/org/prismlauncher/utils/Utils.java

diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
index 6096e812..040fe821 100644
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@@ -441,7 +441,7 @@ QList<QString> JavaUtils::FindJavaPaths()
     scanJavaDir("/usr/lib/jvm");
     scanJavaDir("/usr/lib64/jvm");
     scanJavaDir("/usr/lib32/jvm");
-    // javas stored in PolyMC's folder
+    // javas stored in Prism Launcher's folder
     scanJavaDir("java");
     // manually installed JDKs in /opt
     scanJavaDir("/opt/jdk");
diff --git a/launcher/minecraft/Library.h b/launcher/minecraft/Library.h
index 950aec9d..26dbf962 100644
--- a/launcher/minecraft/Library.h
+++ b/launcher/minecraft/Library.h
@@ -194,7 +194,7 @@ public: /* methods */
     QString getCompatibleNative(const RuntimeContext & runtimeContext) const;
 
 private: /* methods */
-    /// the default storage prefix used by PolyMC
+    /// the default storage prefix used by Prism Launcher
     static QString defaultStoragePrefix();
 
     /// Get the prefix - root of the storage to be used
@@ -215,23 +215,23 @@ protected: /* data */
     /// DEPRECATED URL prefix of the maven repo where the file can be downloaded
     QString m_repositoryURL;
 
-    /// DEPRECATED: PolyMC-specific absolute URL. takes precedence over the implicit maven repo URL, if defined
+    /// DEPRECATED: Prism Launcher-specific absolute URL. takes precedence over the implicit maven repo URL, if defined
     QString m_absoluteURL;
 
-    /// PolyMC extension - filename override
+    /// Prism Launcher extension - filename override
     QString m_filename;
 
-    /// DEPRECATED PolyMC extension - display name
+    /// DEPRECATED Prism Launcher extension - display name
     QString m_displayname;
 
     /**
-     * PolyMC-specific type hint - modifies how the library is treated
+     * Prism Launcher-specific type hint - modifies how the library is treated
      */
     QString m_hint;
 
     /**
-     * storage - by default the local libraries folder in polymc, but could be elsewhere
-     * PolyMC specific, because of FTB.
+     * storage - by default the local libraries folder in Prism Launcher, but could be elsewhere
+     * Prism Launcher specific, because of FTB.
      */
     QString m_storagePrefix;
 
diff --git a/launcher/minecraft/VersionFile.h b/launcher/minecraft/VersionFile.h
index e1b62f6a..11c5a3af 100644
--- a/launcher/minecraft/VersionFile.h
+++ b/launcher/minecraft/VersionFile.h
@@ -62,19 +62,19 @@ public: /* methods */
     void applyTo(LaunchProfile* profile, const RuntimeContext & runtimeContext);
 
 public: /* data */
-    /// PolyMC: order hint for this version file if no explicit order is set
+    /// Prism Launcher: order hint for this version file if no explicit order is set
     int order = 0;
 
-    /// PolyMC: human readable name of this package
+    /// Prism Launcher: human readable name of this package
     QString name;
 
-    /// PolyMC: package ID of this package
+    /// Prism Launcher: package ID of this package
     QString uid;
 
-    /// PolyMC: version of this package
+    /// Prism Launcher: version of this package
     QString version;
 
-    /// PolyMC: DEPRECATED dependency on a Minecraft version
+    /// Prism Launcher: DEPRECATED dependency on a Minecraft version
     QString dependsOnMinecraftVersion;
 
     /// Mojang: DEPRECATED used to version the Mojang version format
@@ -86,13 +86,13 @@ public: /* data */
     /// Mojang: class to launch Minecraft with
     QString mainClass;
 
-    /// PolyMC: class to launch legacy Minecraft with (embed in a custom window)
+    /// Prism Launcher: class to launch legacy Minecraft with (embed in a custom window)
     QString appletClass;
 
     /// Mojang: Minecraft launch arguments (may contain placeholders for variable substitution)
     QString minecraftArguments;
 
-    /// PolyMC: Additional JVM launch arguments
+    /// Prism Launcher: Additional JVM launch arguments
     QStringList addnJvmArguments;
 
     /// Mojang: list of compatible java majors
@@ -110,38 +110,38 @@ public: /* data */
     /// Mojang: DEPRECATED asset group to be used with Minecraft
     QString assets;
 
-    /// PolyMC: list of tweaker mod arguments for launchwrapper
+    /// Prism Launcher: list of tweaker mod arguments for launchwrapper
     QStringList addTweakers;
 
     /// Mojang: list of libraries to add to the version
     QList<LibraryPtr> libraries;
 
-    /// PolyMC: list of maven files to put in the libraries folder, but not in classpath
+    /// Prism Launcher: list of maven files to put in the libraries folder, but not in classpath
     QList<LibraryPtr> mavenFiles;
 
-    /// PolyMC: list of agents to add to JVM arguments
+    /// Prism Launcher: list of agents to add to JVM arguments
     QList<AgentPtr> agents;
 
     /// The main jar (Minecraft version library, normally)
     LibraryPtr mainJar;
 
-    /// PolyMC: list of attached traits of this version file - used to enable features
+    /// Prism Launcher: list of attached traits of this version file - used to enable features
     QSet<QString> traits;
 
-    /// PolyMC: list of jar mods added to this version
+    /// Prism Launcher: list of jar mods added to this version
     QList<LibraryPtr> jarMods;
 
-    /// PolyMC: list of mods added to this version
+    /// Prism Launcher: list of mods added to this version
     QList<LibraryPtr> mods;
 
     /**
-     * PolyMC: set of packages this depends on
+     * Prism Launcher: set of packages this depends on
      * NOTE: this is shared with the meta format!!!
      */
     Meta::RequireSet requires;
 
     /**
-     * PolyMC: set of packages this conflicts with
+     * Prism Launcher: set of packages this conflicts with
      * NOTE: this is shared with the meta format!!!
      */
     Meta::RequireSet conflicts;
diff --git a/launcher/minecraft/auth/AccountList.h b/launcher/minecraft/auth/AccountList.h
index 8136a92e..a8c3529a 100644
--- a/launcher/minecraft/auth/AccountList.h
+++ b/launcher/minecraft/auth/AccountList.h
@@ -44,7 +44,7 @@
 
 /*!
  * List of available Mojang accounts.
- * This should be loaded in the background by PolyMC on startup.
+ * This should be loaded in the background by Prism Launcher on startup.
  */
 class AccountList : public QAbstractListModel
 {
diff --git a/launcher/minecraft/auth/MinecraftAccount.h b/launcher/minecraft/auth/MinecraftAccount.h
index 7777f846..0dcaeb53 100644
--- a/launcher/minecraft/auth/MinecraftAccount.h
+++ b/launcher/minecraft/auth/MinecraftAccount.h
@@ -61,7 +61,7 @@ Q_DECLARE_METATYPE(MinecraftAccountPtr)
  * A profile within someone's Mojang account.
  *
  * Currently, the profile system has not been implemented by Mojang yet,
- * but we might as well add some things for it in PolyMC right now so
+ * but we might as well add some things for it in Prism Launcher right now so
  * we don't have to rip the code to pieces to add it later.
  */
 struct AccountProfile
diff --git a/launcher/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp
index ce477ad7..1d8d7083 100644
--- a/launcher/minecraft/launch/LauncherPartLaunch.cpp
+++ b/launcher/minecraft/launch/LauncherPartLaunch.cpp
@@ -154,7 +154,7 @@ void LauncherPartLaunch::executeTask()
 #else
     args << classPath.join(':');
 #endif
-    args << "org.polymc.EntryPoint";
+    args << "org.prismlauncher.EntryPoint";
 
     qDebug() << args.join(' ');
 
diff --git a/launcher/minecraft/launch/MinecraftServerTarget.cpp b/launcher/minecraft/launch/MinecraftServerTarget.cpp
index 78a33359..a3383ec0 100644
--- a/launcher/minecraft/launch/MinecraftServerTarget.cpp
+++ b/launcher/minecraft/launch/MinecraftServerTarget.cpp
@@ -23,7 +23,7 @@ MinecraftServerTarget MinecraftServerTarget::parse(const QString &fullAddress) {
 
     // The logic below replicates the exact logic minecraft uses for parsing server addresses.
     // While the conversion is not lossless and eats errors, it ensures the same behavior
-    // within Minecraft and PolyMC when entering server addresses.
+    // within Minecraft and Prism Launcher when entering server addresses.
     if (fullAddress.startsWith("["))
     {
         int bracket = fullAddress.indexOf("]");
diff --git a/launcher/settings/Setting.h b/launcher/settings/Setting.h
index 9a5b8210..86007c13 100644
--- a/launcher/settings/Setting.h
+++ b/launcher/settings/Setting.h
@@ -33,7 +33,7 @@ public:
      * Construct a Setting
      *
      * Synonyms are all the possible names used in the settings object, in order of preference.
-     * First synonym is the ID, which identifies the setting in PolyMC.
+     * First synonym is the ID, which identifies the setting in Prism Launcher.
      *
      * defVal is the default value that will be returned when the settings object
      * doesn't have any value for this setting.
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 603eaa97..0fab0202 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1860,7 +1860,7 @@ void MainWindow::globalSettingsClosed()
     updateToolsMenu();
     updateStatusCenter();
     // This needs to be done to prevent UI elements disappearing in the event the config is changed
-    // but PolyMC exits abnormally, causing the window state to never be saved:
+    // but Prism Launcher exits abnormally, causing the window state to never be saved:
     APPLICATION->settings()->set("MainWindowState", saveState().toBase64());
     update();
 }
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index 47f204b3..460d25b9 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -69,7 +69,7 @@ QString getCreditsHtml()
 #endif
     stream << "<center>\n";
 
-    //: %1 is the name of the launcher, determined at build time, e.g. "PolyMC Developers"
+    //: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Developers"
     stream << "<h3>" << QObject::tr("%1 Developers", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n";
     stream << QString("<p>Sefa Eyeoglu (Scrumplex) %1</p>\n")   .arg(getWebsite("https://scrumplex.net"));
     stream << QString("<p>dada513 %1</p>\n")                    .arg(getGitHub("dada513"));
@@ -79,7 +79,7 @@ QString getCreditsHtml()
     stream << QString("<p>cozyGalvinism %1</p>\n")              .arg(getGitHub("cozyGalvinism"));
     stream << "<br />\n";
 
-    //: %1 is the name of the launcher, determined at build time, e.g. "PolyMC Contributors"
+    //: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Contributors"
     stream << "<h3>" << QObject::tr("%1 Contributors", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n";
     stream << QString("<p>DioEgizio %1</p>\n")                      .arg(getGitHub("DioEgizio"));
     stream << QString("<p>flowln %1</p>\n")                      .arg(getGitHub("flowln"));
@@ -87,7 +87,7 @@ QString getCreditsHtml()
     stream << "<br />\n";
 
     // TODO: possibly retrieve from git history at build time?
-    //: %1 is the name of the launcher, determined at build time, e.g. "PolyMC Developers"
+    //: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Developers"
     stream << "<h3>" << QObject::tr("%1 Developers", "About Credits").arg("MultiMC") << "</h3>\n";
     stream << "<p>Andrew Okin &lt;<a href='mailto:forkk@forkk.net'>forkk@forkk.net</a>&gt;</p>\n";
     stream << QString("<p>Petr Mrázek &lt;<a href='mailto:peterix@gmail.com'>peterix@gmail.com</a>&gt;</p>\n");
@@ -102,7 +102,7 @@ QString getCreditsHtml()
     stream << "<p>Kilobyte &lt;<a href='mailto:stiepen22@gmx.de'>stiepen22@gmx.de</a>&gt;</p>\n";
     stream << "<p>Rootbear75 &lt;<a href='https://twitter.com/rootbear75'>@rootbear75</a>&gt;</p>\n";
     stream << "<p>Zeker Zhayard &lt;<a href='https://twitter.com/zeker_zhayard'>@Zeker_Zhayard</a>&gt;</p>\n";
-    stream << "<p>Everyone else who <a href='https://github.com/PolyMC/PolyMC/graphs/contributors'>contributed</a>!</p>\n";
+    stream << "<p>Everyone else who <a href='https://github.com/PrismLauncher/PrismLauncher/graphs/contributors'>contributed</a>!</p>\n";
     stream << "<br />\n";
 
     stream << "</center>\n";
diff --git a/launcher/ui/dialogs/UpdateDialog.cpp b/launcher/ui/dialogs/UpdateDialog.cpp
index e0c5a495..9e82531a 100644
--- a/launcher/ui/dialogs/UpdateDialog.cpp
+++ b/launcher/ui/dialogs/UpdateDialog.cpp
@@ -73,12 +73,12 @@ void UpdateDialog::loadChangelog()
     QString url;
     if(channel == "stable")
     {
-        url = QString("https://raw.githubusercontent.com/PolyMC/PolyMC/%1/changelog.md").arg(channel);
+        url = QString("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/%1/changelog.md").arg(channel);
         m_changelogType = CHANGELOG_MARKDOWN;
     }
     else
     {
-        url = QString("https://api.github.com/repos/PolyMC/PolyMC/compare/%1...%2").arg(BuildConfig.GIT_COMMIT, channel);
+        url = QString("https://api.github.com/repos/PrismLauncher/PrismLauncher/compare/%1...%2").arg(BuildConfig.GIT_COMMIT, channel);
         m_changelogType = CHANGELOG_COMMITS;
     }
     dljob->addNetAction(Net::Download::makeByteArray(QUrl(url), &changelogData));
@@ -93,7 +93,7 @@ QString reprocessMarkdown(QByteArray markdown)
     QString output = hoedown.process(markdown);
 
     // HACK: easier than customizing hoedown
-    output.replace(QRegularExpression("GH-([0-9]+)"), "<a href=\"https://github.com/PolyMC/PolyMC/issues/\\1\">GH-\\1</a>");
+    output.replace(QRegularExpression("GH-([0-9]+)"), "<a href=\"https://github.com/PrismLauncher/PrismLauncher/issues/\\1\">GH-\\1</a>");
     qDebug() << output;
     return output;
 }
@@ -135,7 +135,7 @@ QString reprocessCommits(QByteArray json)
                 result += "<tr><td>";
                 if(issuenr.length())
                 {
-                    result += QString("<a href=\"https://github.com/PolyMC/PolyMC/issues/%1\">GH-%2</a>").arg(issuenr, issuenr);
+                    result += QString("<a href=\"https://github.com/PrismLauncher/PrismLauncher/issues/%1\">GH-%2</a>").arg(issuenr, issuenr);
                 }
                 else if(prefix.length())
                 {
diff --git a/launcher/updater/DownloadTask.h b/launcher/updater/DownloadTask.h
index f47a3048..19a6265c 100644
--- a/launcher/updater/DownloadTask.h
+++ b/launcher/updater/DownloadTask.h
@@ -54,7 +54,7 @@ protected:
     /*!
      * Downloads the version info files from the repository.
      * The files for both the current build, and the build that we're updating to need to be downloaded.
-     * If the current version's info file can't be found, PolyMC will not delete files that
+     * If the current version's info file can't be found, Prism Launcher will not delete files that
      * were removed between versions. It will still replace files that have changed, however.
      * Note that although the repository URL for the current version is not given to the update task,
      * the task will attempt to look it up in the UpdateChecker's channel list.
diff --git a/launcher/updater/GoUpdate.cpp b/launcher/updater/GoUpdate.cpp
index 91f30b5d..4bc7dfa9 100644
--- a/launcher/updater/GoUpdate.cpp
+++ b/launcher/updater/GoUpdate.cpp
@@ -104,7 +104,7 @@ bool processFileLists
         }
     }
 
-    // Next, check each file in PolyMC's folder and see if we need to update them.
+    // Next, check each file in Prism Launcher's folder and see if we need to update them.
     for (VersionFileEntry entry : newVersion)
     {
         // TODO: Let's not MD5sum a ton of files on the GUI thread. We should probably find a
diff --git a/libraries/README.md b/libraries/README.md
index 9a26dd69..dc38477b 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -173,7 +173,7 @@ Available either under LGPL version 2.1 or later.
 
 ## systeminfo
 
-A PolyMC-specific library for probing system information.
+A Prism Launcher-specific library for probing system information.
 
 Apache 2.0
 
@@ -183,4 +183,4 @@ A TOML language parser. Used by Forge 1.14+ to store mod metadata.
 
 See [github repo](https://github.com/marzer/tomlplusplus).
 
-Licenced under the MIT licence.
\ No newline at end of file
+Licenced under the MIT licence.
diff --git a/libraries/katabasis/README.md b/libraries/katabasis/README.md
index 621446e1..fe6dd4ac 100644
--- a/libraries/katabasis/README.md
+++ b/libraries/katabasis/README.md
@@ -10,7 +10,7 @@ Notes to contributors:
 
 * Please follow the coding style of the existing source, where reasonable
 * Code contributions are released under Simplified BSD License, as specified in LICENSE. Do not contribute if this license does not suit your code
-* If you are interested in working on this, come to the PolyMC Discord server and talk first
+* If you are interested in working on this, come to the Prism Launcher Discord server and talk first
 
 ## Installation
 
diff --git a/libraries/launcher/CMakeLists.txt b/libraries/launcher/CMakeLists.txt
index c4dfa5b7..df25414f 100644
--- a/libraries/launcher/CMakeLists.txt
+++ b/libraries/launcher/CMakeLists.txt
@@ -3,19 +3,19 @@ project(launcher Java)
 find_package(Java 1.7 REQUIRED COMPONENTS Development)
 
 include(UseJava)
-set(CMAKE_JAVA_JAR_ENTRY_POINT org.polymc.EntryPoint)
+set(CMAKE_JAVA_JAR_ENTRY_POINT org.prismlauncher.EntryPoint)
 set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked)
 
 set(SRC
-    org/polymc/EntryPoint.java
-    org/polymc/Launcher.java
-    org/polymc/LauncherFactory.java
-    org/polymc/impl/OneSixLauncher.java
-    org/polymc/applet/LegacyFrame.java
-    org/polymc/exception/ParameterNotFoundException.java
-    org/polymc/exception/ParseException.java
-    org/polymc/utils/Parameters.java
-    org/polymc/utils/Utils.java
+    org/prismlauncher/EntryPoint.java
+    org/prismlauncher/Launcher.java
+    org/prismlauncher/LauncherFactory.java
+    org/prismlauncher/impl/OneSixLauncher.java
+    org/prismlauncher/applet/LegacyFrame.java
+    org/prismlauncher/exception/ParameterNotFoundException.java
+    org/prismlauncher/exception/ParseException.java
+    org/prismlauncher/utils/Parameters.java
+    org/prismlauncher/utils/Utils.java
     net/minecraft/Launcher.java
 )
 add_jar(NewLaunch ${SRC})
diff --git a/libraries/launcher/org/polymc/EntryPoint.java b/libraries/launcher/org/polymc/EntryPoint.java
deleted file mode 100644
index 20f418eb..00000000
--- a/libraries/launcher/org/polymc/EntryPoint.java
+++ /dev/null
@@ -1,164 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 icelimetea, <fr3shtea@outlook.com>
- *
- *  This program 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, version 3.
- *
- *  This program 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.
- *
- *  Linking this library statically or dynamically with other modules is
- *  making a combined work based on this library. Thus, the terms and
- *  conditions of the GNU General Public License cover the whole
- *  combination.
- *
- *  As a special exception, the copyright holders of this library give
- *  you permission to link this library with independent modules to
- *  produce an executable, regardless of the license terms of these
- *  independent modules, and to copy and distribute the resulting
- *  executable under terms of your choice, provided that you also meet,
- *  for each linked independent module, the terms and conditions of the
- *  license of that module. An independent module is a module which is
- *  not derived from or based on this library. If you modify this
- *  library, you may extend this exception to your version of the
- *  library, but you are not obliged to do so. If you do not wish to do
- *  so, delete this exception statement from your version.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- *      Copyright 2013-2021 MultiMC Contributors
- *
- *      Licensed under the Apache License, Version 2.0 (the "License");
- *      you may not use this file except in compliance with the License.
- *      You may obtain a copy of the License at
- *
- *          http://www.apache.org/licenses/LICENSE-2.0
- *
- *      Unless required by applicable law or agreed to in writing, software
- *      distributed under the License is distributed on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *      See the License for the specific language governing permissions and
- *      limitations under the License.
- */
-
-package org.polymc;
-
-import org.polymc.exception.ParseException;
-import org.polymc.utils.Parameters;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public final class EntryPoint {
-
-    private static final Logger LOGGER = Logger.getLogger("EntryPoint");
-
-    private final Parameters params = new Parameters();
-
-    public static void main(String[] args) {
-        EntryPoint listener = new EntryPoint();
-
-        int retCode = listener.listen();
-
-        if (retCode != 0) {
-            LOGGER.info("Exiting with " + retCode);
-
-            System.exit(retCode);
-        }
-    }
-
-    private Action parseLine(String inData) throws ParseException {
-        String[] tokens = inData.split("\\s+", 2);
-
-        if (tokens.length == 0)
-            throw new ParseException("Unexpected empty string!");
-
-        switch (tokens[0]) {
-            case "launch": {
-                return Action.Launch;
-            }
-
-            case "abort": {
-                return Action.Abort;
-            }
-
-            default: {
-                if (tokens.length != 2)
-                    throw new ParseException("Error while parsing:" + inData);
-
-                params.add(tokens[0], tokens[1]);
-
-                return Action.Proceed;
-            }
-        }
-    }
-
-    public int listen() {
-        Action action = Action.Proceed;
-
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(
-                System.in,
-                StandardCharsets.UTF_8
-        ))) {
-            String line;
-
-            while (action == Action.Proceed) {
-                if ((line = reader.readLine()) != null) {
-                    action = parseLine(line);
-                } else {
-                    action = Action.Abort;
-                }
-            }
-        } catch (IOException | ParseException e) {
-            LOGGER.log(Level.SEVERE, "Launcher ABORT due to exception:", e);
-
-            return 1;
-        }
-
-        // Main loop
-        if (action == Action.Abort) {
-            LOGGER.info("Launch aborted by the launcher.");
-
-            return 1;
-        }
-
-        try {
-            Launcher launcher =
-                    LauncherFactory
-                            .getInstance()
-                            .createLauncher(params);
-
-            launcher.launch();
-
-            return 0;
-        } catch (IllegalArgumentException e) {
-            LOGGER.log(Level.SEVERE, "Wrong argument.", e);
-
-            return 1;
-        } catch (Exception e) {
-            LOGGER.log(Level.SEVERE, "Exception caught from launcher.", e);
-
-            return 1;
-        }
-    }
-
-    private enum Action {
-        Proceed,
-        Launch,
-        Abort
-    }
-
-}
diff --git a/libraries/launcher/org/polymc/Launcher.java b/libraries/launcher/org/polymc/Launcher.java
deleted file mode 100644
index 5bff123e..00000000
--- a/libraries/launcher/org/polymc/Launcher.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2012-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.polymc;
-
-public interface Launcher {
-
-    void launch() throws Exception;
-
-}
diff --git a/libraries/launcher/org/polymc/LauncherFactory.java b/libraries/launcher/org/polymc/LauncherFactory.java
deleted file mode 100644
index 86862929..00000000
--- a/libraries/launcher/org/polymc/LauncherFactory.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  PolyMC - Minecraft Launcher
- *  Copyright (C) 2022 icelimetea, <fr3shtea@outlook.com>
- *
- *  This program 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, version 3.
- *
- *  This program 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.
- *
- *  Linking this library statically or dynamically with other modules is
- *  making a combined work based on this library. Thus, the terms and
- *  conditions of the GNU General Public License cover the whole
- *  combination.
- *
- *  As a special exception, the copyright holders of this library give
- *  you permission to link this library with independent modules to
- *  produce an executable, regardless of the license terms of these
- *  independent modules, and to copy and distribute the resulting
- *  executable under terms of your choice, provided that you also meet,
- *  for each linked independent module, the terms and conditions of the
- *  license of that module. An independent module is a module which is
- *  not derived from or based on this library. If you modify this
- *  library, you may extend this exception to your version of the
- *  library, but you are not obliged to do so. If you do not wish to do
- *  so, delete this exception statement from your version.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.polymc;
-
-import org.polymc.impl.OneSixLauncher;
-import org.polymc.utils.Parameters;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public final class LauncherFactory {
-
-    private static final LauncherFactory INSTANCE = new LauncherFactory();
-
-    private final Map<String, LauncherProvider> launcherRegistry = new HashMap<>();
-
-    private LauncherFactory() {
-        launcherRegistry.put("onesix", new LauncherProvider() {
-            @Override
-            public Launcher provide(Parameters parameters) {
-                return new OneSixLauncher(parameters);
-            }
-        });
-    }
-
-    public Launcher createLauncher(Parameters parameters) {
-        String name = parameters.first("launcher");
-
-        LauncherProvider launcherProvider = launcherRegistry.get(name);
-
-        if (launcherProvider == null)
-            throw new IllegalArgumentException("Invalid launcher type: " + name);
-
-        return launcherProvider.provide(parameters);
-    }
-
-    public static LauncherFactory getInstance() {
-        return INSTANCE;
-    }
-
-    public interface LauncherProvider {
-
-        Launcher provide(Parameters parameters);
-
-    }
-
-}
diff --git a/libraries/launcher/org/polymc/applet/LegacyFrame.java b/libraries/launcher/org/polymc/applet/LegacyFrame.java
deleted file mode 100644
index 7ae56e60..00000000
--- a/libraries/launcher/org/polymc/applet/LegacyFrame.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2012-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.polymc.applet;
-
-import net.minecraft.Launcher;
-
-import javax.imageio.ImageIO;
-import java.applet.Applet;
-import java.awt.*;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public final class LegacyFrame extends Frame {
-
-    private static final Logger LOGGER = Logger.getLogger("LegacyFrame");
-
-    private final Launcher appletWrap;
-
-    public LegacyFrame(String title, Applet mcApplet) {
-        super(title);
-
-        appletWrap = new Launcher(mcApplet);
-
-        mcApplet.setStub(appletWrap);
-
-        try {
-            setIconImage(ImageIO.read(new File("icon.png")));
-        } catch (IOException e) {
-            LOGGER.log(Level.WARNING, "Unable to read Minecraft icon!", e);
-        }
-
-        addWindowListener(new ForceExitHandler());
-    }
-
-    public void start (
-        String user,
-        String session,
-        int winSizeW,
-        int winSizeH,
-        boolean maximize,
-        String serverAddress,
-        String serverPort,
-        boolean isDemo
-    ) {
-        // Implements support for launching in to multiplayer on classic servers using a mpticket
-        // file generated by an external program and stored in the instance's root folder.
-
-        Path mpticketFile =
-                Paths.get(System.getProperty("user.dir"), "..", "mpticket");
-
-        Path mpticketFileCorrupt =
-                Paths.get(System.getProperty("user.dir"), "..", "mpticket.corrupt");
-
-        if (Files.exists(mpticketFile)) {
-            try {
-                List<String> lines = Files.readAllLines(mpticketFile, StandardCharsets.UTF_8);
-
-                if (lines.size() < 3) {
-                    Files.move(
-                            mpticketFile,
-                            mpticketFileCorrupt,
-                            StandardCopyOption.REPLACE_EXISTING
-                    );
-
-                    LOGGER.warning("Mpticket file is corrupted!");
-                } else {
-                    // Assumes parameters are valid and in the correct order
-                    appletWrap.setParameter("server", lines.get(0));
-                    appletWrap.setParameter("port", lines.get(1));
-                    appletWrap.setParameter("mppass", lines.get(2));
-                }
-            } catch (IOException e) {
-                LOGGER.log(Level.WARNING, "Unable to read mpticket file!", e);
-            }
-        }
-
-        if (serverAddress != null) {
-            appletWrap.setParameter("server", serverAddress);
-            appletWrap.setParameter("port", serverPort);
-        }
-
-        appletWrap.setParameter("username", user);
-        appletWrap.setParameter("sessionid", session);
-        appletWrap.setParameter("stand-alone", "true"); // Show the quit button.
-        appletWrap.setParameter("haspaid", "true"); // Some old versions need this for world saves to work.
-        appletWrap.setParameter("demo", isDemo ? "true" : "false");
-        appletWrap.setParameter("fullscreen", "false");
-
-        add(appletWrap);
-
-        appletWrap.setPreferredSize(new Dimension(winSizeW, winSizeH));
-
-        pack();
-
-        setLocationRelativeTo(null);
-        setResizable(true);
-
-        if (maximize)
-            this.setExtendedState(MAXIMIZED_BOTH);
-
-        validate();
-
-        appletWrap.init();
-        appletWrap.start();
-
-        setVisible(true);
-    }
-
-    private final class ForceExitHandler extends WindowAdapter {
-
-        @Override
-        public void windowClosing(WindowEvent e) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        Thread.sleep(30000L);
-                    } catch (InterruptedException localInterruptedException) {
-                        localInterruptedException.printStackTrace();
-                    }
-
-                    LOGGER.info("Forcing exit!");
-
-                    System.exit(0);
-                }
-            }).start();
-
-            if (appletWrap != null) {
-                appletWrap.stop();
-                appletWrap.destroy();
-            }
-
-            // old minecraft versions can hang without this >_<
-            System.exit(0);
-        }
-
-    }
-
-}
diff --git a/libraries/launcher/org/polymc/exception/ParameterNotFoundException.java b/libraries/launcher/org/polymc/exception/ParameterNotFoundException.java
deleted file mode 100644
index 2044814e..00000000
--- a/libraries/launcher/org/polymc/exception/ParameterNotFoundException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2012-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.polymc.exception;
-
-public final class ParameterNotFoundException extends IllegalArgumentException {
-
-    public ParameterNotFoundException(String key) {
-        super("Unknown parameter name: " + key);
-    }
-
-}
diff --git a/libraries/launcher/org/polymc/exception/ParseException.java b/libraries/launcher/org/polymc/exception/ParseException.java
deleted file mode 100644
index 2f2f8294..00000000
--- a/libraries/launcher/org/polymc/exception/ParseException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2012-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.polymc.exception;
-
-public final class ParseException extends IllegalArgumentException {
-
-    public ParseException(String message) {
-        super(message);
-    }
-
-}
diff --git a/libraries/launcher/org/polymc/impl/OneSixLauncher.java b/libraries/launcher/org/polymc/impl/OneSixLauncher.java
deleted file mode 100644
index d43101eb..00000000
--- a/libraries/launcher/org/polymc/impl/OneSixLauncher.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/* Copyright 2012-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.polymc.impl;
-
-import org.polymc.Launcher;
-import org.polymc.applet.LegacyFrame;
-import org.polymc.utils.Parameters;
-import org.polymc.utils.Utils;
-
-import java.applet.Applet;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public final class OneSixLauncher implements Launcher {
-
-    private static final int DEFAULT_WINDOW_WIDTH = 854;
-    private static final int DEFAULT_WINDOW_HEIGHT = 480;
-
-    private static final Logger LOGGER = Logger.getLogger("OneSixLauncher");
-
-    // parameters, separated from ParamBucket
-    private final List<String> mcParams;
-    private final List<String> traits;
-    private final String appletClass;
-    private final String mainClass;
-    private final String userName, sessionId;
-    private final String windowTitle;
-
-    // secondary parameters
-    private final int winSizeW;
-    private final int winSizeH;
-    private final boolean maximize;
-    private final String cwd;
-
-    private final String serverAddress;
-    private final String serverPort;
-
-    private final ClassLoader classLoader;
-
-    public OneSixLauncher(Parameters params) {
-        classLoader = ClassLoader.getSystemClassLoader();
-
-        mcParams = params.allSafe("param", new ArrayList<String>());
-        mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft");
-        appletClass = params.firstSafe("appletClass", "net.minecraft.client.MinecraftApplet");
-        traits = params.allSafe("traits", new ArrayList<String>());
-
-        userName = params.first("userName");
-        sessionId = params.first("sessionId");
-        windowTitle = params.firstSafe("windowTitle", "Minecraft");
-
-        serverAddress = params.firstSafe("serverAddress", null);
-        serverPort = params.firstSafe("serverPort", null);
-
-        cwd = System.getProperty("user.dir");
-
-        String windowParams = params.firstSafe("windowParams", null);
-
-        if (windowParams != null) {
-            String[] dimStrings = windowParams.split("x");
-
-            if (windowParams.equalsIgnoreCase("max")) {
-                maximize = true;
-
-                winSizeW = DEFAULT_WINDOW_WIDTH;
-                winSizeH = DEFAULT_WINDOW_HEIGHT;
-            } else if (dimStrings.length == 2) {
-                maximize = false;
-
-                winSizeW = Integer.parseInt(dimStrings[0]);
-                winSizeH = Integer.parseInt(dimStrings[1]);
-            } else {
-                throw new IllegalArgumentException("Unexpected window size parameter value: " + windowParams);
-            }
-        } else {
-            maximize = false;
-
-            winSizeW = DEFAULT_WINDOW_WIDTH;
-            winSizeH = DEFAULT_WINDOW_HEIGHT;
-        }
-    }
-
-    private void invokeMain(Class<?> mainClass) throws Exception {
-        Method method = mainClass.getMethod("main", String[].class);
-
-        method.invoke(null, (Object) mcParams.toArray(new String[0]));
-    }
-
-    private void legacyLaunch() throws Exception {
-        // Get the Minecraft Class and set the base folder
-        Class<?> minecraftClass = classLoader.loadClass(mainClass);
-
-        Field baseDirField = Utils.getMinecraftBaseDirField(minecraftClass);
-
-        if (baseDirField == null) {
-            LOGGER.warning("Could not find Minecraft path field.");
-        } else {
-            baseDirField.setAccessible(true);
-
-            baseDirField.set(null, new File(cwd));
-        }
-
-        System.setProperty("minecraft.applet.TargetDirectory", cwd);
-
-        if (!traits.contains("noapplet")) {
-            LOGGER.info("Launching with applet wrapper...");
-
-            try {
-                Class<?> mcAppletClass = classLoader.loadClass(appletClass);
-
-                Applet mcApplet = (Applet) mcAppletClass.getConstructor().newInstance();
-
-                LegacyFrame mcWindow = new LegacyFrame(windowTitle, mcApplet);
-
-                mcWindow.start(
-                        userName,
-                        sessionId,
-                        winSizeW,
-                        winSizeH,
-                        maximize,
-                        serverAddress,
-                        serverPort,
-                        mcParams.contains("--demo")
-                );
-
-                return;
-            } catch (Exception e) {
-                LOGGER.log(Level.SEVERE, "Applet wrapper failed: ", e);
-
-                LOGGER.warning("Falling back to using main class.");
-            }
-        }
-
-        invokeMain(minecraftClass);
-    }
-
-    private void launchWithMainClass() throws Exception {
-        // window size, title and state, onesix
-
-        // FIXME: there is no good way to maximize the minecraft window in onesix.
-        // the following often breaks linux screen setups
-        // mcparams.add("--fullscreen");
-
-        if (!maximize) {
-            mcParams.add("--width");
-            mcParams.add(Integer.toString(winSizeW));
-            mcParams.add("--height");
-            mcParams.add(Integer.toString(winSizeH));
-        }
-
-        if (serverAddress != null) {
-            mcParams.add("--server");
-            mcParams.add(serverAddress);
-            mcParams.add("--port");
-            mcParams.add(serverPort);
-        }
-
-        invokeMain(classLoader.loadClass(mainClass));
-    }
-
-    @Override
-    public void launch() throws Exception {
-        if (traits.contains("legacyLaunch") || traits.contains("alphaLaunch")) {
-            // legacy launch uses the applet wrapper
-            legacyLaunch();
-        } else {
-            // normal launch just calls main()
-            launchWithMainClass();
-        }
-    }
-
-}
diff --git a/libraries/launcher/org/polymc/utils/Parameters.java b/libraries/launcher/org/polymc/utils/Parameters.java
deleted file mode 100644
index 864d3cd2..00000000
--- a/libraries/launcher/org/polymc/utils/Parameters.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2012-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.polymc.utils;
-
-import org.polymc.exception.ParameterNotFoundException;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public final class Parameters {
-
-    private final Map<String, List<String>> paramsMap = new HashMap<>();
-
-    public void add(String key, String value) {
-        List<String> params = paramsMap.get(key);
-
-        if (params == null) {
-            params = new ArrayList<>();
-
-            paramsMap.put(key, params);
-        }
-
-        params.add(value);
-    }
-
-    public List<String> all(String key) throws ParameterNotFoundException {
-        List<String> params = paramsMap.get(key);
-
-        if (params == null)
-            throw new ParameterNotFoundException(key);
-
-        return params;
-    }
-
-    public List<String> allSafe(String key, List<String> def) {
-        List<String> params = paramsMap.get(key);
-
-        if (params == null || params.isEmpty())
-            return def;
-
-        return params;
-    }
-
-    public String first(String key) throws ParameterNotFoundException {
-        List<String> list = all(key);
-
-        if (list.isEmpty())
-            throw new ParameterNotFoundException(key);
-
-        return list.get(0);
-    }
-
-    public String firstSafe(String key, String def) {
-        List<String> params = paramsMap.get(key);
-
-        if (params == null || params.isEmpty())
-            return def;
-
-        return params.get(0);
-    }
-
-}
diff --git a/libraries/launcher/org/polymc/utils/Utils.java b/libraries/launcher/org/polymc/utils/Utils.java
deleted file mode 100644
index 12d6e1aa..00000000
--- a/libraries/launcher/org/polymc/utils/Utils.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2012-2021 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.polymc.utils;
-
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
-public final class Utils {
-
-    private Utils() {}
-
-    /**
-     * Finds a field that looks like a Minecraft base folder in a supplied class
-     *
-     * @param clazz the class to scan
-     */
-    public static Field getMinecraftBaseDirField(Class<?> clazz) {
-        for (Field f : clazz.getDeclaredFields()) {
-            // Has to be File
-            if (f.getType() != File.class)
-                continue;
-
-            // And Private Static.
-            if (!Modifier.isStatic(f.getModifiers()) || !Modifier.isPrivate(f.getModifiers()))
-                continue;
-
-            return f;
-        }
-
-        return null;
-    }
-
-}
-
diff --git a/libraries/launcher/org/prismlauncher/EntryPoint.java b/libraries/launcher/org/prismlauncher/EntryPoint.java
new file mode 100644
index 00000000..9144e1f1
--- /dev/null
+++ b/libraries/launcher/org/prismlauncher/EntryPoint.java
@@ -0,0 +1,164 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 icelimetea, <fr3shtea@outlook.com>
+ *
+ *  This program 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, version 3.
+ *
+ *  This program 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.
+ *
+ *  Linking this library statically or dynamically with other modules is
+ *  making a combined work based on this library. Thus, the terms and
+ *  conditions of the GNU General Public License cover the whole
+ *  combination.
+ *
+ *  As a special exception, the copyright holders of this library give
+ *  you permission to link this library with independent modules to
+ *  produce an executable, regardless of the license terms of these
+ *  independent modules, and to copy and distribute the resulting
+ *  executable under terms of your choice, provided that you also meet,
+ *  for each linked independent module, the terms and conditions of the
+ *  license of that module. An independent module is a module which is
+ *  not derived from or based on this library. If you modify this
+ *  library, you may extend this exception to your version of the
+ *  library, but you are not obliged to do so. If you do not wish to do
+ *  so, delete this exception statement from your version.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+package org.prismlauncher;
+
+import org.prismlauncher.exception.ParseException;
+import org.prismlauncher.utils.Parameters;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public final class EntryPoint {
+
+    private static final Logger LOGGER = Logger.getLogger("EntryPoint");
+
+    private final Parameters params = new Parameters();
+
+    public static void main(String[] args) {
+        EntryPoint listener = new EntryPoint();
+
+        int retCode = listener.listen();
+
+        if (retCode != 0) {
+            LOGGER.info("Exiting with " + retCode);
+
+            System.exit(retCode);
+        }
+    }
+
+    private Action parseLine(String inData) throws ParseException {
+        String[] tokens = inData.split("\\s+", 2);
+
+        if (tokens.length == 0)
+            throw new ParseException("Unexpected empty string!");
+
+        switch (tokens[0]) {
+            case "launch": {
+                return Action.Launch;
+            }
+
+            case "abort": {
+                return Action.Abort;
+            }
+
+            default: {
+                if (tokens.length != 2)
+                    throw new ParseException("Error while parsing:" + inData);
+
+                params.add(tokens[0], tokens[1]);
+
+                return Action.Proceed;
+            }
+        }
+    }
+
+    public int listen() {
+        Action action = Action.Proceed;
+
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(
+                System.in,
+                StandardCharsets.UTF_8
+        ))) {
+            String line;
+
+            while (action == Action.Proceed) {
+                if ((line = reader.readLine()) != null) {
+                    action = parseLine(line);
+                } else {
+                    action = Action.Abort;
+                }
+            }
+        } catch (IOException | ParseException e) {
+            LOGGER.log(Level.SEVERE, "Launcher ABORT due to exception:", e);
+
+            return 1;
+        }
+
+        // Main loop
+        if (action == Action.Abort) {
+            LOGGER.info("Launch aborted by the launcher.");
+
+            return 1;
+        }
+
+        try {
+            Launcher launcher =
+                    LauncherFactory
+                            .getInstance()
+                            .createLauncher(params);
+
+            launcher.launch();
+
+            return 0;
+        } catch (IllegalArgumentException e) {
+            LOGGER.log(Level.SEVERE, "Wrong argument.", e);
+
+            return 1;
+        } catch (Exception e) {
+            LOGGER.log(Level.SEVERE, "Exception caught from launcher.", e);
+
+            return 1;
+        }
+    }
+
+    private enum Action {
+        Proceed,
+        Launch,
+        Abort
+    }
+
+}
diff --git a/libraries/launcher/org/prismlauncher/Launcher.java b/libraries/launcher/org/prismlauncher/Launcher.java
new file mode 100644
index 00000000..7f25717b
--- /dev/null
+++ b/libraries/launcher/org/prismlauncher/Launcher.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.prismlauncher;
+
+public interface Launcher {
+
+    void launch() throws Exception;
+
+}
diff --git a/libraries/launcher/org/prismlauncher/LauncherFactory.java b/libraries/launcher/org/prismlauncher/LauncherFactory.java
new file mode 100644
index 00000000..98f2bbba
--- /dev/null
+++ b/libraries/launcher/org/prismlauncher/LauncherFactory.java
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 icelimetea, <fr3shtea@outlook.com>
+ *
+ *  This program 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, version 3.
+ *
+ *  This program 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.
+ *
+ *  Linking this library statically or dynamically with other modules is
+ *  making a combined work based on this library. Thus, the terms and
+ *  conditions of the GNU General Public License cover the whole
+ *  combination.
+ *
+ *  As a special exception, the copyright holders of this library give
+ *  you permission to link this library with independent modules to
+ *  produce an executable, regardless of the license terms of these
+ *  independent modules, and to copy and distribute the resulting
+ *  executable under terms of your choice, provided that you also meet,
+ *  for each linked independent module, the terms and conditions of the
+ *  license of that module. An independent module is a module which is
+ *  not derived from or based on this library. If you modify this
+ *  library, you may extend this exception to your version of the
+ *  library, but you are not obliged to do so. If you do not wish to do
+ *  so, delete this exception statement from your version.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.prismlauncher;
+
+import org.prismlauncher.impl.OneSixLauncher;
+import org.prismlauncher.utils.Parameters;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public final class LauncherFactory {
+
+    private static final LauncherFactory INSTANCE = new LauncherFactory();
+
+    private final Map<String, LauncherProvider> launcherRegistry = new HashMap<>();
+
+    private LauncherFactory() {
+        launcherRegistry.put("onesix", new LauncherProvider() {
+            @Override
+            public Launcher provide(Parameters parameters) {
+                return new OneSixLauncher(parameters);
+            }
+        });
+    }
+
+    public Launcher createLauncher(Parameters parameters) {
+        String name = parameters.first("launcher");
+
+        LauncherProvider launcherProvider = launcherRegistry.get(name);
+
+        if (launcherProvider == null)
+            throw new IllegalArgumentException("Invalid launcher type: " + name);
+
+        return launcherProvider.provide(parameters);
+    }
+
+    public static LauncherFactory getInstance() {
+        return INSTANCE;
+    }
+
+    public interface LauncherProvider {
+
+        Launcher provide(Parameters parameters);
+
+    }
+
+}
diff --git a/libraries/launcher/org/prismlauncher/applet/LegacyFrame.java b/libraries/launcher/org/prismlauncher/applet/LegacyFrame.java
new file mode 100644
index 00000000..4413efa8
--- /dev/null
+++ b/libraries/launcher/org/prismlauncher/applet/LegacyFrame.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2012-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.prismlauncher.applet;
+
+import net.minecraft.Launcher;
+
+import javax.imageio.ImageIO;
+import java.applet.Applet;
+import java.awt.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public final class LegacyFrame extends Frame {
+
+    private static final Logger LOGGER = Logger.getLogger("LegacyFrame");
+
+    private final Launcher appletWrap;
+
+    public LegacyFrame(String title, Applet mcApplet) {
+        super(title);
+
+        appletWrap = new Launcher(mcApplet);
+
+        mcApplet.setStub(appletWrap);
+
+        try {
+            setIconImage(ImageIO.read(new File("icon.png")));
+        } catch (IOException e) {
+            LOGGER.log(Level.WARNING, "Unable to read Minecraft icon!", e);
+        }
+
+        addWindowListener(new ForceExitHandler());
+    }
+
+    public void start (
+        String user,
+        String session,
+        int winSizeW,
+        int winSizeH,
+        boolean maximize,
+        String serverAddress,
+        String serverPort,
+        boolean isDemo
+    ) {
+        // Implements support for launching in to multiplayer on classic servers using a mpticket
+        // file generated by an external program and stored in the instance's root folder.
+
+        Path mpticketFile =
+                Paths.get(System.getProperty("user.dir"), "..", "mpticket");
+
+        Path mpticketFileCorrupt =
+                Paths.get(System.getProperty("user.dir"), "..", "mpticket.corrupt");
+
+        if (Files.exists(mpticketFile)) {
+            try {
+                List<String> lines = Files.readAllLines(mpticketFile, StandardCharsets.UTF_8);
+
+                if (lines.size() < 3) {
+                    Files.move(
+                            mpticketFile,
+                            mpticketFileCorrupt,
+                            StandardCopyOption.REPLACE_EXISTING
+                    );
+
+                    LOGGER.warning("Mpticket file is corrupted!");
+                } else {
+                    // Assumes parameters are valid and in the correct order
+                    appletWrap.setParameter("server", lines.get(0));
+                    appletWrap.setParameter("port", lines.get(1));
+                    appletWrap.setParameter("mppass", lines.get(2));
+                }
+            } catch (IOException e) {
+                LOGGER.log(Level.WARNING, "Unable to read mpticket file!", e);
+            }
+        }
+
+        if (serverAddress != null) {
+            appletWrap.setParameter("server", serverAddress);
+            appletWrap.setParameter("port", serverPort);
+        }
+
+        appletWrap.setParameter("username", user);
+        appletWrap.setParameter("sessionid", session);
+        appletWrap.setParameter("stand-alone", "true"); // Show the quit button.
+        appletWrap.setParameter("haspaid", "true"); // Some old versions need this for world saves to work.
+        appletWrap.setParameter("demo", isDemo ? "true" : "false");
+        appletWrap.setParameter("fullscreen", "false");
+
+        add(appletWrap);
+
+        appletWrap.setPreferredSize(new Dimension(winSizeW, winSizeH));
+
+        pack();
+
+        setLocationRelativeTo(null);
+        setResizable(true);
+
+        if (maximize)
+            this.setExtendedState(MAXIMIZED_BOTH);
+
+        validate();
+
+        appletWrap.init();
+        appletWrap.start();
+
+        setVisible(true);
+    }
+
+    private final class ForceExitHandler extends WindowAdapter {
+
+        @Override
+        public void windowClosing(WindowEvent e) {
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        Thread.sleep(30000L);
+                    } catch (InterruptedException localInterruptedException) {
+                        localInterruptedException.printStackTrace();
+                    }
+
+                    LOGGER.info("Forcing exit!");
+
+                    System.exit(0);
+                }
+            }).start();
+
+            if (appletWrap != null) {
+                appletWrap.stop();
+                appletWrap.destroy();
+            }
+
+            // old minecraft versions can hang without this >_<
+            System.exit(0);
+        }
+
+    }
+
+}
diff --git a/libraries/launcher/org/prismlauncher/exception/ParameterNotFoundException.java b/libraries/launcher/org/prismlauncher/exception/ParameterNotFoundException.java
new file mode 100644
index 00000000..641e0c99
--- /dev/null
+++ b/libraries/launcher/org/prismlauncher/exception/ParameterNotFoundException.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2012-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.prismlauncher.exception;
+
+public final class ParameterNotFoundException extends IllegalArgumentException {
+
+    public ParameterNotFoundException(String key) {
+        super("Unknown parameter name: " + key);
+    }
+
+}
diff --git a/libraries/launcher/org/prismlauncher/exception/ParseException.java b/libraries/launcher/org/prismlauncher/exception/ParseException.java
new file mode 100644
index 00000000..51d25a62
--- /dev/null
+++ b/libraries/launcher/org/prismlauncher/exception/ParseException.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2012-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.prismlauncher.exception;
+
+public final class ParseException extends IllegalArgumentException {
+
+    public ParseException(String message) {
+        super(message);
+    }
+
+}
diff --git a/libraries/launcher/org/prismlauncher/impl/OneSixLauncher.java b/libraries/launcher/org/prismlauncher/impl/OneSixLauncher.java
new file mode 100644
index 00000000..d6443826
--- /dev/null
+++ b/libraries/launcher/org/prismlauncher/impl/OneSixLauncher.java
@@ -0,0 +1,190 @@
+/* Copyright 2012-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.prismlauncher.impl;
+
+import org.prismlauncher.Launcher;
+import org.prismlauncher.applet.LegacyFrame;
+import org.prismlauncher.utils.Parameters;
+import org.prismlauncher.utils.Utils;
+
+import java.applet.Applet;
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public final class OneSixLauncher implements Launcher {
+
+    private static final int DEFAULT_WINDOW_WIDTH = 854;
+    private static final int DEFAULT_WINDOW_HEIGHT = 480;
+
+    private static final Logger LOGGER = Logger.getLogger("OneSixLauncher");
+
+    // parameters, separated from ParamBucket
+    private final List<String> mcParams;
+    private final List<String> traits;
+    private final String appletClass;
+    private final String mainClass;
+    private final String userName, sessionId;
+    private final String windowTitle;
+
+    // secondary parameters
+    private final int winSizeW;
+    private final int winSizeH;
+    private final boolean maximize;
+    private final String cwd;
+
+    private final String serverAddress;
+    private final String serverPort;
+
+    private final ClassLoader classLoader;
+
+    public OneSixLauncher(Parameters params) {
+        classLoader = ClassLoader.getSystemClassLoader();
+
+        mcParams = params.allSafe("param", new ArrayList<String>());
+        mainClass = params.firstSafe("mainClass", "net.minecraft.client.Minecraft");
+        appletClass = params.firstSafe("appletClass", "net.minecraft.client.MinecraftApplet");
+        traits = params.allSafe("traits", new ArrayList<String>());
+
+        userName = params.first("userName");
+        sessionId = params.first("sessionId");
+        windowTitle = params.firstSafe("windowTitle", "Minecraft");
+
+        serverAddress = params.firstSafe("serverAddress", null);
+        serverPort = params.firstSafe("serverPort", null);
+
+        cwd = System.getProperty("user.dir");
+
+        String windowParams = params.firstSafe("windowParams", null);
+
+        if (windowParams != null) {
+            String[] dimStrings = windowParams.split("x");
+
+            if (windowParams.equalsIgnoreCase("max")) {
+                maximize = true;
+
+                winSizeW = DEFAULT_WINDOW_WIDTH;
+                winSizeH = DEFAULT_WINDOW_HEIGHT;
+            } else if (dimStrings.length == 2) {
+                maximize = false;
+
+                winSizeW = Integer.parseInt(dimStrings[0]);
+                winSizeH = Integer.parseInt(dimStrings[1]);
+            } else {
+                throw new IllegalArgumentException("Unexpected window size parameter value: " + windowParams);
+            }
+        } else {
+            maximize = false;
+
+            winSizeW = DEFAULT_WINDOW_WIDTH;
+            winSizeH = DEFAULT_WINDOW_HEIGHT;
+        }
+    }
+
+    private void invokeMain(Class<?> mainClass) throws Exception {
+        Method method = mainClass.getMethod("main", String[].class);
+
+        method.invoke(null, (Object) mcParams.toArray(new String[0]));
+    }
+
+    private void legacyLaunch() throws Exception {
+        // Get the Minecraft Class and set the base folder
+        Class<?> minecraftClass = classLoader.loadClass(mainClass);
+
+        Field baseDirField = Utils.getMinecraftBaseDirField(minecraftClass);
+
+        if (baseDirField == null) {
+            LOGGER.warning("Could not find Minecraft path field.");
+        } else {
+            baseDirField.setAccessible(true);
+
+            baseDirField.set(null, new File(cwd));
+        }
+
+        System.setProperty("minecraft.applet.TargetDirectory", cwd);
+
+        if (!traits.contains("noapplet")) {
+            LOGGER.info("Launching with applet wrapper...");
+
+            try {
+                Class<?> mcAppletClass = classLoader.loadClass(appletClass);
+
+                Applet mcApplet = (Applet) mcAppletClass.getConstructor().newInstance();
+
+                LegacyFrame mcWindow = new LegacyFrame(windowTitle, mcApplet);
+
+                mcWindow.start(
+                        userName,
+                        sessionId,
+                        winSizeW,
+                        winSizeH,
+                        maximize,
+                        serverAddress,
+                        serverPort,
+                        mcParams.contains("--demo")
+                );
+
+                return;
+            } catch (Exception e) {
+                LOGGER.log(Level.SEVERE, "Applet wrapper failed: ", e);
+
+                LOGGER.warning("Falling back to using main class.");
+            }
+        }
+
+        invokeMain(minecraftClass);
+    }
+
+    private void launchWithMainClass() throws Exception {
+        // window size, title and state, onesix
+
+        // FIXME: there is no good way to maximize the minecraft window in onesix.
+        // the following often breaks linux screen setups
+        // mcparams.add("--fullscreen");
+
+        if (!maximize) {
+            mcParams.add("--width");
+            mcParams.add(Integer.toString(winSizeW));
+            mcParams.add("--height");
+            mcParams.add(Integer.toString(winSizeH));
+        }
+
+        if (serverAddress != null) {
+            mcParams.add("--server");
+            mcParams.add(serverAddress);
+            mcParams.add("--port");
+            mcParams.add(serverPort);
+        }
+
+        invokeMain(classLoader.loadClass(mainClass));
+    }
+
+    @Override
+    public void launch() throws Exception {
+        if (traits.contains("legacyLaunch") || traits.contains("alphaLaunch")) {
+            // legacy launch uses the applet wrapper
+            legacyLaunch();
+        } else {
+            // normal launch just calls main()
+            launchWithMainClass();
+        }
+    }
+
+}
diff --git a/libraries/launcher/org/prismlauncher/utils/Parameters.java b/libraries/launcher/org/prismlauncher/utils/Parameters.java
new file mode 100644
index 00000000..98a40c28
--- /dev/null
+++ b/libraries/launcher/org/prismlauncher/utils/Parameters.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2012-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.prismlauncher.utils;
+
+import org.prismlauncher.exception.ParameterNotFoundException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public final class Parameters {
+
+    private final Map<String, List<String>> paramsMap = new HashMap<>();
+
+    public void add(String key, String value) {
+        List<String> params = paramsMap.get(key);
+
+        if (params == null) {
+            params = new ArrayList<>();
+
+            paramsMap.put(key, params);
+        }
+
+        params.add(value);
+    }
+
+    public List<String> all(String key) throws ParameterNotFoundException {
+        List<String> params = paramsMap.get(key);
+
+        if (params == null)
+            throw new ParameterNotFoundException(key);
+
+        return params;
+    }
+
+    public List<String> allSafe(String key, List<String> def) {
+        List<String> params = paramsMap.get(key);
+
+        if (params == null || params.isEmpty())
+            return def;
+
+        return params;
+    }
+
+    public String first(String key) throws ParameterNotFoundException {
+        List<String> list = all(key);
+
+        if (list.isEmpty())
+            throw new ParameterNotFoundException(key);
+
+        return list.get(0);
+    }
+
+    public String firstSafe(String key, String def) {
+        List<String> params = paramsMap.get(key);
+
+        if (params == null || params.isEmpty())
+            return def;
+
+        return params.get(0);
+    }
+
+}
diff --git a/libraries/launcher/org/prismlauncher/utils/Utils.java b/libraries/launcher/org/prismlauncher/utils/Utils.java
new file mode 100644
index 00000000..ae9a4de2
--- /dev/null
+++ b/libraries/launcher/org/prismlauncher/utils/Utils.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2012-2021 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.prismlauncher.utils;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+public final class Utils {
+
+    private Utils() {}
+
+    /**
+     * Finds a field that looks like a Minecraft base folder in a supplied class
+     *
+     * @param clazz the class to scan
+     */
+    public static Field getMinecraftBaseDirField(Class<?> clazz) {
+        for (Field f : clazz.getDeclaredFields()) {
+            // Has to be File
+            if (f.getType() != File.class)
+                continue;
+
+            // And Private Static.
+            if (!Modifier.isStatic(f.getModifiers()) || !Modifier.isPrivate(f.getModifiers()))
+                continue;
+
+            return f;
+        }
+
+        return null;
+    }
+
+}
+
diff --git a/nix/NIX.md b/nix/NIX.md
index 047dd82f..e57d5be7 100644
--- a/nix/NIX.md
+++ b/nix/NIX.md
@@ -5,22 +5,22 @@ To import with flakes use
 ```nix
 {
   inputs = {
-    polymc.url = "github:PolyMC/PolyMC";
+    prismlauncher.url = "github:PrismLauncher/PrismLauncher";
   };
 
 ...
 
-  nixpkgs.overlays = [ inputs.polymc.overlay ]; ## Within configuration.nix
-  environment.systemPackages = with pkgs; [ polymc ]; ##
+  nixpkgs.overlays = [ inputs.prismlauncher.overlay ]; ## Within configuration.nix
+  environment.systemPackages = with pkgs; [ prismlauncher ]; ##
 }
 ```
 
 To import without flakes use channels:
 
 ```sh
-nix-channel --add https://github.com/PolyMC/PolyMC/archive/master.tar.gz polymc
-nix-channel --update polymc
-nix-env -iA polymc
+nix-channel --add https://github.com/PrismLauncher/PrismLauncher/archive/master.tar.gz prismlauncher
+nix-channel --update prismlauncher
+nix-env -iA prismlauncher
 ```
 
 or alternatively you can use
@@ -28,9 +28,9 @@ or alternatively you can use
 ```nix
 {
   nixpkgs.overlays = [
-    (import (builtins.fetchTarball "https://github.com/PolyMC/PolyMC/archive/develop.tar.gz")).overlay
+    (import (builtins.fetchTarball "https://github.com/PrismLauncher/PrismLauncher/archive/develop.tar.gz")).overlay
   ];
 
-  environment.systemPackages = with pkgs; [ polymc ];
+  environment.systemPackages = with pkgs; [ prismlauncher ];
 }
 ```
diff --git a/program_info/prismlauncher.6.scd b/program_info/prismlauncher.6.scd
index f0628cc9..e3c7de86 100644
--- a/program_info/prismlauncher.6.scd
+++ b/program_info/prismlauncher.6.scd
@@ -1,33 +1,33 @@
-polymc(6)
+prismlauncher(6)
 
 
 # NAME
 
-polymc - a launcher and instance manager for Minecraft.
+prismlauncher - a launcher and instance manager for Minecraft.
 
 
 # SYNOPSIS
 
-*polymc* [OPTIONS...]
+*prismlauncher* [OPTIONS...]
 
 
 # DESCRIPTION
 
-PolyMC is a custom launcher for Minecraft that allows you to easily manage
+Prism Launcher is a custom launcher for Minecraft that allows you to easily manage
 multiple installations of Minecraft at once. It also allows you to easily
 install and remove mods by simply dragging and dropping.
-Here are the current features of PolyMC.
+Here are the current features of Prism Launcher.
 
 # OPTIONS
 
 *-d, --dir*=DIRECTORY
-	Use DIRECTORY as the PolyMC root.
+	Use DIRECTORY as the Prism Launcher root.
 
 *-l, --launch*=INSTANCE_ID
 	Launch the instance specified by INSTANCE_ID.
 
 *--alive*
-	Write a small 'live.check' file after PolyMC starts.
+	Write a small 'live.check' file after Prism Launcher starts.
 
 *-h, --help*
 	Display help text and exit.
@@ -48,14 +48,14 @@ Here are the current features of PolyMC.
 
 # BUGS
 
-https://github.com/PolyMC/PolyMC/issues
+https://github.com/PrismLauncher/PrismLauncher/issues
 
 # RESOURCES
 
-GitHub: https://github.com/PolyMC/PolyMC
+GitHub: https://github.com/PrismLauncher/PrismLauncher
 
-Main website: https://polymc.org
+Main website: https://prismlauncher.org
 
 # AUTHORS
 
-PolyMC Contributors
+Prism Launcher Contributors
-- 
cgit 


From 22365205f9be82f5194b97f4bc354c89bf7254ce Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 19 Oct 2022 12:17:06 +0200
Subject: fix: use display name for NSIS

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 program_info/CMakeLists.txt     |  6 ++++--
 program_info/win_install.nsi.in | 16 ++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt
index e46f63a3..62a01231 100644
--- a/program_info/CMakeLists.txt
+++ b/program_info/CMakeLists.txt
@@ -9,12 +9,14 @@ if(UNIX)
 endif()
 
 set(Launcher_CommonName "PrismLauncher")
+set(Launcher_DisplayName "Prism Launcher")
+
+set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
+set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)
 
 set(Launcher_Copyright "Prism Launcher Contributors\\n© 2012-2021 MultiMC Contributors")
 set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE)
 set(Launcher_Domain "prismlauncher.org" PARENT_SCOPE)
-set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
-set(Launcher_DisplayName "Prism Launcher" PARENT_SCOPE)
 set(Launcher_UserAgent "${Launcher_CommonName}/${Launcher_VERSION_NAME}" PARENT_SCOPE)
 set(Launcher_ConfigFile "prismlauncher.cfg" PARENT_SCOPE)
 set(Launcher_Git "https://github.com/PrismLauncher/PrismLauncher" PARENT_SCOPE)
diff --git a/program_info/win_install.nsi.in b/program_info/win_install.nsi.in
index 87e266f8..1c1f29da 100644
--- a/program_info/win_install.nsi.in
+++ b/program_info/win_install.nsi.in
@@ -104,8 +104,8 @@ OutFile "../@Launcher_CommonName@-Setup.exe"
 ; Version info
 VIProductVersion "@Launcher_VERSION_NAME4@"
 VIFileVersion "@Launcher_VERSION_NAME4@"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "@Launcher_CommonName@"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "@Launcher_CommonName@ Installer"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "@Launcher_DisplayName@"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "@Launcher_DisplayName@ Installer"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "@Launcher_Copyright@"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "@Launcher_VERSION_NAME4@"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@"
@@ -139,12 +139,12 @@ Section "@Launcher_CommonName@"
   ${GetOptions} $R0 "/NoUninstaller" $R1
   ${If} ${Errors}
     !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\@Launcher_CommonName@"
-    WriteRegStr HKCU "${UNINST_KEY}" "DisplayName" "@Launcher_CommonName@"
+    WriteRegStr HKCU "${UNINST_KEY}" "DisplayName" "@Launcher_DisplayName@"
     WriteRegStr HKCU "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\@Launcher_APP_BINARY_NAME@.exe"
     WriteRegStr HKCU "${UNINST_KEY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
     WriteRegStr HKCU "${UNINST_KEY}" "QuietUninstallString" '"$INSTDIR\uninstall.exe" /S'
     WriteRegStr HKCU "${UNINST_KEY}" "InstallLocation" "$INSTDIR"
-    WriteRegStr HKCU "${UNINST_KEY}" "Publisher" "@Launcher_CommonName@ Contributors"
+    WriteRegStr HKCU "${UNINST_KEY}" "Publisher" "@Launcher_DisplayName@ Contributors"
     WriteRegStr HKCU "${UNINST_KEY}" "Version" "@Launcher_VERSION_NAME4@"
     WriteRegStr HKCU "${UNINST_KEY}" "DisplayVersion" "@Launcher_VERSION_NAME@"
     WriteRegStr HKCU "${UNINST_KEY}" "VersionMajor" "@Launcher_VERSION_MAJOR@"
@@ -161,13 +161,13 @@ SectionEnd
 
 Section "Start Menu Shortcut" SM_SHORTCUTS
 
-  CreateShortcut "$SMPROGRAMS\@Launcher_CommonName@.lnk" "$INSTDIR\@Launcher_APP_BINARY_NAME@.exe" "" "$INSTDIR\@Launcher_APP_BINARY_NAME@.exe" 0
+  CreateShortcut "$SMPROGRAMS\@Launcher_DisplayName@.lnk" "$INSTDIR\@Launcher_APP_BINARY_NAME@.exe" "" "$INSTDIR\@Launcher_APP_BINARY_NAME@.exe" 0
 
 SectionEnd
 
 Section /o "Desktop Shortcut" DESKTOP_SHORTCUTS
 
-  CreateShortcut "$DESKTOP\@Launcher_CommonName@.lnk" "$INSTDIR\@Launcher_APP_BINARY_NAME@.exe" "" "$INSTDIR\@Launcher_APP_BINARY_NAME@.exe" 0
+  CreateShortcut "$DESKTOP\@Launcher_DisplayName@.lnk" "$INSTDIR\@Launcher_APP_BINARY_NAME@.exe" "" "$INSTDIR\@Launcher_APP_BINARY_NAME@.exe" 0
 
 SectionEnd
 
@@ -195,8 +195,8 @@ Section "Uninstall"
   RMDir /r $INSTDIR\styles
   RMDir /r $INSTDIR\tls
 
-  Delete "$SMPROGRAMS\@Launcher_CommonName@.lnk"
-  Delete "$DESKTOP\@Launcher_CommonName@.lnk"
+  Delete "$SMPROGRAMS\@Launcher_DisplayName@.lnk"
+  Delete "$DESKTOP\@Launcher_DisplayName@.lnk"
 
   RMDir "$INSTDIR"
 
-- 
cgit 


From 61fbc5a7919c6c7747ee8e2e551fb63f3a4c59fb Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 18 Oct 2022 23:13:46 +0200
Subject: refactor: replace with new logo

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 README.md                                          |   7 +-
 launcher/resources/OSX/scalable/launcher.svg       |  66 +++-
 launcher/resources/flat/scalable/launcher.svg      |  66 +++-
 launcher/resources/iOS/scalable/launcher.svg       |  66 +++-
 launcher/resources/multimc/multimc.qrc             |   2 +-
 .../multimc/scalable/instances/polymc.svg          |  21 --
 .../multimc/scalable/instances/prismlauncher.svg   |  18 +
 launcher/resources/multimc/scalable/launcher.svg   |  66 +++-
 launcher/resources/pe_blue/scalable/launcher.svg   |  66 +++-
 .../resources/pe_colored/scalable/launcher.svg     |  66 +++-
 launcher/resources/pe_dark/scalable/launcher.svg   |  66 +++-
 launcher/resources/pe_light/scalable/launcher.svg  |  66 +++-
 launcher/ui/dialogs/AboutDialog.cpp                |  16 +-
 .../org.prismlauncher.PrismLauncher.Social.svg     |  60 ++++
 .../org.prismlauncher.PrismLauncher.Source.svg     | 400 +++++++++------------
 .../org.prismlauncher.PrismLauncher.bigsur.svg     | 390 ++++++++++++--------
 ...g.prismlauncher.PrismLauncher.logo-darkmode.svg | 212 +++++++++++
 ...org.prismlauncher.PrismLauncher.logo.source.svg | 256 +++++++++++++
 .../org.prismlauncher.PrismLauncher.logo.svg       |  72 ++++
 program_info/org.prismlauncher.PrismLauncher.svg   |  70 +++-
 program_info/prismlauncher-header-black.svg        |  23 --
 program_info/prismlauncher-header.Source.svg       | 139 -------
 program_info/prismlauncher-header.svg              |  23 --
 program_info/prismlauncher-monochrome.Source.svg   | 207 +++++++++++
 program_info/prismlauncher.icns                    | Bin 518794 -> 400974 bytes
 program_info/prismlauncher.ico                     | Bin 102134 -> 102134 bytes
 26 files changed, 1703 insertions(+), 741 deletions(-)
 delete mode 100644 launcher/resources/multimc/scalable/instances/polymc.svg
 create mode 100644 launcher/resources/multimc/scalable/instances/prismlauncher.svg
 create mode 100644 program_info/org.prismlauncher.PrismLauncher.Social.svg
 create mode 100644 program_info/org.prismlauncher.PrismLauncher.logo-darkmode.svg
 create mode 100644 program_info/org.prismlauncher.PrismLauncher.logo.source.svg
 create mode 100644 program_info/org.prismlauncher.PrismLauncher.logo.svg
 delete mode 100644 program_info/prismlauncher-header-black.svg
 delete mode 100644 program_info/prismlauncher-header.Source.svg
 delete mode 100644 program_info/prismlauncher-header.svg
 create mode 100644 program_info/prismlauncher-monochrome.Source.svg

diff --git a/README.md b/README.md
index 25509222..47fbcc62 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,11 @@
-# Prism Launcher
+<p align="center">
+<img src="./program_info/org.prismlauncher.PrismLauncher.logo.svg#gh-light-mode-only" alt="Prism Launcher logo" width="50%"/>
+<img src="./program_info/org.prismlauncher.PrismLauncher.logo-darkmode.svg#gh-dark-mode-only" alt="Prism Launcher logo" width="50%"/>
+</p>
 
 Prism Launcher is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
 
-We are working on a website and other media, for more info we have a [Discord server](https://discord.gg/prismlauncher). Logo and branding are also coming soon.
+We are working on a website and other media, for more info we have a [Discord server](https://discord.gg/prismlauncher).
 
 ## Installation
 
diff --git a/launcher/resources/OSX/scalable/launcher.svg b/launcher/resources/OSX/scalable/launcher.svg
index c192d503..69dd84b1 100644
--- a/launcher/resources/OSX/scalable/launcher.svg
+++ b/launcher/resources/OSX/scalable/launcher.svg
@@ -1,21 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#88b858" offset="0"/>
-   <stop stop-color="#72b147" offset=".5"/>
-   <stop stop-color="#5a9a30" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
-  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <title>Prism Launcher Logo</title>
+ <g stroke-width=".26458">
+  <path d="m6.35 6.35" fill="#99cd61"/>
+  <path d="m6.35 0.52917-2.5208 4.3656 2.5208 1.4552 2.5203-1.4552 0.10955-3.0996c-1.1511-0.66459-2.3388-1.2661-2.6298-1.2661z" fill="#df6277"/>
+  <path d="m8.9798 1.7952-2.6298 4.5548 2.5203 1.4552 2.5208-4.3656c-0.14552-0.25205-1.2601-0.97975-2.4112-1.6443z" fill="#fb9168"/>
+  <path d="m11.391 3.4396-5.041 2.9104 2.5203 1.4552 2.7389-1.4552c0-1.3292-0.072554-2.6584-0.21808-2.9104z" fill="#f3db6c"/>
+  <path d="m6.35 6.35v2.9104h5.041c0.14552-0.25205 0.21807-1.5812 0.21808-2.9104h-5.2591z" fill="#7ab392"/>
+  <path d="m6.35 6.35v2.9104l2.6298 1.6443c1.1511-0.66459 2.2657-1.3923 2.4112-1.6443l-5.041-2.9104z" fill="#4b7cbc"/>
+  <path d="m6.35 6.35-2.5208 1.4552 2.5208 4.3656c0.29104 0 1.4787-0.60148 2.6298-1.2661l-2.6298-4.5548z" fill="#6f488c"/>
+  <path d="m3.8292 4.8948-2.5203 4.3656c0.29104 0.5041 4.459 2.9104 5.041 2.9104v-5.8208l-2.5208-1.4552z" fill="#4d3f33"/>
+  <path d="m1.309 3.4396c-0.29104 0.5041-0.29104 5.3167 0 5.8208l5.041-2.9104v-2.9104h-5.041z" fill="#7a573b"/>
+  <path d="m6.35 0.52917c-0.58208-2e-8 -4.75 2.4063-5.041 2.9104l5.041 2.9104v-5.8208z" fill="#99cd61"/>
  </g>
- <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
+ <g transform="matrix(.88 0 0 .88 -10.906 -1.2421)">
+  <g transform="translate(13.26 2.2776)">
+   <path transform="matrix(.96975 0 0 .96975 .1921 .1921)" d="m6.3498 2.9393c-0.34105 0-2.7827 1.4099-2.9532 1.7052l2.9532 5.1157 2.9538-5.1157c-0.17052-0.29535-2.6127-1.7052-2.9538-1.7052z" fill="#fff" stroke-width=".26458"/>
+  </g>
+  <path d="m16.746 6.9737 2.8639 4.9609c0.33073 0 2.6991-1.3672 2.8644-1.6536 0.16536-0.28642 0.16536-3.0209 0-3.3073l-2.8644 1.6536z" fill="#dfdfdf" stroke-width=".26458"/>
+ </g>
+ <path d="m3.8299 4.8948c-0.14551 0.25205-0.14553 2.6584 0 2.9104 0.14553 0.25204 2.2292 1.4552 2.5203 1.4552v-2.9104z" fill="#d6d2d2" stroke-width=".26458"/>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:title>Prism Launcher Logo</dc:title>
+    <dc:date>19/10/2022</dc:date>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:creator>
+    <dc:contributor>
+     <cc:Agent>
+      <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+     </cc:Agent>
+    </dc:contributor>
+    <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+    <dc:rights>
+     <cc:Agent>
+      <dc:title>CC BY-SA 4.0</dc:title>
+     </cc:Agent>
+    </dc:rights>
+    <dc:publisher>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:publisher>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
 </svg>
diff --git a/launcher/resources/flat/scalable/launcher.svg b/launcher/resources/flat/scalable/launcher.svg
index c192d503..69dd84b1 100644
--- a/launcher/resources/flat/scalable/launcher.svg
+++ b/launcher/resources/flat/scalable/launcher.svg
@@ -1,21 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#88b858" offset="0"/>
-   <stop stop-color="#72b147" offset=".5"/>
-   <stop stop-color="#5a9a30" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
-  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <title>Prism Launcher Logo</title>
+ <g stroke-width=".26458">
+  <path d="m6.35 6.35" fill="#99cd61"/>
+  <path d="m6.35 0.52917-2.5208 4.3656 2.5208 1.4552 2.5203-1.4552 0.10955-3.0996c-1.1511-0.66459-2.3388-1.2661-2.6298-1.2661z" fill="#df6277"/>
+  <path d="m8.9798 1.7952-2.6298 4.5548 2.5203 1.4552 2.5208-4.3656c-0.14552-0.25205-1.2601-0.97975-2.4112-1.6443z" fill="#fb9168"/>
+  <path d="m11.391 3.4396-5.041 2.9104 2.5203 1.4552 2.7389-1.4552c0-1.3292-0.072554-2.6584-0.21808-2.9104z" fill="#f3db6c"/>
+  <path d="m6.35 6.35v2.9104h5.041c0.14552-0.25205 0.21807-1.5812 0.21808-2.9104h-5.2591z" fill="#7ab392"/>
+  <path d="m6.35 6.35v2.9104l2.6298 1.6443c1.1511-0.66459 2.2657-1.3923 2.4112-1.6443l-5.041-2.9104z" fill="#4b7cbc"/>
+  <path d="m6.35 6.35-2.5208 1.4552 2.5208 4.3656c0.29104 0 1.4787-0.60148 2.6298-1.2661l-2.6298-4.5548z" fill="#6f488c"/>
+  <path d="m3.8292 4.8948-2.5203 4.3656c0.29104 0.5041 4.459 2.9104 5.041 2.9104v-5.8208l-2.5208-1.4552z" fill="#4d3f33"/>
+  <path d="m1.309 3.4396c-0.29104 0.5041-0.29104 5.3167 0 5.8208l5.041-2.9104v-2.9104h-5.041z" fill="#7a573b"/>
+  <path d="m6.35 0.52917c-0.58208-2e-8 -4.75 2.4063-5.041 2.9104l5.041 2.9104v-5.8208z" fill="#99cd61"/>
  </g>
- <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
+ <g transform="matrix(.88 0 0 .88 -10.906 -1.2421)">
+  <g transform="translate(13.26 2.2776)">
+   <path transform="matrix(.96975 0 0 .96975 .1921 .1921)" d="m6.3498 2.9393c-0.34105 0-2.7827 1.4099-2.9532 1.7052l2.9532 5.1157 2.9538-5.1157c-0.17052-0.29535-2.6127-1.7052-2.9538-1.7052z" fill="#fff" stroke-width=".26458"/>
+  </g>
+  <path d="m16.746 6.9737 2.8639 4.9609c0.33073 0 2.6991-1.3672 2.8644-1.6536 0.16536-0.28642 0.16536-3.0209 0-3.3073l-2.8644 1.6536z" fill="#dfdfdf" stroke-width=".26458"/>
+ </g>
+ <path d="m3.8299 4.8948c-0.14551 0.25205-0.14553 2.6584 0 2.9104 0.14553 0.25204 2.2292 1.4552 2.5203 1.4552v-2.9104z" fill="#d6d2d2" stroke-width=".26458"/>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:title>Prism Launcher Logo</dc:title>
+    <dc:date>19/10/2022</dc:date>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:creator>
+    <dc:contributor>
+     <cc:Agent>
+      <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+     </cc:Agent>
+    </dc:contributor>
+    <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+    <dc:rights>
+     <cc:Agent>
+      <dc:title>CC BY-SA 4.0</dc:title>
+     </cc:Agent>
+    </dc:rights>
+    <dc:publisher>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:publisher>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
 </svg>
diff --git a/launcher/resources/iOS/scalable/launcher.svg b/launcher/resources/iOS/scalable/launcher.svg
index c192d503..69dd84b1 100644
--- a/launcher/resources/iOS/scalable/launcher.svg
+++ b/launcher/resources/iOS/scalable/launcher.svg
@@ -1,21 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#88b858" offset="0"/>
-   <stop stop-color="#72b147" offset=".5"/>
-   <stop stop-color="#5a9a30" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
-  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <title>Prism Launcher Logo</title>
+ <g stroke-width=".26458">
+  <path d="m6.35 6.35" fill="#99cd61"/>
+  <path d="m6.35 0.52917-2.5208 4.3656 2.5208 1.4552 2.5203-1.4552 0.10955-3.0996c-1.1511-0.66459-2.3388-1.2661-2.6298-1.2661z" fill="#df6277"/>
+  <path d="m8.9798 1.7952-2.6298 4.5548 2.5203 1.4552 2.5208-4.3656c-0.14552-0.25205-1.2601-0.97975-2.4112-1.6443z" fill="#fb9168"/>
+  <path d="m11.391 3.4396-5.041 2.9104 2.5203 1.4552 2.7389-1.4552c0-1.3292-0.072554-2.6584-0.21808-2.9104z" fill="#f3db6c"/>
+  <path d="m6.35 6.35v2.9104h5.041c0.14552-0.25205 0.21807-1.5812 0.21808-2.9104h-5.2591z" fill="#7ab392"/>
+  <path d="m6.35 6.35v2.9104l2.6298 1.6443c1.1511-0.66459 2.2657-1.3923 2.4112-1.6443l-5.041-2.9104z" fill="#4b7cbc"/>
+  <path d="m6.35 6.35-2.5208 1.4552 2.5208 4.3656c0.29104 0 1.4787-0.60148 2.6298-1.2661l-2.6298-4.5548z" fill="#6f488c"/>
+  <path d="m3.8292 4.8948-2.5203 4.3656c0.29104 0.5041 4.459 2.9104 5.041 2.9104v-5.8208l-2.5208-1.4552z" fill="#4d3f33"/>
+  <path d="m1.309 3.4396c-0.29104 0.5041-0.29104 5.3167 0 5.8208l5.041-2.9104v-2.9104h-5.041z" fill="#7a573b"/>
+  <path d="m6.35 0.52917c-0.58208-2e-8 -4.75 2.4063-5.041 2.9104l5.041 2.9104v-5.8208z" fill="#99cd61"/>
  </g>
- <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
+ <g transform="matrix(.88 0 0 .88 -10.906 -1.2421)">
+  <g transform="translate(13.26 2.2776)">
+   <path transform="matrix(.96975 0 0 .96975 .1921 .1921)" d="m6.3498 2.9393c-0.34105 0-2.7827 1.4099-2.9532 1.7052l2.9532 5.1157 2.9538-5.1157c-0.17052-0.29535-2.6127-1.7052-2.9538-1.7052z" fill="#fff" stroke-width=".26458"/>
+  </g>
+  <path d="m16.746 6.9737 2.8639 4.9609c0.33073 0 2.6991-1.3672 2.8644-1.6536 0.16536-0.28642 0.16536-3.0209 0-3.3073l-2.8644 1.6536z" fill="#dfdfdf" stroke-width=".26458"/>
+ </g>
+ <path d="m3.8299 4.8948c-0.14551 0.25205-0.14553 2.6584 0 2.9104 0.14553 0.25204 2.2292 1.4552 2.5203 1.4552v-2.9104z" fill="#d6d2d2" stroke-width=".26458"/>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:title>Prism Launcher Logo</dc:title>
+    <dc:date>19/10/2022</dc:date>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:creator>
+    <dc:contributor>
+     <cc:Agent>
+      <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+     </cc:Agent>
+    </dc:contributor>
+    <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+    <dc:rights>
+     <cc:Agent>
+      <dc:title>CC BY-SA 4.0</dc:title>
+     </cc:Agent>
+    </dc:rights>
+    <dc:publisher>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:publisher>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
 </svg>
diff --git a/launcher/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc
index 2337acd6..3f3d22fc 100644
--- a/launcher/resources/multimc/multimc.qrc
+++ b/launcher/resources/multimc/multimc.qrc
@@ -311,6 +311,6 @@
 
         <file>scalable/instances/fox.svg</file>
         <file>scalable/instances/bee.svg</file>
-        <file>scalable/instances/polymc.svg</file>
+        <file>scalable/instances/prismlauncher.svg</file>
     </qresource>
 </RCC>
diff --git a/launcher/resources/multimc/scalable/instances/polymc.svg b/launcher/resources/multimc/scalable/instances/polymc.svg
deleted file mode 100644
index c192d503..00000000
--- a/launcher/resources/multimc/scalable/instances/polymc.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#88b858" offset="0"/>
-   <stop stop-color="#72b147" offset=".5"/>
-   <stop stop-color="#5a9a30" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
-  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
- </g>
- <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
-</svg>
diff --git a/launcher/resources/multimc/scalable/instances/prismlauncher.svg b/launcher/resources/multimc/scalable/instances/prismlauncher.svg
new file mode 100644
index 00000000..93493aab
--- /dev/null
+++ b/launcher/resources/multimc/scalable/instances/prismlauncher.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="512" height="512" version="1.1" viewBox="0 0 135.47 135.47" xmlns="http://www.w3.org/2000/svg">
+ <g transform="matrix(1.3386 0 0 1.3386 16.155 10.174)">
+  <path d="m18.78 50.126c0 1.342 0.356 2.6345 1.0008 3.758l-18.279 10.617c-0.96723-1.6842-1.5023-3.6252-1.5023-5.6404v-31.721c0-2.0152 0.53511-3.9517 1.5001-5.6382l18.281 10.614c-0.6448 1.1235-1.0008 2.416-1.0008 3.7602z" fill="#7a573b"/>
+  <path d="m77.065 27.139v15.861h-18.78v-7.1243c0-1.342-0.3559-2.6367-1.003-3.7602l18.279-10.614c0.9694 1.6843 1.5023 3.6252 1.5023 5.6404z" fill="#f3db6c"/>
+  <path d="m77.065 43v15.861c0 2.0152-0.5351 3.9562-1.5023 5.6404l-17.278-10.031-1.003-0.5832c0.6471-1.1236 1.003-2.4183 1.003-3.7603v-7.1265z" fill="#7ab392"/>
+  <path d="m75.563 64.501c-0.9695 1.6843-2.3711 3.1208-4.1062 4.1296l-13.658 7.9303-9.3924-16.356 6.1392-3.5644c1.1553-0.6733 2.089-1.628 2.736-2.7516l18.279 10.614z" fill="#4b7cbc"/>
+  <path d="m57.799 76.559-13.658 7.9303c-1.7352 1.0065-3.6719 1.5109-5.6086 1.5109v-21.226c1.2896 0 2.5792-0.3355 3.739-1.0088l6.1348-3.5644 9.3924 16.356z" fill="#6f488c"/>
+  <path d="m57.799 9.4412-9.3924 16.356-6.1348-3.5644c-1.1598-0.6732-2.4494-1.0065-3.739-1.0065v-21.226c1.9367 0 3.8734 0.50437 5.6086 1.5109z" fill="#df6277"/>
+  <path d="m38.532 0v21.226c-1.2896 0-2.5793 0.3333-3.7391 1.0065l-12.274 7.1288c-1.1576 0.671-2.0912 1.6279-2.7383 2.7538l-18.281-10.614c0.96947-1.6865 2.3733-3.1208 4.1085-4.1295l27.315-15.861c1.7352-1.0065 3.6719-1.5109 5.6086-1.5109z" fill="#99cd61"/>
+  <path d="m75.563 21.501-18.279 10.614c-0.647-1.1236-1.5807-2.0806-2.736-2.7516l-6.1392-3.5644 9.3924-16.356 13.658 7.9303c1.7352 1.0065 3.1368 2.4431 4.1062 4.1296z" fill="#fb9168"/>
+  <path d="m38.532 64.776v21.226c-1.9367 0-3.8733-0.5044-5.6085-1.5109l-27.315-15.863c-1.7352-1.0087-3.1368-2.443-4.1062-4.1295l18.279-10.614c0.647 1.1236 1.5807 2.0783 2.736 2.7516l12.274 7.1287c1.1598 0.6733 2.4495 1.0088 3.7391 1.0088z" fill="#4d3f33"/>
+  <path d="m58.285 35.876v14.251c0 2.6885-1.424 5.1698-3.7391 6.5118l-12.274 7.1288c-1.1597 0.6732-2.4494 1.0087-3.739 1.0087-1.2897 0-2.5793-0.3355-3.7391-1.0087l-12.274-7.1288c-2.3151-1.342-3.7391-3.8233-3.7391-6.5118v-14.251c0-2.6884 1.424-5.1698 3.7391-6.5118l12.274-7.1287c1.1598-0.6733 2.4494-1.0065 3.7391-1.0065 1.2896 0 2.5793 0.3355 3.739 1.0065l6.1348 3.5643 6.1392 3.5644c1.1553 0.6733 2.089 1.628 2.736 2.7516 0.6471 1.1235 1.0031 2.4182 1.0031 3.7602z" fill="#fff"/>
+  <path d="m58.285 35.876v14.251c0 1.342-0.356 2.6367-1.0031 3.7603s-1.5807 2.0783-2.736 2.7515l-6.1392 3.5644-6.1348 3.5644c-1.1598 0.6732-2.4494 1.0087-3.739 1.0087v-21.774l14.728-8.5495 4.0234-2.335c0.6471 1.1236 1.0031 2.4183 1.0031 3.7603z" fill="#dfdfdf"/>
+  <path d="m38.532 43v21.774c-1.2897 0-2.5793-0.3355-3.7391-1.0088l-12.274-7.1287c-1.1553-0.6733-2.089-1.628-2.7361-2.7516-0.647-1.1235-1.003-2.4182-1.003-3.7602v-14.251c0-1.342 0.356-2.6367 1.003-3.7603l18.751 10.884z" fill="#d6d2d2"/>
+ </g>
+</svg>
diff --git a/launcher/resources/multimc/scalable/launcher.svg b/launcher/resources/multimc/scalable/launcher.svg
index c192d503..69dd84b1 100644
--- a/launcher/resources/multimc/scalable/launcher.svg
+++ b/launcher/resources/multimc/scalable/launcher.svg
@@ -1,21 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#88b858" offset="0"/>
-   <stop stop-color="#72b147" offset=".5"/>
-   <stop stop-color="#5a9a30" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
-  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <title>Prism Launcher Logo</title>
+ <g stroke-width=".26458">
+  <path d="m6.35 6.35" fill="#99cd61"/>
+  <path d="m6.35 0.52917-2.5208 4.3656 2.5208 1.4552 2.5203-1.4552 0.10955-3.0996c-1.1511-0.66459-2.3388-1.2661-2.6298-1.2661z" fill="#df6277"/>
+  <path d="m8.9798 1.7952-2.6298 4.5548 2.5203 1.4552 2.5208-4.3656c-0.14552-0.25205-1.2601-0.97975-2.4112-1.6443z" fill="#fb9168"/>
+  <path d="m11.391 3.4396-5.041 2.9104 2.5203 1.4552 2.7389-1.4552c0-1.3292-0.072554-2.6584-0.21808-2.9104z" fill="#f3db6c"/>
+  <path d="m6.35 6.35v2.9104h5.041c0.14552-0.25205 0.21807-1.5812 0.21808-2.9104h-5.2591z" fill="#7ab392"/>
+  <path d="m6.35 6.35v2.9104l2.6298 1.6443c1.1511-0.66459 2.2657-1.3923 2.4112-1.6443l-5.041-2.9104z" fill="#4b7cbc"/>
+  <path d="m6.35 6.35-2.5208 1.4552 2.5208 4.3656c0.29104 0 1.4787-0.60148 2.6298-1.2661l-2.6298-4.5548z" fill="#6f488c"/>
+  <path d="m3.8292 4.8948-2.5203 4.3656c0.29104 0.5041 4.459 2.9104 5.041 2.9104v-5.8208l-2.5208-1.4552z" fill="#4d3f33"/>
+  <path d="m1.309 3.4396c-0.29104 0.5041-0.29104 5.3167 0 5.8208l5.041-2.9104v-2.9104h-5.041z" fill="#7a573b"/>
+  <path d="m6.35 0.52917c-0.58208-2e-8 -4.75 2.4063-5.041 2.9104l5.041 2.9104v-5.8208z" fill="#99cd61"/>
  </g>
- <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
+ <g transform="matrix(.88 0 0 .88 -10.906 -1.2421)">
+  <g transform="translate(13.26 2.2776)">
+   <path transform="matrix(.96975 0 0 .96975 .1921 .1921)" d="m6.3498 2.9393c-0.34105 0-2.7827 1.4099-2.9532 1.7052l2.9532 5.1157 2.9538-5.1157c-0.17052-0.29535-2.6127-1.7052-2.9538-1.7052z" fill="#fff" stroke-width=".26458"/>
+  </g>
+  <path d="m16.746 6.9737 2.8639 4.9609c0.33073 0 2.6991-1.3672 2.8644-1.6536 0.16536-0.28642 0.16536-3.0209 0-3.3073l-2.8644 1.6536z" fill="#dfdfdf" stroke-width=".26458"/>
+ </g>
+ <path d="m3.8299 4.8948c-0.14551 0.25205-0.14553 2.6584 0 2.9104 0.14553 0.25204 2.2292 1.4552 2.5203 1.4552v-2.9104z" fill="#d6d2d2" stroke-width=".26458"/>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:title>Prism Launcher Logo</dc:title>
+    <dc:date>19/10/2022</dc:date>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:creator>
+    <dc:contributor>
+     <cc:Agent>
+      <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+     </cc:Agent>
+    </dc:contributor>
+    <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+    <dc:rights>
+     <cc:Agent>
+      <dc:title>CC BY-SA 4.0</dc:title>
+     </cc:Agent>
+    </dc:rights>
+    <dc:publisher>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:publisher>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
 </svg>
diff --git a/launcher/resources/pe_blue/scalable/launcher.svg b/launcher/resources/pe_blue/scalable/launcher.svg
index c192d503..69dd84b1 100644
--- a/launcher/resources/pe_blue/scalable/launcher.svg
+++ b/launcher/resources/pe_blue/scalable/launcher.svg
@@ -1,21 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#88b858" offset="0"/>
-   <stop stop-color="#72b147" offset=".5"/>
-   <stop stop-color="#5a9a30" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
-  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <title>Prism Launcher Logo</title>
+ <g stroke-width=".26458">
+  <path d="m6.35 6.35" fill="#99cd61"/>
+  <path d="m6.35 0.52917-2.5208 4.3656 2.5208 1.4552 2.5203-1.4552 0.10955-3.0996c-1.1511-0.66459-2.3388-1.2661-2.6298-1.2661z" fill="#df6277"/>
+  <path d="m8.9798 1.7952-2.6298 4.5548 2.5203 1.4552 2.5208-4.3656c-0.14552-0.25205-1.2601-0.97975-2.4112-1.6443z" fill="#fb9168"/>
+  <path d="m11.391 3.4396-5.041 2.9104 2.5203 1.4552 2.7389-1.4552c0-1.3292-0.072554-2.6584-0.21808-2.9104z" fill="#f3db6c"/>
+  <path d="m6.35 6.35v2.9104h5.041c0.14552-0.25205 0.21807-1.5812 0.21808-2.9104h-5.2591z" fill="#7ab392"/>
+  <path d="m6.35 6.35v2.9104l2.6298 1.6443c1.1511-0.66459 2.2657-1.3923 2.4112-1.6443l-5.041-2.9104z" fill="#4b7cbc"/>
+  <path d="m6.35 6.35-2.5208 1.4552 2.5208 4.3656c0.29104 0 1.4787-0.60148 2.6298-1.2661l-2.6298-4.5548z" fill="#6f488c"/>
+  <path d="m3.8292 4.8948-2.5203 4.3656c0.29104 0.5041 4.459 2.9104 5.041 2.9104v-5.8208l-2.5208-1.4552z" fill="#4d3f33"/>
+  <path d="m1.309 3.4396c-0.29104 0.5041-0.29104 5.3167 0 5.8208l5.041-2.9104v-2.9104h-5.041z" fill="#7a573b"/>
+  <path d="m6.35 0.52917c-0.58208-2e-8 -4.75 2.4063-5.041 2.9104l5.041 2.9104v-5.8208z" fill="#99cd61"/>
  </g>
- <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
+ <g transform="matrix(.88 0 0 .88 -10.906 -1.2421)">
+  <g transform="translate(13.26 2.2776)">
+   <path transform="matrix(.96975 0 0 .96975 .1921 .1921)" d="m6.3498 2.9393c-0.34105 0-2.7827 1.4099-2.9532 1.7052l2.9532 5.1157 2.9538-5.1157c-0.17052-0.29535-2.6127-1.7052-2.9538-1.7052z" fill="#fff" stroke-width=".26458"/>
+  </g>
+  <path d="m16.746 6.9737 2.8639 4.9609c0.33073 0 2.6991-1.3672 2.8644-1.6536 0.16536-0.28642 0.16536-3.0209 0-3.3073l-2.8644 1.6536z" fill="#dfdfdf" stroke-width=".26458"/>
+ </g>
+ <path d="m3.8299 4.8948c-0.14551 0.25205-0.14553 2.6584 0 2.9104 0.14553 0.25204 2.2292 1.4552 2.5203 1.4552v-2.9104z" fill="#d6d2d2" stroke-width=".26458"/>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:title>Prism Launcher Logo</dc:title>
+    <dc:date>19/10/2022</dc:date>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:creator>
+    <dc:contributor>
+     <cc:Agent>
+      <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+     </cc:Agent>
+    </dc:contributor>
+    <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+    <dc:rights>
+     <cc:Agent>
+      <dc:title>CC BY-SA 4.0</dc:title>
+     </cc:Agent>
+    </dc:rights>
+    <dc:publisher>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:publisher>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
 </svg>
diff --git a/launcher/resources/pe_colored/scalable/launcher.svg b/launcher/resources/pe_colored/scalable/launcher.svg
index c192d503..69dd84b1 100644
--- a/launcher/resources/pe_colored/scalable/launcher.svg
+++ b/launcher/resources/pe_colored/scalable/launcher.svg
@@ -1,21 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#88b858" offset="0"/>
-   <stop stop-color="#72b147" offset=".5"/>
-   <stop stop-color="#5a9a30" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
-  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <title>Prism Launcher Logo</title>
+ <g stroke-width=".26458">
+  <path d="m6.35 6.35" fill="#99cd61"/>
+  <path d="m6.35 0.52917-2.5208 4.3656 2.5208 1.4552 2.5203-1.4552 0.10955-3.0996c-1.1511-0.66459-2.3388-1.2661-2.6298-1.2661z" fill="#df6277"/>
+  <path d="m8.9798 1.7952-2.6298 4.5548 2.5203 1.4552 2.5208-4.3656c-0.14552-0.25205-1.2601-0.97975-2.4112-1.6443z" fill="#fb9168"/>
+  <path d="m11.391 3.4396-5.041 2.9104 2.5203 1.4552 2.7389-1.4552c0-1.3292-0.072554-2.6584-0.21808-2.9104z" fill="#f3db6c"/>
+  <path d="m6.35 6.35v2.9104h5.041c0.14552-0.25205 0.21807-1.5812 0.21808-2.9104h-5.2591z" fill="#7ab392"/>
+  <path d="m6.35 6.35v2.9104l2.6298 1.6443c1.1511-0.66459 2.2657-1.3923 2.4112-1.6443l-5.041-2.9104z" fill="#4b7cbc"/>
+  <path d="m6.35 6.35-2.5208 1.4552 2.5208 4.3656c0.29104 0 1.4787-0.60148 2.6298-1.2661l-2.6298-4.5548z" fill="#6f488c"/>
+  <path d="m3.8292 4.8948-2.5203 4.3656c0.29104 0.5041 4.459 2.9104 5.041 2.9104v-5.8208l-2.5208-1.4552z" fill="#4d3f33"/>
+  <path d="m1.309 3.4396c-0.29104 0.5041-0.29104 5.3167 0 5.8208l5.041-2.9104v-2.9104h-5.041z" fill="#7a573b"/>
+  <path d="m6.35 0.52917c-0.58208-2e-8 -4.75 2.4063-5.041 2.9104l5.041 2.9104v-5.8208z" fill="#99cd61"/>
  </g>
- <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
+ <g transform="matrix(.88 0 0 .88 -10.906 -1.2421)">
+  <g transform="translate(13.26 2.2776)">
+   <path transform="matrix(.96975 0 0 .96975 .1921 .1921)" d="m6.3498 2.9393c-0.34105 0-2.7827 1.4099-2.9532 1.7052l2.9532 5.1157 2.9538-5.1157c-0.17052-0.29535-2.6127-1.7052-2.9538-1.7052z" fill="#fff" stroke-width=".26458"/>
+  </g>
+  <path d="m16.746 6.9737 2.8639 4.9609c0.33073 0 2.6991-1.3672 2.8644-1.6536 0.16536-0.28642 0.16536-3.0209 0-3.3073l-2.8644 1.6536z" fill="#dfdfdf" stroke-width=".26458"/>
+ </g>
+ <path d="m3.8299 4.8948c-0.14551 0.25205-0.14553 2.6584 0 2.9104 0.14553 0.25204 2.2292 1.4552 2.5203 1.4552v-2.9104z" fill="#d6d2d2" stroke-width=".26458"/>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:title>Prism Launcher Logo</dc:title>
+    <dc:date>19/10/2022</dc:date>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:creator>
+    <dc:contributor>
+     <cc:Agent>
+      <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+     </cc:Agent>
+    </dc:contributor>
+    <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+    <dc:rights>
+     <cc:Agent>
+      <dc:title>CC BY-SA 4.0</dc:title>
+     </cc:Agent>
+    </dc:rights>
+    <dc:publisher>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:publisher>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
 </svg>
diff --git a/launcher/resources/pe_dark/scalable/launcher.svg b/launcher/resources/pe_dark/scalable/launcher.svg
index c192d503..69dd84b1 100644
--- a/launcher/resources/pe_dark/scalable/launcher.svg
+++ b/launcher/resources/pe_dark/scalable/launcher.svg
@@ -1,21 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#88b858" offset="0"/>
-   <stop stop-color="#72b147" offset=".5"/>
-   <stop stop-color="#5a9a30" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
-  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <title>Prism Launcher Logo</title>
+ <g stroke-width=".26458">
+  <path d="m6.35 6.35" fill="#99cd61"/>
+  <path d="m6.35 0.52917-2.5208 4.3656 2.5208 1.4552 2.5203-1.4552 0.10955-3.0996c-1.1511-0.66459-2.3388-1.2661-2.6298-1.2661z" fill="#df6277"/>
+  <path d="m8.9798 1.7952-2.6298 4.5548 2.5203 1.4552 2.5208-4.3656c-0.14552-0.25205-1.2601-0.97975-2.4112-1.6443z" fill="#fb9168"/>
+  <path d="m11.391 3.4396-5.041 2.9104 2.5203 1.4552 2.7389-1.4552c0-1.3292-0.072554-2.6584-0.21808-2.9104z" fill="#f3db6c"/>
+  <path d="m6.35 6.35v2.9104h5.041c0.14552-0.25205 0.21807-1.5812 0.21808-2.9104h-5.2591z" fill="#7ab392"/>
+  <path d="m6.35 6.35v2.9104l2.6298 1.6443c1.1511-0.66459 2.2657-1.3923 2.4112-1.6443l-5.041-2.9104z" fill="#4b7cbc"/>
+  <path d="m6.35 6.35-2.5208 1.4552 2.5208 4.3656c0.29104 0 1.4787-0.60148 2.6298-1.2661l-2.6298-4.5548z" fill="#6f488c"/>
+  <path d="m3.8292 4.8948-2.5203 4.3656c0.29104 0.5041 4.459 2.9104 5.041 2.9104v-5.8208l-2.5208-1.4552z" fill="#4d3f33"/>
+  <path d="m1.309 3.4396c-0.29104 0.5041-0.29104 5.3167 0 5.8208l5.041-2.9104v-2.9104h-5.041z" fill="#7a573b"/>
+  <path d="m6.35 0.52917c-0.58208-2e-8 -4.75 2.4063-5.041 2.9104l5.041 2.9104v-5.8208z" fill="#99cd61"/>
  </g>
- <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
+ <g transform="matrix(.88 0 0 .88 -10.906 -1.2421)">
+  <g transform="translate(13.26 2.2776)">
+   <path transform="matrix(.96975 0 0 .96975 .1921 .1921)" d="m6.3498 2.9393c-0.34105 0-2.7827 1.4099-2.9532 1.7052l2.9532 5.1157 2.9538-5.1157c-0.17052-0.29535-2.6127-1.7052-2.9538-1.7052z" fill="#fff" stroke-width=".26458"/>
+  </g>
+  <path d="m16.746 6.9737 2.8639 4.9609c0.33073 0 2.6991-1.3672 2.8644-1.6536 0.16536-0.28642 0.16536-3.0209 0-3.3073l-2.8644 1.6536z" fill="#dfdfdf" stroke-width=".26458"/>
+ </g>
+ <path d="m3.8299 4.8948c-0.14551 0.25205-0.14553 2.6584 0 2.9104 0.14553 0.25204 2.2292 1.4552 2.5203 1.4552v-2.9104z" fill="#d6d2d2" stroke-width=".26458"/>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:title>Prism Launcher Logo</dc:title>
+    <dc:date>19/10/2022</dc:date>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:creator>
+    <dc:contributor>
+     <cc:Agent>
+      <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+     </cc:Agent>
+    </dc:contributor>
+    <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+    <dc:rights>
+     <cc:Agent>
+      <dc:title>CC BY-SA 4.0</dc:title>
+     </cc:Agent>
+    </dc:rights>
+    <dc:publisher>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:publisher>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
 </svg>
diff --git a/launcher/resources/pe_light/scalable/launcher.svg b/launcher/resources/pe_light/scalable/launcher.svg
index a9dfe87a..69dd84b1 100644
--- a/launcher/resources/pe_light/scalable/launcher.svg
+++ b/launcher/resources/pe_light/scalable/launcher.svg
@@ -1,21 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#dedede" offset="0"/>
-   <stop stop-color="#d2d2d2" offset=".5"/>
-   <stop stop-color="#c0c0c0" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#8f8f8f"/>
-  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#c2c2c2"/>
-  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#7c7c7c"/>
-  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#d3d3d3"/>
-  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#bcbcbc"/>
-  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#dedede"/>
-  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <title>Prism Launcher Logo</title>
+ <g stroke-width=".26458">
+  <path d="m6.35 6.35" fill="#99cd61"/>
+  <path d="m6.35 0.52917-2.5208 4.3656 2.5208 1.4552 2.5203-1.4552 0.10955-3.0996c-1.1511-0.66459-2.3388-1.2661-2.6298-1.2661z" fill="#df6277"/>
+  <path d="m8.9798 1.7952-2.6298 4.5548 2.5203 1.4552 2.5208-4.3656c-0.14552-0.25205-1.2601-0.97975-2.4112-1.6443z" fill="#fb9168"/>
+  <path d="m11.391 3.4396-5.041 2.9104 2.5203 1.4552 2.7389-1.4552c0-1.3292-0.072554-2.6584-0.21808-2.9104z" fill="#f3db6c"/>
+  <path d="m6.35 6.35v2.9104h5.041c0.14552-0.25205 0.21807-1.5812 0.21808-2.9104h-5.2591z" fill="#7ab392"/>
+  <path d="m6.35 6.35v2.9104l2.6298 1.6443c1.1511-0.66459 2.2657-1.3923 2.4112-1.6443l-5.041-2.9104z" fill="#4b7cbc"/>
+  <path d="m6.35 6.35-2.5208 1.4552 2.5208 4.3656c0.29104 0 1.4787-0.60148 2.6298-1.2661l-2.6298-4.5548z" fill="#6f488c"/>
+  <path d="m3.8292 4.8948-2.5203 4.3656c0.29104 0.5041 4.459 2.9104 5.041 2.9104v-5.8208l-2.5208-1.4552z" fill="#4d3f33"/>
+  <path d="m1.309 3.4396c-0.29104 0.5041-0.29104 5.3167 0 5.8208l5.041-2.9104v-2.9104h-5.041z" fill="#7a573b"/>
+  <path d="m6.35 0.52917c-0.58208-2e-8 -4.75 2.4063-5.041 2.9104l5.041 2.9104v-5.8208z" fill="#99cd61"/>
  </g>
- <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
+ <g transform="matrix(.88 0 0 .88 -10.906 -1.2421)">
+  <g transform="translate(13.26 2.2776)">
+   <path transform="matrix(.96975 0 0 .96975 .1921 .1921)" d="m6.3498 2.9393c-0.34105 0-2.7827 1.4099-2.9532 1.7052l2.9532 5.1157 2.9538-5.1157c-0.17052-0.29535-2.6127-1.7052-2.9538-1.7052z" fill="#fff" stroke-width=".26458"/>
+  </g>
+  <path d="m16.746 6.9737 2.8639 4.9609c0.33073 0 2.6991-1.3672 2.8644-1.6536 0.16536-0.28642 0.16536-3.0209 0-3.3073l-2.8644 1.6536z" fill="#dfdfdf" stroke-width=".26458"/>
+ </g>
+ <path d="m3.8299 4.8948c-0.14551 0.25205-0.14553 2.6584 0 2.9104 0.14553 0.25204 2.2292 1.4552 2.5203 1.4552v-2.9104z" fill="#d6d2d2" stroke-width=".26458"/>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:title>Prism Launcher Logo</dc:title>
+    <dc:date>19/10/2022</dc:date>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:creator>
+    <dc:contributor>
+     <cc:Agent>
+      <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+     </cc:Agent>
+    </dc:contributor>
+    <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+    <dc:rights>
+     <cc:Agent>
+      <dc:title>CC BY-SA 4.0</dc:title>
+     </cc:Agent>
+    </dc:rights>
+    <dc:publisher>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:publisher>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
 </svg>
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index 460d25b9..2970d47d 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -81,9 +81,9 @@ QString getCreditsHtml()
 
     //: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Contributors"
     stream << "<h3>" << QObject::tr("%1 Contributors", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n";
-    stream << QString("<p>DioEgizio %1</p>\n")                      .arg(getGitHub("DioEgizio"));
-    stream << QString("<p>flowln %1</p>\n")                      .arg(getGitHub("flowln"));
-    stream << QString("<p>swirl %1</p>\n")                      .arg(getWebsite("https://swurl.xyz/"));
+    stream << QString("<p>DioEgizio %1</p>\n")      .arg(getGitHub("DioEgizio"));
+    stream << QString("<p>flowln %1</p>\n")         .arg(getGitHub("flowln"));
+    stream << QString("<p>swirl %1</p>\n")          .arg(getWebsite("https://swurl.xyz/"));
     stream << "<br />\n";
 
     // TODO: possibly retrieve from git history at build time?
@@ -97,12 +97,20 @@ QString getCreditsHtml()
     stream << "<br />\n";
 
     stream << "<h3>" << QObject::tr("With thanks to", "About Credits") << "</h3>\n";
+    stream << QString("<p>Boba %1</p>\n")           .arg(getWebsite("https://cmdplusv.neocities.org/"));
+    stream << QString("<p>Davi Rafael %1</p>\n")    .arg(getWebsite("https://auti.one/"));
+    stream << QString("<p>Fulmine %1</p>\n")        .arg(getWebsite("https://www.fulmine.xyz/"));
+    stream << QString("<p>ely %1</p>\n")            .arg(getGitHub("elyrodso"));
+    stream << QString("<p>gon sawa %1</p>\n")       .arg(getGitHub("gonsawa"));
+    stream << QString("<p>Pankakes</p>\n");
+    stream << QString("<p>tobimori %1</p>\n")       .arg(getGitHub("tobimori"));
     stream << "<p>Orochimarufan &lt;<a href='mailto:orochimarufan.x3@gmail.com'>orochimarufan.x3@gmail.com</a>&gt;</p>\n";
     stream << "<p>TakSuyu &lt;<a href='mailto:taksuyu@gmail.com'>taksuyu@gmail.com</a>&gt;</p>\n";
     stream << "<p>Kilobyte &lt;<a href='mailto:stiepen22@gmx.de'>stiepen22@gmx.de</a>&gt;</p>\n";
     stream << "<p>Rootbear75 &lt;<a href='https://twitter.com/rootbear75'>@rootbear75</a>&gt;</p>\n";
     stream << "<p>Zeker Zhayard &lt;<a href='https://twitter.com/zeker_zhayard'>@Zeker_Zhayard</a>&gt;</p>\n";
-    stream << "<p>Everyone else who <a href='https://github.com/PrismLauncher/PrismLauncher/graphs/contributors'>contributed</a>!</p>\n";
+    stream << "<p>Everyone who helped establish our branding!</p>\n";
+    stream << "<p>And everyone else who <a href='https://github.com/PrismLauncher/PrismLauncher/graphs/contributors'>contributed</a>!</p>\n";
     stream << "<br />\n";
 
     stream << "</center>\n";
diff --git a/program_info/org.prismlauncher.PrismLauncher.Social.svg b/program_info/org.prismlauncher.PrismLauncher.Social.svg
new file mode 100644
index 00000000..4a4da230
--- /dev/null
+++ b/program_info/org.prismlauncher.PrismLauncher.Social.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <title>Prism Launcher Logo</title>
+ <rect x="9.5367e-8" y="9.5367e-8" width="12.7" height="12.7" fill="#14191e" stroke-width=".26458"/>
+ <g transform="matrix(.90909 0 0 .90909 .57737 .57727)">
+  <g stroke-width=".26458">
+   <path d="m6.35 6.35" fill="#99cd61"/>
+   <path d="m6.35 0.52917-2.5208 4.3656 2.5208 1.4552 2.5203-1.4552 0.10955-3.0996c-1.1511-0.66459-2.3388-1.2661-2.6298-1.2661z" fill="#df6277"/>
+   <path d="m8.9798 1.7952-2.6298 4.5548 2.5203 1.4552 2.5208-4.3656c-0.14552-0.25205-1.2601-0.97975-2.4112-1.6443z" fill="#fb9168"/>
+   <path d="m11.391 3.4396-5.041 2.9104 2.5203 1.4552 2.7389-1.4552c0-1.3292-0.07255-2.6584-0.21808-2.9104z" fill="#f3db6c"/>
+   <path d="m6.35 6.35v2.9104h5.041c0.14552-0.25205 0.21807-1.5812 0.21808-2.9104z" fill="#7ab392"/>
+   <path d="m6.35 6.35v2.9104l2.6298 1.6443c1.1511-0.66459 2.2657-1.3923 2.4112-1.6443z" fill="#4b7cbc"/>
+   <path d="m6.35 6.35-2.5208 1.4552 2.5208 4.3656c0.29104 0 1.4787-0.60148 2.6298-1.2661z" fill="#6f488c"/>
+   <path d="m3.8292 4.8948-2.5203 4.3656c0.29104 0.5041 4.459 2.9104 5.041 2.9104v-5.8208z" fill="#4d3f33"/>
+   <path d="m1.309 3.4396c-0.29104 0.5041-0.29104 5.3167 0 5.8208l5.041-2.9104v-2.9104z" fill="#7a573b"/>
+   <path d="m6.35 0.52917c-0.58208-2e-8 -4.75 2.4063-5.041 2.9104l5.041 2.9104z" fill="#99cd61"/>
+  </g>
+  <g transform="matrix(.88 0 0 .88 -10.906 -1.2421)">
+   <g transform="translate(13.26 2.2776)">
+    <path transform="matrix(.96975 0 0 .96975 .1921 .1921)" d="m6.3498 2.9393c-0.34105 0-2.7827 1.4099-2.9532 1.7052l2.9532 5.1157 2.9538-5.1157c-0.17052-0.29535-2.6127-1.7052-2.9538-1.7052z" fill="#fff" stroke-width=".26458"/>
+   </g>
+   <path d="m16.746 6.9737 2.8639 4.9609c0.33073 0 2.6991-1.3672 2.8644-1.6536 0.16536-0.28642 0.16536-3.0209 0-3.3073l-2.8644 1.6536z" fill="#dfdfdf" stroke-width=".26458"/>
+  </g>
+  <path d="m3.8299 4.8948c-0.14551 0.25205-0.14553 2.6584 0 2.9104 0.14553 0.25204 2.2292 1.4552 2.5203 1.4552v-2.9104z" fill="#d6d2d2" stroke-width=".26458"/>
+ </g>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:title>Prism Launcher Logo</dc:title>
+    <dc:date>19/10/2022</dc:date>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:creator>
+    <dc:contributor>
+     <cc:Agent>
+      <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+     </cc:Agent>
+    </dc:contributor>
+    <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+    <dc:publisher>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:publisher>
+    <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"/>
+   </cc:Work>
+   <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>
+    <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/>
+   </cc:License>
+  </rdf:RDF>
+ </metadata>
+</svg>
diff --git a/program_info/org.prismlauncher.PrismLauncher.Source.svg b/program_info/org.prismlauncher.PrismLauncher.Source.svg
index 0614cde2..ee5dc724 100644
--- a/program_info/org.prismlauncher.PrismLauncher.Source.svg
+++ b/program_info/org.prismlauncher.PrismLauncher.Source.svg
@@ -2,260 +2,202 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   inkscape:export-ydpi="1620.0001"
-   inkscape:export-xdpi="1620.0001"
-   inkscape:export-filename="/home/z/Pictures/Polymchd.png"
-   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   sodipodi:docname="org.polymc.PolyMC.Source.svg"
-   id="svg5"
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
    version="1.1"
-   viewBox="0 0 16.933333 16.933333"
-   height="64"
-   width="64"
+   id="svg3606"
+   sodipodi:docname="org.prismlauncher.PrismLauncher.Source.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <title
+     id="title261">Prism Launcher Logo</title>
   <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#505050"
-     bordercolor="#eeeeee"
-     borderopacity="1"
-     inkscape:pageshadow="0"
-     inkscape:pageopacity="0"
+     id="namedview3608"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
-     inkscape:document-units="mm"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="px"
      showgrid="false"
-     width="64mm"
-     inkscape:object-nodes="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-paths="false"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-midpoints="true"
-     units="px"
      showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="7.2348066"
-     inkscape:cx="26.331042"
-     inkscape:cy="25.84727"
-     inkscape:window-width="1920"
-     inkscape:window-height="1011"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:zoom="16"
+     inkscape:cx="14.9375"
+     inkscape:cy="13.9375"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="2552"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     inkscape:snap-center="false"
-     inkscape:snap-page="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-text-baseline="true"
-     fit-margin-left="4"
-     fit-margin-right="4">
-    <inkscape:grid
-       type="xygrid"
-       id="grid56" />
+     inkscape:current-layer="layer1">
     <sodipodi:guide
-       position="3.5610222,0.91765532"
+       position="0.52916688,12.170833"
        orientation="1,0"
-       id="guide1024" />
+       id="guide4870"
+       inkscape:locked="false" />
     <sodipodi:guide
-       position="13.37231,0.91765532"
-       orientation="1,0"
-       id="guide1028" />
+       position="12.170833,12.170833"
+       orientation="0,-1"
+       id="guide4872"
+       inkscape:locked="false" />
     <sodipodi:guide
-       position="8.4666659,3.9526473"
+       position="12.170833,0.5291669"
        orientation="1,0"
-       id="guide1471" />
-    <sodipodi:guide
-       position="0.52916673,10.248746"
-       orientation="-0.58778528,0.80901698"
-       id="guide1629" />
-    <sodipodi:guide
-       position="8.4666659,16.015677"
-       orientation="0.58778537,0.80901691"
-       id="guide1892" />
+       id="guide4874"
+       inkscape:locked="false" />
     <sodipodi:guide
-       position="8.4666659,4.4818143"
-       orientation="0.58778537,0.80901691"
-       id="guide2184"
-       inkscape:label=""
-       inkscape:locked="false"
-       inkscape:color="rgb(0,0,255)" />
-    <sodipodi:guide
-       position="8.4666659,4.4818143"
-       orientation="-0.58778528,0.80901698"
-       id="guide2186"
-       inkscape:label=""
-       inkscape:locked="false"
-       inkscape:color="rgb(0,0,255)" />
-    <sodipodi:guide
-       position="0.52916788,10.248746"
+       position="0.52916688,0.5291666"
        orientation="0,-1"
-       id="guide2188" />
+       id="guide4876"
+       inkscape:locked="false" />
     <sodipodi:guide
-       position="8.8308337,4.2172313"
-       orientation="-0.58778528,0.80901698"
-       id="guide2190"
-       inkscape:label=""
-       inkscape:locked="false"
-       inkscape:color="rgb(0,0,255)" />
+       position="13.692187,21.332031"
+       orientation="0,-1"
+       id="guide6489"
+       inkscape:locked="false" />
     <sodipodi:guide
-       position="8.4666655,3.9526476"
-       orientation="0.58778537,0.80901691"
-       id="guide2192"
-       inkscape:label=""
-       inkscape:locked="false"
-       inkscape:color="rgb(0,0,255)" />
+       position="6.3500002,12.170833"
+       orientation="1,0"
+       id="guide6491"
+       inkscape:locked="false" />
     <sodipodi:guide
-       position="9.7726935,4.3858037"
-       orientation="-0.58778528,0.80901698"
-       id="guide2194"
-       inkscape:label=""
-       inkscape:locked="false"
-       inkscape:color="rgb(0,0,255)" />
+       position="6.3500002,6.3499993"
+       orientation="-0.49999657,-0.86602738"
+       id="guide9375"
+       inkscape:locked="false" />
     <sodipodi:guide
-       position="7.1606718,4.3857603"
-       orientation="0.58778537,0.80901691"
-       id="guide2196"
-       inkscape:label=""
-       inkscape:locked="false"
-       inkscape:color="rgb(0,0,255)" />
+       position="6.3500002,6.3499993"
+       orientation="-0.49999666,0.86602733"
+       id="guide9377"
+       inkscape:locked="false" />
   </sodipodi:namedview>
   <defs
-     id="defs2">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient206240">
-      <stop
-         style="stop-color:#88b858;stop-opacity:1"
-         offset="0"
-         id="stop206236" />
-      <stop
-         style="stop-color:#72b147;stop-opacity:1"
-         offset="0.50000006"
-         id="stop134589" />
-      <stop
-         style="stop-color:#5a9a30;stop-opacity:1"
-         offset="1"
-         id="stop206238" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect28303"
-       satellites_param="F,0,0,1,0,1,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1"
-       is_visible="true"
-       lpeversion="1"
-       unit="px"
-       method="auto"
-       mode="F"
-       radius="0"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" />
-    <inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect28299"
-       satellites_param="F,0,0,1,0,1,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1"
-       is_visible="true"
-       lpeversion="1"
-       unit="px"
-       method="auto"
-       mode="F"
-       radius="0"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" />
-    <inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect28255"
-       satellites_param="F,0,0,1,0,1,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1"
-       is_visible="true"
-       lpeversion="1"
-       unit="px"
-       method="auto"
-       mode="F"
-       radius="0"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" />
-    <inkscape:path-effect
-       effect="fillet_chamfer"
-       id="path-effect10730"
-       satellites_param="F,0,0,1,0,1,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1,0,1"
-       is_visible="true"
-       lpeversion="1"
-       unit="px"
-       method="auto"
-       mode="F"
-       radius="0"
-       chamfer_steps="1"
-       flexible="false"
-       use_knot_distance="true"
-       apply_no_radius="true"
-       apply_with_radius="true"
-       only_selected="false"
-       hide_knots="false" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient206240"
-       id="linearGradient84726"
-       x1="4.4979167"
-       y1="3.8011212"
-       x2="12.435414"
-       y2="9.5680542"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
+     id="defs3603" />
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">
-    <path
-       style="fill:#765338;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 3.5610223,16.015678 c 0,0 0,-3.564159 4.905644,-3.564159 4.9069307,0 4.9056437,3.564159 4.9056437,3.564159 z"
-       id="path90018"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#b7835a;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="M 8.466666,12.451519 3.5610223,16.015678 0.52916674,6.6845872 Z"
-       id="path62382" />
-    <path
-       style="fill:#5b422d;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="m 8.466666,12.451519 7.9375,-5.7669323 -3.031856,9.3310913 z"
-       id="path100033" />
-    <path
-       style="fill:#72b147;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 8.8308339,12.716102 8.4666661,12.980686 8.1024982,12.716102 c 0,-0.264583 0.3641681,-0.264583 0.3641681,-0.264583 0,0 0.3641676,0 0.3641676,0.264583 z"
-       id="path986606"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#5a9a30;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 8.4666663,12.451519 c 0,0 -2e-7,-5.7669302 7.9374987,-5.7669302 L 16.179097,7.3772762 15.260564,8.5737969 14.342031,8.7119827 13.423498,9.9085036 12.504965,10.046689 11.586433,11.24321 10.6679,11.381396 9.7493669,12.577916 8.830834,12.716102 Z"
-       id="path986472"
-       sodipodi:nodetypes="cccccccccccc" />
-    <path
-       style="fill:#88b858;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 8.1024983,12.716102 7.1839654,12.577916 6.2654325,11.381396 5.3468996,11.24321 4.4283667,10.046689 3.5098338,9.9085034 2.5913009,8.7119828 1.6727681,8.5737971 0.75423516,7.3772764 0.52916674,6.6845872 c 7.93749966,10e-8 7.93749956,5.7669318 7.93749956,5.7669318 z"
-       id="path986404"
-       sodipodi:nodetypes="cccccccccccc" />
-    <path
-       style="fill:url(#linearGradient84726);stroke:none;stroke-width:0.26458333;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 0.52916674,6.6845872 8.4666663,12.451519 16.404166,6.6845867 8.4666666,0.91765555 Z"
-       id="path5260" />
-    <path
-       style="fill:#000000;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0"
-       d="M 0.75423516,7.3772764 0.529167,6.684588 8.466666,12.451519 16.404165,6.6845883 16.179097,7.3772762 8.466666,12.980686 Z"
-       id="path970771" />
+    <g
+       id="g531"
+       transform="matrix(0.1353646,0,0,0.1353646,15.301582,0.52916663)" />
+    <g
+       id="g397">
+      <path
+         style="fill:#99cd61;fill-opacity:1;stroke-width:0.264583"
+         d="M 6.3500002,6.350001 Z"
+         id="path7899" />
+      <path
+         id="path3228"
+         style="fill:#df6277;fill-opacity:1;stroke-width:0.264583"
+         d="M 6.35 0.52916667 L 3.8292236 4.8947917 L 6.35 6.35 L 8.8702596 4.8947917 L 8.9798136 1.7952393 C 7.828708 1.1306481 6.6410414 0.52916667 6.35 0.52916667 z " />
+      <path
+         id="path2659"
+         style="fill:#fb9168;fill-opacity:1;stroke-width:0.264583"
+         d="M 8.9798136 1.7952393 L 6.35 6.35 L 8.8702596 7.8052083 L 11.391036 3.4395833 C 11.245515 3.1875341 10.130919 2.4598305 8.9798136 1.7952393 z " />
+      <path
+         id="path2708"
+         style="fill:#f3db6c;fill-opacity:1;stroke-width:0.264583"
+         d="M 11.391036 3.4395833 L 6.35 6.35 L 8.8702596 7.8052083 L 11.609111 6.35 C 11.609111 5.0208177 11.536557 3.6916326 11.391036 3.4395833 z " />
+      <path
+         id="path1737"
+         style="fill:#7ab392;fill-opacity:1;stroke-width:0.264583"
+         d="M 6.35 6.35 L 6.35 9.2604167 L 11.391036 9.2604167 C 11.536557 9.0083674 11.60911 7.6791823 11.609111 6.35 L 6.35 6.35 z " />
+      <path
+         id="path2937"
+         style="fill:#4b7cbc;fill-opacity:1;stroke-width:0.264583"
+         d="M 6.35 6.35 L 6.35 9.2604167 L 8.9798136 10.904761 C 10.130919 10.24017 11.245515 9.5124659 11.391036 9.2604167 L 6.35 6.35 z " />
+      <path
+         id="path3117"
+         style="fill:#6f488c;fill-opacity:1;stroke-width:0.264583"
+         d="M 6.35 6.35 L 3.8292236 7.8052083 L 6.35 12.170833 C 6.6410414 12.170833 7.8287079 11.569352 8.9798136 10.904761 L 6.35 6.35 z " />
+      <path
+         id="path2010"
+         style="fill:#4d3f33;fill-opacity:1;stroke-width:0.264583"
+         d="M 3.8292236 4.8947917 L 1.308964 9.2604167 C 1.6000054 9.7645152 5.7679172 12.170833 6.35 12.170833 L 6.35 6.35 L 3.8292236 4.8947917 z " />
+      <path
+         id="path1744"
+         style="fill:#7a573b;fill-opacity:1;stroke-width:0.264583"
+         d="M 1.308964 3.4395833 C 1.0179226 3.9436818 1.0179227 8.7563182 1.308964 9.2604167 L 6.35 6.35 L 6.35 3.4395833 L 1.308964 3.4395833 z " />
+      <path
+         id="path1739"
+         style="fill:#99cd61;fill-opacity:1;stroke-width:0.264583"
+         d="M 6.35 0.52916667 C 5.7679172 0.52916665 1.6000054 2.9354849 1.308964 3.4395833 L 6.35 6.35 L 6.35 0.52916667 z " />
+      <g
+         id="g379">
+        <g
+           id="g1657"
+           transform="matrix(0.87999988,0,0,0.87999988,-10.906495,-1.242093)">
+          <g
+             id="g7651"
+             transform="translate(13.259961,2.2775894)">
+            <path
+               id="path6659"
+               style="fill:#ffffff;stroke-width:0.264583"
+               d="m 6.3498163,2.9393223 c -0.3410461,0 -2.782726,1.4098777 -2.9532491,1.7052323 L 6.3498163,9.7602513 9.3035983,4.6445546 C 9.1330753,4.3492 6.6908624,2.9393223 6.3498163,2.9393223 Z"
+               transform="matrix(0.96974817,0,0,0.96974817,0.19209885,0.19209792)" />
+          </g>
+          <path
+             id="path461"
+             style="fill:#dfdfdf;fill-opacity:1;stroke-width:0.264583"
+             d="m 16.745875,6.9737355 2.863908,4.9609385 c 0.330729,0 2.69906,-1.367226 2.864424,-1.653646 0.165365,-0.2864204 0.165365,-3.0208729 0,-3.3072925 l -2.864424,1.6536459 z" />
+        </g>
+        <path
+           id="path5065"
+           style="fill:#d6d2d2;fill-opacity:1;stroke-width:0.264583"
+           d="m 3.8298625,4.8947933 c -0.1455111,0.2520549 -0.1455304,2.6583729 0,2.9104166 0.1455304,0.2520438 2.2292181,1.4552195 2.5202596,1.4552084 V 6.3500016 Z" />
+      </g>
+    </g>
   </g>
+  <metadata
+     id="metadata259">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Prism Launcher Logo</dc:title>
+        <dc:date>19/10/2022</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Prism Launcher</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>Prism Launcher</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
 </svg>
diff --git a/program_info/org.prismlauncher.PrismLauncher.bigsur.svg b/program_info/org.prismlauncher.PrismLauncher.bigsur.svg
index e9582f5d..524cf11a 100644
--- a/program_info/org.prismlauncher.PrismLauncher.bigsur.svg
+++ b/program_info/org.prismlauncher.PrismLauncher.bigsur.svg
@@ -1,174 +1,272 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-  width="1024"
-  height="1024"
-  viewBox="0 0 1024 1024"
-  fill="none"
-  xmlns="http://www.w3.org/2000/svg"
->
-  <g filter="url(#filter0_d_102_69)">
+   width="1024"
+   height="1024"
+   viewBox="0 0 1024 1024"
+   fill="none"
+   version="1.1"
+   id="svg76"
+   sodipodi:docname="org.prismlauncher.PrismLauncher.bigsur.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview78"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="0.33974271"
+     inkscape:cx="1215.6258"
+     inkscape:cy="532.75609"
+     inkscape:window-width="1920"
+     inkscape:window-height="1026"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg76" />
+  <g
+     filter="url(#filter0_d_102_69)"
+     id="g4">
     <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M924 354.627C924 344.845 924.004 335.062 923.944 325.279C923.895 317.038 923.8 308.799 923.576 300.562C923.092 282.609 922.033 264.502 918.84 246.749C915.602 228.741 910.314 211.98 901.981 195.617C893.789 179.534 883.088 164.817 870.32 152.058C857.555 139.299 842.834 128.605 826.746 120.418C810.366 112.083 793.587 106.797 775.558 103.56C757.803 100.372 739.691 99.315 721.738 98.83C713.495 98.607 705.253 98.513 697.008 98.462C687.22 98.402 677.432 98.407 667.644 98.407L553.997 98H468.997L357.361 98.407C347.554 98.407 337.747 98.402 327.94 98.462C319.678 98.513 311.42 98.607 303.161 98.83C285.167 99.315 267.014 100.373 249.217 103.565C231.164 106.801 214.36 112.085 197.958 120.414C181.835 128.602 167.083 139.297 154.291 152.058C141.501 164.816 130.78 179.53 122.573 195.61C114.217 211.981 108.919 228.752 105.673 246.77C102.477 264.516 101.418 282.617 100.931 300.562C100.709 308.8 100.613 317.039 100.563 325.279C100.503 335.063 100 347.216 100 356.999L100.003 467.089L100 552.998L100.508 665.427C100.508 675.223 100.504 685.019 100.563 694.815C100.613 703.067 100.709 711.317 100.932 719.566C101.418 737.542 102.479 755.675 105.678 773.452C108.923 791.484 114.22 808.269 122.569 824.653C130.777 840.759 141.5 855.495 154.291 868.272C167.082 881.049 181.83 891.757 197.95 899.956C214.362 908.302 231.174 913.595 249.238 916.836C267.027 920.029 285.174 921.088 303.161 921.573C311.42 921.796 319.679 921.891 327.941 921.941C337.748 922.001 347.554 921.997 357.361 921.997L470.006 922H555.217L667.644 921.996C677.432 921.996 687.22 922.001 697.008 921.941C705.253 921.891 713.495 921.796 721.738 921.573C739.698 921.087 757.816 920.027 775.579 916.832C793.597 913.591 810.368 908.3 826.739 899.959C842.831 891.761 857.554 881.051 870.32 868.272C883.086 855.497 893.786 840.763 901.978 824.66C910.316 808.268 915.604 791.475 918.844 773.431C922.034 755.661 923.092 737.535 923.577 719.566C923.8 711.316 923.895 703.066 923.944 694.815C924.005 685.019 924 675.223 924 665.427C924 665.427 923.994 554.983 923.994 552.998V466.999C923.994 465.533 924 354.627 924 354.627Z"
-      fill="url(#paint0_linear_102_69)"
-    />
+       fill-rule="evenodd"
+       clip-rule="evenodd"
+       d="M924 354.627C924 344.845 924.004 335.062 923.944 325.279C923.895 317.038 923.8 308.799 923.576 300.562C923.092 282.609 922.033 264.502 918.84 246.749C915.602 228.741 910.314 211.98 901.981 195.617C893.789 179.534 883.088 164.817 870.32 152.058C857.555 139.299 842.834 128.605 826.746 120.418C810.366 112.083 793.587 106.797 775.558 103.56C757.803 100.372 739.691 99.315 721.738 98.83C713.495 98.607 705.253 98.513 697.008 98.462C687.22 98.402 677.432 98.407 667.644 98.407L553.997 98H468.997L357.361 98.407C347.554 98.407 337.747 98.402 327.94 98.462C319.678 98.513 311.42 98.607 303.161 98.83C285.167 99.315 267.014 100.373 249.217 103.565C231.164 106.801 214.36 112.085 197.958 120.414C181.835 128.602 167.083 139.297 154.291 152.058C141.501 164.816 130.78 179.53 122.573 195.61C114.217 211.981 108.919 228.752 105.673 246.77C102.477 264.516 101.418 282.617 100.931 300.562C100.709 308.8 100.613 317.039 100.563 325.279C100.503 335.063 100 347.216 100 356.999L100.003 467.089L100 552.998L100.508 665.427C100.508 675.223 100.504 685.019 100.563 694.815C100.613 703.067 100.709 711.317 100.932 719.566C101.418 737.542 102.479 755.675 105.678 773.452C108.923 791.484 114.22 808.269 122.569 824.653C130.777 840.759 141.5 855.495 154.291 868.272C167.082 881.049 181.83 891.757 197.95 899.956C214.362 908.302 231.174 913.595 249.238 916.836C267.027 920.029 285.174 921.088 303.161 921.573C311.42 921.796 319.679 921.891 327.941 921.941C337.748 922.001 347.554 921.997 357.361 921.997L470.006 922H555.217L667.644 921.996C677.432 921.996 687.22 922.001 697.008 921.941C705.253 921.891 713.495 921.796 721.738 921.573C739.698 921.087 757.816 920.027 775.579 916.832C793.597 913.591 810.368 908.3 826.739 899.959C842.831 891.761 857.554 881.051 870.32 868.272C883.086 855.497 893.786 840.763 901.978 824.66C910.316 808.268 915.604 791.475 918.844 773.431C922.034 755.661 923.092 737.535 923.577 719.566C923.8 711.316 923.895 703.066 923.944 694.815C924.005 685.019 924 675.223 924 665.427C924 665.427 923.994 554.983 923.994 552.998V466.999C923.994 465.533 924 354.627 924 354.627Z"
+       fill="url(#paint0_linear_102_69)"
+       id="path2" />
   </g>
   <mask
-    id="mask0_102_69"
-    style="mask-type: alpha"
-    maskUnits="userSpaceOnUse"
-    x="100"
-    y="98"
-    width="824"
-    height="824"
-  >
+     id="mask0_102_69"
+     style="mask-type: alpha"
+     maskUnits="userSpaceOnUse"
+     x="100"
+     y="98"
+     width="824"
+     height="824">
     <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M924 354.627C924 344.845 924.004 335.062 923.944 325.279C923.895 317.038 923.8 308.799 923.576 300.562C923.092 282.609 922.033 264.502 918.84 246.749C915.602 228.741 910.314 211.98 901.981 195.617C893.789 179.534 883.088 164.817 870.32 152.058C857.555 139.299 842.834 128.605 826.746 120.418C810.366 112.083 793.587 106.797 775.558 103.56C757.803 100.372 739.691 99.315 721.738 98.83C713.495 98.607 705.253 98.513 697.008 98.462C687.22 98.402 677.432 98.407 667.644 98.407L553.997 98H468.997L357.361 98.407C347.554 98.407 337.747 98.402 327.94 98.462C319.678 98.513 311.42 98.607 303.161 98.83C285.167 99.315 267.014 100.373 249.217 103.565C231.164 106.801 214.36 112.085 197.958 120.414C181.835 128.602 167.083 139.297 154.291 152.058C141.501 164.816 130.78 179.53 122.573 195.61C114.217 211.981 108.919 228.752 105.673 246.77C102.477 264.516 101.418 282.617 100.931 300.562C100.709 308.8 100.613 317.039 100.563 325.279C100.503 335.063 100 347.216 100 356.999L100.003 467.089L100 552.998L100.508 665.427C100.508 675.223 100.504 685.019 100.563 694.815C100.613 703.067 100.709 711.317 100.932 719.566C101.418 737.542 102.479 755.675 105.678 773.452C108.923 791.484 114.22 808.269 122.569 824.653C130.777 840.759 141.5 855.495 154.291 868.272C167.082 881.049 181.83 891.757 197.95 899.956C214.362 908.302 231.174 913.595 249.238 916.836C267.027 920.029 285.174 921.088 303.161 921.573C311.42 921.796 319.679 921.891 327.941 921.941C337.748 922.001 347.554 921.997 357.361 921.997L470.006 922H555.217L667.644 921.996C677.432 921.996 687.22 922.001 697.008 921.941C705.253 921.891 713.495 921.796 721.738 921.573C739.698 921.087 757.816 920.027 775.579 916.832C793.597 913.591 810.368 908.3 826.739 899.959C842.831 891.761 857.554 881.051 870.32 868.272C883.086 855.497 893.786 840.763 901.978 824.66C910.316 808.268 915.604 791.475 918.844 773.431C922.034 755.661 923.092 737.535 923.577 719.566C923.8 711.316 923.895 703.066 923.944 694.815C924.005 685.019 924 675.223 924 665.427C924 665.427 923.994 554.983 923.994 552.998V466.999C923.994 465.533 924 354.627 924 354.627Z"
-      fill="white"
-    />
+       fill-rule="evenodd"
+       clip-rule="evenodd"
+       d="M924 354.627C924 344.845 924.004 335.062 923.944 325.279C923.895 317.038 923.8 308.799 923.576 300.562C923.092 282.609 922.033 264.502 918.84 246.749C915.602 228.741 910.314 211.98 901.981 195.617C893.789 179.534 883.088 164.817 870.32 152.058C857.555 139.299 842.834 128.605 826.746 120.418C810.366 112.083 793.587 106.797 775.558 103.56C757.803 100.372 739.691 99.315 721.738 98.83C713.495 98.607 705.253 98.513 697.008 98.462C687.22 98.402 677.432 98.407 667.644 98.407L553.997 98H468.997L357.361 98.407C347.554 98.407 337.747 98.402 327.94 98.462C319.678 98.513 311.42 98.607 303.161 98.83C285.167 99.315 267.014 100.373 249.217 103.565C231.164 106.801 214.36 112.085 197.958 120.414C181.835 128.602 167.083 139.297 154.291 152.058C141.501 164.816 130.78 179.53 122.573 195.61C114.217 211.981 108.919 228.752 105.673 246.77C102.477 264.516 101.418 282.617 100.931 300.562C100.709 308.8 100.613 317.039 100.563 325.279C100.503 335.063 100 347.216 100 356.999L100.003 467.089L100 552.998L100.508 665.427C100.508 675.223 100.504 685.019 100.563 694.815C100.613 703.067 100.709 711.317 100.932 719.566C101.418 737.542 102.479 755.675 105.678 773.452C108.923 791.484 114.22 808.269 122.569 824.653C130.777 840.759 141.5 855.495 154.291 868.272C167.082 881.049 181.83 891.757 197.95 899.956C214.362 908.302 231.174 913.595 249.238 916.836C267.027 920.029 285.174 921.088 303.161 921.573C311.42 921.796 319.679 921.891 327.941 921.941C337.748 922.001 347.554 921.997 357.361 921.997L470.006 922H555.217L667.644 921.996C677.432 921.996 687.22 922.001 697.008 921.941C705.253 921.891 713.495 921.796 721.738 921.573C739.698 921.087 757.816 920.027 775.579 916.832C793.597 913.591 810.368 908.3 826.739 899.959C842.831 891.761 857.554 881.051 870.32 868.272C883.086 855.497 893.786 840.763 901.978 824.66C910.316 808.268 915.604 791.475 918.844 773.431C922.034 755.661 923.092 737.535 923.577 719.566C923.8 711.316 923.895 703.066 923.944 694.815C924.005 685.019 924 675.223 924 665.427C924 665.427 923.994 554.983 923.994 552.998V466.999C923.994 465.533 924 354.627 924 354.627Z"
+       fill="white"
+       id="path6" />
   </mask>
-  <g mask="url(#mask0_102_69)">
+  <g
+     mask="url(#mask0_102_69)"
+     id="g15">
     <rect
-      x="42"
-      y="36"
-      width="914"
-      height="914"
-      fill="url(#paint1_linear_102_69)"
-    />
-    <g filter="url(#filter1_b_102_69)">
+       x="42"
+       y="36"
+       width="914"
+       height="914"
+       fill="url(#paint1_linear_102_69)"
+       id="rect9" />
+    <g
+       filter="url(#filter1_b_102_69)"
+       id="g13">
       <rect
-        x="100"
-        y="98"
-        width="824"
-        height="824"
-        rx="126"
-        fill="black"
-        fill-opacity="0.01"
-      />
+         x="100"
+         y="98"
+         width="824"
+         height="824"
+         rx="126"
+         fill="black"
+         fill-opacity="0.01"
+         id="rect11" />
     </g>
   </g>
-  <path
-    d="M367.15 732.923C367.15 732.923 367.15 627.678 512.003 627.678C656.895 627.678 656.856 732.923 656.856 732.923H367.15Z"
-    fill="#765338"
-  />
-  <path
-    d="M512.006 627.684L367.153 732.929L277.626 457.399L512.006 627.684Z"
-    fill="#B7835A"
-  />
-  <path
-    d="M512.006 627.684L746.385 457.399L656.859 732.929L512.006 627.684Z"
-    fill="#5B422D"
-  />
-  <path
-    d="M522.757 635.48L512.004 643.292L501.25 635.48C501.25 627.667 512.004 627.667 512.004 627.667C512.004 627.667 522.757 627.667 522.757 635.48Z"
-    fill="#72B147"
-  />
-  <path
-    d="M512.006 627.684C512.006 627.684 512.006 457.399 746.385 457.399L739.74 477.852L712.617 513.183L685.495 517.263L658.372 552.594L631.25 556.674L604.127 592.005L577.005 596.085L549.882 631.416L522.76 635.496L512.006 627.684Z"
-    fill="#5A9A30"
-  />
-  <path
-    d="M501.252 635.48L474.129 631.399L447.007 596.069L419.884 591.988L392.762 556.658L365.639 552.578L338.517 517.247L311.394 513.167L284.272 477.836L277.626 457.382C512.006 457.382 512.006 627.668 512.006 627.668L501.252 635.48Z"
-    fill="#88B858"
-  />
-  <path
-    d="M277.625 457.384L512.005 627.67L746.385 457.384L512.005 287.098L277.625 457.384Z"
-    fill="url(#paint2_linear_102_69)"
-  />
-  <defs>
+  <defs
+     id="defs74">
     <filter
-      id="filter0_d_102_69"
-      x="90"
-      y="98"
-      width="844"
-      height="844"
-      filterUnits="userSpaceOnUse"
-      color-interpolation-filters="sRGB"
-    >
-      <feFlood flood-opacity="0" result="BackgroundImageFix" />
+       id="filter0_d_102_69"
+       x="90"
+       y="98"
+       width="844"
+       height="844"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood31" />
       <feColorMatrix
-        in="SourceAlpha"
-        type="matrix"
-        values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
-        result="hardAlpha"
-      />
-      <feOffset dy="10" />
-      <feGaussianBlur stdDeviation="5" />
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         result="hardAlpha"
+         id="feColorMatrix33" />
+      <feOffset
+         dy="10"
+         id="feOffset35" />
+      <feGaussianBlur
+         stdDeviation="5"
+         id="feGaussianBlur37" />
       <feColorMatrix
-        type="matrix"
-        values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.3 0"
-      />
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.3 0"
+         id="feColorMatrix39" />
       <feBlend
-        mode="normal"
-        in2="BackgroundImageFix"
-        result="effect1_dropShadow_102_69"
-      />
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow_102_69"
+         id="feBlend41" />
       <feBlend
-        mode="normal"
-        in="SourceGraphic"
-        in2="effect1_dropShadow_102_69"
-        result="shape"
-      />
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_dropShadow_102_69"
+         result="shape"
+         id="feBlend43" />
     </filter>
     <filter
-      id="filter1_b_102_69"
-      x="89.1269"
-      y="87.1269"
-      width="845.746"
-      height="845.746"
-      filterUnits="userSpaceOnUse"
-      color-interpolation-filters="sRGB"
-    >
-      <feFlood flood-opacity="0" result="BackgroundImageFix" />
-      <feGaussianBlur in="BackgroundImage" stdDeviation="5.43656" />
+       id="filter1_b_102_69"
+       x="89.1269"
+       y="87.1269"
+       width="845.746"
+       height="845.746"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood46" />
+      <feGaussianBlur
+         in="BackgroundImage"
+         stdDeviation="5.43656"
+         id="feGaussianBlur48" />
       <feComposite
-        in2="SourceAlpha"
-        operator="in"
-        result="effect1_backgroundBlur_102_69"
-      />
+         in2="SourceAlpha"
+         operator="in"
+         result="effect1_backgroundBlur_102_69"
+         id="feComposite50" />
       <feBlend
-        mode="normal"
-        in="SourceGraphic"
-        in2="effect1_backgroundBlur_102_69"
-        result="shape"
-      />
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_backgroundBlur_102_69"
+         result="shape"
+         id="feBlend52" />
     </filter>
     <linearGradient
-      id="paint0_linear_102_69"
-      x1="-181.14"
-      y1="98"
-      x2="-181.14"
-      y2="1484.28"
-      gradientUnits="userSpaceOnUse"
-    >
-      <stop stop-color="white" />
-      <stop offset="0.489516" stop-color="#EFEFEF" />
-      <stop offset="1" stop-color="#C0C0C0" />
+       id="paint0_linear_102_69"
+       x1="-181.14"
+       y1="98"
+       x2="-181.14"
+       y2="1484.28"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="white"
+         id="stop55" />
+      <stop
+         offset="0.489516"
+         stop-color="#EFEFEF"
+         id="stop57" />
+      <stop
+         offset="1"
+         stop-color="#C0C0C0"
+         id="stop59" />
     </linearGradient>
     <linearGradient
-      id="paint1_linear_102_69"
-      x1="928.377"
-      y1="992.826"
-      x2="928.377"
-      y2="134.072"
-      gradientUnits="userSpaceOnUse"
-    >
-      <stop stop-color="#F6F3F3" />
-      <stop offset="1" stop-color="white" />
+       id="paint1_linear_102_69"
+       x1="928.377"
+       y1="992.826"
+       x2="928.377"
+       y2="134.072"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#F6F3F3"
+         id="stop62" />
+      <stop
+         offset="1"
+         stop-color="white"
+         id="stop64" />
     </linearGradient>
     <linearGradient
-      id="paint2_linear_102_69"
-      x1="394.815"
-      y1="372.239"
-      x2="629.182"
-      y2="542.528"
-      gradientUnits="userSpaceOnUse"
-    >
-      <stop stop-color="#88B858" />
-      <stop offset="0.5" stop-color="#72B147" />
-      <stop offset="1" stop-color="#5A9A30" />
+       id="paint2_linear_102_69"
+       x1="394.815"
+       y1="372.239"
+       x2="629.182"
+       y2="542.528"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#88B858"
+         id="stop67" />
+      <stop
+         offset="0.5"
+         stop-color="#72B147"
+         id="stop69" />
+      <stop
+         offset="1"
+         stop-color="#5A9A30"
+         id="stop71" />
     </linearGradient>
   </defs>
+  <g
+     id="g1817"
+     transform="matrix(0.81938386,0,0,0.81938386,-746.9626,25.220302)">
+    <path
+       style="fill:#99cd61;fill-opacity:1;stroke-width:17.3878"
+       d="M 1536.4629,591.62417 Z"
+       id="path7899" />
+    <path
+       id="path3228"
+       style="fill:#df6277;fill-opacity:1;stroke-width:17.3878"
+       d="m 1536.4629,209.09169 -165.6591,286.89936 165.6591,95.63312 165.6262,-95.63312 7.2003,-203.69576 c -75.6493,-43.67547 -153.6998,-83.2036 -172.8265,-83.2036 z" />
+    <path
+       id="path2659"
+       style="fill:#fb9168;fill-opacity:1;stroke-width:17.3878"
+       d="m 1709.2894,292.29529 -172.8265,299.32888 165.6262,95.63312 165.6591,-286.89936 c -9.5633,-16.56418 -82.8113,-64.38717 -158.4588,-108.06264 z" />
+    <path
+       id="path2708"
+       style="fill:#f3db6c;fill-opacity:1;stroke-width:17.3878"
+       d="m 1867.7482,400.35793 -331.2853,191.26624 165.6262,95.63312 179.9919,-95.63312 c 0,-87.35094 -4.7677,-174.70206 -14.3328,-191.26624 z" />
+    <path
+       id="path1737"
+       style="fill:#7ab392;fill-opacity:1;stroke-width:17.3878"
+       d="m 1536.4629,591.62417 v 191.26624 h 331.2853 c 9.5633,-16.56418 14.3328,-103.9153 14.3328,-191.26624 z" />
+    <path
+       id="path2937"
+       style="fill:#4b7cbc;fill-opacity:1;stroke-width:17.3878"
+       d="m 1536.4629,591.62417 v 191.26624 l 172.8265,108.06281 c 75.6475,-43.67547 148.8955,-91.49863 158.4588,-108.06281 z" />
+    <path
+       id="path3117"
+       style="fill:#6f488c;fill-opacity:1;stroke-width:17.3878"
+       d="m 1536.4629,591.62417 -165.6591,95.63312 165.6591,286.89936 c 19.1267,0 97.1772,-39.52795 172.8265,-83.20343 z" />
+    <path
+       id="path2010"
+       style="fill:#4d3f33;fill-opacity:1;stroke-width:17.3878"
+       d="m 1370.8038,495.99105 -165.6262,286.89936 c 19.1267,33.12818 293.0321,191.26624 331.2853,191.26624 V 591.62417 Z" />
+    <path
+       id="path1744"
+       style="fill:#7a573b;fill-opacity:1;stroke-width:17.3878"
+       d="m 1205.1776,400.35793 c -19.1266,33.12818 -19.1266,349.4043 0,382.53248 L 1536.4629,591.62417 V 400.35793 Z" />
+    <path
+       id="path1739"
+       style="fill:#99cd61;fill-opacity:1;stroke-width:17.3878"
+       d="m 1536.4629,209.09169 c -38.2532,0 -312.1586,158.13806 -331.2853,191.26624 l 331.2853,191.26624 z" />
+    <g
+       id="g1657"
+       transform="matrix(57.831674,0,0,57.831674,402.40368,92.688452)">
+      <g
+         id="g7651"
+         transform="translate(13.259961,2.2775894)">
+        <path
+           id="path6659"
+           style="fill:#ffffff;stroke-width:0.264583"
+           d="m 6.3498163,2.9393223 c -0.3410461,0 -2.782726,1.4098777 -2.9532491,1.7052323 L 6.3498163,9.7602513 9.3035983,4.6445546 C 9.1330753,4.3492 6.6908624,2.9393223 6.3498163,2.9393223 Z"
+           transform="matrix(0.96974817,0,0,0.96974817,0.19209885,0.19209792)" />
+      </g>
+      <path
+         id="path461"
+         style="fill:#dfdfdf;fill-opacity:1;stroke-width:0.264583"
+         d="m 16.745875,6.9737355 2.863908,4.9609385 c 0.330729,0 2.69906,-1.367226 2.864424,-1.653646 0.165365,-0.2864204 0.165365,-3.0208729 0,-3.3072925 l -2.864424,1.6536459 z" />
+    </g>
+    <path
+       id="path5065"
+       style="fill:#d6d2d2;fill-opacity:1;stroke-width:17.3878"
+       d="m 1370.8455,495.99122 c -9.5633,16.56436 -9.5651,174.70241 0,191.26624 9.5633,16.56366 146.4995,95.63382 165.6261,95.63312 V 591.62434 Z" />
+  </g>
 </svg>
diff --git a/program_info/org.prismlauncher.PrismLauncher.logo-darkmode.svg b/program_info/org.prismlauncher.PrismLauncher.logo-darkmode.svg
new file mode 100644
index 00000000..208d6f08
--- /dev/null
+++ b/program_info/org.prismlauncher.PrismLauncher.logo-darkmode.svg
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="144"
+   height="48"
+   version="1.1"
+   viewBox="0 0 38.1 12.7"
+   id="svg66"
+   sodipodi:docname="org.prismlauncher.PrismLauncher.logo-dark.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs70" />
+  <sodipodi:namedview
+     id="namedview68"
+     pagecolor="#000000"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="true"
+     inkscape:deskcolor="#000000"
+     showgrid="false"
+     inkscape:zoom="8.9305556"
+     inkscape:cx="65.001555"
+     inkscape:cy="23.962675"
+     inkscape:window-width="2560"
+     inkscape:window-height="1386"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg66" />
+  <title
+     id="title2">Prism Launcher Logo</title>
+  <g
+     stroke-width=".26458"
+     id="g24">
+    <path
+       d="m6.35 6.35"
+       fill="#99cd61"
+       id="path4" />
+    <path
+       d="m6.35 0.52917-2.5208 4.3656 2.5208 1.4552 2.5203-1.4552 0.10955-3.0996c-1.1511-0.66459-2.3388-1.2661-2.6298-1.2661z"
+       fill="#df6277"
+       id="path6" />
+    <path
+       d="m8.9798 1.7952-2.6298 4.5548 2.5203 1.4552 2.5208-4.3656c-0.14552-0.25205-1.2601-0.97975-2.4112-1.6443z"
+       fill="#fb9168"
+       id="path8" />
+    <path
+       d="m11.391 3.4396-5.041 2.9104 2.5203 1.4552 2.7389-1.4552c0-1.3292-0.07255-2.6584-0.21808-2.9104z"
+       fill="#f3db6c"
+       id="path10" />
+    <path
+       d="m6.35 6.35v2.9104h5.041c0.14552-0.25205 0.21807-1.5812 0.21808-2.9104z"
+       fill="#7ab392"
+       id="path12" />
+    <path
+       d="m6.35 6.35v2.9104l2.6298 1.6443c1.1511-0.66459 2.2657-1.3923 2.4112-1.6443z"
+       fill="#4b7cbc"
+       id="path14" />
+    <path
+       d="m6.35 6.35-2.5208 1.4552 2.5208 4.3656c0.29104 0 1.4787-0.60148 2.6298-1.2661z"
+       fill="#6f488c"
+       id="path16" />
+    <path
+       d="m3.8292 4.8948-2.5203 4.3656c0.29104 0.5041 4.459 2.9104 5.041 2.9104v-5.8208z"
+       fill="#4d3f33"
+       id="path18" />
+    <path
+       d="m1.309 3.4396c-0.29104 0.5041-0.29104 5.3167 0 5.8208l5.041-2.9104v-2.9104z"
+       fill="#7a573b"
+       id="path20" />
+    <path
+       d="m6.35 0.52917c-0.58208-2e-8 -4.75 2.4063-5.041 2.9104l5.041 2.9104z"
+       fill="#99cd61"
+       id="path22" />
+  </g>
+  <g
+     transform="matrix(.88 0 0 .88 -10.906 -1.2421)"
+     id="g32">
+    <g
+       transform="translate(13.26 2.2776)"
+       id="g28">
+      <path
+         transform="matrix(.96975 0 0 .96975 .1921 .1921)"
+         d="m6.3498 2.9393c-0.34105 0-2.7827 1.4099-2.9532 1.7052l2.9532 5.1157 2.9538-5.1157c-0.17052-0.29535-2.6127-1.7052-2.9538-1.7052z"
+         fill="#fff"
+         stroke-width=".26458"
+         id="path26" />
+    </g>
+    <path
+       d="m16.746 6.9737 2.8639 4.9609c0.33073 0 2.6991-1.3672 2.8644-1.6536 0.16536-0.28642 0.16536-3.0209 0-3.3073l-2.8644 1.6536z"
+       fill="#dfdfdf"
+       stroke-width=".26458"
+       id="path30" />
+  </g>
+  <path
+     d="m3.8299 4.8948c-0.14551 0.25205-0.14553 2.6584 0 2.9104 0.14553 0.25204 2.2292 1.4552 2.5203 1.4552v-2.9104z"
+     fill="#d6d2d2"
+     stroke-width=".26458"
+     id="path34" />
+  <g
+     fill="#14191e"
+     stroke-width=".26458"
+     aria-label="Prism Launcher"
+     id="g62"
+     style="fill:#ffffff;fill-opacity:1">
+    <path
+       d="m15.669 3.991h-0.44291v-0.8382h0.44291c0.32385 0 0.46196 0.16192 0.46196 0.4191 0 0.25718-0.13811 0.4191-0.46196 0.4191zm1.2906-0.4191c0-0.61436-0.40958-1.0763-1.2287-1.0763h-1.3192v3.3433h0.81439v-1.2001h0.50482c0.85249 0 1.2287-0.51435 1.2287-1.0668z"
+       id="path36"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m18.198 4.6053c0-0.4572 0.22384-0.59055 0.6096-0.59055h0.22384v-0.86201c-0.35719 0-0.6477 0.1905-0.83344 0.47149v-0.44291h-0.81439v2.6575h0.81439z"
+       id="path38"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m19.421 3.1813v2.6575h0.81439v-2.6575zm0.40958-0.27622c0.28575 0 0.48101-0.19526 0.48101-0.43815 0-0.24765-0.19526-0.44291-0.48101-0.44291-0.29051 0-0.48578 0.19526-0.48578 0.44291 0 0.24289 0.19526 0.43815 0.48578 0.43815z"
+       id="path40"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m21.908 5.8769c0.66675 0 1.0763-0.34766 1.0763-0.80962-0.01429-0.9906-1.4526-0.69056-1.4526-1.1144 0-0.12859 0.10478-0.20479 0.29528-0.20479 0.2286 0 0.36671 0.11906 0.39052 0.30004h0.75248c-0.052387-0.52388-0.43339-0.90487-1.1192-0.90487-0.69532 0-1.0811 0.37147-1.0811 0.82391 0 0.97631 1.4478 0.66675 1.4478 1.0954 0 0.11906-0.10954 0.21431-0.31909 0.21431-0.22384 0-0.39052-0.12382-0.40958-0.30956h-0.80486c0.0381 0.51435 0.51435 0.90964 1.224 0.90964z"
+       id="path42"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m27.146 4.3958v1.443h0.80962v-1.5526c0-0.71438-0.42386-1.1335-1.0811-1.1335-0.38576 0-0.71914 0.21431-0.89535 0.4953-0.18098-0.31909-0.50482-0.4953-0.90488-0.4953-0.34766 0-0.61912 0.14764-0.77629 0.36195v-0.33337h-0.81439v2.6575h0.81439v-1.443c0-0.34766 0.20002-0.53816 0.50959-0.53816 0.30956 0 0.50959 0.1905 0.50959 0.53816v1.443h0.80962v-1.443c0-0.34766 0.20002-0.53816 0.50959-0.53816 0.30956 0 0.50959 0.1905 0.50959 0.53816z"
+       id="path44"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m15.226 7.258h-0.81439v3.3433h1.8812v-0.62865h-1.0668z"
+       id="path46"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m16.521 9.2678c0 0.8382 0.51911 1.3716 1.1668 1.3716 0.39529 0 0.67628-0.18098 0.82391-0.41434v0.37624h0.81439v-2.6575h-0.81439v0.37624c-0.14288-0.23336-0.42386-0.41434-0.81915-0.41434-0.65246 0-1.1716 0.52387-1.1716 1.3621zm1.9907 0.00476c0 0.42386-0.27146 0.65722-0.58102 0.65722-0.3048 0-0.58102-0.23812-0.58102-0.66199s0.27622-0.65246 0.58102-0.65246c0.30956 0 0.58102 0.23336 0.58102 0.65722z"
+       id="path48"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m22.541 10.601v-2.6575h-0.81439v1.443c0 0.36195-0.20002 0.56198-0.51435 0.56198-0.3048 0-0.50959-0.20002-0.50959-0.56198v-1.443h-0.80962v1.5526c0 0.70961 0.41434 1.1335 1.0287 1.1335 0.35719 0 0.64294-0.16192 0.80486-0.39052v0.36195z"
+       id="path50"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m24.96 9.1583v1.443h0.80962v-1.5526c0-0.71438-0.40958-1.1335-1.0239-1.1335-0.35719 0-0.64294 0.15716-0.80486 0.381v-0.35242h-0.81439v2.6575h0.81439v-1.443c0-0.36195 0.20002-0.56198 0.50959-0.56198 0.30956 0 0.50959 0.20002 0.50959 0.56198z"
+       id="path52"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m26.175 9.2726c0 0.84296 0.55245 1.3668 1.3335 1.3668 0.66675 0 1.1382-0.38576 1.2764-1.0001h-0.86678c-0.07144 0.19526-0.20002 0.3048-0.42386 0.3048-0.29051 0-0.49054-0.2286-0.49054-0.67151s0.20002-0.67151 0.49054-0.67151c0.22384 0 0.35719 0.11906 0.42386 0.3048h0.86678c-0.13811-0.63341-0.6096-1.0001-1.2764-1.0001-0.78105 0-1.3335 0.52864-1.3335 1.3668z"
+       id="path54"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m29.218 7.0771v3.5243h0.81439v-1.443c0-0.36195 0.20002-0.56198 0.50959-0.56198 0.30956 0 0.50959 0.20002 0.50959 0.56198v1.443h0.80962v-1.5526c0-0.71438-0.40481-1.1335-1.0096-1.1335-0.36671 0-0.65722 0.15716-0.81915 0.38576v-1.224z"
+       id="path56"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m33.599 8.5582c0.27146 0 0.50006 0.16669 0.50006 0.4572h-1.0192c0.04762-0.29528 0.25241-0.4572 0.51911-0.4572zm1.2716 1.162h-0.86678c-0.06667 0.14288-0.19526 0.25718-0.42386 0.25718-0.26194 0-0.47625-0.16192-0.50482-0.50959h1.8431c0.0095-0.080963 0.01429-0.16192 0.01429-0.23812 0-0.80962-0.54769-1.324-1.324-1.324-0.79058 0-1.343 0.52387-1.343 1.3668 0 0.84296 0.56198 1.3668 1.343 1.3668 0.66199 0 1.1335-0.40005 1.2621-0.91916z"
+       id="path58"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m36.176 9.3678c0-0.4572 0.22384-0.59055 0.6096-0.59055h0.22384v-0.86201c-0.35719 0-0.6477 0.1905-0.83344 0.47149v-0.44291h-0.81439v2.6575h0.81439z"
+       id="path60"
+       style="fill:#ffffff;fill-opacity:1" />
+  </g>
+  <metadata
+     id="metadata64">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Prism Launcher Logo</dc:title>
+        <dc:date>19/10/2022</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Prism Launcher</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>Prism Launcher</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/program_info/org.prismlauncher.PrismLauncher.logo.source.svg b/program_info/org.prismlauncher.PrismLauncher.logo.source.svg
new file mode 100644
index 00000000..56db4258
--- /dev/null
+++ b/program_info/org.prismlauncher.PrismLauncher.logo.source.svg
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="144"
+   height="48"
+   viewBox="0 0 38.1 12.7"
+   version="1.1"
+   id="svg3606"
+   sodipodi:docname="org.prismlauncher.PrismLauncher.logo.source.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <title
+     id="title261">Prism Launcher Logo</title>
+  <sodipodi:namedview
+     id="namedview3608"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="px"
+     showgrid="false"
+     showguides="true"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="87.327687"
+     inkscape:cy="22.98097"
+     inkscape:window-width="2560"
+     inkscape:window-height="1386"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <sodipodi:guide
+       position="0.52916688,12.170833"
+       orientation="1,0"
+       id="guide4870"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="12.170833,12.170833"
+       orientation="0,-1"
+       id="guide4872"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="12.170833,0.5291669"
+       orientation="1,0"
+       id="guide4874"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="0.52916688,0.5291666"
+       orientation="0,-1"
+       id="guide4876"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="6.3500002,12.170833"
+       orientation="1,0"
+       id="guide6491"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="6.3500002,6.3499993"
+       orientation="-0.49999657,-0.86602738"
+       id="guide9375"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="6.3500002,6.3499993"
+       orientation="-0.49999666,0.86602733"
+       id="guide9377"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3603" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g531"
+       transform="matrix(0.1353646,0,0,0.1353646,15.301582,0.52916663)" />
+    <g
+       id="g397">
+      <path
+         style="fill:#99cd61;fill-opacity:1;stroke-width:0.264583"
+         d="M 6.3500002,6.350001 Z"
+         id="path7899" />
+      <path
+         id="path3228"
+         style="fill:#df6277;fill-opacity:1;stroke-width:0.264583"
+         d="M 6.35,0.52916667 3.8292236,4.8947917 6.35,6.35 8.8702596,4.8947917 8.9798136,1.7952393 C 7.828708,1.1306481 6.6410414,0.52916667 6.35,0.52916667 Z" />
+      <path
+         id="path2659"
+         style="fill:#fb9168;fill-opacity:1;stroke-width:0.264583"
+         d="M 8.9798136,1.7952393 6.35,6.35 8.8702596,7.8052083 11.391036,3.4395833 C 11.245515,3.1875341 10.130919,2.4598305 8.9798136,1.7952393 Z" />
+      <path
+         id="path2708"
+         style="fill:#f3db6c;fill-opacity:1;stroke-width:0.264583"
+         d="M 11.391036,3.4395833 6.35,6.35 8.8702596,7.8052083 11.609111,6.35 c 0,-1.3291823 -0.07255,-2.6583674 -0.218075,-2.9104167 z" />
+      <path
+         id="path1737"
+         style="fill:#7ab392;fill-opacity:1;stroke-width:0.264583"
+         d="m 6.35,6.35 v 2.9104167 h 5.041036 C 11.536557,9.0083674 11.60911,7.6791823 11.609111,6.35 Z" />
+      <path
+         id="path2937"
+         style="fill:#4b7cbc;fill-opacity:1;stroke-width:0.264583"
+         d="M 6.35,6.35 V 9.2604167 L 8.9798136,10.904761 C 10.130919,10.24017 11.245515,9.5124659 11.391036,9.2604167 Z" />
+      <path
+         id="path3117"
+         style="fill:#6f488c;fill-opacity:1;stroke-width:0.264583"
+         d="M 6.35,6.35 3.8292236,7.8052083 6.35,12.170833 c 0.2910414,0 1.4787079,-0.601481 2.6298136,-1.266072 z" />
+      <path
+         id="path2010"
+         style="fill:#4d3f33;fill-opacity:1;stroke-width:0.264583"
+         d="M 3.8292236,4.8947917 1.308964,9.2604167 C 1.6000054,9.7645152 5.7679172,12.170833 6.35,12.170833 V 6.35 Z" />
+      <path
+         id="path1744"
+         style="fill:#7a573b;fill-opacity:1;stroke-width:0.264583"
+         d="m 1.308964,3.4395833 c -0.2910414,0.5040985 -0.2910413,5.3167349 0,5.8208334 L 6.35,6.35 V 3.4395833 Z" />
+      <path
+         id="path1739"
+         style="fill:#99cd61;fill-opacity:1;stroke-width:0.264583"
+         d="M 6.35,0.52916667 C 5.7679172,0.52916665 1.6000054,2.9354849 1.308964,3.4395833 L 6.35,6.35 Z" />
+      <g
+         id="g379">
+        <g
+           id="g1657"
+           transform="matrix(0.87999988,0,0,0.87999988,-10.906495,-1.242093)">
+          <g
+             id="g7651"
+             transform="translate(13.259961,2.2775894)">
+            <path
+               id="path6659"
+               style="fill:#ffffff;stroke-width:0.264583"
+               d="m 6.3498163,2.9393223 c -0.3410461,0 -2.782726,1.4098777 -2.9532491,1.7052323 L 6.3498163,9.7602513 9.3035983,4.6445546 C 9.1330753,4.3492 6.6908624,2.9393223 6.3498163,2.9393223 Z"
+               transform="matrix(0.96974817,0,0,0.96974817,0.19209885,0.19209792)" />
+          </g>
+          <path
+             id="path461"
+             style="fill:#dfdfdf;fill-opacity:1;stroke-width:0.264583"
+             d="m 16.745875,6.9737355 2.863908,4.9609385 c 0.330729,0 2.69906,-1.367226 2.864424,-1.653646 0.165365,-0.2864204 0.165365,-3.0208729 0,-3.3072925 l -2.864424,1.6536459 z" />
+        </g>
+        <path
+           id="path5065"
+           style="fill:#d6d2d2;fill-opacity:1;stroke-width:0.264583"
+           d="m 3.8298625,4.8947933 c -0.1455111,0.2520549 -0.1455304,2.6583729 0,2.9104166 0.1455304,0.2520438 2.2292181,1.4552195 2.5202596,1.4552084 V 6.3500016 Z" />
+      </g>
+    </g>
+    <g
+       aria-label="Prism
+Launcher"
+       id="text637"
+       style="font-weight:bold;font-size:4.7625px;line-height:1;font-family:poppins;-inkscape-font-specification:'poppins Bold';stroke-width:0.264583">
+      <path
+         d="M 15.668625,3.9909748 H 15.225712 V 3.1527749 h 0.442913 c 0.32385,0 0.461962,0.161925 0.461962,0.4190999 0,0.257175 -0.138112,0.4191 -0.461962,0.4191 z m 1.290637,-0.4191 c 0,-0.6143624 -0.409575,-1.0763249 -1.228725,-1.0763249 h -1.319212 v 3.3432748 h 0.814387 V 4.6386748 h 0.504825 c 0.852488,0 1.228725,-0.51435 1.228725,-1.0668 z"
+         style="fill:#14191e"
+         id="path419" />
+      <path
+         d="m 18.197515,4.6053373 c 0,-0.4572 0.223837,-0.59055 0.6096,-0.59055 h 0.223837 V 3.1527749 c -0.357187,0 -0.6477,0.1904999 -0.833437,0.4714874 V 3.1813499 h -0.814388 v 2.6574748 h 0.814388 z"
+         style="fill:#14191e"
+         id="path421" />
+      <path
+         d="m 19.421475,3.1813499 v 2.6574748 h 0.814387 V 3.1813499 Z m 0.409575,-0.276225 c 0.28575,0 0.481012,-0.1952625 0.481012,-0.43815 0,-0.24765 -0.195262,-0.4429125 -0.481012,-0.4429125 -0.290513,0 -0.485775,0.1952625 -0.485775,0.4429125 0,0.2428875 0.195262,0.43815 0.485775,0.43815 z"
+         style="fill:#14191e"
+         id="path423" />
+      <path
+         d="m 21.9075,5.8769247 c 0.66675,0 1.076325,-0.3476624 1.076325,-0.8096249 -0.01429,-0.9906 -1.452563,-0.6905625 -1.452563,-1.114425 0,-0.1285875 0.104775,-0.2047875 0.295275,-0.2047875 0.2286,0 0.366713,0.1190625 0.390525,0.3000375 h 0.752475 C 22.91715,3.5242498 22.53615,3.1432499 21.85035,3.1432499 c -0.695325,0 -1.081088,0.3714749 -1.081088,0.8239124 0,0.9763125 1.4478,0.66675 1.4478,1.095375 0,0.1190625 -0.109537,0.2143125 -0.319087,0.2143125 -0.223838,0 -0.390525,-0.123825 -0.409575,-0.3095625 h -0.804863 c 0.0381,0.51435 0.51435,0.9096374 1.223963,0.9096374 z"
+         style="fill:#14191e"
+         id="path425" />
+      <path
+         d="m 27.146252,4.3957873 v 1.4430374 h 0.809625 V 4.2862498 c 0,-0.714375 -0.423862,-1.1334749 -1.081087,-1.1334749 -0.385763,0 -0.719138,0.2143124 -0.89535,0.4952999 -0.180975,-0.3190875 -0.504825,-0.4952999 -0.904875,-0.4952999 -0.347663,0 -0.619125,0.1476375 -0.776288,0.3619499 V 3.1813499 H 23.48389 v 2.6574748 h 0.814387 V 4.3957873 c 0,-0.3476625 0.200025,-0.5381625 0.509588,-0.5381625 0.309562,0 0.509587,0.1905 0.509587,0.5381625 v 1.4430374 h 0.809625 V 4.3957873 c 0,-0.3476625 0.200025,-0.5381625 0.509588,-0.5381625 0.309562,0 0.509587,0.1905 0.509587,0.5381625 z"
+         style="fill:#14191e"
+         id="path427" />
+      <path
+         d="m 15.225712,7.2580497 h -0.814387 v 3.3432753 h 1.881187 V 9.9726746 h -1.0668 z"
+         style="fill:#14191e"
+         id="path429" />
+      <path
+         d="m 16.521109,9.2678246 c 0,0.8382004 0.519112,1.3716004 1.166812,1.3716004 0.395288,0 0.676275,-0.180975 0.823913,-0.414338 v 0.376238 h 0.814387 V 7.9438497 h -0.814387 v 0.3762374 c -0.142875,-0.2333624 -0.423863,-0.4143374 -0.81915,-0.4143374 -0.652463,0 -1.171575,0.5238749 -1.171575,1.3620749 z m 1.990725,0.00476 c 0,0.4238625 -0.271463,0.657225 -0.581025,0.657225 -0.3048,0 -0.581025,-0.238125 -0.581025,-0.6619875 0,-0.4238625 0.276225,-0.6524625 0.581025,-0.6524625 0.309562,0 0.581025,0.2333625 0.581025,0.657225 z"
+         style="fill:#14191e"
+         id="path431" />
+      <path
+         d="M 22.540912,10.601325 V 7.9438497 h -0.814387 v 1.4430374 c 0,0.36195 -0.200025,0.561975 -0.51435,0.561975 -0.3048,0 -0.509588,-0.200025 -0.509588,-0.561975 V 7.9438497 h -0.809624 v 1.5525749 c 0,0.7096124 0.414337,1.1334754 1.028699,1.1334754 0.357188,0 0.642938,-0.161925 0.804863,-0.390525 v 0.36195 z"
+         style="fill:#14191e"
+         id="path433" />
+      <path
+         d="m 24.960261,9.1582871 v 1.4430379 h 0.809625 V 9.0487496 c 0,-0.714375 -0.409575,-1.1334749 -1.023937,-1.1334749 -0.357188,0 -0.642938,0.1571625 -0.804863,0.381 v -0.352425 h -0.814387 v 2.6574753 h 0.814387 V 9.1582871 c 0,-0.36195 0.200025,-0.561975 0.509588,-0.561975 0.309562,0 0.509587,0.200025 0.509587,0.561975 z"
+         style="fill:#14191e"
+         id="path435" />
+      <path
+         d="m 26.174697,9.2725871 c 0,0.8429629 0.55245,1.3668379 1.3335,1.3668379 0.66675,0 1.138238,-0.385763 1.27635,-1.0001254 h -0.866775 c -0.07144,0.1952625 -0.200025,0.3048 -0.423862,0.3048 -0.290513,0 -0.490538,-0.2286 -0.490538,-0.6715125 0,-0.4429125 0.200025,-0.6715125 0.490538,-0.6715125 0.223837,0 0.357187,0.1190625 0.423862,0.3048 h 0.866775 c -0.138112,-0.6334124 -0.6096,-1.0001249 -1.27635,-1.0001249 -0.78105,0 -1.3335,0.5286374 -1.3335,1.3668374 z"
+         style="fill:#14191e"
+         id="path437" />
+      <path
+         d="M 29.217933,7.0770747 V 10.601325 H 30.03232 V 9.1582871 c 0,-0.36195 0.200025,-0.561975 0.509588,-0.561975 0.309562,0 0.509587,0.200025 0.509587,0.561975 V 10.601325 H 31.86112 V 9.0487496 c 0,-0.714375 -0.404812,-1.1334749 -1.00965,-1.1334749 -0.366712,0 -0.657225,0.1571625 -0.81915,0.3857625 V 7.0770747 Z"
+         style="fill:#14191e"
+         id="path439" />
+      <path
+         d="m 33.599433,8.5582121 c 0.271462,0 0.500062,0.1666875 0.500062,0.4572 H 33.08032 c 0.04762,-0.295275 0.252413,-0.4572 0.519113,-0.4572 z m 1.271587,1.16205 h -0.866775 c -0.06667,0.142875 -0.195262,0.257175 -0.423862,0.257175 -0.261938,0 -0.47625,-0.161925 -0.504825,-0.5095875 h 1.843087 c 0.0095,-0.080963 0.01429,-0.161925 0.01429,-0.238125 0,-0.809625 -0.547688,-1.3239749 -1.323975,-1.3239749 -0.790575,0 -1.343025,0.5238749 -1.343025,1.3668374 0,0.8429629 0.561975,1.3668379 1.343025,1.3668379 0.661987,0 1.133475,-0.40005 1.262062,-0.9191629 z"
+         style="fill:#14191e"
+         id="path441" />
+      <path
+         d="m 36.17594,9.3678371 c 0,-0.4572 0.223837,-0.59055 0.6096,-0.59055 h 0.223837 V 7.9152747 c -0.357187,0 -0.6477,0.1905 -0.833437,0.4714874 V 7.9438497 h -0.814388 v 2.6574753 h 0.814388 z"
+         style="fill:#14191e"
+         id="path443" />
+    </g>
+  </g>
+  <metadata
+     id="metadata259">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Prism Launcher Logo</dc:title>
+        <dc:date>19/10/2022</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Prism Launcher</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>Prism Launcher</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/program_info/org.prismlauncher.PrismLauncher.logo.svg b/program_info/org.prismlauncher.PrismLauncher.logo.svg
new file mode 100644
index 00000000..efaf3931
--- /dev/null
+++ b/program_info/org.prismlauncher.PrismLauncher.logo.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="144" height="48" version="1.1" viewBox="0 0 38.1 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <title>Prism Launcher Logo</title>
+ <g stroke-width=".26458">
+  <path d="m6.35 6.35" fill="#99cd61"/>
+  <path d="m6.35 0.52917-2.5208 4.3656 2.5208 1.4552 2.5203-1.4552 0.10955-3.0996c-1.1511-0.66459-2.3388-1.2661-2.6298-1.2661z" fill="#df6277"/>
+  <path d="m8.9798 1.7952-2.6298 4.5548 2.5203 1.4552 2.5208-4.3656c-0.14552-0.25205-1.2601-0.97975-2.4112-1.6443z" fill="#fb9168"/>
+  <path d="m11.391 3.4396-5.041 2.9104 2.5203 1.4552 2.7389-1.4552c0-1.3292-0.07255-2.6584-0.21808-2.9104z" fill="#f3db6c"/>
+  <path d="m6.35 6.35v2.9104h5.041c0.14552-0.25205 0.21807-1.5812 0.21808-2.9104z" fill="#7ab392"/>
+  <path d="m6.35 6.35v2.9104l2.6298 1.6443c1.1511-0.66459 2.2657-1.3923 2.4112-1.6443z" fill="#4b7cbc"/>
+  <path d="m6.35 6.35-2.5208 1.4552 2.5208 4.3656c0.29104 0 1.4787-0.60148 2.6298-1.2661z" fill="#6f488c"/>
+  <path d="m3.8292 4.8948-2.5203 4.3656c0.29104 0.5041 4.459 2.9104 5.041 2.9104v-5.8208z" fill="#4d3f33"/>
+  <path d="m1.309 3.4396c-0.29104 0.5041-0.29104 5.3167 0 5.8208l5.041-2.9104v-2.9104z" fill="#7a573b"/>
+  <path d="m6.35 0.52917c-0.58208-2e-8 -4.75 2.4063-5.041 2.9104l5.041 2.9104z" fill="#99cd61"/>
+ </g>
+ <g transform="matrix(.88 0 0 .88 -10.906 -1.2421)">
+  <g transform="translate(13.26 2.2776)">
+   <path transform="matrix(.96975 0 0 .96975 .1921 .1921)" d="m6.3498 2.9393c-0.34105 0-2.7827 1.4099-2.9532 1.7052l2.9532 5.1157 2.9538-5.1157c-0.17052-0.29535-2.6127-1.7052-2.9538-1.7052z" fill="#fff" stroke-width=".26458"/>
+  </g>
+  <path d="m16.746 6.9737 2.8639 4.9609c0.33073 0 2.6991-1.3672 2.8644-1.6536 0.16536-0.28642 0.16536-3.0209 0-3.3073l-2.8644 1.6536z" fill="#dfdfdf" stroke-width=".26458"/>
+ </g>
+ <path d="m3.8299 4.8948c-0.14551 0.25205-0.14553 2.6584 0 2.9104 0.14553 0.25204 2.2292 1.4552 2.5203 1.4552v-2.9104z" fill="#d6d2d2" stroke-width=".26458"/>
+ <g fill="#14191e" stroke-width=".26458" aria-label="Prism Launcher">
+  <path d="m15.669 3.991h-0.44291v-0.8382h0.44291c0.32385 0 0.46196 0.16192 0.46196 0.4191 0 0.25718-0.13811 0.4191-0.46196 0.4191zm1.2906-0.4191c0-0.61436-0.40958-1.0763-1.2287-1.0763h-1.3192v3.3433h0.81439v-1.2001h0.50482c0.85249 0 1.2287-0.51435 1.2287-1.0668z"/>
+  <path d="m18.198 4.6053c0-0.4572 0.22384-0.59055 0.6096-0.59055h0.22384v-0.86201c-0.35719 0-0.6477 0.1905-0.83344 0.47149v-0.44291h-0.81439v2.6575h0.81439z"/>
+  <path d="m19.421 3.1813v2.6575h0.81439v-2.6575zm0.40958-0.27622c0.28575 0 0.48101-0.19526 0.48101-0.43815 0-0.24765-0.19526-0.44291-0.48101-0.44291-0.29051 0-0.48578 0.19526-0.48578 0.44291 0 0.24289 0.19526 0.43815 0.48578 0.43815z"/>
+  <path d="m21.908 5.8769c0.66675 0 1.0763-0.34766 1.0763-0.80962-0.01429-0.9906-1.4526-0.69056-1.4526-1.1144 0-0.12859 0.10478-0.20479 0.29528-0.20479 0.2286 0 0.36671 0.11906 0.39052 0.30004h0.75248c-0.052387-0.52388-0.43339-0.90487-1.1192-0.90487-0.69532 0-1.0811 0.37147-1.0811 0.82391 0 0.97631 1.4478 0.66675 1.4478 1.0954 0 0.11906-0.10954 0.21431-0.31909 0.21431-0.22384 0-0.39052-0.12382-0.40958-0.30956h-0.80486c0.0381 0.51435 0.51435 0.90964 1.224 0.90964z"/>
+  <path d="m27.146 4.3958v1.443h0.80962v-1.5526c0-0.71438-0.42386-1.1335-1.0811-1.1335-0.38576 0-0.71914 0.21431-0.89535 0.4953-0.18098-0.31909-0.50482-0.4953-0.90488-0.4953-0.34766 0-0.61912 0.14764-0.77629 0.36195v-0.33337h-0.81439v2.6575h0.81439v-1.443c0-0.34766 0.20002-0.53816 0.50959-0.53816 0.30956 0 0.50959 0.1905 0.50959 0.53816v1.443h0.80962v-1.443c0-0.34766 0.20002-0.53816 0.50959-0.53816 0.30956 0 0.50959 0.1905 0.50959 0.53816z"/>
+  <path d="m15.226 7.258h-0.81439v3.3433h1.8812v-0.62865h-1.0668z"/>
+  <path d="m16.521 9.2678c0 0.8382 0.51911 1.3716 1.1668 1.3716 0.39529 0 0.67628-0.18098 0.82391-0.41434v0.37624h0.81439v-2.6575h-0.81439v0.37624c-0.14288-0.23336-0.42386-0.41434-0.81915-0.41434-0.65246 0-1.1716 0.52387-1.1716 1.3621zm1.9907 0.00476c0 0.42386-0.27146 0.65722-0.58102 0.65722-0.3048 0-0.58102-0.23812-0.58102-0.66199s0.27622-0.65246 0.58102-0.65246c0.30956 0 0.58102 0.23336 0.58102 0.65722z"/>
+  <path d="m22.541 10.601v-2.6575h-0.81439v1.443c0 0.36195-0.20002 0.56198-0.51435 0.56198-0.3048 0-0.50959-0.20002-0.50959-0.56198v-1.443h-0.80962v1.5526c0 0.70961 0.41434 1.1335 1.0287 1.1335 0.35719 0 0.64294-0.16192 0.80486-0.39052v0.36195z"/>
+  <path d="m24.96 9.1583v1.443h0.80962v-1.5526c0-0.71438-0.40958-1.1335-1.0239-1.1335-0.35719 0-0.64294 0.15716-0.80486 0.381v-0.35242h-0.81439v2.6575h0.81439v-1.443c0-0.36195 0.20002-0.56198 0.50959-0.56198 0.30956 0 0.50959 0.20002 0.50959 0.56198z"/>
+  <path d="m26.175 9.2726c0 0.84296 0.55245 1.3668 1.3335 1.3668 0.66675 0 1.1382-0.38576 1.2764-1.0001h-0.86678c-0.07144 0.19526-0.20002 0.3048-0.42386 0.3048-0.29051 0-0.49054-0.2286-0.49054-0.67151s0.20002-0.67151 0.49054-0.67151c0.22384 0 0.35719 0.11906 0.42386 0.3048h0.86678c-0.13811-0.63341-0.6096-1.0001-1.2764-1.0001-0.78105 0-1.3335 0.52864-1.3335 1.3668z"/>
+  <path d="m29.218 7.0771v3.5243h0.81439v-1.443c0-0.36195 0.20002-0.56198 0.50959-0.56198 0.30956 0 0.50959 0.20002 0.50959 0.56198v1.443h0.80962v-1.5526c0-0.71438-0.40481-1.1335-1.0096-1.1335-0.36671 0-0.65722 0.15716-0.81915 0.38576v-1.224z"/>
+  <path d="m33.599 8.5582c0.27146 0 0.50006 0.16669 0.50006 0.4572h-1.0192c0.04762-0.29528 0.25241-0.4572 0.51911-0.4572zm1.2716 1.162h-0.86678c-0.06667 0.14288-0.19526 0.25718-0.42386 0.25718-0.26194 0-0.47625-0.16192-0.50482-0.50959h1.8431c0.0095-0.080963 0.01429-0.16192 0.01429-0.23812 0-0.80962-0.54769-1.324-1.324-1.324-0.79058 0-1.343 0.52387-1.343 1.3668 0 0.84296 0.56198 1.3668 1.343 1.3668 0.66199 0 1.1335-0.40005 1.2621-0.91916z"/>
+  <path d="m36.176 9.3678c0-0.4572 0.22384-0.59055 0.6096-0.59055h0.22384v-0.86201c-0.35719 0-0.6477 0.1905-0.83344 0.47149v-0.44291h-0.81439v2.6575h0.81439z"/>
+ </g>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:title>Prism Launcher Logo</dc:title>
+    <dc:date>19/10/2022</dc:date>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:creator>
+    <dc:contributor>
+     <cc:Agent>
+      <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+     </cc:Agent>
+    </dc:contributor>
+    <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+    <dc:publisher>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:publisher>
+    <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"/>
+   </cc:Work>
+   <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>
+    <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/>
+   </cc:License>
+  </rdf:RDF>
+ </metadata>
+</svg>
diff --git a/program_info/org.prismlauncher.PrismLauncher.svg b/program_info/org.prismlauncher.PrismLauncher.svg
index c192d503..aeee8433 100644
--- a/program_info/org.prismlauncher.PrismLauncher.svg
+++ b/program_info/org.prismlauncher.PrismLauncher.svg
@@ -1,21 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="64" height="64" version="1.1" viewBox="0 0 16.933 16.933" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <linearGradient id="linearGradient84726" x1="4.4979" x2="12.435" y1="3.8011" y2="9.5681" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#88b858" offset="0"/>
-   <stop stop-color="#72b147" offset=".5"/>
-   <stop stop-color="#5a9a30" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <path d="m3.561 16.016s0-3.5642 4.9056-3.5642c4.9069 0 4.9056 3.5642 4.9056 3.5642z" fill="#765338"/>
-  <path d="m8.4667 12.452-4.9056 3.5642-3.0319-9.3311z" fill="#b7835a"/>
-  <path d="m8.4667 12.452 7.9375-5.7669-3.0319 9.3311z" fill="#5b422d"/>
-  <path d="m8.8308 12.716-0.36417 0.26458-0.36417-0.26458c0-0.26458 0.36417-0.26458 0.36417-0.26458s0.36417 0 0.36417 0.26458z" fill="#72b147"/>
-  <path d="m8.4667 12.452s-2e-7 -5.7669 7.9375-5.7669l-0.22507 0.69269-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819-0.91853 1.1965-0.91853 0.13819z" fill="#5a9a30"/>
-  <path d="m8.1025 12.716-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.91853-0.13819-0.91853-1.1965-0.22507-0.69269c7.9375 1e-7 7.9375 5.7669 7.9375 5.7669z" fill="#88b858"/>
-  <path d="m0.52917 6.6846 7.9375 5.7669 7.9375-5.7669-7.9375-5.7669z" fill="url(#linearGradient84726)"/>
+<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <title>Prism Launcher Logo</title>
+ <g stroke-width=".26458">
+  <path d="m6.35 6.35" fill="#99cd61"/>
+  <path d="m6.35 0.52917-2.5208 4.3656 2.5208 1.4552 2.5203-1.4552 0.10955-3.0996c-1.1511-0.66459-2.3388-1.2661-2.6298-1.2661z" fill="#df6277"/>
+  <path d="m8.9798 1.7952-2.6298 4.5548 2.5203 1.4552 2.5208-4.3656c-0.14552-0.25205-1.2601-0.97975-2.4112-1.6443z" fill="#fb9168"/>
+  <path d="m11.391 3.4396-5.041 2.9104 2.5203 1.4552 2.7389-1.4552c0-1.3292-0.072554-2.6584-0.21808-2.9104z" fill="#f3db6c"/>
+  <path d="m6.35 6.35v2.9104h5.041c0.14552-0.25205 0.21807-1.5812 0.21808-2.9104h-5.2591z" fill="#7ab392"/>
+  <path d="m6.35 6.35v2.9104l2.6298 1.6443c1.1511-0.66459 2.2657-1.3923 2.4112-1.6443l-5.041-2.9104z" fill="#4b7cbc"/>
+  <path d="m6.35 6.35-2.5208 1.4552 2.5208 4.3656c0.29104 0 1.4787-0.60148 2.6298-1.2661l-2.6298-4.5548z" fill="#6f488c"/>
+  <path d="m3.8292 4.8948-2.5203 4.3656c0.29104 0.5041 4.459 2.9104 5.041 2.9104v-5.8208l-2.5208-1.4552z" fill="#4d3f33"/>
+  <path d="m1.309 3.4396c-0.29104 0.5041-0.29104 5.3167 0 5.8208l5.041-2.9104v-2.9104h-5.041z" fill="#7a573b"/>
+  <path d="m6.35 0.52917c-0.58208-2e-8 -4.75 2.4063-5.041 2.9104l5.041 2.9104v-5.8208z" fill="#99cd61"/>
  </g>
- <path d="m0.75424 7.3773-0.22507-0.69269 7.9375 5.7669 7.9375-5.7669-0.22507 0.69269-7.7124 5.6034z" fill-opacity="0"/>
+ <g transform="matrix(.88 0 0 .88 -10.906 -1.2421)">
+  <g transform="translate(13.26 2.2776)">
+   <path transform="matrix(.96975 0 0 .96975 .1921 .1921)" d="m6.3498 2.9393c-0.34105 0-2.7827 1.4099-2.9532 1.7052l2.9532 5.1157 2.9538-5.1157c-0.17052-0.29535-2.6127-1.7052-2.9538-1.7052z" fill="#fff" stroke-width=".26458"/>
+  </g>
+  <path d="m16.746 6.9737 2.8639 4.9609c0.33073 0 2.6991-1.3672 2.8644-1.6536 0.16536-0.28642 0.16536-3.0209 0-3.3073l-2.8644 1.6536z" fill="#dfdfdf" stroke-width=".26458"/>
+ </g>
+ <path d="m3.8299 4.8948c-0.14551 0.25205-0.14553 2.6584 0 2.9104 0.14553 0.25204 2.2292 1.4552 2.5203 1.4552v-2.9104z" fill="#d6d2d2" stroke-width=".26458"/>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:title>Prism Launcher Logo</dc:title>
+    <dc:date>19/10/2022</dc:date>
+    <dc:creator>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:creator>
+    <dc:contributor>
+     <cc:Agent>
+      <dc:title>AutiOne, Boba, ely, Fulmine, gon sawa, Pankakes, tobimori, Zeke</dc:title>
+     </cc:Agent>
+    </dc:contributor>
+    <dc:source>https://github.com/PrismLauncher/PrismLauncher</dc:source>
+    <dc:publisher>
+     <cc:Agent>
+      <dc:title>Prism Launcher</dc:title>
+     </cc:Agent>
+    </dc:publisher>
+    <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/"/>
+   </cc:Work>
+   <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+    <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>
+    <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+    <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/>
+   </cc:License>
+  </rdf:RDF>
+ </metadata>
 </svg>
diff --git a/program_info/prismlauncher-header-black.svg b/program_info/prismlauncher-header-black.svg
deleted file mode 100644
index e9e7c3e2..00000000
--- a/program_info/prismlauncher-header-black.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 376.77 135.47" xmlns="http://www.w3.org/2000/svg" class="home">
- <defs>
-  <linearGradient id="a" x1="4.498" x2="12.435" y1="3.801" y2="9.568" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#88b858" offset="0"/>
-   <stop stop-color="#72b147" offset=".5"/>
-   <stop stop-color="#5a9a30" offset="1"/>
-  </linearGradient>
- </defs>
- <path d="M42.375 118.668s0-24.797 34.094-24.797c34.103 0 34.094 24.797 34.094 24.797z" fill="#765338"/>
- <path d="M76.47 93.872 42.376 118.67 21.304 53.751z" fill="#b7835a"/>
- <path d="m76.47 93.872 55.165-40.121-21.072 64.918z" fill="#5b422d"/>
- <path d="m79 95.709-2.53 1.84-2.532-1.84c0-1.84 2.531-1.84 2.531-1.84s2.531 0 2.531 1.84z" fill="#72b147"/>
- <path d="M76.47 93.872s0-40.121 55.165-40.121l-1.564 4.819-6.384 8.324-6.384.962-6.383 8.324-6.384.961-6.384 8.325-6.384.961-6.384 8.324-6.383.962z" fill="#5a9a30"/>
- <path d="m73.938 95.709-6.383-.961-6.384-8.325-6.384-.961-6.384-8.324-6.384-.962-6.383-8.324-6.384-.962-6.384-8.324-1.564-4.819c55.165 0 55.165 40.121 55.165 40.121z" fill="#88b858"/>
- <path d="m.53 6.685 7.937 5.766 7.937-5.766L8.467.918z" fill="url(#a)" transform="matrix(6.95 0 0 6.9572 17.626 7.241)"/>
- <path d="m22.868 58.567-1.564-4.82L76.469 93.87l55.166-40.122-1.564 4.82L76.47 97.55z" fill="none"/>
- <g fill="#000" stroke-width=".265" aria-label="PolyMC">
-  <g stroke-width=".01" aria-label="PolyMC">
-   <path d="M168.153 47.323q5.434 0 9.287 1.858 3.852 1.788 5.916 5.228 2.133 3.44 2.133 8.324 0 2.958-.895 5.847-.894 2.82-2.889 5.16-1.926 2.27-5.09 3.646t-7.705 1.375h-7.361v18.3h-6.673V47.322zm.688 25.041q2.958 0 4.884-.963 1.927-.963 3.027-2.408 1.1-1.513 1.582-3.164.482-1.651.482-2.958 0-1.514-.482-3.096-.481-1.651-1.65-2.958-1.101-1.376-2.959-2.202-1.788-.894-4.471-.894h-7.705v18.643zM187.49 82.6q0-4.265 1.994-7.705 2.064-3.44 5.641-5.434 3.577-1.995 8.118-1.995 4.678 0 8.186 1.995 3.509 1.995 5.435 5.434 1.926 3.44 1.926 7.705t-1.926 7.773q-1.926 3.44-5.503 5.435-3.509 1.995-8.187 1.995-4.54 0-8.118-1.857-3.508-1.927-5.572-5.298-1.995-3.44-1.995-8.048zm6.397.07q0 2.751 1.238 5.021 1.238 2.202 3.302 3.509 2.133 1.307 4.678 1.307 2.683 0 4.747-1.307 2.133-1.307 3.302-3.509 1.17-2.27 1.17-5.022 0-2.752-1.17-4.953-1.17-2.27-3.302-3.577-2.064-1.376-4.747-1.376-2.614 0-4.747 1.376-2.063 1.376-3.302 3.646-1.17 2.201-1.17 4.884zM223.251 43.858h6.398v53.246h-6.398zM238.914 110.808l18.78-42.17h5.917l-18.368 42.17zm7.017-13.484-13.69-28.687h7.223l11.489 25.453zM266.775 97.085V51.2h.063l23.855 33.774-3.043-.67L311.384 51.2h.122v45.885h-7.06v-29.88l.487 3.59-16.065 22.7h-.122l-16.31-22.7 1.218-3.286v29.576zM352.299 93.62q-.974.67-2.921 1.643-1.887.973-4.564 1.704-2.617.67-5.843.608-5.172-.062-9.31-1.825-4.138-1.826-6.999-4.869-2.86-3.104-4.442-7.06-1.522-4.016-1.522-8.52 0-5.05 1.583-9.25t4.503-7.241q2.921-3.104 6.938-4.808 4.016-1.704 8.763-1.704 4.199 0 7.485 1.156 3.347 1.096 5.598 2.496l-2.799 6.633q-1.704-1.156-4.26-2.313-2.556-1.156-5.781-1.156-2.921 0-5.599 1.217-2.678 1.156-4.686 3.347-2.008 2.13-3.225 4.99-1.156 2.86-1.156 6.208 0 3.468 1.034 6.39 1.096 2.92 3.043 5.05 2.008 2.07 4.747 3.287 2.799 1.156 6.268 1.156 3.408 0 5.964-1.035 2.616-1.095 4.199-2.434z"/>
-  </g>
- </g>
-</svg>
diff --git a/program_info/prismlauncher-header.Source.svg b/program_info/prismlauncher-header.Source.svg
deleted file mode 100644
index c960f33b..00000000
--- a/program_info/prismlauncher-header.Source.svg
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="1424"
-   height="512"
-   version="1.1"
-   viewBox="0 0 376.77 135.47"
-   id="svg866"
-   sodipodi:docname="PolyMC-Header.Source.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview868"
-     pagecolor="#343434"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="0.61938202"
-     inkscape:cx="534.40363"
-     inkscape:cy="299.49206"
-     inkscape:window-width="2560"
-     inkscape:window-height="1382"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg866" />
-  <defs
-     id="defs831">
-    <linearGradient
-       id="linearGradient84726"
-       x1="4.4979"
-       x2="12.435"
-       y1="3.8011"
-       y2="9.5681"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#88b858"
-         offset="0"
-         id="stop824" />
-      <stop
-         stop-color="#72b147"
-         offset=".5"
-         id="stop826" />
-      <stop
-         stop-color="#5a9a30"
-         offset="1"
-         id="stop828" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient84726"
-       id="linearGradient1147"
-       gradientUnits="userSpaceOnUse"
-       x1="4.4979"
-       y1="3.8011"
-       x2="12.435"
-       y2="9.5681" />
-  </defs>
-  <g
-     id="g1157">
-    <g
-       transform="matrix(6.95,0,0,6.9572,17.626477,7.241195)"
-       id="g1322">
-      <g
-         id="g1318">
-        <path
-           d="m 3.561,16.016 c 0,0 0,-3.5642 4.9056,-3.5642 4.9069,0 4.9056,3.5642 4.9056,3.5642 z"
-           fill="#765338"
-           id="path1304" />
-        <path
-           d="M 8.4667,12.452 3.5611,16.0162 0.5292,6.6851 Z"
-           fill="#b7835a"
-           id="path1306" />
-        <path
-           d="m 8.4667,12.452 7.9375,-5.7669 -3.0319,9.3311 z"
-           fill="#5b422d"
-           id="path1308" />
-        <path
-           d="M 8.8308,12.716 8.46663,12.98058 8.10246,12.716 c 0,-0.26458 0.36417,-0.26458 0.36417,-0.26458 0,0 0.36417,0 0.36417,0.26458 z"
-           fill="#72b147"
-           id="path1310" />
-        <path
-           d="m 8.4667,12.452 c 0,0 -2e-7,-5.7669 7.9375,-5.7669 l -0.22507,0.69269 -0.91853,1.1965 -0.91853,0.13819 -0.91853,1.1965 -0.91853,0.13819 -0.91853,1.1965 -0.91853,0.13819 -0.91853,1.1965 -0.91853,0.13819 z"
-           fill="#5a9a30"
-           id="path1312" />
-        <path
-           d="M 8.1025,12.716 7.18397,12.57781 6.26544,11.38131 5.34691,11.24312 4.42838,10.04662 3.50985,9.90843 2.59132,8.71193 1.67279,8.57374 0.75426,7.37724 0.52919,6.68455 c 7.9375,1e-7 7.9375,5.7669 7.9375,5.7669 z"
-           fill="#88b858"
-           id="path1314" />
-        <path
-           d="m 0.52917,6.6846 7.9375,5.7669 7.9375,-5.7669 -7.9375,-5.7669 z"
-           fill="url(#linearGradient84726)"
-           id="path1316"
-           style="fill:url(#linearGradient1147)" />
-      </g>
-      <path
-         d="m 0.75424,7.3773 -0.22507,-0.69269 7.9375,5.7669 7.9375,-5.7669 -0.22507,0.69269 -7.7124,5.6034 z"
-         fill-opacity="0"
-         id="path1320" />
-    </g>
-    <g
-       id="polymc-header-text-3"
-       fill="white"
-       transform="matrix(6.9306,0,0,6.9306,-695.39957,-649.40511)"
-       stroke-width="0.26458"
-       aria-label="PolyMC"
-       style="fill:#ffffff;fill-opacity:1">
-      <text
-         xml:space="preserve"
-         style="font-size:9.92603px;line-height:1.25;font-family:sans-serif;letter-spacing:-0.610833px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke-width:0.0101009"
-         x="121.65298"
-         y="107.71044"
-         id="text4534"><tspan
-           sodipodi:role="line"
-           id="tspan4532"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.92603px;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';fill:#ffffff;fill-opacity:1;stroke-width:0.0101009"
-           x="121.65298"
-           y="107.71044">Poly<tspan
-   style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:8.78072px;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans Semi-Bold'"
-   id="tspan137828"
-   rotate="0 0">MC</tspan></tspan></text>
-    </g>
-  </g>
-  <g
-     id="polymc-header-text-4"
-     fill="white"
-     transform="matrix(6.9306,0,0,6.9306,-697.30938,-585.54339)"
-     stroke-width="0.26458"
-     aria-label="PolyMC"
-     style="fill:#ffffff;fill-opacity:1" />
-</svg>
diff --git a/program_info/prismlauncher-header.svg b/program_info/prismlauncher-header.svg
deleted file mode 100644
index 837004e1..00000000
--- a/program_info/prismlauncher-header.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 376.77 135.47" xmlns="http://www.w3.org/2000/svg" class="home">
- <defs>
-  <linearGradient id="a" x1="4.498" x2="12.435" y1="3.801" y2="9.568" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#88b858" offset="0"/>
-   <stop stop-color="#72b147" offset=".5"/>
-   <stop stop-color="#5a9a30" offset="1"/>
-  </linearGradient>
- </defs>
- <path d="M42.375 118.668s0-24.797 34.094-24.797c34.103 0 34.094 24.797 34.094 24.797z" fill="#765338"/>
- <path d="M76.47 93.872 42.376 118.67 21.304 53.751z" fill="#b7835a"/>
- <path d="m76.47 93.872 55.165-40.121-21.072 64.918z" fill="#5b422d"/>
- <path d="m79 95.709-2.53 1.84-2.532-1.84c0-1.84 2.531-1.84 2.531-1.84s2.531 0 2.531 1.84z" fill="#72b147"/>
- <path d="M76.47 93.872s0-40.121 55.165-40.121l-1.564 4.819-6.384 8.324-6.384.962-6.383 8.324-6.384.961-6.384 8.325-6.384.961-6.384 8.324-6.383.962z" fill="#5a9a30"/>
- <path d="m73.938 95.709-6.383-.961-6.384-8.325-6.384-.961-6.384-8.324-6.384-.962-6.383-8.324-6.384-.962-6.384-8.324-1.564-4.819c55.165 0 55.165 40.121 55.165 40.121z" fill="#88b858"/>
- <path d="m.53 6.685 7.937 5.766 7.937-5.766L8.467.918z" fill="url(#a)" transform="matrix(6.95 0 0 6.9572 17.626 7.241)"/>
- <path d="m22.868 58.567-1.564-4.82L76.469 93.87l55.166-40.122-1.564 4.82L76.47 97.55z" fill="none"/>
- <g fill="#fff" stroke-width=".265" aria-label="PolyMC">
-  <g stroke-width=".01" aria-label="PolyMC">
-   <path d="M168.153 47.323q5.434 0 9.287 1.858 3.852 1.788 5.916 5.228 2.133 3.44 2.133 8.324 0 2.958-.895 5.847-.894 2.82-2.889 5.16-1.926 2.27-5.09 3.646t-7.705 1.375h-7.361v18.3h-6.673V47.322zm.688 25.041q2.958 0 4.884-.963 1.927-.963 3.027-2.408 1.1-1.513 1.582-3.164.482-1.651.482-2.958 0-1.514-.482-3.096-.481-1.651-1.65-2.958-1.101-1.376-2.959-2.202-1.788-.894-4.471-.894h-7.705v18.643zM187.49 82.6q0-4.265 1.994-7.705 2.064-3.44 5.641-5.434 3.577-1.995 8.118-1.995 4.678 0 8.186 1.995 3.509 1.995 5.435 5.434 1.926 3.44 1.926 7.705t-1.926 7.773q-1.926 3.44-5.503 5.435-3.509 1.995-8.187 1.995-4.54 0-8.118-1.857-3.508-1.927-5.572-5.298-1.995-3.44-1.995-8.048zm6.397.07q0 2.751 1.238 5.021 1.238 2.202 3.302 3.509 2.133 1.307 4.678 1.307 2.683 0 4.747-1.307 2.133-1.307 3.302-3.509 1.17-2.27 1.17-5.022 0-2.752-1.17-4.953-1.17-2.27-3.302-3.577-2.064-1.376-4.747-1.376-2.614 0-4.747 1.376-2.063 1.376-3.302 3.646-1.17 2.201-1.17 4.884zM223.251 43.858h6.398v53.246h-6.398zM238.914 110.808l18.78-42.17h5.917l-18.368 42.17zm7.017-13.484-13.69-28.687h7.223l11.489 25.453zM266.775 97.085V51.2h.063l23.855 33.774-3.043-.67L311.384 51.2h.122v45.885h-7.06v-29.88l.487 3.59-16.065 22.7h-.122l-16.31-22.7 1.218-3.286v29.576zM352.299 93.62q-.974.67-2.921 1.643-1.887.973-4.564 1.704-2.617.67-5.843.608-5.172-.062-9.31-1.825-4.138-1.826-6.999-4.869-2.86-3.104-4.442-7.06-1.522-4.016-1.522-8.52 0-5.05 1.583-9.25t4.503-7.241q2.921-3.104 6.938-4.808 4.016-1.704 8.763-1.704 4.199 0 7.485 1.156 3.347 1.096 5.598 2.496l-2.799 6.633q-1.704-1.156-4.26-2.313-2.556-1.156-5.781-1.156-2.921 0-5.599 1.217-2.678 1.156-4.686 3.347-2.008 2.13-3.225 4.99-1.156 2.86-1.156 6.208 0 3.468 1.034 6.39 1.096 2.92 3.043 5.05 2.008 2.07 4.747 3.287 2.799 1.156 6.268 1.156 3.408 0 5.964-1.035 2.616-1.095 4.199-2.434z"/>
-  </g>
- </g>
-</svg>
diff --git a/program_info/prismlauncher-monochrome.Source.svg b/program_info/prismlauncher-monochrome.Source.svg
new file mode 100644
index 00000000..7e8c8798
--- /dev/null
+++ b/program_info/prismlauncher-monochrome.Source.svg
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="504.11801"
+   height="292.15204"
+   viewBox="0 0 504.11801 292.15204"
+   fill="none"
+   version="1.1"
+   id="svg180"
+   sodipodi:docname="PrismLauncher_(1).svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview182"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="405.52574"
+     inkscape:cy="178.19091"
+     inkscape:window-width="2560"
+     inkscape:window-height="1386"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg180" />
+  <defs
+     id="defs178">
+    <filter
+       id="filter0_d_56_257"
+       x="78.848396"
+       y="368.16199"
+       width="59.429001"
+       height="64.004501"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood146" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         result="hardAlpha"
+         id="feColorMatrix148" />
+      <feOffset
+         id="feOffset150" />
+      <feGaussianBlur
+         stdDeviation="5"
+         id="feGaussianBlur152" />
+      <feComposite
+         in2="hardAlpha"
+         operator="out"
+         id="feComposite154" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.5 0"
+         id="feColorMatrix156" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow_56_257"
+         id="feBlend158" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_dropShadow_56_257"
+         result="shape"
+         id="feBlend160" />
+    </filter>
+    <linearGradient
+       id="paint0_linear_56_257"
+       x1="77.984497"
+       y1="40.9678"
+       x2="124.275"
+       y2="75.7817"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#BCCA38"
+         id="stop163" />
+      <stop
+         offset="1"
+         stop-color="#5EB672"
+         id="stop165" />
+    </linearGradient>
+    <linearGradient
+       id="paint1_linear_56_257"
+       x1="77.984497"
+       y1="197.04401"
+       x2="124.275"
+       y2="231.858"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#BCCA38"
+         id="stop168" />
+      <stop
+         offset="1"
+         stop-color="#5EB672"
+         id="stop170" />
+    </linearGradient>
+    <linearGradient
+       id="paint2_linear_56_257"
+       x1="77.984497"
+       y1="353.12"
+       x2="124.275"
+       y2="387.93399"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#BCCA38"
+         id="stop173" />
+      <stop
+         offset="1"
+         stop-color="#5EB672"
+         id="stop175" />
+    </linearGradient>
+  </defs>
+  <g
+     id="g2123"
+     transform="translate(-20,-488.228)">
+    <rect
+       x="20"
+       y="644.30402"
+       width="504.11801"
+       height="136.076"
+       rx="15"
+       fill="#202020"
+       id="rect86" />
+    <g
+       id="g1354-3"
+       transform="matrix(0.19116204,0,0,0.19116204,60.622437,664.39882)">
+      <path
+         id="path318-6"
+         style="fill:#b5b3b3;fill-opacity:1;stroke-width:5.05912"
+         d="m 250.77344,33.132812 c -9.79798,10e-7 -19.59643,2.550591 -28.375,7.642579 L 84.207031,121.01758 c -8.778522,5.10312 -15.880498,12.35843 -20.785156,20.89062 -4.881988,8.53219 -7.587891,18.33026 -7.587891,28.52539 v 160.48243 c 0,10.19513 2.70629,20.0146 7.59961,28.53515 l 0.0059,-0.004 c 4.904482,8.52855 11.991948,15.78332 20.767578,20.88476 l 138.191408,80.25195 c 8.77857,5.092 18.57702,7.64454 28.375,7.64454 V 360.83984 l -0.0117,-0.01 c -6.52423,0 -13.04846,-1.69722 -18.91602,-5.10352 L 169.75,319.66016 c -5.84479,-3.4063 -10.56855,-8.2355 -13.8418,-13.91993 -3.26211,-5.68391 -5.0625,-12.22239 -5.0625,-19.01171 v -72.09766 c 0,-6.80046 1.80039,-13.33952 5.0625,-19.02344 3.27376,-5.69605 7.99709,-10.53697 13.85352,-13.93164 l 62.0957,-36.06445 c 5.86757,-3.4058 12.39178,-5.0918 18.91602,-5.0918 z" />
+      <path
+         id="path320-7"
+         style="fill:#e6e6e6;fill-opacity:1;stroke-width:5.05912"
+         d="M 250.77344,33.132812 V 140.51953 c 6.52423,0 13.04846,1.686 18.91601,5.0918 l 31.03711,18.0332 47.51758,-82.748046 -69.0957,-40.121093 c -8.77857,-5.091988 -18.57702,-7.642579 -28.375,-7.642579 z m 97.48242,47.775391 -47.51758,82.746097 31.0586,18.0332 c 5.84269,3.39345 10.56477,8.23229 13.83789,13.91406 l -0.008,0.006 c 3.27376,5.68392 5.07422,12.23411 5.07422,19.02344 v 36.04297 36.05469 c 0,6.78932 -1.80046,13.33901 -5.07422,19.02343 l 5.07422,2.95117 87.41211,50.74805 c 4.89318,-8.52055 7.59961,-18.34002 7.59961,-28.53515 v -80.24219 -80.24024 l -0.01,0.01 c 0,-10.19303 -2.69722,-20.00946 -7.5996,-28.5293 l 0.01,-0.006 0.0117,0.0117 c -4.9043,-8.5322 -11.99486,-15.80058 -20.77344,-20.89258 z m 89.85742,278.542967 -0.0117,0.0117 -92.47461,-53.69922 c -3.27324,5.68442 -7.99701,10.51362 -13.84179,13.91992 l -31.04883,18.02735 -0.01,-0.0176 -31.03711,18.0332 c -5.86755,3.4063 -12.39178,5.10352 -18.91601,5.10352 V 468.2168 c 9.79798,0 19.59643,-2.55253 28.375,-7.64453 l 69.09179,-40.11719 0.004,0.008 69.0957,-40.11914 c 8.77807,-5.10363 15.86864,-12.37151 20.77344,-20.89258 z" />
+      <path
+         d="m 350.70202,214.6316 v 72.09648 c 0,13.60144 -7.20418,26.15462 -18.91654,32.94396 l -62.09562,36.06544 c -5.86706,3.4058 -12.3918,5.10313 -18.91604,5.10313 -6.52475,0 -13.04898,-1.69733 -18.91655,-5.10313 L 169.76216,319.67204 C 158.0498,312.8827 150.84561,300.32952 150.84561,286.72808 V 214.6316 c 0,-13.60094 7.20419,-26.15463 18.91655,-32.94397 l 62.09511,-36.06493 c 5.86757,-3.40631 12.3918,-5.092 18.91655,-5.092 6.52424,0 13.04898,1.69733 18.91604,5.092 l 31.03668,18.03221 31.05894,18.03272 c 5.84479,3.40631 10.56849,8.23625 13.84174,13.92067 3.27376,5.68392 5.0748,12.23396 5.0748,19.0233 z"
+         fill="#ffffff"
+         id="path336-5"
+         style="fill:#464646;fill-opacity:1;stroke-width:5.05912" />
+      <path
+         d="m 350.70202,214.6316 v 72.09648 c 0,6.78933 -1.80104,13.33937 -5.0748,19.0238 -3.27375,5.68442 -7.99695,10.51436 -13.84174,13.92016 l -31.05894,18.03272 -31.03668,18.03272 c -5.86756,3.4058 -12.3918,5.10313 -18.91604,5.10313 V 250.6854 l 74.50968,-43.25293 20.35485,-11.81304 c 3.27376,5.68443 5.0748,12.23447 5.0748,19.0238 z"
+         fill="#dfdfdf"
+         id="path338-3"
+         style="fill:#3c3c3c;fill-opacity:1;stroke-width:5.05912" />
+      <path
+         d="m 250.77382,250.67427 v 110.15521 c -6.52475,0 -13.04898,-1.69733 -18.91655,-5.10363 l -62.09511,-36.06494 c -5.8448,-3.4063 -10.56849,-8.23624 -13.84225,-13.92067 -3.27325,-5.68392 -5.0743,-12.23396 -5.0743,-19.02329 v -72.09648 c 0,-6.78934 1.80105,-13.33938 5.0743,-19.0238 l 94.86504,55.06597 z"
+         fill="#d6d2d2"
+         id="path340-5"
+         style="fill:#4a4a4a;fill-opacity:1;stroke-width:5.05912" />
+    </g>
+    <rect
+       x="20"
+       y="488.228"
+       width="504.11801"
+       height="136.076"
+       rx="15"
+       fill="#f8f8f8"
+       id="rect58" />
+    <path
+       d="m 200.844,550.849 c 0,1.616 -0.371,3.1 -1.113,4.451 -0.742,1.325 -1.881,2.398 -3.418,3.219 -1.536,0.822 -3.444,1.232 -5.722,1.232 h -4.213 v 10.015 h -6.796 v -27.898 h 11.009 c 2.225,0 4.106,0.384 5.643,1.152 1.536,0.769 2.689,1.828 3.457,3.18 0.769,1.351 1.153,2.901 1.153,4.649 z m -10.77,3.497 c 1.298,0 2.265,-0.304 2.901,-0.914 0.636,-0.609 0.954,-1.47 0.954,-2.583 0,-1.113 -0.318,-1.974 -0.954,-2.583 -0.636,-0.609 -1.603,-0.914 -2.901,-0.914 h -3.696 v 6.994 z m 20.706,-3.06 c 0.795,-1.218 1.788,-2.172 2.98,-2.861 1.193,-0.715 2.517,-1.073 3.975,-1.073 v 7.193 h -1.868 c -1.696,0 -2.968,0.371 -3.815,1.113 -0.848,0.715 -1.272,1.987 -1.272,3.815 v 10.293 h -6.796 V 547.59 h 6.796 z m 13.223,-6.001 c -1.192,0 -2.172,-0.344 -2.941,-1.033 -0.742,-0.715 -1.112,-1.589 -1.112,-2.623 0,-1.059 0.37,-1.934 1.112,-2.623 0.769,-0.715 1.749,-1.073 2.941,-1.073 1.166,0 2.12,0.358 2.861,1.073 0.769,0.689 1.153,1.564 1.153,2.623 0,1.034 -0.384,1.908 -1.153,2.623 -0.741,0.689 -1.695,1.033 -2.861,1.033 z m 3.378,2.305 v 22.176 h -6.796 V 547.59 Z m 13.549,22.494 c -1.934,0 -3.656,-0.331 -5.167,-0.994 -1.51,-0.662 -2.702,-1.563 -3.576,-2.702 -0.875,-1.166 -1.365,-2.464 -1.471,-3.895 h 6.717 c 0.079,0.769 0.437,1.391 1.073,1.868 0.635,0.477 1.417,0.716 2.344,0.716 0.848,0 1.497,-0.159 1.948,-0.477 0.476,-0.345 0.715,-0.782 0.715,-1.312 0,-0.636 -0.331,-1.099 -0.994,-1.391 -0.662,-0.318 -1.735,-0.662 -3.219,-1.033 -1.589,-0.371 -2.914,-0.755 -3.974,-1.153 -1.06,-0.423 -1.974,-1.073 -2.742,-1.947 -0.768,-0.901 -1.152,-2.106 -1.152,-3.616 0,-1.272 0.344,-2.424 1.033,-3.458 0.715,-1.059 1.748,-1.894 3.1,-2.503 1.377,-0.61 3.007,-0.914 4.888,-0.914 2.782,0 4.967,0.688 6.557,2.066 1.616,1.378 2.544,3.206 2.782,5.484 h -6.279 c -0.106,-0.768 -0.451,-1.377 -1.033,-1.828 -0.557,-0.45 -1.299,-0.675 -2.226,-0.675 -0.795,0 -1.404,0.159 -1.828,0.477 -0.424,0.291 -0.636,0.702 -0.636,1.232 0,0.635 0.331,1.112 0.994,1.43 0.689,0.318 1.748,0.636 3.179,0.954 1.643,0.424 2.981,0.848 4.014,1.272 1.033,0.397 1.934,1.059 2.702,1.987 0.795,0.901 1.206,2.119 1.232,3.656 0,1.298 -0.371,2.464 -1.113,3.497 -0.715,1.007 -1.761,1.802 -3.139,2.385 -1.351,0.582 -2.928,0.874 -4.729,0.874 z m 41.037,-22.732 c 2.755,0 4.941,0.835 6.557,2.504 1.643,1.669 2.464,3.987 2.464,6.954 v 12.956 h -6.756 v -12.042 c 0,-1.43 -0.384,-2.53 -1.152,-3.298 -0.742,-0.795 -1.775,-1.192 -3.1,-1.192 -1.325,0 -2.371,0.397 -3.14,1.192 -0.741,0.768 -1.112,1.868 -1.112,3.298 v 12.042 h -6.756 v -12.042 c 0,-1.43 -0.384,-2.53 -1.153,-3.298 -0.742,-0.795 -1.775,-1.192 -3.1,-1.192 -1.324,0 -2.371,0.397 -3.139,1.192 -0.742,0.768 -1.113,1.868 -1.113,3.298 v 12.042 h -6.796 V 547.59 h 6.796 v 2.782 c 0.689,-0.927 1.59,-1.656 2.703,-2.185 1.112,-0.557 2.371,-0.835 3.775,-0.835 1.669,0 3.153,0.358 4.451,1.073 1.325,0.715 2.358,1.735 3.1,3.06 0.768,-1.219 1.815,-2.212 3.139,-2.98 1.325,-0.769 2.769,-1.153 4.332,-1.153 z m 17.589,19.473 h 9.697 v 2.941 H 295.94 v -27.7 h 3.616 z m 11.789,-8.028 c 0,-2.225 0.45,-4.172 1.351,-5.841 0.901,-1.696 2.133,-3.008 3.696,-3.935 1.59,-0.927 3.352,-1.391 5.286,-1.391 1.907,0 3.563,0.411 4.967,1.232 1.405,0.822 2.451,1.855 3.14,3.1 v -3.974 h 3.656 v 21.778 h -3.656 v -4.054 c -0.715,1.272 -1.788,2.332 -3.219,3.18 -1.404,0.821 -3.047,1.232 -4.928,1.232 -1.934,0 -3.683,-0.477 -5.246,-1.431 -1.563,-0.954 -2.795,-2.292 -3.696,-4.014 -0.901,-1.722 -1.351,-3.683 -1.351,-5.882 z m 18.44,0.04 c 0,-1.642 -0.331,-3.073 -0.994,-4.292 -0.662,-1.219 -1.563,-2.146 -2.702,-2.782 -1.113,-0.662 -2.345,-0.993 -3.696,-0.993 -1.351,0 -2.583,0.318 -3.696,0.954 -1.113,0.635 -2,1.563 -2.663,2.781 -0.662,1.219 -0.993,2.65 -0.993,4.292 0,1.67 0.331,3.127 0.993,4.372 0.663,1.219 1.55,2.159 2.663,2.822 1.113,0.635 2.345,0.953 3.696,0.953 1.351,0 2.583,-0.318 3.696,-0.953 1.139,-0.663 2.04,-1.603 2.702,-2.822 0.663,-1.245 0.994,-2.689 0.994,-4.332 z m 28.684,-10.849 v 21.778 h -3.616 v -3.219 c -0.689,1.113 -1.656,1.987 -2.901,2.623 -1.219,0.609 -2.57,0.914 -4.054,0.914 -1.696,0 -3.219,-0.345 -4.57,-1.033 -1.351,-0.716 -2.424,-1.775 -3.219,-3.18 -0.768,-1.404 -1.153,-3.113 -1.153,-5.126 v -12.757 h 3.577 v 12.28 c 0,2.146 0.543,3.802 1.629,4.968 1.087,1.139 2.57,1.708 4.451,1.708 1.935,0 3.458,-0.596 4.571,-1.788 1.112,-1.192 1.669,-2.928 1.669,-5.206 v -11.962 z m 16.32,-0.398 c 2.649,0 4.795,0.809 6.438,2.425 1.643,1.589 2.464,3.894 2.464,6.915 v 12.836 h -3.577 v -12.32 c 0,-2.172 -0.543,-3.828 -1.629,-4.967 -1.087,-1.166 -2.57,-1.749 -4.451,-1.749 -1.908,0 -3.431,0.596 -4.57,1.788 -1.113,1.193 -1.67,2.928 -1.67,5.206 v 12.042 h -3.616 v -21.778 h 3.616 v 3.1 c 0.716,-1.113 1.683,-1.974 2.902,-2.583 1.245,-0.61 2.609,-0.915 4.093,-0.915 z m 13.061,11.247 c 0,-2.252 0.45,-4.212 1.351,-5.881 0.901,-1.696 2.146,-3.008 3.736,-3.935 1.616,-0.927 3.457,-1.391 5.524,-1.391 2.675,0 4.874,0.649 6.597,1.948 1.748,1.298 2.901,3.099 3.457,5.404 h -3.895 c -0.371,-1.324 -1.099,-2.371 -2.185,-3.139 -1.06,-0.769 -2.385,-1.153 -3.974,-1.153 -2.067,0 -3.736,0.716 -5.008,2.146 -1.272,1.404 -1.907,3.405 -1.907,6.001 0,2.623 0.635,4.65 1.907,6.081 1.272,1.43 2.941,2.146 5.008,2.146 1.589,0 2.914,-0.371 3.974,-1.113 1.059,-0.742 1.788,-1.802 2.185,-3.179 h 3.895 c -0.583,2.225 -1.749,4.013 -3.497,5.365 -1.749,1.324 -3.935,1.987 -6.557,1.987 -2.067,0 -3.908,-0.464 -5.524,-1.391 -1.59,-0.928 -2.835,-2.239 -3.736,-3.935 -0.901,-1.695 -1.351,-3.682 -1.351,-5.961 z m 35.903,-11.247 c 1.642,0 3.126,0.358 4.451,1.073 1.324,0.689 2.358,1.736 3.099,3.14 0.769,1.404 1.153,3.113 1.153,5.127 v 12.836 h -3.577 v -12.32 c 0,-2.172 -0.543,-3.828 -1.629,-4.967 -1.086,-1.166 -2.57,-1.749 -4.451,-1.749 -1.908,0 -3.431,0.596 -4.57,1.788 -1.113,1.193 -1.67,2.928 -1.67,5.206 v 12.042 h -3.616 v -29.408 h 3.616 v 10.73 c 0.716,-1.113 1.696,-1.974 2.941,-2.583 1.272,-0.61 2.689,-0.915 4.253,-0.915 z m 34.083,10.452 c 0,0.689 -0.039,1.418 -0.119,2.186 h -17.406 c 0.132,2.146 0.861,3.829 2.185,5.047 1.352,1.192 2.981,1.789 4.889,1.789 1.563,0 2.861,-0.358 3.894,-1.073 1.06,-0.742 1.802,-1.723 2.226,-2.941 h 3.894 c -0.583,2.093 -1.748,3.802 -3.497,5.126 -1.748,1.299 -3.921,1.948 -6.517,1.948 -2.067,0 -3.922,-0.464 -5.564,-1.391 -1.616,-0.928 -2.888,-2.239 -3.815,-3.935 -0.928,-1.722 -1.391,-3.709 -1.391,-5.961 0,-2.252 0.45,-4.226 1.351,-5.921 0.901,-1.696 2.159,-2.994 3.775,-3.895 1.643,-0.927 3.524,-1.391 5.644,-1.391 2.066,0 3.894,0.451 5.484,1.351 1.589,0.901 2.808,2.146 3.656,3.736 0.874,1.563 1.311,3.338 1.311,5.325 z m -3.735,-0.755 c 0,-1.377 -0.305,-2.556 -0.914,-3.537 -0.61,-1.006 -1.444,-1.762 -2.504,-2.265 -1.033,-0.53 -2.186,-0.795 -3.457,-0.795 -1.828,0 -3.392,0.583 -4.69,1.749 -1.272,1.166 -2,2.782 -2.186,4.848 z m 11.728,-5.762 c 0.636,-1.245 1.537,-2.212 2.703,-2.901 1.192,-0.689 2.636,-1.034 4.331,-1.034 v 3.736 h -0.953 c -4.054,0 -6.081,2.199 -6.081,6.597 v 11.843 h -3.616 v -21.778 h 3.616 z"
+       fill="#000000"
+       id="path84" />
+    <path
+       d="m 200.844,706.925 c 0,1.616 -0.371,3.1 -1.113,4.451 -0.742,1.325 -1.881,2.398 -3.418,3.219 -1.536,0.822 -3.444,1.232 -5.722,1.232 h -4.213 v 10.015 h -6.796 v -27.898 h 11.009 c 2.225,0 4.106,0.384 5.643,1.152 1.536,0.769 2.689,1.828 3.457,3.179 0.769,1.352 1.153,2.902 1.153,4.65 z m -10.77,3.497 c 1.298,0 2.265,-0.304 2.901,-0.914 0.636,-0.609 0.954,-1.47 0.954,-2.583 0,-1.113 -0.318,-1.974 -0.954,-2.583 -0.636,-0.609 -1.603,-0.914 -2.901,-0.914 h -3.696 v 6.994 z m 20.706,-3.06 c 0.795,-1.218 1.788,-2.172 2.98,-2.861 1.193,-0.715 2.517,-1.073 3.975,-1.073 v 7.193 h -1.868 c -1.696,0 -2.968,0.371 -3.815,1.113 -0.848,0.715 -1.272,1.987 -1.272,3.815 v 10.293 h -6.796 v -22.176 h 6.796 z m 13.223,-6.001 c -1.192,0 -2.172,-0.344 -2.941,-1.033 -0.742,-0.715 -1.112,-1.589 -1.112,-2.623 0,-1.059 0.37,-1.934 1.112,-2.623 0.769,-0.715 1.749,-1.073 2.941,-1.073 1.166,0 2.12,0.358 2.861,1.073 0.769,0.689 1.153,1.564 1.153,2.623 0,1.034 -0.384,1.908 -1.153,2.623 -0.741,0.689 -1.695,1.033 -2.861,1.033 z m 3.378,2.305 v 22.176 h -6.796 v -22.176 z m 13.549,22.494 c -1.934,0 -3.656,-0.331 -5.167,-0.994 -1.51,-0.662 -2.702,-1.563 -3.576,-2.702 -0.875,-1.166 -1.365,-2.464 -1.471,-3.895 h 6.717 c 0.079,0.769 0.437,1.391 1.073,1.868 0.635,0.477 1.417,0.716 2.344,0.716 0.848,0 1.497,-0.159 1.948,-0.477 0.476,-0.345 0.715,-0.782 0.715,-1.312 0,-0.636 -0.331,-1.099 -0.994,-1.391 -0.662,-0.318 -1.735,-0.662 -3.219,-1.033 -1.589,-0.371 -2.914,-0.755 -3.974,-1.153 -1.06,-0.423 -1.974,-1.073 -2.742,-1.947 -0.768,-0.901 -1.152,-2.106 -1.152,-3.616 0,-1.272 0.344,-2.424 1.033,-3.458 0.715,-1.06 1.748,-1.894 3.1,-2.503 1.377,-0.61 3.007,-0.914 4.888,-0.914 2.782,0 4.967,0.688 6.557,2.066 1.616,1.378 2.544,3.206 2.782,5.484 h -6.279 c -0.106,-0.768 -0.451,-1.377 -1.033,-1.828 -0.557,-0.45 -1.299,-0.675 -2.226,-0.675 -0.795,0 -1.404,0.159 -1.828,0.477 -0.424,0.291 -0.636,0.702 -0.636,1.231 0,0.636 0.331,1.113 0.994,1.431 0.689,0.318 1.748,0.636 3.179,0.954 1.643,0.424 2.981,0.848 4.014,1.272 1.033,0.397 1.934,1.059 2.702,1.987 0.795,0.901 1.206,2.119 1.232,3.656 0,1.298 -0.371,2.464 -1.113,3.497 -0.715,1.007 -1.761,1.802 -3.139,2.385 -1.351,0.582 -2.928,0.874 -4.729,0.874 z m 41.037,-22.732 c 2.755,0 4.941,0.835 6.557,2.504 1.643,1.669 2.464,3.987 2.464,6.954 v 12.956 h -6.756 V 713.8 c 0,-1.43 -0.384,-2.53 -1.152,-3.298 -0.742,-0.795 -1.775,-1.192 -3.1,-1.192 -1.325,0 -2.371,0.397 -3.14,1.192 -0.741,0.768 -1.112,1.868 -1.112,3.298 v 12.042 h -6.756 V 713.8 c 0,-1.43 -0.384,-2.53 -1.153,-3.298 -0.742,-0.795 -1.775,-1.192 -3.1,-1.192 -1.324,0 -2.371,0.397 -3.139,1.192 -0.742,0.768 -1.113,1.868 -1.113,3.298 v 12.042 h -6.796 v -22.176 h 6.796 v 2.782 c 0.689,-0.927 1.59,-1.656 2.703,-2.185 1.112,-0.557 2.371,-0.835 3.775,-0.835 1.669,0 3.153,0.358 4.451,1.073 1.325,0.715 2.358,1.735 3.1,3.06 0.768,-1.219 1.815,-2.212 3.139,-2.981 1.325,-0.768 2.769,-1.152 4.332,-1.152 z m 17.589,19.473 h 9.697 v 2.941 H 295.94 v -27.7 h 3.616 z m 11.789,-8.028 c 0,-2.225 0.45,-4.172 1.351,-5.842 0.901,-1.695 2.133,-3.007 3.696,-3.934 1.59,-0.927 3.352,-1.391 5.286,-1.391 1.907,0 3.563,0.411 4.967,1.232 1.405,0.821 2.451,1.855 3.14,3.1 v -3.974 h 3.656 v 21.778 h -3.656 v -4.054 c -0.715,1.272 -1.788,2.332 -3.219,3.18 -1.404,0.821 -3.047,1.232 -4.928,1.232 -1.934,0 -3.683,-0.477 -5.246,-1.431 -1.563,-0.954 -2.795,-2.292 -3.696,-4.014 -0.901,-1.722 -1.351,-3.683 -1.351,-5.882 z m 18.44,0.04 c 0,-1.642 -0.331,-3.073 -0.994,-4.292 -0.662,-1.219 -1.563,-2.146 -2.702,-2.782 -1.113,-0.662 -2.345,-0.993 -3.696,-0.993 -1.351,0 -2.583,0.318 -3.696,0.954 -1.113,0.635 -2,1.563 -2.663,2.781 -0.662,1.219 -0.993,2.65 -0.993,4.292 0,1.67 0.331,3.127 0.993,4.372 0.663,1.219 1.55,2.159 2.663,2.822 1.113,0.635 2.345,0.953 3.696,0.953 1.351,0 2.583,-0.318 3.696,-0.953 1.139,-0.663 2.04,-1.603 2.702,-2.822 0.663,-1.245 0.994,-2.689 0.994,-4.332 z m 28.684,-10.849 v 21.778 h -3.616 v -3.219 c -0.689,1.113 -1.656,1.987 -2.901,2.623 -1.219,0.609 -2.57,0.914 -4.054,0.914 -1.696,0 -3.219,-0.345 -4.57,-1.033 -1.351,-0.716 -2.424,-1.775 -3.219,-3.18 -0.768,-1.404 -1.153,-3.113 -1.153,-5.126 v -12.757 h 3.577 v 12.28 c 0,2.146 0.543,3.802 1.629,4.967 1.087,1.14 2.57,1.709 4.451,1.709 1.935,0 3.458,-0.596 4.571,-1.788 1.112,-1.192 1.669,-2.928 1.669,-5.206 v -11.962 z m 16.32,-0.398 c 2.649,0 4.795,0.808 6.438,2.425 1.643,1.589 2.464,3.894 2.464,6.915 v 12.836 h -3.577 v -12.32 c 0,-2.172 -0.543,-3.828 -1.629,-4.967 -1.087,-1.166 -2.57,-1.749 -4.451,-1.749 -1.908,0 -3.431,0.596 -4.57,1.788 -1.113,1.193 -1.67,2.928 -1.67,5.206 v 12.042 h -3.616 v -21.778 h 3.616 v 3.1 c 0.716,-1.113 1.683,-1.974 2.902,-2.584 1.245,-0.609 2.609,-0.914 4.093,-0.914 z m 13.061,11.247 c 0,-2.252 0.45,-4.212 1.351,-5.882 0.901,-1.695 2.146,-3.007 3.736,-3.934 1.616,-0.927 3.457,-1.391 5.524,-1.391 2.675,0 4.874,0.649 6.597,1.947 1.748,1.299 2.901,3.1 3.457,5.405 h -3.895 c -0.371,-1.324 -1.099,-2.371 -2.185,-3.139 -1.06,-0.769 -2.385,-1.153 -3.974,-1.153 -2.067,0 -3.736,0.716 -5.008,2.146 -1.272,1.404 -1.907,3.405 -1.907,6.001 0,2.623 0.635,4.65 1.907,6.081 1.272,1.43 2.941,2.146 5.008,2.146 1.589,0 2.914,-0.371 3.974,-1.113 1.059,-0.742 1.788,-1.802 2.185,-3.179 h 3.895 c -0.583,2.225 -1.749,4.013 -3.497,5.365 -1.749,1.324 -3.935,1.987 -6.557,1.987 -2.067,0 -3.908,-0.464 -5.524,-1.391 -1.59,-0.928 -2.835,-2.239 -3.736,-3.935 -0.901,-1.695 -1.351,-3.682 -1.351,-5.961 z m 35.903,-11.247 c 1.642,0 3.126,0.358 4.451,1.073 1.324,0.689 2.358,1.736 3.099,3.14 0.769,1.404 1.153,3.113 1.153,5.127 v 12.836 h -3.577 v -12.32 c 0,-2.172 -0.543,-3.828 -1.629,-4.967 -1.086,-1.166 -2.57,-1.749 -4.451,-1.749 -1.908,0 -3.431,0.596 -4.57,1.788 -1.113,1.193 -1.67,2.928 -1.67,5.206 v 12.042 h -3.616 v -29.408 h 3.616 v 10.73 c 0.716,-1.113 1.696,-1.974 2.941,-2.584 1.272,-0.609 2.689,-0.914 4.253,-0.914 z m 34.083,10.452 c 0,0.689 -0.039,1.418 -0.119,2.186 h -17.406 c 0.132,2.146 0.861,3.828 2.185,5.047 1.352,1.192 2.981,1.789 4.889,1.789 1.563,0 2.861,-0.358 3.894,-1.073 1.06,-0.742 1.802,-1.723 2.226,-2.941 h 3.894 c -0.583,2.093 -1.748,3.802 -3.497,5.126 -1.748,1.299 -3.921,1.948 -6.517,1.948 -2.067,0 -3.922,-0.464 -5.564,-1.391 -1.616,-0.928 -2.888,-2.239 -3.815,-3.935 -0.928,-1.722 -1.391,-3.709 -1.391,-5.961 0,-2.252 0.45,-4.226 1.351,-5.921 0.901,-1.696 2.159,-2.994 3.775,-3.895 1.643,-0.927 3.524,-1.391 5.644,-1.391 2.066,0 3.894,0.451 5.484,1.351 1.589,0.901 2.808,2.146 3.656,3.736 0.874,1.563 1.311,3.338 1.311,5.325 z m -3.735,-0.755 c 0,-1.377 -0.305,-2.556 -0.914,-3.537 -0.61,-1.006 -1.444,-1.762 -2.504,-2.265 -1.033,-0.53 -2.186,-0.795 -3.457,-0.795 -1.828,0 -3.392,0.583 -4.69,1.749 -1.272,1.166 -2,2.782 -2.186,4.848 z m 11.728,-5.762 c 0.636,-1.245 1.537,-2.212 2.703,-2.901 1.192,-0.689 2.636,-1.034 4.331,-1.034 v 3.736 h -0.953 c -4.054,0 -6.081,2.199 -6.081,6.597 v 11.843 h -3.616 v -21.778 h 3.616 z"
+       fill="#fefefe"
+       id="path112" />
+    <g
+       id="g1354"
+       transform="matrix(0.19116204,0,0,0.19116204,60.622437,508.32282)">
+      <path
+         id="path318"
+         style="fill:#464646;fill-opacity:1;stroke-width:5.05912"
+         d="m 250.77344,33.132812 c -9.79798,10e-7 -19.59643,2.550591 -28.375,7.642579 L 84.207031,121.01758 c -8.778522,5.10312 -15.880498,12.35843 -20.785156,20.89062 -4.881988,8.53219 -7.587891,18.33026 -7.587891,28.52539 v 160.48243 c 0,10.19513 2.70629,20.0146 7.59961,28.53515 l 0.0059,-0.004 c 4.904482,8.52855 11.991948,15.78332 20.767578,20.88476 l 138.191408,80.25195 c 8.77857,5.092 18.57702,7.64454 28.375,7.64454 V 360.83984 l -0.0117,-0.01 c -6.52423,0 -13.04846,-1.69722 -18.91602,-5.10352 L 169.75,319.66016 c -5.84479,-3.4063 -10.56855,-8.2355 -13.8418,-13.91993 -3.26211,-5.68391 -5.0625,-12.22239 -5.0625,-19.01171 v -72.09766 c 0,-6.80046 1.80039,-13.33952 5.0625,-19.02344 3.27376,-5.69605 7.99709,-10.53697 13.85352,-13.93164 l 62.0957,-36.06445 c 5.86757,-3.4058 12.39178,-5.0918 18.91602,-5.0918 z" />
+      <path
+         id="path320"
+         style="fill:#606060;fill-opacity:1;stroke-width:5.05912"
+         d="M 250.77344,33.132812 V 140.51953 c 6.52423,0 13.04846,1.686 18.91601,5.0918 l 31.03711,18.0332 47.51758,-82.748046 -69.0957,-40.121093 c -8.77857,-5.091988 -18.57702,-7.642579 -28.375,-7.642579 z m 97.48242,47.775391 -47.51758,82.746097 31.0586,18.0332 c 5.84269,3.39345 10.56477,8.23229 13.83789,13.91406 l -0.008,0.006 c 3.27376,5.68392 5.07422,12.23411 5.07422,19.02344 v 36.04297 36.05469 c 0,6.78932 -1.80046,13.33901 -5.07422,19.02343 l 5.07422,2.95117 87.41211,50.74805 c 4.89318,-8.52055 7.59961,-18.34002 7.59961,-28.53515 v -80.24219 -80.24024 l -0.01,0.01 c 0,-10.19303 -2.69722,-20.00946 -7.5996,-28.5293 l 0.01,-0.006 0.0117,0.0117 c -4.9043,-8.5322 -11.99486,-15.80058 -20.77344,-20.89258 z m 89.85742,278.542967 -0.0117,0.0117 -92.47461,-53.69922 c -3.27324,5.68442 -7.99701,10.51362 -13.84179,13.91992 l -31.04883,18.02735 -0.01,-0.0176 -31.03711,18.0332 c -5.86755,3.4063 -12.39178,5.10352 -18.91601,5.10352 V 468.2168 c 9.79798,0 19.59643,-2.55253 28.375,-7.64453 l 69.09179,-40.11719 0.004,0.008 69.0957,-40.11914 c 8.77807,-5.10363 15.86864,-12.37151 20.77344,-20.89258 z" />
+      <path
+         d="m 350.70202,214.6316 v 72.09648 c 0,13.60144 -7.20418,26.15462 -18.91654,32.94396 l -62.09562,36.06544 c -5.86706,3.4058 -12.3918,5.10313 -18.91604,5.10313 -6.52475,0 -13.04898,-1.69733 -18.91655,-5.10313 L 169.76216,319.67204 C 158.0498,312.8827 150.84561,300.32952 150.84561,286.72808 V 214.6316 c 0,-13.60094 7.20419,-26.15463 18.91655,-32.94397 l 62.09511,-36.06493 c 5.86757,-3.40631 12.3918,-5.092 18.91655,-5.092 6.52424,0 13.04898,1.69733 18.91604,5.092 l 31.03668,18.03221 31.05894,18.03272 c 5.84479,3.40631 10.56849,8.23625 13.84174,13.92067 3.27376,5.68392 5.0748,12.23396 5.0748,19.0233 z"
+         fill="#ffffff"
+         id="path336"
+         style="stroke-width:5.05912" />
+      <path
+         d="m 350.70202,214.6316 v 72.09648 c 0,6.78933 -1.80104,13.33937 -5.0748,19.0238 -3.27375,5.68442 -7.99695,10.51436 -13.84174,13.92016 l -31.05894,18.03272 -31.03668,18.03272 c -5.86756,3.4058 -12.3918,5.10313 -18.91604,5.10313 V 250.6854 l 74.50968,-43.25293 20.35485,-11.81304 c 3.27376,5.68443 5.0748,12.23447 5.0748,19.0238 z"
+         fill="#dfdfdf"
+         id="path338"
+         style="stroke-width:5.05912" />
+      <path
+         d="m 250.77382,250.67427 v 110.15521 c -6.52475,0 -13.04898,-1.69733 -18.91655,-5.10363 l -62.09511,-36.06494 c -5.8448,-3.4063 -10.56849,-8.23624 -13.84225,-13.92067 -3.27325,-5.68392 -5.0743,-12.23396 -5.0743,-19.02329 v -72.09648 c 0,-6.78934 1.80105,-13.33938 5.0743,-19.0238 l 94.86504,55.06597 z"
+         fill="#d6d2d2"
+         id="path340"
+         style="stroke-width:5.05912" />
+    </g>
+  </g>
+</svg>
diff --git a/program_info/prismlauncher.icns b/program_info/prismlauncher.icns
index 231fa22a..a4c0f7ea 100644
Binary files a/program_info/prismlauncher.icns and b/program_info/prismlauncher.icns differ
diff --git a/program_info/prismlauncher.ico b/program_info/prismlauncher.ico
index d56313f3..e4529f93 100644
Binary files a/program_info/prismlauncher.ico and b/program_info/prismlauncher.ico differ
-- 
cgit 


From 50bbf2aacce0e525b8af8956aeffe0fdecd44b5c Mon Sep 17 00:00:00 2001
From: Sebastian Rüth <sebastian.rueth@protonmail.com>
Date: Tue, 18 Oct 2022 15:14:00 +0200
Subject: fix text clipping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>
---
 launcher/ui/widgets/ProjectItem.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/launcher/ui/widgets/ProjectItem.cpp b/launcher/ui/widgets/ProjectItem.cpp
index 01be88d9..93d3fca1 100644
--- a/launcher/ui/widgets/ProjectItem.cpp
+++ b/launcher/ui/widgets/ProjectItem.cpp
@@ -91,8 +91,8 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
         }
 
         // On the bottom, aligned to the left after the icon, and featuring at most two lines of text (with some margin space to spare)
-        painter->drawText(rect.x(), rect.y() + rect.height() - 2.2 * opt.fontMetrics.height(), remaining_width,
-                          2 * opt.fontMetrics.height(), Qt::TextWordWrap, description);
+        painter->drawText(rect.x(), rect.y() + rect.height() - 2.0 * opt.fontMetrics.height(), remaining_width,
+                          4 * opt.fontMetrics.height(), Qt::TextWordWrap, description);
     }
 
     painter->restore();
-- 
cgit 


From d6479e133d340dcd5ed265b49149627d8cb4fe5b Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 18 Oct 2022 15:13:02 -0300
Subject: fix: properly center project descriptions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In particular, this takes into account the space used by the title, so
(hopefully) there won't be problems with custom themes with that.

Signed-off-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>
---
 launcher/ui/widgets/ProjectItem.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/launcher/ui/widgets/ProjectItem.cpp b/launcher/ui/widgets/ProjectItem.cpp
index 93d3fca1..1011d6e4 100644
--- a/launcher/ui/widgets/ProjectItem.cpp
+++ b/launcher/ui/widgets/ProjectItem.cpp
@@ -51,6 +51,8 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
     auto remaining_width = rect.width() - icon_width - 2 * icon_x_margin;
     rect.setRect(rect.x() + icon_width + 2 * icon_x_margin, rect.y(), remaining_width, rect.height());
 
+    int title_height = 0;
+
     {  // Title painting
         auto title = index.data(UserDataTypes::TITLE).toString();
 
@@ -66,8 +68,10 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
         font.setPointSize(font.pointSize() + 2);
         painter->setFont(font);
 
+        title_height = QFontMetrics(font).height();
+
         // On the top, aligned to the left after the icon
-        painter->drawText(rect.x(), rect.y() + QFontMetrics(font).height(), title);
+        painter->drawText(rect.x(), rect.y() + title_height, title);
 
         painter->restore();
     }
@@ -90,9 +94,19 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
                 description += cut_text.at(1).second;
         }
 
+        int description_x = rect.x();
+
+        // Have the y-value be set based on the number of lines in the description, to centralize the
+        // description text with the space between the base and the title.
+        int description_y = rect.y() + title_height + (rect.height() - title_height) / 2;
+        if (cut_text.size() == 1)
+            description_y -= opt.fontMetrics.height() / 2;
+        else
+            description_y -= opt.fontMetrics.height();
+
         // On the bottom, aligned to the left after the icon, and featuring at most two lines of text (with some margin space to spare)
-        painter->drawText(rect.x(), rect.y() + rect.height() - 2.0 * opt.fontMetrics.height(), remaining_width,
-                          4 * opt.fontMetrics.height(), Qt::TextWordWrap, description);
+        painter->drawText(description_x, description_y, remaining_width,
+                          cut_text.size() * opt.fontMetrics.height(), Qt::TextWordWrap, description);
     }
 
     painter->restore();
-- 
cgit 


From 6439ef11aae3e4c716d78b6ad87fedba4887f778 Mon Sep 17 00:00:00 2001
From: MMK21Hub <KAGfan2018@outlook.com>
Date: Wed, 19 Oct 2022 19:21:48 +0100
Subject: Fix incorrect release titles

Signed-off-by: MMK21Hub <KAGfan2018@outlook.com>
---
 .github/workflows/trigger_release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml
index 476280df..e74e870a 100644
--- a/.github/workflows/trigger_release.yml
+++ b/.github/workflows/trigger_release.yml
@@ -65,7 +65,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
-          name: PrismLauncher ${{ env.VERSION }}
+          name: Prism Launcher ${{ env.VERSION }}
           draft: true
           prerelease: false
           files: |
-- 
cgit 


From 297c593edd3cc2f713aa44b86fcd3c45004fe3b7 Mon Sep 17 00:00:00 2001
From: TheEvilSkeleton <theevilskeleton@riseup.net>
Date: Tue, 18 Oct 2022 21:52:23 -0400
Subject: Improve approachability

Signed-off-by: TheEvilSkeleton <theevilskeleton@riseup.net>
---
 .../org.prismlauncher.PrismLauncher.desktop.in       |  4 ++--
 .../org.prismlauncher.PrismLauncher.metainfo.xml.in  | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/program_info/org.prismlauncher.PrismLauncher.desktop.in b/program_info/org.prismlauncher.PrismLauncher.desktop.in
index 63a6b586..e608f588 100644
--- a/program_info/org.prismlauncher.PrismLauncher.desktop.in
+++ b/program_info/org.prismlauncher.PrismLauncher.desktop.in
@@ -7,6 +7,6 @@ Terminal=false
 Exec=@Launcher_APP_BINARY_NAME@
 StartupNotify=true
 Icon=org.prismlauncher.PrismLauncher
-Categories=Game;
-Keywords=game;minecraft;launcher;mc;
+Categories=Game;ActionGame;AdventureGame;Simulation;
+Keywords=game;minecraft;launcher;mc;multimc;polymc;
 StartupWMClass=PrismLauncher
diff --git a/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in b/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in
index 2e10f7be..55965eb7 100644
--- a/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in
+++ b/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in
@@ -1,33 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
   <id>org.prismlauncher.PrismLauncher</id>
-  <provides>
-    <id>org.prismlauncher.PrismLauncher</id>
-  </provides>
   <launchable type="desktop-id">org.prismlauncher.PrismLauncher.desktop</launchable>
-  <name>PrismLauncher</name>
-  <developer_name>PrismLauncher</developer_name>
+  <name>Prism Launcher</name>
+  <developer_name>Prism Launcher Contributors</developer_name>
   <summary>A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once</summary>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-only</project_license>
   <url type="homepage">https://prismlauncher.org/</url>
   <url type="help">https://prismlauncher.org/wiki/</url>
+  <url type="bugtracker">https://github.com/PrismLauncher/PrismLauncher/issues</url>
+  <url type="contact">https://discord.gg/prismlauncher</url>
+  <url type="vcs-browser">https://github.com/PrismLauncher/PrismLauncher</url>
+  <url type="contribute">https://github.com/PrismLauncher/PrismLauncher/blob/develop/CONTRIBUTING.md</url>
+  <url type="translate">https://hosted.weblate.org/projects/prismlauncher/launcher</url>
   <description>
-    <p>PrismLauncher is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p>
+    <p>Prism Launcher is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p>
     <p>Features:</p>
     <ul>
       <li>Easily install game modifications, such as Fabric, Forge and Quilt</li>
-      <li>Control your java settings</li>
+      <li>Control your Java settings</li>
       <li>Manage worlds and resource packs from the launcher</li>
       <li>See logs and other details easily</li>
       <li>Kill Minecraft in case of a crash/freeze</li>
-      <li>Isolate minecraft instances to keep everything clean</li>
+      <li>Isolate Minecraft instances to keep everything clean</li>
       <li>Install and update mods directly from the launcher</li>
     </ul>
   </description>
   <screenshots>
     <screenshot type="default">
-      <caption>The main PrismLauncher window</caption>
+      <caption>The main Prism Launcher window</caption>
       <image type="source" width="976" height="764">https://prismlauncher.org/img/screenshots/LauncherDark.png</image>
     </screenshot>
     <screenshot>
-- 
cgit 


From d7478c14fdbbe1554d8bb434ecc9afefd23bd5a5 Mon Sep 17 00:00:00 2001
From: Jackson Huffstutler <jack.huffstutler@gmail.com>
Date: Wed, 19 Oct 2022 16:03:18 -0500
Subject: Renamed inappropriate instances of "PrismLauncher" to "Prism
 Launcher"

Signed-off-by: IroncladLandship <jack.huffstutler@gmail.com>
---
 CMakeLists.txt                                               | 2 +-
 program_info/README.md                                       | 4 ++--
 program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3b74a73..131d3e53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,7 @@ endif()
 ##################################### Set Application options #####################################
 
 ######## Set URLs ########
-set(Launcher_NEWS_RSS_URL "https://prismlauncher.org/feed/feed.xml" CACHE STRING "URL to fetch PrismLauncher's news RSS feed from.")
+set(Launcher_NEWS_RSS_URL "https://prismlauncher.org/feed/feed.xml" CACHE STRING "URL to fetch Prism Launcher's news RSS feed from.")
 set(Launcher_NEWS_OPEN_URL "https://prismlauncher.org/news" CACHE STRING "URL that gets opened when the user clicks 'More News'")
 set(Launcher_HELP_URL "https://prismlauncher.org/wiki/help-pages/%1" CACHE STRING "URL (with arg %1 to be substituted with page-id) that gets opened when the user requests help")
 
diff --git a/program_info/README.md b/program_info/README.md
index 8fc81a19..5ba2fa32 100644
--- a/program_info/README.md
+++ b/program_info/README.md
@@ -1,6 +1,6 @@
-# PrismLauncher Program Info
+# Prism Launcher Program Info
 
-This is PrismLauncher's program info which contains information about:
+This is Prism Launcher's program info which contains information about:
 
 - Application name and logo (and branding in general)
 - Various URLs and API endpoints
diff --git a/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in b/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in
index 2e10f7be..5fca93ac 100644
--- a/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in
+++ b/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in
@@ -5,15 +5,15 @@
     <id>org.prismlauncher.PrismLauncher</id>
   </provides>
   <launchable type="desktop-id">org.prismlauncher.PrismLauncher.desktop</launchable>
-  <name>PrismLauncher</name>
-  <developer_name>PrismLauncher</developer_name>
+  <name>Prism Launcher</name>
+  <developer_name>Prism Launcher</developer_name>
   <summary>A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once</summary>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-only</project_license>
   <url type="homepage">https://prismlauncher.org/</url>
   <url type="help">https://prismlauncher.org/wiki/</url>
   <description>
-    <p>PrismLauncher is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p>
+    <p>Prism Launcher is a custom launcher for Minecraft that focuses on predictability, long term stability and simplicity.</p>
     <p>Features:</p>
     <ul>
       <li>Easily install game modifications, such as Fabric, Forge and Quilt</li>
@@ -27,7 +27,7 @@
   </description>
   <screenshots>
     <screenshot type="default">
-      <caption>The main PrismLauncher window</caption>
+      <caption>The main Prism Launcher window</caption>
       <image type="source" width="976" height="764">https://prismlauncher.org/img/screenshots/LauncherDark.png</image>
     </screenshot>
     <screenshot>
-- 
cgit 


From 513d93cfc786a1f0d359f6ef109577eb2e713ca9 Mon Sep 17 00:00:00 2001
From: Skyler Grey <skyler3665@gmail.com>
Date: Wed, 19 Oct 2022 23:16:42 +0100
Subject: Change the derivation to have parity with nixpkgs

- Symlink rather than copying libraries
- Update maintainers
- Reformat with nixpkgs-fmt

Signed-off-by: Skyler Grey <skyler3665@gmail.com>
---
 nix/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nix/default.nix b/nix/default.nix
index c8b4f7cc..c7fc7576 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -59,20 +59,20 @@ stdenv.mkDerivation rec {
     # Copy libnbtplusplus
     rm -rf source/libraries/libnbtplusplus
     mkdir source/libraries/libnbtplusplus
-    cp -a ${libnbtplusplus}/* source/libraries/libnbtplusplus
-    chmod a+r+w source/libraries/libnbtplusplus/*
+    ln -s ${libnbtplusplus}/* source/libraries/libnbtplusplus
+    chmod -R +r+w source/libraries/libnbtplusplus
     # Copy tomlplusplus
     rm -rf source/libraries/tomlplusplus
     mkdir source/libraries/tomlplusplus
-    cp -a ${tomlplusplus}/* source/libraries/tomlplusplus
-    chmod a+r+w source/libraries/tomlplusplus/*
+    ln -s ${tomlplusplus}/* source/libraries/tomlplusplus
+    chmod -R +r+w source/libraries/tomlplusplus
   '';
 
   cmakeFlags = [
     "-GNinja"
     "-DLauncher_QT_VERSION_MAJOR=${lib.versions.major qtbase.version}"
   ] ++ lib.optionals enableLTO [ "-DENABLE_LTO=on" ]
-    ++ lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
+  ++ lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
 
   # we have to check if the system is NixOS before adding stdenv.cc.cc.lib (#923)
   postInstall = ''
@@ -96,6 +96,6 @@ stdenv.mkDerivation rec {
     '';
     platforms = platforms.unix;
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ starcraft66 kloenk ];
+    maintainers = with maintainers; [ minion3665 Scrumplex ];
   };
 }
-- 
cgit 


From dab091a7b776c66541238db6805022fcf4432406 Mon Sep 17 00:00:00 2001
From: Skyler Grey <skyler3665@gmail.com>
Date: Wed, 19 Oct 2022 23:40:49 +0100
Subject: Update NIX.md so it has more methods + is clearer

- Add proper headings
- Change flake codeblocks so that configuration stuff isn't in the same
  place as flake.nix stuff
- Add instructions for not using the overlay with flakes
- Add instructions for running ad-hoc with flakes

Signed-off-by: Skyler Grey <skyler3665@gmail.com>
---
 nix/NIX.md | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 54 insertions(+), 7 deletions(-)

diff --git a/nix/NIX.md b/nix/NIX.md
index e57d5be7..980d20e8 100644
--- a/nix/NIX.md
+++ b/nix/NIX.md
@@ -1,21 +1,59 @@
-# How to import
+# Running on Nix
 
-To import with flakes use
+## Putting it in your system configuration
+
+### On flakes-enabled nix
+
+#### Directly installing
+
+The `prismlauncher` flake provides a package which you can install along with
+the rest of your packages
 
 ```nix
+# In your flake.nix:
 {
   inputs = {
     prismlauncher.url = "github:PrismLauncher/PrismLauncher";
   };
+}
+```
 
-...
+```nix
+# And in your system configuration:
+environment.systemPackages = [ prismlauncher.packages.${pkgs.system}.prismlauncher ];
 
-  nixpkgs.overlays = [ inputs.prismlauncher.overlay ]; ## Within configuration.nix
-  environment.systemPackages = with pkgs; [ prismlauncher ]; ##
+# Or in your home-manager configuration:
+home.packages = [ prismlauncher.packages.${pkgs.system}.prismlauncher ];
+```
+
+#### Using the overlay
+
+Alternatively, you can overlay the prismlauncher version in nixpkgs which will
+allow you to install using `pkgs` as you normally would while also using the
+latest version
+
+```nix
+# In your flake.nix:
+{
+  inputs = {
+    prismlauncher.url = "github:PrismLauncher/PrismLauncher";
+  };
 }
 ```
 
-To import without flakes use channels:
+```nix
+# And in your system configuration:
+nixpkgs.overlays = [ inputs.prismlauncher.overlay ];
+environment.systemPackages = [ pkgs.prismlauncher ];
+
+# Or in your home-manager configuration:
+config.nixpkgs.overlays = [ inputs.prismlauncher.overlay ];
+home.packages = [ pkgs.prismlauncher ];
+```
+
+### Without flakes-enabled nix
+
+#### Using channels
 
 ```sh
 nix-channel --add https://github.com/PrismLauncher/PrismLauncher/archive/master.tar.gz prismlauncher
@@ -23,9 +61,10 @@ nix-channel --update prismlauncher
 nix-env -iA prismlauncher
 ```
 
-or alternatively you can use
+#### Using the overlay
 
 ```nix
+# In your configuration.nix:
 {
   nixpkgs.overlays = [
     (import (builtins.fetchTarball "https://github.com/PrismLauncher/PrismLauncher/archive/develop.tar.gz")).overlay
@@ -34,3 +73,11 @@ or alternatively you can use
   environment.systemPackages = with pkgs; [ prismlauncher ];
 }
 ```
+
+## Running ad-hoc
+
+If you're on a flakes-enabled nix you can run the launcher in one-line
+
+```sh
+nix run github:PrismLauncher/PrismLauncher
+```
-- 
cgit 


From ae910eea62b07217a4407753f75487e500b33452 Mon Sep 17 00:00:00 2001
From: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
Date: Tue, 18 Oct 2022 18:08:34 +0400
Subject: Change issue templates to Prism branding

Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yml | 12 ++++++------
 .github/ISSUE_TEMPLATE/rfc.yml        |  4 ++--
 .github/ISSUE_TEMPLATE/suggestion.yml |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index ab3c8a29..9166fcf2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -8,9 +8,9 @@ body:
       If you need help with running Minecraft, please visit us on our Discord before making a bug report.
 
       Before submitting a bug report, please make sure you have read this *entire* form, and that:
-      * You have read the [PolyMC wiki](https://polymc.org/wiki/) and it has not answered your question.
+      * You have read the [PrismLauncher wiki](https://polymc.org/wiki/) and it has not answered your question.
       * Your bug is not caused by Minecraft or any mods you have installed.
-      * Your issue has not been reported before, [make sure to use the search function!](https://github.com/PolyMC/PolyMC/issues)
+      * Your issue has not been reported before, [make sure to use the search function!](https://github.com/PrismLauncher/PrismLauncher/issues)
 
       **Do not forget to give your issue a descriptive title.** "Bug in the instance screen" makes it hard to distinguish issues at a glance.
 - type: dropdown
@@ -25,15 +25,15 @@ body:
     - Other
 - type: textarea
   attributes:
-    label: Version of PolyMC
-    description: The version of PolyMC used in the bug report.
-    placeholder: PolyMC 1.4.1
+    label: Version of PrismLauncher
+    description: The version of PrismLauncher used in the bug report.
+    placeholder: PrismLauncher 1.4.1
   validations:
     required: true
 - type: textarea
   attributes:
     label: Version of Qt
-    description: The version of Qt used in the bug report. You can find it in Help -> About PolyMC -> About Qt.
+    description: The version of Qt used in the bug report. You can find it in Help -> About PrismLauncher -> About Qt.
     placeholder: Qt 6.3.0
   validations:
     required: true
diff --git a/.github/ISSUE_TEMPLATE/rfc.yml b/.github/ISSUE_TEMPLATE/rfc.yml
index 0a40d01d..506e2b86 100644
--- a/.github/ISSUE_TEMPLATE/rfc.yml
+++ b/.github/ISSUE_TEMPLATE/rfc.yml
@@ -6,7 +6,7 @@ body:
 - type: markdown
   attributes:
     value: |
-      ### Use this form to suggest a larger change for PolyMC.
+      ### Use this form to suggest a larger change for PrismLauncher.
 - type: textarea
   attributes:
     label: Goal
@@ -18,7 +18,7 @@ body:
   attributes:
     label: Motivation
     description: |
-      Introduce the topic. If this is a not-well-known section of PolyMC, a detailed explanation of the background is recommended.
+      Introduce the topic. If this is a not-well-known section of PrismLauncher, a detailed explanation of the background is recommended.
       Some example points of discussion:
        - What specific problems are you facing right now that you're trying to address?
        - Are there any previous discussions? Link to them and summarize them (don't force your readers to read them though!).
diff --git a/.github/ISSUE_TEMPLATE/suggestion.yml b/.github/ISSUE_TEMPLATE/suggestion.yml
index 48f157b3..a82643cc 100644
--- a/.github/ISSUE_TEMPLATE/suggestion.yml
+++ b/.github/ISSUE_TEMPLATE/suggestion.yml
@@ -5,25 +5,25 @@ body:
 - type: markdown
   attributes:
     value: |
-      ### Use this form to suggest a feature for PolyMC.
+      ### Use this form to suggest a feature for PrismLauncher.
 - type: input
   attributes:
     label: Role
-    description: In what way do you use PolyMC that needs this feature?
+    description: In what way do you use PrismLauncher that needs this feature?
     placeholder: I play modded Minecraft.
   validations:
     required: true
 - type: input
   attributes:
     label: Suggestion
-    description: What do you want PolyMC to do?
+    description: What do you want PrismLauncher to do?
     placeholder: I want the cat button to meow.
   validations:
     required: true
 - type: input
   attributes:
     label: Benefit
-    description: Why do you need PolyMC to do this?
+    description: Why do you need PrismLauncher to do this?
     placeholder: so that I can always hear a cat when I need to.
   validations:
     required: true
-- 
cgit 


From 42ed7e46269dd7fec1ede26ebafbf7858a35b512 Mon Sep 17 00:00:00 2001
From: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
Date: Tue, 18 Oct 2022 18:08:46 +0400
Subject: Remove Matrix room link until one is created

Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
---
 .github/ISSUE_TEMPLATE/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 932d0c8f..dbbfe24f 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: true
-contact_links:
-  - name: PolyMC Matrix Support Room
-    url: https://matrix.to/#/#support:polymc.org
-    about: Please ask for support here before opening an issue.
+# contact_links:
+#   - name: PrismLauncher Matrix Support Room
+#     url: about:blank # Add proper link in the future
+#     about: (⚠ Room not created yet ⚠) Please ask for support here before opening an issue.
-- 
cgit 


From a99b9e80b870f5722f31e1854295d49dbde23d0f Mon Sep 17 00:00:00 2001
From: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
Date: Tue, 18 Oct 2022 18:08:53 +0400
Subject: Remove PolyMC's OpenCollective

Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
---
 .github/FUNDING.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 247675fc..3671160b 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1,2 @@
-open_collective: polymc
+# Commented out until further notice
+# open_collective: polymc
-- 
cgit 


From 3f2e5633b456daaabe7de28293a73c55d8ae1a06 Mon Sep 17 00:00:00 2001
From: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com>
Date: Wed, 19 Oct 2022 09:12:43 +0400
Subject: Add OpenCollective

Co-authored-by: Fayne Aldan <FayneAldan@gmail.com>
Signed-off-by: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com>
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
---
 .github/FUNDING.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 3671160b..6d05e3da 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1 @@
-# Commented out until further notice
-# open_collective: polymc
+open_collective: prismlauncher
-- 
cgit 


From 32eebd3ca7a405c9c7815ca0bff8abb2e0a4b12a Mon Sep 17 00:00:00 2001
From: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com>
Date: Wed, 19 Oct 2022 09:13:54 +0400
Subject: PrismLauncher → Prism Launcher
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Fayne Aldan <FayneAldan@gmail.com>
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com>
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yml | 8 ++++----
 .github/ISSUE_TEMPLATE/config.yml     | 2 +-
 .github/ISSUE_TEMPLATE/rfc.yml        | 4 ++--
 .github/ISSUE_TEMPLATE/suggestion.yml | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 9166fcf2..5521ecde 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -8,7 +8,7 @@ body:
       If you need help with running Minecraft, please visit us on our Discord before making a bug report.
 
       Before submitting a bug report, please make sure you have read this *entire* form, and that:
-      * You have read the [PrismLauncher wiki](https://polymc.org/wiki/) and it has not answered your question.
+      * You have read the [Prism Launcher wiki](https://prismlauncher.org/wiki/) and it has not answered your question.
       * Your bug is not caused by Minecraft or any mods you have installed.
       * Your issue has not been reported before, [make sure to use the search function!](https://github.com/PrismLauncher/PrismLauncher/issues)
 
@@ -25,15 +25,15 @@ body:
     - Other
 - type: textarea
   attributes:
-    label: Version of PrismLauncher
-    description: The version of PrismLauncher used in the bug report.
+    label: Version of Prism Launcher
+    description: The version of Prism Launcher used in the bug report.
     placeholder: PrismLauncher 1.4.1
   validations:
     required: true
 - type: textarea
   attributes:
     label: Version of Qt
-    description: The version of Qt used in the bug report. You can find it in Help -> About PrismLauncher -> About Qt.
+    description: The version of Qt used in the bug report. You can find it in Help -> About Prism Launcher -> About Qt.
     placeholder: Qt 6.3.0
   validations:
     required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index dbbfe24f..36afd2b6 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 # contact_links:
-#   - name: PrismLauncher Matrix Support Room
+#   - name: Prism Launcher Matrix Support Room
 #     url: about:blank # Add proper link in the future
 #     about: (⚠ Room not created yet ⚠) Please ask for support here before opening an issue.
diff --git a/.github/ISSUE_TEMPLATE/rfc.yml b/.github/ISSUE_TEMPLATE/rfc.yml
index 506e2b86..fa7cdbe6 100644
--- a/.github/ISSUE_TEMPLATE/rfc.yml
+++ b/.github/ISSUE_TEMPLATE/rfc.yml
@@ -6,7 +6,7 @@ body:
 - type: markdown
   attributes:
     value: |
-      ### Use this form to suggest a larger change for PrismLauncher.
+      ### Use this form to suggest a larger change for Prism Launcher.
 - type: textarea
   attributes:
     label: Goal
@@ -18,7 +18,7 @@ body:
   attributes:
     label: Motivation
     description: |
-      Introduce the topic. If this is a not-well-known section of PrismLauncher, a detailed explanation of the background is recommended.
+      Introduce the topic. If this is a not-well-known section of Prism Launcher, a detailed explanation of the background is recommended.
       Some example points of discussion:
        - What specific problems are you facing right now that you're trying to address?
        - Are there any previous discussions? Link to them and summarize them (don't force your readers to read them though!).
diff --git a/.github/ISSUE_TEMPLATE/suggestion.yml b/.github/ISSUE_TEMPLATE/suggestion.yml
index a82643cc..ddee86b6 100644
--- a/.github/ISSUE_TEMPLATE/suggestion.yml
+++ b/.github/ISSUE_TEMPLATE/suggestion.yml
@@ -5,25 +5,25 @@ body:
 - type: markdown
   attributes:
     value: |
-      ### Use this form to suggest a feature for PrismLauncher.
+      ### Use this form to suggest a feature for Prism Launcher.
 - type: input
   attributes:
     label: Role
-    description: In what way do you use PrismLauncher that needs this feature?
+    description: In what way do you use Prism Launcher that needs this feature?
     placeholder: I play modded Minecraft.
   validations:
     required: true
 - type: input
   attributes:
     label: Suggestion
-    description: What do you want PrismLauncher to do?
+    description: What do you want Prism Launcher to do?
     placeholder: I want the cat button to meow.
   validations:
     required: true
 - type: input
   attributes:
     label: Benefit
-    description: Why do you need PrismLauncher to do this?
+    description: Why do you need Prism Launcher to do this?
     placeholder: so that I can always hear a cat when I need to.
   validations:
     required: true
-- 
cgit 


From ab68d9198d07674952f99a63bb0901f8a410ce5c Mon Sep 17 00:00:00 2001
From: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com>
Date: Wed, 19 Oct 2022 09:14:27 +0400
Subject: PrismLauncher → Prism Launcher (again)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com>
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 5521ecde..ea1fbfdd 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -27,7 +27,7 @@ body:
   attributes:
     label: Version of Prism Launcher
     description: The version of Prism Launcher used in the bug report.
-    placeholder: PrismLauncher 1.4.1
+    placeholder: Prism Launcher 5.0
   validations:
     required: true
 - type: textarea
-- 
cgit 


From b6aa33f3a6d0ec6daf842f4ab62ea901b9e39129 Mon Sep 17 00:00:00 2001
From: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com>
Date: Wed, 19 Oct 2022 09:24:43 +0400
Subject: Add Matrix Room

Co-authored-by: Fayne Aldan <FayneAldan@gmail.com>
Signed-off-by: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com>
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
---
 .github/ISSUE_TEMPLATE/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 36afd2b6..97a55db3 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: true
-# contact_links:
-#   - name: Prism Launcher Matrix Support Room
-#     url: about:blank # Add proper link in the future
-#     about: (⚠ Room not created yet ⚠) Please ask for support here before opening an issue.
+contact_links:
+  - name: Prism Launcher Matrix Support Room
+    url: https://matrix.to/#/#prism-support:matrix.org
+    about: Please ask for support here before opening an issue.
-- 
cgit 


From b46c4a81e0355189d90f33567b21ac07872fc2a4 Mon Sep 17 00:00:00 2001
From: Sebastian Rueth <sebastian.rueth@protonmail.com>
Date: Thu, 20 Oct 2022 08:02:05 +0200
Subject: check space requirements of project description

if there isn't enough space for 2 lines of project description, only
draw one

Signed-off-by: Sebastian Rueth <sebastian.rueth@protonmail.com>
---
 launcher/ui/widgets/ProjectItem.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/launcher/ui/widgets/ProjectItem.cpp b/launcher/ui/widgets/ProjectItem.cpp
index 1011d6e4..49baf3e8 100644
--- a/launcher/ui/widgets/ProjectItem.cpp
+++ b/launcher/ui/widgets/ProjectItem.cpp
@@ -86,20 +86,25 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
 
         // Get first line unconditionally
         description = cut_text.first().second;
+        auto num_lines = 1;
+
         // Get second line, elided if needed
-        if (cut_text.size() > 1) {
-            if (cut_text.size() > 2)
+        if (cut_text.size() > 1 && rect.height() - title_height > opt.fontMetrics.height() * 2) {
+            if (cut_text.size() > 2) {
                 description += opt.fontMetrics.elidedText(cut_text.at(1).second, opt.textElideMode, cut_text.at(1).first);
-            else
+            } else {
                 description += cut_text.at(1).second;
+            }
+            num_lines += 1;
         }
 
         int description_x = rect.x();
+        
 
         // Have the y-value be set based on the number of lines in the description, to centralize the
         // description text with the space between the base and the title.
         int description_y = rect.y() + title_height + (rect.height() - title_height) / 2;
-        if (cut_text.size() == 1)
+        if (num_lines == 1)
             description_y -= opt.fontMetrics.height() / 2;
         else
             description_y -= opt.fontMetrics.height();
-- 
cgit 


From 6f2d6425a2c753e9ce8c702600bfe5609cb9d2b0 Mon Sep 17 00:00:00 2001
From: Zeke <ezekielsmith@protonmail.com>
Date: Thu, 20 Oct 2022 16:54:57 +1000
Subject: update meta to not break flatpak

Signed-off-by: Zeke <ezekielsmith@protonmail.com>
---
 program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in b/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in
index 55965eb7..13a860d9 100644
--- a/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in
+++ b/program_info/org.prismlauncher.PrismLauncher.metainfo.xml.in
@@ -38,7 +38,7 @@
     </screenshot>
     <screenshot>
       <caption>Mod installation</caption>
-      <image type="source" width="1000" height="692">https://prismlauncher.org/img/screenshots/ModInstallDark.png</image>
+      <image type="source" width="1036" height="700">https://prismlauncher.org/img/screenshots/ModInstallDark.png</image>
     </screenshot>
     <screenshot>
       <caption>Mod updating</caption>
-- 
cgit 


From 8e754d9a564e18f69585b913480b1192d23f7f75 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 19 Oct 2022 18:29:07 +0200
Subject: fix: update README

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 README.md | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 47fbcc62..acbe4aaa 100644
--- a/README.md
+++ b/README.md
@@ -5,25 +5,80 @@
 
 Prism Launcher is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once.
 
-We are working on a website and other media, for more info we have a [Discord server](https://discord.gg/prismlauncher).
+This is a **fork** of the MultiMC Launcher and not endorsed by MultiMC.
 
 ## Installation
 
-- All downloads and instructions for Prism Launcher will soon be available.
+- All downloads and instructions for Prism Launcher can be found [on our website](https://prismlauncher.org/download/).
 - Last build status can be found [here](https://github.com/PrismLauncher/PrismLauncher/actions).
 
 ### Development Builds
 
 There are development builds available [here](https://github.com/PrismLauncher/PrismLauncher/actions). These have debug information in the binaries, so their file sizes are relatively larger.
 
-Portable builds are provided for AppImage on Linux, Windows, and macOS.
+Portable builds are provided for on Linux, Windows, and macOS.
 
+For Debian and Arch, you can use these packages for the latest development versions:  
+[![prismlauncher-git](https://img.shields.io/badge/aur-prismlauncher--git-blue)](https://aur.archlinux.org/packages/prismlauncher-git/)
+[![prismlauncher-git](https://img.shields.io/badge/mpr-prismlauncher--git-orange)](https://mpr.makedeb.org/packages/prismlauncher-git)  
 ## Help & Support
 
+Feel free to create an issue if you need help. However, you might find it easier to ask in the Discord server.
 
-[![Join the Discord Server](https://discordapp.com/api/guilds/1031648380885147709/widget.png?style=banner3)](https://discord.gg/hX4g537UNE)
+[![Prism Launcher Discord server](https://discordapp.com/api/guilds/1031648380885147709/widget.png?style=banner3)](https://discord.gg/prismlauncher)
 
+We will also soon be opening up our Matrix channels.
+You can already join our Matrix space:
+
+[![PrismLauncher Space](https://img.shields.io/matrix/prismlauncher:matrix.org?label=PrismLauncher%20space)](https://matrix.to/#/#prismlauncher:matrix.org)
+
+We also have a subreddit you can post your issues and suggestions on:
+
+[r/PrismLauncher](https://www.reddit.com/r/PrismLauncher/)
+
+## Building
+
+If you want to build Prism Launcher yourself, check [Build Instructions](https://prismlauncher.org/wiki/development/build-instructions/) for build instructions.
+
+## Translations
+
+The translation effort for PrismLauncher is hosted on [Weblate](https://hosted.weblate.org/projects/prismlauncher/launcher/) and information about translating Prism Launcher is available at <https://github.com/PrismLauncher/Translations>
+
+## Forking/Redistributing/Custom builds policy
+
+We don't care what you do with your fork/custom build as long as you follow the terms of the [license](LICENSE) (this is a legal responsibility), and if you made code changes rather than just packaging a custom build, please do the following as a basic courtesy:
+
+- Make it clear that your fork is not PrismLauncher and is not endorsed by or affiliated with the PrismLauncher project (<https://prismlauncher.org>).
+- Go through [CMakeLists.txt](CMakeLists.txt) and change PrismLauncher's API keys to your own or set them to empty strings (`""`) to disable them (this way the program will still compile but the functionality requiring those keys will be disabled).
+
+If you have any questions or want any clarification on the above conditions please make an issue and ask us.
+
+Be aware that if you build this software without removing the provided API keys in [CMakeLists.txt](CMakeLists.txt) you are accepting the following terms and conditions:
+
+- [Microsoft Identity Platform Terms of Use](https://docs.microsoft.com/en-us/legal/microsoft-identity-platform/terms-of-use)
+- [CurseForge 3rd Party API Terms and Conditions](https://support.curseforge.com/en/support/solutions/articles/9000207405-curse-forge-3rd-party-api-terms-and-conditions)
+
+If you do not agree with these terms and conditions, then remove the associated API keys from the [CMakeLists.txt](CMakeLists.txt) file by setting them to an empty string (`""`).
 
 ## License
 
 All launcher code is available under the GPL-3.0-only license.
+  
+The logo and related assets are under the CC BY-SA 4.0 license.
+
+## Sponsors
+
+Thanks to JetBrains for providing us a few licenses for all their products, as part of their [Open Source program](https://www.jetbrains.com/opensource/).
+
+[![JetBrains](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://www.jetbrains.com/opensource/)
+
+Also thanks to Weblate for hosting our translation efforts.
+
+<a href="https://hosted.weblate.org/engage/prismlauncher/">
+<img src="https://hosted.weblate.org/widgets/prismlauncher/-/open-graph.png" alt="Translation status" width="300" />
+</a>
+
+Additionally, thanks to the awesome people over at [MacStadium](https://www.macstadium.com/), for providing M1-Macs for development purposes!
+
+<a href="https://www.macstadium.com"><img src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png" alt="Powered by MacStadium" width="300"></a>
+
-- 
cgit 


From 5d2763382128fb6ddbdc34ca803dc1b0f582d318 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Thu, 20 Oct 2022 14:51:09 -0300
Subject: fix: show a single line in ProjectItem's desc. when there's no more
 space

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/ui/widgets/ProjectItem.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/launcher/ui/widgets/ProjectItem.cpp b/launcher/ui/widgets/ProjectItem.cpp
index 49baf3e8..d1ff9dbc 100644
--- a/launcher/ui/widgets/ProjectItem.cpp
+++ b/launcher/ui/widgets/ProjectItem.cpp
@@ -89,13 +89,19 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
         auto num_lines = 1;
 
         // Get second line, elided if needed
-        if (cut_text.size() > 1 && rect.height() - title_height > opt.fontMetrics.height() * 2) {
-            if (cut_text.size() > 2) {
-                description += opt.fontMetrics.elidedText(cut_text.at(1).second, opt.textElideMode, cut_text.at(1).first);
+        if (cut_text.size() > 1) {
+            // 2.5x so because there should be some margin left from the 2x so things don't get too squishy.
+            if (rect.height() - title_height <= 2.5 * opt.fontMetrics.height()) {
+                // If there's not enough space, show only a single line, elided.
+                description = opt.fontMetrics.elidedText(description, opt.textElideMode, cut_text.at(0).first);
             } else {
-                description += cut_text.at(1).second;
+                if (cut_text.size() > 2) {
+                    description += opt.fontMetrics.elidedText(cut_text.at(1).second, opt.textElideMode, cut_text.at(1).first);
+                } else {
+                    description += cut_text.at(1).second;
+                }
+                num_lines += 1;
             }
-            num_lines += 1;
         }
 
         int description_x = rect.x();
-- 
cgit 


From 88341b923a8d59b64aebb03e9f8bbaed47d1d0ad Mon Sep 17 00:00:00 2001
From: Chrono-byte <me@disilla.org>
Date: Thu, 20 Oct 2022 15:14:26 -0400
Subject: fix contributor notices in AboutDialog.cpp for license compliance

Signed-off-by: Chrono-byte <me@disilla.org>
---
 launcher/ui/dialogs/AboutDialog.cpp | 2 +-
 program_info/CMakeLists.txt         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index 2970d47d..cecda1df 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -172,7 +172,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
     QString urlText("<html><head/><body><p><a href=\"%1\">%1</a></p></body></html>");
     ui->urlLabel->setText(urlText.arg(BuildConfig.LAUNCHER_GIT));
 
-    QString copyText("© 2021-2022 %1");
+    QString copyText("© 2022 %1");
     ui->copyLabel->setText(copyText.arg(BuildConfig.LAUNCHER_COPYRIGHT));
 
     connect(ui->closeButton, SIGNAL(clicked()), SLOT(close()));
diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt
index 62a01231..8cbc2d36 100644
--- a/program_info/CMakeLists.txt
+++ b/program_info/CMakeLists.txt
@@ -14,7 +14,7 @@ set(Launcher_DisplayName "Prism Launcher")
 set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
 set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)
 
-set(Launcher_Copyright "Prism Launcher Contributors\\n© 2012-2021 MultiMC Contributors")
+set(Launcher_Copyright "Prism Launcher Contributors\\n © 2021-2022 PolyMC Contributors \\n© 2012-2021 MultiMC Contributors")
 set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE)
 set(Launcher_Domain "prismlauncher.org" PARENT_SCOPE)
 set(Launcher_UserAgent "${Launcher_CommonName}/${Launcher_VERSION_NAME}" PARENT_SCOPE)
-- 
cgit 


From ece206b81cdffac0459c61dabb80d31f85de254d Mon Sep 17 00:00:00 2001
From: Chrono-byte <me@disilla.org>
Date: Thu, 20 Oct 2022 15:22:04 -0400
Subject: Remove erroneous space

Signed-off-by: Chrono-byte <me@disilla.org>
---
 program_info/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/program_info/CMakeLists.txt b/program_info/CMakeLists.txt
index 8cbc2d36..f6e2ea84 100644
--- a/program_info/CMakeLists.txt
+++ b/program_info/CMakeLists.txt
@@ -14,7 +14,7 @@ set(Launcher_DisplayName "Prism Launcher")
 set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
 set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)
 
-set(Launcher_Copyright "Prism Launcher Contributors\\n © 2021-2022 PolyMC Contributors \\n© 2012-2021 MultiMC Contributors")
+set(Launcher_Copyright "Prism Launcher Contributors\\n© 2021-2022 PolyMC Contributors \\n© 2012-2021 MultiMC Contributors")
 set(Launcher_Copyright "${Launcher_Copyright}" PARENT_SCOPE)
 set(Launcher_Domain "prismlauncher.org" PARENT_SCOPE)
 set(Launcher_UserAgent "${Launcher_CommonName}/${Launcher_VERSION_NAME}" PARENT_SCOPE)
-- 
cgit 


From 0a7383a4e1c36b0dbbdc615433a30665d1777f64 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Thu, 20 Oct 2022 16:54:39 -0300
Subject: fix: hide ProgressDialog when failing/succeeding tasks

WHY IS QT LIKE THAT AAAAAAAA

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/ui/dialogs/ProgressDialog.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/launcher/ui/dialogs/ProgressDialog.cpp b/launcher/ui/dialogs/ProgressDialog.cpp
index 68dd4d17..05269f62 100644
--- a/launcher/ui/dialogs/ProgressDialog.cpp
+++ b/launcher/ui/dialogs/ProgressDialog.cpp
@@ -136,11 +136,13 @@ void ProgressDialog::onTaskStarted() {}
 void ProgressDialog::onTaskFailed(QString failure)
 {
     reject();
+    hide();
 }
 
 void ProgressDialog::onTaskSucceeded()
 {
     accept();
+    hide();
 }
 
 void ProgressDialog::changeStatus(const QString& status)
-- 
cgit 


From 01b90809e8be2bef02644ba91feceb21b6f7cb8f Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Thu, 20 Oct 2022 16:55:22 -0300
Subject: fix: memory leak when finishing blocked mods job

Signed-off-by: flow <flowlnlnln@gmail.com>
---
 launcher/modplatform/flame/FileResolvingTask.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 1e7f5559..0b2431f7 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -66,7 +66,11 @@ void Flame::FileResolvingTask::netJobFinished()
         }
         index++;
     }
-    connect(job, &NetJob::finished, this, &Flame::FileResolvingTask::modrinthCheckFinished);
+    connect(job, &NetJob::finished, this,
+        [this, &job] {
+            modrinthCheckFinished();
+            job->deleteLater();
+        });
 
     job->start();
 }
-- 
cgit 


From 31dc92dafecc7924d937f10184dff28838c1f69a Mon Sep 17 00:00:00 2001
From: leo78913 <leo3758@riseup.net>
Date: Thu, 20 Oct 2022 17:48:57 -0300
Subject: add icons to the instance menu and 4 new icons:

delete
rename
tag
export

Signed-off-by: leo78913 <leo3758@riseup.net>
---
 launcher/resources/OSX/OSX.qrc                    |  4 ++
 launcher/resources/OSX/scalable/delete.svg        | 49 +++++++++++++++++
 launcher/resources/OSX/scalable/export.svg        | 65 +++++++++++++++++++++++
 launcher/resources/OSX/scalable/rename.svg        | 27 ++++++++++
 launcher/resources/OSX/scalable/tag.svg           | 35 ++++++++++++
 launcher/resources/flat/flat.qrc                  |  4 ++
 launcher/resources/flat/scalable/delete.svg       | 17 ++++++
 launcher/resources/flat/scalable/export.svg       | 16 ++++++
 launcher/resources/flat/scalable/rename.svg       | 17 ++++++
 launcher/resources/flat/scalable/tag.svg          | 17 ++++++
 launcher/resources/iOS/iOS.qrc                    |  4 ++
 launcher/resources/iOS/scalable/delete.svg        | 31 +++++++++++
 launcher/resources/iOS/scalable/export.svg        | 34 ++++++++++++
 launcher/resources/iOS/scalable/rename.svg        | 16 ++++++
 launcher/resources/iOS/scalable/tag.svg           | 20 +++++++
 launcher/resources/pe_blue/pe_blue.qrc            |  4 ++
 launcher/resources/pe_blue/scalable/delete.svg    | 35 ++++++++++++
 launcher/resources/pe_blue/scalable/export.svg    | 40 ++++++++++++++
 launcher/resources/pe_blue/scalable/rename.svg    | 19 +++++++
 launcher/resources/pe_blue/scalable/tag.svg       | 39 ++++++++++++++
 launcher/resources/pe_colored/pe_colored.qrc      |  4 ++
 launcher/resources/pe_colored/scalable/delete.svg | 49 +++++++++++++++++
 launcher/resources/pe_colored/scalable/export.svg | 44 +++++++++++++++
 launcher/resources/pe_colored/scalable/rename.svg | 22 ++++++++
 launcher/resources/pe_colored/scalable/tag.svg    | 42 +++++++++++++++
 launcher/resources/pe_dark/pe_dark.qrc            |  4 ++
 launcher/resources/pe_dark/scalable/delete.svg    | 24 +++++++++
 launcher/resources/pe_dark/scalable/export.svg    | 36 +++++++++++++
 launcher/resources/pe_dark/scalable/rename.svg    | 19 +++++++
 launcher/resources/pe_dark/scalable/tag.svg       | 38 +++++++++++++
 launcher/resources/pe_light/pe_light.qrc          |  4 ++
 launcher/resources/pe_light/scalable/delete.svg   | 20 +++++++
 launcher/resources/pe_light/scalable/export.svg   | 37 +++++++++++++
 launcher/resources/pe_light/scalable/rename.svg   | 19 +++++++
 launcher/resources/pe_light/scalable/tag.svg      | 23 ++++++++
 launcher/ui/MainWindow.cpp                        |  9 +++-
 36 files changed, 886 insertions(+), 1 deletion(-)
 create mode 100644 launcher/resources/OSX/scalable/delete.svg
 create mode 100644 launcher/resources/OSX/scalable/export.svg
 create mode 100644 launcher/resources/OSX/scalable/rename.svg
 create mode 100644 launcher/resources/OSX/scalable/tag.svg
 create mode 100644 launcher/resources/flat/scalable/delete.svg
 create mode 100644 launcher/resources/flat/scalable/export.svg
 create mode 100644 launcher/resources/flat/scalable/rename.svg
 create mode 100644 launcher/resources/flat/scalable/tag.svg
 create mode 100644 launcher/resources/iOS/scalable/delete.svg
 create mode 100644 launcher/resources/iOS/scalable/export.svg
 create mode 100644 launcher/resources/iOS/scalable/rename.svg
 create mode 100644 launcher/resources/iOS/scalable/tag.svg
 create mode 100644 launcher/resources/pe_blue/scalable/delete.svg
 create mode 100644 launcher/resources/pe_blue/scalable/export.svg
 create mode 100644 launcher/resources/pe_blue/scalable/rename.svg
 create mode 100644 launcher/resources/pe_blue/scalable/tag.svg
 create mode 100644 launcher/resources/pe_colored/scalable/delete.svg
 create mode 100644 launcher/resources/pe_colored/scalable/export.svg
 create mode 100644 launcher/resources/pe_colored/scalable/rename.svg
 create mode 100644 launcher/resources/pe_colored/scalable/tag.svg
 create mode 100644 launcher/resources/pe_dark/scalable/delete.svg
 create mode 100644 launcher/resources/pe_dark/scalable/export.svg
 create mode 100644 launcher/resources/pe_dark/scalable/rename.svg
 create mode 100644 launcher/resources/pe_dark/scalable/tag.svg
 create mode 100644 launcher/resources/pe_light/scalable/delete.svg
 create mode 100644 launcher/resources/pe_light/scalable/export.svg
 create mode 100644 launcher/resources/pe_light/scalable/rename.svg
 create mode 100644 launcher/resources/pe_light/scalable/tag.svg

diff --git a/launcher/resources/OSX/OSX.qrc b/launcher/resources/OSX/OSX.qrc
index 3eca8e19..55be28b5 100644
--- a/launcher/resources/OSX/OSX.qrc
+++ b/launcher/resources/OSX/OSX.qrc
@@ -34,5 +34,9 @@
         <file>scalable/status-yellow.svg</file>
         <file>scalable/viewfolder.svg</file>
         <file>scalable/worlds.svg</file>
+        <file>scalable/delete.svg</file>
+        <file>scalable/tag.svg</file>
+        <file>scalable/export.svg</file>
+        <file>scalable/rename.svg</file>
     </qresource>
 </RCC>
diff --git a/launcher/resources/OSX/scalable/delete.svg b/launcher/resources/OSX/scalable/delete.svg
new file mode 100644
index 00000000..bec8c7d9
--- /dev/null
+++ b/launcher/resources/OSX/scalable/delete.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs13" />
+<rect
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   fill="none"
+   width="32"
+   height="32"
+   id="rect2" />
+<path
+   fill="#B6B5B6"
+   d="M30,28H2c-1.1,0-2-0.9-2-2V8c0-1.1,0.9-2,2-2h28c1.1,0,2,0.9,2,2v18C32,27.1,31.1,28,30,28z"
+   id="path4" />
+<path
+   fill="#FBFBFB"
+   d="M30,27H2c-1.1,0-2-0.9-2-2V8c0-1.1,0.9-2,2-2h28c1.1,0,2,0.9,2,2v17C32,26.1,31.1,27,30,27z"
+   id="path6" />
+
+<g
+   id="g19002"
+   transform="matrix(0.61347029,0,0,0.61364877,6.1844752,6.6215364)"
+   style="stroke-width:1.62983"><g
+     id="g9250"
+     transform="matrix(0.97069724,0,0,1.1763237,-0.10468178,-4.8181425)"
+     style="stroke-width:1.52524"><path
+       style="color:#000000;fill:#585858;fill-opacity:1;stroke-width:1.52524;stroke-linecap:round;-inkscape-stroke:none"
+       d="m 6.7324219,10.556641 v 0.820312 15.230469 c 0,1.649975 1.3558838,3.003906 3.0058594,3.003906 H 23.443359 c 1.649976,0 3.00586,-1.353931 3.00586,-3.003906 V 10.556641 Z m 1.6386719,1.638672 H 24.810547 v 14.412109 c 0,0.764319 -0.602868,1.365234 -1.367188,1.365234 H 9.7382813 c -0.7643194,0 -1.3671876,-0.600915 -1.3671875,-1.365234 z"
+       id="rect2395" /><path
+       id="path8117"
+       style="fill:none;stroke:#585858;stroke-width:2.28785;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       d="m 13.353409,15.259086 v 9.466797 z m 6.474609,0.183594 v 9.466797 z" /></g><path
+     style="fill:none;fill-opacity:1;stroke:#585858;stroke-width:2.44476;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+     d="M 3.0114815,4.6293617 H 28.988519"
+     id="path9281" /><path
+     style="fill:none;stroke:#585858;stroke-width:2.44476;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 10.431403,3.4038387 H 21.568596"
+     id="path9283" /></g></svg>
diff --git a/launcher/resources/OSX/scalable/export.svg b/launcher/resources/OSX/scalable/export.svg
new file mode 100644
index 00000000..62145a7e
--- /dev/null
+++ b/launcher/resources/OSX/scalable/export.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs7209" />
+<rect
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   fill="none"
+   width="32"
+   height="32"
+   id="rect7195" />
+<path
+   fill="#B6B5B6"
+   d="M30,28.4H2c-1.1,0-2-0.9-2-2v-18c0-1.1,0.9-2,2-2h28c1.1,0,2,0.9,2,2v18C32,27.5,31.1,28.4,30,28.4z"
+   id="path7197" />
+<path
+   fill="#FBFBFB"
+   d="M30,27.4H2c-1.1,0-2-0.9-2-2v-17c0-1.1,0.9-2,2-2h28c1.1,0,2,0.9,2,2v17C32,26.5,31.1,27.4,30,27.4z"
+   id="path7199" />
+<g
+   id="_x36__6_">
+	<g
+   id="g7203">
+		<path
+   fill="#585858"
+   d="M22,11.4h-7c0-1.1-0.9-2-2-2h-3c-1.1,0-2,0.9-2,2v12c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2v-10    C24,12.3,23.1,11.4,22,11.4z M23,23.4c0,0.6-0.4,1-1,1H10c-0.6,0-1-0.4-1-1v-8h14V23.4z M23,14.4H9v-3c0-0.6,0.4-1,1-1h3    c0.6,0,1,0.4,1,1v1h8c0.6,0,1,0.4,1,1V14.4z"
+   id="path7201" />
+	</g>
+</g>
+<g
+   id="g7346"
+   transform="matrix(0.60195183,0,0,0.60195183,6.3687707,6.8734131)"
+   style="fill:#585858;fill-opacity:1;stroke-width:1.66127"><g
+     id="_x36__4_"
+     style="fill:#585858;fill-opacity:1;stroke-width:1.66127">
+	<g
+   id="g849"
+   style="fill:#585858;fill-opacity:1;stroke-width:1.66127">
+		
+	</g>
+</g><g
+     id="g1052"
+     transform="rotate(-90,15.237227,22.237227)"
+     style="fill:#585858;fill-opacity:1;stroke-width:1.66127"><g
+       id="_x37__7_"
+       style="fill:#585858;fill-opacity:1;stroke-width:1.66127">
+	<g
+   id="g1038"
+   style="fill:#585858;fill-opacity:1;stroke-width:1.66127">
+		<path
+   d="m 21.7,25.4 c -0.4,-0.4 -1,-0.4 -1.4,0 L 17,28.7 V 15 c 0,-0.6 -0.4,-1 -1,-1 -0.6,0 -1,0.4 -1,1 v 13.6 l -3.3,-3.2 c -0.4,-0.4 -1,-0.4 -1.4,0 -0.4,0.4 -0.4,1 0,1.4 l 4.9,4.9 c 0.2,0.2 0.5,0.3 0.8,0.3 0.3,0 0.6,-0.1 0.8,-0.3 l 4.9,-4.9 c 0.4,-0.4 0.4,-1 0,-1.4 z"
+   id="path1036"
+   style="fill:#585858;fill-opacity:1;stroke-width:2.62304" />
+	</g>
+</g></g></g></svg>
diff --git a/launcher/resources/OSX/scalable/rename.svg b/launcher/resources/OSX/scalable/rename.svg
new file mode 100644
index 00000000..83ae5cb5
--- /dev/null
+++ b/launcher/resources/OSX/scalable/rename.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 24 24"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs11868" />
+<rect
+   fill="none"
+   width="24"
+   height="24"
+   id="rect11854" />
+<g
+   id="g15058"
+   transform="matrix(1.2018036,0,0,1.2018036,9.1890033,-5.9659463)"
+   style="stroke-width:0.832083"><path
+     style="fill:#cccccc;fill-opacity:1;stroke:#585858;stroke-width:0.832083;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+     d="m -4.635309,18.83508 -1.6867847,4.775149 4.7751492,-1.686784 z"
+     id="path14640" /><path
+     style="fill:#f2f2f2;fill-opacity:1;stroke:#585858;stroke-width:0.832083;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
+     d="M 7.6468491,6.2880897 -3.1410372,17.075975 0.21216023,20.429172 11.000046,9.6412872 Z"
+     id="rect291" /></g></svg>
diff --git a/launcher/resources/OSX/scalable/tag.svg b/launcher/resources/OSX/scalable/tag.svg
new file mode 100644
index 00000000..56438e3b
--- /dev/null
+++ b/launcher/resources/OSX/scalable/tag.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs13" />
+<rect
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   fill="none"
+   width="32"
+   height="32"
+   id="rect2" />
+<path
+   fill="#B6B5B6"
+   d="M30,28H2c-1.1,0-2-0.9-2-2V8c0-1.1,0.9-2,2-2h28c1.1,0,2,0.9,2,2v18C32,27.1,31.1,28,30,28z"
+   id="path4" />
+<path
+   fill="#FBFBFB"
+   d="M30,27H2c-1.1,0-2-0.9-2-2V8c0-1.1,0.9-2,2-2h28c1.1,0,2,0.9,2,2v17C32,26.1,31.1,27,30,27z"
+   id="path6" />
+
+<path
+   style="fill:none;fill-opacity:1;stroke:#585858;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
+   d="m 15.90395,8.3243241 -8.037878,0.04174 -0.04175,8.0378789 8.752925,8.079624 7.406322,-7.406322 z m -3.366509,2.6932089 c 1.114988,0 2.019906,0.904918 2.019906,2.019906 0,1.114988 -0.904918,2.019906 -2.019906,2.019906 -1.114988,0 -2.019906,-0.904918 -2.019906,-2.019906 0,-1.114988 0.904918,-2.019906 2.019906,-2.019906"
+   class="ColorScheme-Text"
+   id="path4838" /></svg>
diff --git a/launcher/resources/flat/flat.qrc b/launcher/resources/flat/flat.qrc
index d2b752b1..7f59da7b 100644
--- a/launcher/resources/flat/flat.qrc
+++ b/launcher/resources/flat/flat.qrc
@@ -42,5 +42,9 @@
         <file>scalable/status-yellow.svg</file>
         <file>scalable/viewfolder.svg</file>
         <file>scalable/worlds.svg</file>
+        <file>scalable/delete.svg</file>
+        <file>scalable/tag.svg</file>
+        <file>scalable/export.svg</file>
+        <file>scalable/rename.svg</file>
     </qresource>
 </RCC>
diff --git a/launcher/resources/flat/scalable/delete.svg b/launcher/resources/flat/scalable/delete.svg
new file mode 100644
index 00000000..9f35cd07
--- /dev/null
+++ b/launcher/resources/flat/scalable/delete.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   fill="#757575"
+   height="24"
+   viewBox="0 0 24 24"
+   width="24"
+   version="1.1"
+   id="svg4"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <path
+     id="path5145"
+     style="fill:#757575;fill-opacity:1;stroke:none;stroke-width:1.4;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:none"
+     d="M 7.1074219 0.96484375 L 7.1074219 2.7304688 L 2.6132812 2.7304688 L 2.6132812 4.4960938 L 21.386719 4.4960938 L 21.386719 2.7304688 L 16.892578 2.7304688 L 16.892578 0.96484375 L 7.1074219 0.96484375 z M 5.0058594 6.0839844 L 5.0058594 22.859375 L 18.994141 22.859375 L 18.994141 6.0839844 L 5.0058594 6.0839844 z M 7.9160156 9.0605469 L 10.193359 9.0605469 L 10.193359 19.882812 L 7.9160156 19.882812 L 7.9160156 9.0605469 z M 13.804688 9.0605469 L 16.085938 9.0605469 L 16.085938 19.882812 L 13.804688 19.882812 L 13.804688 9.0605469 z " />
+</svg>
diff --git a/launcher/resources/flat/scalable/export.svg b/launcher/resources/flat/scalable/export.svg
new file mode 100644
index 00000000..d715ce94
--- /dev/null
+++ b/launcher/resources/flat/scalable/export.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   fill="#757575"
+   height="24"
+   viewBox="0 0 24 24"
+   width="24"
+   version="1.1"
+   id="svg4"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <path
+     id="path2"
+     d="M 4 4 C 2.9000011 4 2.0097656 4.9000011 2.0097656 6 L 2 18 C 2 19.099999 2.9000011 20 4 20 L 20 20 C 21.099999 20 22 19.099999 22 18 L 22 8 C 22 6.9000011 21.099999 6 20 6 L 12 6 L 10 4 L 4 4 z M 12.537109 9.9082031 L 13.185547 10.298828 L 17.554688 12.929688 L 13.185547 15.5625 L 12.537109 15.953125 L 11.755859 14.65625 L 12.404297 14.265625 L 13.349609 13.695312 L 6.4453125 13.695312 L 6.4453125 12.166016 L 13.351562 12.166016 L 12.404297 11.595703 L 11.755859 11.205078 L 12.537109 9.9082031 z " />
+</svg>
diff --git a/launcher/resources/flat/scalable/rename.svg b/launcher/resources/flat/scalable/rename.svg
new file mode 100644
index 00000000..1f793ca7
--- /dev/null
+++ b/launcher/resources/flat/scalable/rename.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   fill="#757575"
+   height="24"
+   viewBox="0 0 24 24"
+   width="24"
+   version="1.1"
+   id="svg4"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs6" />
+  
+<path
+   id="rect345"
+   style="stroke-width:1.40001;stroke-linecap:square"
+   d="m 16.944458,1.2305698 -2.249239,2.2492384 5.824973,5.8249729 2.249239,-2.2492385 a 0.74206194,0.74206194 90.000002 0 0 0,-1.0494341 L 17.993892,1.2305699 a 0.74206211,0.74206211 2.5523302e-6 0 0 -1.049434,-1e-7 z M 13.645389,4.5296385 3.5726925,14.602335 9.3976653,20.427306 19.470362,10.35461 Z M 2.5228612,15.652165 1.0244287,22.411695 a 0.47276304,0.47276304 44.999993 0 0 0.5638754,0.563875 l 6.75953,-1.498434 z" /></svg>
diff --git a/launcher/resources/flat/scalable/tag.svg b/launcher/resources/flat/scalable/tag.svg
new file mode 100644
index 00000000..7355fbf1
--- /dev/null
+++ b/launcher/resources/flat/scalable/tag.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   fill="#757575"
+   height="24"
+   viewBox="0 0 24 24"
+   width="24"
+   version="1.1"
+   id="svg4"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <path
+  style="fill:#757575;fill-opacity:1;stroke:none;stroke-width:0.999999"
+  d="M 12,2.4960934 2.5451968,2.5451969 2.4960933,12 12.791992,21.503907 21.503907,12.791992 Z M 8.0400388,5.6640622 c 1.3115393,0 2.3759772,1.0644375 2.3759772,2.3759766 0,1.3115391 -1.0644379,2.3759772 -2.3759772,2.3759772 -1.3115392,0 -2.3759767,-1.0644381 -2.3759767,-2.3759772 0,-1.3115391 1.0644375,-2.3759766 2.3759767,-2.3759766"
+  class="ColorScheme-Text"
+  id="path4838" />
+</svg>
diff --git a/launcher/resources/iOS/iOS.qrc b/launcher/resources/iOS/iOS.qrc
index f05cd67c..1d752042 100644
--- a/launcher/resources/iOS/iOS.qrc
+++ b/launcher/resources/iOS/iOS.qrc
@@ -34,5 +34,9 @@
         <file>scalable/status-yellow.svg</file>
         <file>scalable/viewfolder.svg</file>
         <file>scalable/worlds.svg</file>
+        <file>scalable/delete.svg</file>
+        <file>scalable/tag.svg</file>
+        <file>scalable/export.svg</file>
+        <file>scalable/rename.svg</file>
     </qresource>
 </RCC>
diff --git a/launcher/resources/iOS/scalable/delete.svg b/launcher/resources/iOS/scalable/delete.svg
new file mode 100644
index 00000000..a542fa4f
--- /dev/null
+++ b/launcher/resources/iOS/scalable/delete.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs855" />
+<g
+   id="g19002"
+   transform="matrix(1.142151,0,0,1.1420676,-2.2744167,-2.2900782)"
+   style="stroke-width:0.875573"><g
+     id="g9250"
+     transform="matrix(0.97069724,0,0,1.1763237,-0.10468178,-4.8181425)"
+     style="stroke-width:0.819383"><path
+       style="color:#000000;fill:#3366cc;stroke-linecap:round;-inkscape-stroke:none"
+       d="m 6.7324219,10.556641 v 0.820312 15.230469 c 0,1.649975 1.3558838,3.003906 3.0058594,3.003906 H 23.443359 c 1.649976,0 3.00586,-1.353931 3.00586,-3.003906 V 10.556641 Z m 1.6386719,1.638672 H 24.810547 v 14.412109 c 0,0.764319 -0.602868,1.365234 -1.367188,1.365234 H 9.7382813 c -0.7643194,0 -1.3671876,-0.600915 -1.3671875,-1.365234 z"
+       id="rect2395" /><path
+       id="path8117"
+       style="fill:none;stroke:#3366cc;stroke-width:1.63877;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       d="m 13.353409,15.259086 v 9.466797 z m 6.474609,0.183594 v 9.466797 z" /></g><path
+     style="fill:none;fill-opacity:1;stroke:#3366cc;stroke-width:1.75115;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+     d="M 3.0114815,4.6293617 H 28.988519"
+     id="path9281" /><path
+     style="fill:none;stroke:#3366cc;stroke-width:1.75115;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 10.431403,2.9656366 H 21.568596"
+     id="path9283" /></g></svg>
diff --git a/launcher/resources/iOS/scalable/export.svg b/launcher/resources/iOS/scalable/export.svg
new file mode 100644
index 00000000..db2f4c3c
--- /dev/null
+++ b/launcher/resources/iOS/scalable/export.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs855" />
+<g
+   id="_x36__4_">
+	<g
+   id="g849">
+		<path
+   fill="#3366CC"
+   d="M28,4H14c0-2.2-1.8-4-4-4H4C1.8,0,0,1.8,0,4v24c0,2.2,1.8,4,4,4h24c2.2,0,4-1.8,4-4V8C32,5.8,30.2,4,28,4z     M30,28c0,1.1-0.9,2-2,2H4c-1.1,0-2-0.9-2-2V12h28V28z M30,10H2V4c0-1.1,0.9-2,2-2h6c1.1,0,2,0.9,2,2v2h16c1.1,0,2,0.9,2,2V10z"
+   id="path847" />
+	</g>
+</g>
+<g
+   id="g1052"
+   transform="rotate(-90,15.237227,22.237227)"><g
+     id="_x37__7_">
+	<g
+   id="g1038">
+		<path
+   fill="#3366cc"
+   d="m 21.7,25.4 c -0.4,-0.4 -1,-0.4 -1.4,0 L 17,28.7 V 15 c 0,-0.6 -0.4,-1 -1,-1 -0.6,0 -1,0.4 -1,1 v 13.6 l -3.3,-3.2 c -0.4,-0.4 -1,-0.4 -1.4,0 -0.4,0.4 -0.4,1 0,1.4 l 4.9,4.9 c 0.2,0.2 0.5,0.3 0.8,0.3 0.3,0 0.6,-0.1 0.8,-0.3 l 4.9,-4.9 c 0.4,-0.4 0.4,-1 0,-1.4 z"
+   id="path1036" />
+	</g>
+</g></g></svg>
diff --git a/launcher/resources/iOS/scalable/rename.svg b/launcher/resources/iOS/scalable/rename.svg
new file mode 100644
index 00000000..064e84b7
--- /dev/null
+++ b/launcher/resources/iOS/scalable/rename.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs855" />
+<path
+   id="rect291"
+   style="fill:none;stroke:#3366cc;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke"
+   d="M 25.192659,0.99995946 6.5091864,19.68343 12.316568,25.490811 31.00004,6.8073412 Z M 3.9212666,22.730012 0.99993513,31.000063 9.2699855,28.078732 Z" /></svg>
diff --git a/launcher/resources/iOS/scalable/tag.svg b/launcher/resources/iOS/scalable/tag.svg
new file mode 100644
index 00000000..23b549e5
--- /dev/null
+++ b/launcher/resources/iOS/scalable/tag.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs855" />
+<g
+   style="fill:none;stroke:#3366cc;stroke-width:1.48328703;stroke-dasharray:none;stroke-opacity:1"
+   id="g35489"
+   transform="matrix(1.3483567,0,0,1.3483567,-0.37239014,-0.37239021)"><path
+     style="fill:none;fill-opacity:1;stroke:#3366cc;stroke-width:1.48328703;stroke-dasharray:none;stroke-opacity:1"
+     d="M 12,2.4960934 2.5451968,2.5451969 2.4960933,12 12.791992,21.503907 21.503907,12.791992 Z M 8.0400388,5.6640622 c 1.3115393,0 2.3759772,1.0644375 2.3759772,2.3759766 0,1.3115391 -1.0644379,2.3759772 -2.3759772,2.3759772 -1.3115392,0 -2.3759767,-1.0644381 -2.3759767,-2.3759772 0,-1.3115391 1.0644375,-2.3759766 2.3759767,-2.3759766"
+     class="ColorScheme-Text"
+     id="path4838" /></g></svg>
diff --git a/launcher/resources/pe_blue/pe_blue.qrc b/launcher/resources/pe_blue/pe_blue.qrc
index 456963b7..3d385713 100644
--- a/launcher/resources/pe_blue/pe_blue.qrc
+++ b/launcher/resources/pe_blue/pe_blue.qrc
@@ -34,5 +34,9 @@
         <file>scalable/status-yellow.svg</file>
         <file>scalable/viewfolder.svg</file>
         <file>scalable/worlds.svg</file>
+        <file>scalable/delete.svg</file>
+        <file>scalable/tag.svg</file>
+        <file>scalable/export.svg</file>
+        <file>scalable/rename.svg</file>
     </qresource>
 </RCC>
diff --git a/launcher/resources/pe_blue/scalable/delete.svg b/launcher/resources/pe_blue/scalable/delete.svg
new file mode 100644
index 00000000..123fade3
--- /dev/null
+++ b/launcher/resources/pe_blue/scalable/delete.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs21">
+</defs>
+<path
+   d="m 6.9999998,26 c 0,1.1 0.9,2 2,2 H 23 c 1.1,0 2,-0.9 2,-2 V 12.091433 H 6.9999998 Z"
+   id="path2"
+   style="fill:#daeeff;fill-opacity:1" /><circle
+   fill="none"
+   cx="8.9659033"
+   cy="10"
+   r="2"
+   id="circle6" /><path
+   fill="none"
+   d="M 8.9659036,28 H 22.965904 c 1.1,0 2,-0.9 2,-2 V 15 14 H 6.9659036 v 1 11 c 0,1.1 0.9,2 2,2 z"
+   id="path8" /><path
+   id="path10"
+   style="stroke-width:0.999996;fill:#3366cc;fill-opacity:1"
+   d="M 11.244141 0 C 9.0387543 0 7.234375 1.8696839 7.234375 4.1542969 L 7.234375 9 L 2 9 C 0.89200111 9 0 9.8920011 0 11 C 0 12.107999 0.89200111 13 2 13 L 3 13 L 3 26 C 3 29.299997 5.7000033 32 9 32 L 23 32 C 26.299997 32 29 29.299997 29 26 L 29 13 L 30 13 C 31.107999 13 32 12.107999 32 11 C 32 9.8920011 31.107999 9 30 9 L 24.609375 9 L 24.609375 4.1542969 C 24.609375 1.8696839 22.804995 0 20.599609 0 L 11.244141 0 z M 7 13 L 25 13 L 25 26 C 25 27.099999 24.099999 28 23 28 L 9 28 C 7.9000011 28 7 27.099999 7 26 L 7 13 z " />
+<rect
+   style="fill:#000000;fill-opacity:0;stroke:none;stroke-width:0.000000879999;stroke-linecap:round;stroke-linejoin:round"
+   id="rect2311"
+   width="29.020048"
+   height="4"
+   x="1.4899759"
+   y="7.1611009" /></svg>
diff --git a/launcher/resources/pe_blue/scalable/export.svg b/launcher/resources/pe_blue/scalable/export.svg
new file mode 100644
index 00000000..560bf3e8
--- /dev/null
+++ b/launcher/resources/pe_blue/scalable/export.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs14" />
+<g
+   id="g7954"><g
+     id="g22579"><path
+       d="M 28,10 C 28,8.9 27.1,8 26,8 H 16 V 6 C 16,4.9 15.1,4 14,4 H 6 C 4.9,4 4,4.9 4,6 v 20 c 0,1.1 0.9,2 2,2 h 20 c 1.1,0 2,-0.9 2,-2 z"
+       id="path22556"
+       style="fill:#daeeff;fill-opacity:1" /><rect
+       x="0"
+       fill="none"
+       width="32"
+       height="32"
+       id="rect22558"
+       y="0" /><g
+       id="g22566">
+	<path
+   fill="none"
+   d="M 26,8 H 16 V 6 C 16,4.9 15.1,4 14,4 H 6 C 4.9,4 4,4.9 4,6 v 3 17 c 0,1.1 0.9,2 2,2 h 20 c 1.1,0 2,-0.9 2,-2 V 10 C 28,9.6 27.9,9.3 27.7,9 27.4,8.4 26.7,8 26,8 Z"
+   id="path22560" />
+	<path
+   id="path22562"
+   d="M 6 0 C 2.7000033 0 0 2.7000033 0 6 L 0 9 L 0 26 C 0 29.299997 2.7000033 32 6 32 L 26 32 C 29.299997 32 32 29.299997 32 26 L 32 10 C 32 9.7000003 32.000391 9.2999997 31.900391 9 C 31.400391 6.2000028 28.999997 4 26 4 L 19.599609 4 C 18.79961 1.7000023 16.599997 0 14 0 L 6 0 z M 6 4 L 14 4 C 15.099999 4 16 4.9000011 16 6 L 16 8 L 26 8 C 26.699999 8 27.399219 8.4000006 27.699219 9 C 27.899219 9.2999997 28 9.6000004 28 10 L 28 26 C 28 27.099999 27.099999 28 26 28 L 6 28 C 4.9000011 28 4 27.099999 4 26 L 4 9 L 4 6 C 4 4.9000011 4.9000011 4 6 4 z "
+   style="fill:#3366cc;fill-opacity:1" />
+	
+</g></g><path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="m 19.283635,21.196352 c -0.312728,0.234545 -0.625454,0.312728 -0.938181,0.312728 -0.234546,0 -0.469091,-0.07819 -0.703637,-0.156365 -0.547272,-0.234544 -0.859999,-0.781818 -0.859999,-1.407271 v -1.485455 -0.07817 c -4.925453,0 -9.1472686,3.283635 -10.4763592,7.818178 C 5.9927316,25.18363 5.836368,24.167266 5.836368,23.07272 c 0,-6.019996 4.925452,-10.945449 10.94545,-10.945449 v -1.563635 c 0,-0.625454 0.312727,-1.172727 0.859999,-1.407272 C 17.876363,9.078184 18.110908,9 18.345454,9 c 0.312727,0 0.625453,0.07817 0.938181,0.312727 l 6.254542,4.690906 c 0.390909,0.312728 0.625455,0.781818 0.625455,1.250909 0,0.469092 -0.234546,0.938182 -0.625455,1.250908 z"
+     id="path22733"
+     style="stroke-width:1;fill:#666666;fill-opacity:1" /></g></svg>
diff --git a/launcher/resources/pe_blue/scalable/rename.svg b/launcher/resources/pe_blue/scalable/rename.svg
new file mode 100644
index 00000000..f9ca562e
--- /dev/null
+++ b/launcher/resources/pe_blue/scalable/rename.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs38" />
+<g
+   id="g70305"
+   transform="matrix(0.87995311,0.87998288,-0.87995311,0.87998288,15.409106,-7.1812248)"
+   style="stroke-width:0.80356"><path
+     id="path66642"
+     style="fill:#daeeff;stroke:#3366cc;stroke-width:3.21424;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
+     d="M 10.272393,0.15880016 C 9.9282548,0.48303193 9.701946,1.0320027 9.701946,1.6547804 l 7.713e-4,20.0058326 2.7787647,5.932786 c 0.483272,1.031938 1.566339,1.032889 2.049746,0.0011 l 2.780076,-5.93399 0.0014,-20.0058323 c 0,-0.99644441 -0.579446,-1.80446494 -1.293962,-1.80446494 l -5.022821,8.497e-5 c -0.267943,0 -0.517093,0.11398937 -0.723576,0.30852843 z" /></g></svg>
diff --git a/launcher/resources/pe_blue/scalable/tag.svg b/launcher/resources/pe_blue/scalable/tag.svg
new file mode 100644
index 00000000..02f6693a
--- /dev/null
+++ b/launcher/resources/pe_blue/scalable/tag.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs45" />
+
+<g
+   id="g7954"><path
+     fill="none"
+     d="M 8.9659036,28 H 22.965904 c 1.1,0 2,-0.9 2,-2 V 15 14 H 6.9659036 v 1 11 c 0,1.1 0.9,2 2,2 z"
+     id="path8" /><rect
+     style="fill:#000000;fill-opacity:0;stroke:none;stroke-width:0.000000879999;stroke-linecap:round;stroke-linejoin:round"
+     id="rect2311"
+     width="29.020048"
+     height="4"
+     x="1.4899759"
+     y="7.1611009" /><path
+     id="path2-6"
+     d="M 28,6 C 28,4.9 27.1,4 26,4 H 6 C 4.9,4 4,4.9 4,6 v 20 c 0,1.1 0.9,2 2,2 h 20 c 1.1,0 2,-0.9 2,-2 z"
+     clip-rule="evenodd"
+     fill-rule="evenodd"
+     style="fill:#daeeff;fill-opacity:1" /><g
+     id="g12"><path
+       id="path6"
+       d="m 6,28 h 20 c 1.1,0 2,-0.9 2,-2 V 9 6 C 28,4.9 27.1,4 26,4 H 6 C 4.9,4 4,4.9 4,6 v 3 17 c 0,1.1 0.9,2 2,2 z"
+       fill="none" /><path
+       id="path8-7"
+       d="M 6 0 C 2.7000033 0 0 2.7000033 0 6 L 0 9 L 0 26 C 0 29.299997 2.7000033 32 6 32 L 26 32 C 29.299997 32 32 29.299997 32 26 L 32 9 L 32 6 C 32 2.7000033 29.299997 0 26 0 L 6 0 z M 6 4 L 26 4 C 27.099999 4 28 4.9000011 28 6 L 28 9 L 28 26 C 28 27.099999 27.099999 28 26 28 L 6 28 C 4.9000011 28 4 27.099999 4 26 L 4 9 L 4 6 C 4 4.9000011 4.9000011 4 6 4 z "
+       style="fill:#3366cc;fill-opacity:1" /></g><path
+     style="fill:#666666;fill-opacity:1;stroke:none;stroke-width:1"
+     d="m 16,7.1611009 -8.793231,0.045668 -0.045668,8.7932321 9.575474,8.838898 8.102324,-8.102324 z m -3.682875,2.9463001 c 1.219769,0 2.209725,0.989956 2.209725,2.209725 0,1.219769 -0.989956,2.209725 -2.209725,2.209725 -1.219766,0 -2.209724,-0.989956 -2.209724,-2.209725 0,-1.219769 0.989958,-2.209725 2.209724,-2.209725"
+     id="path6042" /></g></svg>
diff --git a/launcher/resources/pe_colored/pe_colored.qrc b/launcher/resources/pe_colored/pe_colored.qrc
index 92a78b5c..fa6cd9cd 100644
--- a/launcher/resources/pe_colored/pe_colored.qrc
+++ b/launcher/resources/pe_colored/pe_colored.qrc
@@ -34,5 +34,9 @@
         <file>scalable/status-yellow.svg</file>
         <file>scalable/viewfolder.svg</file>
         <file>scalable/worlds.svg</file>
+        <file>scalable/delete.svg</file>
+        <file>scalable/tag.svg</file>
+        <file>scalable/export.svg</file>
+        <file>scalable/rename.svg</file>
     </qresource>
 </RCC>
diff --git a/launcher/resources/pe_colored/scalable/delete.svg b/launcher/resources/pe_colored/scalable/delete.svg
new file mode 100644
index 00000000..59162da8
--- /dev/null
+++ b/launcher/resources/pe_colored/scalable/delete.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs21">
+</defs>
+<circle
+   fill="none"
+   cx="8.9659033"
+   cy="10"
+   r="2"
+   id="circle6" /><path
+   fill="none"
+   d="M 8.9659036,28 H 22.965904 c 1.1,0 2,-0.9 2,-2 V 15 14 H 6.9659036 v 1 11 c 0,1.1 0.9,2 2,2 z"
+   id="path8" /><path
+   fill="#39b54a"
+   d="M 7.2338527,4.153846 V 8.9999996 H 9.9070509 21.936442 24.609641 V 4.153846 C 24.609641,1.8692307 22.805232,0 20.599844,0 H 11.24365 C 9.0382615,0 7.2338527,1.8692307 7.2338527,4.153846 Z"
+   id="path10"
+   style="stroke-width:0.999996" /><g
+   id="g2238"
+   transform="translate(0.0340962)"><path
+     fill="#f2f2f2"
+     d="m 6.9659036,26 c 0,1.1 0.9,2 2,2 H 22.965904 c 1.1,0 2,-0.9 2,-2 V 12.091433 H 6.9659036 Z"
+     id="path2" /><path
+     fill="#8c6239"
+     d="m 24.965904,26 c 0,1.1 -0.9,2 -2,2 H 8.9659036 c -1.1,0 -2,-0.9 -2,-2 V 12.091433 h -4 V 26 c 0,3.3 2.7,6 6,6 H 22.965904 c 3.3,0 6,-2.7 6,-6 V 12.091433 h -4 z"
+     id="path12" /></g>
+<rect
+   style="fill:#8c6239;fill-opacity:1;stroke:none;stroke-width:8.79999e-07;stroke-linecap:round;stroke-linejoin:round"
+   id="rect587"
+   width="32"
+   height="4"
+   x="0"
+   y="9"
+   rx="2"
+   ry="2" /><rect
+   style="fill:#000000;fill-opacity:0;stroke:none;stroke-width:0.000000879999;stroke-linecap:round;stroke-linejoin:round"
+   id="rect2311"
+   width="29.020048"
+   height="4"
+   x="1.4899759"
+   y="7.1611009"/></svg>
diff --git a/launcher/resources/pe_colored/scalable/export.svg b/launcher/resources/pe_colored/scalable/export.svg
new file mode 100644
index 00000000..267cc490
--- /dev/null
+++ b/launcher/resources/pe_colored/scalable/export.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+<g
+   id="g7954"><g
+     id="g22579"><path
+       fill="#f2f2f2"
+       d="M 28,10 C 28,8.9 27.1,8 26,8 H 16 V 6 C 16,4.9 15.1,4 14,4 H 6 C 4.9,4 4,4.9 4,6 v 20 c 0,1.1 0.9,2 2,2 h 20 c 1.1,0 2,-0.9 2,-2 z"
+       id="path22556" /><rect
+       x="0"
+       fill="none"
+       width="32"
+       height="32"
+       id="rect22558"
+       y="0" /><g
+       id="g22566">
+	<path
+   fill="none"
+   d="M 26,8 H 16 V 6 C 16,4.9 15.1,4 14,4 H 6 C 4.9,4 4,4.9 4,6 v 3 17 c 0,1.1 0.9,2 2,2 h 20 c 1.1,0 2,-0.9 2,-2 V 10 C 28,9.6 27.9,9.3 27.7,9 27.4,8.4 26.7,8 26,8 Z"
+   id="path22560" />
+	<path
+   fill="#39b54a"
+   d="M 4,6 C 4,4.9 4.9,4 6,4 h 8 c 1.1,0 2,0.9 2,2 v 2 h 10 c 0.7,0 1.4,0.4 1.7,1 h 4.2 C 31.4,6.2 29,4 26,4 H 19.6 C 18.8,1.7 16.6,0 14,0 H 6 C 2.7,0 0,2.7 0,6 v 3 h 4 z"
+   id="path22562" />
+	<path
+   fill="#8c6239"
+   d="m 27.7,9 c 0.2,0.3 0.3,0.6 0.3,1 v 16 c 0,1.1 -0.9,2 -2,2 H 6 C 4.9,28 4,27.1 4,26 V 9 H 0 v 17 c 0,3.3 2.7,6 6,6 h 20 c 3.3,0 6,-2.7 6,-6 V 10 C 32,9.7 32,9.3 31.9,9 Z"
+   id="path22564" />
+</g></g><path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     fill="#009245"
+     d="m 19.283635,21.196352 c -0.312728,0.234545 -0.625454,0.312728 -0.938181,0.312728 -0.234546,0 -0.469091,-0.07819 -0.703637,-0.156365 -0.547272,-0.234544 -0.859999,-0.781818 -0.859999,-1.407271 v -1.485455 -0.07817 c -4.925453,0 -9.1472686,3.283635 -10.4763592,7.818178 C 5.9927316,25.18363 5.836368,24.167266 5.836368,23.07272 c 0,-6.019996 4.925452,-10.945449 10.94545,-10.945449 v -1.563635 c 0,-0.625454 0.312727,-1.172727 0.859999,-1.407272 C 17.876363,9.078184 18.110908,9 18.345454,9 c 0.312727,0 0.625453,0.07817 0.938181,0.312727 l 6.254542,4.690906 c 0.390909,0.312728 0.625455,0.781818 0.625455,1.250909 0,0.469092 -0.234546,0.938182 -0.625455,1.250908 z"
+     id="path22733"
+     style="stroke-width:1" /></g></svg>
diff --git a/launcher/resources/pe_colored/scalable/rename.svg b/launcher/resources/pe_colored/scalable/rename.svg
new file mode 100644
index 00000000..216cccb4
--- /dev/null
+++ b/launcher/resources/pe_colored/scalable/rename.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs38" />
+<g
+   id="g70305"
+   transform="matrix(0.87995311,0.87998288,-0.87995311,0.87998288,15.409106,-7.1812248)"
+   style="stroke-width:0.80356"><path
+     id="path66642"
+     style="fill:#f2f2f2;stroke:#8c6239;stroke-width:3.21424;stroke-linecap:butt;stroke-linejoin:round"
+     d="m 9.7027425,6.192769 v 15.467882 l 2.7787125,5.933433 c 0.483272,1.031939 1.567304,1.032078 2.050712,2.63e-4 L 17.31212,21.660651 V 6.192769" /><path
+     id="rect61208"
+     style="fill:#f2f2f2;stroke:#39b54a;stroke-width:3.21424;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+     d="m 17.31212,6.8348105 v -5.180077 c 0,-0.99644538 -0.579229,-1.80422399 -1.293746,-1.80422399 h -5.021885 c -0.714516,0 -1.2937465,0.80777861 -1.2937465,1.80422399 v 5.195776" /></g></svg>
diff --git a/launcher/resources/pe_colored/scalable/tag.svg b/launcher/resources/pe_colored/scalable/tag.svg
new file mode 100644
index 00000000..69303fe5
--- /dev/null
+++ b/launcher/resources/pe_colored/scalable/tag.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs45" />
+
+<g
+   id="g7954"><path
+     fill="none"
+     d="M 8.9659036,28 H 22.965904 c 1.1,0 2,-0.9 2,-2 V 15 14 H 6.9659036 v 1 11 c 0,1.1 0.9,2 2,2 z"
+     id="path8" /><rect
+     style="fill:#000000;fill-opacity:0;stroke:none;stroke-width:0.000000879999;stroke-linecap:round;stroke-linejoin:round"
+     id="rect2311"
+     width="29.020048"
+     height="4"
+     x="1.4899759"
+     y="7.1611009" /><path
+     id="path2-6"
+     d="M 28,6 C 28,4.9 27.1,4 26,4 H 6 C 4.9,4 4,4.9 4,6 v 20 c 0,1.1 0.9,2 2,2 h 20 c 1.1,0 2,-0.9 2,-2 z"
+     fill="#f2f2f2"
+     clip-rule="evenodd"
+     fill-rule="evenodd" /><g
+     id="g12"><path
+       id="path6"
+       d="m 6,28 h 20 c 1.1,0 2,-0.9 2,-2 V 9 6 C 28,4.9 27.1,4 26,4 H 6 C 4.9,4 4,4.9 4,6 v 3 17 c 0,1.1 0.9,2 2,2 z"
+       fill="none" /><path
+       id="path8-7"
+       d="M 26,0 H 6 C 2.7,0 0,2.7 0,6 V 9 H 4 V 6 C 4,4.9 4.9,4 6,4 h 20 c 1.1,0 2,0.9 2,2 v 3 h 4 V 6 C 32,2.7 29.3,0 26,0 Z"
+       fill="#39b54a" /><path
+       id="path10-5"
+       d="m 28,26 c 0,1.1 -0.9,2 -2,2 H 6 C 4.9,28 4,27.1 4,26 V 9 H 0 v 17 c 0,3.3 2.7,6 6,6 h 20 c 3.3,0 6,-2.7 6,-6 V 9 h -4 z"
+       fill="#8c6239" /></g><path
+     style="fill:#009245;fill-opacity:1;stroke:none;stroke-width:1"
+     d="m 16,7.1611009 -8.793231,0.045668 -0.045668,8.7932321 9.575474,8.838898 8.102324,-8.102324 z m -3.682875,2.9463001 c 1.219769,0 2.209725,0.989956 2.209725,2.209725 0,1.219769 -0.989956,2.209725 -2.209725,2.209725 -1.219766,0 -2.209724,-0.989956 -2.209724,-2.209725 0,-1.219769 0.989958,-2.209725 2.209724,-2.209725"
+     id="path6042" /></g></svg>
diff --git a/launcher/resources/pe_dark/pe_dark.qrc b/launcher/resources/pe_dark/pe_dark.qrc
index 929b310d..6b9c7cb6 100644
--- a/launcher/resources/pe_dark/pe_dark.qrc
+++ b/launcher/resources/pe_dark/pe_dark.qrc
@@ -34,5 +34,9 @@
         <file>scalable/status-yellow.svg</file>
         <file>scalable/viewfolder.svg</file>
         <file>scalable/worlds.svg</file>
+        <file>scalable/delete.svg</file>
+        <file>scalable/tag.svg</file>
+        <file>scalable/export.svg</file>
+        <file>scalable/rename.svg</file>
     </qresource>
 </RCC>
diff --git a/launcher/resources/pe_dark/scalable/delete.svg b/launcher/resources/pe_dark/scalable/delete.svg
new file mode 100644
index 00000000..fc5c2a45
--- /dev/null
+++ b/launcher/resources/pe_dark/scalable/delete.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs21">
+</defs>
+<rect
+   style="fill:#f2f2f2;stroke:none;stroke-width:4;stroke-linejoin:round;fill-opacity:1"
+   id="rect12419"
+   width="18"
+   height="15"
+   x="7"
+   y="13" /><path
+   id="path10"
+   style="stroke-width:0.999996;fill:#000000"
+   d="M 11.244141 0 C 9.0387543 0 7.234375 1.8696839 7.234375 4.1542969 L 7.234375 9 L 2 9 C 0.89200111 9 0 9.8920011 0 11 C 0 12.107999 0.89200111 13 2 13 L 3 13 L 3 26 C 3 29.299997 5.7000033 32 9 32 L 23 32 C 26.299997 32 29 29.299997 29 26 L 29 13 L 30 13 C 31.107999 13 32 12.107999 32 11 C 32 9.8920011 31.107999 9 30 9 L 24.609375 9 L 24.609375 4.1542969 C 24.609375 1.8696839 22.804995 0 20.599609 0 L 11.244141 0 z M 7 13 L 25 13 L 25 26 C 25 27.099999 24.099999 28 23 28 L 9 28 C 7.9000011 28 7 27.099999 7 26 L 7 13 z " />
+</svg>
diff --git a/launcher/resources/pe_dark/scalable/export.svg b/launcher/resources/pe_dark/scalable/export.svg
new file mode 100644
index 00000000..faec8fce
--- /dev/null
+++ b/launcher/resources/pe_dark/scalable/export.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs14" />
+<g
+   id="g7954"><g
+     id="g22579"><rect
+       x="0"
+       fill="none"
+       width="32"
+       height="32"
+       id="rect22558"
+       y="0" /><g
+       id="g22566">
+	<path
+   fill="none"
+   d="M 26,8 H 16 V 6 C 16,4.9 15.1,4 14,4 H 6 C 4.9,4 4,4.9 4,6 v 3 17 c 0,1.1 0.9,2 2,2 h 20 c 1.1,0 2,-0.9 2,-2 V 10 C 28,9.6 27.9,9.3 27.7,9 27.4,8.4 26.7,8 26,8 Z"
+   id="path22560" />
+	<path
+   id="path22562"
+   d="M 6 0 C 2.7000033 0 0 2.7000033 0 6 L 0 9 L 0 26 C 0 29.299997 2.7000033 32 6 32 L 26 32 C 29.299997 32 32 29.299997 32 26 L 32 10 C 32 9.7000003 32.000391 9.2999997 31.900391 9 C 31.400391 6.2000028 28.999997 4 26 4 L 19.599609 4 C 18.79961 1.7000023 16.599997 0 14 0 L 6 0 z M 6 4 L 14 4 C 15.099999 4 16 4.9000011 16 6 L 16 8 L 26 8 C 26.699999 8 27.399219 8.4000006 27.699219 9 C 27.899219 9.2999997 28 9.6000004 28 10 L 28 26 C 28 27.099999 27.099999 28 26 28 L 6 28 C 4.9000011 28 4 27.099999 4 26 L 4 9 L 4 6 C 4 4.9000011 4.9000011 4 6 4 z " />
+	
+</g></g><path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="m 19.283635,21.196352 c -0.312728,0.234545 -0.625454,0.312728 -0.938181,0.312728 -0.234546,0 -0.469091,-0.07819 -0.703637,-0.156365 -0.547272,-0.234544 -0.859999,-0.781818 -0.859999,-1.407271 v -1.485455 -0.07817 c -4.925453,0 -9.1472686,3.283635 -10.4763592,7.818178 C 5.9927316,25.18363 5.836368,24.167266 5.836368,23.07272 c 0,-6.019996 4.925452,-10.945449 10.94545,-10.945449 v -1.563635 c 0,-0.625454 0.312727,-1.172727 0.859999,-1.407272 C 17.876363,9.078184 18.110908,9 18.345454,9 c 0.312727,0 0.625453,0.07817 0.938181,0.312727 l 6.254542,4.690906 c 0.390909,0.312728 0.625455,0.781818 0.625455,1.250909 0,0.469092 -0.234546,0.938182 -0.625455,1.250908 z"
+     id="path22733"
+     style="stroke-width:1;fill:#666666;fill-opacity:1" /></g></svg>
diff --git a/launcher/resources/pe_dark/scalable/rename.svg b/launcher/resources/pe_dark/scalable/rename.svg
new file mode 100644
index 00000000..740f8d2f
--- /dev/null
+++ b/launcher/resources/pe_dark/scalable/rename.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs38" />
+<g
+   id="g70305"
+   transform="matrix(0.87995311,0.87998288,-0.87995311,0.87998288,15.409106,-7.1812248)"
+   style="stroke-width:0.80356"><path
+     id="path66642"
+     style="fill:#f2f2f2;stroke:#000000;stroke-width:3.21424;stroke-linecap:butt;stroke-linejoin:round"
+     d="M 10.272393,0.15880016 C 9.9282548,0.48303193 9.701946,1.0320027 9.701946,1.6547804 l 7.713e-4,20.0058326 2.7787647,5.932786 c 0.483272,1.031938 1.566339,1.032889 2.049746,0.0011 l 2.780076,-5.93399 0.0014,-20.0058323 c 0,-0.99644441 -0.579446,-1.80446494 -1.293962,-1.80446494 l -5.022821,8.497e-5 c -0.267943,0 -0.517093,0.11398937 -0.723576,0.30852843 z" /></g></svg>
diff --git a/launcher/resources/pe_dark/scalable/tag.svg b/launcher/resources/pe_dark/scalable/tag.svg
new file mode 100644
index 00000000..c092d02f
--- /dev/null
+++ b/launcher/resources/pe_dark/scalable/tag.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs45" />
+
+<g
+   id="g7954"><path
+     fill="none"
+     d="M 8.9659036,28 H 22.965904 c 1.1,0 2,-0.9 2,-2 V 15 14 H 6.9659036 v 1 11 c 0,1.1 0.9,2 2,2 z"
+     id="path8" /><rect
+     style="fill:#000000;fill-opacity:0;stroke:none;stroke-width:0.000000879999;stroke-linecap:round;stroke-linejoin:round"
+     id="rect2311"
+     width="29.020048"
+     height="4"
+     x="1.4899759"
+     y="7.1611009" /><path
+     id="path2-6"
+     d="M 28,6 C 28,4.9 27.1,4 26,4 H 6 C 4.9,4 4,4.9 4,6 v 20 c 0,1.1 0.9,2 2,2 h 20 c 1.1,0 2,-0.9 2,-2 z"
+     fill="#F2F2F2"
+     clip-rule="evenodd"
+     fill-rule="evenodd" /><g
+     id="g12"><path
+       id="path6"
+       d="m 6,28 h 20 c 1.1,0 2,-0.9 2,-2 V 9 6 C 28,4.9 27.1,4 26,4 H 6 C 4.9,4 4,4.9 4,6 v 3 17 c 0,1.1 0.9,2 2,2 z"
+       fill="none" /><path
+       id="path8-7"
+       d="M 6 0 C 2.7000033 0 0 2.7000033 0 6 L 0 9 L 0 26 C 0 29.299997 2.7000033 32 6 32 L 26 32 C 29.299997 32 32 29.299997 32 26 L 32 9 L 32 6 C 32 2.7000033 29.299997 0 26 0 L 6 0 z M 6 4 L 26 4 C 27.099999 4 28 4.9000011 28 6 L 28 9 L 28 26 C 28 27.099999 27.099999 28 26 28 L 6 28 C 4.9000011 28 4 27.099999 4 26 L 4 9 L 4 6 C 4 4.9000011 4.9000011 4 6 4 z " /></g><path
+     style="fill:#666666;fill-opacity:1;stroke:none;stroke-width:1"
+     d="m 16,7.1611009 -8.793231,0.045668 -0.045668,8.7932321 9.575474,8.838898 8.102324,-8.102324 z m -3.682875,2.9463001 c 1.219769,0 2.209725,0.989956 2.209725,2.209725 0,1.219769 -0.989956,2.209725 -2.209725,2.209725 -1.219766,0 -2.209724,-0.989956 -2.209724,-2.209725 0,-1.219769 0.989958,-2.209725 2.209724,-2.209725"
+     id="path6042" /></g></svg>
diff --git a/launcher/resources/pe_light/pe_light.qrc b/launcher/resources/pe_light/pe_light.qrc
index 25fde872..963bfcde 100644
--- a/launcher/resources/pe_light/pe_light.qrc
+++ b/launcher/resources/pe_light/pe_light.qrc
@@ -34,5 +34,9 @@
         <file>scalable/status-yellow.svg</file>
         <file>scalable/viewfolder.svg</file>
         <file>scalable/worlds.svg</file>
+        <file>scalable/delete.svg</file>
+        <file>scalable/tag.svg</file>
+        <file>scalable/export.svg</file>
+        <file>scalable/rename.svg</file>
     </qresource>
 </RCC>
diff --git a/launcher/resources/pe_light/scalable/delete.svg b/launcher/resources/pe_light/scalable/delete.svg
new file mode 100644
index 00000000..21f90ea0
--- /dev/null
+++ b/launcher/resources/pe_light/scalable/delete.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs21">
+</defs>
+<path
+   id="path10"
+   style="stroke-width:0.999996;fill:#f2f2f2;fill-opacity:1"
+   d="M 11.244141 0 C 9.0387543 0 7.234375 1.8696839 7.234375 4.1542969 L 7.234375 9 L 2 9 C 0.89200111 9 0 9.8920011 0 11 C 0 12.107999 0.89200111 13 2 13 L 3 13 L 3 26 C 3 29.299997 5.7000033 32 9 32 L 23 32 C 26.299997 32 29 29.299997 29 26 L 29 13 L 30 13 C 31.107999 13 32 12.107999 32 11 C 32 9.8920011 31.107999 9 30 9 L 24.609375 9 L 24.609375 4.1542969 C 24.609375 1.8696839 22.804995 0 20.599609 0 L 11.244141 0 z M 7 13 L 25 13 L 25 26 C 25 27.099999 24.099999 28 23 28 L 9 28 C 7.9000011 28 7 27.099999 7 26 L 7 13 z " /><g
+   id="g2238"
+   transform="translate(0.0340962)" />
+</svg>
diff --git a/launcher/resources/pe_light/scalable/export.svg b/launcher/resources/pe_light/scalable/export.svg
new file mode 100644
index 00000000..eee61936
--- /dev/null
+++ b/launcher/resources/pe_light/scalable/export.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs14" />
+<g
+   id="g7954"><g
+     id="g22579"><rect
+       x="0"
+       fill="none"
+       width="32"
+       height="32"
+       id="rect22558"
+       y="0" /><g
+       id="g22566">
+	<path
+   fill="none"
+   d="M 26,8 H 16 V 6 C 16,4.9 15.1,4 14,4 H 6 C 4.9,4 4,4.9 4,6 v 3 17 c 0,1.1 0.9,2 2,2 h 20 c 1.1,0 2,-0.9 2,-2 V 10 C 28,9.6 27.9,9.3 27.7,9 27.4,8.4 26.7,8 26,8 Z"
+   id="path22560" />
+	<path
+   id="path22562"
+   d="M 6 0 C 2.7000033 0 0 2.7000033 0 6 L 0 9 L 0 26 C 0 29.299997 2.7000033 32 6 32 L 26 32 C 29.299997 32 32 29.299997 32 26 L 32 10 C 32 9.7000003 32.000391 9.2999997 31.900391 9 C 31.400391 6.2000028 28.999997 4 26 4 L 19.599609 4 C 18.79961 1.7000023 16.599997 0 14 0 L 6 0 z M 6 4 L 14 4 C 15.099999 4 16 4.9000011 16 6 L 16 8 L 26 8 C 26.699999 8 27.399219 8.4000006 27.699219 9 C 27.899219 9.2999997 28 9.6000004 28 10 L 28 26 C 28 27.099999 27.099999 28 26 28 L 6 28 C 4.9000011 28 4 27.099999 4 26 L 4 9 L 4 6 C 4 4.9000011 4.9000011 4 6 4 z "
+   style="fill:#f2f2f2;fill-opacity:1" />
+	
+</g></g><path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="m 19.283635,21.196352 c -0.312728,0.234545 -0.625454,0.312728 -0.938181,0.312728 -0.234546,0 -0.469091,-0.07819 -0.703637,-0.156365 -0.547272,-0.234544 -0.859999,-0.781818 -0.859999,-1.407271 v -1.485455 -0.07817 c -4.925453,0 -9.1472686,3.283635 -10.4763592,7.818178 C 5.9927316,25.18363 5.836368,24.167266 5.836368,23.07272 c 0,-6.019996 4.925452,-10.945449 10.94545,-10.945449 v -1.563635 c 0,-0.625454 0.312727,-1.172727 0.859999,-1.407272 C 17.876363,9.078184 18.110908,9 18.345454,9 c 0.312727,0 0.625453,0.07817 0.938181,0.312727 l 6.254542,4.690906 c 0.390909,0.312728 0.625455,0.781818 0.625455,1.250909 0,0.469092 -0.234546,0.938182 -0.625455,1.250908 z"
+     id="path22733"
+     style="stroke-width:1;fill:#cccccc;fill-opacity:1" /></g></svg>
diff --git a/launcher/resources/pe_light/scalable/rename.svg b/launcher/resources/pe_light/scalable/rename.svg
new file mode 100644
index 00000000..f11639a0
--- /dev/null
+++ b/launcher/resources/pe_light/scalable/rename.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs38" />
+<g
+   id="g70305"
+   transform="matrix(0.87995311,0.87998288,-0.87995311,0.87998288,15.409106,-7.1812248)"
+   style="stroke-width:0.80356;fill:#4d4d4d;fill-opacity:1"><path
+     id="path66642"
+     style="fill:#4d4d4d;stroke:#ffffff;stroke-width:3.21424;stroke-linecap:butt;stroke-linejoin:round;fill-opacity:1"
+     d="M 10.272393,0.15880016 C 9.9282548,0.48303193 9.701946,1.0320027 9.701946,1.6547804 l 7.713e-4,20.0058326 2.7787647,5.932786 c 0.483272,1.031938 1.566339,1.032889 2.049746,0.0011 l 2.780076,-5.93399 0.0014,-20.0058323 c 0,-0.99644441 -0.579446,-1.80446494 -1.293962,-1.80446494 l -5.022821,8.497e-5 c -0.267943,0 -0.517093,0.11398937 -0.723576,0.30852843 z" /></g></svg>
diff --git a/launcher/resources/pe_light/scalable/tag.svg b/launcher/resources/pe_light/scalable/tag.svg
new file mode 100644
index 00000000..3f750a85
--- /dev/null
+++ b/launcher/resources/pe_light/scalable/tag.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 32 32"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs45" />
+
+<path
+   id="path6"
+   d="m 6,28 h 20 c 1.1,0 2,-0.9 2,-2 V 9 6 C 28,4.9 27.1,4 26,4 H 6 C 4.9,4 4,4.9 4,6 v 3 17 c 0,1.1 0.9,2 2,2 z"
+   fill="none" /><path
+   id="path8-7"
+   d="M 6,0 C 2.7000033,0 0,2.7000033 0,6 v 3 17 c 0,3.299997 2.7000033,6 6,6 h 20 c 3.299997,0 6,-2.700003 6,-6 V 9 6 C 32,2.7000033 29.299997,0 26,0 Z m 0,4 h 20 c 1.099999,0 2,0.9000011 2,2 v 3 17 c 0,1.099999 -0.900001,2 -2,2 H 6 C 4.9000011,28 4,27.099999 4,26 V 9 6 C 4,4.9000011 4.9000011,4 6,4 Z"
+   style="fill:#f2f2f2;fill-opacity:1" /><path
+   style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1"
+   d="m 16,7.1611009 -8.793231,0.045668 -0.045668,8.7932321 9.575474,8.838898 8.102324,-8.102324 z m -3.682875,2.9463001 c 1.219769,0 2.209725,0.989956 2.209725,2.209725 0,1.219769 -0.989956,2.209725 -2.209725,2.209725 -1.219766,0 -2.209724,-0.989956 -2.209724,-2.209725 0,-1.219769 0.989958,-2.209725 2.209724,-2.209725"
+   id="path6042" /></svg>
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 0fab0202..97152a48 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -643,6 +643,7 @@ public:
         actionRenameInstance->setObjectName(QStringLiteral("actionRenameInstance"));
         actionRenameInstance.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Rename"));
         actionRenameInstance.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Rename the selected instance."));
+        actionRenameInstance->setIcon(APPLICATION->getThemedIcon("rename"));
         all_actions.append(&actionRenameInstance);
 
         // the rename label is inside the rename tool button
@@ -675,6 +676,7 @@ public:
         actionKillInstance.setTextId(QT_TRANSLATE_NOOP("MainWindow", "&Kill"));
         actionKillInstance.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Kill the running instance"));
         actionKillInstance->setShortcut(QKeySequence(tr("Ctrl+K")));
+        actionKillInstance->setIcon(APPLICATION->getThemedIcon("status-bad"));
         all_actions.append(&actionKillInstance);
 
         actionEditInstance = TranslatedAction(MainWindow);
@@ -682,6 +684,7 @@ public:
         actionEditInstance.setTextId(QT_TRANSLATE_NOOP("MainWindow", "&Edit..."));
         actionEditInstance.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Change the instance settings, mods and versions."));
         actionEditInstance->setShortcut(QKeySequence(tr("Ctrl+I")));
+        actionEditInstance->setIcon(APPLICATION->getThemedIcon("settings-configure"));
         all_actions.append(&actionEditInstance);
 
         actionChangeInstGroup = TranslatedAction(MainWindow);
@@ -689,12 +692,14 @@ public:
         actionChangeInstGroup.setTextId(QT_TRANSLATE_NOOP("MainWindow", "&Change Group..."));
         actionChangeInstGroup.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Change the selected instance's group."));
         actionChangeInstGroup->setShortcut(QKeySequence(tr("Ctrl+G")));
+        actionChangeInstGroup->setIcon(APPLICATION->getThemedIcon("tag"));
         all_actions.append(&actionChangeInstGroup);
 
         actionViewSelectedInstFolder = TranslatedAction(MainWindow);
         actionViewSelectedInstFolder->setObjectName(QStringLiteral("actionViewSelectedInstFolder"));
         actionViewSelectedInstFolder.setTextId(QT_TRANSLATE_NOOP("MainWindow", "&Folder"));
         actionViewSelectedInstFolder.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open the selected instance's root folder in a file browser."));
+        actionViewSelectedInstFolder->setIcon(APPLICATION->getThemedIcon("viewfolder"));
         all_actions.append(&actionViewSelectedInstFolder);
 
         actionExportInstance = TranslatedAction(MainWindow);
@@ -702,6 +707,7 @@ public:
         actionExportInstance.setTextId(QT_TRANSLATE_NOOP("MainWindow", "E&xport..."));
         actionExportInstance.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Export the selected instance as a zip file."));
         actionExportInstance->setShortcut(QKeySequence(tr("Ctrl+E")));
+        actionExportInstance->setIcon(APPLICATION->getThemedIcon("export"));
         all_actions.append(&actionExportInstance);
 
         actionDeleteInstance = TranslatedAction(MainWindow);
@@ -710,14 +716,15 @@ public:
         actionDeleteInstance.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Delete the selected instance."));
         actionDeleteInstance->setShortcuts({QKeySequence(tr("Backspace")), QKeySequence::Delete});
         actionDeleteInstance->setAutoRepeat(false);
+        actionDeleteInstance->setIcon(APPLICATION->getThemedIcon("delete"));
         all_actions.append(&actionDeleteInstance);
 
         actionCopyInstance = TranslatedAction(MainWindow);
         actionCopyInstance->setObjectName(QStringLiteral("actionCopyInstance"));
-        actionCopyInstance->setIcon(APPLICATION->getThemedIcon("copy"));
         actionCopyInstance.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Cop&y..."));
         actionCopyInstance.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Copy the selected instance."));
         actionCopyInstance->setShortcut(QKeySequence(tr("Ctrl+D")));
+        actionCopyInstance->setIcon(APPLICATION->getThemedIcon("copy"));
         all_actions.append(&actionCopyInstance);
 
         setInstanceActionsEnabled(false);
-- 
cgit 


From c5a796ad8eda5c6d611b7badf223b6622bdec448 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 14:43:02 +0000
Subject: chore(deps): add renovate.json

---
 renovate.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 renovate.json

diff --git a/renovate.json b/renovate.json
new file mode 100644
index 00000000..39a2b6e9
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}
-- 
cgit 


From bdd5c180d324641c879153edd02064b0a1d08853 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 14:55:42 +0000
Subject: chore(deps): update actions/cache action to v3.0.11

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 04c34754..b30388d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -126,7 +126,7 @@ jobs:
 
       - name: Retrieve ccache cache (Windows)
         if: runner.os == 'Windows' && inputs.build_type == 'Debug'
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.0.11
         with:
           path: '${{ github.workspace }}\.ccache'
           key: ${{ matrix.os }}-qt${{ matrix.qt_ver }}
-- 
cgit 


From 09e4e100a2a2cd02167365573c447a09974f28b2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 14:55:49 +0000
Subject: chore(deps): update hendrikmuhs/ccache-action action to v1.2.3

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 04c34754..8f48fa5c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -104,7 +104,7 @@ jobs:
 
       - name: Setup ccache
         if: runner.os != 'Windows' && inputs.build_type == 'Debug'
-        uses: hendrikmuhs/ccache-action@v1.2.1
+        uses: hendrikmuhs/ccache-action@v1.2.3
         with:
           key: ${{ matrix.os }}-qt${{ matrix.qt_ver }}
 
-- 
cgit 


From 9758c9b2a25a215664c59adfc2a72eeb09d5afa1 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 21 Oct 2022 17:04:21 +0200
Subject: chore: add Netlify as sponsor

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index acbe4aaa..d7df8e26 100644
--- a/README.md
+++ b/README.md
@@ -72,13 +72,16 @@ Thanks to JetBrains for providing us a few licenses for all their products, as p
 
 [![JetBrains](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://www.jetbrains.com/opensource/)
 
-Also thanks to Weblate for hosting our translation efforts.
+Thanks to Weblate for hosting our translation efforts.
 
 <a href="https://hosted.weblate.org/engage/prismlauncher/">
 <img src="https://hosted.weblate.org/widgets/prismlauncher/-/open-graph.png" alt="Translation status" width="300" />
 </a>
 
-Additionally, thanks to the awesome people over at [MacStadium](https://www.macstadium.com/), for providing M1-Macs for development purposes!
+Thanks to Netlify for providing us their excellent web services, as part of their [Open Source program](https://www.netlify.com/open-source/)
 
-<a href="https://www.macstadium.com"><img src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png" alt="Powered by MacStadium" width="300"></a>
+<a href="https://www.netlify.com"> <img src="https://www.netlify.com/v3/img/components/netlify-color-accent.svg" alt="Deploys by Netlify" /> </a>
+
+Thanks to the awesome people over at [MacStadium](https://www.macstadium.com/), for providing M1-Macs for development purposes!
 
+<a href="https://www.macstadium.com"><img src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png" alt="Powered by MacStadium" width="300"></a>
-- 
cgit 


From ff2f40f5e10bf742170df938c56a9d21854f370b Mon Sep 17 00:00:00 2001
From: circuit10 <heath.mitchell27@gmail.com>
Date: Fri, 21 Oct 2022 16:28:04 +0100
Subject: Fix typo

Signed-off-by: circuit10 <heath.mitchell27@gmail.com>
---
 launcher/ui/pages/global/LauncherPage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 1e5df5b2..b8431e8c 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -147,7 +147,7 @@ void LauncherPage::on_instDirBrowseBtn_clicked()
         {
             QMessageBox warning;
             warning.setText(tr("You're trying to specify an instance folder "
-                            "which was granted temporaily via Flatpak.\n"
+                            "which was granted temporarily via Flatpak.\n"
                             "This is known to cause problems. "
                             "After a restart the launcher might break, "
                             "because it will no longer have access to that directory.\n\n"
-- 
cgit 


From 919f8c54d74f81e7144d8a18a1ef068e3538f458 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Fri, 21 Oct 2022 17:42:18 +0200
Subject: fix: don't build renovate branches

They will be built using the pull_requests event anyway.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .github/workflows/trigger_builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/trigger_builds.yml b/.github/workflows/trigger_builds.yml
index 55b4fdd4..8adaa5e5 100644
--- a/.github/workflows/trigger_builds.yml
+++ b/.github/workflows/trigger_builds.yml
@@ -3,7 +3,7 @@ name: Build Application
 on:
   push:
     branches-ignore:
-      - 'stable'
+      - 'renovate/**'
     paths-ignore:
       - '**.md'
       - '**/LICENSE'
-- 
cgit 


From e4b5cd23e6c8bb68bd484cfdc3da887fd30c3934 Mon Sep 17 00:00:00 2001
From: leo78913 <leo3758@riseup.net>
Date: Fri, 21 Oct 2022 13:49:31 -0300
Subject: the trashcan icons dont look like trash now

Signed-off-by: leo78913 <leo3758@riseup.net>
---
 launcher/resources/pe_blue/scalable/delete.svg    | 79 +++++++++++++------
 launcher/resources/pe_colored/scalable/delete.svg | 93 ++++++++++++++---------
 launcher/resources/pe_dark/scalable/delete.svg    | 68 ++++++++++++++---
 launcher/resources/pe_dark/scalable/tag.svg       | 12 +--
 launcher/resources/pe_light/scalable/delete.svg   | 64 ++++++++++++++--
 5 files changed, 230 insertions(+), 86 deletions(-)

diff --git a/launcher/resources/pe_blue/scalable/delete.svg b/launcher/resources/pe_blue/scalable/delete.svg
index 123fade3..54a70374 100644
--- a/launcher/resources/pe_blue/scalable/delete.svg
+++ b/launcher/resources/pe_blue/scalable/delete.svg
@@ -11,25 +11,60 @@
    xmlns:svg="http://www.w3.org/2000/svg"><defs
    id="defs21">
 </defs>
-<path
-   d="m 6.9999998,26 c 0,1.1 0.9,2 2,2 H 23 c 1.1,0 2,-0.9 2,-2 V 12.091433 H 6.9999998 Z"
-   id="path2"
-   style="fill:#daeeff;fill-opacity:1" /><circle
-   fill="none"
-   cx="8.9659033"
-   cy="10"
-   r="2"
-   id="circle6" /><path
-   fill="none"
-   d="M 8.9659036,28 H 22.965904 c 1.1,0 2,-0.9 2,-2 V 15 14 H 6.9659036 v 1 11 c 0,1.1 0.9,2 2,2 z"
-   id="path8" /><path
-   id="path10"
-   style="stroke-width:0.999996;fill:#3366cc;fill-opacity:1"
-   d="M 11.244141 0 C 9.0387543 0 7.234375 1.8696839 7.234375 4.1542969 L 7.234375 9 L 2 9 C 0.89200111 9 0 9.8920011 0 11 C 0 12.107999 0.89200111 13 2 13 L 3 13 L 3 26 C 3 29.299997 5.7000033 32 9 32 L 23 32 C 26.299997 32 29 29.299997 29 26 L 29 13 L 30 13 C 31.107999 13 32 12.107999 32 11 C 32 9.8920011 31.107999 9 30 9 L 24.609375 9 L 24.609375 4.1542969 C 24.609375 1.8696839 22.804995 0 20.599609 0 L 11.244141 0 z M 7 13 L 25 13 L 25 26 C 25 27.099999 24.099999 28 23 28 L 9 28 C 7.9000011 28 7 27.099999 7 26 L 7 13 z " />
-<rect
-   style="fill:#000000;fill-opacity:0;stroke:none;stroke-width:0.000000879999;stroke-linecap:round;stroke-linejoin:round"
-   id="rect2311"
-   width="29.020048"
-   height="4"
-   x="1.4899759"
-   y="7.1611009" /></svg>
+
+<g
+   id="g17358"
+   transform="translate(0.73129773)"><rect
+     style="fill:#daeeff;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+     id="rect15793"
+     width="17.548431"
+     height="20.8389"
+     x="6.4944863"
+     y="7.1611009" /><path
+     d="M 18.455476,4.1064849 V 2.071966 c 0,-0.8979555 0.387777,-0.8011866 -2.488293,-0.8011866 h -1.397072 c -2.876069,0 -2.488293,-0.1289149 -2.488293,0.8011866 v 2.0345189"
+     id="path10"
+     style="fill:#3366cc;fill-opacity:1;stroke:#3366cc;stroke-width:2;stroke-dasharray:none;stroke-opacity:1" /><g
+     id="g2238"
+     transform="translate(-0.9858234)"><path
+       d="m 22.885931,26.821028 c -0.0782,1.097217 -0.9,1.178972 -2,1.178972 H 11.62312 c -1.1,0 -2.0000002,-0.07897 -2.0000002,-1.178972 L 8.2218981,7.1611009 H 4.2241361 L 5.6231198,26.821028 C 5.8573527,30.112705 8.3231198,32 11.62312,32 h 9.262811 c 3.3,0 5.765767,-1.887295 6,-5.178972 L 28.284915,7.1611009 h -3.997763 z"
+       id="path12"
+       style="fill:#3366cc;fill-opacity:1" /></g><rect
+     style="fill:#3366cc;fill-opacity:1;stroke:none;stroke-width:0.000000879999;stroke-linecap:round;stroke-linejoin:round"
+     id="rect587"
+     width="29.264914"
+     height="3.9999995"
+     x="0.63624543"
+     y="3.2609999"
+     rx="2.1756897"
+     ry="1.9999998" /><g
+     id="g72186"
+     transform="matrix(1,0,0,0.89022438,-0.25830466,0.83279537)"
+     style="stroke-width:1.05986"><g
+       id="g92780"
+       transform="translate(-0.2948263)"><g
+         id="g92786"
+         transform="translate(-0.39497401)"><g
+           id="g24025"
+           transform="matrix(1,0,0,1.4771202,-0.16968376,-9.6959051)"
+           style="stroke-width:0.872052"><rect
+             style="fill:#3366cc;fill-opacity:1;stroke:none;stroke-width:3.49043;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+             id="rect24019"
+             width="2.1505656"
+             height="10.38496"
+             x="10.206384"
+             y="14.677745"
+             rx="1.0752828"
+             ry="1.0752828"
+             transform="matrix(0.99908133,-0.04285447,0.09318226,0.99564907,0,0)" /></g><g
+           id="g72180"
+           transform="matrix(-1,0,0,1.4771202,32.603298,-9.6959051)"
+           style="stroke-width:0.872052"><rect
+             style="fill:#3366cc;fill-opacity:1;stroke:none;stroke-width:3.49043;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+             id="rect72178"
+             width="2.1505656"
+             height="10.38496"
+             x="10.206384"
+             y="14.677745"
+             rx="1.0752828"
+             ry="1.0752828"
+             transform="matrix(0.99908133,-0.04285447,0.09318226,0.99564907,0,0)" /></g></g></g></g></g></svg>
diff --git a/launcher/resources/pe_colored/scalable/delete.svg b/launcher/resources/pe_colored/scalable/delete.svg
index 59162da8..d9bbddc7 100644
--- a/launcher/resources/pe_colored/scalable/delete.svg
+++ b/launcher/resources/pe_colored/scalable/delete.svg
@@ -11,39 +11,60 @@
    xmlns:svg="http://www.w3.org/2000/svg"><defs
    id="defs21">
 </defs>
-<circle
-   fill="none"
-   cx="8.9659033"
-   cy="10"
-   r="2"
-   id="circle6" /><path
-   fill="none"
-   d="M 8.9659036,28 H 22.965904 c 1.1,0 2,-0.9 2,-2 V 15 14 H 6.9659036 v 1 11 c 0,1.1 0.9,2 2,2 z"
-   id="path8" /><path
-   fill="#39b54a"
-   d="M 7.2338527,4.153846 V 8.9999996 H 9.9070509 21.936442 24.609641 V 4.153846 C 24.609641,1.8692307 22.805232,0 20.599844,0 H 11.24365 C 9.0382615,0 7.2338527,1.8692307 7.2338527,4.153846 Z"
-   id="path10"
-   style="stroke-width:0.999996" /><g
-   id="g2238"
-   transform="translate(0.0340962)"><path
-     fill="#f2f2f2"
-     d="m 6.9659036,26 c 0,1.1 0.9,2 2,2 H 22.965904 c 1.1,0 2,-0.9 2,-2 V 12.091433 H 6.9659036 Z"
-     id="path2" /><path
-     fill="#8c6239"
-     d="m 24.965904,26 c 0,1.1 -0.9,2 -2,2 H 8.9659036 c -1.1,0 -2,-0.9 -2,-2 V 12.091433 h -4 V 26 c 0,3.3 2.7,6 6,6 H 22.965904 c 3.3,0 6,-2.7 6,-6 V 12.091433 h -4 z"
-     id="path12" /></g>
-<rect
-   style="fill:#8c6239;fill-opacity:1;stroke:none;stroke-width:8.79999e-07;stroke-linecap:round;stroke-linejoin:round"
-   id="rect587"
-   width="32"
-   height="4"
-   x="0"
-   y="9"
-   rx="2"
-   ry="2" /><rect
-   style="fill:#000000;fill-opacity:0;stroke:none;stroke-width:0.000000879999;stroke-linecap:round;stroke-linejoin:round"
-   id="rect2311"
-   width="29.020048"
-   height="4"
-   x="1.4899759"
-   y="7.1611009"/></svg>
+
+<g
+   id="g17358"
+   transform="translate(0.73129773)"><rect
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+     id="rect15793"
+     width="17.548431"
+     height="20.8389"
+     x="6.4944863"
+     y="7.1611009" /><path
+     d="M 18.455476,4.1064849 V 2.071966 c 0,-0.8979555 0.387777,-0.8011866 -2.488293,-0.8011866 h -1.397072 c -2.876069,0 -2.488293,-0.1289149 -2.488293,0.8011866 v 2.0345189"
+     id="path10"
+     style="fill:#39b54a;fill-opacity:1;stroke:#39b54a;stroke-width:2;stroke-dasharray:none;stroke-opacity:1" /><g
+     id="g2238"
+     transform="translate(-0.9858234)"><path
+       fill="#8c6239"
+       d="m 22.885931,26.821028 c -0.0782,1.097217 -0.9,1.178972 -2,1.178972 H 11.62312 c -1.1,0 -2.0000002,-0.07897 -2.0000002,-1.178972 L 8.2218981,7.1611009 H 4.2241361 L 5.6231198,26.821028 C 5.8573527,30.112705 8.3231198,32 11.62312,32 h 9.262811 c 3.3,0 5.765767,-1.887295 6,-5.178972 L 28.284915,7.1611009 h -3.997763 z"
+       id="path12" /></g><rect
+     style="fill:#39b54a;fill-opacity:1;stroke:none;stroke-width:8.79999e-07;stroke-linecap:round;stroke-linejoin:round"
+     id="rect587"
+     width="29.264914"
+     height="3.9999995"
+     x="0.63624543"
+     y="3.2609999"
+     rx="2.1756897"
+     ry="1.9999998" /><g
+     id="g72186"
+     transform="matrix(1,0,0,0.89022438,-0.25830466,0.83279537)"
+     style="stroke-width:1.05986"><g
+       id="g92780"
+       transform="translate(-0.2948263)"><g
+         id="g92786"
+         transform="translate(-0.39497401)"><g
+           id="g24025"
+           transform="matrix(1,0,0,1.4771202,-0.16968376,-9.6959051)"
+           style="stroke-width:0.872052"><rect
+             style="fill:#8c6239;fill-opacity:1;stroke:none;stroke-width:3.49043;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+             id="rect24019"
+             width="2.1505656"
+             height="10.38496"
+             x="10.206384"
+             y="14.677745"
+             rx="1.0752828"
+             ry="1.0752828"
+             transform="matrix(0.99908133,-0.04285447,0.09318226,0.99564907,0,0)" /></g><g
+           id="g72180"
+           transform="matrix(-1,0,0,1.4771202,32.603298,-9.6959051)"
+           style="stroke-width:0.872052"><rect
+             style="fill:#8c6239;fill-opacity:1;stroke:none;stroke-width:3.49043;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+             id="rect72178"
+             width="2.1505656"
+             height="10.38496"
+             x="10.206384"
+             y="14.677745"
+             rx="1.0752828"
+             ry="1.0752828"
+             transform="matrix(0.99908133,-0.04285447,0.09318226,0.99564907,0,0)" /></g></g></g></g></g></svg>
diff --git a/launcher/resources/pe_dark/scalable/delete.svg b/launcher/resources/pe_dark/scalable/delete.svg
index fc5c2a45..76e52a4f 100644
--- a/launcher/resources/pe_dark/scalable/delete.svg
+++ b/launcher/resources/pe_dark/scalable/delete.svg
@@ -11,14 +11,60 @@
    xmlns:svg="http://www.w3.org/2000/svg"><defs
    id="defs21">
 </defs>
-<rect
-   style="fill:#f2f2f2;stroke:none;stroke-width:4;stroke-linejoin:round;fill-opacity:1"
-   id="rect12419"
-   width="18"
-   height="15"
-   x="7"
-   y="13" /><path
-   id="path10"
-   style="stroke-width:0.999996;fill:#000000"
-   d="M 11.244141 0 C 9.0387543 0 7.234375 1.8696839 7.234375 4.1542969 L 7.234375 9 L 2 9 C 0.89200111 9 0 9.8920011 0 11 C 0 12.107999 0.89200111 13 2 13 L 3 13 L 3 26 C 3 29.299997 5.7000033 32 9 32 L 23 32 C 26.299997 32 29 29.299997 29 26 L 29 13 L 30 13 C 31.107999 13 32 12.107999 32 11 C 32 9.8920011 31.107999 9 30 9 L 24.609375 9 L 24.609375 4.1542969 C 24.609375 1.8696839 22.804995 0 20.599609 0 L 11.244141 0 z M 7 13 L 25 13 L 25 26 C 25 27.099999 24.099999 28 23 28 L 9 28 C 7.9000011 28 7 27.099999 7 26 L 7 13 z " />
-</svg>
+
+<g
+   id="g17358"
+   transform="translate(0.73129773)"><rect
+     style="fill:none;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+     id="rect15793"
+     width="17.548431"
+     height="20.8389"
+     x="6.4944863"
+     y="7.1611009" /><path
+     d="M 18.455476,4.1064849 V 2.071966 c 0,-0.8979555 0.387777,-0.8011866 -2.488293,-0.8011866 h -1.397072 c -2.876069,0 -2.488293,-0.1289149 -2.488293,0.8011866 v 2.0345189"
+     id="path10"
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-dasharray:none;stroke-opacity:1" /><g
+     id="g2238"
+     transform="translate(-0.9858234)"><path
+       d="m 22.885931,26.821028 c -0.0782,1.097217 -0.9,1.178972 -2,1.178972 H 11.62312 c -1.1,0 -2.0000002,-0.07897 -2.0000002,-1.178972 L 8.2218981,7.1611009 H 4.2241361 L 5.6231198,26.821028 C 5.8573527,30.112705 8.3231198,32 11.62312,32 h 9.262811 c 3.3,0 5.765767,-1.887295 6,-5.178972 L 28.284915,7.1611009 h -3.997763 z"
+       id="path12"
+       style="fill:#000000" /></g><rect
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.000000879999;stroke-linecap:round;stroke-linejoin:round"
+     id="rect587"
+     width="29.264914"
+     height="3.9999995"
+     x="0.63624543"
+     y="3.2609999"
+     rx="2.1756897"
+     ry="1.9999998" /><g
+     id="g72186"
+     transform="matrix(1,0,0,0.89022438,-0.25830466,0.83279537)"
+     style="stroke-width:1.05986"><g
+       id="g92780"
+       transform="translate(-0.2948263)"><g
+         id="g92786"
+         transform="translate(-0.39497401)"><g
+           id="g24025"
+           transform="matrix(1,0,0,1.4771202,-0.16968376,-9.6959051)"
+           style="stroke-width:0.872052"><rect
+             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.49043;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+             id="rect24019"
+             width="2.1505656"
+             height="10.38496"
+             x="10.206384"
+             y="14.677745"
+             rx="1.0752828"
+             ry="1.0752828"
+             transform="matrix(0.99908133,-0.04285447,0.09318226,0.99564907,0,0)" /></g><g
+           id="g72180"
+           transform="matrix(-1,0,0,1.4771202,32.603298,-9.6959051)"
+           style="stroke-width:0.872052"><rect
+             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.49043;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+             id="rect72178"
+             width="2.1505656"
+             height="10.38496"
+             x="10.206384"
+             y="14.677745"
+             rx="1.0752828"
+             ry="1.0752828"
+             transform="matrix(0.99908133,-0.04285447,0.09318226,0.99564907,0,0)" /></g></g></g></g></g></svg>
diff --git a/launcher/resources/pe_dark/scalable/tag.svg b/launcher/resources/pe_dark/scalable/tag.svg
index c092d02f..63772af2 100644
--- a/launcher/resources/pe_dark/scalable/tag.svg
+++ b/launcher/resources/pe_dark/scalable/tag.svg
@@ -12,21 +12,13 @@
    id="defs45" />
 
 <g
-   id="g7954"><path
-     fill="none"
-     d="M 8.9659036,28 H 22.965904 c 1.1,0 2,-0.9 2,-2 V 15 14 H 6.9659036 v 1 11 c 0,1.1 0.9,2 2,2 z"
-     id="path8" /><rect
+   id="g7954"><rect
      style="fill:#000000;fill-opacity:0;stroke:none;stroke-width:0.000000879999;stroke-linecap:round;stroke-linejoin:round"
      id="rect2311"
      width="29.020048"
      height="4"
      x="1.4899759"
-     y="7.1611009" /><path
-     id="path2-6"
-     d="M 28,6 C 28,4.9 27.1,4 26,4 H 6 C 4.9,4 4,4.9 4,6 v 20 c 0,1.1 0.9,2 2,2 h 20 c 1.1,0 2,-0.9 2,-2 z"
-     fill="#F2F2F2"
-     clip-rule="evenodd"
-     fill-rule="evenodd" /><g
+     y="7.1611009" /><g
      id="g12"><path
        id="path6"
        d="m 6,28 h 20 c 1.1,0 2,-0.9 2,-2 V 9 6 C 28,4.9 27.1,4 26,4 H 6 C 4.9,4 4,4.9 4,6 v 3 17 c 0,1.1 0.9,2 2,2 z"
diff --git a/launcher/resources/pe_light/scalable/delete.svg b/launcher/resources/pe_light/scalable/delete.svg
index 21f90ea0..0e41add9 100644
--- a/launcher/resources/pe_light/scalable/delete.svg
+++ b/launcher/resources/pe_light/scalable/delete.svg
@@ -11,10 +11,60 @@
    xmlns:svg="http://www.w3.org/2000/svg"><defs
    id="defs21">
 </defs>
-<path
-   id="path10"
-   style="stroke-width:0.999996;fill:#f2f2f2;fill-opacity:1"
-   d="M 11.244141 0 C 9.0387543 0 7.234375 1.8696839 7.234375 4.1542969 L 7.234375 9 L 2 9 C 0.89200111 9 0 9.8920011 0 11 C 0 12.107999 0.89200111 13 2 13 L 3 13 L 3 26 C 3 29.299997 5.7000033 32 9 32 L 23 32 C 26.299997 32 29 29.299997 29 26 L 29 13 L 30 13 C 31.107999 13 32 12.107999 32 11 C 32 9.8920011 31.107999 9 30 9 L 24.609375 9 L 24.609375 4.1542969 C 24.609375 1.8696839 22.804995 0 20.599609 0 L 11.244141 0 z M 7 13 L 25 13 L 25 26 C 25 27.099999 24.099999 28 23 28 L 9 28 C 7.9000011 28 7 27.099999 7 26 L 7 13 z " /><g
-   id="g2238"
-   transform="translate(0.0340962)" />
-</svg>
+
+<g
+   id="g17358"
+   transform="translate(0.73129773)"><rect
+     style="fill:none;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+     id="rect15793"
+     width="17.548431"
+     height="20.8389"
+     x="6.4944863"
+     y="7.1611009" /><path
+     d="M 18.455476,4.1064849 V 2.071966 c 0,-0.8979555 0.387777,-0.8011866 -2.488293,-0.8011866 h -1.397072 c -2.876069,0 -2.488293,-0.1289149 -2.488293,0.8011866 v 2.0345189"
+     id="path10"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:#f2f2f2;stroke-width:2;stroke-dasharray:none;stroke-opacity:1" /><g
+     id="g2238"
+     transform="translate(-0.9858234)"><path
+       d="m 22.885931,26.821028 c -0.0782,1.097217 -0.9,1.178972 -2,1.178972 H 11.62312 c -1.1,0 -2.0000002,-0.07897 -2.0000002,-1.178972 L 8.2218981,7.1611009 H 4.2241361 L 5.6231198,26.821028 C 5.8573527,30.112705 8.3231198,32 11.62312,32 h 9.262811 c 3.3,0 5.765767,-1.887295 6,-5.178972 L 28.284915,7.1611009 h -3.997763 z"
+       id="path12"
+       style="fill:#f2f2f2;fill-opacity:1" /></g><rect
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.000000879999;stroke-linecap:round;stroke-linejoin:round"
+     id="rect587"
+     width="29.264914"
+     height="3.9999995"
+     x="0.63624543"
+     y="3.2609999"
+     rx="2.1756897"
+     ry="1.9999998" /><g
+     id="g72186"
+     transform="matrix(1,0,0,0.89022438,-0.25830466,0.83279537)"
+     style="stroke-width:1.05986"><g
+       id="g92780"
+       transform="translate(-0.2948263)"><g
+         id="g92786"
+         transform="translate(-0.39497401)"><g
+           id="g24025"
+           transform="matrix(1,0,0,1.4771202,-0.16968376,-9.6959051)"
+           style="stroke-width:0.872052"><rect
+             style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:3.49043;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+             id="rect24019"
+             width="2.1505656"
+             height="10.38496"
+             x="10.206384"
+             y="14.677745"
+             rx="1.0752828"
+             ry="1.0752828"
+             transform="matrix(0.99908133,-0.04285447,0.09318226,0.99564907,0,0)" /></g><g
+           id="g72180"
+           transform="matrix(-1,0,0,1.4771202,32.603298,-9.6959051)"
+           style="stroke-width:0.872052"><rect
+             style="fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:3.49043;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"
+             id="rect72178"
+             width="2.1505656"
+             height="10.38496"
+             x="10.206384"
+             y="14.677745"
+             rx="1.0752828"
+             ry="1.0752828"
+             transform="matrix(0.99908133,-0.04285447,0.09318226,0.99564907,0,0)" /></g></g></g></g></g></svg>
-- 
cgit 


From ccf7d1e0c433d72d7bcd805a8564e602d61ac880 Mon Sep 17 00:00:00 2001
From: leo78913 <leo3758@riseup.net>
Date: Fri, 21 Oct 2022 13:59:22 -0300
Subject: material design icons

Signed-off-by: leo78913 <leo3758@riseup.net>
---
 launcher/resources/flat/scalable/delete.svg | 18 +-----------------
 launcher/resources/flat/scalable/export.svg | 17 +----------------
 launcher/resources/flat/scalable/rename.svg | 18 +-----------------
 launcher/resources/flat/scalable/tag.svg    | 18 +-----------------
 4 files changed, 4 insertions(+), 67 deletions(-)

diff --git a/launcher/resources/flat/scalable/delete.svg b/launcher/resources/flat/scalable/delete.svg
index 9f35cd07..89a0948b 100644
--- a/launcher/resources/flat/scalable/delete.svg
+++ b/launcher/resources/flat/scalable/delete.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   fill="#757575"
-   height="24"
-   viewBox="0 0 24 24"
-   width="24"
-   version="1.1"
-   id="svg4"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs8" />
-  <path
-     id="path5145"
-     style="fill:#757575;fill-opacity:1;stroke:none;stroke-width:1.4;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:none"
-     d="M 7.1074219 0.96484375 L 7.1074219 2.7304688 L 2.6132812 2.7304688 L 2.6132812 4.4960938 L 21.386719 4.4960938 L 21.386719 2.7304688 L 16.892578 2.7304688 L 16.892578 0.96484375 L 7.1074219 0.96484375 z M 5.0058594 6.0839844 L 5.0058594 22.859375 L 18.994141 22.859375 L 18.994141 6.0839844 L 5.0058594 6.0839844 z M 7.9160156 9.0605469 L 10.193359 9.0605469 L 10.193359 19.882812 L 7.9160156 19.882812 L 7.9160156 9.0605469 z M 13.804688 9.0605469 L 16.085938 9.0605469 L 16.085938 19.882812 L 13.804688 19.882812 L 13.804688 9.0605469 z " />
-</svg>
+<svg fill="#757575" xmlns="http://www.w3.org/2000/svg" height="48" width="48"><path d="M13.05 42q-1.2 0-2.1-.9-.9-.9-.9-2.1V10.5H8v-3h9.4V6h13.2v1.5H40v3h-2.05V39q0 1.2-.9 2.1-.9.9-2.1.9Zm5.3-7.3h3V14.75h-3Zm8.3 0h3V14.75h-3Z"/></svg>
diff --git a/launcher/resources/flat/scalable/export.svg b/launcher/resources/flat/scalable/export.svg
index d715ce94..a3b711a2 100644
--- a/launcher/resources/flat/scalable/export.svg
+++ b/launcher/resources/flat/scalable/export.svg
@@ -1,16 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   fill="#757575"
-   height="24"
-   viewBox="0 0 24 24"
-   width="24"
-   version="1.1"
-   id="svg4"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M 4 4 C 2.9000011 4 2.0097656 4.9000011 2.0097656 6 L 2 18 C 2 19.099999 2.9000011 20 4 20 L 20 20 C 21.099999 20 22 19.099999 22 18 L 22 8 C 22 6.9000011 21.099999 6 20 6 L 12 6 L 10 4 L 4 4 z M 12.537109 9.9082031 L 13.185547 10.298828 L 17.554688 12.929688 L 13.185547 15.5625 L 12.537109 15.953125 L 11.755859 14.65625 L 12.404297 14.265625 L 13.349609 13.695312 L 6.4453125 13.695312 L 6.4453125 12.166016 L 13.351562 12.166016 L 12.404297 11.595703 L 11.755859 11.205078 L 12.537109 9.9082031 z " />
-</svg>
+<svg fill="#757575" xmlns="http://www.w3.org/2000/svg" height="48" width="48"><path d="M24.65 33.35 32 26l-7.35-7.35-2.1 2.1 3.75 3.75H16v3h10.3l-3.75 3.75ZM7.05 40q-1.2 0-2.1-.925-.9-.925-.9-2.075V11q0-1.15.9-2.075Q5.85 8 7.05 8h14l3 3h17q1.15 0 2.075.925.925.925.925 2.075v23q0 1.15-.925 2.075Q42.2 40 41.05 40Z"/></svg>
diff --git a/launcher/resources/flat/scalable/rename.svg b/launcher/resources/flat/scalable/rename.svg
index 1f793ca7..d0b56723 100644
--- a/launcher/resources/flat/scalable/rename.svg
+++ b/launcher/resources/flat/scalable/rename.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   fill="#757575"
-   height="24"
-   viewBox="0 0 24 24"
-   width="24"
-   version="1.1"
-   id="svg4"
-   xml:space="preserve"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs6" />
-  
-<path
-   id="rect345"
-   style="stroke-width:1.40001;stroke-linecap:square"
-   d="m 16.944458,1.2305698 -2.249239,2.2492384 5.824973,5.8249729 2.249239,-2.2492385 a 0.74206194,0.74206194 90.000002 0 0 0,-1.0494341 L 17.993892,1.2305699 a 0.74206211,0.74206211 2.5523302e-6 0 0 -1.049434,-1e-7 z M 13.645389,4.5296385 3.5726925,14.602335 9.3976653,20.427306 19.470362,10.35461 Z M 2.5228612,15.652165 1.0244287,22.411695 a 0.47276304,0.47276304 44.999993 0 0 0.5638754,0.563875 l 6.75953,-1.498434 z" /></svg>
+<svg fill="#757575" xmlns="http://www.w3.org/2000/svg" height="48" width="48"><path d="m39.7 14.7-6.4-6.4 2.1-2.1q.85-.85 2.125-.825 1.275.025 2.125.875L41.8 8.4q.85.85.85 2.1t-.85 2.1Zm-2.1 2.1L12.4 42H6v-6.4l25.2-25.2Z"/></svg>
diff --git a/launcher/resources/flat/scalable/tag.svg b/launcher/resources/flat/scalable/tag.svg
index 7355fbf1..0629b185 100644
--- a/launcher/resources/flat/scalable/tag.svg
+++ b/launcher/resources/flat/scalable/tag.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   fill="#757575"
-   height="24"
-   viewBox="0 0 24 24"
-   width="24"
-   version="1.1"
-   id="svg4"
-   xml:space="preserve"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <path
-  style="fill:#757575;fill-opacity:1;stroke:none;stroke-width:0.999999"
-  d="M 12,2.4960934 2.5451968,2.5451969 2.4960933,12 12.791992,21.503907 21.503907,12.791992 Z M 8.0400388,5.6640622 c 1.3115393,0 2.3759772,1.0644375 2.3759772,2.3759766 0,1.3115391 -1.0644379,2.3759772 -2.3759772,2.3759772 -1.3115392,0 -2.3759767,-1.0644381 -2.3759767,-2.3759772 0,-1.3115391 1.0644375,-2.3759766 2.3759767,-2.3759766"
-  class="ColorScheme-Text"
-  id="path4838" />
-</svg>
+<svg fill="#757575" xmlns="http://www.w3.org/2000/svg" height="48" width="48"><path d="M27.95 43.15q-.9.9-2.175.9t-2.175-.9L4.85 24.4q-.5-.5-.675-1.05Q4 22.8 4 22.2V7q0-1.3.85-2.15Q5.7 4 7 4h15.2q.6 0 1.2.175t1.1.675L43.15 23.5q.95.95.95 2.225 0 1.275-.95 2.225ZM12.25 14.8q1.05 0 1.825-.775.775-.775.775-1.825 0-1.05-.775-1.825Q13.3 9.6 12.25 9.6q-1.05 0-1.825.775-.775.775-.775 1.825 0 1.05.775 1.825.775.775 1.825.775Z"/></svg>
-- 
cgit 


From 9b17cde01929e58819c353868734f81faf811958 Mon Sep 17 00:00:00 2001
From: forkiesassds <icanttellyou@memeware.net>
Date: Sat, 22 Oct 2022 01:19:51 +0300
Subject: CurseForge modpack page improvements

Signed-off-by: forkiesassds <icanttellyou@memeware.net>
---
 launcher/ui/pages/modplatform/flame/FlameModel.cpp | 52 +++++++++++++---------
 launcher/ui/pages/modplatform/flame/FlamePage.cpp  | 10 +++++
 launcher/ui/pages/modplatform/flame/FlamePage.ui   |  9 +++-
 3 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/launcher/ui/pages/modplatform/flame/FlameModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
index b9804681..9f8605eb 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModel.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameModel.cpp
@@ -1,6 +1,7 @@
 #include "FlameModel.h"
 #include <Json.h>
 #include "Application.h"
+#include "ui/widgets/ProjectItem.h"
 
 #include <MMCStrings.h>
 #include <Version.h>
@@ -31,29 +32,38 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
     }
 
     IndexedPack pack = modpacks.at(pos);
-    if (role == Qt::DisplayRole) {
-        return pack.name;
-    } else if (role == Qt::ToolTipRole) {
-        if (pack.description.length() > 100) {
-            // some magic to prevent to long tooltips and replace html linebreaks
-            QString edit = pack.description.left(97);
-            edit = edit.left(edit.lastIndexOf("<br>")).left(edit.lastIndexOf(" ")).append("...");
-            return edit;
+    switch (role) {
+        case Qt::ToolTipRole: {
+            if (pack.description.length() > 100) {
+                // some magic to prevent to long tooltips and replace html linebreaks
+                QString edit = pack.description.left(97);
+                edit = edit.left(edit.lastIndexOf("<br>")).left(edit.lastIndexOf(" ")).append("...");
+                return edit;
+            }
+            return pack.description;
+        } case Qt::DecorationRole: {
+            if (m_logoMap.contains(pack.logoName)) {
+                return (m_logoMap.value(pack.logoName));
+            }
+            QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
+            ((ListModel*)this)->requestLogo(pack.logoName, pack.logoUrl);
+            return icon;
+        } case Qt::UserRole: {
+            QVariant v;
+            v.setValue(pack);
+            return v;
         }
-        return pack.description;
-    } else if (role == Qt::DecorationRole) {
-        if (m_logoMap.contains(pack.logoName)) {
-            return (m_logoMap.value(pack.logoName));
-        }
-        QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
-        ((ListModel*)this)->requestLogo(pack.logoName, pack.logoUrl);
-        return icon;
-    } else if (role == Qt::UserRole) {
-        QVariant v;
-        v.setValue(pack);
-        return v;
+        case Qt::SizeHintRole:
+            return QSize(0, 58);
+        case UserDataTypes::TITLE:
+            return pack.name;
+        case UserDataTypes::DESCRIPTION:
+            return pack.description;
+        case UserDataTypes::SELECTED:
+            return false;
+        default:
+            break;
     }
-
     return QVariant();
 }
 
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.cpp b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
index 7d2ba2e2..a65b6585 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.cpp
@@ -43,6 +43,10 @@
 #include "InstanceImportTask.h"
 #include "Json.h"
 #include "ui/dialogs/NewInstanceDialog.h"
+#include "ui/widgets/ProjectItem.h"
+#include "modplatform/flame/FlameAPI.h"
+
+static FlameAPI api;
 
 FlamePage::FlamePage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), ui(new Ui::FlamePage), dialog(dialog)
 {
@@ -66,6 +70,9 @@ FlamePage::FlamePage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(paren
     connect(ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
     connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FlamePage::onSelectionChanged);
     connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FlamePage::onVersionSelectionChanged);
+
+    ui->packView->setItemDelegate(new ProjectItemDelegate(this));
+    ui->packDescription->setMetaEntry("FlamePacks");
 }
 
 FlamePage::~FlamePage()
@@ -250,7 +257,10 @@ void FlamePage::updateUi()
             text += "- " + tr("Source code: <a href=%1>%1</a>").arg(current.extra.sourceUrl) + "<br>";
     }
 
+
     text += "<hr>";
+    text += api.getModDescription(current.addonId).toUtf8();
 
     ui->packDescription->setHtml(text + current.description);
+    ui->packDescription->flush();
 }
diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.ui b/launcher/ui/pages/modplatform/flame/FlamePage.ui
index 1a3d0225..71d19513 100644
--- a/launcher/ui/pages/modplatform/flame/FlamePage.ui
+++ b/launcher/ui/pages/modplatform/flame/FlamePage.ui
@@ -66,7 +66,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QTextBrowser" name="packDescription">
+      <widget class="ProjectDescriptionPage" name="packDescription">
        <property name="openExternalLinks">
         <bool>true</bool>
        </property>
@@ -99,6 +99,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ProjectDescriptionPage</class>
+   <extends>QTextBrowser</extends>
+   <header>ui/widgets/ProjectDescriptionPage.h</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>packView</tabstop>
   <tabstop>packDescription</tabstop>
-- 
cgit 


From ba4af1a890f3d2990d86a36a2fbbb16ad2c774cf Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 21 Oct 2022 19:54:10 -0400
Subject: fix: make jars path specific to prism

Signed-off-by: seth <getchoo@tuta.io>
---
 CMakeLists.txt           | 2 +-
 launcher/Application.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 131d3e53..97bad31b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,7 +249,7 @@ if(UNIX AND APPLE)
 elseif(UNIX)
     set(BINARY_DEST_DIR "bin")
     set(LIBRARY_DEST_DIR "lib${LIB_SUFFIX}")
-    set(JARS_DEST_DIR "share/jars")
+    set(JARS_DEST_DIR "share/${Launcher_APP_BINARY_NAME}")
     set(LAUNCHER_DESKTOP_DEST_DIR "share/applications" CACHE STRING "Path to the desktop file directory")
     set(LAUNCHER_METAINFO_DEST_DIR "share/metainfo" CACHE STRING "Path to the metainfo directory")
     set(LAUNCHER_ICON_DEST_DIR "share/icons/hicolor/scalable/apps" CACHE STRING "Path to the scalable icon directory")
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 6ffec1ae..babf824a 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1571,7 +1571,7 @@ QString Application::getJarPath(QString jarFile)
 {
     QStringList potentialPaths = {
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
-        FS::PathCombine(m_rootPath, "share/jars"),
+        FS::PathCombine(m_rootPath, "share/" + BuildConfig.LAUNCHER_NAME),
 #endif
         FS::PathCombine(m_rootPath, "jars"),
         FS::PathCombine(applicationDirPath(), "jars")
-- 
cgit 


From 4a2b25e841224441c0dcaa81bcbd0f716d64201e Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 21 Oct 2022 21:29:28 -0400
Subject: fix: use correct variable for jars path

Signed-off-by: seth <getchoo@tuta.io>
---
 buildconfig/BuildConfig.cpp.in | 1 +
 buildconfig/BuildConfig.h      | 1 +
 launcher/Application.cpp       | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/buildconfig/BuildConfig.cpp.in b/buildconfig/BuildConfig.cpp.in
index 50e5e8a4..fc68326c 100644
--- a/buildconfig/BuildConfig.cpp.in
+++ b/buildconfig/BuildConfig.cpp.in
@@ -42,6 +42,7 @@ Config::Config()
 {
     // Name and copyright
     LAUNCHER_NAME = "@Launcher_Name@";
+    LAUNCHER_APP_BINARY_NAME = "@Launcher_APP_BINARY_NAME@"'
     LAUNCHER_DISPLAYNAME = "@Launcher_DisplayName@";
     LAUNCHER_COPYRIGHT = "@Launcher_Copyright@";
     LAUNCHER_DOMAIN = "@Launcher_Domain@";
diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h
index ef384ed2..13ccdaa1 100644
--- a/buildconfig/BuildConfig.h
+++ b/buildconfig/BuildConfig.h
@@ -44,6 +44,7 @@ class Config {
    public:
     Config();
     QString LAUNCHER_NAME;
+    QString LAUNCHER_APP_BINARY_NAME;
     QString LAUNCHER_DISPLAYNAME;
     QString LAUNCHER_COPYRIGHT;
     QString LAUNCHER_DOMAIN;
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index babf824a..97f757f7 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1571,7 +1571,7 @@ QString Application::getJarPath(QString jarFile)
 {
     QStringList potentialPaths = {
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
-        FS::PathCombine(m_rootPath, "share/" + BuildConfig.LAUNCHER_NAME),
+        FS::PathCombine(m_rootPath, "share/" + BuildConfig.LAUNCHER_APP_BINARY_NAME),
 #endif
         FS::PathCombine(m_rootPath, "jars"),
         FS::PathCombine(applicationDirPath(), "jars")
-- 
cgit 


From 2592c690213506c3cdfbc441c20f13ef7cf3eb23 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 21 Oct 2022 21:37:31 -0400
Subject: semicolon fail

i was off by one key :(

Signed-off-by: seth <getchoo@tuta.io>
---
 buildconfig/BuildConfig.cpp.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildconfig/BuildConfig.cpp.in b/buildconfig/BuildConfig.cpp.in
index fc68326c..b8fa5133 100644
--- a/buildconfig/BuildConfig.cpp.in
+++ b/buildconfig/BuildConfig.cpp.in
@@ -42,7 +42,7 @@ Config::Config()
 {
     // Name and copyright
     LAUNCHER_NAME = "@Launcher_Name@";
-    LAUNCHER_APP_BINARY_NAME = "@Launcher_APP_BINARY_NAME@"'
+    LAUNCHER_APP_BINARY_NAME = "@Launcher_APP_BINARY_NAME@";
     LAUNCHER_DISPLAYNAME = "@Launcher_DisplayName@";
     LAUNCHER_COPYRIGHT = "@Launcher_Copyright@";
     LAUNCHER_DOMAIN = "@Launcher_Domain@";
-- 
cgit 


From a6b13487f0e27c8bea1917720a0c5c1eb1eb206c Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Thu, 20 Oct 2022 18:30:32 +0100
Subject: ATLauncher: Abort install if optional mods dialog is closed

This matches the behaviour of ATLauncher.
---
 launcher/modplatform/atlauncher/ATLPackInstallTask.cpp             | 7 ++++++-
 launcher/modplatform/atlauncher/ATLPackInstallTask.h               | 2 +-
 .../pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp | 7 +++++--
 .../pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h   | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index a553eafd..68d75943 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
@@ -736,7 +736,12 @@ void PackInstallTask::downloadMods()
     QVector<QString> selectedMods;
     if (!optionalMods.isEmpty()) {
         setStatus(tr("Selecting optional mods..."));
-        selectedMods = m_support->chooseOptionalMods(m_version, optionalMods);
+        auto mods = m_support->chooseOptionalMods(m_version, optionalMods);
+        if (!mods.has_value()) {
+            emitAborted();
+            return;
+        }
+        selectedMods = mods.value();
     }
 
     setStatus(tr("Downloading mods..."));
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.h b/launcher/modplatform/atlauncher/ATLPackInstallTask.h
index ed4436f0..78cd87fb 100644
--- a/launcher/modplatform/atlauncher/ATLPackInstallTask.h
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.h
@@ -62,7 +62,7 @@ public:
     /**
      * Requests a user interaction to select which optional mods should be installed.
      */
-    virtual QVector<QString> chooseOptionalMods(PackVersion version, QVector<ATLauncher::VersionMod> mods) = 0;
+    virtual std::optional<QVector<QString>> chooseOptionalMods(PackVersion version, QVector<ATLauncher::VersionMod> mods) = 0;
 
     /**
      * Requests a user interaction to select a component version from a given version list
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
index 03196685..c68e40ba 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
@@ -43,10 +43,13 @@ AtlUserInteractionSupportImpl::AtlUserInteractionSupportImpl(QWidget *parent) :
 {
 }
 
-QVector<QString> AtlUserInteractionSupportImpl::chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods)
+std::optional<QVector<QString>> AtlUserInteractionSupportImpl::chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods)
 {
     AtlOptionalModDialog optionalModDialog(m_parent, version, mods);
-    optionalModDialog.exec();
+    auto result = optionalModDialog.exec();
+    if (result == QDialog::Rejected) {
+        return {};
+    }
     return optionalModDialog.getResult();
 }
 
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h
index aa22fc73..3b37c9be 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h
@@ -47,7 +47,7 @@ public:
 
 private:
     QString chooseVersion(Meta::VersionListPtr vlist, QString minecraftVersion) override;
-    QVector<QString> chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods) override;
+    std::optional<QVector<QString>> chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods) override;
     void displayMessage(QString message) override;
 
 private:
-- 
cgit 

-- 
cgit 


From 970e4b020ea14a1fbd5abe65517a3e26399280cb Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 22 Oct 2022 14:11:51 +0200
Subject: fix: fix segfault when resolving Flame resources

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 launcher/modplatform/flame/FileResolvingTask.cpp | 14 ++++++--------
 launcher/modplatform/flame/FileResolvingTask.h   |  3 ++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 0b2431f7..c50abb8f 100644
--- a/launcher/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
@@ -12,6 +12,8 @@ bool Flame::FileResolvingTask::abort()
     bool aborted = true;
     if (m_dljob)
         aborted &= m_dljob->abort();
+    if (m_checkJob)
+        aborted &= m_checkJob->abort();
     return aborted ? Task::abort() : false;
 }
 
@@ -40,7 +42,7 @@ void Flame::FileResolvingTask::netJobFinished()
     setProgress(1, 3);
     int index = 0;
     // job to check modrinth for blocked projects
-    auto job = new NetJob("Modrinth check", m_network);
+    m_checkJob = new NetJob("Modrinth check", m_network);
     blockedProjects = QMap<File *,QByteArray *>();
     auto doc = Json::requireDocument(*result);
     auto array = Json::requireArray(doc.object()["data"]);
@@ -60,19 +62,15 @@ void Flame::FileResolvingTask::netJobFinished()
                     out.resolved = true;
                 });
 
-                job->addNetAction(dl);
+                m_checkJob->addNetAction(dl);
                 blockedProjects.insert(&out, output);
             }
         }
         index++;
     }
-    connect(job, &NetJob::finished, this,
-        [this, &job] {
-            modrinthCheckFinished();
-            job->deleteLater();
-        });
+    connect(m_checkJob.get(), &NetJob::finished, this, &Flame::FileResolvingTask::modrinthCheckFinished);
 
-    job->start();
+    m_checkJob->start();
 }
 
 void Flame::FileResolvingTask::modrinthCheckFinished() {
diff --git a/launcher/modplatform/flame/FileResolvingTask.h b/launcher/modplatform/flame/FileResolvingTask.h
index f71b87ce..8fc17ea9 100644
--- a/launcher/modplatform/flame/FileResolvingTask.h
+++ b/launcher/modplatform/flame/FileResolvingTask.h
@@ -30,8 +30,9 @@ protected slots:
 private: /* data */
     shared_qobject_ptr<QNetworkAccessManager> m_network;
     Flame::Manifest m_toProcess;
-    std::shared_ptr<QByteArray> result;
+	std::shared_ptr<QByteArray> result;
     NetJob::Ptr m_dljob;
+	NetJob::Ptr m_checkJob;
 
     void modrinthCheckFinished();
 
-- 
cgit 


From 8b3093e7580c01e43d80803b8b931445f9438bc8 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 22 Oct 2022 14:57:03 +0200
Subject: chore: add PR template

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .github/pull_request_template.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 00000000..41f0604e
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,9 @@
+<!--
+Hey there! Thanks for your contribution.
+
+Please make sure that your commits are signed off first.
+If you don't know how that works, check out our contribution guidelines: https://github.com/PrismLauncher/PrismLauncher/blob/develop/CONTRIBUTING.md#signing-your-work
+If you already created your commits, you can run `git rebase --signoff develop` to retroactively sign-off all your commits and `git push --force` to override what you have pushed already.
+
+Note that signing and signing-off are two different things!
+-->
-- 
cgit