5 files changed, 4 insertions, 18 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index e6a8562c..acac2da2 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1175,16 +1175,6 @@ QIcon Application::getThemedIcon(const QString& name)
     return QIcon::fromTheme(name);
 }
 
-QList<CatPack*> Application::getValidCatPacks()
-{
-    return m_themeManager->getValidCatPacks();
-}
-
-QString Application::getCatPack(QString catName)
-{
-    return m_themeManager->getCatPack(catName);
-}
-
 bool Application::openJsonEditor(const QString& filename)
 {
     const QString file = QDir::current().absoluteFilePath(filename);
diff --git a/launcher/Application.h b/launcher/Application.h
index 203fd16e..1c221cec 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -122,10 +122,6 @@ public:
 
     ThemeManager* themeManager() { return m_themeManager.get(); }
 
-    QList<CatPack*> getValidCatPacks();
-
-    QString getCatPack(QString catName = "");
-
     shared_qobject_ptr<ExternalUpdater> updater() { return m_updater; }
 
     void triggerUpdateCheck();
diff --git a/launcher/ui/instanceview/InstanceView.cpp b/launcher/ui/instanceview/InstanceView.cpp
index 05f0004d..155550e1 100644
--- a/launcher/ui/instanceview/InstanceView.cpp
+++ b/launcher/ui/instanceview/InstanceView.cpp
@@ -52,7 +52,7 @@
 
 #include <Application.h>
 #include <InstanceList.h>
-
+#include "ui/themes/ThemeManager.h"
 
 template <typename T> bool listsIntersect(const QList<T> &l1, const QList<T> t2)
 {
@@ -503,7 +503,7 @@ void InstanceView::setPaintCat(bool visible)
 {
     m_catVisible = visible;
     if (visible)
-        m_catPixmap.load(APPLICATION->getCatPack());
+        m_catPixmap.load(APPLICATION->themeManager()->getCatPack());
     else
         m_catPixmap = QPixmap();
 }
diff --git a/launcher/ui/setupwizard/ThemeWizardPage.cpp b/launcher/ui/setupwizard/ThemeWizardPage.cpp
index 1c336921..fe11ed9a 100644
--- a/launcher/ui/setupwizard/ThemeWizardPage.cpp
+++ b/launcher/ui/setupwizard/ThemeWizardPage.cpp
@@ -61,7 +61,7 @@ void ThemeWizardPage::updateIcons()
 void ThemeWizardPage::updateCat()
 {
     qDebug() << "Setting Cat";
-    ui->catImagePreviewButton->setIcon(QIcon(QString(R"(%1)").arg(APPLICATION->getCatPack())));
+    ui->catImagePreviewButton->setIcon(QIcon(QString(R"(%1)").arg(APPLICATION->themeManager()->getCatPack())));
 }
 
 void ThemeWizardPage::retranslate()
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.cpp b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
index 8ccb5dcc..b9294908 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.cpp
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
@@ -152,7 +152,7 @@ void ThemeCustomizationWidget::loadSettings()
     }
 
     auto cat = settings->get("BackgroundCat").toString();
-    for (auto& catFromList : APPLICATION->getValidCatPacks()) {
+    for (auto& catFromList : APPLICATION->themeManager()->getValidCatPacks()) {
         QIcon catIcon = QIcon(QString("%1").arg(catFromList->path()));
         ui->backgroundCatComboBox->addItem(catIcon, catFromList->name(), catFromList->id());
         if (cat == catFromList->id()) {