diff --git a/ScreenPlay/main.cpp b/ScreenPlay/main.cpp
index 216aa45c..fc5c7aee 100644
--- a/ScreenPlay/main.cpp
+++ b/ScreenPlay/main.cpp
@@ -3,21 +3,13 @@
 #include <QFontDatabase>
 #include <QGuiApplication>
 #include <QIcon>
-#include <QLibrary>
 #include <QObject>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QQmlEngine>
-#include <QThread>
-
-#include <QQuickView>
-#include <QScreen>
 #include <QStringList>
 #include <QUrl>
-#include <QVariant>
-#include <QWindow>
 #include <QtGlobal>
-#include <QtQuick/QQuickItem>
 #include <QtWebEngine>
 
 #ifdef Q_OS_WIN
@@ -90,8 +82,7 @@ int main(int argc, char* argv[])
     mainWindowEngine.rootContext()->setContextProperty("screenPlaySettings", &settings);
     mainWindowEngine.load(QUrl(QStringLiteral("qrc:/main.qml")));
 
-    installedListFilter.sortByRoleType("All");
-    installedListModel.loadScreens();
+    installedListModel.loadInstalledContent();
 
     // Instead of setting "renderType: Text.NativeRendering" every time
     // we can set it here once :)
diff --git a/ScreenPlay/src/installedlistfilter.cpp b/ScreenPlay/src/installedlistfilter.cpp
index 8f66ef1e..f6a7db57 100644
--- a/ScreenPlay/src/installedlistfilter.cpp
+++ b/ScreenPlay/src/installedlistfilter.cpp
@@ -2,8 +2,10 @@
 
 InstalledListFilter::InstalledListFilter(InstalledListModel* ilm)
 {
+
     setSourceModel(ilm);
     setFilterRole(InstalledListModel::InstalledRole::TitleRole);
+    sortByRoleType("All");
 }
 
 void InstalledListFilter::sortByRoleType(QString type)
diff --git a/ScreenPlay/src/settings.h b/ScreenPlay/src/settings.h
index 4753fbe0..7ef1c91c 100644
--- a/ScreenPlay/src/settings.h
+++ b/ScreenPlay/src/settings.h
@@ -227,7 +227,7 @@ public slots:
         m_localStoragePath = cleanedPath.toString();
         emit localStoragePathChanged(cleanedPath.toString());
         m_ilm->reset();
-        m_ilm->loadScreens();
+        m_ilm->loadInstalledContent();
     }
 
     void setDecoder(QString decoder)