diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7e542d4e5..8077ea59a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -501,7 +501,7 @@ jobs:
             export SIGN=1
             export SIGN_KEY=${{ secrets.GPG_PRIVATE_KEY_ID }}
             mkdir -p ~/.gnupg/
-            printf "$GPG_PRIVATE_KEY" | base64 --decode > ~/.gnupg/private.key
+            echo "$GPG_PRIVATE_KEY" > ~/.gnupg/private.key
             gpg --import ~/.gnupg/private.key
           else
             echo ":warning: Skipped code signing for Linux AppImage, as gpg key was not present." >> $GITHUB_STEP_SUMMARY
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be443fe31..faeb1c44e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -347,6 +347,11 @@ add_subdirectory(program_info)
 ####################################### Install layout #######################################
 
 set(Launcher_ENABLE_UPDATER NO)
+set(Launcher_BUILD_UPDATER NO)
+
+if (NOT APPLE AND (NOT Launcher_UPDATER_GITHUB_REPO STREQUAL "" AND NOT Launcher_BUILD_ARTIFACT STREQUAL ""))
+	set(Launcher_BUILD_UPDATER YES)
+endif()
 
 if(NOT (UNIX AND APPLE))
     # Install "portable.txt" if selected component is "portable"
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index d15dc85de..19b837a2f 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -1306,7 +1306,7 @@ install(TARGETS ${Launcher_Name}
     FRAMEWORK DESTINATION ${FRAMEWORK_DEST_DIR} COMPONENT Runtime
 )
 
-if(NOT APPLE OR (DEFINED Launcher_BUILD_UPDATER AND Launcher_BUILD_UPDATER))
+if(Launcher_BUILD_UPDATER)
     # Updater
     add_library(prism_updater_logic STATIC ${PRISMUPDATER_SOURCES} ${TASKS_SOURCES} ${PRISMUPDATER_UI})
     target_include_directories(prism_updater_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index 3c6f6ef16..f5eaff7a1 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -85,6 +85,7 @@ QString getCreditsHtml()
     stream << QString("<p>TayouVR %1</p>\n").arg(getGitHub("TayouVR"));
     stream << QString("<p>TheKodeToad %1</p>\n").arg(getGitHub("TheKodeToad"));
     stream << QString("<p>getchoo %1</p>\n").arg(getGitHub("getchoo"));
+    stream << QString("<p>Alexandru Tripon (Trial97) %1</p>\n").arg(getGitHub("Trial97"));
     stream << "<br />\n";
 
     // TODO: possibly retrieve from git history at build time?
diff --git a/launcher/ui/themes/CustomTheme.cpp b/launcher/ui/themes/CustomTheme.cpp
index 29ecf6254..4859983c6 100644
--- a/launcher/ui/themes/CustomTheme.cpp
+++ b/launcher/ui/themes/CustomTheme.cpp
@@ -165,11 +165,15 @@ CustomTheme::CustomTheme(ITheme* baseTheme, QFileInfo& fileInfo, bool isManifest
         QString path = FS::PathCombine("themes", m_id);
         QString pathResources = FS::PathCombine("themes", m_id, "resources");
 
-        if (!FS::ensureFolderPathExists(path) || !FS::ensureFolderPathExists(pathResources)) {
-            themeWarningLog() << "couldn't create folder for theme!";
+        if (!FS::ensureFolderPathExists(path)) {
+            themeWarningLog() << "Theme directory for" << m_id << "could not be created. This theme might be invalid";
             return;
         }
 
+        if (!FS::ensureFolderPathExists(pathResources)) {
+            themeWarningLog() << "Resources directory for" << m_id << "could not be created";
+        }
+
         auto themeFilePath = FS::PathCombine(path, themeFile);
 
         bool jsonDataIncomplete = false;
@@ -230,7 +234,11 @@ CustomTheme::CustomTheme(ITheme* baseTheme, QFileInfo& fileInfo, bool isManifest
 
 QStringList CustomTheme::searchPaths()
 {
-    return { FS::PathCombine("themes", m_id, "resources") };
+    QString pathResources = FS::PathCombine("themes", m_id, "resources");
+    if (QFileInfo::exists(pathResources))
+        return { pathResources };
+
+    return {};
 }
 
 QString CustomTheme::id()