NOISSUE Flatten gui and logic libraries into MultiMC

1113 files changed, 1228 insertions, 1401 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be6f7dfe..521fdaad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,7 +175,7 @@ if(MultiMC_LAYOUT_REAL STREQUAL "mac-bundle")
     set(INSTALL_BUNDLE "full")
 
     # Add the icon
-    install(FILES application/resources/MultiMC.icns DESTINATION ${RESOURCES_DEST_DIR})
+    install(FILES launcher/resources/MultiMC.icns DESTINATION ${RESOURCES_DEST_DIR})
 
 elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-bundle")
     set(BINARY_DEST_DIR "bin")
@@ -198,7 +198,7 @@ elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-bundle")
     SET(MultiMC_BINARY_RPATH "$ORIGIN/")
 
     # Install basic runner script
-    install(PROGRAMS application/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR})
+    install(PROGRAMS launcher/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR})
 
 elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-nodeps")
     set(BINARY_DEST_DIR "bin")
@@ -215,7 +215,7 @@ elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-nodeps")
     SET(MultiMC_BINARY_RPATH "$ORIGIN/")
 
     # Install basic runner script
-    install(PROGRAMS application/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR})
+    install(PROGRAMS launcher/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR})
 
 elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-system")
     set(MultiMC_APP_BINARY_NAME "multimc" CACHE STRING "Name of the MultiMC binary")
@@ -283,8 +283,6 @@ add_subdirectory(libraries/katabasis) # An OAuth2 library that tried to do too m
 ############################### Built Artifacts ###############################
 
 add_subdirectory(buildconfig)
-add_subdirectory(api/logic)
-add_subdirectory(api/gui)
 
 # NOTE: this must always be last to appease the CMake deity of quirky install command evaluation order.
-add_subdirectory(application)
+add_subdirectory(launcher)
diff --git a/api/gui/CMakeLists.txt b/api/gui/CMakeLists.txt
deleted file mode 100644
index ad116a43..00000000
--- a/api/gui/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-project(MultiMC_gui LANGUAGES CXX)
-
-set(GUI_SOURCES
-    DesktopServices.h
-    DesktopServices.cpp
-
-    # Icons
-    icons/MMCIcon.h
-    icons/MMCIcon.cpp
-    icons/IconList.h
-    icons/IconList.cpp
-
-    SkinUtils.cpp
-    SkinUtils.h
-)
-################################ COMPILE ################################
-
-add_library(MultiMC_gui SHARED ${GUI_SOURCES})
-set_target_properties(MultiMC_gui PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1)
-
-generate_export_header(MultiMC_gui)
-
-# Link
-target_link_libraries(MultiMC_gui MultiMC_iconfix MultiMC_logic Qt5::Gui)
-
-# Mark and export headers
-target_include_directories(MultiMC_gui PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-
-# Install it
-install(
-    TARGETS MultiMC_gui
-    RUNTIME DESTINATION ${LIBRARY_DEST_DIR}
-    LIBRARY DESTINATION ${LIBRARY_DEST_DIR}
-)
\ No newline at end of file
diff --git a/api/gui/DesktopServices.h b/api/gui/DesktopServices.h
deleted file mode 100644
index 606fa52c..00000000
--- a/api/gui/DesktopServices.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#include <QUrl>
-#include <QString>
-#include "multimc_gui_export.h"
-
-/**
- * This wraps around QDesktopServices and adds workarounds where needed
- * Use this instead of QDesktopServices!
- */
-namespace DesktopServices
-{
-    /**
-     * Open a file in whatever application is applicable
-     */
-    MULTIMC_GUI_EXPORT bool openFile(const QString &path);
-
-    /**
-     * Open a file in the specified application
-     */
-    MULTIMC_GUI_EXPORT bool openFile(const QString &application, const QString &path, const QString & workingDirectory = QString(), qint64 *pid = 0);
-
-    /**
-     * Run an application
-     */
-    MULTIMC_GUI_EXPORT bool run(const QString &application,const QStringList &args, const QString & workingDirectory = QString(), qint64 *pid = 0);
-
-    /**
-     * Open a directory
-     */
-    MULTIMC_GUI_EXPORT bool openDirectory(const QString &path, bool ensureExists = false);
-
-    /**
-     * Open the URL, most likely in a browser. Maybe.
-     */
-    MULTIMC_GUI_EXPORT bool openUrl(const QUrl &url);
-}
diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt
deleted file mode 100644
index 6d269714..00000000
--- a/api/logic/CMakeLists.txt
+++ /dev/null
@@ -1,564 +0,0 @@
-project(MultiMC_logic)
-
-include (UnitTest)
-
-set(CORE_SOURCES
-    # LOGIC - Base classes and infrastructure
-    BaseInstaller.h
-    BaseInstaller.cpp
-    BaseVersionList.h
-    BaseVersionList.cpp
-    InstanceList.h
-    InstanceList.cpp
-    InstanceTask.h
-    InstanceTask.cpp
-    LoggedProcess.h
-    LoggedProcess.cpp
-    MessageLevel.cpp
-    MessageLevel.h
-    BaseVersion.h
-    BaseInstance.h
-    BaseInstance.cpp
-    NullInstance.h
-    MMCZip.h
-    MMCZip.cpp
-    MMCStrings.h
-    MMCStrings.cpp
-
-    # Basic instance manipulation tasks (derived from InstanceTask)
-    InstanceCreationTask.h
-    InstanceCreationTask.cpp
-    InstanceCopyTask.h
-    InstanceCopyTask.cpp
-    InstanceImportTask.h
-    InstanceImportTask.cpp
-
-    # Use tracking separate from memory management
-    Usable.h
-
-    # Prefix tree where node names are strings between separators
-    SeparatorPrefixTree.h
-
-    # WARNING: globals live here
-    Env.h
-    Env.cpp
-
-    # String filters
-    Filter.h
-    Filter.cpp
-
-    # JSON parsing helpers
-    Json.h
-    Json.cpp
-
-    FileSystem.h
-    FileSystem.cpp
-
-    Exception.h
-
-    # RW lock protected map
-    RWStorage.h
-
-    # A variable that has an implicit default value and keeps track of changes
-    DefaultVariable.h
-
-    # a smart pointer wrapper intended for safer use with Qt signal/slot mechanisms
-    QObjectPtr.h
-
-    # Compression support
-    GZip.h
-    GZip.cpp
-
-    # Command line parameter parsing
-    Commandline.h
-    Commandline.cpp
-
-    # Version number string support
-    Version.h
-    Version.cpp
-
-    # A Recursive file system watcher
-    RecursiveFileSystemWatcher.h
-    RecursiveFileSystemWatcher.cpp
-)
-
-add_unit_test(FileSystem
-    SOURCES FileSystem_test.cpp
-    LIBS MultiMC_logic
-    DATA testdata
-    )
-
-add_unit_test(GZip
-    SOURCES GZip_test.cpp
-    LIBS MultiMC_logic
-    )
-
-set(PATHMATCHER_SOURCES
-    # Path matchers
-    pathmatcher/FSTreeMatcher.h
-    pathmatcher/IPathMatcher.h
-    pathmatcher/MultiMatcher.h
-    pathmatcher/RegexpMatcher.h
-)
-
-set(NET_SOURCES
-    # network stuffs
-    net/ByteArraySink.h
-    net/ChecksumValidator.h
-    net/Download.cpp
-    net/Download.h
-    net/FileSink.cpp
-    net/FileSink.h
-    net/HttpMetaCache.cpp
-    net/HttpMetaCache.h
-    net/MetaCacheSink.cpp
-    net/MetaCacheSink.h
-    net/NetAction.h
-    net/NetJob.cpp
-    net/NetJob.h
-    net/PasteUpload.cpp
-    net/PasteUpload.h
-    net/Sink.h
-    net/Validator.h
-)
-
-# Game launch logic
-set(LAUNCH_SOURCES
-    launch/steps/LookupServerAddress.cpp
-    launch/steps/LookupServerAddress.h
-    launch/steps/PostLaunchCommand.cpp
-    launch/steps/PostLaunchCommand.h
-    launch/steps/PreLaunchCommand.cpp
-    launch/steps/PreLaunchCommand.h
-    launch/steps/TextPrint.cpp
-    launch/steps/TextPrint.h
-    launch/steps/Update.cpp
-    launch/steps/Update.h
-    launch/LaunchStep.cpp
-    launch/LaunchStep.h
-    launch/LaunchTask.cpp
-    launch/LaunchTask.h
-    launch/LogModel.cpp
-    launch/LogModel.h
-)
-
-# Old update system
-set(UPDATE_SOURCES
-    updater/GoUpdate.h
-    updater/GoUpdate.cpp
-    updater/UpdateChecker.h
-    updater/UpdateChecker.cpp
-    updater/DownloadTask.h
-    updater/DownloadTask.cpp
-)
-
-add_unit_test(UpdateChecker
-    SOURCES updater/UpdateChecker_test.cpp
-    LIBS MultiMC_logic
-    DATA updater/testdata
-    )
-
-add_unit_test(DownloadTask
-    SOURCES updater/DownloadTask_test.cpp
-    LIBS MultiMC_logic
-    DATA updater/testdata
-    )
-
-# Rarely used notifications
-set(NOTIFICATIONS_SOURCES
-    # Notifications - short warning messages
-    notifications/NotificationChecker.h
-    notifications/NotificationChecker.cpp
-)
-
-# Backend for the news bar... there's usually no news.
-set(NEWS_SOURCES
-    # News System
-    news/NewsChecker.h
-    news/NewsChecker.cpp
-    news/NewsEntry.h
-    news/NewsEntry.cpp
-)
-
-# Icon interface
-set(ICONS_SOURCES
-    # Icons System and related code
-    icons/IIconList.h
-    icons/IIconList.cpp
-    icons/IconUtils.h
-    icons/IconUtils.cpp
-)
-
-# Minecraft services status checker
-set(STATUS_SOURCES
-    # Status system
-    status/StatusChecker.h
-    status/StatusChecker.cpp
-)
-
-# Support for Minecraft instances and launch
-set(MINECRAFT_SOURCES
-    # Minecraft support
-    minecraft/auth/AuthSession.h
-    minecraft/auth/AuthSession.cpp
-    minecraft/auth/MojangAccountList.h
-    minecraft/auth/MojangAccountList.cpp
-    minecraft/auth/MojangAccount.h
-    minecraft/auth/MojangAccount.cpp
-    minecraft/auth/YggdrasilTask.h
-    minecraft/auth/YggdrasilTask.cpp
-    minecraft/auth/flows/AuthenticateTask.h
-    minecraft/auth/flows/AuthenticateTask.cpp
-    minecraft/auth/flows/RefreshTask.cpp
-    minecraft/auth/flows/RefreshTask.cpp
-    minecraft/auth/flows/ValidateTask.h
-    minecraft/auth/flows/ValidateTask.cpp
-
-    minecraft/gameoptions/GameOptions.h
-    minecraft/gameoptions/GameOptions.cpp
-
-    minecraft/update/AssetUpdateTask.h
-    minecraft/update/AssetUpdateTask.cpp
-    minecraft/update/FMLLibrariesTask.cpp
-    minecraft/update/FMLLibrariesTask.h
-    minecraft/update/FoldersTask.cpp
-    minecraft/update/FoldersTask.h
-    minecraft/update/LibrariesTask.cpp
-    minecraft/update/LibrariesTask.h
-
-    minecraft/launch/ClaimAccount.cpp
-    minecraft/launch/ClaimAccount.h
-    minecraft/launch/CreateGameFolders.cpp
-    minecraft/launch/CreateGameFolders.h
-    minecraft/launch/ModMinecraftJar.cpp
-    minecraft/launch/ModMinecraftJar.h
-    minecraft/launch/DirectJavaLaunch.cpp
-    minecraft/launch/DirectJavaLaunch.h
-    minecraft/launch/ExtractNatives.cpp
-    minecraft/launch/ExtractNatives.h
-    minecraft/launch/LauncherPartLaunch.cpp
-    minecraft/launch/LauncherPartLaunch.h
-    minecraft/launch/MinecraftServerTarget.cpp
-    minecraft/launch/MinecraftServerTarget.h
-    minecraft/launch/PrintInstanceInfo.cpp
-    minecraft/launch/PrintInstanceInfo.h
-    minecraft/launch/ReconstructAssets.cpp
-    minecraft/launch/ReconstructAssets.h
-    minecraft/launch/ScanModFolders.cpp
-    minecraft/launch/ScanModFolders.h
-    minecraft/launch/VerifyJavaInstall.cpp
-    minecraft/launch/VerifyJavaInstall.h
-
-    minecraft/legacy/LegacyModList.h
-    minecraft/legacy/LegacyModList.cpp
-    minecraft/legacy/LegacyInstance.h
-    minecraft/legacy/LegacyInstance.cpp
-    minecraft/legacy/LegacyUpgradeTask.h
-    minecraft/legacy/LegacyUpgradeTask.cpp
-
-    minecraft/GradleSpecifier.h
-    minecraft/MinecraftInstance.cpp
-    minecraft/MinecraftInstance.h
-    minecraft/LaunchProfile.cpp
-    minecraft/LaunchProfile.h
-    minecraft/Component.cpp
-    minecraft/Component.h
-    minecraft/PackProfile.cpp
-    minecraft/PackProfile.h
-    minecraft/ComponentUpdateTask.cpp
-    minecraft/ComponentUpdateTask.h
-    minecraft/MinecraftLoadAndCheck.h
-    minecraft/MinecraftLoadAndCheck.cpp
-    minecraft/MinecraftUpdate.h
-    minecraft/MinecraftUpdate.cpp
-    minecraft/MojangVersionFormat.cpp
-    minecraft/MojangVersionFormat.h
-    minecraft/Rule.cpp
-    minecraft/Rule.h
-    minecraft/OneSixVersionFormat.cpp
-    minecraft/OneSixVersionFormat.h
-    minecraft/OpSys.cpp
-    minecraft/OpSys.h
-    minecraft/ParseUtils.cpp
-    minecraft/ParseUtils.h
-    minecraft/ProfileUtils.cpp
-    minecraft/ProfileUtils.h
-    minecraft/Library.cpp
-    minecraft/Library.h
-    minecraft/MojangDownloadInfo.h
-    minecraft/VersionFile.cpp
-    minecraft/VersionFile.h
-    minecraft/VersionFilterData.h
-    minecraft/VersionFilterData.cpp
-    minecraft/World.h
-    minecraft/World.cpp
-    minecraft/WorldList.h
-    minecraft/WorldList.cpp
-
-    minecraft/mod/Mod.h
-    minecraft/mod/Mod.cpp
-    minecraft/mod/ModDetails.h
-    minecraft/mod/ModFolderModel.h
-    minecraft/mod/ModFolderModel.cpp
-    minecraft/mod/ModFolderLoadTask.h
-    minecraft/mod/ModFolderLoadTask.cpp
-    minecraft/mod/LocalModParseTask.h
-    minecraft/mod/LocalModParseTask.cpp
-    minecraft/mod/ResourcePackFolderModel.h
-    minecraft/mod/ResourcePackFolderModel.cpp
-    minecraft/mod/TexturePackFolderModel.h
-    minecraft/mod/TexturePackFolderModel.cpp
-
-    # Assets
-    minecraft/AssetsUtils.h
-    minecraft/AssetsUtils.cpp
-
-    # Minecraft services
-    minecraft/services/SkinUpload.cpp
-    minecraft/services/SkinUpload.h
-    minecraft/services/SkinDelete.cpp
-    minecraft/services/SkinDelete.h
-
-    mojang/PackageManifest.h
-    mojang/PackageManifest.cpp
-    )
-
-add_unit_test(GradleSpecifier
-    SOURCES minecraft/GradleSpecifier_test.cpp
-    LIBS MultiMC_logic
-    )
-
-add_executable(PackageManifest
-    mojang/PackageManifest_test.cpp
-)
-target_link_libraries(PackageManifest
-    MultiMC_logic
-    Qt5::Test
-)
-target_include_directories(PackageManifest
-    PRIVATE ../../cmake/UnitTest/
-)
-add_test(
-    NAME PackageManifest
-    COMMAND PackageManifest
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-add_unit_test(MojangVersionFormat
-    SOURCES minecraft/MojangVersionFormat_test.cpp
-    LIBS MultiMC_logic
-    DATA minecraft/testdata
-    )
-
-add_unit_test(Library
-    SOURCES minecraft/Library_test.cpp
-    LIBS MultiMC_logic
-    )
-
-# FIXME: shares data with FileSystem test
-add_unit_test(ModFolderModel
-    SOURCES minecraft/mod/ModFolderModel_test.cpp
-    DATA testdata
-    LIBS MultiMC_logic
-    )
-
-add_unit_test(ParseUtils
-    SOURCES minecraft/ParseUtils_test.cpp
-    LIBS MultiMC_logic
-    )
-
-# the screenshots feature
-set(SCREENSHOTS_SOURCES
-    screenshots/Screenshot.h
-    screenshots/ImgurUpload.h
-    screenshots/ImgurUpload.cpp
-    screenshots/ImgurAlbumCreation.h
-    screenshots/ImgurAlbumCreation.cpp
-)
-
-set(TASKS_SOURCES
-    # Tasks
-    tasks/Task.h
-    tasks/Task.cpp
-    tasks/SequentialTask.h
-    tasks/SequentialTask.cpp
-)
-
-set(SETTINGS_SOURCES
-    # Settings
-    settings/INIFile.cpp
-    settings/INIFile.h
-    settings/INISettingsObject.cpp
-    settings/INISettingsObject.h
-    settings/OverrideSetting.cpp
-    settings/OverrideSetting.h
-    settings/PassthroughSetting.cpp
-    settings/PassthroughSetting.h
-    settings/Setting.cpp
-    settings/Setting.h
-    settings/SettingsObject.cpp
-    settings/SettingsObject.h
-)
-
-add_unit_test(INIFile
-    SOURCES settings/INIFile_test.cpp
-    LIBS MultiMC_logic
-    )
-
-set(JAVA_SOURCES
-    # Java related code
-    java/launch/CheckJava.cpp
-    java/launch/CheckJava.h
-    java/JavaChecker.h
-    java/JavaChecker.cpp
-    java/JavaCheckerJob.h
-    java/JavaCheckerJob.cpp
-    java/JavaInstall.h
-    java/JavaInstall.cpp
-    java/JavaInstallList.h
-    java/JavaInstallList.cpp
-    java/JavaUtils.h
-    java/JavaUtils.cpp
-    java/JavaVersion.h
-    java/JavaVersion.cpp
-)
-
-add_unit_test(JavaVersion
-    SOURCES java/JavaVersion_test.cpp
-    LIBS MultiMC_logic
-    )
-
-set(TRANSLATIONS_SOURCES
-    translations/TranslationsModel.h
-    translations/TranslationsModel.cpp
-    translations/POTranslator.h
-    translations/POTranslator.cpp
-)
-
-set(TOOLS_SOURCES
-    # Tools
-    tools/BaseExternalTool.cpp
-    tools/BaseExternalTool.h
-    tools/BaseProfiler.cpp
-    tools/BaseProfiler.h
-    tools/JProfiler.cpp
-    tools/JProfiler.h
-    tools/JVisualVM.cpp
-    tools/JVisualVM.h
-    tools/MCEditTool.cpp
-    tools/MCEditTool.h
-)
-
-set(META_SOURCES
-    # Metadata sources
-    meta/JsonFormat.cpp
-    meta/JsonFormat.h
-    meta/BaseEntity.cpp
-    meta/BaseEntity.h
-    meta/VersionList.cpp
-    meta/VersionList.h
-    meta/Version.cpp
-    meta/Version.h
-    meta/Index.cpp
-    meta/Index.h
-)
-
-set(FTB_SOURCES
-    modplatform/legacy_ftb/PackFetchTask.h
-    modplatform/legacy_ftb/PackFetchTask.cpp
-    modplatform/legacy_ftb/PackInstallTask.h
-    modplatform/legacy_ftb/PackInstallTask.cpp
-    modplatform/legacy_ftb/PrivatePackManager.h
-    modplatform/legacy_ftb/PrivatePackManager.cpp
-
-    modplatform/legacy_ftb/PackHelpers.h
-)
-
-set(FLAME_SOURCES
-    # Flame
-    modplatform/flame/FlamePackIndex.cpp
-    modplatform/flame/FlamePackIndex.h
-    modplatform/flame/PackManifest.h
-    modplatform/flame/PackManifest.cpp
-    modplatform/flame/FileResolvingTask.h
-    modplatform/flame/FileResolvingTask.cpp
-)
-
-set(MODPACKSCH_SOURCES
-    modplatform/modpacksch/FTBPackInstallTask.h
-    modplatform/modpacksch/FTBPackInstallTask.cpp
-    modplatform/modpacksch/FTBPackManifest.h
-    modplatform/modpacksch/FTBPackManifest.cpp
-)
-
-set(TECHNIC_SOURCES
-    modplatform/technic/SingleZipPackInstallTask.h
-    modplatform/technic/SingleZipPackInstallTask.cpp
-    modplatform/technic/SolderPackInstallTask.h
-    modplatform/technic/SolderPackInstallTask.cpp
-    modplatform/technic/TechnicPackProcessor.h
-    modplatform/technic/TechnicPackProcessor.cpp
-)
-
-set(ATLAUNCHER_SOURCES
-    modplatform/atlauncher/ATLPackIndex.cpp
-    modplatform/atlauncher/ATLPackIndex.h
-    modplatform/atlauncher/ATLPackInstallTask.cpp
-    modplatform/atlauncher/ATLPackInstallTask.h
-    modplatform/atlauncher/ATLPackManifest.cpp
-    modplatform/atlauncher/ATLPackManifest.h
-)
-
-add_unit_test(Index
-    SOURCES meta/Index_test.cpp
-    LIBS MultiMC_logic
-    )
-
-################################ COMPILE ################################
-
-# we need zlib
-find_package(ZLIB REQUIRED)
-
-set(LOGIC_SOURCES
-    ${CORE_SOURCES}
-    ${PATHMATCHER_SOURCES}
-    ${NET_SOURCES}
-    ${LAUNCH_SOURCES}
-    ${UPDATE_SOURCES}
-    ${NOTIFICATIONS_SOURCES}
-    ${NEWS_SOURCES}
-    ${STATUS_SOURCES}
-    ${MINECRAFT_SOURCES}
-    ${SCREENSHOTS_SOURCES}
-    ${TASKS_SOURCES}
-    ${SETTINGS_SOURCES}
-    ${JAVA_SOURCES}
-    ${TRANSLATIONS_SOURCES}
-    ${TOOLS_SOURCES}
-    ${META_SOURCES}
-    ${ICONS_SOURCES}
-    ${FTB_SOURCES}
-    ${FLAME_SOURCES}
-    ${MODPACKSCH_SOURCES}
-    ${TECHNIC_SOURCES}
-    ${ATLAUNCHER_SOURCES}
-)
-
-add_library(MultiMC_logic SHARED ${LOGIC_SOURCES})
-set_target_properties(MultiMC_logic PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1)
-
-generate_export_header(MultiMC_logic)
-
-# Link
-target_link_libraries(MultiMC_logic systeminfo MultiMC_quazip MultiMC_classparser ${NBT_NAME} ${ZLIB_LIBRARIES} optional-bare tomlc99 BuildConfig)
-target_link_libraries(MultiMC_logic Qt5::Core Qt5::Xml Qt5::Network Qt5::Concurrent)
-
-# Mark and export headers
-target_include_directories(MultiMC_logic PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" PRIVATE "${ZLIB_INCLUDE_DIRS}")
-
-# Install it
-install(
-    TARGETS MultiMC_logic
-    RUNTIME DESTINATION ${LIBRARY_DEST_DIR}
-    LIBRARY DESTINATION ${LIBRARY_DEST_DIR}
-)
diff --git a/api/logic/MMCStrings.h b/api/logic/MMCStrings.h
deleted file mode 100644
index 493ba3d2..00000000
--- a/api/logic/MMCStrings.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include <QString>
-
-#include "multimc_logic_export.h"
-
-namespace Strings
-{
-    int MULTIMC_LOGIC_EXPORT naturalCompare(const QString &s1, const QString &s2, Qt::CaseSensitivity cs);
-}
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
deleted file mode 100644
index ab2b9960..00000000
--- a/application/CMakeLists.txt
+++ /dev/null
@@ -1,417 +0,0 @@
-project(application)
-
-################################ FILES ################################
-
-######## Sources and headers ########
-SET(MULTIMC_SOURCES
-    # Application base
-    main.cpp
-    MultiMC.h
-    MultiMC.cpp
-    UpdateController.cpp
-    UpdateController.h
-
-    # GUI - general utilities
-    GuiUtil.h
-    GuiUtil.cpp
-    ColumnResizer.h
-    ColumnResizer.cpp
-    InstanceProxyModel.h
-    InstanceProxyModel.cpp
-    VersionProxyModel.h
-    VersionProxyModel.cpp
-    ColorCache.h
-    ColorCache.cpp
-    HoeDown.h
-
-    # Super secret!
-    KonamiCode.h
-    KonamiCode.cpp
-
-    # GUI - windows
-    MainWindow.h
-    MainWindow.cpp
-    InstanceWindow.h
-    InstanceWindow.cpp
-
-    # GUI - setup wizard
-    setupwizard/SetupWizard.h
-    setupwizard/SetupWizard.cpp
-    setupwizard/AnalyticsWizardPage.cpp
-    setupwizard/AnalyticsWizardPage.h
-    setupwizard/BaseWizardPage.h
-    setupwizard/JavaWizardPage.cpp
-    setupwizard/JavaWizardPage.h
-    setupwizard/LanguageWizardPage.cpp
-    setupwizard/LanguageWizardPage.h
-
-    # GUI - themes
-    themes/FusionTheme.cpp
-    themes/FusionTheme.h
-    themes/BrightTheme.cpp
-    themes/BrightTheme.h
-    themes/CustomTheme.cpp
-    themes/CustomTheme.h
-    themes/DarkTheme.cpp
-    themes/DarkTheme.h
-    themes/ITheme.cpp
-    themes/ITheme.h
-    themes/SystemTheme.cpp
-    themes/SystemTheme.h
-
-    # Processes
-    LaunchController.h
-    LaunchController.cpp
-
-    # page provider for instances
-    InstancePageProvider.h
-
-    # Common java checking UI
-    JavaCommon.h
-    JavaCommon.cpp
-
-    # GUI - paged dialog base
-    pages/BasePage.h
-    pages/BasePageContainer.h
-    pages/BasePageProvider.h
-
-    # GUI - instance pages
-    pages/instance/GameOptionsPage.cpp
-    pages/instance/GameOptionsPage.h
-    pages/instance/VersionPage.cpp
-    pages/instance/VersionPage.h
-    pages/instance/TexturePackPage.h
-    pages/instance/ResourcePackPage.h
-    pages/instance/ModFolderPage.cpp
-    pages/instance/ModFolderPage.h
-    pages/instance/NotesPage.cpp
-    pages/instance/NotesPage.h
-    pages/instance/LogPage.cpp
-    pages/instance/LogPage.h
-    pages/instance/InstanceSettingsPage.cpp
-    pages/instance/InstanceSettingsPage.h
-    pages/instance/ScreenshotsPage.cpp
-    pages/instance/ScreenshotsPage.h
-    pages/instance/OtherLogsPage.cpp
-    pages/instance/OtherLogsPage.h
-    pages/instance/ServersPage.cpp
-    pages/instance/ServersPage.h
-    pages/instance/LegacyUpgradePage.cpp
-    pages/instance/LegacyUpgradePage.h
-    pages/instance/WorldListPage.cpp
-    pages/instance/WorldListPage.h
-
-    # GUI - global settings pages
-    pages/global/AccountListPage.cpp
-    pages/global/AccountListPage.h
-    pages/global/CustomCommandsPage.cpp
-    pages/global/CustomCommandsPage.h
-    pages/global/ExternalToolsPage.cpp
-    pages/global/ExternalToolsPage.h
-    pages/global/JavaPage.cpp
-    pages/global/JavaPage.h
-    pages/global/LanguagePage.cpp
-    pages/global/LanguagePage.h
-    pages/global/MinecraftPage.cpp
-    pages/global/MinecraftPage.h
-    pages/global/MultiMCPage.cpp
-    pages/global/MultiMCPage.h
-    pages/global/ProxyPage.cpp
-    pages/global/ProxyPage.h
-    pages/global/PasteEEPage.cpp
-    pages/global/PasteEEPage.h
-
-    # GUI - platform pages
-    pages/modplatform/VanillaPage.cpp
-    pages/modplatform/VanillaPage.h
-
-    pages/modplatform/atlauncher/AtlFilterModel.cpp
-    pages/modplatform/atlauncher/AtlFilterModel.h
-    pages/modplatform/atlauncher/AtlListModel.cpp
-    pages/modplatform/atlauncher/AtlListModel.h
-    pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
-    pages/modplatform/atlauncher/AtlOptionalModDialog.h
-    pages/modplatform/atlauncher/AtlPage.cpp
-    pages/modplatform/atlauncher/AtlPage.h
-
-    pages/modplatform/ftb/FtbFilterModel.cpp
-    pages/modplatform/ftb/FtbFilterModel.h
-    pages/modplatform/ftb/FtbListModel.cpp
-    pages/modplatform/ftb/FtbListModel.h
-    pages/modplatform/ftb/FtbPage.cpp
-    pages/modplatform/ftb/FtbPage.h
-
-    pages/modplatform/legacy_ftb/Page.cpp
-    pages/modplatform/legacy_ftb/Page.h
-    pages/modplatform/legacy_ftb/ListModel.h
-    pages/modplatform/legacy_ftb/ListModel.cpp
-
-    pages/modplatform/flame/FlameModel.cpp
-    pages/modplatform/flame/FlameModel.h
-    pages/modplatform/flame/FlamePage.cpp
-    pages/modplatform/flame/FlamePage.h
-
-    pages/modplatform/technic/TechnicModel.cpp
-    pages/modplatform/technic/TechnicModel.h
-    pages/modplatform/technic/TechnicPage.cpp
-    pages/modplatform/technic/TechnicPage.h
-
-    pages/modplatform/ImportPage.cpp
-    pages/modplatform/ImportPage.h
-
-    # GUI - dialogs
-    dialogs/AboutDialog.cpp
-    dialogs/AboutDialog.h
-    dialogs/ProfileSelectDialog.cpp
-    dialogs/ProfileSelectDialog.h
-    dialogs/CopyInstanceDialog.cpp
-    dialogs/CopyInstanceDialog.h
-    dialogs/CustomMessageBox.cpp
-    dialogs/CustomMessageBox.h
-    dialogs/EditAccountDialog.cpp
-    dialogs/EditAccountDialog.h
-    dialogs/ExportInstanceDialog.cpp
-    dialogs/ExportInstanceDialog.h
-    dialogs/IconPickerDialog.cpp
-    dialogs/IconPickerDialog.h
-    dialogs/LoginDialog.cpp
-    dialogs/LoginDialog.h
-    dialogs/NewComponentDialog.cpp
-    dialogs/NewComponentDialog.h
-    dialogs/NewInstanceDialog.cpp
-    dialogs/NewInstanceDialog.h
-    dialogs/NotificationDialog.cpp
-    dialogs/NotificationDialog.h
-    pagedialog/PageDialog.cpp
-    pagedialog/PageDialog.h
-    dialogs/ProgressDialog.cpp
-    dialogs/ProgressDialog.h
-    dialogs/UpdateDialog.cpp
-    dialogs/UpdateDialog.h
-    dialogs/VersionSelectDialog.cpp
-    dialogs/VersionSelectDialog.h
-    dialogs/SkinUploadDialog.cpp
-    dialogs/SkinUploadDialog.h
-
-
-    # GUI - widgets
-    widgets/Common.cpp
-    widgets/Common.h
-    widgets/CustomCommands.cpp
-    widgets/CustomCommands.h
-    widgets/DropLabel.cpp
-    widgets/DropLabel.h
-    widgets/FocusLineEdit.cpp
-    widgets/FocusLineEdit.h
-    widgets/IconLabel.cpp
-    widgets/IconLabel.h
-    widgets/JavaSettingsWidget.cpp
-    widgets/JavaSettingsWidget.h
-    widgets/LabeledToolButton.cpp
-    widgets/LabeledToolButton.h
-    widgets/LanguageSelectionWidget.cpp
-    widgets/LanguageSelectionWidget.h
-    widgets/LineSeparator.cpp
-    widgets/LineSeparator.h
-    widgets/LogView.cpp
-    widgets/LogView.h
-    widgets/MCModInfoFrame.cpp
-    widgets/MCModInfoFrame.h
-    widgets/ModListView.cpp
-    widgets/ModListView.h
-    widgets/PageContainer.cpp
-    widgets/PageContainer.h
-    widgets/PageContainer_p.h
-    widgets/ServerStatus.cpp
-    widgets/ServerStatus.h
-    widgets/VersionListView.cpp
-    widgets/VersionListView.h
-    widgets/VersionSelectWidget.cpp
-    widgets/VersionSelectWidget.h
-    widgets/ProgressWidget.h
-    widgets/ProgressWidget.cpp
-    widgets/WideBar.h
-    widgets/WideBar.cpp
-
-    # GUI - instance group view
-    groupview/GroupedProxyModel.cpp
-    groupview/GroupedProxyModel.h
-    groupview/AccessibleGroupView.cpp
-    groupview/AccessibleGroupView.h
-    groupview/AccessibleGroupView_p.h
-    groupview/GroupView.cpp
-    groupview/GroupView.h
-    groupview/InstanceDelegate.cpp
-    groupview/InstanceDelegate.h
-    groupview/VisualGroup.cpp
-    groupview/VisualGroup.h
-    )
-
-######## UIs ########
-SET(MULTIMC_UIS
-    # Instance pages
-    pages/instance/GameOptionsPage.ui
-    pages/instance/VersionPage.ui
-    pages/instance/ModFolderPage.ui
-    pages/instance/LogPage.ui
-    pages/instance/InstanceSettingsPage.ui
-    pages/instance/NotesPage.ui
-    pages/instance/ScreenshotsPage.ui
-    pages/instance/OtherLogsPage.ui
-    pages/instance/LegacyUpgradePage.ui
-    pages/instance/ServersPage.ui
-    pages/instance/WorldListPage.ui
-
-    # Global settings pages
-    pages/global/AccountListPage.ui
-    pages/global/ExternalToolsPage.ui
-    pages/global/JavaPage.ui
-    pages/global/MinecraftPage.ui
-    pages/global/MultiMCPage.ui
-    pages/global/ProxyPage.ui
-    pages/global/PasteEEPage.ui
-
-    # Platform pages
-    pages/modplatform/VanillaPage.ui
-    pages/modplatform/atlauncher/AtlPage.ui
-    pages/modplatform/ftb/FtbPage.ui
-    pages/modplatform/legacy_ftb/Page.ui
-    pages/modplatform/flame/FlamePage.ui
-    pages/modplatform/technic/TechnicPage.ui
-    pages/modplatform/ImportPage.ui
-
-    # Platform Dialogs
-    pages/modplatform/atlauncher/AtlOptionalModDialog.ui
-
-    # Dialogs
-    dialogs/CopyInstanceDialog.ui
-    dialogs/NewComponentDialog.ui
-    dialogs/NewInstanceDialog.ui
-    dialogs/AboutDialog.ui
-    dialogs/ProgressDialog.ui
-    dialogs/IconPickerDialog.ui
-    dialogs/ProfileSelectDialog.ui
-    dialogs/EditAccountDialog.ui
-    dialogs/ExportInstanceDialog.ui
-    dialogs/LoginDialog.ui
-    dialogs/UpdateDialog.ui
-    dialogs/NotificationDialog.ui
-    dialogs/SkinUploadDialog.ui
-
-    # Widgets/other
-    widgets/CustomCommands.ui
-    widgets/MCModInfoFrame.ui
-)
-
-set(MULTIMC_QRCS
-    resources/backgrounds/backgrounds.qrc
-    resources/multimc/multimc.qrc
-    resources/pe_dark/pe_dark.qrc
-    resources/pe_light/pe_light.qrc
-    resources/pe_colored/pe_colored.qrc
-    resources/pe_blue/pe_blue.qrc
-    resources/OSX/OSX.qrc
-    resources/iOS/iOS.qrc
-    resources/flat/flat.qrc
-    resources/documents/documents.qrc
-)
-
-######## Windows resource files ########
-if(WIN32)
-    set(MULTIMC_RCS resources/multimc.rc)
-endif()
-
-# Qt 5 stuff
-qt5_wrap_ui(MULTIMC_UI ${MULTIMC_UIS})
-qt5_add_resources(MULTIMC_RESOURCES ${MULTIMC_QRCS})
-
-# Add executable
-add_executable(MultiMC MACOSX_BUNDLE WIN32 ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES} ${MULTIMC_RCS})
-target_link_libraries(MultiMC MultiMC_gui ${QUAZIP_LIBRARIES} hoedown MultiMC_rainbow LocalPeer ganalytics)
-if(DEFINED MultiMC_APP_BINARY_NAME)
-    set_target_properties(MultiMC PROPERTIES OUTPUT_NAME "${MultiMC_APP_BINARY_NAME}")
-endif()
-if(DEFINED MultiMC_BINARY_RPATH)
-    SET_TARGET_PROPERTIES(MultiMC PROPERTIES INSTALL_RPATH "${MultiMC_BINARY_RPATH}")
-endif()
-if(DEFINED MultiMC_APP_BINARY_DEFS)
-    target_compile_definitions(MultiMC PRIVATE ${MultiMC_APP_BINARY_DEFS})
-endif()
-
-install(TARGETS MultiMC
-    BUNDLE DESTINATION ${BUNDLE_DEST_DIR} COMPONENT Runtime
-    LIBRARY DESTINATION ${LIBRARY_DEST_DIR} COMPONENT Runtime
-    RUNTIME DESTINATION ${BINARY_DEST_DIR} COMPONENT Runtime
-)
-
-#### The MultiMC bundle mess! ####
-# Bundle utilities are used to complete the portable packages - they add all the libraries that would otherwise be missing on the target system.
-# NOTE: it seems that this absolutely has to be here, and nowhere else.
-if(INSTALL_BUNDLE STREQUAL "full")
-    # Add qt.conf - this makes Qt stop looking for things outside the bundle
-    install(
-        CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DEST_DIR}/qt.conf\" \" \")"
-        COMPONENT Runtime
-    )
-    # Bundle plugins
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-        # Image formats
-        install(
-            DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
-            DESTINATION ${PLUGIN_DEST_DIR}
-            COMPONENT Runtime
-            REGEX "tga|tiff|mng|webp" EXCLUDE
-        )
-        # Icon engines
-        install(
-            DIRECTORY "${QT_PLUGINS_DIR}/iconengines"
-            DESTINATION ${PLUGIN_DEST_DIR}
-            COMPONENT Runtime
-            REGEX "fontawesome" EXCLUDE
-        )
-        # Platform plugins
-        install(
-            DIRECTORY "${QT_PLUGINS_DIR}/platforms"
-            DESTINATION ${PLUGIN_DEST_DIR}
-            COMPONENT Runtime
-            REGEX "minimal|linuxfb|offscreen" EXCLUDE
-        )
-    else()
-        # Image formats
-        install(
-            DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
-            DESTINATION ${PLUGIN_DEST_DIR}
-            COMPONENT Runtime
-            REGEX "tga|tiff|mng|webp" EXCLUDE
-            REGEX "d\\." EXCLUDE
-            REGEX "_debug\\." EXCLUDE
-            REGEX "\\.dSYM" EXCLUDE
-        )
-        # Icon engines
-        install(
-            DIRECTORY "${QT_PLUGINS_DIR}/iconengines"
-            DESTINATION ${PLUGIN_DEST_DIR}
-            COMPONENT Runtime
-            REGEX "fontawesome" EXCLUDE
-            REGEX "d\\." EXCLUDE
-            REGEX "_debug\\." EXCLUDE
-            REGEX "\\.dSYM" EXCLUDE
-        )
-        # Platform plugins
-        install(
-            DIRECTORY "${QT_PLUGINS_DIR}/platforms"
-            DESTINATION ${PLUGIN_DEST_DIR}
-            COMPONENT Runtime
-            REGEX "minimal|linuxfb|offscreen" EXCLUDE
-            REGEX "d\\." EXCLUDE
-            REGEX "_debug\\." EXCLUDE
-            REGEX "\\.dSYM" EXCLUDE
-        )
-    endif()
-    configure_file(
-        "${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in"
-        "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake"
-        @ONLY
-    )
-    install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime)
-endif()
diff --git a/api/logic/BaseInstaller.cpp b/launcher/BaseInstaller.cpp
index d61c3fe9..d61c3fe9 100644
--- a/api/logic/BaseInstaller.cpp
+++ b/launcher/BaseInstaller.cpp
diff --git a/api/logic/BaseInstaller.h b/launcher/BaseInstaller.h
index 3e40b355..b2e6a14d 100644
--- a/api/logic/BaseInstaller.h
+++ b/launcher/BaseInstaller.h
@@ -17,8 +17,6 @@
 
 #include <memory>
 
-#include "multimc_logic_export.h"
-
 class MinecraftInstance;
 class QDir;
 class QString;
@@ -27,7 +25,7 @@ class Task;
 class BaseVersion;
 typedef std::shared_ptr<BaseVersion> BaseVersionPtr;
 
-class MULTIMC_LOGIC_EXPORT BaseInstaller
+class BaseInstaller
 {
 public:
     BaseInstaller();
diff --git a/api/logic/BaseInstance.cpp b/launcher/BaseInstance.cpp
index 46b45827..46b45827 100644
--- a/api/logic/BaseInstance.cpp
+++ b/launcher/BaseInstance.cpp
diff --git a/api/logic/BaseInstance.h b/launcher/BaseInstance.h
index d250e03e..833646c0 100644
--- a/api/logic/BaseInstance.h
+++ b/launcher/BaseInstance.h
@@ -32,8 +32,6 @@
 
 #include "net/Mode.h"
 
-#include "multimc_logic_export.h"
-
 #include "minecraft/launch/MinecraftServerTarget.h"
 
 class QDir;
@@ -52,7 +50,7 @@ typedef std::shared_ptr<BaseInstance> InstancePtr;
  * To create a new instance type, create a new class inheriting from this class
  * and implement the pure virtual functions.
  */
-class MULTIMC_LOGIC_EXPORT BaseInstance : public QObject, public std::enable_shared_from_this<BaseInstance>
+class BaseInstance : public QObject, public std::enable_shared_from_this<BaseInstance>
 {
     Q_OBJECT
 protected:
diff --git a/api/logic/BaseVersion.h b/launcher/BaseVersion.h
index b88105fb..b88105fb 100644
--- a/api/logic/BaseVersion.h
+++ b/launcher/BaseVersion.h
diff --git a/api/logic/BaseVersionList.cpp b/launcher/BaseVersionList.cpp
index aa9cb6cf..aa9cb6cf 100644
--- a/api/logic/BaseVersionList.cpp
+++ b/launcher/BaseVersionList.cpp
diff --git a/api/logic/BaseVersionList.h b/launcher/BaseVersionList.h
index 29e21bdb..ce7abce1 100644
--- a/api/logic/BaseVersionList.h
+++ b/launcher/BaseVersionList.h
@@ -21,7 +21,6 @@
 
 #include "BaseVersion.h"
 #include "tasks/Task.h"
-#include "multimc_logic_export.h"
 #include "QObjectPtr.h"
 
 /*!
@@ -36,7 +35,7 @@
  * all have a default implementation, but they can be overridden by plugins to
  * change the behavior of the list.
  */
-class MULTIMC_LOGIC_EXPORT BaseVersionList : public QAbstractListModel
+class BaseVersionList : public QAbstractListModel
 {
     Q_OBJECT
 public:
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
new file mode 100644
index 00000000..e3ef5039
--- /dev/null
+++ b/launcher/CMakeLists.txt
@@ -0,0 +1,1001 @@
+project(application)
+
+################################ FILES ################################
+
+######## Sources and headers ########
+
+include (UnitTest)
+
+set(CORE_SOURCES
+    # LOGIC - Base classes and infrastructure
+    BaseInstaller.h
+    BaseInstaller.cpp
+    BaseVersionList.h
+    BaseVersionList.cpp
+    InstanceList.h
+    InstanceList.cpp
+    InstanceTask.h
+    InstanceTask.cpp
+    LoggedProcess.h
+    LoggedProcess.cpp
+    MessageLevel.cpp
+    MessageLevel.h
+    BaseVersion.h
+    BaseInstance.h
+    BaseInstance.cpp
+    NullInstance.h
+    MMCZip.h
+    MMCZip.cpp
+    MMCStrings.h
+    MMCStrings.cpp
+
+    # Basic instance manipulation tasks (derived from InstanceTask)
+    InstanceCreationTask.h
+    InstanceCreationTask.cpp
+    InstanceCopyTask.h
+    InstanceCopyTask.cpp
+    InstanceImportTask.h
+    InstanceImportTask.cpp
+
+    # Use tracking separate from memory management
+    Usable.h
+
+    # Prefix tree where node names are strings between separators
+    SeparatorPrefixTree.h
+
+    # WARNING: globals live here
+    Env.h
+    Env.cpp
+
+    # String filters
+    Filter.h
+    Filter.cpp
+
+    # JSON parsing helpers
+    Json.h
+    Json.cpp
+
+    FileSystem.h
+    FileSystem.cpp
+
+    Exception.h
+
+    # RW lock protected map
+    RWStorage.h
+
+    # A variable that has an implicit default value and keeps track of changes
+    DefaultVariable.h
+
+    # a smart pointer wrapper intended for safer use with Qt signal/slot mechanisms
+    QObjectPtr.h
+
+    # Compression support
+    GZip.h
+    GZip.cpp
+
+    # Command line parameter parsing
+    Commandline.h
+    Commandline.cpp
+
+    # Version number string support
+    Version.h
+    Version.cpp
+
+    # A Recursive file system watcher
+    RecursiveFileSystemWatcher.h
+    RecursiveFileSystemWatcher.cpp
+)
+
+add_unit_test(FileSystem
+    SOURCES FileSystem_test.cpp
+    LIBS MultiMC_logic
+    DATA testdata
+    )
+
+add_unit_test(GZip
+    SOURCES GZip_test.cpp
+    LIBS MultiMC_logic
+    )
+
+set(PATHMATCHER_SOURCES
+    # Path matchers
+    pathmatcher/FSTreeMatcher.h
+    pathmatcher/IPathMatcher.h
+    pathmatcher/MultiMatcher.h
+    pathmatcher/RegexpMatcher.h
+)
+
+set(NET_SOURCES
+    # network stuffs
+    net/ByteArraySink.h
+    net/ChecksumValidator.h
+    net/Download.cpp
+    net/Download.h
+    net/FileSink.cpp
+    net/FileSink.h
+    net/HttpMetaCache.cpp
+    net/HttpMetaCache.h
+    net/MetaCacheSink.cpp
+    net/MetaCacheSink.h
+    net/NetAction.h
+    net/NetJob.cpp
+    net/NetJob.h
+    net/PasteUpload.cpp
+    net/PasteUpload.h
+    net/Sink.h
+    net/Validator.h
+)
+
+# Game launch logic
+set(LAUNCH_SOURCES
+    launch/steps/LookupServerAddress.cpp
+    launch/steps/LookupServerAddress.h
+    launch/steps/PostLaunchCommand.cpp
+    launch/steps/PostLaunchCommand.h
+    launch/steps/PreLaunchCommand.cpp
+    launch/steps/PreLaunchCommand.h
+    launch/steps/TextPrint.cpp
+    launch/steps/TextPrint.h
+    launch/steps/Update.cpp
+    launch/steps/Update.h
+    launch/LaunchStep.cpp
+    launch/LaunchStep.h
+    launch/LaunchTask.cpp
+    launch/LaunchTask.h
+    launch/LogModel.cpp
+    launch/LogModel.h
+)
+
+# Old update system
+set(UPDATE_SOURCES
+    updater/GoUpdate.h
+    updater/GoUpdate.cpp
+    updater/UpdateChecker.h
+    updater/UpdateChecker.cpp
+    updater/DownloadTask.h
+    updater/DownloadTask.cpp
+)
+
+add_unit_test(UpdateChecker
+    SOURCES updater/UpdateChecker_test.cpp
+    LIBS MultiMC_logic
+    DATA updater/testdata
+    )
+
+add_unit_test(DownloadTask
+    SOURCES updater/DownloadTask_test.cpp
+    LIBS MultiMC_logic
+    DATA updater/testdata
+    )
+
+# Rarely used notifications
+set(NOTIFICATIONS_SOURCES
+    # Notifications - short warning messages
+    notifications/NotificationChecker.h
+    notifications/NotificationChecker.cpp
+)
+
+# Backend for the news bar... there's usually no news.
+set(NEWS_SOURCES
+    # News System
+    news/NewsChecker.h
+    news/NewsChecker.cpp
+    news/NewsEntry.h
+    news/NewsEntry.cpp
+)
+
+# Icon interface
+set(ICONS_SOURCES
+    # Icons System and related code
+    icons/IIconList.h
+    icons/IIconList.cpp
+    icons/IconUtils.h
+    icons/IconUtils.cpp
+)
+
+# Minecraft services status checker
+set(STATUS_SOURCES
+    # Status system
+    status/StatusChecker.h
+    status/StatusChecker.cpp
+)
+
+# Support for Minecraft instances and launch
+set(MINECRAFT_SOURCES
+    # Minecraft support
+    minecraft/auth/AuthSession.h
+    minecraft/auth/AuthSession.cpp
+    minecraft/auth/MojangAccountList.h
+    minecraft/auth/MojangAccountList.cpp
+    minecraft/auth/MojangAccount.h
+    minecraft/auth/MojangAccount.cpp
+    minecraft/auth/YggdrasilTask.h
+    minecraft/auth/YggdrasilTask.cpp
+    minecraft/auth/flows/AuthenticateTask.h
+    minecraft/auth/flows/AuthenticateTask.cpp
+    minecraft/auth/flows/RefreshTask.cpp
+    minecraft/auth/flows/RefreshTask.cpp
+    minecraft/auth/flows/ValidateTask.h
+    minecraft/auth/flows/ValidateTask.cpp
+
+    minecraft/gameoptions/GameOptions.h
+    minecraft/gameoptions/GameOptions.cpp
+
+    minecraft/update/AssetUpdateTask.h
+    minecraft/update/AssetUpdateTask.cpp
+    minecraft/update/FMLLibrariesTask.cpp
+    minecraft/update/FMLLibrariesTask.h
+    minecraft/update/FoldersTask.cpp
+    minecraft/update/FoldersTask.h
+    minecraft/update/LibrariesTask.cpp
+    minecraft/update/LibrariesTask.h
+
+    minecraft/launch/ClaimAccount.cpp
+    minecraft/launch/ClaimAccount.h
+    minecraft/launch/CreateGameFolders.cpp
+    minecraft/launch/CreateGameFolders.h
+    minecraft/launch/ModMinecraftJar.cpp
+    minecraft/launch/ModMinecraftJar.h
+    minecraft/launch/DirectJavaLaunch.cpp
+    minecraft/launch/DirectJavaLaunch.h
+    minecraft/launch/ExtractNatives.cpp
+    minecraft/launch/ExtractNatives.h
+    minecraft/launch/LauncherPartLaunch.cpp
+    minecraft/launch/LauncherPartLaunch.h
+    minecraft/launch/MinecraftServerTarget.cpp
+    minecraft/launch/MinecraftServerTarget.h
+    minecraft/launch/PrintInstanceInfo.cpp
+    minecraft/launch/PrintInstanceInfo.h
+    minecraft/launch/ReconstructAssets.cpp
+    minecraft/launch/ReconstructAssets.h
+    minecraft/launch/ScanModFolders.cpp
+    minecraft/launch/ScanModFolders.h
+    minecraft/launch/VerifyJavaInstall.cpp
+    minecraft/launch/VerifyJavaInstall.h
+
+    minecraft/legacy/LegacyModList.h
+    minecraft/legacy/LegacyModList.cpp
+    minecraft/legacy/LegacyInstance.h
+    minecraft/legacy/LegacyInstance.cpp
+    minecraft/legacy/LegacyUpgradeTask.h
+    minecraft/legacy/LegacyUpgradeTask.cpp
+
+    minecraft/GradleSpecifier.h
+    minecraft/MinecraftInstance.cpp
+    minecraft/MinecraftInstance.h
+    minecraft/LaunchProfile.cpp
+    minecraft/LaunchProfile.h
+    minecraft/Component.cpp
+    minecraft/Component.h
+    minecraft/PackProfile.cpp
+    minecraft/PackProfile.h
+    minecraft/ComponentUpdateTask.cpp
+    minecraft/ComponentUpdateTask.h
+    minecraft/MinecraftLoadAndCheck.h
+    minecraft/MinecraftLoadAndCheck.cpp
+    minecraft/MinecraftUpdate.h
+    minecraft/MinecraftUpdate.cpp
+    minecraft/MojangVersionFormat.cpp
+    minecraft/MojangVersionFormat.h
+    minecraft/Rule.cpp
+    minecraft/Rule.h
+    minecraft/OneSixVersionFormat.cpp
+    minecraft/OneSixVersionFormat.h
+    minecraft/OpSys.cpp
+    minecraft/OpSys.h
+    minecraft/ParseUtils.cpp
+    minecraft/ParseUtils.h
+    minecraft/ProfileUtils.cpp
+    minecraft/ProfileUtils.h
+    minecraft/Library.cpp
+    minecraft/Library.h
+    minecraft/MojangDownloadInfo.h
+    minecraft/VersionFile.cpp
+    minecraft/VersionFile.h
+    minecraft/VersionFilterData.h
+    minecraft/VersionFilterData.cpp
+    minecraft/World.h
+    minecraft/World.cpp
+    minecraft/WorldList.h
+    minecraft/WorldList.cpp
+
+    minecraft/mod/Mod.h
+    minecraft/mod/Mod.cpp
+    minecraft/mod/ModDetails.h
+    minecraft/mod/ModFolderModel.h
+    minecraft/mod/ModFolderModel.cpp
+    minecraft/mod/ModFolderLoadTask.h
+    minecraft/mod/ModFolderLoadTask.cpp
+    minecraft/mod/LocalModParseTask.h
+    minecraft/mod/LocalModParseTask.cpp
+    minecraft/mod/ResourcePackFolderModel.h
+    minecraft/mod/ResourcePackFolderModel.cpp
+    minecraft/mod/TexturePackFolderModel.h
+    minecraft/mod/TexturePackFolderModel.cpp
+
+    # Assets
+    minecraft/AssetsUtils.h
+    minecraft/AssetsUtils.cpp
+
+    # Minecraft services
+    minecraft/services/SkinUpload.cpp
+    minecraft/services/SkinUpload.h
+    minecraft/services/SkinDelete.cpp
+    minecraft/services/SkinDelete.h
+
+    mojang/PackageManifest.h
+    mojang/PackageManifest.cpp
+    )
+
+add_unit_test(GradleSpecifier
+    SOURCES minecraft/GradleSpecifier_test.cpp
+    LIBS MultiMC_logic
+    )
+
+add_executable(PackageManifest
+    mojang/PackageManifest_test.cpp
+)
+target_link_libraries(PackageManifest
+    MultiMC_logic
+    Qt5::Test
+)
+target_include_directories(PackageManifest
+    PRIVATE ../cmake/UnitTest/
+)
+add_test(
+    NAME PackageManifest
+    COMMAND PackageManifest
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_unit_test(MojangVersionFormat
+    SOURCES minecraft/MojangVersionFormat_test.cpp
+    LIBS MultiMC_logic
+    DATA minecraft/testdata
+    )
+
+add_unit_test(Library
+    SOURCES minecraft/Library_test.cpp
+    LIBS MultiMC_logic
+    )
+
+# FIXME: shares data with FileSystem test
+add_unit_test(ModFolderModel
+    SOURCES minecraft/mod/ModFolderModel_test.cpp
+    DATA testdata
+    LIBS MultiMC_logic
+    )
+
+add_unit_test(ParseUtils
+    SOURCES minecraft/ParseUtils_test.cpp
+    LIBS MultiMC_logic
+    )
+
+# the screenshots feature
+set(SCREENSHOTS_SOURCES
+    screenshots/Screenshot.h
+    screenshots/ImgurUpload.h
+    screenshots/ImgurUpload.cpp
+    screenshots/ImgurAlbumCreation.h
+    screenshots/ImgurAlbumCreation.cpp
+)
+
+set(TASKS_SOURCES
+    # Tasks
+    tasks/Task.h
+    tasks/Task.cpp
+    tasks/SequentialTask.h
+    tasks/SequentialTask.cpp
+)
+
+set(SETTINGS_SOURCES
+    # Settings
+    settings/INIFile.cpp
+    settings/INIFile.h
+    settings/INISettingsObject.cpp
+    settings/INISettingsObject.h
+    settings/OverrideSetting.cpp
+    settings/OverrideSetting.h
+    settings/PassthroughSetting.cpp
+    settings/PassthroughSetting.h
+    settings/Setting.cpp
+    settings/Setting.h
+    settings/SettingsObject.cpp
+    settings/SettingsObject.h
+)
+
+add_unit_test(INIFile
+    SOURCES settings/INIFile_test.cpp
+    LIBS MultiMC_logic
+    )
+
+set(JAVA_SOURCES
+    # Java related code
+    java/launch/CheckJava.cpp
+    java/launch/CheckJava.h
+    java/JavaChecker.h
+    java/JavaChecker.cpp
+    java/JavaCheckerJob.h
+    java/JavaCheckerJob.cpp
+    java/JavaInstall.h
+    java/JavaInstall.cpp
+    java/JavaInstallList.h
+    java/JavaInstallList.cpp
+    java/JavaUtils.h
+    java/JavaUtils.cpp
+    java/JavaVersion.h
+    java/JavaVersion.cpp
+)
+
+add_unit_test(JavaVersion
+    SOURCES java/JavaVersion_test.cpp
+    LIBS MultiMC_logic
+    )
+
+set(TRANSLATIONS_SOURCES
+    translations/TranslationsModel.h
+    translations/TranslationsModel.cpp
+    translations/POTranslator.h
+    translations/POTranslator.cpp
+)
+
+set(TOOLS_SOURCES
+    # Tools
+    tools/BaseExternalTool.cpp
+    tools/BaseExternalTool.h
+    tools/BaseProfiler.cpp
+    tools/BaseProfiler.h
+    tools/JProfiler.cpp
+    tools/JProfiler.h
+    tools/JVisualVM.cpp
+    tools/JVisualVM.h
+    tools/MCEditTool.cpp
+    tools/MCEditTool.h
+)
+
+set(META_SOURCES
+    # Metadata sources
+    meta/JsonFormat.cpp
+    meta/JsonFormat.h
+    meta/BaseEntity.cpp
+    meta/BaseEntity.h
+    meta/VersionList.cpp
+    meta/VersionList.h
+    meta/Version.cpp
+    meta/Version.h
+    meta/Index.cpp
+    meta/Index.h
+)
+
+set(FTB_SOURCES
+    modplatform/legacy_ftb/PackFetchTask.h
+    modplatform/legacy_ftb/PackFetchTask.cpp
+    modplatform/legacy_ftb/PackInstallTask.h
+    modplatform/legacy_ftb/PackInstallTask.cpp
+    modplatform/legacy_ftb/PrivatePackManager.h
+    modplatform/legacy_ftb/PrivatePackManager.cpp
+
+    modplatform/legacy_ftb/PackHelpers.h
+)
+
+set(FLAME_SOURCES
+    # Flame
+    modplatform/flame/FlamePackIndex.cpp
+    modplatform/flame/FlamePackIndex.h
+    modplatform/flame/PackManifest.h
+    modplatform/flame/PackManifest.cpp
+    modplatform/flame/FileResolvingTask.h
+    modplatform/flame/FileResolvingTask.cpp
+)
+
+set(MODPACKSCH_SOURCES
+    modplatform/modpacksch/FTBPackInstallTask.h
+    modplatform/modpacksch/FTBPackInstallTask.cpp
+    modplatform/modpacksch/FTBPackManifest.h
+    modplatform/modpacksch/FTBPackManifest.cpp
+)
+
+set(TECHNIC_SOURCES
+    modplatform/technic/SingleZipPackInstallTask.h
+    modplatform/technic/SingleZipPackInstallTask.cpp
+    modplatform/technic/SolderPackInstallTask.h
+    modplatform/technic/SolderPackInstallTask.cpp
+    modplatform/technic/TechnicPackProcessor.h
+    modplatform/technic/TechnicPackProcessor.cpp
+)
+
+set(ATLAUNCHER_SOURCES
+    modplatform/atlauncher/ATLPackIndex.cpp
+    modplatform/atlauncher/ATLPackIndex.h
+    modplatform/atlauncher/ATLPackInstallTask.cpp
+    modplatform/atlauncher/ATLPackInstallTask.h
+    modplatform/atlauncher/ATLPackManifest.cpp
+    modplatform/atlauncher/ATLPackManifest.h
+)
+
+add_unit_test(Index
+    SOURCES meta/Index_test.cpp
+    LIBS MultiMC_logic
+    )
+
+################################ COMPILE ################################
+
+# we need zlib
+find_package(ZLIB REQUIRED)
+
+set(LOGIC_SOURCES
+    ${CORE_SOURCES}
+    ${PATHMATCHER_SOURCES}
+    ${NET_SOURCES}
+    ${LAUNCH_SOURCES}
+    ${UPDATE_SOURCES}
+    ${NOTIFICATIONS_SOURCES}
+    ${NEWS_SOURCES}
+    ${STATUS_SOURCES}
+    ${MINECRAFT_SOURCES}
+    ${SCREENSHOTS_SOURCES}
+    ${TASKS_SOURCES}
+    ${SETTINGS_SOURCES}
+    ${JAVA_SOURCES}
+    ${TRANSLATIONS_SOURCES}
+    ${TOOLS_SOURCES}
+    ${META_SOURCES}
+    ${ICONS_SOURCES}
+    ${FTB_SOURCES}
+    ${FLAME_SOURCES}
+    ${MODPACKSCH_SOURCES}
+    ${TECHNIC_SOURCES}
+    ${ATLAUNCHER_SOURCES}
+)
+
+SET(MULTIMC_SOURCES
+    # Application base
+    MultiMC.h
+    MultiMC.cpp
+    UpdateController.cpp
+    UpdateController.h
+
+    # GUI - general utilities
+    DesktopServices.h
+    DesktopServices.cpp
+    GuiUtil.h
+    GuiUtil.cpp
+    ColumnResizer.h
+    ColumnResizer.cpp
+    InstanceProxyModel.h
+    InstanceProxyModel.cpp
+    VersionProxyModel.h
+    VersionProxyModel.cpp
+    ColorCache.h
+    ColorCache.cpp
+    HoeDown.h
+
+    # Super secret!
+    KonamiCode.h
+    KonamiCode.cpp
+
+    # Icons
+    icons/MMCIcon.h
+    icons/MMCIcon.cpp
+    icons/IconList.h
+    icons/IconList.cpp
+
+    # GUI - windows
+    MainWindow.h
+    MainWindow.cpp
+    InstanceWindow.h
+    InstanceWindow.cpp
+
+    # FIXME: maybe find a better home for this.
+    SkinUtils.cpp
+    SkinUtils.h
+
+    # GUI - setup wizard
+    setupwizard/SetupWizard.h
+    setupwizard/SetupWizard.cpp
+    setupwizard/AnalyticsWizardPage.cpp
+    setupwizard/AnalyticsWizardPage.h
+    setupwizard/BaseWizardPage.h
+    setupwizard/JavaWizardPage.cpp
+    setupwizard/JavaWizardPage.h
+    setupwizard/LanguageWizardPage.cpp
+    setupwizard/LanguageWizardPage.h
+
+    # GUI - themes
+    themes/FusionTheme.cpp
+    themes/FusionTheme.h
+    themes/BrightTheme.cpp
+    themes/BrightTheme.h
+    themes/CustomTheme.cpp
+    themes/CustomTheme.h
+    themes/DarkTheme.cpp
+    themes/DarkTheme.h
+    themes/ITheme.cpp
+    themes/ITheme.h
+    themes/SystemTheme.cpp
+    themes/SystemTheme.h
+
+    # Processes
+    LaunchController.h
+    LaunchController.cpp
+
+    # page provider for instances
+    InstancePageProvider.h
+
+    # Common java checking UI
+    JavaCommon.h
+    JavaCommon.cpp
+
+    # GUI - paged dialog base
+    pages/BasePage.h
+    pages/BasePageContainer.h
+    pages/BasePageProvider.h
+
+    # GUI - instance pages
+    pages/instance/GameOptionsPage.cpp
+    pages/instance/GameOptionsPage.h
+    pages/instance/VersionPage.cpp
+    pages/instance/VersionPage.h
+    pages/instance/TexturePackPage.h
+    pages/instance/ResourcePackPage.h
+    pages/instance/ModFolderPage.cpp
+    pages/instance/ModFolderPage.h
+    pages/instance/NotesPage.cpp
+    pages/instance/NotesPage.h
+    pages/instance/LogPage.cpp
+    pages/instance/LogPage.h
+    pages/instance/InstanceSettingsPage.cpp
+    pages/instance/InstanceSettingsPage.h
+    pages/instance/ScreenshotsPage.cpp
+    pages/instance/ScreenshotsPage.h
+    pages/instance/OtherLogsPage.cpp
+    pages/instance/OtherLogsPage.h
+    pages/instance/ServersPage.cpp
+    pages/instance/ServersPage.h
+    pages/instance/LegacyUpgradePage.cpp
+    pages/instance/LegacyUpgradePage.h
+    pages/instance/WorldListPage.cpp
+    pages/instance/WorldListPage.h
+
+    # GUI - global settings pages
+    pages/global/AccountListPage.cpp
+    pages/global/AccountListPage.h
+    pages/global/CustomCommandsPage.cpp
+    pages/global/CustomCommandsPage.h
+    pages/global/ExternalToolsPage.cpp
+    pages/global/ExternalToolsPage.h
+    pages/global/JavaPage.cpp
+    pages/global/JavaPage.h
+    pages/global/LanguagePage.cpp
+    pages/global/LanguagePage.h
+    pages/global/MinecraftPage.cpp
+    pages/global/MinecraftPage.h
+    pages/global/MultiMCPage.cpp
+    pages/global/MultiMCPage.h
+    pages/global/ProxyPage.cpp
+    pages/global/ProxyPage.h
+    pages/global/PasteEEPage.cpp
+    pages/global/PasteEEPage.h
+
+    # GUI - platform pages
+    pages/modplatform/VanillaPage.cpp
+    pages/modplatform/VanillaPage.h
+
+    pages/modplatform/atlauncher/AtlFilterModel.cpp
+    pages/modplatform/atlauncher/AtlFilterModel.h
+    pages/modplatform/atlauncher/AtlListModel.cpp
+    pages/modplatform/atlauncher/AtlListModel.h
+    pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
+    pages/modplatform/atlauncher/AtlOptionalModDialog.h
+    pages/modplatform/atlauncher/AtlPage.cpp
+    pages/modplatform/atlauncher/AtlPage.h
+
+    pages/modplatform/ftb/FtbFilterModel.cpp
+    pages/modplatform/ftb/FtbFilterModel.h
+    pages/modplatform/ftb/FtbListModel.cpp
+    pages/modplatform/ftb/FtbListModel.h
+    pages/modplatform/ftb/FtbPage.cpp
+    pages/modplatform/ftb/FtbPage.h
+
+    pages/modplatform/legacy_ftb/Page.cpp
+    pages/modplatform/legacy_ftb/Page.h
+    pages/modplatform/legacy_ftb/ListModel.h
+    pages/modplatform/legacy_ftb/ListModel.cpp
+
+    pages/modplatform/flame/FlameModel.cpp
+    pages/modplatform/flame/FlameModel.h
+    pages/modplatform/flame/FlamePage.cpp
+    pages/modplatform/flame/FlamePage.h
+
+    pages/modplatform/technic/TechnicModel.cpp
+    pages/modplatform/technic/TechnicModel.h
+    pages/modplatform/technic/TechnicPage.cpp
+    pages/modplatform/technic/TechnicPage.h
+
+    pages/modplatform/ImportPage.cpp
+    pages/modplatform/ImportPage.h
+
+    # GUI - dialogs
+    dialogs/AboutDialog.cpp
+    dialogs/AboutDialog.h
+    dialogs/ProfileSelectDialog.cpp
+    dialogs/ProfileSelectDialog.h
+    dialogs/CopyInstanceDialog.cpp
+    dialogs/CopyInstanceDialog.h
+    dialogs/CustomMessageBox.cpp
+    dialogs/CustomMessageBox.h
+    dialogs/EditAccountDialog.cpp
+    dialogs/EditAccountDialog.h
+    dialogs/ExportInstanceDialog.cpp
+    dialogs/ExportInstanceDialog.h
+    dialogs/IconPickerDialog.cpp
+    dialogs/IconPickerDialog.h
+    dialogs/LoginDialog.cpp
+    dialogs/LoginDialog.h
+    dialogs/NewComponentDialog.cpp
+    dialogs/NewComponentDialog.h
+    dialogs/NewInstanceDialog.cpp
+    dialogs/NewInstanceDialog.h
+    dialogs/NotificationDialog.cpp
+    dialogs/NotificationDialog.h
+    pagedialog/PageDialog.cpp
+    pagedialog/PageDialog.h
+    dialogs/ProgressDialog.cpp
+    dialogs/ProgressDialog.h
+    dialogs/UpdateDialog.cpp
+    dialogs/UpdateDialog.h
+    dialogs/VersionSelectDialog.cpp
+    dialogs/VersionSelectDialog.h
+    dialogs/SkinUploadDialog.cpp
+    dialogs/SkinUploadDialog.h
+
+
+    # GUI - widgets
+    widgets/Common.cpp
+    widgets/Common.h
+    widgets/CustomCommands.cpp
+    widgets/CustomCommands.h
+    widgets/DropLabel.cpp
+    widgets/DropLabel.h
+    widgets/FocusLineEdit.cpp
+    widgets/FocusLineEdit.h
+    widgets/IconLabel.cpp
+    widgets/IconLabel.h
+    widgets/JavaSettingsWidget.cpp
+    widgets/JavaSettingsWidget.h
+    widgets/LabeledToolButton.cpp
+    widgets/LabeledToolButton.h
+    widgets/LanguageSelectionWidget.cpp
+    widgets/LanguageSelectionWidget.h
+    widgets/LineSeparator.cpp
+    widgets/LineSeparator.h
+    widgets/LogView.cpp
+    widgets/LogView.h
+    widgets/MCModInfoFrame.cpp
+    widgets/MCModInfoFrame.h
+    widgets/ModListView.cpp
+    widgets/ModListView.h
+    widgets/PageContainer.cpp
+    widgets/PageContainer.h
+    widgets/PageContainer_p.h
+    widgets/ServerStatus.cpp
+    widgets/ServerStatus.h
+    widgets/VersionListView.cpp
+    widgets/VersionListView.h
+    widgets/VersionSelectWidget.cpp
+    widgets/VersionSelectWidget.h
+    widgets/ProgressWidget.h
+    widgets/ProgressWidget.cpp
+    widgets/WideBar.h
+    widgets/WideBar.cpp
+
+    # GUI - instance group view
+    groupview/GroupedProxyModel.cpp
+    groupview/GroupedProxyModel.h
+    groupview/AccessibleGroupView.cpp
+    groupview/AccessibleGroupView.h
+    groupview/AccessibleGroupView_p.h
+    groupview/GroupView.cpp
+    groupview/GroupView.h
+    groupview/InstanceDelegate.cpp
+    groupview/InstanceDelegate.h
+    groupview/VisualGroup.cpp
+    groupview/VisualGroup.h
+    )
+
+######## UIs ########
+SET(MULTIMC_UIS
+    # Instance pages
+    pages/instance/GameOptionsPage.ui
+    pages/instance/VersionPage.ui
+    pages/instance/ModFolderPage.ui
+    pages/instance/LogPage.ui
+    pages/instance/InstanceSettingsPage.ui
+    pages/instance/NotesPage.ui
+    pages/instance/ScreenshotsPage.ui
+    pages/instance/OtherLogsPage.ui
+    pages/instance/LegacyUpgradePage.ui
+    pages/instance/ServersPage.ui
+    pages/instance/WorldListPage.ui
+
+    # Global settings pages
+    pages/global/AccountListPage.ui
+    pages/global/ExternalToolsPage.ui
+    pages/global/JavaPage.ui
+    pages/global/MinecraftPage.ui
+    pages/global/MultiMCPage.ui
+    pages/global/ProxyPage.ui
+    pages/global/PasteEEPage.ui
+
+    # Platform pages
+    pages/modplatform/VanillaPage.ui
+    pages/modplatform/atlauncher/AtlPage.ui
+    pages/modplatform/ftb/FtbPage.ui
+    pages/modplatform/legacy_ftb/Page.ui
+    pages/modplatform/flame/FlamePage.ui
+    pages/modplatform/technic/TechnicPage.ui
+    pages/modplatform/ImportPage.ui
+
+    # Platform Dialogs
+    pages/modplatform/atlauncher/AtlOptionalModDialog.ui
+
+    # Dialogs
+    dialogs/CopyInstanceDialog.ui
+    dialogs/NewComponentDialog.ui
+    dialogs/NewInstanceDialog.ui
+    dialogs/AboutDialog.ui
+    dialogs/ProgressDialog.ui
+    dialogs/IconPickerDialog.ui
+    dialogs/ProfileSelectDialog.ui
+    dialogs/EditAccountDialog.ui
+    dialogs/ExportInstanceDialog.ui
+    dialogs/LoginDialog.ui
+    dialogs/UpdateDialog.ui
+    dialogs/NotificationDialog.ui
+    dialogs/SkinUploadDialog.ui
+
+    # Widgets/other
+    widgets/CustomCommands.ui
+    widgets/MCModInfoFrame.ui
+)
+
+set(MULTIMC_QRCS
+    resources/backgrounds/backgrounds.qrc
+    resources/multimc/multimc.qrc
+    resources/pe_dark/pe_dark.qrc
+    resources/pe_light/pe_light.qrc
+    resources/pe_colored/pe_colored.qrc
+    resources/pe_blue/pe_blue.qrc
+    resources/OSX/OSX.qrc
+    resources/iOS/iOS.qrc
+    resources/flat/flat.qrc
+    resources/documents/documents.qrc
+)
+
+######## Windows resource files ########
+if(WIN32)
+    set(MULTIMC_RCS resources/multimc.rc)
+endif()
+
+# Qt 5 stuff
+qt5_wrap_ui(MULTIMC_UI ${MULTIMC_UIS})
+qt5_add_resources(MULTIMC_RESOURCES ${MULTIMC_QRCS})
+
+# Add executable
+add_library(MultiMC_logic STATIC ${LOGIC_SOURCES} ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES})
+target_link_libraries(MultiMC_logic
+    systeminfo
+    MultiMC_quazip
+    MultiMC_classparser
+    ${NBT_NAME}
+    ${ZLIB_LIBRARIES}
+    optional-bare
+    tomlc99
+    BuildConfig
+)
+target_link_libraries(MultiMC_logic
+    Qt5::Core
+    Qt5::Xml
+    Qt5::Network
+    Qt5::Concurrent
+    Qt5::Gui
+)
+target_link_libraries(MultiMC_logic
+    MultiMC_iconfix
+    ${QUAZIP_LIBRARIES}
+    hoedown
+    MultiMC_rainbow
+    LocalPeer
+    ganalytics
+)
+
+add_executable(MultiMC MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS})
+target_link_libraries(MultiMC MultiMC_logic)
+
+if(DEFINED MultiMC_APP_BINARY_NAME)
+    set_target_properties(MultiMC PROPERTIES OUTPUT_NAME "${MultiMC_APP_BINARY_NAME}")
+endif()
+if(DEFINED MultiMC_BINARY_RPATH)
+    SET_TARGET_PROPERTIES(MultiMC PROPERTIES INSTALL_RPATH "${MultiMC_BINARY_RPATH}")
+endif()
+if(DEFINED MultiMC_APP_BINARY_DEFS)
+    target_compile_definitions(MultiMC PRIVATE ${MultiMC_APP_BINARY_DEFS})
+endif()
+
+install(TARGETS MultiMC
+    BUNDLE DESTINATION ${BUNDLE_DEST_DIR} COMPONENT Runtime
+    LIBRARY DESTINATION ${LIBRARY_DEST_DIR} COMPONENT Runtime
+    RUNTIME DESTINATION ${BINARY_DEST_DIR} COMPONENT Runtime
+)
+
+#### The MultiMC bundle mess! ####
+# Bundle utilities are used to complete the portable packages - they add all the libraries that would otherwise be missing on the target system.
+# NOTE: it seems that this absolutely has to be here, and nowhere else.
+if(INSTALL_BUNDLE STREQUAL "full")
+    # Add qt.conf - this makes Qt stop looking for things outside the bundle
+    install(
+        CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DEST_DIR}/qt.conf\" \" \")"
+        COMPONENT Runtime
+    )
+    # Bundle plugins
+    if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+        # Image formats
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+            REGEX "tga|tiff|mng|webp" EXCLUDE
+        )
+        # Icon engines
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/iconengines"
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+            REGEX "fontawesome" EXCLUDE
+        )
+        # Platform plugins
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/platforms"
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+            REGEX "minimal|linuxfb|offscreen" EXCLUDE
+        )
+    else()
+        # Image formats
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+            REGEX "tga|tiff|mng|webp" EXCLUDE
+            REGEX "d\\." EXCLUDE
+            REGEX "_debug\\." EXCLUDE
+            REGEX "\\.dSYM" EXCLUDE
+        )
+        # Icon engines
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/iconengines"
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+            REGEX "fontawesome" EXCLUDE
+            REGEX "d\\." EXCLUDE
+            REGEX "_debug\\." EXCLUDE
+            REGEX "\\.dSYM" EXCLUDE
+        )
+        # Platform plugins
+        install(
+            DIRECTORY "${QT_PLUGINS_DIR}/platforms"
+            DESTINATION ${PLUGIN_DEST_DIR}
+            COMPONENT Runtime
+            REGEX "minimal|linuxfb|offscreen" EXCLUDE
+            REGEX "d\\." EXCLUDE
+            REGEX "_debug\\." EXCLUDE
+            REGEX "\\.dSYM" EXCLUDE
+        )
+    endif()
+    configure_file(
+        "${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in"
+        "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake"
+        @ONLY
+    )
+    install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime)
+endif()
diff --git a/application/ColorCache.cpp b/launcher/ColorCache.cpp
index ef268dd2..ef268dd2 100644
--- a/application/ColorCache.cpp
+++ b/launcher/ColorCache.cpp
diff --git a/application/ColorCache.h b/launcher/ColorCache.h
index 6ae633b9..6ae633b9 100644
--- a/application/ColorCache.h
+++ b/launcher/ColorCache.h
diff --git a/application/ColumnResizer.cpp b/launcher/ColumnResizer.cpp
index fe415067..fe415067 100644
--- a/application/ColumnResizer.cpp
+++ b/launcher/ColumnResizer.cpp
diff --git a/application/ColumnResizer.h b/launcher/ColumnResizer.h
index 8c920f01..8c920f01 100644
--- a/application/ColumnResizer.h
+++ b/launcher/ColumnResizer.h
diff --git a/api/logic/Commandline.cpp b/launcher/Commandline.cpp
index 2c0fde64..2c0fde64 100644
--- a/api/logic/Commandline.cpp
+++ b/launcher/Commandline.cpp
diff --git a/api/logic/Commandline.h b/launcher/Commandline.h
index 09c1707e..a4e7aa61 100644
--- a/api/logic/Commandline.h
+++ b/launcher/Commandline.h
@@ -25,8 +25,6 @@
 #include <QHash>
 #include <QStringList>
 
-#include "multimc_logic_export.h"
-
 /**
  * @file libutil/include/cmdutils.h
  * @brief commandline parsing and processing utilities
@@ -40,7 +38,7 @@ namespace Commandline
  * @param args the argument string
  * @return a QStringList containing all arguments
  */
-MULTIMC_LOGIC_EXPORT QStringList splitArgs(QString args);
+QStringList splitArgs(QString args);
 
 /**
  * @brief The FlagStyle enum
@@ -83,7 +81,7 @@ enum Enum
 /**
  * @brief The ParsingError class
  */
-class MULTIMC_LOGIC_EXPORT ParsingError : public std::runtime_error
+class ParsingError : public std::runtime_error
 {
 public:
     ParsingError(const QString &what);
@@ -92,7 +90,7 @@ public:
 /**
  * @brief The Parser class
  */
-class MULTIMC_LOGIC_EXPORT Parser
+class Parser
 {
 public:
     /**
diff --git a/api/logic/DefaultVariable.h b/launcher/DefaultVariable.h
index 5c069bd3..5c069bd3 100644
--- a/api/logic/DefaultVariable.h
+++ b/launcher/DefaultVariable.h
diff --git a/api/gui/DesktopServices.cpp b/launcher/DesktopServices.cpp
index 5368ddc8..5368ddc8 100644
--- a/api/gui/DesktopServices.cpp
+++ b/launcher/DesktopServices.cpp
diff --git a/launcher/DesktopServices.h b/launcher/DesktopServices.h
new file mode 100644
index 00000000..1c081da4
--- /dev/null
+++ b/launcher/DesktopServices.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <QUrl>
+#include <QString>
+
+/**
+ * This wraps around QDesktopServices and adds workarounds where needed
+ * Use this instead of QDesktopServices!
+ */
+namespace DesktopServices
+{
+    /**
+     * Open a file in whatever application is applicable
+     */
+    bool openFile(const QString &path);
+
+    /**
+     * Open a file in the specified application
+     */
+    bool openFile(const QString &application, const QString &path, const QString & workingDirectory = QString(), qint64 *pid = 0);
+
+    /**
+     * Run an application
+     */
+    bool run(const QString &application,const QStringList &args, const QString & workingDirectory = QString(), qint64 *pid = 0);
+
+    /**
+     * Open a directory
+     */
+    bool openDirectory(const QString &path, bool ensureExists = false);
+
+    /**
+     * Open the URL, most likely in a browser. Maybe.
+     */
+    bool openUrl(const QUrl &url);
+}
diff --git a/api/logic/Env.cpp b/launcher/Env.cpp
index 71b49d95..71b49d95 100644
--- a/api/logic/Env.cpp
+++ b/launcher/Env.cpp
diff --git a/api/logic/Env.h b/launcher/Env.h
index 8b9b827e..7d1a8bc9 100644
--- a/api/logic/Env.h
+++ b/launcher/Env.h
@@ -5,8 +5,6 @@
 #include <QString>
 #include <QMap>
 
-#include "multimc_logic_export.h"
-
 #include "QObjectPtr.h"
 
 class QNetworkAccessManager;
@@ -25,7 +23,7 @@ class Index;
 #define ENV (Env::getInstance())
 
 
-class MULTIMC_LOGIC_EXPORT Env
+class Env
 {
     friend class MultiMC;
 private:
diff --git a/api/logic/Exception.h b/launcher/Exception.h
index 9400b3f8..fe0b86b5 100644
--- a/api/logic/Exception.h
+++ b/launcher/Exception.h
@@ -6,9 +6,7 @@
 #include <QDebug>
 #include <exception>
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT Exception : public std::exception
+class Exception : public std::exception
 {
 public:
     Exception(const QString &message) : std::exception(), m_message(message)
diff --git a/api/logic/ExponentialSeries.h b/launcher/ExponentialSeries.h
index a9487f0a..a9487f0a 100644
--- a/api/logic/ExponentialSeries.h
+++ b/launcher/ExponentialSeries.h
diff --git a/api/logic/FileSystem.cpp b/launcher/FileSystem.cpp
index 13f05b86..13f05b86 100644
--- a/api/logic/FileSystem.cpp
+++ b/launcher/FileSystem.cpp
diff --git a/api/logic/FileSystem.h b/launcher/FileSystem.h
index 55ec6a58..8f6e8b48 100644
--- a/api/logic/FileSystem.h
+++ b/launcher/FileSystem.h
@@ -5,14 +5,13 @@
 #include "Exception.h"
 #include "pathmatcher/IPathMatcher.h"
 
-#include "multimc_logic_export.h"
 #include <QDir>
 #include <QFlags>
 
 namespace FS
 {
 
-class MULTIMC_LOGIC_EXPORT FileSystemException : public ::Exception
+class FileSystemException : public ::Exception
 {
 public:
     FileSystemException(const QString &message) : Exception(message) {}
@@ -21,31 +20,31 @@ public:
 /**
  * write data to a file safely
  */
-MULTIMC_LOGIC_EXPORT void write(const QString &filename, const QByteArray &data);
+void write(const QString &filename, const QByteArray &data);
 
 /**
  * read data from a file safely\
  */
-MULTIMC_LOGIC_EXPORT QByteArray read(const QString &filename);
+QByteArray read(const QString &filename);
 
 /**
  * Update the last changed timestamp of an existing file
  */
-MULTIMC_LOGIC_EXPORT bool updateTimestamp(const QString & filename);
+bool updateTimestamp(const QString & filename);
 
 /**
  * Creates all the folders in a path for the specified path
  * last segment of the path is treated as a file name and is ignored!
  */
-MULTIMC_LOGIC_EXPORT bool ensureFilePathExists(QString filenamepath);
+bool ensureFilePathExists(QString filenamepath);
 
 /**
  * Creates all the folders in a path for the specified path
  * last segment of the path is treated as a folder name and is created!
  */
-MULTIMC_LOGIC_EXPORT bool ensureFolderPathExists(QString filenamepath);
+bool ensureFolderPathExists(QString filenamepath);
 
-class MULTIMC_LOGIC_EXPORT copy
+class copy
 {
 public:
     copy(const QString & src, const QString & dst)
@@ -81,13 +80,13 @@ private:
 /**
  * Delete a folder recursively
  */
-MULTIMC_LOGIC_EXPORT bool deletePath(QString path);
+bool deletePath(QString path);
 
-MULTIMC_LOGIC_EXPORT QString PathCombine(const QString &path1, const QString &path2);
-MULTIMC_LOGIC_EXPORT QString PathCombine(const QString &path1, const QString &path2, const QString &path3);
-MULTIMC_LOGIC_EXPORT QString PathCombine(const QString &path1, const QString &path2, const QString &path3, const QString &path4);
+QString PathCombine(const QString &path1, const QString &path2);
+QString PathCombine(const QString &path1, const QString &path2, const QString &path3);
+QString PathCombine(const QString &path1, const QString &path2, const QString &path3, const QString &path4);
 
-MULTIMC_LOGIC_EXPORT QString AbsolutePath(QString path);
+QString AbsolutePath(QString path);
 
 /**
  * Resolve an executable
@@ -99,7 +98,7 @@ MULTIMC_LOGIC_EXPORT QString AbsolutePath(QString path);
  *
  * @return absolute path to executable or null string
  */
-MULTIMC_LOGIC_EXPORT QString ResolveExecutable(QString path);
+QString ResolveExecutable(QString path);
 
 /**
  * Normalize path
@@ -109,20 +108,20 @@ MULTIMC_LOGIC_EXPORT QString ResolveExecutable(QString path);
  *
  * Returns false if the path logic somehow filed (and normalizedPath in invalid)
  */
-MULTIMC_LOGIC_EXPORT QString NormalizePath(QString path);
+QString NormalizePath(QString path);
 
-MULTIMC_LOGIC_EXPORT QString RemoveInvalidFilenameChars(QString string, QChar replaceWith = '-');
+QString RemoveInvalidFilenameChars(QString string, QChar replaceWith = '-');
 
-MULTIMC_LOGIC_EXPORT QString DirNameFromString(QString string, QString inDir = ".");
+QString DirNameFromString(QString string, QString inDir = ".");
 
 /// Checks if the a given Path contains "!"
-MULTIMC_LOGIC_EXPORT bool checkProblemticPathJava(QDir folder);
+bool checkProblemticPathJava(QDir folder);
 
 // Get the Directory representing the User's Desktop
-MULTIMC_LOGIC_EXPORT QString getDesktopDir();
+QString getDesktopDir();
 
 // Create a shortcut at *location*, pointing to *dest* called with the arguments *args*
 // call it *name* and assign it the icon *icon*
 // return true if operation succeeded
-MULTIMC_LOGIC_EXPORT bool createShortCut(QString location, QString dest, QStringList args, QString name, QString iconLocation);
+bool createShortCut(QString location, QString dest, QStringList args, QString name, QString iconLocation);
 }
diff --git a/api/logic/FileSystem_test.cpp b/launcher/FileSystem_test.cpp
index df653ea1..df653ea1 100644
--- a/api/logic/FileSystem_test.cpp
+++ b/launcher/FileSystem_test.cpp
diff --git a/api/logic/Filter.cpp b/launcher/Filter.cpp
index c65ca0ce..c65ca0ce 100644
--- a/api/logic/Filter.cpp
+++ b/launcher/Filter.cpp
diff --git a/api/logic/Filter.h b/launcher/Filter.h
index 1ba48e48..b55067ac 100644
--- a/api/logic/Filter.h
+++ b/launcher/Filter.h
@@ -3,16 +3,14 @@
 #include <QString>
 #include <QRegularExpression>
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT Filter
+class Filter
 {
 public:
     virtual ~Filter();
     virtual bool accepts(const QString & value) = 0;
 };
 
-class MULTIMC_LOGIC_EXPORT ContainsFilter: public Filter
+class ContainsFilter: public Filter
 {
 public:
     ContainsFilter(const QString &pattern);
@@ -22,7 +20,7 @@ private:
     QString pattern;
 };
 
-class MULTIMC_LOGIC_EXPORT ExactFilter: public Filter
+class ExactFilter: public Filter
 {
 public:
     ExactFilter(const QString &pattern);
@@ -32,7 +30,7 @@ private:
     QString pattern;
 };
 
-class MULTIMC_LOGIC_EXPORT RegexpFilter: public Filter
+class RegexpFilter: public Filter
 {
 public:
     RegexpFilter(const QString &regexp, bool invert);
diff --git a/api/logic/GZip.cpp b/launcher/GZip.cpp
index 0368c32d..0368c32d 100644
--- a/api/logic/GZip.cpp
+++ b/launcher/GZip.cpp
diff --git a/api/logic/GZip.h b/launcher/GZip.h
index c7eddbb3..7d4b1c33 100644
--- a/api/logic/GZip.h
+++ b/launcher/GZip.h
@@ -1,9 +1,7 @@
 #pragma once
 #include <QByteArray>
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT GZip
+class GZip
 {
 public:
     static bool unzip(const QByteArray &compressedBytes, QByteArray &uncompressedBytes);
diff --git a/api/logic/GZip_test.cpp b/launcher/GZip_test.cpp
index 3f4d181c..3f4d181c 100644
--- a/api/logic/GZip_test.cpp
+++ b/launcher/GZip_test.cpp
diff --git a/application/GuiUtil.cpp b/launcher/GuiUtil.cpp
index 302206f5..302206f5 100644
--- a/application/GuiUtil.cpp
+++ b/launcher/GuiUtil.cpp
diff --git a/application/GuiUtil.h b/launcher/GuiUtil.h
index 5e109383..5e109383 100644
--- a/application/GuiUtil.h
+++ b/launcher/GuiUtil.h
diff --git a/application/HoeDown.h b/launcher/HoeDown.h
index b9e06ffb..b9e06ffb 100644
--- a/application/HoeDown.h
+++ b/launcher/HoeDown.h
diff --git a/api/logic/InstanceCopyTask.cpp b/launcher/InstanceCopyTask.cpp
index 35adeaf9..35adeaf9 100644
--- a/api/logic/InstanceCopyTask.cpp
+++ b/launcher/InstanceCopyTask.cpp
diff --git a/api/logic/InstanceCopyTask.h b/launcher/InstanceCopyTask.h
index 6465e92d..82901732 100644
--- a/api/logic/InstanceCopyTask.h
+++ b/launcher/InstanceCopyTask.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "tasks/Task.h"
-#include "multimc_logic_export.h"
 #include "net/NetJob.h"
 #include <QUrl>
 #include <QFuture>
@@ -11,7 +10,7 @@
 #include "BaseInstance.h"
 #include "InstanceTask.h"
 
-class MULTIMC_LOGIC_EXPORT InstanceCopyTask : public InstanceTask
+class InstanceCopyTask : public InstanceTask
 {
     Q_OBJECT
 public:
diff --git a/api/logic/InstanceCreationTask.cpp b/launcher/InstanceCreationTask.cpp
index eafc5126..eafc5126 100644
--- a/api/logic/InstanceCreationTask.cpp
+++ b/launcher/InstanceCreationTask.cpp
diff --git a/api/logic/InstanceCreationTask.h b/launcher/InstanceCreationTask.h
index 154a854f..54997116 100644
--- a/api/logic/InstanceCreationTask.h
+++ b/launcher/InstanceCreationTask.h
@@ -1,14 +1,13 @@
 #pragma once
 
 #include "tasks/Task.h"
-#include "multimc_logic_export.h"
 #include "net/NetJob.h"
 #include <QUrl>
 #include "settings/SettingsObject.h"
 #include "BaseVersion.h"
 #include "InstanceTask.h"
 
-class MULTIMC_LOGIC_EXPORT InstanceCreationTask : public InstanceTask
+class InstanceCreationTask : public InstanceTask
 {
     Q_OBJECT
 public:
diff --git a/api/logic/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index 3eac4d57..3eac4d57 100644
--- a/api/logic/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
diff --git a/api/logic/InstanceImportTask.h b/launcher/InstanceImportTask.h
index 7291324d..72ae6851 100644
--- a/api/logic/InstanceImportTask.h
+++ b/launcher/InstanceImportTask.h
@@ -16,7 +16,6 @@
 #pragma once
 
 #include "InstanceTask.h"
-#include "multimc_logic_export.h"
 #include "net/NetJob.h"
 #include <QUrl>
 #include <QFuture>
@@ -32,7 +31,7 @@ namespace Flame
     class FileResolvingTask;
 }
 
-class MULTIMC_LOGIC_EXPORT InstanceImportTask : public InstanceTask
+class InstanceImportTask : public InstanceTask
 {
     Q_OBJECT
 public:
diff --git a/api/logic/InstanceList.cpp b/launcher/InstanceList.cpp
index cb38853b..cb38853b 100644
--- a/api/logic/InstanceList.cpp
+++ b/launcher/InstanceList.cpp
diff --git a/api/logic/InstanceList.h b/launcher/InstanceList.h
index 56ee3be4..4d2dc1f6 100644
--- a/api/logic/InstanceList.h
+++ b/launcher/InstanceList.h
@@ -22,8 +22,6 @@
 
 #include "BaseInstance.h"
 
-#include "multimc_logic_export.h"
-
 #include "QObjectPtr.h"
 
 class QFileSystemWatcher;
@@ -49,7 +47,7 @@ enum class GroupsState
 };
 
 
-class MULTIMC_LOGIC_EXPORT InstanceList : public QAbstractListModel
+class InstanceList : public QAbstractListModel
 {
     Q_OBJECT
 
diff --git a/application/InstancePageProvider.h b/launcher/InstancePageProvider.h
index 3cb723c4..3cb723c4 100644
--- a/application/InstancePageProvider.h
+++ b/launcher/InstancePageProvider.h
diff --git a/application/InstanceProxyModel.cpp b/launcher/InstanceProxyModel.cpp
index 5317f60c..5317f60c 100644
--- a/application/InstanceProxyModel.cpp
+++ b/launcher/InstanceProxyModel.cpp
diff --git a/application/InstanceProxyModel.h b/launcher/InstanceProxyModel.h
index fab6f834..fab6f834 100644
--- a/application/InstanceProxyModel.h
+++ b/launcher/InstanceProxyModel.h
diff --git a/api/logic/InstanceTask.cpp b/launcher/InstanceTask.cpp
index dd132877..dd132877 100644
--- a/api/logic/InstanceTask.cpp
+++ b/launcher/InstanceTask.cpp
diff --git a/api/logic/InstanceTask.h b/launcher/InstanceTask.h
index c5f6c7fd..82e23f11 100644
--- a/api/logic/InstanceTask.h
+++ b/launcher/InstanceTask.h
@@ -1,10 +1,9 @@
 #pragma once
 
 #include "tasks/Task.h"
-#include "multimc_logic_export.h"
 #include "settings/SettingsObject.h"
 
-class MULTIMC_LOGIC_EXPORT InstanceTask : public Task
+class InstanceTask : public Task
 {
     Q_OBJECT
 public:
diff --git a/application/InstanceWindow.cpp b/launcher/InstanceWindow.cpp
index 015ffe1c..015ffe1c 100644
--- a/application/InstanceWindow.cpp
+++ b/launcher/InstanceWindow.cpp
diff --git a/application/InstanceWindow.h b/launcher/InstanceWindow.h
index cd7d2494..cd7d2494 100644
--- a/application/InstanceWindow.h
+++ b/launcher/InstanceWindow.h
diff --git a/application/JavaCommon.cpp b/launcher/JavaCommon.cpp
index 92a058f0..92a058f0 100644
--- a/application/JavaCommon.cpp
+++ b/launcher/JavaCommon.cpp
diff --git a/application/JavaCommon.h b/launcher/JavaCommon.h
index ca98145c..ca98145c 100644
--- a/application/JavaCommon.h
+++ b/launcher/JavaCommon.h
diff --git a/api/logic/Json.cpp b/launcher/Json.cpp
index 37ada1aa..37ada1aa 100644
--- a/api/logic/Json.cpp
+++ b/launcher/Json.cpp
diff --git a/api/logic/Json.h b/launcher/Json.h
index 34ff6fe2..f2e68f0c 100644
--- a/api/logic/Json.h
+++ b/launcher/Json.h
@@ -16,32 +16,32 @@
 
 namespace Json
 {
-class MULTIMC_LOGIC_EXPORT JsonException : public ::Exception
+class JsonException : public ::Exception
 {
 public:
     JsonException(const QString &message) : Exception(message) {}
 };
 
 /// @throw FileSystemException
-MULTIMC_LOGIC_EXPORT void write(const QJsonDocument &doc, const QString &filename);
+void write(const QJsonDocument &doc, const QString &filename);
 /// @throw FileSystemException
-MULTIMC_LOGIC_EXPORT void write(const QJsonObject &object, const QString &filename);
+void write(const QJsonObject &object, const QString &filename);
 /// @throw FileSystemException
-MULTIMC_LOGIC_EXPORT void write(const QJsonArray &array, const QString &filename);
+void write(const QJsonArray &array, const QString &filename);
 
-MULTIMC_LOGIC_EXPORT QByteArray toBinary(const QJsonObject &obj);
-MULTIMC_LOGIC_EXPORT QByteArray toBinary(const QJsonArray &array);
-MULTIMC_LOGIC_EXPORT QByteArray toText(const QJsonObject &obj);
-MULTIMC_LOGIC_EXPORT QByteArray toText(const QJsonArray &array);
+QByteArray toBinary(const QJsonObject &obj);
+QByteArray toBinary(const QJsonArray &array);
+QByteArray toText(const QJsonObject &obj);
+QByteArray toText(const QJsonArray &array);
 
 /// @throw JsonException
-MULTIMC_LOGIC_EXPORT QJsonDocument requireDocument(const QByteArray &data, const QString &what = "Document");
+QJsonDocument requireDocument(const QByteArray &data, const QString &what = "Document");
 /// @throw JsonException
-MULTIMC_LOGIC_EXPORT QJsonDocument requireDocument(const QString &filename, const QString &what = "Document");
+QJsonDocument requireDocument(const QString &filename, const QString &what = "Document");
 /// @throw JsonException
-MULTIMC_LOGIC_EXPORT QJsonObject requireObject(const QJsonDocument &doc, const QString &what = "Document");
+QJsonObject requireObject(const QJsonDocument &doc, const QString &what = "Document");
 /// @throw JsonException
-MULTIMC_LOGIC_EXPORT QJsonArray requireArray(const QJsonDocument &doc, const QString &what = "Document");
+QJsonArray requireArray(const QJsonDocument &doc, const QString &what = "Document");
 
 /////////////////// WRITING ////////////////////
 
@@ -84,31 +84,31 @@ template <typename T>
 T requireIsType(const QJsonValue &value, const QString &what = "Value");
 
 /// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT double requireIsType<double>(const QJsonValue &value, const QString &what);
+template<> double requireIsType<double>(const QJsonValue &value, const QString &what);
 /// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT bool requireIsType<bool>(const QJsonValue &value, const QString &what);
+template<> bool requireIsType<bool>(const QJsonValue &value, const QString &what);
 /// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT int requireIsType<int>(const QJsonValue &value, const QString &what);
+template<> int requireIsType<int>(const QJsonValue &value, const QString &what);
 /// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QJsonObject requireIsType<QJsonObject>(const QJsonValue &value, const QString &what);
+template<> QJsonObject requireIsType<QJsonObject>(const QJsonValue &value, const QString &what);
 /// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QJsonArray requireIsType<QJsonArray>(const QJsonValue &value, const QString &what);
+template<> QJsonArray requireIsType<QJsonArray>(const QJsonValue &value, const QString &what);
 /// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QJsonValue requireIsType<QJsonValue>(const QJsonValue &value, const QString &what);
+template<> QJsonValue requireIsType<QJsonValue>(const QJsonValue &value, const QString &what);
 /// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QByteArray requireIsType<QByteArray>(const QJsonValue &value, const QString &what);
+template<> QByteArray requireIsType<QByteArray>(const QJsonValue &value, const QString &what);
 /// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QDateTime requireIsType<QDateTime>(const QJsonValue &value, const QString &what);
+template<> QDateTime requireIsType<QDateTime>(const QJsonValue &value, const QString &what);
 /// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QVariant requireIsType<QVariant>(const QJsonValue &value, const QString &what);
+template<> QVariant requireIsType<QVariant>(const QJsonValue &value, const QString &what);
 /// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QString requireIsType<QString>(const QJsonValue &value, const QString &what);
+template<> QString requireIsType<QString>(const QJsonValue &value, const QString &what);
 /// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QUuid requireIsType<QUuid>(const QJsonValue &value, const QString &what);
+template<> QUuid requireIsType<QUuid>(const QJsonValue &value, const QString &what);
 /// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QDir requireIsType<QDir>(const QJsonValue &value, const QString &what);
+template<> QDir requireIsType<QDir>(const QJsonValue &value, const QString &what);
 /// @throw JsonException
-template<> MULTIMC_LOGIC_EXPORT QUrl requireIsType<QUrl>(const QJsonValue &value, const QString &what);
+template<> QUrl requireIsType<QUrl>(const QJsonValue &value, const QString &what);
 
 // the following functions are higher level functions, that make use of the above functions for
 // type conversion
diff --git a/application/KonamiCode.cpp b/launcher/KonamiCode.cpp
index 46a2a0b2..46a2a0b2 100644
--- a/application/KonamiCode.cpp
+++ b/launcher/KonamiCode.cpp
diff --git a/application/KonamiCode.h b/launcher/KonamiCode.h
index 3d320ae7..3d320ae7 100644
--- a/application/KonamiCode.h
+++ b/launcher/KonamiCode.h
diff --git a/application/LaunchController.cpp b/launcher/LaunchController.cpp
index ee764082..ee764082 100644
--- a/application/LaunchController.cpp
+++ b/launcher/LaunchController.cpp
diff --git a/application/LaunchController.h b/launcher/LaunchController.h
index 5f177e00..5f177e00 100644
--- a/application/LaunchController.h
+++ b/launcher/LaunchController.h
diff --git a/api/logic/LoggedProcess.cpp b/launcher/LoggedProcess.cpp
index 822c0f04..822c0f04 100644
--- a/api/logic/LoggedProcess.cpp
+++ b/launcher/LoggedProcess.cpp
diff --git a/api/logic/LoggedProcess.h b/launcher/LoggedProcess.h
index 327cdc6a..e52b8a7b 100644
--- a/api/logic/LoggedProcess.h
+++ b/launcher/LoggedProcess.h
@@ -17,13 +17,12 @@
 
 #include <QProcess>
 #include "MessageLevel.h"
-#include "multimc_logic_export.h"
 
 /*
  * This is a basic process.
  * It has line-based logging support and hides some of the nasty bits.
  */
-class MULTIMC_LOGIC_EXPORT LoggedProcess : public QProcess
+class LoggedProcess : public QProcess
 {
 Q_OBJECT
 public:
diff --git a/api/logic/MMCStrings.cpp b/launcher/MMCStrings.cpp
index dc91c8d6..dc91c8d6 100644
--- a/api/logic/MMCStrings.cpp
+++ b/launcher/MMCStrings.cpp
diff --git a/launcher/MMCStrings.h b/launcher/MMCStrings.h
new file mode 100644
index 00000000..48052a00
--- /dev/null
+++ b/launcher/MMCStrings.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <QString>
+
+namespace Strings
+{
+    int naturalCompare(const QString &s1, const QString &s2, Qt::CaseSensitivity cs);
+}
diff --git a/api/logic/MMCZip.cpp b/launcher/MMCZip.cpp
index b25c61e7..b25c61e7 100644
--- a/api/logic/MMCZip.cpp
+++ b/launcher/MMCZip.cpp
diff --git a/api/logic/MMCZip.h b/launcher/MMCZip.h
index 98d9cd5b..9c47fa11 100644
--- a/api/logic/MMCZip.h
+++ b/launcher/MMCZip.h
@@ -21,8 +21,6 @@
 #include "minecraft/mod/Mod.h"
 #include <functional>
 
-#include "multimc_logic_export.h"
-
 #include <JlCompress.h>
 #include <nonstd/optional>
 
@@ -32,20 +30,20 @@ namespace MMCZip
     /**
      * Merge two zip files, using a filter function
      */
-    bool MULTIMC_LOGIC_EXPORT mergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString> &contained,
+    bool mergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString> &contained,
                                             const JlCompress::FilterFunction filter = nullptr);
 
     /**
      * take a source jar, add mods to it, resulting in target jar
      */
-    bool MULTIMC_LOGIC_EXPORT createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod>& mods);
+    bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList<Mod>& mods);
 
     /**
      * Find a single file in archive by file name (not path)
      *
      * \return the path prefix where the file is
      */
-    QString MULTIMC_LOGIC_EXPORT findFolderOfFileInZip(QuaZip * zip, const QString & what, const QString &root = QString(""));
+    QString findFolderOfFileInZip(QuaZip * zip, const QString & what, const QString &root = QString(""));
 
     /**
      * Find a multiple files of the same name in archive by file name
@@ -53,14 +51,14 @@ namespace MMCZip
      *
      * \return true if anything was found
      */
-    bool MULTIMC_LOGIC_EXPORT findFilesInZip(QuaZip * zip, const QString & what, QStringList & result, const QString &root = QString());
+    bool findFilesInZip(QuaZip * zip, const QString & what, QStringList & result, const QString &root = QString());
 
     /**
      * Extract a subdirectory from an archive
      */
-    nonstd::optional<QStringList> MULTIMC_LOGIC_EXPORT extractSubDir(QuaZip *zip, const QString & subdir, const QString &target);
+    nonstd::optional<QStringList> extractSubDir(QuaZip *zip, const QString & subdir, const QString &target);
 
-    bool MULTIMC_LOGIC_EXPORT extractRelFile(QuaZip *zip, const QString & file, const QString &target);
+    bool extractRelFile(QuaZip *zip, const QString & file, const QString &target);
 
     /**
      * Extract a whole archive.
@@ -69,7 +67,7 @@ namespace MMCZip
      * \param dir The directory to extract to, the current directory if left empty.
      * \return The list of the full paths of the files extracted, empty on failure.
      */
-    nonstd::optional<QStringList> MULTIMC_LOGIC_EXPORT extractDir(QString fileCompressed, QString dir);
+    nonstd::optional<QStringList> extractDir(QString fileCompressed, QString dir);
 
     /**
      * Extract a subdirectory from an archive
@@ -79,7 +77,7 @@ namespace MMCZip
      * \param dir The directory to extract to, the current directory if left empty.
      * \return The list of the full paths of the files extracted, empty on failure.
      */
-    nonstd::optional<QStringList> MULTIMC_LOGIC_EXPORT extractDir(QString fileCompressed, QString subdir, QString dir);
+    nonstd::optional<QStringList> extractDir(QString fileCompressed, QString subdir, QString dir);
 
     /**
      * Extract a single file from an archive into a directory
@@ -89,6 +87,6 @@ namespace MMCZip
      * \param dir The directory to extract to, the current directory if left empty.
      * \return true for success or false for failure
      */
-    bool MULTIMC_LOGIC_EXPORT extractFile(QString fileCompressed, QString file, QString dir);
+    bool extractFile(QString fileCompressed, QString file, QString dir);
 
 }
diff --git a/application/MainWindow.cpp b/launcher/MainWindow.cpp
index 9225193e..9225193e 100644
--- a/application/MainWindow.cpp
+++ b/launcher/MainWindow.cpp
diff --git a/application/MainWindow.h b/launcher/MainWindow.h
index c992ab94..c992ab94 100644
--- a/application/MainWindow.h
+++ b/launcher/MainWindow.h
diff --git a/api/logic/MessageLevel.cpp b/launcher/MessageLevel.cpp
index 0a2cd23d..0a2cd23d 100644
--- a/api/logic/MessageLevel.cpp
+++ b/launcher/MessageLevel.cpp
diff --git a/api/logic/MessageLevel.h b/launcher/MessageLevel.h
index f19048e3..f19048e3 100644
--- a/api/logic/MessageLevel.h
+++ b/launcher/MessageLevel.h
diff --git a/application/MultiMC.cpp b/launcher/MultiMC.cpp
index 932c7a76..932c7a76 100644
--- a/application/MultiMC.cpp
+++ b/launcher/MultiMC.cpp
diff --git a/application/MultiMC.h b/launcher/MultiMC.h
index af2b41c1..af2b41c1 100644
--- a/application/MultiMC.h
+++ b/launcher/MultiMC.h
diff --git a/api/logic/NullInstance.h b/launcher/NullInstance.h
index 94ed6c3a..94ed6c3a 100644
--- a/api/logic/NullInstance.h
+++ b/launcher/NullInstance.h
diff --git a/api/logic/ProblemProvider.h b/launcher/ProblemProvider.h
index 33c9d364..cd4745fa 100644
--- a/api/logic/ProblemProvider.h
+++ b/launcher/ProblemProvider.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "multimc_logic_export.h"
-
 enum class ProblemSeverity
 {
     None,
@@ -15,7 +13,7 @@ struct PatchProblem
     QString m_description;
 };
 
-class MULTIMC_LOGIC_EXPORT ProblemProvider
+class ProblemProvider
 {
 public:
     virtual ~ProblemProvider() {};
@@ -23,7 +21,7 @@ public:
     virtual ProblemSeverity getProblemSeverity() const = 0;
 };
 
-class MULTIMC_LOGIC_EXPORT ProblemContainer : public ProblemProvider
+class ProblemContainer : public ProblemProvider
 {
 public:
     const QList<PatchProblem> getProblems() const override
diff --git a/api/logic/QObjectPtr.h b/launcher/QObjectPtr.h
index 0ff51136..0ff51136 100644
--- a/api/logic/QObjectPtr.h
+++ b/launcher/QObjectPtr.h
diff --git a/api/logic/RWStorage.h b/launcher/RWStorage.h
index 3028388e..3028388e 100644
--- a/api/logic/RWStorage.h
+++ b/launcher/RWStorage.h
diff --git a/api/logic/RecursiveFileSystemWatcher.cpp b/launcher/RecursiveFileSystemWatcher.cpp
index b7417cdf..b7417cdf 100644
--- a/api/logic/RecursiveFileSystemWatcher.cpp
+++ b/launcher/RecursiveFileSystemWatcher.cpp
diff --git a/api/logic/RecursiveFileSystemWatcher.h b/launcher/RecursiveFileSystemWatcher.h
index c9c39f49..cc837d60 100644
--- a/api/logic/RecursiveFileSystemWatcher.h
+++ b/launcher/RecursiveFileSystemWatcher.h
@@ -4,9 +4,7 @@
 #include <QDir>
 #include "pathmatcher/IPathMatcher.h"
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT RecursiveFileSystemWatcher : public QObject
+class RecursiveFileSystemWatcher : public QObject
 {
     Q_OBJECT
 public:
diff --git a/api/logic/SeparatorPrefixTree.h b/launcher/SeparatorPrefixTree.h
index 7a841cb7..7a841cb7 100644
--- a/api/logic/SeparatorPrefixTree.h
+++ b/launcher/SeparatorPrefixTree.h
diff --git a/api/gui/SkinUtils.cpp b/launcher/SkinUtils.cpp
index ec969889..ec969889 100644
--- a/api/gui/SkinUtils.cpp
+++ b/launcher/SkinUtils.cpp
diff --git a/api/gui/SkinUtils.h b/launcher/SkinUtils.h
index b44f4228..c1f437ab 100644
--- a/api/gui/SkinUtils.h
+++ b/launcher/SkinUtils.h
@@ -17,9 +17,7 @@
 
 #include <QPixmap>
 
-#include "multimc_gui_export.h"
-
 namespace SkinUtils
 {
-QPixmap MULTIMC_GUI_EXPORT getFaceFromCache(QString id, int height = 64, int width = 64);
+QPixmap getFaceFromCache(QString id, int height = 64, int width = 64);
 }
diff --git a/application/UpdateController.cpp b/launcher/UpdateController.cpp
index 0309ad93..0309ad93 100644
--- a/application/UpdateController.cpp
+++ b/launcher/UpdateController.cpp
diff --git a/application/UpdateController.h b/launcher/UpdateController.h
index 715554e5..715554e5 100644
--- a/application/UpdateController.h
+++ b/launcher/UpdateController.h
diff --git a/api/logic/Usable.h b/launcher/Usable.h
index 83dd083d..83dd083d 100644
--- a/api/logic/Usable.h
+++ b/launcher/Usable.h
diff --git a/api/logic/Version.cpp b/launcher/Version.cpp
index 6392a50f..6392a50f 100644
--- a/api/logic/Version.cpp
+++ b/launcher/Version.cpp
diff --git a/api/logic/Version.h b/launcher/Version.h
index c5d93081..9fe12d6d 100644
--- a/api/logic/Version.h
+++ b/launcher/Version.h
@@ -3,11 +3,9 @@
 #include <QString>
 #include <QList>
 
-#include "multimc_logic_export.h"
-
 class QUrl;
 
-class MULTIMC_LOGIC_EXPORT Version
+class Version
 {
 public:
     Version(const QString &str);
diff --git a/application/VersionProxyModel.cpp b/launcher/VersionProxyModel.cpp
index 5587136f..5587136f 100644
--- a/application/VersionProxyModel.cpp
+++ b/launcher/VersionProxyModel.cpp
diff --git a/application/VersionProxyModel.h b/launcher/VersionProxyModel.h
index 8991c31b..8991c31b 100644
--- a/application/VersionProxyModel.h
+++ b/launcher/VersionProxyModel.h
diff --git a/api/logic/Version_test.cpp b/launcher/Version_test.cpp
index b2d657a6..b2d657a6 100644
--- a/api/logic/Version_test.cpp
+++ b/launcher/Version_test.cpp
diff --git a/api/logic/WatchLock.h b/launcher/WatchLock.h
index 3e08b413..3e08b413 100644
--- a/api/logic/WatchLock.h
+++ b/launcher/WatchLock.h
diff --git a/application/dialogs/AboutDialog.cpp b/launcher/dialogs/AboutDialog.cpp
index c97c471e..c97c471e 100644
--- a/application/dialogs/AboutDialog.cpp
+++ b/launcher/dialogs/AboutDialog.cpp
diff --git a/application/dialogs/AboutDialog.h b/launcher/dialogs/AboutDialog.h
index c7621c37..c7621c37 100644
--- a/application/dialogs/AboutDialog.h
+++ b/launcher/dialogs/AboutDialog.h
diff --git a/application/dialogs/AboutDialog.ui b/launcher/dialogs/AboutDialog.ui
index c6de9ebb..c6de9ebb 100644
--- a/application/dialogs/AboutDialog.ui
+++ b/launcher/dialogs/AboutDialog.ui
diff --git a/application/dialogs/CopyInstanceDialog.cpp b/launcher/dialogs/CopyInstanceDialog.cpp
index 5fe90334..5fe90334 100644
--- a/application/dialogs/CopyInstanceDialog.cpp
+++ b/launcher/dialogs/CopyInstanceDialog.cpp
diff --git a/application/dialogs/CopyInstanceDialog.h b/launcher/dialogs/CopyInstanceDialog.h
index bf3cd920..bf3cd920 100644
--- a/application/dialogs/CopyInstanceDialog.h
+++ b/launcher/dialogs/CopyInstanceDialog.h
diff --git a/application/dialogs/CopyInstanceDialog.ui b/launcher/dialogs/CopyInstanceDialog.ui
index fa675455..fa675455 100644
--- a/application/dialogs/CopyInstanceDialog.ui
+++ b/launcher/dialogs/CopyInstanceDialog.ui
diff --git a/application/dialogs/CustomMessageBox.cpp b/launcher/dialogs/CustomMessageBox.cpp
index 19029f68..19029f68 100644
--- a/application/dialogs/CustomMessageBox.cpp
+++ b/launcher/dialogs/CustomMessageBox.cpp
diff --git a/application/dialogs/CustomMessageBox.h b/launcher/dialogs/CustomMessageBox.h
index 712c6518..712c6518 100644
--- a/application/dialogs/CustomMessageBox.h
+++ b/launcher/dialogs/CustomMessageBox.h
diff --git a/application/dialogs/EditAccountDialog.cpp b/launcher/dialogs/EditAccountDialog.cpp
index 002c064b..002c064b 100644
--- a/application/dialogs/EditAccountDialog.cpp
+++ b/launcher/dialogs/EditAccountDialog.cpp
diff --git a/application/dialogs/EditAccountDialog.h b/launcher/dialogs/EditAccountDialog.h
index 6b5eb4aa..6b5eb4aa 100644
--- a/application/dialogs/EditAccountDialog.h
+++ b/launcher/dialogs/EditAccountDialog.h
diff --git a/application/dialogs/EditAccountDialog.ui b/launcher/dialogs/EditAccountDialog.ui
index e87509bc..e87509bc 100644
--- a/application/dialogs/EditAccountDialog.ui
+++ b/launcher/dialogs/EditAccountDialog.ui
diff --git a/application/dialogs/ExportInstanceDialog.cpp b/launcher/dialogs/ExportInstanceDialog.cpp
index a42779d4..a42779d4 100644
--- a/application/dialogs/ExportInstanceDialog.cpp
+++ b/launcher/dialogs/ExportInstanceDialog.cpp
diff --git a/application/dialogs/ExportInstanceDialog.h b/launcher/dialogs/ExportInstanceDialog.h
index dea02d1b..dea02d1b 100644
--- a/application/dialogs/ExportInstanceDialog.h
+++ b/launcher/dialogs/ExportInstanceDialog.h
diff --git a/application/dialogs/ExportInstanceDialog.ui b/launcher/dialogs/ExportInstanceDialog.ui
index bcd4e84a..bcd4e84a 100644
--- a/application/dialogs/ExportInstanceDialog.ui
+++ b/launcher/dialogs/ExportInstanceDialog.ui
diff --git a/application/dialogs/IconPickerDialog.cpp b/launcher/dialogs/IconPickerDialog.cpp
index 90436554..90436554 100644
--- a/application/dialogs/IconPickerDialog.cpp
+++ b/launcher/dialogs/IconPickerDialog.cpp
diff --git a/application/dialogs/IconPickerDialog.h b/launcher/dialogs/IconPickerDialog.h
index 9af6a678..9af6a678 100644
--- a/application/dialogs/IconPickerDialog.h
+++ b/launcher/dialogs/IconPickerDialog.h
diff --git a/application/dialogs/IconPickerDialog.ui b/launcher/dialogs/IconPickerDialog.ui
index c548edfb..c548edfb 100644
--- a/application/dialogs/IconPickerDialog.ui
+++ b/launcher/dialogs/IconPickerDialog.ui
diff --git a/application/dialogs/LoginDialog.cpp b/launcher/dialogs/LoginDialog.cpp
index 32f8a48f..32f8a48f 100644
--- a/application/dialogs/LoginDialog.cpp
+++ b/launcher/dialogs/LoginDialog.cpp
diff --git a/application/dialogs/LoginDialog.h b/launcher/dialogs/LoginDialog.h
index 16bdddfb..16bdddfb 100644
--- a/application/dialogs/LoginDialog.h
+++ b/launcher/dialogs/LoginDialog.h
diff --git a/application/dialogs/LoginDialog.ui b/launcher/dialogs/LoginDialog.ui
index dbdb3b93..dbdb3b93 100644
--- a/application/dialogs/LoginDialog.ui
+++ b/launcher/dialogs/LoginDialog.ui
diff --git a/application/dialogs/NewComponentDialog.cpp b/launcher/dialogs/NewComponentDialog.cpp
index f4d6274f..f4d6274f 100644
--- a/application/dialogs/NewComponentDialog.cpp
+++ b/launcher/dialogs/NewComponentDialog.cpp
diff --git a/application/dialogs/NewComponentDialog.h b/launcher/dialogs/NewComponentDialog.h
index 8c790beb..8c790beb 100644
--- a/application/dialogs/NewComponentDialog.h
+++ b/launcher/dialogs/NewComponentDialog.h
diff --git a/application/dialogs/NewComponentDialog.ui b/launcher/dialogs/NewComponentDialog.ui
index 03b0d222..03b0d222 100644
--- a/application/dialogs/NewComponentDialog.ui
+++ b/launcher/dialogs/NewComponentDialog.ui
diff --git a/application/dialogs/NewInstanceDialog.cpp b/launcher/dialogs/NewInstanceDialog.cpp
index 86963149..86963149 100644
--- a/application/dialogs/NewInstanceDialog.cpp
+++ b/launcher/dialogs/NewInstanceDialog.cpp
diff --git a/application/dialogs/NewInstanceDialog.h b/launcher/dialogs/NewInstanceDialog.h
index 53abf8cf..53abf8cf 100644
--- a/application/dialogs/NewInstanceDialog.h
+++ b/launcher/dialogs/NewInstanceDialog.h
diff --git a/application/dialogs/NewInstanceDialog.ui b/launcher/dialogs/NewInstanceDialog.ui
index 7fb19ff5..7fb19ff5 100644
--- a/application/dialogs/NewInstanceDialog.ui
+++ b/launcher/dialogs/NewInstanceDialog.ui
diff --git a/application/dialogs/NotificationDialog.cpp b/launcher/dialogs/NotificationDialog.cpp
index f2a35ae2..f2a35ae2 100644
--- a/application/dialogs/NotificationDialog.cpp
+++ b/launcher/dialogs/NotificationDialog.cpp
diff --git a/application/dialogs/NotificationDialog.h b/launcher/dialogs/NotificationDialog.h
index e1cbb9fa..e1cbb9fa 100644
--- a/application/dialogs/NotificationDialog.h
+++ b/launcher/dialogs/NotificationDialog.h
diff --git a/application/dialogs/NotificationDialog.ui b/launcher/dialogs/NotificationDialog.ui
index 3e6c22bc..3e6c22bc 100644
--- a/application/dialogs/NotificationDialog.ui
+++ b/launcher/dialogs/NotificationDialog.ui
diff --git a/application/dialogs/ProfileSelectDialog.cpp b/launcher/dialogs/ProfileSelectDialog.cpp
index ae34709f..ae34709f 100644
--- a/application/dialogs/ProfileSelectDialog.cpp
+++ b/launcher/dialogs/ProfileSelectDialog.cpp
diff --git a/application/dialogs/ProfileSelectDialog.h b/launcher/dialogs/ProfileSelectDialog.h
index 9f95830c..9f95830c 100644
--- a/application/dialogs/ProfileSelectDialog.h
+++ b/launcher/dialogs/ProfileSelectDialog.h
diff --git a/application/dialogs/ProfileSelectDialog.ui b/launcher/dialogs/ProfileSelectDialog.ui
index e779b51b..e779b51b 100644
--- a/application/dialogs/ProfileSelectDialog.ui
+++ b/launcher/dialogs/ProfileSelectDialog.ui
diff --git a/application/dialogs/ProgressDialog.cpp b/launcher/dialogs/ProgressDialog.cpp
index 4b092859..4b092859 100644
--- a/application/dialogs/ProgressDialog.cpp
+++ b/launcher/dialogs/ProgressDialog.cpp
diff --git a/application/dialogs/ProgressDialog.h b/launcher/dialogs/ProgressDialog.h
index b28ad4fa..b28ad4fa 100644
--- a/application/dialogs/ProgressDialog.h
+++ b/launcher/dialogs/ProgressDialog.h
diff --git a/application/dialogs/ProgressDialog.ui b/launcher/dialogs/ProgressDialog.ui
index 04b8fef3..04b8fef3 100644
--- a/application/dialogs/ProgressDialog.ui
+++ b/launcher/dialogs/ProgressDialog.ui
diff --git a/application/dialogs/SkinUploadDialog.cpp b/launcher/dialogs/SkinUploadDialog.cpp
index 56133529..56133529 100644
--- a/application/dialogs/SkinUploadDialog.cpp
+++ b/launcher/dialogs/SkinUploadDialog.cpp
diff --git a/application/dialogs/SkinUploadDialog.h b/launcher/dialogs/SkinUploadDialog.h
index deb44eac..deb44eac 100644
--- a/application/dialogs/SkinUploadDialog.h
+++ b/launcher/dialogs/SkinUploadDialog.h
diff --git a/application/dialogs/SkinUploadDialog.ui b/launcher/dialogs/SkinUploadDialog.ui
index 6f5307e3..6f5307e3 100644
--- a/application/dialogs/SkinUploadDialog.ui
+++ b/launcher/dialogs/SkinUploadDialog.ui
diff --git a/application/dialogs/UpdateDialog.cpp b/launcher/dialogs/UpdateDialog.cpp
index 2baaf5e9..2baaf5e9 100644
--- a/application/dialogs/UpdateDialog.cpp
+++ b/launcher/dialogs/UpdateDialog.cpp
diff --git a/application/dialogs/UpdateDialog.h b/launcher/dialogs/UpdateDialog.h
index ae1799c3..ae1799c3 100644
--- a/application/dialogs/UpdateDialog.h
+++ b/launcher/dialogs/UpdateDialog.h
diff --git a/application/dialogs/UpdateDialog.ui b/launcher/dialogs/UpdateDialog.ui
index b0b3dd83..b0b3dd83 100644
--- a/application/dialogs/UpdateDialog.ui
+++ b/launcher/dialogs/UpdateDialog.ui
diff --git a/application/dialogs/VersionSelectDialog.cpp b/launcher/dialogs/VersionSelectDialog.cpp
index ed1210ba..ed1210ba 100644
--- a/application/dialogs/VersionSelectDialog.cpp
+++ b/launcher/dialogs/VersionSelectDialog.cpp
diff --git a/application/dialogs/VersionSelectDialog.h b/launcher/dialogs/VersionSelectDialog.h
index ed30d3f3..ed30d3f3 100644
--- a/application/dialogs/VersionSelectDialog.h
+++ b/launcher/dialogs/VersionSelectDialog.h
diff --git a/application/groupview/AccessibleGroupView.cpp b/launcher/groupview/AccessibleGroupView.cpp
index c6541f18..c6541f18 100644
--- a/application/groupview/AccessibleGroupView.cpp
+++ b/launcher/groupview/AccessibleGroupView.cpp
diff --git a/application/groupview/AccessibleGroupView.h b/launcher/groupview/AccessibleGroupView.h
index 9bfd1745..9bfd1745 100644
--- a/application/groupview/AccessibleGroupView.h
+++ b/launcher/groupview/AccessibleGroupView.h
diff --git a/application/groupview/AccessibleGroupView_p.h b/launcher/groupview/AccessibleGroupView_p.h
index e74da3be..e74da3be 100644
--- a/application/groupview/AccessibleGroupView_p.h
+++ b/launcher/groupview/AccessibleGroupView_p.h
diff --git a/application/groupview/GroupView.cpp b/launcher/groupview/GroupView.cpp
index 6bfc9381..6bfc9381 100644
--- a/application/groupview/GroupView.cpp
+++ b/launcher/groupview/GroupView.cpp
diff --git a/application/groupview/GroupView.h b/launcher/groupview/GroupView.h
index cc5a58aa..cc5a58aa 100644
--- a/application/groupview/GroupView.h
+++ b/launcher/groupview/GroupView.h
diff --git a/application/groupview/GroupedProxyModel.cpp b/launcher/groupview/GroupedProxyModel.cpp
index dc4212d5..dc4212d5 100644
--- a/application/groupview/GroupedProxyModel.cpp
+++ b/launcher/groupview/GroupedProxyModel.cpp
diff --git a/application/groupview/GroupedProxyModel.h b/launcher/groupview/GroupedProxyModel.h
index fabf11c1..fabf11c1 100644
--- a/application/groupview/GroupedProxyModel.h
+++ b/launcher/groupview/GroupedProxyModel.h
diff --git a/application/groupview/InstanceDelegate.cpp b/launcher/groupview/InstanceDelegate.cpp
index fc959565..fc959565 100644
--- a/application/groupview/InstanceDelegate.cpp
+++ b/launcher/groupview/InstanceDelegate.cpp
diff --git a/application/groupview/InstanceDelegate.h b/launcher/groupview/InstanceDelegate.h
index d95279f3..d95279f3 100644
--- a/application/groupview/InstanceDelegate.h
+++ b/launcher/groupview/InstanceDelegate.h
diff --git a/application/groupview/VisualGroup.cpp b/launcher/groupview/VisualGroup.cpp
index 76bf8678..76bf8678 100644
--- a/application/groupview/VisualGroup.cpp
+++ b/launcher/groupview/VisualGroup.cpp
diff --git a/application/groupview/VisualGroup.h b/launcher/groupview/VisualGroup.h
index 239ee9d7..239ee9d7 100644
--- a/application/groupview/VisualGroup.h
+++ b/launcher/groupview/VisualGroup.h
diff --git a/api/logic/icons/IIconList.cpp b/launcher/icons/IIconList.cpp
index b3a8fb43..b3a8fb43 100644
--- a/api/logic/icons/IIconList.cpp
+++ b/launcher/icons/IIconList.cpp
diff --git a/api/logic/icons/IIconList.h b/launcher/icons/IIconList.h
index 9a3fe022..15d7dd15 100644
--- a/api/logic/icons/IIconList.h
+++ b/launcher/icons/IIconList.h
@@ -2,7 +2,6 @@
 
 #include <QString>
 #include <QStringList>
-#include "multimc_logic_export.h"
 
 enum IconType : unsigned
 {
@@ -13,7 +12,7 @@ enum IconType : unsigned
     ToBeDeleted
 };
 
-class MULTIMC_LOGIC_EXPORT IIconList
+class IIconList
 {
 public:
     virtual ~IIconList();
diff --git a/api/gui/icons/IconList.cpp b/launcher/icons/IconList.cpp
index 70350534..70350534 100644
--- a/api/gui/icons/IconList.cpp
+++ b/launcher/icons/IconList.cpp
diff --git a/api/gui/icons/IconList.h b/launcher/icons/IconList.h
index f07415fa..70266ebb 100644
--- a/api/gui/icons/IconList.h
+++ b/launcher/icons/IconList.h
@@ -26,11 +26,9 @@
 #include "Env.h" // there is a global icon list inside Env.
 #include <icons/IIconList.h>
 
-#include "multimc_gui_export.h"
-
 class QFileSystemWatcher;
 
-class MULTIMC_GUI_EXPORT IconList : public QAbstractListModel, public IIconList
+class IconList : public QAbstractListModel, public IIconList
 {
     Q_OBJECT
 public:
diff --git a/api/logic/icons/IconUtils.cpp b/launcher/icons/IconUtils.cpp
index bf530c16..bf530c16 100644
--- a/api/logic/icons/IconUtils.cpp
+++ b/launcher/icons/IconUtils.cpp
diff --git a/api/logic/icons/IconUtils.h b/launcher/icons/IconUtils.h
index ce236946..be93d914 100644
--- a/api/logic/icons/IconUtils.h
+++ b/launcher/icons/IconUtils.h
@@ -1,14 +1,13 @@
 #pragma once
 
 #include <QString>
-#include "multimc_logic_export.h"
 
 namespace IconUtils {
 
 // Given a folder and an icon key, find 'best' of the icons with the given key in there and return its path
-MULTIMC_LOGIC_EXPORT QString findBestIconIn(const QString &folder, const QString & iconKey);
+QString findBestIconIn(const QString &folder, const QString & iconKey);
 
 // Get icon file type filter for file browser dialogs
-MULTIMC_LOGIC_EXPORT QString getIconFilter();
+QString getIconFilter();
 
 }
diff --git a/api/gui/icons/MMCIcon.cpp b/launcher/icons/MMCIcon.cpp
index f0b82ec9..f0b82ec9 100644
--- a/api/gui/icons/MMCIcon.cpp
+++ b/launcher/icons/MMCIcon.cpp
diff --git a/api/gui/icons/MMCIcon.h b/launcher/icons/MMCIcon.h
index fd14b5b7..1f05f28e 100644
--- a/api/gui/icons/MMCIcon.h
+++ b/launcher/icons/MMCIcon.h
@@ -19,9 +19,7 @@
 #include <QIcon>
 #include <icons/IIconList.h>
 
-#include "multimc_gui_export.h"
-
-struct MULTIMC_GUI_EXPORT MMCImage
+struct MMCImage
 {
     QIcon icon;
     QString key;
@@ -32,7 +30,7 @@ struct MULTIMC_GUI_EXPORT MMCImage
     }
 };
 
-struct MULTIMC_GUI_EXPORT MMCIcon
+struct MMCIcon
 {
     QString m_key;
     QString m_name;
diff --git a/application/install_prereqs.cmake.in b/launcher/install_prereqs.cmake.in
index e4408d16..e4408d16 100644
--- a/application/install_prereqs.cmake.in
+++ b/launcher/install_prereqs.cmake.in
diff --git a/api/logic/java/JavaChecker.cpp b/launcher/java/JavaChecker.cpp
index d78d6505..d78d6505 100644
--- a/api/logic/java/JavaChecker.cpp
+++ b/launcher/java/JavaChecker.cpp
diff --git a/api/logic/java/JavaChecker.h b/launcher/java/JavaChecker.h
index 0a96249a..122861cf 100644
--- a/api/logic/java/JavaChecker.h
+++ b/launcher/java/JavaChecker.h
@@ -5,13 +5,11 @@
 
 #include "QObjectPtr.h"
 
-#include "multimc_logic_export.h"
-
 #include "JavaVersion.h"
 
 class JavaChecker;
 
-struct MULTIMC_LOGIC_EXPORT JavaCheckResult
+struct JavaCheckResult
 {
     QString path;
     QString mojangPlatform;
@@ -32,7 +30,7 @@ struct MULTIMC_LOGIC_EXPORT JavaCheckResult
 
 typedef shared_qobject_ptr<QProcess> QProcessPtr;
 typedef shared_qobject_ptr<JavaChecker> JavaCheckerPtr;
-class MULTIMC_LOGIC_EXPORT JavaChecker : public QObject
+class JavaChecker : public QObject
 {
     Q_OBJECT
 public:
diff --git a/api/logic/java/JavaCheckerJob.cpp b/launcher/java/JavaCheckerJob.cpp
index 67d70066..67d70066 100644
--- a/api/logic/java/JavaCheckerJob.cpp
+++ b/launcher/java/JavaCheckerJob.cpp
diff --git a/api/logic/java/JavaCheckerJob.h b/launcher/java/JavaCheckerJob.h
index c0986420..c0986420 100644
--- a/api/logic/java/JavaCheckerJob.h
+++ b/launcher/java/JavaCheckerJob.h
diff --git a/api/logic/java/JavaInstall.cpp b/launcher/java/JavaInstall.cpp
index 5bcf7bcb..5bcf7bcb 100644
--- a/api/logic/java/JavaInstall.cpp
+++ b/launcher/java/JavaInstall.cpp
diff --git a/api/logic/java/JavaInstall.h b/launcher/java/JavaInstall.h
index 64be40d1..64be40d1 100644
--- a/api/logic/java/JavaInstall.h
+++ b/launcher/java/JavaInstall.h
diff --git a/api/logic/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp
index 0bded03c..0bded03c 100644
--- a/api/logic/java/JavaInstallList.cpp
+++ b/launcher/java/JavaInstallList.cpp
diff --git a/api/logic/java/JavaInstallList.h b/launcher/java/JavaInstallList.h
index 1785a7b6..e5c72b17 100644
--- a/api/logic/java/JavaInstallList.h
+++ b/launcher/java/JavaInstallList.h
@@ -26,11 +26,9 @@
 
 #include "QObjectPtr.h"
 
-#include "multimc_logic_export.h"
-
 class JavaListLoadTask;
 
-class MULTIMC_LOGIC_EXPORT JavaInstallList : public BaseVersionList
+class JavaInstallList : public BaseVersionList
 {
     Q_OBJECT
     enum class Status
diff --git a/api/logic/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
index 4b231e6a..4b231e6a 100644
--- a/api/logic/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
diff --git a/api/logic/java/JavaUtils.h b/launcher/java/JavaUtils.h
index 206acf89..3152d143 100644
--- a/api/logic/java/JavaUtils.h
+++ b/launcher/java/JavaUtils.h
@@ -24,11 +24,9 @@
 #include <windows.h>
 #endif
 
-#include "multimc_logic_export.h"
-
 QProcessEnvironment CleanEnviroment();
 
-class MULTIMC_LOGIC_EXPORT JavaUtils : public QObject
+class JavaUtils : public QObject
 {
     Q_OBJECT
 public:
diff --git a/api/logic/java/JavaVersion.cpp b/launcher/java/JavaVersion.cpp
index 179ccd8d..179ccd8d 100644
--- a/api/logic/java/JavaVersion.cpp
+++ b/launcher/java/JavaVersion.cpp
diff --git a/api/logic/java/JavaVersion.h b/launcher/java/JavaVersion.h
index 8589c21a..9bbf0642 100644
--- a/api/logic/java/JavaVersion.h
+++ b/launcher/java/JavaVersion.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "multimc_logic_export.h"
 #include <QString>
 
 // NOTE: apparently the GNU C library pollutes the global namespace with these... undef them.
@@ -11,7 +10,7 @@
     #undef minor
 #endif
 
-class MULTIMC_LOGIC_EXPORT JavaVersion
+class JavaVersion
 {
     friend class JavaVersionTest;
 public:
diff --git a/api/logic/java/JavaVersion_test.cpp b/launcher/java/JavaVersion_test.cpp
index 10ae13a7..10ae13a7 100644
--- a/api/logic/java/JavaVersion_test.cpp
+++ b/launcher/java/JavaVersion_test.cpp
diff --git a/api/logic/java/launch/CheckJava.cpp b/launcher/java/launch/CheckJava.cpp
index f58602f0..f58602f0 100644
--- a/api/logic/java/launch/CheckJava.cpp
+++ b/launcher/java/launch/CheckJava.cpp
diff --git a/api/logic/java/launch/CheckJava.h b/launcher/java/launch/CheckJava.h
index 68cd618b..68cd618b 100644
--- a/api/logic/java/launch/CheckJava.h
+++ b/launcher/java/launch/CheckJava.h
diff --git a/api/logic/launch/LaunchStep.cpp b/launcher/launch/LaunchStep.cpp
index d6bb6e88..d6bb6e88 100644
--- a/api/logic/launch/LaunchStep.cpp
+++ b/launcher/launch/LaunchStep.cpp
diff --git a/api/logic/launch/LaunchStep.h b/launcher/launch/LaunchStep.h
index 3939f960..3939f960 100644
--- a/api/logic/launch/LaunchStep.h
+++ b/launcher/launch/LaunchStep.h
diff --git a/api/logic/launch/LaunchTask.cpp b/launcher/launch/LaunchTask.cpp
index e6f6bbac..e6f6bbac 100644
--- a/api/logic/launch/LaunchTask.cpp
+++ b/launcher/launch/LaunchTask.cpp
diff --git a/api/logic/launch/LaunchTask.h b/launcher/launch/LaunchTask.h
index 2be59c83..ae81462f 100644
--- a/api/logic/launch/LaunchTask.h
+++ b/launcher/launch/LaunchTask.h
@@ -24,9 +24,7 @@
 #include "LoggedProcess.h"
 #include "LaunchStep.h"
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT LaunchTask: public Task
+class LaunchTask: public Task
 {
     Q_OBJECT
 protected:
diff --git a/api/logic/launch/LogModel.cpp b/launcher/launch/LogModel.cpp
index 92f9487a..92f9487a 100644
--- a/api/logic/launch/LogModel.cpp
+++ b/launcher/launch/LogModel.cpp
diff --git a/api/logic/launch/LogModel.h b/launcher/launch/LogModel.h
index bccceaef..6aabc823 100644
--- a/api/logic/launch/LogModel.h
+++ b/launcher/launch/LogModel.h
@@ -4,9 +4,7 @@
 #include <QString>
 #include "MessageLevel.h"
 
-#include <multimc_logic_export.h>
-
-class MULTIMC_LOGIC_EXPORT LogModel : public QAbstractListModel
+class LogModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
diff --git a/api/logic/launch/steps/LookupServerAddress.cpp b/launcher/launch/steps/LookupServerAddress.cpp
index de56c28a..de56c28a 100644
--- a/api/logic/launch/steps/LookupServerAddress.cpp
+++ b/launcher/launch/steps/LookupServerAddress.cpp
diff --git a/api/logic/launch/steps/LookupServerAddress.h b/launcher/launch/steps/LookupServerAddress.h
index 5a5c3de1..5a5c3de1 100644
--- a/api/logic/launch/steps/LookupServerAddress.h
+++ b/launcher/launch/steps/LookupServerAddress.h
diff --git a/api/logic/launch/steps/PostLaunchCommand.cpp b/launcher/launch/steps/PostLaunchCommand.cpp
index d48d03d1..d48d03d1 100644
--- a/api/logic/launch/steps/PostLaunchCommand.cpp
+++ b/launcher/launch/steps/PostLaunchCommand.cpp
diff --git a/api/logic/launch/steps/PostLaunchCommand.h b/launcher/launch/steps/PostLaunchCommand.h
index ab4c494f..ab4c494f 100644
--- a/api/logic/launch/steps/PostLaunchCommand.h
+++ b/launcher/launch/steps/PostLaunchCommand.h
diff --git a/api/logic/launch/steps/PreLaunchCommand.cpp b/launcher/launch/steps/PreLaunchCommand.cpp
index 20e089e2..20e089e2 100644
--- a/api/logic/launch/steps/PreLaunchCommand.cpp
+++ b/launcher/launch/steps/PreLaunchCommand.cpp
diff --git a/api/logic/launch/steps/PreLaunchCommand.h b/launcher/launch/steps/PreLaunchCommand.h
index dc069f71..dc069f71 100644
--- a/api/logic/launch/steps/PreLaunchCommand.h
+++ b/launcher/launch/steps/PreLaunchCommand.h
diff --git a/api/logic/launch/steps/TextPrint.cpp b/launcher/launch/steps/TextPrint.cpp
index 0c1f320c..0c1f320c 100644
--- a/api/logic/launch/steps/TextPrint.cpp
+++ b/launcher/launch/steps/TextPrint.cpp
diff --git a/api/logic/launch/steps/TextPrint.h b/launcher/launch/steps/TextPrint.h
index 2937c64a..36fa7f9a 100644
--- a/api/logic/launch/steps/TextPrint.h
+++ b/launcher/launch/steps/TextPrint.h
@@ -19,13 +19,11 @@
 #include <LoggedProcess.h>
 #include <java/JavaChecker.h>
 
-#include "multimc_logic_export.h"
-
 /*
  * FIXME: maybe do not export
  */
 
-class MULTIMC_LOGIC_EXPORT TextPrint: public LaunchStep
+class TextPrint: public LaunchStep
 {
     Q_OBJECT
 public:
diff --git a/api/logic/launch/steps/Update.cpp b/launcher/launch/steps/Update.cpp
index 28bd153d..28bd153d 100644
--- a/api/logic/launch/steps/Update.cpp
+++ b/launcher/launch/steps/Update.cpp
diff --git a/api/logic/launch/steps/Update.h b/launcher/launch/steps/Update.h
index 0c9d91e0..0c9d91e0 100644
--- a/api/logic/launch/steps/Update.h
+++ b/launcher/launch/steps/Update.h
diff --git a/application/main.cpp b/launcher/main.cpp
index b0360c7e..b0360c7e 100644
--- a/application/main.cpp
+++ b/launcher/main.cpp
diff --git a/api/logic/meta/BaseEntity.cpp b/launcher/meta/BaseEntity.cpp
index 5ff7a59a..5ff7a59a 100644
--- a/api/logic/meta/BaseEntity.cpp
+++ b/launcher/meta/BaseEntity.cpp
diff --git a/api/logic/meta/BaseEntity.h b/launcher/meta/BaseEntity.h
index 04a37420..eff43879 100644
--- a/api/logic/meta/BaseEntity.h
+++ b/launcher/meta/BaseEntity.h
@@ -19,13 +19,12 @@
 #include <QObject>
 #include "QObjectPtr.h"
 
-#include "multimc_logic_export.h"
 #include "net/Mode.h"
 
 class Task;
 namespace Meta
 {
-class MULTIMC_LOGIC_EXPORT BaseEntity
+class BaseEntity
 {
 public: /* types */
     using Ptr = std::shared_ptr<BaseEntity>;
diff --git a/api/logic/meta/Index.cpp b/launcher/meta/Index.cpp
index 6802470d..6802470d 100644
--- a/api/logic/meta/Index.cpp
+++ b/launcher/meta/Index.cpp
diff --git a/api/logic/meta/Index.h b/launcher/meta/Index.h
index e9412e70..d33ab0c8 100644
--- a/api/logic/meta/Index.h
+++ b/launcher/meta/Index.h
@@ -20,8 +20,6 @@
 
 #include "BaseEntity.h"
 
-#include "multimc_logic_export.h"
-
 class Task;
 
 namespace Meta
@@ -29,7 +27,7 @@ namespace Meta
 using VersionListPtr = std::shared_ptr<class VersionList>;
 using VersionPtr = std::shared_ptr<class Version>;
 
-class MULTIMC_LOGIC_EXPORT Index : public QAbstractListModel, public BaseEntity
+class Index : public QAbstractListModel, public BaseEntity
 {
     Q_OBJECT
 public:
diff --git a/api/logic/meta/Index_test.cpp b/launcher/meta/Index_test.cpp
index b0892070..b0892070 100644
--- a/api/logic/meta/Index_test.cpp
+++ b/launcher/meta/Index_test.cpp
diff --git a/api/logic/meta/JsonFormat.cpp b/launcher/meta/JsonFormat.cpp
index 796da4bb..796da4bb 100644
--- a/api/logic/meta/JsonFormat.cpp
+++ b/launcher/meta/JsonFormat.cpp
diff --git a/api/logic/meta/JsonFormat.h b/launcher/meta/JsonFormat.h
index 93217b7e..93217b7e 100644
--- a/api/logic/meta/JsonFormat.h
+++ b/launcher/meta/JsonFormat.h
diff --git a/api/logic/meta/Version.cpp b/launcher/meta/Version.cpp
index a8dc3169..a8dc3169 100644
--- a/api/logic/meta/Version.cpp
+++ b/launcher/meta/Version.cpp
diff --git a/api/logic/meta/Version.h b/launcher/meta/Version.h
index a38d7bcd..dea8dc8a 100644
--- a/api/logic/meta/Version.h
+++ b/launcher/meta/Version.h
@@ -26,15 +26,13 @@
 
 #include "BaseEntity.h"
 
-#include "multimc_logic_export.h"
-
 #include "JsonFormat.h"
 
 namespace Meta
 {
 using VersionPtr = std::shared_ptr<class Version>;
 
-class MULTIMC_LOGIC_EXPORT Version : public QObject, public BaseVersion, public BaseEntity
+class Version : public QObject, public BaseVersion, public BaseEntity
 {
     Q_OBJECT
 
diff --git a/api/logic/meta/VersionList.cpp b/launcher/meta/VersionList.cpp
index 607007eb..607007eb 100644
--- a/api/logic/meta/VersionList.cpp
+++ b/launcher/meta/VersionList.cpp
diff --git a/api/logic/meta/VersionList.h b/launcher/meta/VersionList.h
index bba32ca3..58cdafe7 100644
--- a/api/logic/meta/VersionList.h
+++ b/launcher/meta/VersionList.h
@@ -25,7 +25,7 @@ namespace Meta
 using VersionPtr = std::shared_ptr<class Version>;
 using VersionListPtr = std::shared_ptr<class VersionList>;
 
-class MULTIMC_LOGIC_EXPORT VersionList : public BaseVersionList, public BaseEntity
+class VersionList : public BaseVersionList, public BaseEntity
 {
     Q_OBJECT
     Q_PROPERTY(QString uid READ uid CONSTANT)
diff --git a/api/logic/minecraft/AssetsUtils.cpp b/launcher/minecraft/AssetsUtils.cpp
index c01733b6..c01733b6 100644
--- a/api/logic/minecraft/AssetsUtils.cpp
+++ b/launcher/minecraft/AssetsUtils.cpp
diff --git a/api/logic/minecraft/AssetsUtils.h b/launcher/minecraft/AssetsUtils.h
index 32e57060..32e57060 100644
--- a/api/logic/minecraft/AssetsUtils.h
+++ b/launcher/minecraft/AssetsUtils.h
diff --git a/api/logic/minecraft/Component.cpp b/launcher/minecraft/Component.cpp
index 92821065..92821065 100644
--- a/api/logic/minecraft/Component.cpp
+++ b/launcher/minecraft/Component.cpp
diff --git a/api/logic/minecraft/Component.h b/launcher/minecraft/Component.h
index cb202f7f..ef7c9947 100644
--- a/api/logic/minecraft/Component.h
+++ b/launcher/minecraft/Component.h
@@ -7,7 +7,6 @@
 #include "meta/JsonFormat.h"
 #include "ProblemProvider.h"
 #include "QObjectPtr.h"
-#include "multimc_logic_export.h"
 
 class PackProfile;
 class LaunchProfile;
@@ -18,7 +17,7 @@ namespace Meta
 }
 class VersionFile;
 
-class MULTIMC_LOGIC_EXPORT Component : public QObject, public ProblemProvider
+class Component : public QObject, public ProblemProvider
 {
 Q_OBJECT
 public:
diff --git a/api/logic/minecraft/ComponentUpdateTask.cpp b/launcher/minecraft/ComponentUpdateTask.cpp
index 241d9a49..241d9a49 100644
--- a/api/logic/minecraft/ComponentUpdateTask.cpp
+++ b/launcher/minecraft/ComponentUpdateTask.cpp
diff --git a/api/logic/minecraft/ComponentUpdateTask.h b/launcher/minecraft/ComponentUpdateTask.h
index 4274cabb..4274cabb 100644
--- a/api/logic/minecraft/ComponentUpdateTask.h
+++ b/launcher/minecraft/ComponentUpdateTask.h
diff --git a/api/logic/minecraft/ComponentUpdateTask_p.h b/launcher/minecraft/ComponentUpdateTask_p.h
index 5b02431b..5b02431b 100644
--- a/api/logic/minecraft/ComponentUpdateTask_p.h
+++ b/launcher/minecraft/ComponentUpdateTask_p.h
diff --git a/api/logic/minecraft/GradleSpecifier.h b/launcher/minecraft/GradleSpecifier.h
index 60e0a726..60e0a726 100644
--- a/api/logic/minecraft/GradleSpecifier.h
+++ b/launcher/minecraft/GradleSpecifier.h
diff --git a/api/logic/minecraft/GradleSpecifier_test.cpp b/launcher/minecraft/GradleSpecifier_test.cpp
index 0900c9d8..0900c9d8 100644
--- a/api/logic/minecraft/GradleSpecifier_test.cpp
+++ b/launcher/minecraft/GradleSpecifier_test.cpp
diff --git a/api/logic/minecraft/LaunchProfile.cpp b/launcher/minecraft/LaunchProfile.cpp
index 41705187..41705187 100644
--- a/api/logic/minecraft/LaunchProfile.cpp
+++ b/launcher/minecraft/LaunchProfile.cpp
diff --git a/api/logic/minecraft/LaunchProfile.h b/launcher/minecraft/LaunchProfile.h
index c1752531..c1752531 100644
--- a/api/logic/minecraft/LaunchProfile.h
+++ b/launcher/minecraft/LaunchProfile.h
diff --git a/api/logic/minecraft/Library.cpp b/launcher/minecraft/Library.cpp
index f2293679..f2293679 100644
--- a/api/logic/minecraft/Library.cpp
+++ b/launcher/minecraft/Library.cpp
diff --git a/api/logic/minecraft/Library.h b/launcher/minecraft/Library.h
index acdd6c9c..119b4a86 100644
--- a/api/logic/minecraft/Library.h
+++ b/launcher/minecraft/Library.h
@@ -14,14 +14,12 @@
 #include "GradleSpecifier.h"
 #include "MojangDownloadInfo.h"
 
-#include "multimc_logic_export.h"
-
 class Library;
 class MinecraftInstance;
 
 typedef std::shared_ptr<Library> LibraryPtr;
 
-class MULTIMC_LOGIC_EXPORT Library
+class Library
 {
     friend class OneSixVersionFormat;
     friend class MojangVersionFormat;
diff --git a/api/logic/minecraft/Library_test.cpp b/launcher/minecraft/Library_test.cpp
index 75bb4db1..75bb4db1 100644
--- a/api/logic/minecraft/Library_test.cpp
+++ b/launcher/minecraft/Library_test.cpp
diff --git a/api/logic/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index dbf9f816..dbf9f816 100644
--- a/api/logic/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
diff --git a/api/logic/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h
index 05600797..b55a2776 100644
--- a/api/logic/minecraft/MinecraftInstance.h
+++ b/launcher/minecraft/MinecraftInstance.h
@@ -4,7 +4,6 @@
 #include "minecraft/mod/Mod.h"
 #include <QProcess>
 #include <QDir>
-#include "multimc_logic_export.h"
 #include "minecraft/launch/MinecraftServerTarget.h"
 
 class ModFolderModel;
@@ -13,7 +12,7 @@ class GameOptions;
 class LaunchStep;
 class PackProfile;
 
-class MULTIMC_LOGIC_EXPORT MinecraftInstance: public BaseInstance
+class MinecraftInstance: public BaseInstance
 {
     Q_OBJECT
 public:
diff --git a/api/logic/minecraft/MinecraftLoadAndCheck.cpp b/launcher/minecraft/MinecraftLoadAndCheck.cpp
index 79b0c484..79b0c484 100644
--- a/api/logic/minecraft/MinecraftLoadAndCheck.cpp
+++ b/launcher/minecraft/MinecraftLoadAndCheck.cpp
diff --git a/api/logic/minecraft/MinecraftLoadAndCheck.h b/launcher/minecraft/MinecraftLoadAndCheck.h
index 3435b52b..3435b52b 100644
--- a/api/logic/minecraft/MinecraftLoadAndCheck.h
+++ b/launcher/minecraft/MinecraftLoadAndCheck.h
diff --git a/api/logic/minecraft/MinecraftUpdate.cpp b/launcher/minecraft/MinecraftUpdate.cpp
index 8f1565b0..8f1565b0 100644
--- a/api/logic/minecraft/MinecraftUpdate.cpp
+++ b/launcher/minecraft/MinecraftUpdate.cpp
diff --git a/api/logic/minecraft/MinecraftUpdate.h b/launcher/minecraft/MinecraftUpdate.h
index fadebff9..fadebff9 100644
--- a/api/logic/minecraft/MinecraftUpdate.h
+++ b/launcher/minecraft/MinecraftUpdate.h
diff --git a/api/logic/minecraft/MojangDownloadInfo.h b/launcher/minecraft/MojangDownloadInfo.h
index 88f87287..88f87287 100644
--- a/api/logic/minecraft/MojangDownloadInfo.h
+++ b/launcher/minecraft/MojangDownloadInfo.h
diff --git a/api/logic/minecraft/MojangVersionFormat.cpp b/launcher/minecraft/MojangVersionFormat.cpp
index f9cb2228..f9cb2228 100644
--- a/api/logic/minecraft/MojangVersionFormat.cpp
+++ b/launcher/minecraft/MojangVersionFormat.cpp
diff --git a/api/logic/minecraft/MojangVersionFormat.h b/launcher/minecraft/MojangVersionFormat.h
index 2871dae4..d38f0a2f 100644
--- a/api/logic/minecraft/MojangVersionFormat.h
+++ b/launcher/minecraft/MojangVersionFormat.h
@@ -5,9 +5,7 @@
 #include <QJsonDocument>
 #include <ProblemProvider.h>
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT MojangVersionFormat
+class MojangVersionFormat
 {
 friend class OneSixVersionFormat;
 protected:
diff --git a/api/logic/minecraft/MojangVersionFormat_test.cpp b/launcher/minecraft/MojangVersionFormat_test.cpp
index 9d095340..9d095340 100644
--- a/api/logic/minecraft/MojangVersionFormat_test.cpp
+++ b/launcher/minecraft/MojangVersionFormat_test.cpp
diff --git a/api/logic/minecraft/OneSixVersionFormat.cpp b/launcher/minecraft/OneSixVersionFormat.cpp
index 0329d70e..0329d70e 100644
--- a/api/logic/minecraft/OneSixVersionFormat.cpp
+++ b/launcher/minecraft/OneSixVersionFormat.cpp
diff --git a/api/logic/minecraft/OneSixVersionFormat.h b/launcher/minecraft/OneSixVersionFormat.h
index 1a091d88..1a091d88 100644
--- a/api/logic/minecraft/OneSixVersionFormat.h
+++ b/launcher/minecraft/OneSixVersionFormat.h
diff --git a/api/logic/minecraft/OpSys.cpp b/launcher/minecraft/OpSys.cpp
index f6a4ed1c..f6a4ed1c 100644
--- a/api/logic/minecraft/OpSys.cpp
+++ b/launcher/minecraft/OpSys.cpp
diff --git a/api/logic/minecraft/OpSys.h b/launcher/minecraft/OpSys.h
index 63c750b1..63c750b1 100644
--- a/api/logic/minecraft/OpSys.h
+++ b/launcher/minecraft/OpSys.h
diff --git a/api/logic/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp
index f6918116..f6918116 100644
--- a/api/logic/minecraft/PackProfile.cpp
+++ b/launcher/minecraft/PackProfile.cpp
diff --git a/api/logic/minecraft/PackProfile.h b/launcher/minecraft/PackProfile.h
index e55e6a58..3d6cc6c3 100644
--- a/api/logic/minecraft/PackProfile.h
+++ b/launcher/minecraft/PackProfile.h
@@ -27,14 +27,13 @@
 #include "ProfileUtils.h"
 #include "BaseVersion.h"
 #include "MojangDownloadInfo.h"
-#include "multimc_logic_export.h"
 #include "net/Mode.h"
 
 class MinecraftInstance;
 struct PackProfileData;
 class ComponentUpdateTask;
 
-class MULTIMC_LOGIC_EXPORT PackProfile : public QAbstractListModel
+class PackProfile : public QAbstractListModel
 {
     Q_OBJECT
     friend ComponentUpdateTask;
diff --git a/api/logic/minecraft/PackProfile_p.h b/launcher/minecraft/PackProfile_p.h
index 6cd2a4e5..6cd2a4e5 100644
--- a/api/logic/minecraft/PackProfile_p.h
+++ b/launcher/minecraft/PackProfile_p.h
diff --git a/api/logic/minecraft/ParseUtils.cpp b/launcher/minecraft/ParseUtils.cpp
index c9640e77..c9640e77 100644
--- a/api/logic/minecraft/ParseUtils.cpp
+++ b/launcher/minecraft/ParseUtils.cpp
diff --git a/api/logic/minecraft/ParseUtils.h b/launcher/minecraft/ParseUtils.h
index 2b367a10..aad82748 100644
--- a/api/logic/minecraft/ParseUtils.h
+++ b/launcher/minecraft/ParseUtils.h
@@ -2,10 +2,8 @@
 #include <QString>
 #include <QDateTime>
 
-#include "multimc_logic_export.h"
-
 /// take the timestamp used by S3 and turn it into QDateTime
-MULTIMC_LOGIC_EXPORT QDateTime timeFromS3Time(QString str);
+QDateTime timeFromS3Time(QString str);
 
 /// take a timestamp and convert it into an S3 timestamp
-MULTIMC_LOGIC_EXPORT QString timeToS3Time(QDateTime);
+QString timeToS3Time(QDateTime);
diff --git a/api/logic/minecraft/ParseUtils_test.cpp b/launcher/minecraft/ParseUtils_test.cpp
index fcc137e5..fcc137e5 100644
--- a/api/logic/minecraft/ParseUtils_test.cpp
+++ b/launcher/minecraft/ParseUtils_test.cpp
diff --git a/api/logic/minecraft/ProfileUtils.cpp b/launcher/minecraft/ProfileUtils.cpp
index 8ca24cc8..8ca24cc8 100644
--- a/api/logic/minecraft/ProfileUtils.cpp
+++ b/launcher/minecraft/ProfileUtils.cpp
diff --git a/api/logic/minecraft/ProfileUtils.h b/launcher/minecraft/ProfileUtils.h
index 351c36cb..351c36cb 100644
--- a/api/logic/minecraft/ProfileUtils.h
+++ b/launcher/minecraft/ProfileUtils.h
diff --git a/api/logic/minecraft/Rule.cpp b/launcher/minecraft/Rule.cpp
index af2861e3..af2861e3 100644
--- a/api/logic/minecraft/Rule.cpp
+++ b/launcher/minecraft/Rule.cpp
diff --git a/api/logic/minecraft/Rule.h b/launcher/minecraft/Rule.h
index 7aa34d96..7aa34d96 100644
--- a/api/logic/minecraft/Rule.h
+++ b/launcher/minecraft/Rule.h
diff --git a/api/logic/minecraft/VersionFile.cpp b/launcher/minecraft/VersionFile.cpp
index d0a1a507..d0a1a507 100644
--- a/api/logic/minecraft/VersionFile.cpp
+++ b/launcher/minecraft/VersionFile.cpp
diff --git a/api/logic/minecraft/VersionFile.h b/launcher/minecraft/VersionFile.h
index b79fcd4f..b79fcd4f 100644
--- a/api/logic/minecraft/VersionFile.h
+++ b/launcher/minecraft/VersionFile.h
diff --git a/api/logic/minecraft/VersionFilterData.cpp b/launcher/minecraft/VersionFilterData.cpp
index 38e7b60c..38e7b60c 100644
--- a/api/logic/minecraft/VersionFilterData.cpp
+++ b/launcher/minecraft/VersionFilterData.cpp
diff --git a/api/logic/minecraft/VersionFilterData.h b/launcher/minecraft/VersionFilterData.h
index d100acc3..79756c3f 100644
--- a/api/logic/minecraft/VersionFilterData.h
+++ b/launcher/minecraft/VersionFilterData.h
@@ -4,8 +4,6 @@
 #include <QSet>
 #include <QDateTime>
 
-#include "multimc_logic_export.h"
-
 struct FMLlib
 {
     QString filename;
@@ -28,4 +26,4 @@ struct VersionFilterData
     // release data of first version to require Java 16 (21w19a)
     QDateTime java16BeginsDate;
 };
-extern VersionFilterData MULTIMC_LOGIC_EXPORT g_VersionFilterData;
+extern VersionFilterData g_VersionFilterData;
diff --git a/api/logic/minecraft/World.cpp b/launcher/minecraft/World.cpp
index a2b4dac7..a2b4dac7 100644
--- a/api/logic/minecraft/World.cpp
+++ b/launcher/minecraft/World.cpp
diff --git a/api/logic/minecraft/World.h b/launcher/minecraft/World.h
index 1d94d54d..35e32788 100644
--- a/api/logic/minecraft/World.h
+++ b/launcher/minecraft/World.h
@@ -18,9 +18,7 @@
 #include <QDateTime>
 #include <nonstd/optional>
 
-#include "multimc_logic_export.h"
-
-struct MULTIMC_LOGIC_EXPORT GameType {
+struct GameType {
     GameType() = default;
     GameType (nonstd::optional<int> original);
 
@@ -38,7 +36,7 @@ struct MULTIMC_LOGIC_EXPORT GameType {
     nonstd::optional<int> original;
 };
 
-class MULTIMC_LOGIC_EXPORT World
+class World
 {
 public:
     World(const QFileInfo &file);
diff --git a/api/logic/minecraft/WorldList.cpp b/launcher/minecraft/WorldList.cpp
index f6309dbd..f6309dbd 100644
--- a/api/logic/minecraft/WorldList.cpp
+++ b/launcher/minecraft/WorldList.cpp
diff --git a/api/logic/minecraft/WorldList.h b/launcher/minecraft/WorldList.h
index 740b1461..8e238ee3 100644
--- a/api/logic/minecraft/WorldList.h
+++ b/launcher/minecraft/WorldList.h
@@ -22,11 +22,9 @@
 #include <QMimeData>
 #include "minecraft/World.h"
 
-#include "multimc_logic_export.h"
-
 class QFileSystemWatcher;
 
-class MULTIMC_LOGIC_EXPORT WorldList : public QAbstractListModel
+class WorldList : public QAbstractListModel
 {
     Q_OBJECT
 public:
diff --git a/api/logic/minecraft/auth-msa/BuildConfig.cpp.in b/launcher/minecraft/auth-msa/BuildConfig.cpp.in
index 8f470e25..8f470e25 100644
--- a/api/logic/minecraft/auth-msa/BuildConfig.cpp.in
+++ b/launcher/minecraft/auth-msa/BuildConfig.cpp.in
diff --git a/api/logic/minecraft/auth-msa/BuildConfig.h b/launcher/minecraft/auth-msa/BuildConfig.h
index 7a01d704..7a01d704 100644
--- a/api/logic/minecraft/auth-msa/BuildConfig.h
+++ b/launcher/minecraft/auth-msa/BuildConfig.h
diff --git a/api/logic/minecraft/auth-msa/CMakeLists.txt b/launcher/minecraft/auth-msa/CMakeLists.txt
index 22777d1b..22777d1b 100644
--- a/api/logic/minecraft/auth-msa/CMakeLists.txt
+++ b/launcher/minecraft/auth-msa/CMakeLists.txt
diff --git a/api/logic/minecraft/auth-msa/context.cpp b/launcher/minecraft/auth-msa/context.cpp
index d7ecda30..d7ecda30 100644
--- a/api/logic/minecraft/auth-msa/context.cpp
+++ b/launcher/minecraft/auth-msa/context.cpp
diff --git a/api/logic/minecraft/auth-msa/context.h b/launcher/minecraft/auth-msa/context.h
index f1ac99b8..f1ac99b8 100644
--- a/api/logic/minecraft/auth-msa/context.h
+++ b/launcher/minecraft/auth-msa/context.h
diff --git a/api/logic/minecraft/auth-msa/main.cpp b/launcher/minecraft/auth-msa/main.cpp
index 481e0126..481e0126 100644
--- a/api/logic/minecraft/auth-msa/main.cpp
+++ b/launcher/minecraft/auth-msa/main.cpp
diff --git a/api/logic/minecraft/auth-msa/mainwindow.cpp b/launcher/minecraft/auth-msa/mainwindow.cpp
index d4e18dc0..d4e18dc0 100644
--- a/api/logic/minecraft/auth-msa/mainwindow.cpp
+++ b/launcher/minecraft/auth-msa/mainwindow.cpp
diff --git a/api/logic/minecraft/auth-msa/mainwindow.h b/launcher/minecraft/auth-msa/mainwindow.h
index abde52d8..abde52d8 100644
--- a/api/logic/minecraft/auth-msa/mainwindow.h
+++ b/launcher/minecraft/auth-msa/mainwindow.h
diff --git a/api/logic/minecraft/auth-msa/mainwindow.ui b/launcher/minecraft/auth-msa/mainwindow.ui
index 32b34128..32b34128 100644
--- a/api/logic/minecraft/auth-msa/mainwindow.ui
+++ b/launcher/minecraft/auth-msa/mainwindow.ui
diff --git a/api/logic/minecraft/auth/AuthSession.cpp b/launcher/minecraft/auth/AuthSession.cpp
index 4e858796..4e858796 100644
--- a/api/logic/minecraft/auth/AuthSession.cpp
+++ b/launcher/minecraft/auth/AuthSession.cpp
diff --git a/api/logic/minecraft/auth/AuthSession.h b/launcher/minecraft/auth/AuthSession.h
index b397d9a1..29958597 100644
--- a/api/logic/minecraft/auth/AuthSession.h
+++ b/launcher/minecraft/auth/AuthSession.h
@@ -4,8 +4,6 @@
 #include <QMultiMap>
 #include <memory>
 
-#include "multimc_logic_export.h"
-
 class MojangAccount;
 
 struct User
@@ -14,7 +12,7 @@ struct User
     QMultiMap<QString, QString> properties;
 };
 
-struct MULTIMC_LOGIC_EXPORT AuthSession
+struct AuthSession
 {
     bool MakeOffline(QString offline_playername);
 
diff --git a/api/logic/minecraft/auth/MojangAccount.cpp b/launcher/minecraft/auth/MojangAccount.cpp
index f5853fe3..f5853fe3 100644
--- a/api/logic/minecraft/auth/MojangAccount.cpp
+++ b/launcher/minecraft/auth/MojangAccount.cpp
diff --git a/api/logic/minecraft/auth/MojangAccount.h b/launcher/minecraft/auth/MojangAccount.h
index 30a5f2ff..3f6cbedd 100644
--- a/api/logic/minecraft/auth/MojangAccount.h
+++ b/launcher/minecraft/auth/MojangAccount.h
@@ -26,8 +26,6 @@
 #include "AuthSession.h"
 #include "Usable.h"
 
-#include "multimc_logic_export.h"
-
 class Task;
 class YggdrasilTask;
 class MojangAccount;
@@ -61,7 +59,7 @@ enum AccountStatus
  * Said information may include things such as that account's username, client token, and access
  * token if the user chose to stay logged in.
  */
-class MULTIMC_LOGIC_EXPORT MojangAccount :
+class MojangAccount :
     public QObject,
     public Usable,
     public std::enable_shared_from_this<MojangAccount>
diff --git a/api/logic/minecraft/auth/MojangAccountList.cpp b/launcher/minecraft/auth/MojangAccountList.cpp
index e584cb3b..e584cb3b 100644
--- a/api/logic/minecraft/auth/MojangAccountList.cpp
+++ b/launcher/minecraft/auth/MojangAccountList.cpp
diff --git a/api/logic/minecraft/auth/MojangAccountList.h b/launcher/minecraft/auth/MojangAccountList.h
index cc3a61a2..99d2988e 100644
--- a/api/logic/minecraft/auth/MojangAccountList.h
+++ b/launcher/minecraft/auth/MojangAccountList.h
@@ -22,8 +22,6 @@
 #include <QAbstractListModel>
 #include <QSharedPointer>
 
-#include "multimc_logic_export.h"
-
 /*!
  * \brief List of available Mojang accounts.
  * This should be loaded in the background by MultiMC on startup.
@@ -33,7 +31,7 @@
  * all have a default implementation, but they can be overridden by subclasses to
  * change the behavior of the list.
  */
-class MULTIMC_LOGIC_EXPORT MojangAccountList : public QAbstractListModel
+class MojangAccountList : public QAbstractListModel
 {
     Q_OBJECT
 public:
diff --git a/api/logic/minecraft/auth/YggdrasilTask.cpp b/launcher/minecraft/auth/YggdrasilTask.cpp
index 0857b46b..0857b46b 100644
--- a/api/logic/minecraft/auth/YggdrasilTask.cpp
+++ b/launcher/minecraft/auth/YggdrasilTask.cpp
diff --git a/api/logic/minecraft/auth/YggdrasilTask.h b/launcher/minecraft/auth/YggdrasilTask.h
index 8af2e132..8af2e132 100644
--- a/api/logic/minecraft/auth/YggdrasilTask.h
+++ b/launcher/minecraft/auth/YggdrasilTask.h
diff --git a/api/logic/minecraft/auth/flows/AuthenticateTask.cpp b/launcher/minecraft/auth/flows/AuthenticateTask.cpp
index 2e8dc859..2e8dc859 100644
--- a/api/logic/minecraft/auth/flows/AuthenticateTask.cpp
+++ b/launcher/minecraft/auth/flows/AuthenticateTask.cpp
diff --git a/api/logic/minecraft/auth/flows/AuthenticateTask.h b/launcher/minecraft/auth/flows/AuthenticateTask.h
index 4c14eec7..4c14eec7 100644
--- a/api/logic/minecraft/auth/flows/AuthenticateTask.h
+++ b/launcher/minecraft/auth/flows/AuthenticateTask.h
diff --git a/api/logic/minecraft/auth/flows/RefreshTask.cpp b/launcher/minecraft/auth/flows/RefreshTask.cpp
index ecba178d..ecba178d 100644
--- a/api/logic/minecraft/auth/flows/RefreshTask.cpp
+++ b/launcher/minecraft/auth/flows/RefreshTask.cpp
diff --git a/api/logic/minecraft/auth/flows/RefreshTask.h b/launcher/minecraft/auth/flows/RefreshTask.h
index f0840dda..f0840dda 100644
--- a/api/logic/minecraft/auth/flows/RefreshTask.h
+++ b/launcher/minecraft/auth/flows/RefreshTask.h
diff --git a/api/logic/minecraft/auth/flows/ValidateTask.cpp b/launcher/minecraft/auth/flows/ValidateTask.cpp
index 6b3f0a65..6b3f0a65 100644
--- a/api/logic/minecraft/auth/flows/ValidateTask.cpp
+++ b/launcher/minecraft/auth/flows/ValidateTask.cpp
diff --git a/api/logic/minecraft/auth/flows/ValidateTask.h b/launcher/minecraft/auth/flows/ValidateTask.h
index 986c2e9f..986c2e9f 100644
--- a/api/logic/minecraft/auth/flows/ValidateTask.h
+++ b/launcher/minecraft/auth/flows/ValidateTask.h
diff --git a/api/logic/minecraft/gameoptions/GameOptions.cpp b/launcher/minecraft/gameoptions/GameOptions.cpp
index e547b32a..e547b32a 100644
--- a/api/logic/minecraft/gameoptions/GameOptions.cpp
+++ b/launcher/minecraft/gameoptions/GameOptions.cpp
diff --git a/api/logic/minecraft/gameoptions/GameOptions.h b/launcher/minecraft/gameoptions/GameOptions.h
index c6d25492..c6d25492 100644
--- a/api/logic/minecraft/gameoptions/GameOptions.h
+++ b/launcher/minecraft/gameoptions/GameOptions.h
diff --git a/api/logic/minecraft/launch/ClaimAccount.cpp b/launcher/minecraft/launch/ClaimAccount.cpp
index a1180f0a..a1180f0a 100644
--- a/api/logic/minecraft/launch/ClaimAccount.cpp
+++ b/launcher/minecraft/launch/ClaimAccount.cpp
diff --git a/api/logic/minecraft/launch/ClaimAccount.h b/launcher/minecraft/launch/ClaimAccount.h
index c5bd75f3..c5bd75f3 100644
--- a/api/logic/minecraft/launch/ClaimAccount.h
+++ b/launcher/minecraft/launch/ClaimAccount.h
diff --git a/api/logic/minecraft/launch/CreateGameFolders.cpp b/launcher/minecraft/launch/CreateGameFolders.cpp
index 4081e72e..4081e72e 100644
--- a/api/logic/minecraft/launch/CreateGameFolders.cpp
+++ b/launcher/minecraft/launch/CreateGameFolders.cpp
diff --git a/api/logic/minecraft/launch/CreateGameFolders.h b/launcher/minecraft/launch/CreateGameFolders.h
index 9c7d3c94..9c7d3c94 100644
--- a/api/logic/minecraft/launch/CreateGameFolders.h
+++ b/launcher/minecraft/launch/CreateGameFolders.h
diff --git a/api/logic/minecraft/launch/DirectJavaLaunch.cpp b/launcher/minecraft/launch/DirectJavaLaunch.cpp
index 2110384f..2110384f 100644
--- a/api/logic/minecraft/launch/DirectJavaLaunch.cpp
+++ b/launcher/minecraft/launch/DirectJavaLaunch.cpp
diff --git a/api/logic/minecraft/launch/DirectJavaLaunch.h b/launcher/minecraft/launch/DirectJavaLaunch.h
index 58b119b8..58b119b8 100644
--- a/api/logic/minecraft/launch/DirectJavaLaunch.h
+++ b/launcher/minecraft/launch/DirectJavaLaunch.h
diff --git a/api/logic/minecraft/launch/ExtractNatives.cpp b/launcher/minecraft/launch/ExtractNatives.cpp
index d57499aa..d57499aa 100644
--- a/api/logic/minecraft/launch/ExtractNatives.cpp
+++ b/launcher/minecraft/launch/ExtractNatives.cpp
diff --git a/api/logic/minecraft/launch/ExtractNatives.h b/launcher/minecraft/launch/ExtractNatives.h
index 094fcd6b..094fcd6b 100644
--- a/api/logic/minecraft/launch/ExtractNatives.h
+++ b/launcher/minecraft/launch/ExtractNatives.h
diff --git a/api/logic/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp
index ee469770..ee469770 100644
--- a/api/logic/minecraft/launch/LauncherPartLaunch.cpp
+++ b/launcher/minecraft/launch/LauncherPartLaunch.cpp
diff --git a/api/logic/minecraft/launch/LauncherPartLaunch.h b/launcher/minecraft/launch/LauncherPartLaunch.h
index 6a7ee0e5..6a7ee0e5 100644
--- a/api/logic/minecraft/launch/LauncherPartLaunch.h
+++ b/launcher/minecraft/launch/LauncherPartLaunch.h
diff --git a/api/logic/minecraft/launch/MinecraftServerTarget.cpp b/launcher/minecraft/launch/MinecraftServerTarget.cpp
index 569273b6..569273b6 100644
--- a/api/logic/minecraft/launch/MinecraftServerTarget.cpp
+++ b/launcher/minecraft/launch/MinecraftServerTarget.cpp
diff --git a/api/logic/minecraft/launch/MinecraftServerTarget.h b/launcher/minecraft/launch/MinecraftServerTarget.h
index 3c5786f4..a402421a 100644
--- a/api/logic/minecraft/launch/MinecraftServerTarget.h
+++ b/launcher/minecraft/launch/MinecraftServerTarget.h
@@ -18,13 +18,12 @@
 #include <memory>
 
 #include <QString>
-#include <multimc_logic_export.h>
 
 struct MinecraftServerTarget {
     QString address;
     quint16 port;
 
-    static MULTIMC_LOGIC_EXPORT MinecraftServerTarget parse(const QString &fullAddress);
+    static MinecraftServerTarget parse(const QString &fullAddress);
 };
 
 typedef std::shared_ptr<MinecraftServerTarget> MinecraftServerTargetPtr;
diff --git a/api/logic/minecraft/launch/ModMinecraftJar.cpp b/launcher/minecraft/launch/ModMinecraftJar.cpp
index 93de9d59..93de9d59 100644
--- a/api/logic/minecraft/launch/ModMinecraftJar.cpp
+++ b/launcher/minecraft/launch/ModMinecraftJar.cpp
diff --git a/api/logic/minecraft/launch/ModMinecraftJar.h b/launcher/minecraft/launch/ModMinecraftJar.h
index 081c6a91..081c6a91 100644
--- a/api/logic/minecraft/launch/ModMinecraftJar.h
+++ b/launcher/minecraft/launch/ModMinecraftJar.h
diff --git a/api/logic/minecraft/launch/PrintInstanceInfo.cpp b/launcher/minecraft/launch/PrintInstanceInfo.cpp
index 0b9611ad..0b9611ad 100644
--- a/api/logic/minecraft/launch/PrintInstanceInfo.cpp
+++ b/launcher/minecraft/launch/PrintInstanceInfo.cpp
diff --git a/api/logic/minecraft/launch/PrintInstanceInfo.h b/launcher/minecraft/launch/PrintInstanceInfo.h
index fdc30f31..fdc30f31 100644
--- a/api/logic/minecraft/launch/PrintInstanceInfo.h
+++ b/launcher/minecraft/launch/PrintInstanceInfo.h
diff --git a/api/logic/minecraft/launch/ReconstructAssets.cpp b/launcher/minecraft/launch/ReconstructAssets.cpp
index 4d206665..4d206665 100644
--- a/api/logic/minecraft/launch/ReconstructAssets.cpp
+++ b/launcher/minecraft/launch/ReconstructAssets.cpp
diff --git a/api/logic/minecraft/launch/ReconstructAssets.h b/launcher/minecraft/launch/ReconstructAssets.h
index 58d7febd..58d7febd 100644
--- a/api/logic/minecraft/launch/ReconstructAssets.h
+++ b/launcher/minecraft/launch/ReconstructAssets.h
diff --git a/api/logic/minecraft/launch/ScanModFolders.cpp b/launcher/minecraft/launch/ScanModFolders.cpp
index 2a0e21b3..2a0e21b3 100644
--- a/api/logic/minecraft/launch/ScanModFolders.cpp
+++ b/launcher/minecraft/launch/ScanModFolders.cpp
diff --git a/api/logic/minecraft/launch/ScanModFolders.h b/launcher/minecraft/launch/ScanModFolders.h
index d5989170..d5989170 100644
--- a/api/logic/minecraft/launch/ScanModFolders.h
+++ b/launcher/minecraft/launch/ScanModFolders.h
diff --git a/api/logic/minecraft/launch/VerifyJavaInstall.cpp b/launcher/minecraft/launch/VerifyJavaInstall.cpp
index 657669af..657669af 100644
--- a/api/logic/minecraft/launch/VerifyJavaInstall.cpp
+++ b/launcher/minecraft/launch/VerifyJavaInstall.cpp
diff --git a/api/logic/minecraft/launch/VerifyJavaInstall.h b/launcher/minecraft/launch/VerifyJavaInstall.h
index a553106d..a553106d 100644
--- a/api/logic/minecraft/launch/VerifyJavaInstall.h
+++ b/launcher/minecraft/launch/VerifyJavaInstall.h
diff --git a/api/logic/minecraft/legacy/LegacyInstance.cpp b/launcher/minecraft/legacy/LegacyInstance.cpp
index 9f9bda5a..9f9bda5a 100644
--- a/api/logic/minecraft/legacy/LegacyInstance.cpp
+++ b/launcher/minecraft/legacy/LegacyInstance.cpp
diff --git a/api/logic/minecraft/legacy/LegacyInstance.h b/launcher/minecraft/legacy/LegacyInstance.h
index 325bac7a..ac2a8543 100644
--- a/api/logic/minecraft/legacy/LegacyInstance.h
+++ b/launcher/minecraft/legacy/LegacyInstance.h
@@ -18,8 +18,6 @@
 #include "BaseInstance.h"
 #include "launch/LaunchTask.h"
 
-#include "multimc_logic_export.h"
-
 class ModFolderModel;
 class LegacyModList;
 class WorldList;
@@ -27,7 +25,7 @@ class Task;
 /*
  * WHY: Legacy instances - from MultiMC 3 and 4 - are here only to provide a way to upgrade them to the current format.
  */
-class MULTIMC_LOGIC_EXPORT LegacyInstance : public BaseInstance
+class LegacyInstance : public BaseInstance
 {
     Q_OBJECT
 public:
diff --git a/api/logic/minecraft/legacy/LegacyModList.cpp b/launcher/minecraft/legacy/LegacyModList.cpp
index 7301eb8c..7301eb8c 100644
--- a/api/logic/minecraft/legacy/LegacyModList.cpp
+++ b/launcher/minecraft/legacy/LegacyModList.cpp
diff --git a/api/logic/minecraft/legacy/LegacyModList.h b/launcher/minecraft/legacy/LegacyModList.h
index 8881d471..fade736e 100644
--- a/api/logic/minecraft/legacy/LegacyModList.h
+++ b/launcher/minecraft/legacy/LegacyModList.h
@@ -19,9 +19,7 @@
 #include <QString>
 #include <QDir>
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT LegacyModList
+class LegacyModList
 {
 public:
 
diff --git a/api/logic/minecraft/legacy/LegacyUpgradeTask.cpp b/launcher/minecraft/legacy/LegacyUpgradeTask.cpp
index a4ea60cd..a4ea60cd 100644
--- a/api/logic/minecraft/legacy/LegacyUpgradeTask.cpp
+++ b/launcher/minecraft/legacy/LegacyUpgradeTask.cpp
diff --git a/api/logic/minecraft/legacy/LegacyUpgradeTask.h b/launcher/minecraft/legacy/LegacyUpgradeTask.h
index e35e43b7..542e17b8 100644
--- a/api/logic/minecraft/legacy/LegacyUpgradeTask.h
+++ b/launcher/minecraft/legacy/LegacyUpgradeTask.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "InstanceTask.h"
-#include "multimc_logic_export.h"
 #include "net/NetJob.h"
 #include <QUrl>
 #include <QFuture>
@@ -11,7 +10,7 @@
 #include "BaseInstance.h"
 
 
-class MULTIMC_LOGIC_EXPORT LegacyUpgradeTask : public InstanceTask
+class LegacyUpgradeTask : public InstanceTask
 {
     Q_OBJECT
 public:
diff --git a/api/logic/minecraft/mod/LocalModParseTask.cpp b/launcher/minecraft/mod/LocalModParseTask.cpp
index 0d6972fb..0d6972fb 100644
--- a/api/logic/minecraft/mod/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/LocalModParseTask.cpp
diff --git a/api/logic/minecraft/mod/LocalModParseTask.h b/launcher/minecraft/mod/LocalModParseTask.h
index 0f119ba6..0f119ba6 100644
--- a/api/logic/minecraft/mod/LocalModParseTask.h
+++ b/launcher/minecraft/mod/LocalModParseTask.h
diff --git a/api/logic/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index b6bff29b..b6bff29b 100644
--- a/api/logic/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
diff --git a/api/logic/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index f77ffd41..921faeb1 100644
--- a/api/logic/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -19,13 +19,11 @@
 #include <QList>
 #include <memory>
 
-#include "multimc_logic_export.h"
-
 #include "ModDetails.h"
 
 
 
-class MULTIMC_LOGIC_EXPORT Mod
+class Mod
 {
 public:
     enum ModType
diff --git a/api/logic/minecraft/mod/ModDetails.h b/launcher/minecraft/mod/ModDetails.h
index 6ab4aee7..6ab4aee7 100644
--- a/api/logic/minecraft/mod/ModDetails.h
+++ b/launcher/minecraft/mod/ModDetails.h
diff --git a/api/logic/minecraft/mod/ModFolderLoadTask.cpp b/launcher/minecraft/mod/ModFolderLoadTask.cpp
index 88349877..88349877 100644
--- a/api/logic/minecraft/mod/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/ModFolderLoadTask.cpp
diff --git a/api/logic/minecraft/mod/ModFolderLoadTask.h b/launcher/minecraft/mod/ModFolderLoadTask.h
index 8d720e65..8d720e65 100644
--- a/api/logic/minecraft/mod/ModFolderLoadTask.h
+++ b/launcher/minecraft/mod/ModFolderLoadTask.h
diff --git a/api/logic/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index 031eebe5..031eebe5 100644
--- a/api/logic/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
diff --git a/api/logic/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h
index b0a76121..62c504df 100644
--- a/api/logic/minecraft/mod/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@@ -24,7 +24,6 @@
 
 #include "Mod.h"
 
-#include "multimc_logic_export.h"
 #include "ModFolderLoadTask.h"
 #include "LocalModParseTask.h"
 
@@ -36,7 +35,7 @@ class QFileSystemWatcher;
  * A legacy mod list.
  * Backed by a folder.
  */
-class MULTIMC_LOGIC_EXPORT ModFolderModel : public QAbstractListModel
+class ModFolderModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
diff --git a/api/logic/minecraft/mod/ModFolderModel_test.cpp b/launcher/minecraft/mod/ModFolderModel_test.cpp
index 76f16ed5..76f16ed5 100644
--- a/api/logic/minecraft/mod/ModFolderModel_test.cpp
+++ b/launcher/minecraft/mod/ModFolderModel_test.cpp
diff --git a/api/logic/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
index f3d7f566..f3d7f566 100644
--- a/api/logic/minecraft/mod/ResourcePackFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
diff --git a/api/logic/minecraft/mod/ResourcePackFolderModel.h b/launcher/minecraft/mod/ResourcePackFolderModel.h
index 47eb4bb2..0cd6214b 100644
--- a/api/logic/minecraft/mod/ResourcePackFolderModel.h
+++ b/launcher/minecraft/mod/ResourcePackFolderModel.h
@@ -2,7 +2,7 @@
 
 #include "ModFolderModel.h"
 
-class MULTIMC_LOGIC_EXPORT ResourcePackFolderModel : public ModFolderModel
+class ResourcePackFolderModel : public ModFolderModel
 {
     Q_OBJECT
 
diff --git a/api/logic/minecraft/mod/TexturePackFolderModel.cpp b/launcher/minecraft/mod/TexturePackFolderModel.cpp
index d5956da1..d5956da1 100644
--- a/api/logic/minecraft/mod/TexturePackFolderModel.cpp
+++ b/launcher/minecraft/mod/TexturePackFolderModel.cpp
diff --git a/api/logic/minecraft/mod/TexturePackFolderModel.h b/launcher/minecraft/mod/TexturePackFolderModel.h
index d773b17b..a59d5119 100644
--- a/api/logic/minecraft/mod/TexturePackFolderModel.h
+++ b/launcher/minecraft/mod/TexturePackFolderModel.h
@@ -2,7 +2,7 @@
 
 #include "ModFolderModel.h"
 
-class MULTIMC_LOGIC_EXPORT TexturePackFolderModel : public ModFolderModel
+class TexturePackFolderModel : public ModFolderModel
 {
     Q_OBJECT
 
diff --git a/api/logic/minecraft/services/SkinDelete.cpp b/launcher/minecraft/services/SkinDelete.cpp
index 34977257..34977257 100644
--- a/api/logic/minecraft/services/SkinDelete.cpp
+++ b/launcher/minecraft/services/SkinDelete.cpp
diff --git a/api/logic/minecraft/services/SkinDelete.h b/launcher/minecraft/services/SkinDelete.h
index 705ce8ef..839bf9bc 100644
--- a/api/logic/minecraft/services/SkinDelete.h
+++ b/launcher/minecraft/services/SkinDelete.h
@@ -5,11 +5,10 @@
 #include <memory>
 #include <minecraft/auth/AuthSession.h>
 #include "tasks/Task.h"
-#include "multimc_logic_export.h"
 
 typedef std::shared_ptr<class SkinDelete> SkinDeletePtr;
 
-class MULTIMC_LOGIC_EXPORT SkinDelete : public Task
+class SkinDelete : public Task
 {
     Q_OBJECT
 public:
diff --git a/api/logic/minecraft/services/SkinUpload.cpp b/launcher/minecraft/services/SkinUpload.cpp
index 4e5a1698..4e5a1698 100644
--- a/api/logic/minecraft/services/SkinUpload.cpp
+++ b/launcher/minecraft/services/SkinUpload.cpp
diff --git a/api/logic/minecraft/services/SkinUpload.h b/launcher/minecraft/services/SkinUpload.h
index c77abb03..ec859699 100644
--- a/api/logic/minecraft/services/SkinUpload.h
+++ b/launcher/minecraft/services/SkinUpload.h
@@ -5,11 +5,10 @@
 #include <memory>
 #include <minecraft/auth/AuthSession.h>
 #include "tasks/Task.h"
-#include "multimc_logic_export.h"
 
 typedef std::shared_ptr<class SkinUpload> SkinUploadPtr;
 
-class MULTIMC_LOGIC_EXPORT SkinUpload : public Task
+class SkinUpload : public Task
 {
     Q_OBJECT
 public:
diff --git a/api/logic/minecraft/testdata/1.9-simple.json b/launcher/minecraft/testdata/1.9-simple.json
index 574c5b06..574c5b06 100644
--- a/api/logic/minecraft/testdata/1.9-simple.json
+++ b/launcher/minecraft/testdata/1.9-simple.json
diff --git a/api/logic/minecraft/testdata/1.9.json b/launcher/minecraft/testdata/1.9.json
index 697c6059..697c6059 100644
--- a/api/logic/minecraft/testdata/1.9.json
+++ b/launcher/minecraft/testdata/1.9.json
diff --git a/api/logic/minecraft/testdata/codecwav-20101023.jar b/launcher/minecraft/testdata/codecwav-20101023.jar
index f5236083..f5236083 100644
--- a/api/logic/minecraft/testdata/codecwav-20101023.jar
+++ b/launcher/minecraft/testdata/codecwav-20101023.jar
diff --git a/api/logic/minecraft/testdata/lib-native-arch.json b/launcher/minecraft/testdata/lib-native-arch.json
index 501826ae..501826ae 100644
--- a/api/logic/minecraft/testdata/lib-native-arch.json
+++ b/launcher/minecraft/testdata/lib-native-arch.json
diff --git a/api/logic/minecraft/testdata/lib-native.json b/launcher/minecraft/testdata/lib-native.json
index 5b9f3b55..5b9f3b55 100644
--- a/api/logic/minecraft/testdata/lib-native.json
+++ b/launcher/minecraft/testdata/lib-native.json
diff --git a/api/logic/minecraft/testdata/lib-simple.json b/launcher/minecraft/testdata/lib-simple.json
index 90bbff07..90bbff07 100644
--- a/api/logic/minecraft/testdata/lib-simple.json
+++ b/launcher/minecraft/testdata/lib-simple.json
diff --git a/api/logic/minecraft/testdata/testname-testversion-linux-32.jar b/launcher/minecraft/testdata/testname-testversion-linux-32.jar
index f5236083..f5236083 100644
--- a/api/logic/minecraft/testdata/testname-testversion-linux-32.jar
+++ b/launcher/minecraft/testdata/testname-testversion-linux-32.jar
diff --git a/api/logic/minecraft/update/AssetUpdateTask.cpp b/launcher/minecraft/update/AssetUpdateTask.cpp
index e26ab4ef..e26ab4ef 100644
--- a/api/logic/minecraft/update/AssetUpdateTask.cpp
+++ b/launcher/minecraft/update/AssetUpdateTask.cpp
diff --git a/api/logic/minecraft/update/AssetUpdateTask.h b/launcher/minecraft/update/AssetUpdateTask.h
index fdfa8f1c..fdfa8f1c 100644
--- a/api/logic/minecraft/update/AssetUpdateTask.h
+++ b/launcher/minecraft/update/AssetUpdateTask.h
diff --git a/api/logic/minecraft/update/FMLLibrariesTask.cpp b/launcher/minecraft/update/FMLLibrariesTask.cpp
index a05a7c2a..a05a7c2a 100644
--- a/api/logic/minecraft/update/FMLLibrariesTask.cpp
+++ b/launcher/minecraft/update/FMLLibrariesTask.cpp
diff --git a/api/logic/minecraft/update/FMLLibrariesTask.h b/launcher/minecraft/update/FMLLibrariesTask.h
index a1e70ed4..a1e70ed4 100644
--- a/api/logic/minecraft/update/FMLLibrariesTask.h
+++ b/launcher/minecraft/update/FMLLibrariesTask.h
diff --git a/api/logic/minecraft/update/FoldersTask.cpp b/launcher/minecraft/update/FoldersTask.cpp
index e2b1bb48..e2b1bb48 100644
--- a/api/logic/minecraft/update/FoldersTask.cpp
+++ b/launcher/minecraft/update/FoldersTask.cpp
diff --git a/api/logic/minecraft/update/FoldersTask.h b/launcher/minecraft/update/FoldersTask.h
index f6ed5e6d..f6ed5e6d 100644
--- a/api/logic/minecraft/update/FoldersTask.h
+++ b/launcher/minecraft/update/FoldersTask.h
diff --git a/api/logic/minecraft/update/LibrariesTask.cpp b/launcher/minecraft/update/LibrariesTask.cpp
index 7f66a651..7f66a651 100644
--- a/api/logic/minecraft/update/LibrariesTask.cpp
+++ b/launcher/minecraft/update/LibrariesTask.cpp
diff --git a/api/logic/minecraft/update/LibrariesTask.h b/launcher/minecraft/update/LibrariesTask.h
index 49f76932..49f76932 100644
--- a/api/logic/minecraft/update/LibrariesTask.h
+++ b/launcher/minecraft/update/LibrariesTask.h
diff --git a/api/logic/modplatform/atlauncher/ATLPackIndex.cpp b/launcher/modplatform/atlauncher/ATLPackIndex.cpp
index 35f50b18..35f50b18 100644
--- a/api/logic/modplatform/atlauncher/ATLPackIndex.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackIndex.cpp
diff --git a/api/logic/modplatform/atlauncher/ATLPackIndex.h b/launcher/modplatform/atlauncher/ATLPackIndex.h
index 5e2e6487..405a3448 100644
--- a/api/logic/modplatform/atlauncher/ATLPackIndex.h
+++ b/launcher/modplatform/atlauncher/ATLPackIndex.h
@@ -6,8 +6,6 @@
 #include <QVector>
 #include <QMetaType>
 
-#include "multimc_logic_export.h"
-
 namespace ATLauncher
 {
 
@@ -30,7 +28,7 @@ struct IndexedPack
     QString safeName;
 };
 
-MULTIMC_LOGIC_EXPORT void loadIndexedPack(IndexedPack & m, QJsonObject & obj);
+void loadIndexedPack(IndexedPack & m, QJsonObject & obj);
 }
 
 Q_DECLARE_METATYPE(ATLauncher::IndexedPack)
diff --git a/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
index 55087a27..55087a27 100644
--- a/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp
diff --git a/api/logic/modplatform/atlauncher/ATLPackInstallTask.h b/launcher/modplatform/atlauncher/ATLPackInstallTask.h
index 15fd9b32..39e2b013 100644
--- a/api/logic/modplatform/atlauncher/ATLPackInstallTask.h
+++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.h
@@ -4,7 +4,6 @@
 #include "ATLPackManifest.h"
 
 #include "InstanceTask.h"
-#include "multimc_logic_export.h"
 #include "net/NetJob.h"
 #include "settings/INISettingsObject.h"
 #include "minecraft/MinecraftInstance.h"
@@ -15,7 +14,7 @@
 
 namespace ATLauncher {
 
-class MULTIMC_LOGIC_EXPORT UserInteractionSupport {
+class UserInteractionSupport {
 
 public:
     /**
@@ -31,7 +30,7 @@ public:
 
 };
 
-class MULTIMC_LOGIC_EXPORT PackInstallTask : public InstanceTask
+class PackInstallTask : public InstanceTask
 {
 Q_OBJECT
 
diff --git a/api/logic/modplatform/atlauncher/ATLPackManifest.cpp b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
index e25d8346..e25d8346 100644
--- a/api/logic/modplatform/atlauncher/ATLPackManifest.cpp
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.cpp
diff --git a/api/logic/modplatform/atlauncher/ATLPackManifest.h b/launcher/modplatform/atlauncher/ATLPackManifest.h
index 17821e4c..ead216a5 100644
--- a/api/logic/modplatform/atlauncher/ATLPackManifest.h
+++ b/launcher/modplatform/atlauncher/ATLPackManifest.h
@@ -3,7 +3,6 @@
 #include <QString>
 #include <QVector>
 #include <QJsonObject>
-#include <multimc_logic_export.h>
 
 namespace ATLauncher
 {
@@ -121,6 +120,6 @@ struct PackVersion
     VersionConfigs configs;
 };
 
-MULTIMC_LOGIC_EXPORT void loadVersion(PackVersion & v, QJsonObject & obj);
+void loadVersion(PackVersion & v, QJsonObject & obj);
 
 }
diff --git a/api/logic/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp
index 295574f0..295574f0 100644
--- a/api/logic/modplatform/flame/FileResolvingTask.cpp
+++ b/launcher/modplatform/flame/FileResolvingTask.cpp
diff --git a/api/logic/modplatform/flame/FileResolvingTask.h b/launcher/modplatform/flame/FileResolvingTask.h
index 5679b907..78a38fcb 100644
--- a/api/logic/modplatform/flame/FileResolvingTask.h
+++ b/launcher/modplatform/flame/FileResolvingTask.h
@@ -4,11 +4,9 @@
 #include "net/NetJob.h"
 #include "PackManifest.h"
 
-#include "multimc_logic_export.h"
-
 namespace Flame
 {
-class MULTIMC_LOGIC_EXPORT FileResolvingTask : public Task
+class FileResolvingTask : public Task
 {
     Q_OBJECT
 public:
diff --git a/api/logic/modplatform/flame/FlamePackIndex.cpp b/launcher/modplatform/flame/FlamePackIndex.cpp
index 3d8ea22a..3d8ea22a 100644
--- a/api/logic/modplatform/flame/FlamePackIndex.cpp
+++ b/launcher/modplatform/flame/FlamePackIndex.cpp
diff --git a/api/logic/modplatform/flame/FlamePackIndex.h b/launcher/modplatform/flame/FlamePackIndex.h
index cdeb2c13..7ffa29c3 100644
--- a/api/logic/modplatform/flame/FlamePackIndex.h
+++ b/launcher/modplatform/flame/FlamePackIndex.h
@@ -5,8 +5,6 @@
 #include <QString>
 #include <QVector>
 
-#include "multimc_logic_export.h"
-
 namespace Flame {
 
 struct ModpackAuthor {
@@ -36,8 +34,8 @@ struct IndexedPack
     QVector<IndexedVersion> versions;
 };
 
-MULTIMC_LOGIC_EXPORT void loadIndexedPack(IndexedPack & m, QJsonObject & obj);
-MULTIMC_LOGIC_EXPORT void loadIndexedPackVersions(IndexedPack & m, QJsonArray & arr);
+void loadIndexedPack(IndexedPack & m, QJsonObject & obj);
+void loadIndexedPackVersions(IndexedPack & m, QJsonArray & arr);
 }
 
 Q_DECLARE_METATYPE(Flame::IndexedPack)
diff --git a/api/logic/modplatform/flame/PackManifest.cpp b/launcher/modplatform/flame/PackManifest.cpp
index b928fd16..b928fd16 100644
--- a/api/logic/modplatform/flame/PackManifest.cpp
+++ b/launcher/modplatform/flame/PackManifest.cpp
diff --git a/api/logic/modplatform/flame/PackManifest.h b/launcher/modplatform/flame/PackManifest.h
index 02f39f0e..02f39f0e 100644
--- a/api/logic/modplatform/flame/PackManifest.h
+++ b/launcher/modplatform/flame/PackManifest.h
diff --git a/api/logic/modplatform/legacy_ftb/PackFetchTask.cpp b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
index c2ef6436..c2ef6436 100644
--- a/api/logic/modplatform/legacy_ftb/PackFetchTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp
diff --git a/api/logic/modplatform/legacy_ftb/PackFetchTask.h b/launcher/modplatform/legacy_ftb/PackFetchTask.h
index 4a8469b1..3ab32fab 100644
--- a/api/logic/modplatform/legacy_ftb/PackFetchTask.h
+++ b/launcher/modplatform/legacy_ftb/PackFetchTask.h
@@ -8,7 +8,7 @@
 
 namespace LegacyFTB {
 
-class MULTIMC_LOGIC_EXPORT PackFetchTask : public QObject {
+class PackFetchTask : public QObject {
 
     Q_OBJECT
 
diff --git a/api/logic/modplatform/legacy_ftb/PackHelpers.h b/launcher/modplatform/legacy_ftb/PackHelpers.h
index 566210d0..566210d0 100644
--- a/api/logic/modplatform/legacy_ftb/PackHelpers.h
+++ b/launcher/modplatform/legacy_ftb/PackHelpers.h
diff --git a/api/logic/modplatform/legacy_ftb/PackInstallTask.cpp b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
index c77f3250..c77f3250 100644
--- a/api/logic/modplatform/legacy_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp
diff --git a/api/logic/modplatform/legacy_ftb/PackInstallTask.h b/launcher/modplatform/legacy_ftb/PackInstallTask.h
index f3515781..600f72e7 100644
--- a/api/logic/modplatform/legacy_ftb/PackInstallTask.h
+++ b/launcher/modplatform/legacy_ftb/PackInstallTask.h
@@ -12,7 +12,7 @@
 
 namespace LegacyFTB {
 
-class MULTIMC_LOGIC_EXPORT PackInstallTask : public InstanceTask
+class PackInstallTask : public InstanceTask
 {
     Q_OBJECT
 
diff --git a/api/logic/modplatform/legacy_ftb/PrivatePackManager.cpp b/launcher/modplatform/legacy_ftb/PrivatePackManager.cpp
index 501e6003..501e6003 100644
--- a/api/logic/modplatform/legacy_ftb/PrivatePackManager.cpp
+++ b/launcher/modplatform/legacy_ftb/PrivatePackManager.cpp
diff --git a/api/logic/modplatform/legacy_ftb/PrivatePackManager.h b/launcher/modplatform/legacy_ftb/PrivatePackManager.h
index 0232bac7..0e814646 100644
--- a/api/logic/modplatform/legacy_ftb/PrivatePackManager.h
+++ b/launcher/modplatform/legacy_ftb/PrivatePackManager.h
@@ -3,11 +3,10 @@
 #include <QSet>
 #include <QString>
 #include <QFile>
-#include "multimc_logic_export.h"
 
 namespace LegacyFTB {
 
-class MULTIMC_LOGIC_EXPORT PrivatePackManager
+class PrivatePackManager
 {
 public:
     ~PrivatePackManager()
diff --git a/api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
index f22373bc..f22373bc 100644
--- a/api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp
+++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
diff --git a/api/logic/modplatform/modpacksch/FTBPackInstallTask.h b/launcher/modplatform/modpacksch/FTBPackInstallTask.h
index 55db3d3c..fdd84c4e 100644
--- a/api/logic/modplatform/modpacksch/FTBPackInstallTask.h
+++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.h
@@ -3,12 +3,11 @@
 #include "FTBPackManifest.h"
 
 #include "InstanceTask.h"
-#include "multimc_logic_export.h"
 #include "net/NetJob.h"
 
 namespace ModpacksCH {
 
-class MULTIMC_LOGIC_EXPORT PackInstallTask : public InstanceTask
+class PackInstallTask : public InstanceTask
 {
     Q_OBJECT
 
diff --git a/api/logic/modplatform/modpacksch/FTBPackManifest.cpp b/launcher/modplatform/modpacksch/FTBPackManifest.cpp
index fd99d332..fd99d332 100644
--- a/api/logic/modplatform/modpacksch/FTBPackManifest.cpp
+++ b/launcher/modplatform/modpacksch/FTBPackManifest.cpp
diff --git a/api/logic/modplatform/modpacksch/FTBPackManifest.h b/launcher/modplatform/modpacksch/FTBPackManifest.h
index 518fffbf..7818b36d 100644
--- a/api/logic/modplatform/modpacksch/FTBPackManifest.h
+++ b/launcher/modplatform/modpacksch/FTBPackManifest.h
@@ -6,8 +6,6 @@
 #include <QJsonObject>
 #include <QMetaType>
 
-#include "multimc_logic_export.h"
-
 namespace ModpacksCH
 {
 
@@ -119,9 +117,9 @@ struct VersionChangelog
     int64_t updated;
 };
 
-MULTIMC_LOGIC_EXPORT void loadModpack(Modpack & m, QJsonObject & obj);
+void loadModpack(Modpack & m, QJsonObject & obj);
 
-MULTIMC_LOGIC_EXPORT void loadVersion(Version & m, QJsonObject & obj);
+void loadVersion(Version & m, QJsonObject & obj);
 }
 
 Q_DECLARE_METATYPE(ModpacksCH::Modpack)
diff --git a/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp b/launcher/modplatform/technic/SingleZipPackInstallTask.cpp
index dbce8e53..dbce8e53 100644
--- a/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp
+++ b/launcher/modplatform/technic/SingleZipPackInstallTask.cpp
diff --git a/api/logic/modplatform/technic/SingleZipPackInstallTask.h b/launcher/modplatform/technic/SingleZipPackInstallTask.h
index ec2ff605..80f10a98 100644
--- a/api/logic/modplatform/technic/SingleZipPackInstallTask.h
+++ b/launcher/modplatform/technic/SingleZipPackInstallTask.h
@@ -17,7 +17,6 @@
 
 #include "InstanceTask.h"
 #include "net/NetJob.h"
-#include "multimc_logic_export.h"
 
 #include "quazip.h"
 
@@ -29,7 +28,7 @@
 
 namespace Technic {
 
-class MULTIMC_LOGIC_EXPORT SingleZipPackInstallTask : public InstanceTask
+class SingleZipPackInstallTask : public InstanceTask
 {
     Q_OBJECT
 
diff --git a/api/logic/modplatform/technic/SolderPackInstallTask.cpp b/launcher/modplatform/technic/SolderPackInstallTask.cpp
index 1b4186d4..1b4186d4 100644
--- a/api/logic/modplatform/technic/SolderPackInstallTask.cpp
+++ b/launcher/modplatform/technic/SolderPackInstallTask.cpp
diff --git a/api/logic/modplatform/technic/SolderPackInstallTask.h b/launcher/modplatform/technic/SolderPackInstallTask.h
index 9f0f20a9..6e1057eb 100644
--- a/api/logic/modplatform/technic/SolderPackInstallTask.h
+++ b/launcher/modplatform/technic/SolderPackInstallTask.h
@@ -23,7 +23,7 @@
 
 namespace Technic
 {
-    class MULTIMC_LOGIC_EXPORT SolderPackInstallTask : public InstanceTask
+    class SolderPackInstallTask : public InstanceTask
     {
         Q_OBJECT
     public:
diff --git a/api/logic/modplatform/technic/TechnicPackProcessor.cpp b/launcher/modplatform/technic/TechnicPackProcessor.cpp
index 52979b7c..52979b7c 100644
--- a/api/logic/modplatform/technic/TechnicPackProcessor.cpp
+++ b/launcher/modplatform/technic/TechnicPackProcessor.cpp
diff --git a/api/logic/modplatform/technic/TechnicPackProcessor.h b/launcher/modplatform/technic/TechnicPackProcessor.h
index 2ad803b3..2ad803b3 100644
--- a/api/logic/modplatform/technic/TechnicPackProcessor.h
+++ b/launcher/modplatform/technic/TechnicPackProcessor.h
diff --git a/api/logic/mojang/PackageManifest.cpp b/launcher/mojang/PackageManifest.cpp
index b3dfd7fc..b3dfd7fc 100644
--- a/api/logic/mojang/PackageManifest.cpp
+++ b/launcher/mojang/PackageManifest.cpp
diff --git a/api/logic/mojang/PackageManifest.h b/launcher/mojang/PackageManifest.h
index d01a0554..fd7ab0ad 100644
--- a/api/logic/mojang/PackageManifest.h
+++ b/launcher/mojang/PackageManifest.h
@@ -6,15 +6,13 @@
 #include <QStringList>
 #include "tasks/Task.h"
 
-#include "multimc_logic_export.h"
-
 namespace mojang_files {
 
 using Hash = QString;
 extern const Hash empty_hash;
 
 // simple-ish path implementation. assumes always relative and does not allow '..' entries
-class MULTIMC_LOGIC_EXPORT Path
+class Path
 {
 public:
     using parts_type = QStringList;
@@ -106,7 +104,7 @@ enum class Compression {
 };
 
 
-struct MULTIMC_LOGIC_EXPORT FileSource
+struct FileSource
 {
     Compression compression = Compression::Unknown;
     Hash hash;
@@ -122,14 +120,14 @@ struct MULTIMC_LOGIC_EXPORT FileSource
     }
 };
 
-struct MULTIMC_LOGIC_EXPORT File
+struct File
 {
     Hash hash;
     bool executable;
     std::uint64_t size = 0;
 };
 
-struct MULTIMC_LOGIC_EXPORT Package {
+struct Package {
     static Package fromInspectedFolder(const QString &folderPath);
     static Package fromManifestFile(const QString &path);
     static Package fromManifestContents(const QByteArray& contents);
@@ -150,7 +148,7 @@ struct MULTIMC_LOGIC_EXPORT Package {
     std::map<Path, Path> symlinks;
 };
 
-struct MULTIMC_LOGIC_EXPORT FileDownload : FileSource
+struct FileDownload : FileSource
 {
     FileDownload(const FileSource& source, bool executable) {
         static_cast<FileSource &> (*this) = source;
@@ -159,7 +157,7 @@ struct MULTIMC_LOGIC_EXPORT FileDownload : FileSource
     bool executable = false;
 };
 
-struct MULTIMC_LOGIC_EXPORT UpdateOperations {
+struct UpdateOperations {
     static UpdateOperations resolve(const Package & from, const Package & to);
     bool valid = false;
     std::vector<Path> deletes;
diff --git a/api/logic/mojang/PackageManifest_test.cpp b/launcher/mojang/PackageManifest_test.cpp
index d4c55c5a..d4c55c5a 100644
--- a/api/logic/mojang/PackageManifest_test.cpp
+++ b/launcher/mojang/PackageManifest_test.cpp
diff --git a/api/logic/mojang/testdata/1.8.0_202-x64.json b/launcher/mojang/testdata/1.8.0_202-x64.json
index 3d99d719..3d99d719 100644
--- a/api/logic/mojang/testdata/1.8.0_202-x64.json
+++ b/launcher/mojang/testdata/1.8.0_202-x64.json
diff --git a/api/logic/mojang/testdata/inspect/a/b.txt b/launcher/mojang/testdata/inspect/a/b.txt
index e69de29b..e69de29b 100755
--- a/api/logic/mojang/testdata/inspect/a/b.txt
+++ b/launcher/mojang/testdata/inspect/a/b.txt
diff --git a/api/logic/mojang/testdata/inspect/a/b/b.txt b/launcher/mojang/testdata/inspect/a/b/b.txt
index 4e19a044..4e19a044 120000
--- a/api/logic/mojang/testdata/inspect/a/b/b.txt
+++ b/launcher/mojang/testdata/inspect/a/b/b.txt
diff --git a/api/logic/mojang/testdata/inspect_win/a/b.txt b/launcher/mojang/testdata/inspect_win/a/b.txt
index e69de29b..e69de29b 100644
--- a/api/logic/mojang/testdata/inspect_win/a/b.txt
+++ b/launcher/mojang/testdata/inspect_win/a/b.txt
diff --git a/api/logic/mojang/testdata/inspect_win/a/b/b.txt b/launcher/mojang/testdata/inspect_win/a/b/b.txt
index e69de29b..e69de29b 100644
--- a/api/logic/mojang/testdata/inspect_win/a/b/b.txt
+++ b/launcher/mojang/testdata/inspect_win/a/b/b.txt
diff --git a/api/logic/net/ByteArraySink.h b/launcher/net/ByteArraySink.h
index 20e6764c..20e6764c 100644
--- a/api/logic/net/ByteArraySink.h
+++ b/launcher/net/ByteArraySink.h
diff --git a/api/logic/net/ChecksumValidator.h b/launcher/net/ChecksumValidator.h
index 0d6b19c2..0d6b19c2 100644
--- a/api/logic/net/ChecksumValidator.h
+++ b/launcher/net/ChecksumValidator.h
diff --git a/api/logic/net/Download.cpp b/launcher/net/Download.cpp
index 3f183b7d..3f183b7d 100644
--- a/api/logic/net/Download.cpp
+++ b/launcher/net/Download.cpp
diff --git a/api/logic/net/Download.h b/launcher/net/Download.h
index 2c436032..a224bb86 100644
--- a/api/logic/net/Download.h
+++ b/launcher/net/Download.h
@@ -20,9 +20,8 @@
 #include "Validator.h"
 #include "Sink.h"
 
-#include "multimc_logic_export.h"
 namespace Net {
-class MULTIMC_LOGIC_EXPORT Download : public NetAction
+class Download : public NetAction
 {
     Q_OBJECT
 
diff --git a/api/logic/net/FileSink.cpp b/launcher/net/FileSink.cpp
index 8b3e917d..8b3e917d 100644
--- a/api/logic/net/FileSink.cpp
+++ b/launcher/net/FileSink.cpp
diff --git a/api/logic/net/FileSink.h b/launcher/net/FileSink.h
index 875fe511..875fe511 100644
--- a/api/logic/net/FileSink.h
+++ b/launcher/net/FileSink.h
diff --git a/api/logic/net/HttpMetaCache.cpp b/launcher/net/HttpMetaCache.cpp
index 4bc8fbc8..4bc8fbc8 100644
--- a/api/logic/net/HttpMetaCache.cpp
+++ b/launcher/net/HttpMetaCache.cpp
diff --git a/api/logic/net/HttpMetaCache.h b/launcher/net/HttpMetaCache.h
index c3248793..1c10e8c7 100644
--- a/api/logic/net/HttpMetaCache.h
+++ b/launcher/net/HttpMetaCache.h
@@ -19,11 +19,9 @@
 #include <qtimer.h>
 #include <memory>
 
-#include "multimc_logic_export.h"
-
 class HttpMetaCache;
 
-class MULTIMC_LOGIC_EXPORT MetaEntry
+class MetaEntry
 {
 friend class HttpMetaCache;
 protected:
@@ -79,7 +77,7 @@ protected:
 
 typedef std::shared_ptr<MetaEntry> MetaEntryPtr;
 
-class MULTIMC_LOGIC_EXPORT HttpMetaCache : public QObject
+class HttpMetaCache : public QObject
 {
     Q_OBJECT
 public:
diff --git a/api/logic/net/MetaCacheSink.cpp b/launcher/net/MetaCacheSink.cpp
index d7f18533..d7f18533 100644
--- a/api/logic/net/MetaCacheSink.cpp
+++ b/launcher/net/MetaCacheSink.cpp
diff --git a/api/logic/net/MetaCacheSink.h b/launcher/net/MetaCacheSink.h
index edcf7ad1..edcf7ad1 100644
--- a/api/logic/net/MetaCacheSink.h
+++ b/launcher/net/MetaCacheSink.h
diff --git a/api/logic/net/Mode.h b/launcher/net/Mode.h
index 9a95f5ad..9a95f5ad 100644
--- a/api/logic/net/Mode.h
+++ b/launcher/net/Mode.h
diff --git a/api/logic/net/NetAction.h b/launcher/net/NetAction.h
index 02b249a3..c13c187f 100644
--- a/api/logic/net/NetAction.h
+++ b/launcher/net/NetAction.h
@@ -21,8 +21,6 @@
 #include <QNetworkReply>
 #include <QObjectPtr.h>
 
-#include "multimc_logic_export.h"
-
 enum JobStatus
 {
     Job_NotStarted,
@@ -38,7 +36,7 @@ enum JobStatus
 };
 
 typedef std::shared_ptr<class NetAction> NetActionPtr;
-class MULTIMC_LOGIC_EXPORT NetAction : public QObject
+class NetAction : public QObject
 {
     Q_OBJECT
 protected:
diff --git a/api/logic/net/NetJob.cpp b/launcher/net/NetJob.cpp
index 029d9e34..029d9e34 100644
--- a/api/logic/net/NetJob.cpp
+++ b/launcher/net/NetJob.cpp
diff --git a/api/logic/net/NetJob.h b/launcher/net/NetJob.h
index 480d8037..338f8e71 100644
--- a/api/logic/net/NetJob.h
+++ b/launcher/net/NetJob.h
@@ -21,12 +21,10 @@
 #include "tasks/Task.h"
 #include "QObjectPtr.h"
 
-#include "multimc_logic_export.h"
-
 class NetJob;
 typedef shared_qobject_ptr<NetJob> NetJobPtr;
 
-class MULTIMC_LOGIC_EXPORT NetJob : public Task
+class NetJob : public Task
 {
     Q_OBJECT
 public:
diff --git a/api/logic/net/PasteUpload.cpp b/launcher/net/PasteUpload.cpp
index cb470c49..cb470c49 100644
--- a/api/logic/net/PasteUpload.cpp
+++ b/launcher/net/PasteUpload.cpp
diff --git a/api/logic/net/PasteUpload.h b/launcher/net/PasteUpload.h
index 11e05c2e..5514e058 100644
--- a/api/logic/net/PasteUpload.h
+++ b/launcher/net/PasteUpload.h
@@ -4,9 +4,7 @@
 #include <QBuffer>
 #include <memory>
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT PasteUpload : public Task
+class PasteUpload : public Task
 {
     Q_OBJECT
 public:
diff --git a/api/logic/net/Sink.h b/launcher/net/Sink.h
index d526895c..d367fb15 100644
--- a/api/logic/net/Sink.h
+++ b/launcher/net/Sink.h
@@ -2,11 +2,10 @@
 
 #include "net/NetAction.h"
 
-#include "multimc_logic_export.h"
 #include "Validator.h"
 
 namespace Net {
-class MULTIMC_LOGIC_EXPORT Sink
+class Sink
 {
 public: /* con/des */
     Sink() {};
diff --git a/api/logic/net/Validator.h b/launcher/net/Validator.h
index 955412ce..59b72a0b 100644
--- a/api/logic/net/Validator.h
+++ b/launcher/net/Validator.h
@@ -2,10 +2,8 @@
 
 #include "net/NetAction.h"
 
-#include "multimc_logic_export.h"
-
 namespace Net {
-class MULTIMC_LOGIC_EXPORT Validator
+class Validator
 {
 public: /* con/des */
     Validator() {};
@@ -17,4 +15,4 @@ public: /* methods */
     virtual bool abort() = 0;
     virtual bool validate(QNetworkReply & reply) = 0;
 };
-}
\ No newline at end of file
+}
diff --git a/api/logic/news/NewsChecker.cpp b/launcher/news/NewsChecker.cpp
index c66f49e1..c66f49e1 100644
--- a/api/logic/news/NewsChecker.cpp
+++ b/launcher/news/NewsChecker.cpp
diff --git a/api/logic/news/NewsChecker.h b/launcher/news/NewsChecker.h
index c473ecab..84b1f552 100644
--- a/api/logic/news/NewsChecker.h
+++ b/launcher/news/NewsChecker.h
@@ -23,9 +23,7 @@
 
 #include "NewsEntry.h"
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT NewsChecker : public QObject
+class NewsChecker : public QObject
 {
     Q_OBJECT
 public:
diff --git a/api/logic/news/NewsEntry.cpp b/launcher/news/NewsEntry.cpp
index 7eff657b..7eff657b 100644
--- a/api/logic/news/NewsEntry.cpp
+++ b/launcher/news/NewsEntry.cpp
diff --git a/api/logic/news/NewsEntry.h b/launcher/news/NewsEntry.h
index 0dbc70a5..0dbc70a5 100644
--- a/api/logic/news/NewsEntry.h
+++ b/launcher/news/NewsEntry.h
diff --git a/api/logic/notifications/NotificationChecker.cpp b/launcher/notifications/NotificationChecker.cpp
index 8209c28b..8209c28b 100644
--- a/api/logic/notifications/NotificationChecker.cpp
+++ b/launcher/notifications/NotificationChecker.cpp
diff --git a/api/logic/notifications/NotificationChecker.h b/launcher/notifications/NotificationChecker.h
index 4b1b893d..eb2b32a2 100644
--- a/api/logic/notifications/NotificationChecker.h
+++ b/launcher/notifications/NotificationChecker.h
@@ -5,9 +5,7 @@
 #include "net/NetJob.h"
 #include "net/Download.h"
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT NotificationChecker : public QObject
+class NotificationChecker : public QObject
 {
     Q_OBJECT
 
diff --git a/application/package/linux/MultiMC b/launcher/package/linux/MultiMC
index da6373bc..da6373bc 100755
--- a/application/package/linux/MultiMC
+++ b/launcher/package/linux/MultiMC
diff --git a/application/package/linux/multimc.desktop b/launcher/package/linux/multimc.desktop
index c25be047..c25be047 100755
--- a/application/package/linux/multimc.desktop
+++ b/launcher/package/linux/multimc.desktop
diff --git a/application/package/rpm/MultiMC5.spec b/launcher/package/rpm/MultiMC5.spec
index 78b9000e..78b9000e 100644
--- a/application/package/rpm/MultiMC5.spec
+++ b/launcher/package/rpm/MultiMC5.spec
diff --git a/application/package/rpm/README.md b/launcher/package/rpm/README.md
index 0c2b1e49..0c2b1e49 100644
--- a/application/package/rpm/README.md
+++ b/launcher/package/rpm/README.md
diff --git a/application/package/ubuntu/README.md b/launcher/package/ubuntu/README.md
index 892abd12..892abd12 100644
--- a/application/package/ubuntu/README.md
+++ b/launcher/package/ubuntu/README.md
diff --git a/application/package/ubuntu/multimc/DEBIAN/control b/launcher/package/ubuntu/multimc/DEBIAN/control
index 3e0f570c..3e0f570c 100644
--- a/application/package/ubuntu/multimc/DEBIAN/control
+++ b/launcher/package/ubuntu/multimc/DEBIAN/control
diff --git a/application/package/ubuntu/multimc/DEBIAN/postrm b/launcher/package/ubuntu/multimc/DEBIAN/postrm
index f9bbc8a7..f9bbc8a7 100755
--- a/application/package/ubuntu/multimc/DEBIAN/postrm
+++ b/launcher/package/ubuntu/multimc/DEBIAN/postrm
diff --git a/application/package/ubuntu/multimc/opt/multimc/icon.svg b/launcher/package/ubuntu/multimc/opt/multimc/icon.svg
index 8bb0e289..8bb0e289 100644
--- a/application/package/ubuntu/multimc/opt/multimc/icon.svg
+++ b/launcher/package/ubuntu/multimc/opt/multimc/icon.svg
diff --git a/application/package/ubuntu/multimc/opt/multimc/run.sh b/launcher/package/ubuntu/multimc/opt/multimc/run.sh
index c493a513..c493a513 100755
--- a/application/package/ubuntu/multimc/opt/multimc/run.sh
+++ b/launcher/package/ubuntu/multimc/opt/multimc/run.sh
diff --git a/application/package/ubuntu/multimc/usr/share/applications/multimc.desktop b/launcher/package/ubuntu/multimc/usr/share/applications/multimc.desktop
index e0456f89..e0456f89 100755
--- a/application/package/ubuntu/multimc/usr/share/applications/multimc.desktop
+++ b/launcher/package/ubuntu/multimc/usr/share/applications/multimc.desktop
diff --git a/application/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml b/launcher/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml
index 4c6b7450..4c6b7450 100644
--- a/application/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml
+++ b/launcher/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml
diff --git a/application/pagedialog/PageDialog.cpp b/launcher/pagedialog/PageDialog.cpp
index fd5d36d4..fd5d36d4 100644
--- a/application/pagedialog/PageDialog.cpp
+++ b/launcher/pagedialog/PageDialog.cpp
diff --git a/application/pagedialog/PageDialog.h b/launcher/pagedialog/PageDialog.h
index 1029bc30..1029bc30 100644
--- a/application/pagedialog/PageDialog.h
+++ b/launcher/pagedialog/PageDialog.h
diff --git a/application/pages/BasePage.h b/launcher/pages/BasePage.h
index 408965d0..408965d0 100644
--- a/application/pages/BasePage.h
+++ b/launcher/pages/BasePage.h
diff --git a/application/pages/BasePageContainer.h b/launcher/pages/BasePageContainer.h
index f8c7adeb..f8c7adeb 100644
--- a/application/pages/BasePageContainer.h
+++ b/launcher/pages/BasePageContainer.h
diff --git a/application/pages/BasePageProvider.h b/launcher/pages/BasePageProvider.h
index 7bfaaf3b..7bfaaf3b 100644
--- a/application/pages/BasePageProvider.h
+++ b/launcher/pages/BasePageProvider.h
diff --git a/application/pages/global/AccountListPage.cpp b/launcher/pages/global/AccountListPage.cpp
index ff3736ed..ff3736ed 100644
--- a/application/pages/global/AccountListPage.cpp
+++ b/launcher/pages/global/AccountListPage.cpp
diff --git a/application/pages/global/AccountListPage.h b/launcher/pages/global/AccountListPage.h
index fba1833f..fba1833f 100644
--- a/application/pages/global/AccountListPage.h
+++ b/launcher/pages/global/AccountListPage.h
diff --git a/application/pages/global/AccountListPage.ui b/launcher/pages/global/AccountListPage.ui
index 71647db3..71647db3 100644
--- a/application/pages/global/AccountListPage.ui
+++ b/launcher/pages/global/AccountListPage.ui
diff --git a/application/pages/global/CustomCommandsPage.cpp b/launcher/pages/global/CustomCommandsPage.cpp
index 3b182319..3b182319 100644
--- a/application/pages/global/CustomCommandsPage.cpp
+++ b/launcher/pages/global/CustomCommandsPage.cpp
diff --git a/application/pages/global/CustomCommandsPage.h b/launcher/pages/global/CustomCommandsPage.h
index 414c3259..414c3259 100644
--- a/application/pages/global/CustomCommandsPage.h
+++ b/launcher/pages/global/CustomCommandsPage.h
diff --git a/application/pages/global/ExternalToolsPage.cpp b/launcher/pages/global/ExternalToolsPage.cpp
index 6a0a38be..6a0a38be 100644
--- a/application/pages/global/ExternalToolsPage.cpp
+++ b/launcher/pages/global/ExternalToolsPage.cpp
diff --git a/application/pages/global/ExternalToolsPage.h b/launcher/pages/global/ExternalToolsPage.h
index 0fc8ebe1..0fc8ebe1 100644
--- a/application/pages/global/ExternalToolsPage.h
+++ b/launcher/pages/global/ExternalToolsPage.h
diff --git a/application/pages/global/ExternalToolsPage.ui b/launcher/pages/global/ExternalToolsPage.ui
index e79e9388..e79e9388 100644
--- a/application/pages/global/ExternalToolsPage.ui
+++ b/launcher/pages/global/ExternalToolsPage.ui
diff --git a/application/pages/global/JavaPage.cpp b/launcher/pages/global/JavaPage.cpp
index cde0e035..cde0e035 100644
--- a/application/pages/global/JavaPage.cpp
+++ b/launcher/pages/global/JavaPage.cpp
diff --git a/application/pages/global/JavaPage.h b/launcher/pages/global/JavaPage.h
index 832f460b..832f460b 100644
--- a/application/pages/global/JavaPage.h
+++ b/launcher/pages/global/JavaPage.h
diff --git a/application/pages/global/JavaPage.ui b/launcher/pages/global/JavaPage.ui
index b67e9994..b67e9994 100644
--- a/application/pages/global/JavaPage.ui
+++ b/launcher/pages/global/JavaPage.ui
diff --git a/application/pages/global/LanguagePage.cpp b/launcher/pages/global/LanguagePage.cpp
index ae3168cc..ae3168cc 100644
--- a/application/pages/global/LanguagePage.cpp
+++ b/launcher/pages/global/LanguagePage.cpp
diff --git a/application/pages/global/LanguagePage.h b/launcher/pages/global/LanguagePage.h
index ca8eecc6..ca8eecc6 100644
--- a/application/pages/global/LanguagePage.h
+++ b/launcher/pages/global/LanguagePage.h
diff --git a/application/pages/global/MinecraftPage.cpp b/launcher/pages/global/MinecraftPage.cpp
index 6c9bd307..6c9bd307 100644
--- a/application/pages/global/MinecraftPage.cpp
+++ b/launcher/pages/global/MinecraftPage.cpp
diff --git a/application/pages/global/MinecraftPage.h b/launcher/pages/global/MinecraftPage.h
index 5e781aed..5e781aed 100644
--- a/application/pages/global/MinecraftPage.h
+++ b/launcher/pages/global/MinecraftPage.h
diff --git a/application/pages/global/MinecraftPage.ui b/launcher/pages/global/MinecraftPage.ui
index 2abd4bd4..2abd4bd4 100644
--- a/application/pages/global/MinecraftPage.ui
+++ b/launcher/pages/global/MinecraftPage.ui
diff --git a/application/pages/global/MultiMCPage.cpp b/launcher/pages/global/MultiMCPage.cpp
index d383e6ed..d383e6ed 100644
--- a/application/pages/global/MultiMCPage.cpp
+++ b/launcher/pages/global/MultiMCPage.cpp
diff --git a/application/pages/global/MultiMCPage.h b/launcher/pages/global/MultiMCPage.h
index fae75bf2..fae75bf2 100644
--- a/application/pages/global/MultiMCPage.h
+++ b/launcher/pages/global/MultiMCPage.h
diff --git a/application/pages/global/MultiMCPage.ui b/launcher/pages/global/MultiMCPage.ui
index 4ad20242..4ad20242 100644
--- a/application/pages/global/MultiMCPage.ui
+++ b/launcher/pages/global/MultiMCPage.ui
diff --git a/application/pages/global/PasteEEPage.cpp b/launcher/pages/global/PasteEEPage.cpp
index f932dede..f932dede 100644
--- a/application/pages/global/PasteEEPage.cpp
+++ b/launcher/pages/global/PasteEEPage.cpp
diff --git a/application/pages/global/PasteEEPage.h b/launcher/pages/global/PasteEEPage.h
index 001decdb..001decdb 100644
--- a/application/pages/global/PasteEEPage.h
+++ b/launcher/pages/global/PasteEEPage.h
diff --git a/application/pages/global/PasteEEPage.ui b/launcher/pages/global/PasteEEPage.ui
index 10883781..10883781 100644
--- a/application/pages/global/PasteEEPage.ui
+++ b/launcher/pages/global/PasteEEPage.ui
diff --git a/application/pages/global/ProxyPage.cpp b/launcher/pages/global/ProxyPage.cpp
index 809059ff..809059ff 100644
--- a/application/pages/global/ProxyPage.cpp
+++ b/launcher/pages/global/ProxyPage.cpp
diff --git a/application/pages/global/ProxyPage.h b/launcher/pages/global/ProxyPage.h
index ff94ec49..ff94ec49 100644
--- a/application/pages/global/ProxyPage.h
+++ b/launcher/pages/global/ProxyPage.h
diff --git a/application/pages/global/ProxyPage.ui b/launcher/pages/global/ProxyPage.ui
index 69fcef1e..69fcef1e 100644
--- a/application/pages/global/ProxyPage.ui
+++ b/launcher/pages/global/ProxyPage.ui
diff --git a/application/pages/instance/GameOptionsPage.cpp b/launcher/pages/instance/GameOptionsPage.cpp
index 782f2ab3..782f2ab3 100644
--- a/application/pages/instance/GameOptionsPage.cpp
+++ b/launcher/pages/instance/GameOptionsPage.cpp
diff --git a/application/pages/instance/GameOptionsPage.h b/launcher/pages/instance/GameOptionsPage.h
index 0fd2fbff..0fd2fbff 100644
--- a/application/pages/instance/GameOptionsPage.h
+++ b/launcher/pages/instance/GameOptionsPage.h
diff --git a/application/pages/instance/GameOptionsPage.ui b/launcher/pages/instance/GameOptionsPage.ui
index f0a5ce0e..f0a5ce0e 100644
--- a/application/pages/instance/GameOptionsPage.ui
+++ b/launcher/pages/instance/GameOptionsPage.ui
diff --git a/application/pages/instance/InstanceSettingsPage.cpp b/launcher/pages/instance/InstanceSettingsPage.cpp
index 7bd424c0..7bd424c0 100644
--- a/application/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/pages/instance/InstanceSettingsPage.cpp
diff --git a/application/pages/instance/InstanceSettingsPage.h b/launcher/pages/instance/InstanceSettingsPage.h
index 068213a8..068213a8 100644
--- a/application/pages/instance/InstanceSettingsPage.h
+++ b/launcher/pages/instance/InstanceSettingsPage.h
diff --git a/application/pages/instance/InstanceSettingsPage.ui b/launcher/pages/instance/InstanceSettingsPage.ui
index e569ce56..e569ce56 100644
--- a/application/pages/instance/InstanceSettingsPage.ui
+++ b/launcher/pages/instance/InstanceSettingsPage.ui
diff --git a/application/pages/instance/LegacyUpgradePage.cpp b/launcher/pages/instance/LegacyUpgradePage.cpp
index af800b03..af800b03 100644
--- a/application/pages/instance/LegacyUpgradePage.cpp
+++ b/launcher/pages/instance/LegacyUpgradePage.cpp
diff --git a/application/pages/instance/LegacyUpgradePage.h b/launcher/pages/instance/LegacyUpgradePage.h
index df34e33a..df34e33a 100644
--- a/application/pages/instance/LegacyUpgradePage.h
+++ b/launcher/pages/instance/LegacyUpgradePage.h
diff --git a/application/pages/instance/LegacyUpgradePage.ui b/launcher/pages/instance/LegacyUpgradePage.ui
index a94ee039..a94ee039 100644
--- a/application/pages/instance/LegacyUpgradePage.ui
+++ b/launcher/pages/instance/LegacyUpgradePage.ui
diff --git a/application/pages/instance/LogPage.cpp b/launcher/pages/instance/LogPage.cpp
index 3d2085c6..3d2085c6 100644
--- a/application/pages/instance/LogPage.cpp
+++ b/launcher/pages/instance/LogPage.cpp
diff --git a/application/pages/instance/LogPage.h b/launcher/pages/instance/LogPage.h
index b0b0e04b..b0b0e04b 100644
--- a/application/pages/instance/LogPage.h
+++ b/launcher/pages/instance/LogPage.h
diff --git a/application/pages/instance/LogPage.ui b/launcher/pages/instance/LogPage.ui
index 4843d7c3..4843d7c3 100644
--- a/application/pages/instance/LogPage.ui
+++ b/launcher/pages/instance/LogPage.ui
diff --git a/application/pages/instance/ModFolderPage.cpp b/launcher/pages/instance/ModFolderPage.cpp
index 98f20e77..98f20e77 100644
--- a/application/pages/instance/ModFolderPage.cpp
+++ b/launcher/pages/instance/ModFolderPage.cpp
diff --git a/application/pages/instance/ModFolderPage.h b/launcher/pages/instance/ModFolderPage.h
index f653a8c0..f653a8c0 100644
--- a/application/pages/instance/ModFolderPage.h
+++ b/launcher/pages/instance/ModFolderPage.h
diff --git a/application/pages/instance/ModFolderPage.ui b/launcher/pages/instance/ModFolderPage.ui
index 954a0167..954a0167 100644
--- a/application/pages/instance/ModFolderPage.ui
+++ b/launcher/pages/instance/ModFolderPage.ui
diff --git a/application/pages/instance/NotesPage.cpp b/launcher/pages/instance/NotesPage.cpp
index fa966c91..fa966c91 100644
--- a/application/pages/instance/NotesPage.cpp
+++ b/launcher/pages/instance/NotesPage.cpp
diff --git a/application/pages/instance/NotesPage.h b/launcher/pages/instance/NotesPage.h
index d0c00ac1..d0c00ac1 100644
--- a/application/pages/instance/NotesPage.h
+++ b/launcher/pages/instance/NotesPage.h
diff --git a/application/pages/instance/NotesPage.ui b/launcher/pages/instance/NotesPage.ui
index 67cb261c..67cb261c 100644
--- a/application/pages/instance/NotesPage.ui
+++ b/launcher/pages/instance/NotesPage.ui
diff --git a/application/pages/instance/OtherLogsPage.cpp b/launcher/pages/instance/OtherLogsPage.cpp
index b67b84bd..b67b84bd 100644
--- a/application/pages/instance/OtherLogsPage.cpp
+++ b/launcher/pages/instance/OtherLogsPage.cpp
diff --git a/application/pages/instance/OtherLogsPage.h b/launcher/pages/instance/OtherLogsPage.h
index 7f21c0fa..7f21c0fa 100644
--- a/application/pages/instance/OtherLogsPage.h
+++ b/launcher/pages/instance/OtherLogsPage.h
diff --git a/application/pages/instance/OtherLogsPage.ui b/launcher/pages/instance/OtherLogsPage.ui
index 56ff3b62..56ff3b62 100644
--- a/application/pages/instance/OtherLogsPage.ui
+++ b/launcher/pages/instance/OtherLogsPage.ui
diff --git a/application/pages/instance/ResourcePackPage.h b/launcher/pages/instance/ResourcePackPage.h
index 1486bf52..1486bf52 100644
--- a/application/pages/instance/ResourcePackPage.h
+++ b/launcher/pages/instance/ResourcePackPage.h
diff --git a/application/pages/instance/ScreenshotsPage.cpp b/launcher/pages/instance/ScreenshotsPage.cpp
index efa0f9f2..efa0f9f2 100644
--- a/application/pages/instance/ScreenshotsPage.cpp
+++ b/launcher/pages/instance/ScreenshotsPage.cpp
diff --git a/application/pages/instance/ScreenshotsPage.h b/launcher/pages/instance/ScreenshotsPage.h
index 03a809de..03a809de 100644
--- a/application/pages/instance/ScreenshotsPage.h
+++ b/launcher/pages/instance/ScreenshotsPage.h
diff --git a/application/pages/instance/ScreenshotsPage.ui b/launcher/pages/instance/ScreenshotsPage.ui
index f11f4cd4..f11f4cd4 100644
--- a/application/pages/instance/ScreenshotsPage.ui
+++ b/launcher/pages/instance/ScreenshotsPage.ui
diff --git a/application/pages/instance/ServersPage.cpp b/launcher/pages/instance/ServersPage.cpp
index d63c6e70..d63c6e70 100644
--- a/application/pages/instance/ServersPage.cpp
+++ b/launcher/pages/instance/ServersPage.cpp
diff --git a/application/pages/instance/ServersPage.h b/launcher/pages/instance/ServersPage.h
index 8c5b7eb8..8c5b7eb8 100644
--- a/application/pages/instance/ServersPage.h
+++ b/launcher/pages/instance/ServersPage.h
diff --git a/application/pages/instance/ServersPage.ui b/launcher/pages/instance/ServersPage.ui
index d89b7cba..d89b7cba 100644
--- a/application/pages/instance/ServersPage.ui
+++ b/launcher/pages/instance/ServersPage.ui
diff --git a/application/pages/instance/TexturePackPage.h b/launcher/pages/instance/TexturePackPage.h
index 3f04997d..3f04997d 100644
--- a/application/pages/instance/TexturePackPage.h
+++ b/launcher/pages/instance/TexturePackPage.h
diff --git a/application/pages/instance/VersionPage.cpp b/launcher/pages/instance/VersionPage.cpp
index a98bfb7d..a98bfb7d 100644
--- a/application/pages/instance/VersionPage.cpp
+++ b/launcher/pages/instance/VersionPage.cpp
diff --git a/application/pages/instance/VersionPage.h b/launcher/pages/instance/VersionPage.h
index b5b4a6f5..b5b4a6f5 100644
--- a/application/pages/instance/VersionPage.h
+++ b/launcher/pages/instance/VersionPage.h
diff --git a/application/pages/instance/VersionPage.ui b/launcher/pages/instance/VersionPage.ui
index 84d06e2e..84d06e2e 100644
--- a/application/pages/instance/VersionPage.ui
+++ b/launcher/pages/instance/VersionPage.ui
diff --git a/application/pages/instance/WorldListPage.cpp b/launcher/pages/instance/WorldListPage.cpp
index 119cff3e..119cff3e 100644
--- a/application/pages/instance/WorldListPage.cpp
+++ b/launcher/pages/instance/WorldListPage.cpp
diff --git a/application/pages/instance/WorldListPage.h b/launcher/pages/instance/WorldListPage.h
index 4fc9aa09..4fc9aa09 100644
--- a/application/pages/instance/WorldListPage.h
+++ b/launcher/pages/instance/WorldListPage.h
diff --git a/application/pages/instance/WorldListPage.ui b/launcher/pages/instance/WorldListPage.ui
index ed078d94..ed078d94 100644
--- a/application/pages/instance/WorldListPage.ui
+++ b/launcher/pages/instance/WorldListPage.ui
diff --git a/application/pages/modplatform/ImportPage.cpp b/launcher/pages/modplatform/ImportPage.cpp
index c2369bdc..c2369bdc 100644
--- a/application/pages/modplatform/ImportPage.cpp
+++ b/launcher/pages/modplatform/ImportPage.cpp
diff --git a/application/pages/modplatform/ImportPage.h b/launcher/pages/modplatform/ImportPage.h
index 67e3c201..67e3c201 100644
--- a/application/pages/modplatform/ImportPage.h
+++ b/launcher/pages/modplatform/ImportPage.h
diff --git a/application/pages/modplatform/ImportPage.ui b/launcher/pages/modplatform/ImportPage.ui
index eb63cbe9..eb63cbe9 100644
--- a/application/pages/modplatform/ImportPage.ui
+++ b/launcher/pages/modplatform/ImportPage.ui
diff --git a/application/pages/modplatform/VanillaPage.cpp b/launcher/pages/modplatform/VanillaPage.cpp
index 02638315..02638315 100644
--- a/application/pages/modplatform/VanillaPage.cpp
+++ b/launcher/pages/modplatform/VanillaPage.cpp
diff --git a/application/pages/modplatform/VanillaPage.h b/launcher/pages/modplatform/VanillaPage.h
index af6fd392..af6fd392 100644
--- a/application/pages/modplatform/VanillaPage.h
+++ b/launcher/pages/modplatform/VanillaPage.h
diff --git a/application/pages/modplatform/VanillaPage.ui b/launcher/pages/modplatform/VanillaPage.ui
index 47effc86..47effc86 100644
--- a/application/pages/modplatform/VanillaPage.ui
+++ b/launcher/pages/modplatform/VanillaPage.ui
diff --git a/application/pages/modplatform/atlauncher/AtlFilterModel.cpp b/launcher/pages/modplatform/atlauncher/AtlFilterModel.cpp
index b5d8f22b..b5d8f22b 100644
--- a/application/pages/modplatform/atlauncher/AtlFilterModel.cpp
+++ b/launcher/pages/modplatform/atlauncher/AtlFilterModel.cpp
diff --git a/application/pages/modplatform/atlauncher/AtlFilterModel.h b/launcher/pages/modplatform/atlauncher/AtlFilterModel.h
index bd72ad91..bd72ad91 100644
--- a/application/pages/modplatform/atlauncher/AtlFilterModel.h
+++ b/launcher/pages/modplatform/atlauncher/AtlFilterModel.h
diff --git a/application/pages/modplatform/atlauncher/AtlListModel.cpp b/launcher/pages/modplatform/atlauncher/AtlListModel.cpp
index f3be6198..f3be6198 100644
--- a/application/pages/modplatform/atlauncher/AtlListModel.cpp
+++ b/launcher/pages/modplatform/atlauncher/AtlListModel.cpp
diff --git a/application/pages/modplatform/atlauncher/AtlListModel.h b/launcher/pages/modplatform/atlauncher/AtlListModel.h
index 2d30a64e..2d30a64e 100644
--- a/application/pages/modplatform/atlauncher/AtlListModel.h
+++ b/launcher/pages/modplatform/atlauncher/AtlListModel.h
diff --git a/application/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp b/launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
index 14bbd18b..14bbd18b 100644
--- a/application/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
+++ b/launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp
diff --git a/application/pages/modplatform/atlauncher/AtlOptionalModDialog.h b/launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.h
index a1df43f6..a1df43f6 100644
--- a/application/pages/modplatform/atlauncher/AtlOptionalModDialog.h
+++ b/launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.h
diff --git a/application/pages/modplatform/atlauncher/AtlOptionalModDialog.ui b/launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.ui
index 5d3193a4..5d3193a4 100644
--- a/application/pages/modplatform/atlauncher/AtlOptionalModDialog.ui
+++ b/launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.ui
diff --git a/application/pages/modplatform/atlauncher/AtlPage.cpp b/launcher/pages/modplatform/atlauncher/AtlPage.cpp
index 9fdf111f..9fdf111f 100644
--- a/application/pages/modplatform/atlauncher/AtlPage.cpp
+++ b/launcher/pages/modplatform/atlauncher/AtlPage.cpp
diff --git a/application/pages/modplatform/atlauncher/AtlPage.h b/launcher/pages/modplatform/atlauncher/AtlPage.h
index 932ec6a6..932ec6a6 100644
--- a/application/pages/modplatform/atlauncher/AtlPage.h
+++ b/launcher/pages/modplatform/atlauncher/AtlPage.h
diff --git a/application/pages/modplatform/atlauncher/AtlPage.ui b/launcher/pages/modplatform/atlauncher/AtlPage.ui
index f16c24b8..f16c24b8 100644
--- a/application/pages/modplatform/atlauncher/AtlPage.ui
+++ b/launcher/pages/modplatform/atlauncher/AtlPage.ui
diff --git a/application/pages/modplatform/flame/FlameModel.cpp b/launcher/pages/modplatform/flame/FlameModel.cpp
index 228a88c5..228a88c5 100644
--- a/application/pages/modplatform/flame/FlameModel.cpp
+++ b/launcher/pages/modplatform/flame/FlameModel.cpp
diff --git a/application/pages/modplatform/flame/FlameModel.h b/launcher/pages/modplatform/flame/FlameModel.h
index 24383db0..24383db0 100644
--- a/application/pages/modplatform/flame/FlameModel.h
+++ b/launcher/pages/modplatform/flame/FlameModel.h
diff --git a/application/pages/modplatform/flame/FlamePage.cpp b/launcher/pages/modplatform/flame/FlamePage.cpp
index ade58431..ade58431 100644
--- a/application/pages/modplatform/flame/FlamePage.cpp
+++ b/launcher/pages/modplatform/flame/FlamePage.cpp
diff --git a/application/pages/modplatform/flame/FlamePage.h b/launcher/pages/modplatform/flame/FlamePage.h
index 467bb44b..467bb44b 100644
--- a/application/pages/modplatform/flame/FlamePage.h
+++ b/launcher/pages/modplatform/flame/FlamePage.h
diff --git a/application/pages/modplatform/flame/FlamePage.ui b/launcher/pages/modplatform/flame/FlamePage.ui
index 9723815a..9723815a 100644
--- a/application/pages/modplatform/flame/FlamePage.ui
+++ b/launcher/pages/modplatform/flame/FlamePage.ui
diff --git a/application/pages/modplatform/ftb/FtbFilterModel.cpp b/launcher/pages/modplatform/ftb/FtbFilterModel.cpp
index dec3a017..dec3a017 100644
--- a/application/pages/modplatform/ftb/FtbFilterModel.cpp
+++ b/launcher/pages/modplatform/ftb/FtbFilterModel.cpp
diff --git a/application/pages/modplatform/ftb/FtbFilterModel.h b/launcher/pages/modplatform/ftb/FtbFilterModel.h
index 4fe2a274..4fe2a274 100644
--- a/application/pages/modplatform/ftb/FtbFilterModel.h
+++ b/launcher/pages/modplatform/ftb/FtbFilterModel.h
diff --git a/application/pages/modplatform/ftb/FtbListModel.cpp b/launcher/pages/modplatform/ftb/FtbListModel.cpp
index 98973f2e..98973f2e 100644
--- a/application/pages/modplatform/ftb/FtbListModel.cpp
+++ b/launcher/pages/modplatform/ftb/FtbListModel.cpp
diff --git a/application/pages/modplatform/ftb/FtbListModel.h b/launcher/pages/modplatform/ftb/FtbListModel.h
index de94e6ba..de94e6ba 100644
--- a/application/pages/modplatform/ftb/FtbListModel.h
+++ b/launcher/pages/modplatform/ftb/FtbListModel.h
diff --git a/application/pages/modplatform/ftb/FtbPage.cpp b/launcher/pages/modplatform/ftb/FtbPage.cpp
index b7f35c5d..b7f35c5d 100644
--- a/application/pages/modplatform/ftb/FtbPage.cpp
+++ b/launcher/pages/modplatform/ftb/FtbPage.cpp
diff --git a/application/pages/modplatform/ftb/FtbPage.h b/launcher/pages/modplatform/ftb/FtbPage.h
index c9c93897..c9c93897 100644
--- a/application/pages/modplatform/ftb/FtbPage.h
+++ b/launcher/pages/modplatform/ftb/FtbPage.h
diff --git a/application/pages/modplatform/ftb/FtbPage.ui b/launcher/pages/modplatform/ftb/FtbPage.ui
index 135afc6d..135afc6d 100644
--- a/application/pages/modplatform/ftb/FtbPage.ui
+++ b/launcher/pages/modplatform/ftb/FtbPage.ui
diff --git a/application/pages/modplatform/legacy_ftb/ListModel.cpp b/launcher/pages/modplatform/legacy_ftb/ListModel.cpp
index 32596fb3..32596fb3 100644
--- a/application/pages/modplatform/legacy_ftb/ListModel.cpp
+++ b/launcher/pages/modplatform/legacy_ftb/ListModel.cpp
diff --git a/application/pages/modplatform/legacy_ftb/ListModel.h b/launcher/pages/modplatform/legacy_ftb/ListModel.h
index c55df000..c55df000 100644
--- a/application/pages/modplatform/legacy_ftb/ListModel.h
+++ b/launcher/pages/modplatform/legacy_ftb/ListModel.h
diff --git a/application/pages/modplatform/legacy_ftb/Page.cpp b/launcher/pages/modplatform/legacy_ftb/Page.cpp
index a438f76c..a438f76c 100644
--- a/application/pages/modplatform/legacy_ftb/Page.cpp
+++ b/launcher/pages/modplatform/legacy_ftb/Page.cpp
diff --git a/application/pages/modplatform/legacy_ftb/Page.h b/launcher/pages/modplatform/legacy_ftb/Page.h
index e840216e..e840216e 100644
--- a/application/pages/modplatform/legacy_ftb/Page.h
+++ b/launcher/pages/modplatform/legacy_ftb/Page.h
diff --git a/application/pages/modplatform/legacy_ftb/Page.ui b/launcher/pages/modplatform/legacy_ftb/Page.ui
index 15e5d432..15e5d432 100644
--- a/application/pages/modplatform/legacy_ftb/Page.ui
+++ b/launcher/pages/modplatform/legacy_ftb/Page.ui
diff --git a/application/pages/modplatform/technic/TechnicData.h b/launcher/pages/modplatform/technic/TechnicData.h
index 50fd75e8..50fd75e8 100644
--- a/application/pages/modplatform/technic/TechnicData.h
+++ b/launcher/pages/modplatform/technic/TechnicData.h
diff --git a/application/pages/modplatform/technic/TechnicModel.cpp b/launcher/pages/modplatform/technic/TechnicModel.cpp
index def30783..def30783 100644
--- a/application/pages/modplatform/technic/TechnicModel.cpp
+++ b/launcher/pages/modplatform/technic/TechnicModel.cpp
diff --git a/application/pages/modplatform/technic/TechnicModel.h b/launcher/pages/modplatform/technic/TechnicModel.h
index 82a03842..82a03842 100644
--- a/application/pages/modplatform/technic/TechnicModel.h
+++ b/launcher/pages/modplatform/technic/TechnicModel.h
diff --git a/application/pages/modplatform/technic/TechnicPage.cpp b/launcher/pages/modplatform/technic/TechnicPage.cpp
index e836f767..e836f767 100644
--- a/application/pages/modplatform/technic/TechnicPage.cpp
+++ b/launcher/pages/modplatform/technic/TechnicPage.cpp
diff --git a/application/pages/modplatform/technic/TechnicPage.h b/launcher/pages/modplatform/technic/TechnicPage.h
index 27e1258a..27e1258a 100644
--- a/application/pages/modplatform/technic/TechnicPage.h
+++ b/launcher/pages/modplatform/technic/TechnicPage.h
diff --git a/application/pages/modplatform/technic/TechnicPage.ui b/launcher/pages/modplatform/technic/TechnicPage.ui
index 2ca45dd2..2ca45dd2 100644
--- a/application/pages/modplatform/technic/TechnicPage.ui
+++ b/launcher/pages/modplatform/technic/TechnicPage.ui
diff --git a/api/logic/pathmatcher/FSTreeMatcher.h b/launcher/pathmatcher/FSTreeMatcher.h
index 361924af..361924af 100644
--- a/api/logic/pathmatcher/FSTreeMatcher.h
+++ b/launcher/pathmatcher/FSTreeMatcher.h
diff --git a/api/logic/pathmatcher/IPathMatcher.h b/launcher/pathmatcher/IPathMatcher.h
index b60621c9..b60621c9 100644
--- a/api/logic/pathmatcher/IPathMatcher.h
+++ b/launcher/pathmatcher/IPathMatcher.h
diff --git a/api/logic/pathmatcher/MultiMatcher.h b/launcher/pathmatcher/MultiMatcher.h
index 8bc1b6ee..8bc1b6ee 100644
--- a/api/logic/pathmatcher/MultiMatcher.h
+++ b/launcher/pathmatcher/MultiMatcher.h
diff --git a/api/logic/pathmatcher/RegexpMatcher.h b/launcher/pathmatcher/RegexpMatcher.h
index 825d488c..825d488c 100644
--- a/api/logic/pathmatcher/RegexpMatcher.h
+++ b/launcher/pathmatcher/RegexpMatcher.h
diff --git a/application/resources/MultiMC.icns b/launcher/resources/MultiMC.icns
index c4eb59d5..c4eb59d5 100644
--- a/application/resources/MultiMC.icns
+++ b/launcher/resources/MultiMC.icns
diff --git a/application/resources/MultiMC.ico b/launcher/resources/MultiMC.ico
index a86a1f0d..a86a1f0d 100644
--- a/application/resources/MultiMC.ico
+++ b/launcher/resources/MultiMC.ico
diff --git a/application/resources/MultiMC.manifest b/launcher/resources/MultiMC.manifest
index 9278f6e4..9278f6e4 100644
--- a/application/resources/MultiMC.manifest
+++ b/launcher/resources/MultiMC.manifest
diff --git a/application/resources/OSX/OSX.qrc b/launcher/resources/OSX/OSX.qrc
index 19fd4b6a..19fd4b6a 100644
--- a/application/resources/OSX/OSX.qrc
+++ b/launcher/resources/OSX/OSX.qrc
diff --git a/application/resources/OSX/index.theme b/launcher/resources/OSX/index.theme
index 7f90a32e..7f90a32e 100644
--- a/application/resources/OSX/index.theme
+++ b/launcher/resources/OSX/index.theme
diff --git a/application/resources/OSX/scalable/about.svg b/launcher/resources/OSX/scalable/about.svg
index eb87ccf1..eb87ccf1 100644
--- a/application/resources/OSX/scalable/about.svg
+++ b/launcher/resources/OSX/scalable/about.svg
diff --git a/application/resources/OSX/scalable/accounts.svg b/launcher/resources/OSX/scalable/accounts.svg
index 163bcee0..163bcee0 100644
--- a/application/resources/OSX/scalable/accounts.svg
+++ b/launcher/resources/OSX/scalable/accounts.svg
diff --git a/application/resources/OSX/scalable/bug.svg b/launcher/resources/OSX/scalable/bug.svg
index 00565bb6..00565bb6 100644
--- a/application/resources/OSX/scalable/bug.svg
+++ b/launcher/resources/OSX/scalable/bug.svg
diff --git a/application/resources/OSX/scalable/centralmods.svg b/launcher/resources/OSX/scalable/centralmods.svg
index 37b821e4..37b821e4 100644
--- a/application/resources/OSX/scalable/centralmods.svg
+++ b/launcher/resources/OSX/scalable/centralmods.svg
diff --git a/application/resources/OSX/scalable/checkupdate.svg b/launcher/resources/OSX/scalable/checkupdate.svg
index 30cec51f..30cec51f 100644
--- a/application/resources/OSX/scalable/checkupdate.svg
+++ b/launcher/resources/OSX/scalable/checkupdate.svg
diff --git a/application/resources/OSX/scalable/copy.svg b/launcher/resources/OSX/scalable/copy.svg
index 7382d6e2..7382d6e2 100644
--- a/application/resources/OSX/scalable/copy.svg
+++ b/launcher/resources/OSX/scalable/copy.svg
diff --git a/application/resources/OSX/scalable/coremods.svg b/launcher/resources/OSX/scalable/coremods.svg
index b0df6052..b0df6052 100644
--- a/application/resources/OSX/scalable/coremods.svg
+++ b/launcher/resources/OSX/scalable/coremods.svg
diff --git a/application/resources/OSX/scalable/externaltools.svg b/launcher/resources/OSX/scalable/externaltools.svg
index a2b7488e..a2b7488e 100644
--- a/application/resources/OSX/scalable/externaltools.svg
+++ b/launcher/resources/OSX/scalable/externaltools.svg
diff --git a/application/resources/OSX/scalable/help.svg b/launcher/resources/OSX/scalable/help.svg
index 9d1b367c..9d1b367c 100644
--- a/application/resources/OSX/scalable/help.svg
+++ b/launcher/resources/OSX/scalable/help.svg
diff --git a/application/resources/OSX/scalable/instance-settings.svg b/launcher/resources/OSX/scalable/instance-settings.svg
index 394877f8..394877f8 100644
--- a/application/resources/OSX/scalable/instance-settings.svg
+++ b/launcher/resources/OSX/scalable/instance-settings.svg
diff --git a/application/resources/OSX/scalable/jarmods.svg b/launcher/resources/OSX/scalable/jarmods.svg
index 213ec833..213ec833 100644
--- a/application/resources/OSX/scalable/jarmods.svg
+++ b/launcher/resources/OSX/scalable/jarmods.svg
diff --git a/application/resources/OSX/scalable/java.svg b/launcher/resources/OSX/scalable/java.svg
index e1aee159..e1aee159 100644
--- a/application/resources/OSX/scalable/java.svg
+++ b/launcher/resources/OSX/scalable/java.svg
diff --git a/application/resources/OSX/scalable/language.svg b/launcher/resources/OSX/scalable/language.svg
index 4f7d002a..4f7d002a 100644
--- a/application/resources/OSX/scalable/language.svg
+++ b/launcher/resources/OSX/scalable/language.svg
diff --git a/application/resources/OSX/scalable/loadermods.svg b/launcher/resources/OSX/scalable/loadermods.svg
index 76951ebd..76951ebd 100644
--- a/application/resources/OSX/scalable/loadermods.svg
+++ b/launcher/resources/OSX/scalable/loadermods.svg
diff --git a/application/resources/OSX/scalable/log.svg b/launcher/resources/OSX/scalable/log.svg
index 0ac45d54..0ac45d54 100644
--- a/application/resources/OSX/scalable/log.svg
+++ b/launcher/resources/OSX/scalable/log.svg
diff --git a/application/resources/OSX/scalable/minecraft.svg b/launcher/resources/OSX/scalable/minecraft.svg
index 86c915bc..86c915bc 100644
--- a/application/resources/OSX/scalable/minecraft.svg
+++ b/launcher/resources/OSX/scalable/minecraft.svg
diff --git a/application/resources/OSX/scalable/multimc.svg b/launcher/resources/OSX/scalable/multimc.svg
index caad21b5..caad21b5 100644
--- a/application/resources/OSX/scalable/multimc.svg
+++ b/launcher/resources/OSX/scalable/multimc.svg
diff --git a/application/resources/OSX/scalable/new.svg b/launcher/resources/OSX/scalable/new.svg
index 79ee87ba..79ee87ba 100644
--- a/application/resources/OSX/scalable/new.svg
+++ b/launcher/resources/OSX/scalable/new.svg
diff --git a/application/resources/OSX/scalable/news.svg b/launcher/resources/OSX/scalable/news.svg
index b8ce3cd1..b8ce3cd1 100644
--- a/application/resources/OSX/scalable/news.svg
+++ b/launcher/resources/OSX/scalable/news.svg
diff --git a/application/resources/OSX/scalable/notes.svg b/launcher/resources/OSX/scalable/notes.svg
index c2e95cfd..c2e95cfd 100644
--- a/application/resources/OSX/scalable/notes.svg
+++ b/launcher/resources/OSX/scalable/notes.svg
diff --git a/application/resources/OSX/scalable/patreon.svg b/launcher/resources/OSX/scalable/patreon.svg
index 4f0da3e5..4f0da3e5 100644
--- a/application/resources/OSX/scalable/patreon.svg
+++ b/launcher/resources/OSX/scalable/patreon.svg
diff --git a/application/resources/OSX/scalable/proxy.svg b/launcher/resources/OSX/scalable/proxy.svg
index 99acaa2b..99acaa2b 100644
--- a/application/resources/OSX/scalable/proxy.svg
+++ b/launcher/resources/OSX/scalable/proxy.svg
diff --git a/application/resources/OSX/scalable/quickmods.svg b/launcher/resources/OSX/scalable/quickmods.svg
index e0aaad87..e0aaad87 100644
--- a/application/resources/OSX/scalable/quickmods.svg
+++ b/launcher/resources/OSX/scalable/quickmods.svg
diff --git a/application/resources/OSX/scalable/refresh.svg b/launcher/resources/OSX/scalable/refresh.svg
index c97489c1..c97489c1 100644
--- a/application/resources/OSX/scalable/refresh.svg
+++ b/launcher/resources/OSX/scalable/refresh.svg
diff --git a/application/resources/OSX/scalable/resourcepacks.svg b/launcher/resources/OSX/scalable/resourcepacks.svg
index c85d4e3c..c85d4e3c 100644
--- a/application/resources/OSX/scalable/resourcepacks.svg
+++ b/launcher/resources/OSX/scalable/resourcepacks.svg
diff --git a/application/resources/OSX/scalable/screenshots.svg b/launcher/resources/OSX/scalable/screenshots.svg
index 12df0c88..12df0c88 100644
--- a/application/resources/OSX/scalable/screenshots.svg
+++ b/launcher/resources/OSX/scalable/screenshots.svg
diff --git a/application/resources/OSX/scalable/settings.svg b/launcher/resources/OSX/scalable/settings.svg
index dcdd9f1c..dcdd9f1c 100644
--- a/application/resources/OSX/scalable/settings.svg
+++ b/launcher/resources/OSX/scalable/settings.svg
diff --git a/application/resources/OSX/scalable/status-bad.svg b/launcher/resources/OSX/scalable/status-bad.svg
index add7a6f7..add7a6f7 100644
--- a/application/resources/OSX/scalable/status-bad.svg
+++ b/launcher/resources/OSX/scalable/status-bad.svg
diff --git a/application/resources/OSX/scalable/status-good.svg b/launcher/resources/OSX/scalable/status-good.svg
index f10da757..f10da757 100644
--- a/application/resources/OSX/scalable/status-good.svg
+++ b/launcher/resources/OSX/scalable/status-good.svg
diff --git a/application/resources/OSX/scalable/status-yellow.svg b/launcher/resources/OSX/scalable/status-yellow.svg
index fba697bc..fba697bc 100644
--- a/application/resources/OSX/scalable/status-yellow.svg
+++ b/launcher/resources/OSX/scalable/status-yellow.svg
diff --git a/application/resources/OSX/scalable/viewfolder.svg b/launcher/resources/OSX/scalable/viewfolder.svg
index 682c72c7..682c72c7 100644
--- a/application/resources/OSX/scalable/viewfolder.svg
+++ b/launcher/resources/OSX/scalable/viewfolder.svg
diff --git a/application/resources/OSX/scalable/worlds.svg b/launcher/resources/OSX/scalable/worlds.svg
index b1491272..b1491272 100644
--- a/application/resources/OSX/scalable/worlds.svg
+++ b/launcher/resources/OSX/scalable/worlds.svg
diff --git a/application/resources/assets/underconstruction.png b/launcher/resources/assets/underconstruction.png
index 6ae06476..6ae06476 100644
--- a/application/resources/assets/underconstruction.png
+++ b/launcher/resources/assets/underconstruction.png
diff --git a/application/resources/backgrounds/backgrounds.qrc b/launcher/resources/backgrounds/backgrounds.qrc
index 83505635..83505635 100644
--- a/application/resources/backgrounds/backgrounds.qrc
+++ b/launcher/resources/backgrounds/backgrounds.qrc
diff --git a/application/resources/backgrounds/catbgrnd2.png b/launcher/resources/backgrounds/catbgrnd2.png
index e9de7f27..e9de7f27 100644
--- a/application/resources/backgrounds/catbgrnd2.png
+++ b/launcher/resources/backgrounds/catbgrnd2.png
diff --git a/application/resources/backgrounds/catmas.png b/launcher/resources/backgrounds/catmas.png
index 8bdb1d5c..8bdb1d5c 100644
--- a/application/resources/backgrounds/catmas.png
+++ b/launcher/resources/backgrounds/catmas.png
diff --git a/application/resources/documents/documents.qrc b/launcher/resources/documents/documents.qrc
index 007efcde..007efcde 100644
--- a/application/resources/documents/documents.qrc
+++ b/launcher/resources/documents/documents.qrc
diff --git a/application/resources/flat/flat.qrc b/launcher/resources/flat/flat.qrc
index b6e2ee38..b6e2ee38 100644
--- a/application/resources/flat/flat.qrc
+++ b/launcher/resources/flat/flat.qrc
diff --git a/application/resources/flat/index.theme b/launcher/resources/flat/index.theme
index 34e27aa0..34e27aa0 100644
--- a/application/resources/flat/index.theme
+++ b/launcher/resources/flat/index.theme
diff --git a/application/resources/flat/scalable/about.svg b/launcher/resources/flat/scalable/about.svg
index 4f85045d..4f85045d 100644
--- a/application/resources/flat/scalable/about.svg
+++ b/launcher/resources/flat/scalable/about.svg
diff --git a/application/resources/flat/scalable/accounts.svg b/launcher/resources/flat/scalable/accounts.svg
index e6a1328d..e6a1328d 100644
--- a/application/resources/flat/scalable/accounts.svg
+++ b/launcher/resources/flat/scalable/accounts.svg
diff --git a/application/resources/flat/scalable/bug.svg b/launcher/resources/flat/scalable/bug.svg
index ea370faa..ea370faa 100644
--- a/application/resources/flat/scalable/bug.svg
+++ b/launcher/resources/flat/scalable/bug.svg
diff --git a/application/resources/flat/scalable/cat.svg b/launcher/resources/flat/scalable/cat.svg
index e90763b5..e90763b5 100644
--- a/application/resources/flat/scalable/cat.svg
+++ b/launcher/resources/flat/scalable/cat.svg
diff --git a/application/resources/flat/scalable/centralmods.svg b/launcher/resources/flat/scalable/centralmods.svg
index c694662a..c694662a 100644
--- a/application/resources/flat/scalable/centralmods.svg
+++ b/launcher/resources/flat/scalable/centralmods.svg
diff --git a/application/resources/flat/scalable/checkupdate.svg b/launcher/resources/flat/scalable/checkupdate.svg
index e6525a08..e6525a08 100644
--- a/application/resources/flat/scalable/checkupdate.svg
+++ b/launcher/resources/flat/scalable/checkupdate.svg
diff --git a/application/resources/flat/scalable/copy.svg b/launcher/resources/flat/scalable/copy.svg
index 36986e0d..36986e0d 100644
--- a/application/resources/flat/scalable/copy.svg
+++ b/launcher/resources/flat/scalable/copy.svg
diff --git a/application/resources/flat/scalable/coremods.svg b/launcher/resources/flat/scalable/coremods.svg
index 21a3450e..21a3450e 100644
--- a/application/resources/flat/scalable/coremods.svg
+++ b/launcher/resources/flat/scalable/coremods.svg
diff --git a/application/resources/flat/scalable/discord.svg b/launcher/resources/flat/scalable/discord.svg
index ad63180f..ad63180f 100644
--- a/application/resources/flat/scalable/discord.svg
+++ b/launcher/resources/flat/scalable/discord.svg
diff --git a/application/resources/flat/scalable/externaltools.svg b/launcher/resources/flat/scalable/externaltools.svg
index 55820dfc..55820dfc 100644
--- a/application/resources/flat/scalable/externaltools.svg
+++ b/launcher/resources/flat/scalable/externaltools.svg
diff --git a/application/resources/flat/scalable/help.svg b/launcher/resources/flat/scalable/help.svg
index 26d5d7f4..26d5d7f4 100644
--- a/application/resources/flat/scalable/help.svg
+++ b/launcher/resources/flat/scalable/help.svg
diff --git a/application/resources/flat/scalable/instance-settings.svg b/launcher/resources/flat/scalable/instance-settings.svg
index dd9d86ed..dd9d86ed 100644
--- a/application/resources/flat/scalable/instance-settings.svg
+++ b/launcher/resources/flat/scalable/instance-settings.svg
diff --git a/application/resources/flat/scalable/jarmods.svg b/launcher/resources/flat/scalable/jarmods.svg
index db90fa34..db90fa34 100644
--- a/application/resources/flat/scalable/jarmods.svg
+++ b/launcher/resources/flat/scalable/jarmods.svg
diff --git a/application/resources/flat/scalable/java.svg b/launcher/resources/flat/scalable/java.svg
index dc19ee23..dc19ee23 100644
--- a/application/resources/flat/scalable/java.svg
+++ b/launcher/resources/flat/scalable/java.svg
diff --git a/application/resources/flat/scalable/language.svg b/launcher/resources/flat/scalable/language.svg
index f4d3f2f4..f4d3f2f4 100644
--- a/application/resources/flat/scalable/language.svg
+++ b/launcher/resources/flat/scalable/language.svg
diff --git a/application/resources/flat/scalable/loadermods.svg b/launcher/resources/flat/scalable/loadermods.svg
index 8a2fd12c..8a2fd12c 100644
--- a/application/resources/flat/scalable/loadermods.svg
+++ b/launcher/resources/flat/scalable/loadermods.svg
diff --git a/application/resources/flat/scalable/log.svg b/launcher/resources/flat/scalable/log.svg
index e8caa08a..e8caa08a 100644
--- a/application/resources/flat/scalable/log.svg
+++ b/launcher/resources/flat/scalable/log.svg
diff --git a/application/resources/flat/scalable/minecraft.svg b/launcher/resources/flat/scalable/minecraft.svg
index c17c44cd..c17c44cd 100644
--- a/application/resources/flat/scalable/minecraft.svg
+++ b/launcher/resources/flat/scalable/minecraft.svg
diff --git a/application/resources/flat/scalable/multimc.svg b/launcher/resources/flat/scalable/multimc.svg
index 1c1f2359..1c1f2359 100644
--- a/application/resources/flat/scalable/multimc.svg
+++ b/launcher/resources/flat/scalable/multimc.svg
diff --git a/application/resources/flat/scalable/new.svg b/launcher/resources/flat/scalable/new.svg
index 01f19d7c..01f19d7c 100644
--- a/application/resources/flat/scalable/new.svg
+++ b/launcher/resources/flat/scalable/new.svg
diff --git a/application/resources/flat/scalable/news.svg b/launcher/resources/flat/scalable/news.svg
index 8868414e..8868414e 100644
--- a/application/resources/flat/scalable/news.svg
+++ b/launcher/resources/flat/scalable/news.svg
diff --git a/application/resources/flat/scalable/notes.svg b/launcher/resources/flat/scalable/notes.svg
index ebe0cb5a..ebe0cb5a 100644
--- a/application/resources/flat/scalable/notes.svg
+++ b/launcher/resources/flat/scalable/notes.svg
diff --git a/application/resources/flat/scalable/packages.svg b/launcher/resources/flat/scalable/packages.svg
index fe576a43..fe576a43 100644
--- a/application/resources/flat/scalable/packages.svg
+++ b/launcher/resources/flat/scalable/packages.svg
diff --git a/application/resources/flat/scalable/patreon.svg b/launcher/resources/flat/scalable/patreon.svg
index ad561f57..ad561f57 100644
--- a/application/resources/flat/scalable/patreon.svg
+++ b/launcher/resources/flat/scalable/patreon.svg
diff --git a/application/resources/flat/scalable/proxy.svg b/launcher/resources/flat/scalable/proxy.svg
index 4956fec8..4956fec8 100644
--- a/application/resources/flat/scalable/proxy.svg
+++ b/launcher/resources/flat/scalable/proxy.svg
diff --git a/application/resources/flat/scalable/quickmods.svg b/launcher/resources/flat/scalable/quickmods.svg
index 952d1e0e..952d1e0e 100644
--- a/application/resources/flat/scalable/quickmods.svg
+++ b/launcher/resources/flat/scalable/quickmods.svg
diff --git a/application/resources/flat/scalable/reddit-alien.svg b/launcher/resources/flat/scalable/reddit-alien.svg
index 9bcfbedc..9bcfbedc 100644
--- a/application/resources/flat/scalable/reddit-alien.svg
+++ b/launcher/resources/flat/scalable/reddit-alien.svg
diff --git a/application/resources/flat/scalable/refresh.svg b/launcher/resources/flat/scalable/refresh.svg
index 94be1e27..94be1e27 100644
--- a/application/resources/flat/scalable/refresh.svg
+++ b/launcher/resources/flat/scalable/refresh.svg
diff --git a/application/resources/flat/scalable/resourcepacks.svg b/launcher/resources/flat/scalable/resourcepacks.svg
index b6054baf..b6054baf 100644
--- a/application/resources/flat/scalable/resourcepacks.svg
+++ b/launcher/resources/flat/scalable/resourcepacks.svg
diff --git a/application/resources/flat/scalable/screenshot-placeholder.svg b/launcher/resources/flat/scalable/screenshot-placeholder.svg
index 99e0c17a..99e0c17a 100644
--- a/application/resources/flat/scalable/screenshot-placeholder.svg
+++ b/launcher/resources/flat/scalable/screenshot-placeholder.svg
diff --git a/application/resources/flat/scalable/screenshots.svg b/launcher/resources/flat/scalable/screenshots.svg
index 208bb104..208bb104 100644
--- a/application/resources/flat/scalable/screenshots.svg
+++ b/launcher/resources/flat/scalable/screenshots.svg
diff --git a/application/resources/flat/scalable/settings.svg b/launcher/resources/flat/scalable/settings.svg
index dd9d86ed..dd9d86ed 100644
--- a/application/resources/flat/scalable/settings.svg
+++ b/launcher/resources/flat/scalable/settings.svg
diff --git a/application/resources/flat/scalable/star.svg b/launcher/resources/flat/scalable/star.svg
index 878bdca8..878bdca8 100644
--- a/application/resources/flat/scalable/star.svg
+++ b/launcher/resources/flat/scalable/star.svg
diff --git a/application/resources/flat/scalable/status-bad.svg b/launcher/resources/flat/scalable/status-bad.svg
index 3f8e0116..3f8e0116 100644
--- a/application/resources/flat/scalable/status-bad.svg
+++ b/launcher/resources/flat/scalable/status-bad.svg
diff --git a/application/resources/flat/scalable/status-good.svg b/launcher/resources/flat/scalable/status-good.svg
index 3503d6ba..3503d6ba 100644
--- a/application/resources/flat/scalable/status-good.svg
+++ b/launcher/resources/flat/scalable/status-good.svg
diff --git a/application/resources/flat/scalable/status-running.svg b/launcher/resources/flat/scalable/status-running.svg
index 7c750319..7c750319 100644
--- a/application/resources/flat/scalable/status-running.svg
+++ b/launcher/resources/flat/scalable/status-running.svg
diff --git a/application/resources/flat/scalable/status-yellow.svg b/launcher/resources/flat/scalable/status-yellow.svg
index ac2d2349..ac2d2349 100644
--- a/application/resources/flat/scalable/status-yellow.svg
+++ b/launcher/resources/flat/scalable/status-yellow.svg
diff --git a/application/resources/flat/scalable/viewfolder.svg b/launcher/resources/flat/scalable/viewfolder.svg
index 2f5e29c9..2f5e29c9 100644
--- a/application/resources/flat/scalable/viewfolder.svg
+++ b/launcher/resources/flat/scalable/viewfolder.svg
diff --git a/application/resources/flat/scalable/worlds.svg b/launcher/resources/flat/scalable/worlds.svg
index 95a59bd4..95a59bd4 100644
--- a/application/resources/flat/scalable/worlds.svg
+++ b/launcher/resources/flat/scalable/worlds.svg
diff --git a/application/resources/iOS/iOS.qrc b/launcher/resources/iOS/iOS.qrc
index 511e390b..511e390b 100644
--- a/application/resources/iOS/iOS.qrc
+++ b/launcher/resources/iOS/iOS.qrc
diff --git a/application/resources/iOS/index.theme b/launcher/resources/iOS/index.theme
index b0f2f6ba..b0f2f6ba 100644
--- a/application/resources/iOS/index.theme
+++ b/launcher/resources/iOS/index.theme
diff --git a/application/resources/iOS/scalable/about.svg b/launcher/resources/iOS/scalable/about.svg
index c4d35471..c4d35471 100644
--- a/application/resources/iOS/scalable/about.svg
+++ b/launcher/resources/iOS/scalable/about.svg
diff --git a/application/resources/iOS/scalable/accounts.svg b/launcher/resources/iOS/scalable/accounts.svg
index 65f76c3f..65f76c3f 100644
--- a/application/resources/iOS/scalable/accounts.svg
+++ b/launcher/resources/iOS/scalable/accounts.svg
diff --git a/application/resources/iOS/scalable/bug.svg b/launcher/resources/iOS/scalable/bug.svg
index fc4a3d69..fc4a3d69 100644
--- a/application/resources/iOS/scalable/bug.svg
+++ b/launcher/resources/iOS/scalable/bug.svg
diff --git a/application/resources/iOS/scalable/centralmods.svg b/launcher/resources/iOS/scalable/centralmods.svg
index 1b4c4741..1b4c4741 100644
--- a/application/resources/iOS/scalable/centralmods.svg
+++ b/launcher/resources/iOS/scalable/centralmods.svg
diff --git a/application/resources/iOS/scalable/checkupdate.svg b/launcher/resources/iOS/scalable/checkupdate.svg
index 9fc983d1..9fc983d1 100644
--- a/application/resources/iOS/scalable/checkupdate.svg
+++ b/launcher/resources/iOS/scalable/checkupdate.svg
diff --git a/application/resources/iOS/scalable/copy.svg b/launcher/resources/iOS/scalable/copy.svg
index 3ccc2f06..3ccc2f06 100644
--- a/application/resources/iOS/scalable/copy.svg
+++ b/launcher/resources/iOS/scalable/copy.svg
diff --git a/application/resources/iOS/scalable/coremods.svg b/launcher/resources/iOS/scalable/coremods.svg
index ea47872c..ea47872c 100644
--- a/application/resources/iOS/scalable/coremods.svg
+++ b/launcher/resources/iOS/scalable/coremods.svg
diff --git a/application/resources/iOS/scalable/externaltools.svg b/launcher/resources/iOS/scalable/externaltools.svg
index 16e9fa48..16e9fa48 100644
--- a/application/resources/iOS/scalable/externaltools.svg
+++ b/launcher/resources/iOS/scalable/externaltools.svg
diff --git a/application/resources/iOS/scalable/help.svg b/launcher/resources/iOS/scalable/help.svg
index 9c2d2e93..9c2d2e93 100644
--- a/application/resources/iOS/scalable/help.svg
+++ b/launcher/resources/iOS/scalable/help.svg
diff --git a/application/resources/iOS/scalable/instance-settings.svg b/launcher/resources/iOS/scalable/instance-settings.svg
index 95b8a508..95b8a508 100644
--- a/application/resources/iOS/scalable/instance-settings.svg
+++ b/launcher/resources/iOS/scalable/instance-settings.svg
diff --git a/application/resources/iOS/scalable/jarmods.svg b/launcher/resources/iOS/scalable/jarmods.svg
index c4c5ca8c..c4c5ca8c 100644
--- a/application/resources/iOS/scalable/jarmods.svg
+++ b/launcher/resources/iOS/scalable/jarmods.svg
diff --git a/application/resources/iOS/scalable/java.svg b/launcher/resources/iOS/scalable/java.svg
index 8d7c2798..8d7c2798 100644
--- a/application/resources/iOS/scalable/java.svg
+++ b/launcher/resources/iOS/scalable/java.svg
diff --git a/application/resources/iOS/scalable/language.svg b/launcher/resources/iOS/scalable/language.svg
index fcc3436e..fcc3436e 100644
--- a/application/resources/iOS/scalable/language.svg
+++ b/launcher/resources/iOS/scalable/language.svg
diff --git a/application/resources/iOS/scalable/loadermods.svg b/launcher/resources/iOS/scalable/loadermods.svg
index 010efa11..010efa11 100644
--- a/application/resources/iOS/scalable/loadermods.svg
+++ b/launcher/resources/iOS/scalable/loadermods.svg
diff --git a/application/resources/iOS/scalable/log.svg b/launcher/resources/iOS/scalable/log.svg
index 5d1c7f06..5d1c7f06 100644
--- a/application/resources/iOS/scalable/log.svg
+++ b/launcher/resources/iOS/scalable/log.svg
diff --git a/application/resources/iOS/scalable/minecraft.svg b/launcher/resources/iOS/scalable/minecraft.svg
index 069b4e71..069b4e71 100644
--- a/application/resources/iOS/scalable/minecraft.svg
+++ b/launcher/resources/iOS/scalable/minecraft.svg
diff --git a/application/resources/iOS/scalable/multimc.svg b/launcher/resources/iOS/scalable/multimc.svg
index bc819433..bc819433 100644
--- a/application/resources/iOS/scalable/multimc.svg
+++ b/launcher/resources/iOS/scalable/multimc.svg
diff --git a/application/resources/iOS/scalable/new.svg b/launcher/resources/iOS/scalable/new.svg
index 9f221580..9f221580 100644
--- a/application/resources/iOS/scalable/new.svg
+++ b/launcher/resources/iOS/scalable/new.svg
diff --git a/application/resources/iOS/scalable/news.svg b/launcher/resources/iOS/scalable/news.svg
index d3c010bb..d3c010bb 100644
--- a/application/resources/iOS/scalable/news.svg
+++ b/launcher/resources/iOS/scalable/news.svg
diff --git a/application/resources/iOS/scalable/notes.svg b/launcher/resources/iOS/scalable/notes.svg
index b42ebeef..b42ebeef 100644
--- a/application/resources/iOS/scalable/notes.svg
+++ b/launcher/resources/iOS/scalable/notes.svg
diff --git a/application/resources/iOS/scalable/patreon.svg b/launcher/resources/iOS/scalable/patreon.svg
index 1bd06f4a..1bd06f4a 100644
--- a/application/resources/iOS/scalable/patreon.svg
+++ b/launcher/resources/iOS/scalable/patreon.svg
diff --git a/application/resources/iOS/scalable/proxy.svg b/launcher/resources/iOS/scalable/proxy.svg
index f6552281..f6552281 100644
--- a/application/resources/iOS/scalable/proxy.svg
+++ b/launcher/resources/iOS/scalable/proxy.svg
diff --git a/application/resources/iOS/scalable/quickmods.svg b/launcher/resources/iOS/scalable/quickmods.svg
index cd63ba71..cd63ba71 100644
--- a/application/resources/iOS/scalable/quickmods.svg
+++ b/launcher/resources/iOS/scalable/quickmods.svg
diff --git a/application/resources/iOS/scalable/refresh.svg b/launcher/resources/iOS/scalable/refresh.svg
index 297b79c9..297b79c9 100644
--- a/application/resources/iOS/scalable/refresh.svg
+++ b/launcher/resources/iOS/scalable/refresh.svg
diff --git a/application/resources/iOS/scalable/resourcepacks.svg b/launcher/resources/iOS/scalable/resourcepacks.svg
index 5b359d63..5b359d63 100644
--- a/application/resources/iOS/scalable/resourcepacks.svg
+++ b/launcher/resources/iOS/scalable/resourcepacks.svg
diff --git a/application/resources/iOS/scalable/screenshots.svg b/launcher/resources/iOS/scalable/screenshots.svg
index 39ce7b82..39ce7b82 100644
--- a/application/resources/iOS/scalable/screenshots.svg
+++ b/launcher/resources/iOS/scalable/screenshots.svg
diff --git a/application/resources/iOS/scalable/settings.svg b/launcher/resources/iOS/scalable/settings.svg
index 95b8a508..95b8a508 100644
--- a/application/resources/iOS/scalable/settings.svg
+++ b/launcher/resources/iOS/scalable/settings.svg
diff --git a/application/resources/iOS/scalable/status-bad.svg b/launcher/resources/iOS/scalable/status-bad.svg
index 4019c8da..4019c8da 100644
--- a/application/resources/iOS/scalable/status-bad.svg
+++ b/launcher/resources/iOS/scalable/status-bad.svg
diff --git a/application/resources/iOS/scalable/status-good.svg b/launcher/resources/iOS/scalable/status-good.svg
index e1859113..e1859113 100644
--- a/application/resources/iOS/scalable/status-good.svg
+++ b/launcher/resources/iOS/scalable/status-good.svg
diff --git a/application/resources/iOS/scalable/status-yellow.svg b/launcher/resources/iOS/scalable/status-yellow.svg
index d8a28e23..d8a28e23 100644
--- a/application/resources/iOS/scalable/status-yellow.svg
+++ b/launcher/resources/iOS/scalable/status-yellow.svg
diff --git a/application/resources/iOS/scalable/viewfolder.svg b/launcher/resources/iOS/scalable/viewfolder.svg
index 0ae0c0b5..0ae0c0b5 100644
--- a/application/resources/iOS/scalable/viewfolder.svg
+++ b/launcher/resources/iOS/scalable/viewfolder.svg
diff --git a/application/resources/iOS/scalable/worlds.svg b/launcher/resources/iOS/scalable/worlds.svg
index 1596fd76..1596fd76 100644
--- a/application/resources/iOS/scalable/worlds.svg
+++ b/launcher/resources/iOS/scalable/worlds.svg
diff --git a/application/resources/multimc.rc b/launcher/resources/multimc.rc
index e7340f2a..e7340f2a 100644
--- a/application/resources/multimc.rc
+++ b/launcher/resources/multimc.rc
diff --git a/application/resources/multimc/128x128/instances/chicken.png b/launcher/resources/multimc/128x128/instances/chicken.png
index 71f6dedc..71f6dedc 100644
--- a/application/resources/multimc/128x128/instances/chicken.png
+++ b/launcher/resources/multimc/128x128/instances/chicken.png
diff --git a/application/resources/multimc/128x128/instances/creeper.png b/launcher/resources/multimc/128x128/instances/creeper.png
index 41b7d07d..41b7d07d 100644
--- a/application/resources/multimc/128x128/instances/creeper.png
+++ b/launcher/resources/multimc/128x128/instances/creeper.png
diff --git a/application/resources/multimc/128x128/instances/enderpearl.png b/launcher/resources/multimc/128x128/instances/enderpearl.png
index 0a5bf91a..0a5bf91a 100644
--- a/application/resources/multimc/128x128/instances/enderpearl.png
+++ b/launcher/resources/multimc/128x128/instances/enderpearl.png
diff --git a/application/resources/multimc/128x128/instances/flame.png b/launcher/resources/multimc/128x128/instances/flame.png
index 8a50a0b4..8a50a0b4 100644
--- a/application/resources/multimc/128x128/instances/flame.png
+++ b/launcher/resources/multimc/128x128/instances/flame.png
diff --git a/application/resources/multimc/128x128/instances/ftb_glow.png b/launcher/resources/multimc/128x128/instances/ftb_glow.png
index 86632b21..86632b21 100644
--- a/application/resources/multimc/128x128/instances/ftb_glow.png
+++ b/launcher/resources/multimc/128x128/instances/ftb_glow.png
diff --git a/application/resources/multimc/128x128/instances/ftb_logo.png b/launcher/resources/multimc/128x128/instances/ftb_logo.png
index e725b7fe..e725b7fe 100644
--- a/application/resources/multimc/128x128/instances/ftb_logo.png
+++ b/launcher/resources/multimc/128x128/instances/ftb_logo.png
diff --git a/application/resources/multimc/128x128/instances/gear.png b/launcher/resources/multimc/128x128/instances/gear.png
index 75c68a66..75c68a66 100644
--- a/application/resources/multimc/128x128/instances/gear.png
+++ b/launcher/resources/multimc/128x128/instances/gear.png
diff --git a/application/resources/multimc/128x128/instances/herobrine.png b/launcher/resources/multimc/128x128/instances/herobrine.png
index 13f1494c..13f1494c 100644
--- a/application/resources/multimc/128x128/instances/herobrine.png
+++ b/launcher/resources/multimc/128x128/instances/herobrine.png
diff --git a/application/resources/multimc/128x128/instances/infinity.png b/launcher/resources/multimc/128x128/instances/infinity.png
index cc7ca7bc..cc7ca7bc 100644
--- a/application/resources/multimc/128x128/instances/infinity.png
+++ b/launcher/resources/multimc/128x128/instances/infinity.png
diff --git a/application/resources/multimc/128x128/instances/magitech.png b/launcher/resources/multimc/128x128/instances/magitech.png
index 0f81a199..0f81a199 100644
--- a/application/resources/multimc/128x128/instances/magitech.png
+++ b/launcher/resources/multimc/128x128/instances/magitech.png
diff --git a/application/resources/multimc/128x128/instances/meat.png b/launcher/resources/multimc/128x128/instances/meat.png
index fefc9bf1..fefc9bf1 100644
--- a/application/resources/multimc/128x128/instances/meat.png
+++ b/launcher/resources/multimc/128x128/instances/meat.png
diff --git a/application/resources/multimc/128x128/instances/netherstar.png b/launcher/resources/multimc/128x128/instances/netherstar.png
index 132085f0..132085f0 100644
--- a/application/resources/multimc/128x128/instances/netherstar.png
+++ b/launcher/resources/multimc/128x128/instances/netherstar.png
diff --git a/application/resources/multimc/128x128/instances/skeleton.png b/launcher/resources/multimc/128x128/instances/skeleton.png
index 55fcf5a9..55fcf5a9 100644
--- a/application/resources/multimc/128x128/instances/skeleton.png
+++ b/launcher/resources/multimc/128x128/instances/skeleton.png
diff --git a/application/resources/multimc/128x128/instances/squarecreeper.png b/launcher/resources/multimc/128x128/instances/squarecreeper.png
index c82d8406..c82d8406 100644
--- a/application/resources/multimc/128x128/instances/squarecreeper.png
+++ b/launcher/resources/multimc/128x128/instances/squarecreeper.png
diff --git a/application/resources/multimc/128x128/instances/steve.png b/launcher/resources/multimc/128x128/instances/steve.png
index a07cbd2f..a07cbd2f 100644
--- a/application/resources/multimc/128x128/instances/steve.png
+++ b/launcher/resources/multimc/128x128/instances/steve.png
diff --git a/application/resources/multimc/128x128/unknown_server.png b/launcher/resources/multimc/128x128/unknown_server.png
index ec98382d..ec98382d 100644
--- a/application/resources/multimc/128x128/unknown_server.png
+++ b/launcher/resources/multimc/128x128/unknown_server.png
diff --git a/application/resources/multimc/16x16/about.png b/launcher/resources/multimc/16x16/about.png
index a6a986e1..a6a986e1 100644
--- a/application/resources/multimc/16x16/about.png
+++ b/launcher/resources/multimc/16x16/about.png
diff --git a/application/resources/multimc/16x16/bug.png b/launcher/resources/multimc/16x16/bug.png
index 0c5b78b4..0c5b78b4 100644
--- a/application/resources/multimc/16x16/bug.png
+++ b/launcher/resources/multimc/16x16/bug.png
diff --git a/application/resources/multimc/16x16/cat.png b/launcher/resources/multimc/16x16/cat.png
index e6e31b44..e6e31b44 100644
--- a/application/resources/multimc/16x16/cat.png
+++ b/launcher/resources/multimc/16x16/cat.png
diff --git a/application/resources/multimc/16x16/centralmods.png b/launcher/resources/multimc/16x16/centralmods.png
index c1b91c76..c1b91c76 100644
--- a/application/resources/multimc/16x16/centralmods.png
+++ b/launcher/resources/multimc/16x16/centralmods.png
diff --git a/application/resources/multimc/16x16/checkupdate.png b/launcher/resources/multimc/16x16/checkupdate.png
index f3742058..f3742058 100644
--- a/application/resources/multimc/16x16/checkupdate.png
+++ b/launcher/resources/multimc/16x16/checkupdate.png
diff --git a/application/resources/multimc/16x16/copy.png b/launcher/resources/multimc/16x16/copy.png
index ccaed9e1..ccaed9e1 100644
--- a/application/resources/multimc/16x16/copy.png
+++ b/launcher/resources/multimc/16x16/copy.png
diff --git a/application/resources/multimc/16x16/coremods.png b/launcher/resources/multimc/16x16/coremods.png
index af0f1166..af0f1166 100644
--- a/application/resources/multimc/16x16/coremods.png
+++ b/launcher/resources/multimc/16x16/coremods.png
diff --git a/application/resources/multimc/16x16/help.png b/launcher/resources/multimc/16x16/help.png
index e6edf6ba..e6edf6ba 100644
--- a/application/resources/multimc/16x16/help.png
+++ b/launcher/resources/multimc/16x16/help.png
diff --git a/application/resources/multimc/16x16/instance-settings.png b/launcher/resources/multimc/16x16/instance-settings.png
index b916cd24..b916cd24 100644
--- a/application/resources/multimc/16x16/instance-settings.png
+++ b/launcher/resources/multimc/16x16/instance-settings.png
diff --git a/application/resources/multimc/16x16/jarmods.png b/launcher/resources/multimc/16x16/jarmods.png
index 1a97c9c0..1a97c9c0 100644
--- a/application/resources/multimc/16x16/jarmods.png
+++ b/launcher/resources/multimc/16x16/jarmods.png
diff --git a/application/resources/multimc/16x16/loadermods.png b/launcher/resources/multimc/16x16/loadermods.png
index b5ab3fce..b5ab3fce 100644
--- a/application/resources/multimc/16x16/loadermods.png
+++ b/launcher/resources/multimc/16x16/loadermods.png
diff --git a/application/resources/multimc/16x16/log.png b/launcher/resources/multimc/16x16/log.png
index efa2a0b5..efa2a0b5 100644
--- a/application/resources/multimc/16x16/log.png
+++ b/launcher/resources/multimc/16x16/log.png
diff --git a/application/resources/multimc/16x16/minecraft.png b/launcher/resources/multimc/16x16/minecraft.png
index e9f2f2a5..e9f2f2a5 100644
--- a/application/resources/multimc/16x16/minecraft.png
+++ b/launcher/resources/multimc/16x16/minecraft.png
diff --git a/application/resources/multimc/16x16/new.png b/launcher/resources/multimc/16x16/new.png
index 2e56f589..2e56f589 100644
--- a/application/resources/multimc/16x16/new.png
+++ b/launcher/resources/multimc/16x16/new.png
diff --git a/application/resources/multimc/16x16/news.png b/launcher/resources/multimc/16x16/news.png
index 872e85db..872e85db 100644
--- a/application/resources/multimc/16x16/news.png
+++ b/launcher/resources/multimc/16x16/news.png
diff --git a/application/resources/multimc/16x16/noaccount.png b/launcher/resources/multimc/16x16/noaccount.png
index b49bcf36..b49bcf36 100644
--- a/application/resources/multimc/16x16/noaccount.png
+++ b/launcher/resources/multimc/16x16/noaccount.png
diff --git a/application/resources/multimc/16x16/patreon.png b/launcher/resources/multimc/16x16/patreon.png
index 9150c478..9150c478 100644
--- a/application/resources/multimc/16x16/patreon.png
+++ b/launcher/resources/multimc/16x16/patreon.png
diff --git a/application/resources/multimc/16x16/refresh.png b/launcher/resources/multimc/16x16/refresh.png
index 86b6f82c..86b6f82c 100644
--- a/application/resources/multimc/16x16/refresh.png
+++ b/launcher/resources/multimc/16x16/refresh.png
diff --git a/application/resources/multimc/16x16/resourcepacks.png b/launcher/resources/multimc/16x16/resourcepacks.png
index d862f5ca..d862f5ca 100644
--- a/application/resources/multimc/16x16/resourcepacks.png
+++ b/launcher/resources/multimc/16x16/resourcepacks.png
diff --git a/application/resources/multimc/16x16/screenshots.png b/launcher/resources/multimc/16x16/screenshots.png
index 460000d4..460000d4 100644
--- a/application/resources/multimc/16x16/screenshots.png
+++ b/launcher/resources/multimc/16x16/screenshots.png
diff --git a/application/resources/multimc/16x16/settings.png b/launcher/resources/multimc/16x16/settings.png
index b916cd24..b916cd24 100644
--- a/application/resources/multimc/16x16/settings.png
+++ b/launcher/resources/multimc/16x16/settings.png
diff --git a/application/resources/multimc/16x16/star.png b/launcher/resources/multimc/16x16/star.png
index 4963e6ec..4963e6ec 100644
--- a/application/resources/multimc/16x16/star.png
+++ b/launcher/resources/multimc/16x16/star.png
diff --git a/application/resources/multimc/16x16/status-bad.png b/launcher/resources/multimc/16x16/status-bad.png
index 5b3f2051..5b3f2051 100644
--- a/application/resources/multimc/16x16/status-bad.png
+++ b/launcher/resources/multimc/16x16/status-bad.png
diff --git a/application/resources/multimc/16x16/status-good.png b/launcher/resources/multimc/16x16/status-good.png
index 5cbdee81..5cbdee81 100644
--- a/application/resources/multimc/16x16/status-good.png
+++ b/launcher/resources/multimc/16x16/status-good.png
diff --git a/application/resources/multimc/16x16/status-running.png b/launcher/resources/multimc/16x16/status-running.png
index a4c42e39..a4c42e39 100644
--- a/application/resources/multimc/16x16/status-running.png
+++ b/launcher/resources/multimc/16x16/status-running.png
diff --git a/application/resources/multimc/16x16/status-yellow.png b/launcher/resources/multimc/16x16/status-yellow.png
index b25375d1..b25375d1 100644
--- a/application/resources/multimc/16x16/status-yellow.png
+++ b/launcher/resources/multimc/16x16/status-yellow.png
diff --git a/application/resources/multimc/16x16/viewfolder.png b/launcher/resources/multimc/16x16/viewfolder.png
index 98b8a944..98b8a944 100644
--- a/application/resources/multimc/16x16/viewfolder.png
+++ b/launcher/resources/multimc/16x16/viewfolder.png
diff --git a/application/resources/multimc/16x16/worlds.png b/launcher/resources/multimc/16x16/worlds.png
index 1a38f38e..1a38f38e 100644
--- a/application/resources/multimc/16x16/worlds.png
+++ b/launcher/resources/multimc/16x16/worlds.png
diff --git a/application/resources/multimc/22x22/about.png b/launcher/resources/multimc/22x22/about.png
index 57775e25..57775e25 100644
--- a/application/resources/multimc/22x22/about.png
+++ b/launcher/resources/multimc/22x22/about.png
diff --git a/application/resources/multimc/22x22/bug.png b/launcher/resources/multimc/22x22/bug.png
index 90481bba..90481bba 100644
--- a/application/resources/multimc/22x22/bug.png
+++ b/launcher/resources/multimc/22x22/bug.png
diff --git a/application/resources/multimc/22x22/cat.png b/launcher/resources/multimc/22x22/cat.png
index 3ea7ba69..3ea7ba69 100644
--- a/application/resources/multimc/22x22/cat.png
+++ b/launcher/resources/multimc/22x22/cat.png
diff --git a/application/resources/multimc/22x22/centralmods.png b/launcher/resources/multimc/22x22/centralmods.png
index a10f9a2b..a10f9a2b 100644
--- a/application/resources/multimc/22x22/centralmods.png
+++ b/launcher/resources/multimc/22x22/centralmods.png
diff --git a/application/resources/multimc/22x22/checkupdate.png b/launcher/resources/multimc/22x22/checkupdate.png
index badb200c..badb200c 100644
--- a/application/resources/multimc/22x22/checkupdate.png
+++ b/launcher/resources/multimc/22x22/checkupdate.png
diff --git a/application/resources/multimc/22x22/copy.png b/launcher/resources/multimc/22x22/copy.png
index ea236a24..ea236a24 100644
--- a/application/resources/multimc/22x22/copy.png
+++ b/launcher/resources/multimc/22x22/copy.png
diff --git a/application/resources/multimc/22x22/help.png b/launcher/resources/multimc/22x22/help.png
index da79b3e3..da79b3e3 100644
--- a/application/resources/multimc/22x22/help.png
+++ b/launcher/resources/multimc/22x22/help.png
diff --git a/application/resources/multimc/22x22/instance-settings.png b/launcher/resources/multimc/22x22/instance-settings.png
index daf56aad..daf56aad 100644
--- a/application/resources/multimc/22x22/instance-settings.png
+++ b/launcher/resources/multimc/22x22/instance-settings.png
diff --git a/application/resources/multimc/22x22/new.png b/launcher/resources/multimc/22x22/new.png
index c707fbbf..c707fbbf 100644
--- a/application/resources/multimc/22x22/new.png
+++ b/launcher/resources/multimc/22x22/new.png
diff --git a/application/resources/multimc/22x22/news.png b/launcher/resources/multimc/22x22/news.png
index 1953bf7b..1953bf7b 100644
--- a/application/resources/multimc/22x22/news.png
+++ b/launcher/resources/multimc/22x22/news.png
diff --git a/application/resources/multimc/22x22/patreon.png b/launcher/resources/multimc/22x22/patreon.png
index f2c2076c..f2c2076c 100644
--- a/application/resources/multimc/22x22/patreon.png
+++ b/launcher/resources/multimc/22x22/patreon.png
diff --git a/application/resources/multimc/22x22/refresh.png b/launcher/resources/multimc/22x22/refresh.png
index 45b5535c..45b5535c 100644
--- a/application/resources/multimc/22x22/refresh.png
+++ b/launcher/resources/multimc/22x22/refresh.png
diff --git a/application/resources/multimc/22x22/screenshots.png b/launcher/resources/multimc/22x22/screenshots.png
index 6fb42bbd..6fb42bbd 100644
--- a/application/resources/multimc/22x22/screenshots.png
+++ b/launcher/resources/multimc/22x22/screenshots.png
diff --git a/application/resources/multimc/22x22/settings.png b/launcher/resources/multimc/22x22/settings.png
index daf56aad..daf56aad 100644
--- a/application/resources/multimc/22x22/settings.png
+++ b/launcher/resources/multimc/22x22/settings.png
diff --git a/application/resources/multimc/22x22/status-bad.png b/launcher/resources/multimc/22x22/status-bad.png
index 2707539e..2707539e 100644
--- a/application/resources/multimc/22x22/status-bad.png
+++ b/launcher/resources/multimc/22x22/status-bad.png
diff --git a/application/resources/multimc/22x22/status-good.png b/launcher/resources/multimc/22x22/status-good.png
index f55debc3..f55debc3 100644
--- a/application/resources/multimc/22x22/status-good.png
+++ b/launcher/resources/multimc/22x22/status-good.png
diff --git a/application/resources/multimc/22x22/status-running.png b/launcher/resources/multimc/22x22/status-running.png
index 0dffba18..0dffba18 100644
--- a/application/resources/multimc/22x22/status-running.png
+++ b/launcher/resources/multimc/22x22/status-running.png
diff --git a/application/resources/multimc/22x22/status-yellow.png b/launcher/resources/multimc/22x22/status-yellow.png
index 481eb7f3..481eb7f3 100644
--- a/application/resources/multimc/22x22/status-yellow.png
+++ b/launcher/resources/multimc/22x22/status-yellow.png
diff --git a/application/resources/multimc/22x22/viewfolder.png b/launcher/resources/multimc/22x22/viewfolder.png
index b645167f..b645167f 100644
--- a/application/resources/multimc/22x22/viewfolder.png
+++ b/launcher/resources/multimc/22x22/viewfolder.png
diff --git a/application/resources/multimc/22x22/worlds.png b/launcher/resources/multimc/22x22/worlds.png
index e8825bab..e8825bab 100644
--- a/application/resources/multimc/22x22/worlds.png
+++ b/launcher/resources/multimc/22x22/worlds.png
diff --git a/application/resources/multimc/24x24/cat.png b/launcher/resources/multimc/24x24/cat.png
index c93245f6..c93245f6 100644
--- a/application/resources/multimc/24x24/cat.png
+++ b/launcher/resources/multimc/24x24/cat.png
diff --git a/application/resources/multimc/24x24/coremods.png b/launcher/resources/multimc/24x24/coremods.png
index 90603d24..90603d24 100644
--- a/application/resources/multimc/24x24/coremods.png
+++ b/launcher/resources/multimc/24x24/coremods.png
diff --git a/application/resources/multimc/24x24/jarmods.png b/launcher/resources/multimc/24x24/jarmods.png
index 68cb8e9d..68cb8e9d 100644
--- a/application/resources/multimc/24x24/jarmods.png
+++ b/launcher/resources/multimc/24x24/jarmods.png
diff --git a/application/resources/multimc/24x24/loadermods.png b/launcher/resources/multimc/24x24/loadermods.png
index 250a6260..250a6260 100644
--- a/application/resources/multimc/24x24/loadermods.png
+++ b/launcher/resources/multimc/24x24/loadermods.png
diff --git a/application/resources/multimc/24x24/log.png b/launcher/resources/multimc/24x24/log.png
index fe302053..fe302053 100644
--- a/application/resources/multimc/24x24/log.png
+++ b/launcher/resources/multimc/24x24/log.png
diff --git a/application/resources/multimc/24x24/minecraft.png b/launcher/resources/multimc/24x24/minecraft.png
index b31177c9..b31177c9 100644
--- a/application/resources/multimc/24x24/minecraft.png
+++ b/launcher/resources/multimc/24x24/minecraft.png
diff --git a/application/resources/multimc/24x24/noaccount.png b/launcher/resources/multimc/24x24/noaccount.png
index ac12437c..ac12437c 100644
--- a/application/resources/multimc/24x24/noaccount.png
+++ b/launcher/resources/multimc/24x24/noaccount.png
diff --git a/application/resources/multimc/24x24/patreon.png b/launcher/resources/multimc/24x24/patreon.png
index add80668..add80668 100644
--- a/application/resources/multimc/24x24/patreon.png
+++ b/launcher/resources/multimc/24x24/patreon.png
diff --git a/application/resources/multimc/24x24/resourcepacks.png b/launcher/resources/multimc/24x24/resourcepacks.png
index 68359d39..68359d39 100644
--- a/application/resources/multimc/24x24/resourcepacks.png
+++ b/launcher/resources/multimc/24x24/resourcepacks.png
diff --git a/application/resources/multimc/24x24/star.png b/launcher/resources/multimc/24x24/star.png
index 7f16618a..7f16618a 100644
--- a/application/resources/multimc/24x24/star.png
+++ b/launcher/resources/multimc/24x24/star.png
diff --git a/application/resources/multimc/24x24/status-bad.png b/launcher/resources/multimc/24x24/status-bad.png
index d1547a47..d1547a47 100644
--- a/application/resources/multimc/24x24/status-bad.png
+++ b/launcher/resources/multimc/24x24/status-bad.png
diff --git a/application/resources/multimc/24x24/status-good.png b/launcher/resources/multimc/24x24/status-good.png
index 3545bc4c..3545bc4c 100644
--- a/application/resources/multimc/24x24/status-good.png
+++ b/launcher/resources/multimc/24x24/status-good.png
diff --git a/application/resources/multimc/24x24/status-running.png b/launcher/resources/multimc/24x24/status-running.png
index ecd64451..ecd64451 100644
--- a/application/resources/multimc/24x24/status-running.png
+++ b/launcher/resources/multimc/24x24/status-running.png
diff --git a/application/resources/multimc/24x24/status-yellow.png b/launcher/resources/multimc/24x24/status-yellow.png
index dd5fde67..dd5fde67 100644
--- a/application/resources/multimc/24x24/status-yellow.png
+++ b/launcher/resources/multimc/24x24/status-yellow.png
diff --git a/application/resources/multimc/256x256/minecraft.png b/launcher/resources/multimc/256x256/minecraft.png
index 77e3f03e..77e3f03e 100644
--- a/application/resources/multimc/256x256/minecraft.png
+++ b/launcher/resources/multimc/256x256/minecraft.png
diff --git a/application/resources/multimc/32x32/about.png b/launcher/resources/multimc/32x32/about.png
index 5174c4f1..5174c4f1 100644
--- a/application/resources/multimc/32x32/about.png
+++ b/launcher/resources/multimc/32x32/about.png
diff --git a/application/resources/multimc/32x32/bug.png b/launcher/resources/multimc/32x32/bug.png
index ada46653..ada46653 100644
--- a/application/resources/multimc/32x32/bug.png
+++ b/launcher/resources/multimc/32x32/bug.png
diff --git a/application/resources/multimc/32x32/cat.png b/launcher/resources/multimc/32x32/cat.png
index 78ff98e9..78ff98e9 100644
--- a/application/resources/multimc/32x32/cat.png
+++ b/launcher/resources/multimc/32x32/cat.png
diff --git a/application/resources/multimc/32x32/centralmods.png b/launcher/resources/multimc/32x32/centralmods.png
index cd2b8208..cd2b8208 100644
--- a/application/resources/multimc/32x32/centralmods.png
+++ b/launcher/resources/multimc/32x32/centralmods.png
diff --git a/application/resources/multimc/32x32/checkupdate.png b/launcher/resources/multimc/32x32/checkupdate.png
index 754005f9..754005f9 100644
--- a/application/resources/multimc/32x32/checkupdate.png
+++ b/launcher/resources/multimc/32x32/checkupdate.png
diff --git a/application/resources/multimc/32x32/copy.png b/launcher/resources/multimc/32x32/copy.png
index c137b0f1..c137b0f1 100644
--- a/application/resources/multimc/32x32/copy.png
+++ b/launcher/resources/multimc/32x32/copy.png
diff --git a/application/resources/multimc/32x32/coremods.png b/launcher/resources/multimc/32x32/coremods.png
index 770d695e..770d695e 100644
--- a/application/resources/multimc/32x32/coremods.png
+++ b/launcher/resources/multimc/32x32/coremods.png
diff --git a/application/resources/multimc/32x32/help.png b/launcher/resources/multimc/32x32/help.png
index b3854278..b3854278 100644
--- a/application/resources/multimc/32x32/help.png
+++ b/launcher/resources/multimc/32x32/help.png
diff --git a/application/resources/multimc/32x32/instance-settings.png b/launcher/resources/multimc/32x32/instance-settings.png
index a9c0817c..a9c0817c 100644
--- a/application/resources/multimc/32x32/instance-settings.png
+++ b/launcher/resources/multimc/32x32/instance-settings.png
diff --git a/application/resources/multimc/32x32/instances/brick.png b/launcher/resources/multimc/32x32/instances/brick.png
index c324fda0..c324fda0 100644
--- a/application/resources/multimc/32x32/instances/brick.png
+++ b/launcher/resources/multimc/32x32/instances/brick.png
diff --git a/application/resources/multimc/32x32/instances/chicken.png b/launcher/resources/multimc/32x32/instances/chicken.png
index f870467a..f870467a 100644
--- a/application/resources/multimc/32x32/instances/chicken.png
+++ b/launcher/resources/multimc/32x32/instances/chicken.png
diff --git a/application/resources/multimc/32x32/instances/creeper.png b/launcher/resources/multimc/32x32/instances/creeper.png
index a67ecfc3..a67ecfc3 100644
--- a/application/resources/multimc/32x32/instances/creeper.png
+++ b/launcher/resources/multimc/32x32/instances/creeper.png
diff --git a/application/resources/multimc/32x32/instances/diamond.png b/launcher/resources/multimc/32x32/instances/diamond.png
index 1eb26469..1eb26469 100644
--- a/application/resources/multimc/32x32/instances/diamond.png
+++ b/launcher/resources/multimc/32x32/instances/diamond.png
diff --git a/application/resources/multimc/32x32/instances/dirt.png b/launcher/resources/multimc/32x32/instances/dirt.png
index 9e19eb8f..9e19eb8f 100644
--- a/application/resources/multimc/32x32/instances/dirt.png
+++ b/launcher/resources/multimc/32x32/instances/dirt.png
diff --git a/application/resources/multimc/32x32/instances/enderpearl.png b/launcher/resources/multimc/32x32/instances/enderpearl.png
index a818eb8e..a818eb8e 100644
--- a/application/resources/multimc/32x32/instances/enderpearl.png
+++ b/launcher/resources/multimc/32x32/instances/enderpearl.png
diff --git a/application/resources/multimc/32x32/instances/flame.png b/launcher/resources/multimc/32x32/instances/flame.png
index d8987338..d8987338 100644
--- a/application/resources/multimc/32x32/instances/flame.png
+++ b/launcher/resources/multimc/32x32/instances/flame.png
diff --git a/application/resources/multimc/32x32/instances/ftb_glow.png b/launcher/resources/multimc/32x32/instances/ftb_glow.png
index c4e6fd5d..c4e6fd5d 100644
--- a/application/resources/multimc/32x32/instances/ftb_glow.png
+++ b/launcher/resources/multimc/32x32/instances/ftb_glow.png
diff --git a/application/resources/multimc/32x32/instances/ftb_logo.png b/launcher/resources/multimc/32x32/instances/ftb_logo.png
index 20df7171..20df7171 100644
--- a/application/resources/multimc/32x32/instances/ftb_logo.png
+++ b/launcher/resources/multimc/32x32/instances/ftb_logo.png
diff --git a/application/resources/multimc/32x32/instances/gear.png b/launcher/resources/multimc/32x32/instances/gear.png
index da9ba2f9..da9ba2f9 100644
--- a/application/resources/multimc/32x32/instances/gear.png
+++ b/launcher/resources/multimc/32x32/instances/gear.png
diff --git a/application/resources/multimc/32x32/instances/gold.png b/launcher/resources/multimc/32x32/instances/gold.png
index 593410fa..593410fa 100644
--- a/application/resources/multimc/32x32/instances/gold.png
+++ b/launcher/resources/multimc/32x32/instances/gold.png
diff --git a/application/resources/multimc/32x32/instances/grass.png b/launcher/resources/multimc/32x32/instances/grass.png
index f1694547..f1694547 100644
--- a/application/resources/multimc/32x32/instances/grass.png
+++ b/launcher/resources/multimc/32x32/instances/grass.png
diff --git a/application/resources/multimc/32x32/instances/herobrine.png b/launcher/resources/multimc/32x32/instances/herobrine.png
index e5460da3..e5460da3 100644
--- a/application/resources/multimc/32x32/instances/herobrine.png
+++ b/launcher/resources/multimc/32x32/instances/herobrine.png
diff --git a/application/resources/multimc/32x32/instances/infinity.png b/launcher/resources/multimc/32x32/instances/infinity.png
index bd94a3dc..bd94a3dc 100644
--- a/application/resources/multimc/32x32/instances/infinity.png
+++ b/launcher/resources/multimc/32x32/instances/infinity.png
diff --git a/application/resources/multimc/32x32/instances/iron.png b/launcher/resources/multimc/32x32/instances/iron.png
index 3e811bd6..3e811bd6 100644
--- a/application/resources/multimc/32x32/instances/iron.png
+++ b/launcher/resources/multimc/32x32/instances/iron.png
diff --git a/application/resources/multimc/32x32/instances/magitech.png b/launcher/resources/multimc/32x32/instances/magitech.png
index 6fd8ff60..6fd8ff60 100644
--- a/application/resources/multimc/32x32/instances/magitech.png
+++ b/launcher/resources/multimc/32x32/instances/magitech.png
diff --git a/application/resources/multimc/32x32/instances/meat.png b/launcher/resources/multimc/32x32/instances/meat.png
index 6694859d..6694859d 100644
--- a/application/resources/multimc/32x32/instances/meat.png
+++ b/launcher/resources/multimc/32x32/instances/meat.png
diff --git a/application/resources/multimc/32x32/instances/netherstar.png b/launcher/resources/multimc/32x32/instances/netherstar.png
index 43cb5113..43cb5113 100644
--- a/application/resources/multimc/32x32/instances/netherstar.png
+++ b/launcher/resources/multimc/32x32/instances/netherstar.png
diff --git a/application/resources/multimc/32x32/instances/planks.png b/launcher/resources/multimc/32x32/instances/planks.png
index a94b7502..a94b7502 100644
--- a/application/resources/multimc/32x32/instances/planks.png
+++ b/launcher/resources/multimc/32x32/instances/planks.png
diff --git a/application/resources/multimc/32x32/instances/skeleton.png b/launcher/resources/multimc/32x32/instances/skeleton.png
index 0c8d3505..0c8d3505 100644
--- a/application/resources/multimc/32x32/instances/skeleton.png
+++ b/launcher/resources/multimc/32x32/instances/skeleton.png
diff --git a/application/resources/multimc/32x32/instances/squarecreeper.png b/launcher/resources/multimc/32x32/instances/squarecreeper.png
index b78c4ae0..b78c4ae0 100644
--- a/application/resources/multimc/32x32/instances/squarecreeper.png
+++ b/launcher/resources/multimc/32x32/instances/squarecreeper.png
diff --git a/application/resources/multimc/32x32/instances/steve.png b/launcher/resources/multimc/32x32/instances/steve.png
index 07c6acde..07c6acde 100644
--- a/application/resources/multimc/32x32/instances/steve.png
+++ b/launcher/resources/multimc/32x32/instances/steve.png
diff --git a/application/resources/multimc/32x32/instances/stone.png b/launcher/resources/multimc/32x32/instances/stone.png
index 1b6ef7a4..1b6ef7a4 100644
--- a/application/resources/multimc/32x32/instances/stone.png
+++ b/launcher/resources/multimc/32x32/instances/stone.png
diff --git a/application/resources/multimc/32x32/instances/tnt.png b/launcher/resources/multimc/32x32/instances/tnt.png
index e40d404d..e40d404d 100644
--- a/application/resources/multimc/32x32/instances/tnt.png
+++ b/launcher/resources/multimc/32x32/instances/tnt.png
diff --git a/application/resources/multimc/32x32/jarmods.png b/launcher/resources/multimc/32x32/jarmods.png
index 5cda173a..5cda173a 100644
--- a/application/resources/multimc/32x32/jarmods.png
+++ b/launcher/resources/multimc/32x32/jarmods.png
diff --git a/application/resources/multimc/32x32/loadermods.png b/launcher/resources/multimc/32x32/loadermods.png
index c4ca12e2..c4ca12e2 100644
--- a/application/resources/multimc/32x32/loadermods.png
+++ b/launcher/resources/multimc/32x32/loadermods.png
diff --git a/application/resources/multimc/32x32/log.png b/launcher/resources/multimc/32x32/log.png
index d620da12..d620da12 100644
--- a/application/resources/multimc/32x32/log.png
+++ b/launcher/resources/multimc/32x32/log.png
diff --git a/application/resources/multimc/32x32/minecraft.png b/launcher/resources/multimc/32x32/minecraft.png
index 816bec98..816bec98 100644
--- a/application/resources/multimc/32x32/minecraft.png
+++ b/launcher/resources/multimc/32x32/minecraft.png
diff --git a/application/resources/multimc/32x32/new.png b/launcher/resources/multimc/32x32/new.png
index a3555ba4..a3555ba4 100644
--- a/application/resources/multimc/32x32/new.png
+++ b/launcher/resources/multimc/32x32/new.png
diff --git a/application/resources/multimc/32x32/news.png b/launcher/resources/multimc/32x32/news.png
index c579fd44..c579fd44 100644
--- a/application/resources/multimc/32x32/news.png
+++ b/launcher/resources/multimc/32x32/news.png
diff --git a/application/resources/multimc/32x32/noaccount.png b/launcher/resources/multimc/32x32/noaccount.png
index a73afc94..a73afc94 100644
--- a/application/resources/multimc/32x32/noaccount.png
+++ b/launcher/resources/multimc/32x32/noaccount.png
diff --git a/application/resources/multimc/32x32/patreon.png b/launcher/resources/multimc/32x32/patreon.png
index 70085aa1..70085aa1 100644
--- a/application/resources/multimc/32x32/patreon.png
+++ b/launcher/resources/multimc/32x32/patreon.png
diff --git a/application/resources/multimc/32x32/refresh.png b/launcher/resources/multimc/32x32/refresh.png
index afa2a9d7..afa2a9d7 100644
--- a/application/resources/multimc/32x32/refresh.png
+++ b/launcher/resources/multimc/32x32/refresh.png
diff --git a/application/resources/multimc/32x32/resourcepacks.png b/launcher/resources/multimc/32x32/resourcepacks.png
index c14759ef..c14759ef 100644
--- a/application/resources/multimc/32x32/resourcepacks.png
+++ b/launcher/resources/multimc/32x32/resourcepacks.png
diff --git a/application/resources/multimc/32x32/screenshots.png b/launcher/resources/multimc/32x32/screenshots.png
index 4fcd6224..4fcd6224 100644
--- a/application/resources/multimc/32x32/screenshots.png
+++ b/launcher/resources/multimc/32x32/screenshots.png
diff --git a/application/resources/multimc/32x32/settings.png b/launcher/resources/multimc/32x32/settings.png
index a9c0817c..a9c0817c 100644
--- a/application/resources/multimc/32x32/settings.png
+++ b/launcher/resources/multimc/32x32/settings.png
diff --git a/application/resources/multimc/32x32/star.png b/launcher/resources/multimc/32x32/star.png
index b271f0d1..b271f0d1 100644
--- a/application/resources/multimc/32x32/star.png
+++ b/launcher/resources/multimc/32x32/star.png
diff --git a/application/resources/multimc/32x32/status-bad.png b/launcher/resources/multimc/32x32/status-bad.png
index 8c2c9d4f..8c2c9d4f 100644
--- a/application/resources/multimc/32x32/status-bad.png
+++ b/launcher/resources/multimc/32x32/status-bad.png
diff --git a/application/resources/multimc/32x32/status-good.png b/launcher/resources/multimc/32x32/status-good.png
index 1a805e68..1a805e68 100644
--- a/application/resources/multimc/32x32/status-good.png
+++ b/launcher/resources/multimc/32x32/status-good.png
diff --git a/application/resources/multimc/32x32/status-running.png b/launcher/resources/multimc/32x32/status-running.png
index f561f01a..f561f01a 100644
--- a/application/resources/multimc/32x32/status-running.png
+++ b/launcher/resources/multimc/32x32/status-running.png
diff --git a/application/resources/multimc/32x32/status-yellow.png b/launcher/resources/multimc/32x32/status-yellow.png
index 42c68552..42c68552 100644
--- a/application/resources/multimc/32x32/status-yellow.png
+++ b/launcher/resources/multimc/32x32/status-yellow.png
diff --git a/application/resources/multimc/32x32/viewfolder.png b/launcher/resources/multimc/32x32/viewfolder.png
index 74ab8fa6..74ab8fa6 100644
--- a/application/resources/multimc/32x32/viewfolder.png
+++ b/launcher/resources/multimc/32x32/viewfolder.png
diff --git a/application/resources/multimc/32x32/worlds.png b/launcher/resources/multimc/32x32/worlds.png
index c986596c..c986596c 100644
--- a/application/resources/multimc/32x32/worlds.png
+++ b/launcher/resources/multimc/32x32/worlds.png
diff --git a/application/resources/multimc/48x48/about.png b/launcher/resources/multimc/48x48/about.png
index b4ac71b8..b4ac71b8 100644
--- a/application/resources/multimc/48x48/about.png
+++ b/launcher/resources/multimc/48x48/about.png
diff --git a/application/resources/multimc/48x48/bug.png b/launcher/resources/multimc/48x48/bug.png
index 298f9397..298f9397 100644
--- a/application/resources/multimc/48x48/bug.png
+++ b/launcher/resources/multimc/48x48/bug.png
diff --git a/application/resources/multimc/48x48/cat.png b/launcher/resources/multimc/48x48/cat.png
index 25912a3c..25912a3c 100644
--- a/application/resources/multimc/48x48/cat.png
+++ b/launcher/resources/multimc/48x48/cat.png
diff --git a/application/resources/multimc/48x48/centralmods.png b/launcher/resources/multimc/48x48/centralmods.png
index d927e39b..d927e39b 100644
--- a/application/resources/multimc/48x48/centralmods.png
+++ b/launcher/resources/multimc/48x48/centralmods.png
diff --git a/application/resources/multimc/48x48/checkupdate.png b/launcher/resources/multimc/48x48/checkupdate.png
index 2e2c7d6b..2e2c7d6b 100644
--- a/application/resources/multimc/48x48/checkupdate.png
+++ b/launcher/resources/multimc/48x48/checkupdate.png
diff --git a/application/resources/multimc/48x48/copy.png b/launcher/resources/multimc/48x48/copy.png
index ea40e34b..ea40e34b 100644
--- a/application/resources/multimc/48x48/copy.png
+++ b/launcher/resources/multimc/48x48/copy.png
diff --git a/application/resources/multimc/48x48/help.png b/launcher/resources/multimc/48x48/help.png
index 82d828fa..82d828fa 100644
--- a/application/resources/multimc/48x48/help.png
+++ b/launcher/resources/multimc/48x48/help.png
diff --git a/application/resources/multimc/48x48/instance-settings.png b/launcher/resources/multimc/48x48/instance-settings.png
index 6674eb23..6674eb23 100644
--- a/application/resources/multimc/48x48/instance-settings.png
+++ b/launcher/resources/multimc/48x48/instance-settings.png
diff --git a/application/resources/multimc/48x48/log.png b/launcher/resources/multimc/48x48/log.png
index 45f60e6b..45f60e6b 100644
--- a/application/resources/multimc/48x48/log.png
+++ b/launcher/resources/multimc/48x48/log.png
diff --git a/application/resources/multimc/48x48/minecraft.png b/launcher/resources/multimc/48x48/minecraft.png
index 38fc9f6c..38fc9f6c 100644
--- a/application/resources/multimc/48x48/minecraft.png
+++ b/launcher/resources/multimc/48x48/minecraft.png
diff --git a/application/resources/multimc/48x48/new.png b/launcher/resources/multimc/48x48/new.png
index a81753b3..a81753b3 100644
--- a/application/resources/multimc/48x48/new.png
+++ b/launcher/resources/multimc/48x48/new.png
diff --git a/application/resources/multimc/48x48/news.png b/launcher/resources/multimc/48x48/news.png
index 0f82d857..0f82d857 100644
--- a/application/resources/multimc/48x48/news.png
+++ b/launcher/resources/multimc/48x48/news.png
diff --git a/application/resources/multimc/48x48/noaccount.png b/launcher/resources/multimc/48x48/noaccount.png
index 4703796c..4703796c 100644
--- a/application/resources/multimc/48x48/noaccount.png
+++ b/launcher/resources/multimc/48x48/noaccount.png
diff --git a/application/resources/multimc/48x48/patreon.png b/launcher/resources/multimc/48x48/patreon.png
index 7aec4d7d..7aec4d7d 100644
--- a/application/resources/multimc/48x48/patreon.png
+++ b/launcher/resources/multimc/48x48/patreon.png
diff --git a/application/resources/multimc/48x48/refresh.png b/launcher/resources/multimc/48x48/refresh.png
index 0b08b238..0b08b238 100644
--- a/application/resources/multimc/48x48/refresh.png
+++ b/launcher/resources/multimc/48x48/refresh.png
diff --git a/application/resources/multimc/48x48/screenshots.png b/launcher/resources/multimc/48x48/screenshots.png
index 03c0059f..03c0059f 100644
--- a/application/resources/multimc/48x48/screenshots.png
+++ b/launcher/resources/multimc/48x48/screenshots.png
diff --git a/application/resources/multimc/48x48/settings.png b/launcher/resources/multimc/48x48/settings.png
index 6674eb23..6674eb23 100644
--- a/application/resources/multimc/48x48/settings.png
+++ b/launcher/resources/multimc/48x48/settings.png
diff --git a/application/resources/multimc/48x48/star.png b/launcher/resources/multimc/48x48/star.png
index d9468e7e..d9468e7e 100644
--- a/application/resources/multimc/48x48/star.png
+++ b/launcher/resources/multimc/48x48/star.png
diff --git a/application/resources/multimc/48x48/status-bad.png b/launcher/resources/multimc/48x48/status-bad.png
index 41c9cf22..41c9cf22 100644
--- a/application/resources/multimc/48x48/status-bad.png
+++ b/launcher/resources/multimc/48x48/status-bad.png
diff --git a/application/resources/multimc/48x48/status-good.png b/launcher/resources/multimc/48x48/status-good.png
index df7cb59b..df7cb59b 100644
--- a/application/resources/multimc/48x48/status-good.png
+++ b/launcher/resources/multimc/48x48/status-good.png
diff --git a/application/resources/multimc/48x48/status-running.png b/launcher/resources/multimc/48x48/status-running.png
index b8c0bf7c..b8c0bf7c 100644
--- a/application/resources/multimc/48x48/status-running.png
+++ b/launcher/resources/multimc/48x48/status-running.png
diff --git a/application/resources/multimc/48x48/status-yellow.png b/launcher/resources/multimc/48x48/status-yellow.png
index 4f3b11d6..4f3b11d6 100644
--- a/application/resources/multimc/48x48/status-yellow.png
+++ b/launcher/resources/multimc/48x48/status-yellow.png
diff --git a/application/resources/multimc/48x48/viewfolder.png b/launcher/resources/multimc/48x48/viewfolder.png
index 0492a736..0492a736 100644
--- a/application/resources/multimc/48x48/viewfolder.png
+++ b/launcher/resources/multimc/48x48/viewfolder.png
diff --git a/application/resources/multimc/48x48/worlds.png b/launcher/resources/multimc/48x48/worlds.png
index 4fc33751..4fc33751 100644
--- a/application/resources/multimc/48x48/worlds.png
+++ b/launcher/resources/multimc/48x48/worlds.png
diff --git a/application/resources/multimc/50x50/instances/enderman.png b/launcher/resources/multimc/50x50/instances/enderman.png
index 9f3a72b3..9f3a72b3 100644
--- a/application/resources/multimc/50x50/instances/enderman.png
+++ b/launcher/resources/multimc/50x50/instances/enderman.png
diff --git a/application/resources/multimc/64x64/about.png b/launcher/resources/multimc/64x64/about.png
index b83e9269..b83e9269 100644
--- a/application/resources/multimc/64x64/about.png
+++ b/launcher/resources/multimc/64x64/about.png
diff --git a/application/resources/multimc/64x64/bug.png b/launcher/resources/multimc/64x64/bug.png
index 156b0315..156b0315 100644
--- a/application/resources/multimc/64x64/bug.png
+++ b/launcher/resources/multimc/64x64/bug.png
diff --git a/application/resources/multimc/64x64/cat.png b/launcher/resources/multimc/64x64/cat.png
index 2cc21f80..2cc21f80 100644
--- a/application/resources/multimc/64x64/cat.png
+++ b/launcher/resources/multimc/64x64/cat.png
diff --git a/application/resources/multimc/64x64/centralmods.png b/launcher/resources/multimc/64x64/centralmods.png
index 8831f437..8831f437 100644
--- a/application/resources/multimc/64x64/centralmods.png
+++ b/launcher/resources/multimc/64x64/centralmods.png
diff --git a/application/resources/multimc/64x64/checkupdate.png b/launcher/resources/multimc/64x64/checkupdate.png
index dd1e29ac..dd1e29ac 100644
--- a/application/resources/multimc/64x64/checkupdate.png
+++ b/launcher/resources/multimc/64x64/checkupdate.png
diff --git a/application/resources/multimc/64x64/copy.png b/launcher/resources/multimc/64x64/copy.png
index d12cf9c8..d12cf9c8 100644
--- a/application/resources/multimc/64x64/copy.png
+++ b/launcher/resources/multimc/64x64/copy.png
diff --git a/application/resources/multimc/64x64/coremods.png b/launcher/resources/multimc/64x64/coremods.png
index 668be334..668be334 100644
--- a/application/resources/multimc/64x64/coremods.png
+++ b/launcher/resources/multimc/64x64/coremods.png
diff --git a/application/resources/multimc/64x64/help.png b/launcher/resources/multimc/64x64/help.png
index 0f3948c2..0f3948c2 100644
--- a/application/resources/multimc/64x64/help.png
+++ b/launcher/resources/multimc/64x64/help.png
diff --git a/application/resources/multimc/64x64/instance-settings.png b/launcher/resources/multimc/64x64/instance-settings.png
index e3ff58fa..e3ff58fa 100644
--- a/application/resources/multimc/64x64/instance-settings.png
+++ b/launcher/resources/multimc/64x64/instance-settings.png
diff --git a/application/resources/multimc/64x64/jarmods.png b/launcher/resources/multimc/64x64/jarmods.png
index 55d1a42a..55d1a42a 100644
--- a/application/resources/multimc/64x64/jarmods.png
+++ b/launcher/resources/multimc/64x64/jarmods.png
diff --git a/application/resources/multimc/64x64/loadermods.png b/launcher/resources/multimc/64x64/loadermods.png
index 24618fd0..24618fd0 100644
--- a/application/resources/multimc/64x64/loadermods.png
+++ b/launcher/resources/multimc/64x64/loadermods.png
diff --git a/application/resources/multimc/64x64/log.png b/launcher/resources/multimc/64x64/log.png
index 0f531cdf..0f531cdf 100644
--- a/application/resources/multimc/64x64/log.png
+++ b/launcher/resources/multimc/64x64/log.png
diff --git a/application/resources/multimc/64x64/new.png b/launcher/resources/multimc/64x64/new.png
index c3c6796c..c3c6796c 100644
--- a/application/resources/multimc/64x64/new.png
+++ b/launcher/resources/multimc/64x64/new.png
diff --git a/application/resources/multimc/64x64/news.png b/launcher/resources/multimc/64x64/news.png
index e306eed3..e306eed3 100644
--- a/application/resources/multimc/64x64/news.png
+++ b/launcher/resources/multimc/64x64/news.png
diff --git a/application/resources/multimc/64x64/patreon.png b/launcher/resources/multimc/64x64/patreon.png
index ef5d690e..ef5d690e 100644
--- a/application/resources/multimc/64x64/patreon.png
+++ b/launcher/resources/multimc/64x64/patreon.png
diff --git a/application/resources/multimc/64x64/refresh.png b/launcher/resources/multimc/64x64/refresh.png
index 8373d819..8373d819 100644
--- a/application/resources/multimc/64x64/refresh.png
+++ b/launcher/resources/multimc/64x64/refresh.png
diff --git a/application/resources/multimc/64x64/resourcepacks.png b/launcher/resources/multimc/64x64/resourcepacks.png
index fb874e7d..fb874e7d 100644
--- a/application/resources/multimc/64x64/resourcepacks.png
+++ b/launcher/resources/multimc/64x64/resourcepacks.png
diff --git a/application/resources/multimc/64x64/screenshots.png b/launcher/resources/multimc/64x64/screenshots.png
index af18e39c..af18e39c 100644
--- a/application/resources/multimc/64x64/screenshots.png
+++ b/launcher/resources/multimc/64x64/screenshots.png
diff --git a/application/resources/multimc/64x64/settings.png b/launcher/resources/multimc/64x64/settings.png
index e3ff58fa..e3ff58fa 100644
--- a/application/resources/multimc/64x64/settings.png
+++ b/launcher/resources/multimc/64x64/settings.png
diff --git a/application/resources/multimc/64x64/star.png b/launcher/resources/multimc/64x64/star.png
index 4ed5d978..4ed5d978 100644
--- a/application/resources/multimc/64x64/star.png
+++ b/launcher/resources/multimc/64x64/star.png
diff --git a/application/resources/multimc/64x64/status-bad.png b/launcher/resources/multimc/64x64/status-bad.png
index 64060ba0..64060ba0 100644
--- a/application/resources/multimc/64x64/status-bad.png
+++ b/launcher/resources/multimc/64x64/status-bad.png
diff --git a/application/resources/multimc/64x64/status-good.png b/launcher/resources/multimc/64x64/status-good.png
index e862ddcd..e862ddcd 100644
--- a/application/resources/multimc/64x64/status-good.png
+++ b/launcher/resources/multimc/64x64/status-good.png
diff --git a/application/resources/multimc/64x64/status-running.png b/launcher/resources/multimc/64x64/status-running.png
index 38afda0f..38afda0f 100644
--- a/application/resources/multimc/64x64/status-running.png
+++ b/launcher/resources/multimc/64x64/status-running.png
diff --git a/application/resources/multimc/64x64/status-yellow.png b/launcher/resources/multimc/64x64/status-yellow.png
index 3d54d320..3d54d320 100644
--- a/application/resources/multimc/64x64/status-yellow.png
+++ b/launcher/resources/multimc/64x64/status-yellow.png
diff --git a/application/resources/multimc/64x64/viewfolder.png b/launcher/resources/multimc/64x64/viewfolder.png
index 7d531f9c..7d531f9c 100644
--- a/application/resources/multimc/64x64/viewfolder.png
+++ b/launcher/resources/multimc/64x64/viewfolder.png
diff --git a/application/resources/multimc/64x64/worlds.png b/launcher/resources/multimc/64x64/worlds.png
index 1d40f1df..1d40f1df 100644
--- a/application/resources/multimc/64x64/worlds.png
+++ b/launcher/resources/multimc/64x64/worlds.png
diff --git a/application/resources/multimc/8x8/noaccount.png b/launcher/resources/multimc/8x8/noaccount.png
index 466e4c07..466e4c07 100644
--- a/application/resources/multimc/8x8/noaccount.png
+++ b/launcher/resources/multimc/8x8/noaccount.png
diff --git a/application/resources/multimc/index.theme b/launcher/resources/multimc/index.theme
index 6061b7f8..6061b7f8 100644
--- a/application/resources/multimc/index.theme
+++ b/launcher/resources/multimc/index.theme
diff --git a/application/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc
index 249e8e28..249e8e28 100644
--- a/application/resources/multimc/multimc.qrc
+++ b/launcher/resources/multimc/multimc.qrc
diff --git a/application/resources/multimc/scalable/atlauncher-placeholder.png b/launcher/resources/multimc/scalable/atlauncher-placeholder.png
index f4314c43..f4314c43 100644
--- a/application/resources/multimc/scalable/atlauncher-placeholder.png
+++ b/launcher/resources/multimc/scalable/atlauncher-placeholder.png
diff --git a/application/resources/multimc/scalable/atlauncher.svg b/launcher/resources/multimc/scalable/atlauncher.svg
index 1bb5f359..1bb5f359 100644
--- a/application/resources/multimc/scalable/atlauncher.svg
+++ b/launcher/resources/multimc/scalable/atlauncher.svg
diff --git a/application/resources/multimc/scalable/bug.svg b/launcher/resources/multimc/scalable/bug.svg
index 178e3c23..178e3c23 100644
--- a/application/resources/multimc/scalable/bug.svg
+++ b/launcher/resources/multimc/scalable/bug.svg
diff --git a/application/resources/multimc/scalable/centralmods.svg b/launcher/resources/multimc/scalable/centralmods.svg
index a8b123d0..a8b123d0 100644
--- a/application/resources/multimc/scalable/centralmods.svg
+++ b/launcher/resources/multimc/scalable/centralmods.svg
diff --git a/application/resources/multimc/scalable/checkupdate.svg b/launcher/resources/multimc/scalable/checkupdate.svg
index fc09cb4c..fc09cb4c 100644
--- a/application/resources/multimc/scalable/checkupdate.svg
+++ b/launcher/resources/multimc/scalable/checkupdate.svg
diff --git a/application/resources/multimc/scalable/custom-commands.svg b/launcher/resources/multimc/scalable/custom-commands.svg
index b7f1a149..b7f1a149 100644
--- a/application/resources/multimc/scalable/custom-commands.svg
+++ b/launcher/resources/multimc/scalable/custom-commands.svg
diff --git a/application/resources/multimc/scalable/discord.svg b/launcher/resources/multimc/scalable/discord.svg
index 067be1e8..067be1e8 100644
--- a/application/resources/multimc/scalable/discord.svg
+++ b/launcher/resources/multimc/scalable/discord.svg
diff --git a/application/resources/multimc/scalable/instances/bee.svg b/launcher/resources/multimc/scalable/instances/bee.svg
index 49f216c8..49f216c8 100644
--- a/application/resources/multimc/scalable/instances/bee.svg
+++ b/launcher/resources/multimc/scalable/instances/bee.svg
diff --git a/application/resources/multimc/scalable/instances/fox.svg b/launcher/resources/multimc/scalable/instances/fox.svg
index fcf16b2f..fcf16b2f 100644
--- a/application/resources/multimc/scalable/instances/fox.svg
+++ b/launcher/resources/multimc/scalable/instances/fox.svg
diff --git a/application/resources/multimc/scalable/java.svg b/launcher/resources/multimc/scalable/java.svg
index fd15e5c6..fd15e5c6 100644
--- a/application/resources/multimc/scalable/java.svg
+++ b/launcher/resources/multimc/scalable/java.svg
diff --git a/application/resources/multimc/scalable/language.svg b/launcher/resources/multimc/scalable/language.svg
index 968e3538..968e3538 100644
--- a/application/resources/multimc/scalable/language.svg
+++ b/launcher/resources/multimc/scalable/language.svg
diff --git a/application/resources/multimc/scalable/logo.svg b/launcher/resources/multimc/scalable/logo.svg
index 8bb0e289..8bb0e289 100644
--- a/application/resources/multimc/scalable/logo.svg
+++ b/launcher/resources/multimc/scalable/logo.svg
diff --git a/application/resources/multimc/scalable/multimc.svg b/launcher/resources/multimc/scalable/multimc.svg
index 8bb0e289..8bb0e289 100644
--- a/application/resources/multimc/scalable/multimc.svg
+++ b/launcher/resources/multimc/scalable/multimc.svg
diff --git a/application/resources/multimc/scalable/new.svg b/launcher/resources/multimc/scalable/new.svg
index c9cff358..c9cff358 100644
--- a/application/resources/multimc/scalable/new.svg
+++ b/launcher/resources/multimc/scalable/new.svg
diff --git a/application/resources/multimc/scalable/news.svg b/launcher/resources/multimc/scalable/news.svg
index 67a370df..67a370df 100644
--- a/application/resources/multimc/scalable/news.svg
+++ b/launcher/resources/multimc/scalable/news.svg
diff --git a/application/resources/multimc/scalable/proxy.svg b/launcher/resources/multimc/scalable/proxy.svg
index 55ee6f93..55ee6f93 100644
--- a/application/resources/multimc/scalable/proxy.svg
+++ b/launcher/resources/multimc/scalable/proxy.svg
diff --git a/application/resources/multimc/scalable/reddit-alien.svg b/launcher/resources/multimc/scalable/reddit-alien.svg
index 46061a56..46061a56 100644
--- a/application/resources/multimc/scalable/reddit-alien.svg
+++ b/launcher/resources/multimc/scalable/reddit-alien.svg
diff --git a/application/resources/multimc/scalable/screenshot-placeholder.svg b/launcher/resources/multimc/scalable/screenshot-placeholder.svg
index a7a2a3d6..a7a2a3d6 100644
--- a/application/resources/multimc/scalable/screenshot-placeholder.svg
+++ b/launcher/resources/multimc/scalable/screenshot-placeholder.svg
diff --git a/application/resources/multimc/scalable/screenshots.svg b/launcher/resources/multimc/scalable/screenshots.svg
index a3d4d8e2..a3d4d8e2 100644
--- a/application/resources/multimc/scalable/screenshots.svg
+++ b/launcher/resources/multimc/scalable/screenshots.svg
diff --git a/application/resources/multimc/scalable/status-bad.svg b/launcher/resources/multimc/scalable/status-bad.svg
index 9f47307e..9f47307e 100644
--- a/application/resources/multimc/scalable/status-bad.svg
+++ b/launcher/resources/multimc/scalable/status-bad.svg
diff --git a/application/resources/multimc/scalable/status-good.svg b/launcher/resources/multimc/scalable/status-good.svg
index 0a35c80f..0a35c80f 100644
--- a/application/resources/multimc/scalable/status-good.svg
+++ b/launcher/resources/multimc/scalable/status-good.svg
diff --git a/application/resources/multimc/scalable/status-running.svg b/launcher/resources/multimc/scalable/status-running.svg
index 18209940..18209940 100644
--- a/application/resources/multimc/scalable/status-running.svg
+++ b/launcher/resources/multimc/scalable/status-running.svg
diff --git a/application/resources/multimc/scalable/status-yellow.svg b/launcher/resources/multimc/scalable/status-yellow.svg
index 140e6082..140e6082 100644
--- a/application/resources/multimc/scalable/status-yellow.svg
+++ b/launcher/resources/multimc/scalable/status-yellow.svg
diff --git a/application/resources/multimc/scalable/technic.svg b/launcher/resources/multimc/scalable/technic.svg
index 91cbd3d7..91cbd3d7 100644
--- a/application/resources/multimc/scalable/technic.svg
+++ b/launcher/resources/multimc/scalable/technic.svg
diff --git a/application/resources/multimc/scalable/viewfolder.svg b/launcher/resources/multimc/scalable/viewfolder.svg
index 4ba0ed0a..4ba0ed0a 100644
--- a/application/resources/multimc/scalable/viewfolder.svg
+++ b/launcher/resources/multimc/scalable/viewfolder.svg
diff --git a/application/resources/pe_blue/index.theme b/launcher/resources/pe_blue/index.theme
index c9e0d93a..c9e0d93a 100644
--- a/application/resources/pe_blue/index.theme
+++ b/launcher/resources/pe_blue/index.theme
diff --git a/application/resources/pe_blue/pe_blue.qrc b/launcher/resources/pe_blue/pe_blue.qrc
index 98445d88..98445d88 100644
--- a/application/resources/pe_blue/pe_blue.qrc
+++ b/launcher/resources/pe_blue/pe_blue.qrc
diff --git a/application/resources/pe_blue/scalable/about.svg b/launcher/resources/pe_blue/scalable/about.svg
index 56e7fc9b..56e7fc9b 100644
--- a/application/resources/pe_blue/scalable/about.svg
+++ b/launcher/resources/pe_blue/scalable/about.svg
diff --git a/application/resources/pe_blue/scalable/accounts.svg b/launcher/resources/pe_blue/scalable/accounts.svg
index 77e3f45a..77e3f45a 100644
--- a/application/resources/pe_blue/scalable/accounts.svg
+++ b/launcher/resources/pe_blue/scalable/accounts.svg
diff --git a/application/resources/pe_blue/scalable/bug.svg b/launcher/resources/pe_blue/scalable/bug.svg
index 75a19e29..75a19e29 100644
--- a/application/resources/pe_blue/scalable/bug.svg
+++ b/launcher/resources/pe_blue/scalable/bug.svg
diff --git a/application/resources/pe_blue/scalable/centralmods.svg b/launcher/resources/pe_blue/scalable/centralmods.svg
index cda39b1f..cda39b1f 100644
--- a/application/resources/pe_blue/scalable/centralmods.svg
+++ b/launcher/resources/pe_blue/scalable/centralmods.svg
diff --git a/application/resources/pe_blue/scalable/checkupdate.svg b/launcher/resources/pe_blue/scalable/checkupdate.svg
index a7d9ee81..a7d9ee81 100644
--- a/application/resources/pe_blue/scalable/checkupdate.svg
+++ b/launcher/resources/pe_blue/scalable/checkupdate.svg
diff --git a/application/resources/pe_blue/scalable/copy.svg b/launcher/resources/pe_blue/scalable/copy.svg
index 7ce014ed..7ce014ed 100644
--- a/application/resources/pe_blue/scalable/copy.svg
+++ b/launcher/resources/pe_blue/scalable/copy.svg
diff --git a/application/resources/pe_blue/scalable/coremods.svg b/launcher/resources/pe_blue/scalable/coremods.svg
index 4cc030d0..4cc030d0 100644
--- a/application/resources/pe_blue/scalable/coremods.svg
+++ b/launcher/resources/pe_blue/scalable/coremods.svg
diff --git a/application/resources/pe_blue/scalable/externaltools.svg b/launcher/resources/pe_blue/scalable/externaltools.svg
index 45b73496..45b73496 100644
--- a/application/resources/pe_blue/scalable/externaltools.svg
+++ b/launcher/resources/pe_blue/scalable/externaltools.svg
diff --git a/application/resources/pe_blue/scalable/help.svg b/launcher/resources/pe_blue/scalable/help.svg
index e98540cb..e98540cb 100644
--- a/application/resources/pe_blue/scalable/help.svg
+++ b/launcher/resources/pe_blue/scalable/help.svg
diff --git a/application/resources/pe_blue/scalable/instance-settings.svg b/launcher/resources/pe_blue/scalable/instance-settings.svg
index 43f0b2f2..43f0b2f2 100644
--- a/application/resources/pe_blue/scalable/instance-settings.svg
+++ b/launcher/resources/pe_blue/scalable/instance-settings.svg
diff --git a/application/resources/pe_blue/scalable/jarmods.svg b/launcher/resources/pe_blue/scalable/jarmods.svg
index bb75f4b1..bb75f4b1 100644
--- a/application/resources/pe_blue/scalable/jarmods.svg
+++ b/launcher/resources/pe_blue/scalable/jarmods.svg
diff --git a/application/resources/pe_blue/scalable/java.svg b/launcher/resources/pe_blue/scalable/java.svg
index 5e369203..5e369203 100644
--- a/application/resources/pe_blue/scalable/java.svg
+++ b/launcher/resources/pe_blue/scalable/java.svg
diff --git a/application/resources/pe_blue/scalable/language.svg b/launcher/resources/pe_blue/scalable/language.svg
index 92868516..92868516 100644
--- a/application/resources/pe_blue/scalable/language.svg
+++ b/launcher/resources/pe_blue/scalable/language.svg
diff --git a/application/resources/pe_blue/scalable/loadermods.svg b/launcher/resources/pe_blue/scalable/loadermods.svg
index a54dc211..a54dc211 100644
--- a/application/resources/pe_blue/scalable/loadermods.svg
+++ b/launcher/resources/pe_blue/scalable/loadermods.svg
diff --git a/application/resources/pe_blue/scalable/log.svg b/launcher/resources/pe_blue/scalable/log.svg
index 89d373f4..89d373f4 100644
--- a/application/resources/pe_blue/scalable/log.svg
+++ b/launcher/resources/pe_blue/scalable/log.svg
diff --git a/application/resources/pe_blue/scalable/minecraft.svg b/launcher/resources/pe_blue/scalable/minecraft.svg
index 2fe6a028..2fe6a028 100644
--- a/application/resources/pe_blue/scalable/minecraft.svg
+++ b/launcher/resources/pe_blue/scalable/minecraft.svg
diff --git a/application/resources/pe_blue/scalable/multimc.svg b/launcher/resources/pe_blue/scalable/multimc.svg
index 820c0b53..820c0b53 100644
--- a/application/resources/pe_blue/scalable/multimc.svg
+++ b/launcher/resources/pe_blue/scalable/multimc.svg
diff --git a/application/resources/pe_blue/scalable/new.svg b/launcher/resources/pe_blue/scalable/new.svg
index dcc8579e..dcc8579e 100644
--- a/application/resources/pe_blue/scalable/new.svg
+++ b/launcher/resources/pe_blue/scalable/new.svg
diff --git a/application/resources/pe_blue/scalable/news.svg b/launcher/resources/pe_blue/scalable/news.svg
index 3ca3be37..3ca3be37 100644
--- a/application/resources/pe_blue/scalable/news.svg
+++ b/launcher/resources/pe_blue/scalable/news.svg
diff --git a/application/resources/pe_blue/scalable/notes.svg b/launcher/resources/pe_blue/scalable/notes.svg
index d0991259..d0991259 100644
--- a/application/resources/pe_blue/scalable/notes.svg
+++ b/launcher/resources/pe_blue/scalable/notes.svg
diff --git a/application/resources/pe_blue/scalable/patreon.svg b/launcher/resources/pe_blue/scalable/patreon.svg
index 644b9b41..644b9b41 100644
--- a/application/resources/pe_blue/scalable/patreon.svg
+++ b/launcher/resources/pe_blue/scalable/patreon.svg
diff --git a/application/resources/pe_blue/scalable/proxy.svg b/launcher/resources/pe_blue/scalable/proxy.svg
index 8266f9b8..8266f9b8 100644
--- a/application/resources/pe_blue/scalable/proxy.svg
+++ b/launcher/resources/pe_blue/scalable/proxy.svg
diff --git a/application/resources/pe_blue/scalable/quickmods.svg b/launcher/resources/pe_blue/scalable/quickmods.svg
index 8b577376..8b577376 100644
--- a/application/resources/pe_blue/scalable/quickmods.svg
+++ b/launcher/resources/pe_blue/scalable/quickmods.svg
diff --git a/application/resources/pe_blue/scalable/refresh.svg b/launcher/resources/pe_blue/scalable/refresh.svg
index a3d2281d..a3d2281d 100644
--- a/application/resources/pe_blue/scalable/refresh.svg
+++ b/launcher/resources/pe_blue/scalable/refresh.svg
diff --git a/application/resources/pe_blue/scalable/resourcepacks.svg b/launcher/resources/pe_blue/scalable/resourcepacks.svg
index a17e7e82..a17e7e82 100644
--- a/application/resources/pe_blue/scalable/resourcepacks.svg
+++ b/launcher/resources/pe_blue/scalable/resourcepacks.svg
diff --git a/application/resources/pe_blue/scalable/screenshots.svg b/launcher/resources/pe_blue/scalable/screenshots.svg
index 1aa4e559..1aa4e559 100644
--- a/application/resources/pe_blue/scalable/screenshots.svg
+++ b/launcher/resources/pe_blue/scalable/screenshots.svg
diff --git a/application/resources/pe_blue/scalable/settings.svg b/launcher/resources/pe_blue/scalable/settings.svg
index 43f0b2f2..43f0b2f2 100644
--- a/application/resources/pe_blue/scalable/settings.svg
+++ b/launcher/resources/pe_blue/scalable/settings.svg
diff --git a/application/resources/pe_blue/scalable/status-bad.svg b/launcher/resources/pe_blue/scalable/status-bad.svg
index 4a48b5d8..4a48b5d8 100644
--- a/application/resources/pe_blue/scalable/status-bad.svg
+++ b/launcher/resources/pe_blue/scalable/status-bad.svg
diff --git a/application/resources/pe_blue/scalable/status-good.svg b/launcher/resources/pe_blue/scalable/status-good.svg
index 4cfa56f0..4cfa56f0 100644
--- a/application/resources/pe_blue/scalable/status-good.svg
+++ b/launcher/resources/pe_blue/scalable/status-good.svg
diff --git a/application/resources/pe_blue/scalable/status-yellow.svg b/launcher/resources/pe_blue/scalable/status-yellow.svg
index 0551fed2..0551fed2 100644
--- a/application/resources/pe_blue/scalable/status-yellow.svg
+++ b/launcher/resources/pe_blue/scalable/status-yellow.svg
diff --git a/application/resources/pe_blue/scalable/viewfolder.svg b/launcher/resources/pe_blue/scalable/viewfolder.svg
index 2634f8ff..2634f8ff 100644
--- a/application/resources/pe_blue/scalable/viewfolder.svg
+++ b/launcher/resources/pe_blue/scalable/viewfolder.svg
diff --git a/application/resources/pe_blue/scalable/worlds.svg b/launcher/resources/pe_blue/scalable/worlds.svg
index 1670c035..1670c035 100644
--- a/application/resources/pe_blue/scalable/worlds.svg
+++ b/launcher/resources/pe_blue/scalable/worlds.svg
diff --git a/application/resources/pe_colored/index.theme b/launcher/resources/pe_colored/index.theme
index b757bbd7..b757bbd7 100644
--- a/application/resources/pe_colored/index.theme
+++ b/launcher/resources/pe_colored/index.theme
diff --git a/application/resources/pe_colored/pe_colored.qrc b/launcher/resources/pe_colored/pe_colored.qrc
index fbaaf9e4..fbaaf9e4 100644
--- a/application/resources/pe_colored/pe_colored.qrc
+++ b/launcher/resources/pe_colored/pe_colored.qrc
diff --git a/application/resources/pe_colored/scalable/about.svg b/launcher/resources/pe_colored/scalable/about.svg
index 95e99689..95e99689 100644
--- a/application/resources/pe_colored/scalable/about.svg
+++ b/launcher/resources/pe_colored/scalable/about.svg
diff --git a/application/resources/pe_colored/scalable/accounts.svg b/launcher/resources/pe_colored/scalable/accounts.svg
index 301eb368..301eb368 100644
--- a/application/resources/pe_colored/scalable/accounts.svg
+++ b/launcher/resources/pe_colored/scalable/accounts.svg
diff --git a/application/resources/pe_colored/scalable/bug.svg b/launcher/resources/pe_colored/scalable/bug.svg
index 8c92df0a..8c92df0a 100644
--- a/application/resources/pe_colored/scalable/bug.svg
+++ b/launcher/resources/pe_colored/scalable/bug.svg
diff --git a/application/resources/pe_colored/scalable/centralmods.svg b/launcher/resources/pe_colored/scalable/centralmods.svg
index 57a97259..57a97259 100644
--- a/application/resources/pe_colored/scalable/centralmods.svg
+++ b/launcher/resources/pe_colored/scalable/centralmods.svg
diff --git a/application/resources/pe_colored/scalable/checkupdate.svg b/launcher/resources/pe_colored/scalable/checkupdate.svg
index 0adc8eeb..0adc8eeb 100644
--- a/application/resources/pe_colored/scalable/checkupdate.svg
+++ b/launcher/resources/pe_colored/scalable/checkupdate.svg
diff --git a/application/resources/pe_colored/scalable/copy.svg b/launcher/resources/pe_colored/scalable/copy.svg
index b9b0f1b1..b9b0f1b1 100644
--- a/application/resources/pe_colored/scalable/copy.svg
+++ b/launcher/resources/pe_colored/scalable/copy.svg
diff --git a/application/resources/pe_colored/scalable/coremods.svg b/launcher/resources/pe_colored/scalable/coremods.svg
index ca7a22f0..ca7a22f0 100644
--- a/application/resources/pe_colored/scalable/coremods.svg
+++ b/launcher/resources/pe_colored/scalable/coremods.svg
diff --git a/application/resources/pe_colored/scalable/externaltools.svg b/launcher/resources/pe_colored/scalable/externaltools.svg
index 1469674f..1469674f 100644
--- a/application/resources/pe_colored/scalable/externaltools.svg
+++ b/launcher/resources/pe_colored/scalable/externaltools.svg
diff --git a/application/resources/pe_colored/scalable/help.svg b/launcher/resources/pe_colored/scalable/help.svg
index c1ee5258..c1ee5258 100644
--- a/application/resources/pe_colored/scalable/help.svg
+++ b/launcher/resources/pe_colored/scalable/help.svg
diff --git a/application/resources/pe_colored/scalable/instance-settings.svg b/launcher/resources/pe_colored/scalable/instance-settings.svg
index 72032f8a..72032f8a 100644
--- a/application/resources/pe_colored/scalable/instance-settings.svg
+++ b/launcher/resources/pe_colored/scalable/instance-settings.svg
diff --git a/application/resources/pe_colored/scalable/jarmods.svg b/launcher/resources/pe_colored/scalable/jarmods.svg
index bb75f4b1..bb75f4b1 100644
--- a/application/resources/pe_colored/scalable/jarmods.svg
+++ b/launcher/resources/pe_colored/scalable/jarmods.svg
diff --git a/application/resources/pe_colored/scalable/java.svg b/launcher/resources/pe_colored/scalable/java.svg
index 32c0225b..32c0225b 100644
--- a/application/resources/pe_colored/scalable/java.svg
+++ b/launcher/resources/pe_colored/scalable/java.svg
diff --git a/application/resources/pe_colored/scalable/language.svg b/launcher/resources/pe_colored/scalable/language.svg
index 80c1dcad..80c1dcad 100644
--- a/application/resources/pe_colored/scalable/language.svg
+++ b/launcher/resources/pe_colored/scalable/language.svg
diff --git a/application/resources/pe_colored/scalable/loadermods.svg b/launcher/resources/pe_colored/scalable/loadermods.svg
index 2d80c7f3..2d80c7f3 100644
--- a/application/resources/pe_colored/scalable/loadermods.svg
+++ b/launcher/resources/pe_colored/scalable/loadermods.svg
diff --git a/application/resources/pe_colored/scalable/log.svg b/launcher/resources/pe_colored/scalable/log.svg
index 42659b53..42659b53 100644
--- a/application/resources/pe_colored/scalable/log.svg
+++ b/launcher/resources/pe_colored/scalable/log.svg
diff --git a/application/resources/pe_colored/scalable/minecraft.svg b/launcher/resources/pe_colored/scalable/minecraft.svg
index 52815487..52815487 100644
--- a/application/resources/pe_colored/scalable/minecraft.svg
+++ b/launcher/resources/pe_colored/scalable/minecraft.svg
diff --git a/application/resources/pe_colored/scalable/multimc.svg b/launcher/resources/pe_colored/scalable/multimc.svg
index a146c52e..a146c52e 100644
--- a/application/resources/pe_colored/scalable/multimc.svg
+++ b/launcher/resources/pe_colored/scalable/multimc.svg
diff --git a/application/resources/pe_colored/scalable/new.svg b/launcher/resources/pe_colored/scalable/new.svg
index f18ed28a..f18ed28a 100644
--- a/application/resources/pe_colored/scalable/new.svg
+++ b/launcher/resources/pe_colored/scalable/new.svg
diff --git a/application/resources/pe_colored/scalable/news.svg b/launcher/resources/pe_colored/scalable/news.svg
index 4f924cd8..4f924cd8 100644
--- a/application/resources/pe_colored/scalable/news.svg
+++ b/launcher/resources/pe_colored/scalable/news.svg
diff --git a/application/resources/pe_colored/scalable/notes.svg b/launcher/resources/pe_colored/scalable/notes.svg
index 55ece163..55ece163 100644
--- a/application/resources/pe_colored/scalable/notes.svg
+++ b/launcher/resources/pe_colored/scalable/notes.svg
diff --git a/application/resources/pe_colored/scalable/patreon.svg b/launcher/resources/pe_colored/scalable/patreon.svg
index d3c6d2d5..d3c6d2d5 100644
--- a/application/resources/pe_colored/scalable/patreon.svg
+++ b/launcher/resources/pe_colored/scalable/patreon.svg
diff --git a/application/resources/pe_colored/scalable/proxy.svg b/launcher/resources/pe_colored/scalable/proxy.svg
index 0aee69b7..0aee69b7 100644
--- a/application/resources/pe_colored/scalable/proxy.svg
+++ b/launcher/resources/pe_colored/scalable/proxy.svg
diff --git a/application/resources/pe_colored/scalable/quickmods.svg b/launcher/resources/pe_colored/scalable/quickmods.svg
index 199b2dae..199b2dae 100644
--- a/application/resources/pe_colored/scalable/quickmods.svg
+++ b/launcher/resources/pe_colored/scalable/quickmods.svg
diff --git a/application/resources/pe_colored/scalable/refresh.svg b/launcher/resources/pe_colored/scalable/refresh.svg
index c2e7e91f..c2e7e91f 100644
--- a/application/resources/pe_colored/scalable/refresh.svg
+++ b/launcher/resources/pe_colored/scalable/refresh.svg
diff --git a/application/resources/pe_colored/scalable/resourcepacks.svg b/launcher/resources/pe_colored/scalable/resourcepacks.svg
index 0318354c..0318354c 100644
--- a/application/resources/pe_colored/scalable/resourcepacks.svg
+++ b/launcher/resources/pe_colored/scalable/resourcepacks.svg
diff --git a/application/resources/pe_colored/scalable/screenshots.svg b/launcher/resources/pe_colored/scalable/screenshots.svg
index 844fcbaa..844fcbaa 100644
--- a/application/resources/pe_colored/scalable/screenshots.svg
+++ b/launcher/resources/pe_colored/scalable/screenshots.svg
diff --git a/application/resources/pe_colored/scalable/settings.svg b/launcher/resources/pe_colored/scalable/settings.svg
index 72032f8a..72032f8a 100644
--- a/application/resources/pe_colored/scalable/settings.svg
+++ b/launcher/resources/pe_colored/scalable/settings.svg
diff --git a/application/resources/pe_colored/scalable/status-bad.svg b/launcher/resources/pe_colored/scalable/status-bad.svg
index bc42c248..bc42c248 100644
--- a/application/resources/pe_colored/scalable/status-bad.svg
+++ b/launcher/resources/pe_colored/scalable/status-bad.svg
diff --git a/application/resources/pe_colored/scalable/status-good.svg b/launcher/resources/pe_colored/scalable/status-good.svg
index 4cfa56f0..4cfa56f0 100644
--- a/application/resources/pe_colored/scalable/status-good.svg
+++ b/launcher/resources/pe_colored/scalable/status-good.svg
diff --git a/application/resources/pe_colored/scalable/status-yellow.svg b/launcher/resources/pe_colored/scalable/status-yellow.svg
index 0551fed2..0551fed2 100644
--- a/application/resources/pe_colored/scalable/status-yellow.svg
+++ b/launcher/resources/pe_colored/scalable/status-yellow.svg
diff --git a/application/resources/pe_colored/scalable/viewfolder.svg b/launcher/resources/pe_colored/scalable/viewfolder.svg
index 91832577..91832577 100644
--- a/application/resources/pe_colored/scalable/viewfolder.svg
+++ b/launcher/resources/pe_colored/scalable/viewfolder.svg
diff --git a/application/resources/pe_colored/scalable/worlds.svg b/launcher/resources/pe_colored/scalable/worlds.svg
index 087ba7c9..087ba7c9 100644
--- a/application/resources/pe_colored/scalable/worlds.svg
+++ b/launcher/resources/pe_colored/scalable/worlds.svg
diff --git a/application/resources/pe_dark/index.theme b/launcher/resources/pe_dark/index.theme
index b7d1ad01..b7d1ad01 100644
--- a/application/resources/pe_dark/index.theme
+++ b/launcher/resources/pe_dark/index.theme
diff --git a/application/resources/pe_dark/pe_dark.qrc b/launcher/resources/pe_dark/pe_dark.qrc
index a57b6a14..a57b6a14 100644
--- a/application/resources/pe_dark/pe_dark.qrc
+++ b/launcher/resources/pe_dark/pe_dark.qrc
diff --git a/application/resources/pe_dark/scalable/about.svg b/launcher/resources/pe_dark/scalable/about.svg
index e75ea6ca..e75ea6ca 100644
--- a/application/resources/pe_dark/scalable/about.svg
+++ b/launcher/resources/pe_dark/scalable/about.svg
diff --git a/application/resources/pe_dark/scalable/accounts.svg b/launcher/resources/pe_dark/scalable/accounts.svg
index 6d46b2df..6d46b2df 100644
--- a/application/resources/pe_dark/scalable/accounts.svg
+++ b/launcher/resources/pe_dark/scalable/accounts.svg
diff --git a/application/resources/pe_dark/scalable/bug.svg b/launcher/resources/pe_dark/scalable/bug.svg
index 9da71adb..9da71adb 100644
--- a/application/resources/pe_dark/scalable/bug.svg
+++ b/launcher/resources/pe_dark/scalable/bug.svg
diff --git a/application/resources/pe_dark/scalable/centralmods.svg b/launcher/resources/pe_dark/scalable/centralmods.svg
index f3b0c0e4..f3b0c0e4 100644
--- a/application/resources/pe_dark/scalable/centralmods.svg
+++ b/launcher/resources/pe_dark/scalable/centralmods.svg
diff --git a/application/resources/pe_dark/scalable/checkupdate.svg b/launcher/resources/pe_dark/scalable/checkupdate.svg
index 97585447..97585447 100644
--- a/application/resources/pe_dark/scalable/checkupdate.svg
+++ b/launcher/resources/pe_dark/scalable/checkupdate.svg
diff --git a/application/resources/pe_dark/scalable/copy.svg b/launcher/resources/pe_dark/scalable/copy.svg
index 8c30ac0b..8c30ac0b 100644
--- a/application/resources/pe_dark/scalable/copy.svg
+++ b/launcher/resources/pe_dark/scalable/copy.svg
diff --git a/application/resources/pe_dark/scalable/coremods.svg b/launcher/resources/pe_dark/scalable/coremods.svg
index 1e2eb227..1e2eb227 100644
--- a/application/resources/pe_dark/scalable/coremods.svg
+++ b/launcher/resources/pe_dark/scalable/coremods.svg
diff --git a/application/resources/pe_dark/scalable/externaltools.svg b/launcher/resources/pe_dark/scalable/externaltools.svg
index 29b45f26..29b45f26 100644
--- a/application/resources/pe_dark/scalable/externaltools.svg
+++ b/launcher/resources/pe_dark/scalable/externaltools.svg
diff --git a/application/resources/pe_dark/scalable/help.svg b/launcher/resources/pe_dark/scalable/help.svg
index 2a1518ae..2a1518ae 100644
--- a/application/resources/pe_dark/scalable/help.svg
+++ b/launcher/resources/pe_dark/scalable/help.svg
diff --git a/application/resources/pe_dark/scalable/instance-settings.svg b/launcher/resources/pe_dark/scalable/instance-settings.svg
index c9f701e7..c9f701e7 100644
--- a/application/resources/pe_dark/scalable/instance-settings.svg
+++ b/launcher/resources/pe_dark/scalable/instance-settings.svg
diff --git a/application/resources/pe_dark/scalable/jarmods.svg b/launcher/resources/pe_dark/scalable/jarmods.svg
index cb9a97ba..cb9a97ba 100644
--- a/application/resources/pe_dark/scalable/jarmods.svg
+++ b/launcher/resources/pe_dark/scalable/jarmods.svg
diff --git a/application/resources/pe_dark/scalable/java.svg b/launcher/resources/pe_dark/scalable/java.svg
index 9e1091fa..9e1091fa 100644
--- a/application/resources/pe_dark/scalable/java.svg
+++ b/launcher/resources/pe_dark/scalable/java.svg
diff --git a/application/resources/pe_dark/scalable/language.svg b/launcher/resources/pe_dark/scalable/language.svg
index 1a9b4c5c..1a9b4c5c 100644
--- a/application/resources/pe_dark/scalable/language.svg
+++ b/launcher/resources/pe_dark/scalable/language.svg
diff --git a/application/resources/pe_dark/scalable/loadermods.svg b/launcher/resources/pe_dark/scalable/loadermods.svg
index 24226a09..24226a09 100644
--- a/application/resources/pe_dark/scalable/loadermods.svg
+++ b/launcher/resources/pe_dark/scalable/loadermods.svg
diff --git a/application/resources/pe_dark/scalable/log.svg b/launcher/resources/pe_dark/scalable/log.svg
index 68686a7d..68686a7d 100644
--- a/application/resources/pe_dark/scalable/log.svg
+++ b/launcher/resources/pe_dark/scalable/log.svg
diff --git a/application/resources/pe_dark/scalable/minecraft.svg b/launcher/resources/pe_dark/scalable/minecraft.svg
index 01baf575..01baf575 100644
--- a/application/resources/pe_dark/scalable/minecraft.svg
+++ b/launcher/resources/pe_dark/scalable/minecraft.svg
diff --git a/application/resources/pe_dark/scalable/multimc.svg b/launcher/resources/pe_dark/scalable/multimc.svg
index e4cf7b7f..e4cf7b7f 100644
--- a/application/resources/pe_dark/scalable/multimc.svg
+++ b/launcher/resources/pe_dark/scalable/multimc.svg
diff --git a/application/resources/pe_dark/scalable/new.svg b/launcher/resources/pe_dark/scalable/new.svg
index 0377aceb..0377aceb 100644
--- a/application/resources/pe_dark/scalable/new.svg
+++ b/launcher/resources/pe_dark/scalable/new.svg
diff --git a/application/resources/pe_dark/scalable/news.svg b/launcher/resources/pe_dark/scalable/news.svg
index 84979dcb..84979dcb 100644
--- a/application/resources/pe_dark/scalable/news.svg
+++ b/launcher/resources/pe_dark/scalable/news.svg
diff --git a/application/resources/pe_dark/scalable/notes.svg b/launcher/resources/pe_dark/scalable/notes.svg
index 72649721..72649721 100644
--- a/application/resources/pe_dark/scalable/notes.svg
+++ b/launcher/resources/pe_dark/scalable/notes.svg
diff --git a/application/resources/pe_dark/scalable/patreon.svg b/launcher/resources/pe_dark/scalable/patreon.svg
index 01cb279a..01cb279a 100644
--- a/application/resources/pe_dark/scalable/patreon.svg
+++ b/launcher/resources/pe_dark/scalable/patreon.svg
diff --git a/application/resources/pe_dark/scalable/proxy.svg b/launcher/resources/pe_dark/scalable/proxy.svg
index 98bcfac1..98bcfac1 100644
--- a/application/resources/pe_dark/scalable/proxy.svg
+++ b/launcher/resources/pe_dark/scalable/proxy.svg
diff --git a/application/resources/pe_dark/scalable/quickmods.svg b/launcher/resources/pe_dark/scalable/quickmods.svg
index 346729f1..346729f1 100644
--- a/application/resources/pe_dark/scalable/quickmods.svg
+++ b/launcher/resources/pe_dark/scalable/quickmods.svg
diff --git a/application/resources/pe_dark/scalable/refresh.svg b/launcher/resources/pe_dark/scalable/refresh.svg
index c227cd6c..c227cd6c 100644
--- a/application/resources/pe_dark/scalable/refresh.svg
+++ b/launcher/resources/pe_dark/scalable/refresh.svg
diff --git a/application/resources/pe_dark/scalable/resourcepacks.svg b/launcher/resources/pe_dark/scalable/resourcepacks.svg
index 0db2beb1..0db2beb1 100644
--- a/application/resources/pe_dark/scalable/resourcepacks.svg
+++ b/launcher/resources/pe_dark/scalable/resourcepacks.svg
diff --git a/application/resources/pe_dark/scalable/screenshots.svg b/launcher/resources/pe_dark/scalable/screenshots.svg
index 2803b9aa..2803b9aa 100644
--- a/application/resources/pe_dark/scalable/screenshots.svg
+++ b/launcher/resources/pe_dark/scalable/screenshots.svg
diff --git a/application/resources/pe_dark/scalable/settings.svg b/launcher/resources/pe_dark/scalable/settings.svg
index c9f701e7..c9f701e7 100644
--- a/application/resources/pe_dark/scalable/settings.svg
+++ b/launcher/resources/pe_dark/scalable/settings.svg
diff --git a/application/resources/pe_dark/scalable/status-bad.svg b/launcher/resources/pe_dark/scalable/status-bad.svg
index f455965a..f455965a 100644
--- a/application/resources/pe_dark/scalable/status-bad.svg
+++ b/launcher/resources/pe_dark/scalable/status-bad.svg
diff --git a/application/resources/pe_dark/scalable/status-good.svg b/launcher/resources/pe_dark/scalable/status-good.svg
index 4ba91f2d..4ba91f2d 100644
--- a/application/resources/pe_dark/scalable/status-good.svg
+++ b/launcher/resources/pe_dark/scalable/status-good.svg
diff --git a/application/resources/pe_dark/scalable/status-yellow.svg b/launcher/resources/pe_dark/scalable/status-yellow.svg
index 69133817..69133817 100644
--- a/application/resources/pe_dark/scalable/status-yellow.svg
+++ b/launcher/resources/pe_dark/scalable/status-yellow.svg
diff --git a/application/resources/pe_dark/scalable/viewfolder.svg b/launcher/resources/pe_dark/scalable/viewfolder.svg
index 3af36240..3af36240 100644
--- a/application/resources/pe_dark/scalable/viewfolder.svg
+++ b/launcher/resources/pe_dark/scalable/viewfolder.svg
diff --git a/application/resources/pe_dark/scalable/worlds.svg b/launcher/resources/pe_dark/scalable/worlds.svg
index 2b01070f..2b01070f 100644
--- a/application/resources/pe_dark/scalable/worlds.svg
+++ b/launcher/resources/pe_dark/scalable/worlds.svg
diff --git a/application/resources/pe_light/index.theme b/launcher/resources/pe_light/index.theme
index c106acc8..c106acc8 100644
--- a/application/resources/pe_light/index.theme
+++ b/launcher/resources/pe_light/index.theme
diff --git a/application/resources/pe_light/pe_light.qrc b/launcher/resources/pe_light/pe_light.qrc
index 6d77c835..6d77c835 100644
--- a/application/resources/pe_light/pe_light.qrc
+++ b/launcher/resources/pe_light/pe_light.qrc
diff --git a/application/resources/pe_light/scalable/about.svg b/launcher/resources/pe_light/scalable/about.svg
index 8d00c32e..8d00c32e 100644
--- a/application/resources/pe_light/scalable/about.svg
+++ b/launcher/resources/pe_light/scalable/about.svg
diff --git a/application/resources/pe_light/scalable/accounts.svg b/launcher/resources/pe_light/scalable/accounts.svg
index 3a092d03..3a092d03 100644
--- a/application/resources/pe_light/scalable/accounts.svg
+++ b/launcher/resources/pe_light/scalable/accounts.svg
diff --git a/application/resources/pe_light/scalable/bug.svg b/launcher/resources/pe_light/scalable/bug.svg
index ccb64bc5..ccb64bc5 100644
--- a/application/resources/pe_light/scalable/bug.svg
+++ b/launcher/resources/pe_light/scalable/bug.svg
diff --git a/application/resources/pe_light/scalable/centralmods.svg b/launcher/resources/pe_light/scalable/centralmods.svg
index 050fdc58..050fdc58 100644
--- a/application/resources/pe_light/scalable/centralmods.svg
+++ b/launcher/resources/pe_light/scalable/centralmods.svg
diff --git a/application/resources/pe_light/scalable/checkupdate.svg b/launcher/resources/pe_light/scalable/checkupdate.svg
index 08b8dcd5..08b8dcd5 100644
--- a/application/resources/pe_light/scalable/checkupdate.svg
+++ b/launcher/resources/pe_light/scalable/checkupdate.svg
diff --git a/application/resources/pe_light/scalable/copy.svg b/launcher/resources/pe_light/scalable/copy.svg
index abdcce09..abdcce09 100644
--- a/application/resources/pe_light/scalable/copy.svg
+++ b/launcher/resources/pe_light/scalable/copy.svg
diff --git a/application/resources/pe_light/scalable/coremods.svg b/launcher/resources/pe_light/scalable/coremods.svg
index c8fb0eb9..c8fb0eb9 100644
--- a/application/resources/pe_light/scalable/coremods.svg
+++ b/launcher/resources/pe_light/scalable/coremods.svg
diff --git a/application/resources/pe_light/scalable/externaltools.svg b/launcher/resources/pe_light/scalable/externaltools.svg
index 4d232bcf..4d232bcf 100644
--- a/application/resources/pe_light/scalable/externaltools.svg
+++ b/launcher/resources/pe_light/scalable/externaltools.svg
diff --git a/application/resources/pe_light/scalable/help.svg b/launcher/resources/pe_light/scalable/help.svg
index f820c679..f820c679 100644
--- a/application/resources/pe_light/scalable/help.svg
+++ b/launcher/resources/pe_light/scalable/help.svg
diff --git a/application/resources/pe_light/scalable/instance-settings.svg b/launcher/resources/pe_light/scalable/instance-settings.svg
index 83b92a52..83b92a52 100644
--- a/application/resources/pe_light/scalable/instance-settings.svg
+++ b/launcher/resources/pe_light/scalable/instance-settings.svg
diff --git a/application/resources/pe_light/scalable/jarmods.svg b/launcher/resources/pe_light/scalable/jarmods.svg
index 9852c805..9852c805 100644
--- a/application/resources/pe_light/scalable/jarmods.svg
+++ b/launcher/resources/pe_light/scalable/jarmods.svg
diff --git a/application/resources/pe_light/scalable/java.svg b/launcher/resources/pe_light/scalable/java.svg
index 0584058a..0584058a 100644
--- a/application/resources/pe_light/scalable/java.svg
+++ b/launcher/resources/pe_light/scalable/java.svg
diff --git a/application/resources/pe_light/scalable/language.svg b/launcher/resources/pe_light/scalable/language.svg
index 57d5e3de..57d5e3de 100644
--- a/application/resources/pe_light/scalable/language.svg
+++ b/launcher/resources/pe_light/scalable/language.svg
diff --git a/application/resources/pe_light/scalable/loadermods.svg b/launcher/resources/pe_light/scalable/loadermods.svg
index 913c1968..913c1968 100644
--- a/application/resources/pe_light/scalable/loadermods.svg
+++ b/launcher/resources/pe_light/scalable/loadermods.svg
diff --git a/application/resources/pe_light/scalable/log.svg b/launcher/resources/pe_light/scalable/log.svg
index 82282ca4..82282ca4 100644
--- a/application/resources/pe_light/scalable/log.svg
+++ b/launcher/resources/pe_light/scalable/log.svg
diff --git a/application/resources/pe_light/scalable/minecraft.svg b/launcher/resources/pe_light/scalable/minecraft.svg
index d772111f..d772111f 100644
--- a/application/resources/pe_light/scalable/minecraft.svg
+++ b/launcher/resources/pe_light/scalable/minecraft.svg
diff --git a/application/resources/pe_light/scalable/multimc.svg b/launcher/resources/pe_light/scalable/multimc.svg
index 8b2cb631..8b2cb631 100644
--- a/application/resources/pe_light/scalable/multimc.svg
+++ b/launcher/resources/pe_light/scalable/multimc.svg
diff --git a/application/resources/pe_light/scalable/new.svg b/launcher/resources/pe_light/scalable/new.svg
index 96fd1f5b..96fd1f5b 100644
--- a/application/resources/pe_light/scalable/new.svg
+++ b/launcher/resources/pe_light/scalable/new.svg
diff --git a/application/resources/pe_light/scalable/news.svg b/launcher/resources/pe_light/scalable/news.svg
index 6f184afc..6f184afc 100644
--- a/application/resources/pe_light/scalable/news.svg
+++ b/launcher/resources/pe_light/scalable/news.svg
diff --git a/application/resources/pe_light/scalable/notes.svg b/launcher/resources/pe_light/scalable/notes.svg
index 02dc11ec..02dc11ec 100644
--- a/application/resources/pe_light/scalable/notes.svg
+++ b/launcher/resources/pe_light/scalable/notes.svg
diff --git a/application/resources/pe_light/scalable/patreon.svg b/launcher/resources/pe_light/scalable/patreon.svg
index 0bd08826..0bd08826 100644
--- a/application/resources/pe_light/scalable/patreon.svg
+++ b/launcher/resources/pe_light/scalable/patreon.svg
diff --git a/application/resources/pe_light/scalable/proxy.svg b/launcher/resources/pe_light/scalable/proxy.svg
index 9de8d6d1..9de8d6d1 100644
--- a/application/resources/pe_light/scalable/proxy.svg
+++ b/launcher/resources/pe_light/scalable/proxy.svg
diff --git a/application/resources/pe_light/scalable/quickmods.svg b/launcher/resources/pe_light/scalable/quickmods.svg
index 6dbeab52..6dbeab52 100644
--- a/application/resources/pe_light/scalable/quickmods.svg
+++ b/launcher/resources/pe_light/scalable/quickmods.svg
diff --git a/application/resources/pe_light/scalable/refresh.svg b/launcher/resources/pe_light/scalable/refresh.svg
index 9a724d91..9a724d91 100644
--- a/application/resources/pe_light/scalable/refresh.svg
+++ b/launcher/resources/pe_light/scalable/refresh.svg
diff --git a/application/resources/pe_light/scalable/resourcepacks.svg b/launcher/resources/pe_light/scalable/resourcepacks.svg
index 7d6323f2..7d6323f2 100644
--- a/application/resources/pe_light/scalable/resourcepacks.svg
+++ b/launcher/resources/pe_light/scalable/resourcepacks.svg
diff --git a/application/resources/pe_light/scalable/screenshots.svg b/launcher/resources/pe_light/scalable/screenshots.svg
index f2887be6..f2887be6 100644
--- a/application/resources/pe_light/scalable/screenshots.svg
+++ b/launcher/resources/pe_light/scalable/screenshots.svg
diff --git a/application/resources/pe_light/scalable/settings.svg b/launcher/resources/pe_light/scalable/settings.svg
index 83b92a52..83b92a52 100644
--- a/application/resources/pe_light/scalable/settings.svg
+++ b/launcher/resources/pe_light/scalable/settings.svg
diff --git a/application/resources/pe_light/scalable/status-bad.svg b/launcher/resources/pe_light/scalable/status-bad.svg
index 2c24970c..2c24970c 100644
--- a/application/resources/pe_light/scalable/status-bad.svg
+++ b/launcher/resources/pe_light/scalable/status-bad.svg
diff --git a/application/resources/pe_light/scalable/status-good.svg b/launcher/resources/pe_light/scalable/status-good.svg
index bf9a4174..bf9a4174 100644
--- a/application/resources/pe_light/scalable/status-good.svg
+++ b/launcher/resources/pe_light/scalable/status-good.svg
diff --git a/application/resources/pe_light/scalable/status-yellow.svg b/launcher/resources/pe_light/scalable/status-yellow.svg
index f7d2236b..f7d2236b 100644
--- a/application/resources/pe_light/scalable/status-yellow.svg
+++ b/launcher/resources/pe_light/scalable/status-yellow.svg
diff --git a/application/resources/pe_light/scalable/viewfolder.svg b/launcher/resources/pe_light/scalable/viewfolder.svg
index b36343fe..b36343fe 100644
--- a/application/resources/pe_light/scalable/viewfolder.svg
+++ b/launcher/resources/pe_light/scalable/viewfolder.svg
diff --git a/application/resources/pe_light/scalable/worlds.svg b/launcher/resources/pe_light/scalable/worlds.svg
index bf4c21a3..bf4c21a3 100644
--- a/application/resources/pe_light/scalable/worlds.svg
+++ b/launcher/resources/pe_light/scalable/worlds.svg
diff --git a/application/resources/sources/clucker.svg b/launcher/resources/sources/clucker.svg
index 0c1727eb..0c1727eb 100644
--- a/application/resources/sources/clucker.svg
+++ b/launcher/resources/sources/clucker.svg
diff --git a/application/resources/sources/creeper.svg b/launcher/resources/sources/creeper.svg
index 2a2e39b6..2a2e39b6 100644
--- a/application/resources/sources/creeper.svg
+++ b/launcher/resources/sources/creeper.svg
diff --git a/application/resources/sources/enderpearl.svg b/launcher/resources/sources/enderpearl.svg
index ac9378f5..ac9378f5 100644
--- a/application/resources/sources/enderpearl.svg
+++ b/launcher/resources/sources/enderpearl.svg
diff --git a/application/resources/sources/flame.svg b/launcher/resources/sources/flame.svg
index 8a6da2f7..8a6da2f7 100644
--- a/application/resources/sources/flame.svg
+++ b/launcher/resources/sources/flame.svg
diff --git a/application/resources/sources/ftb-glow.svg b/launcher/resources/sources/ftb-glow.svg
index be78c78e..be78c78e 100644
--- a/application/resources/sources/ftb-glow.svg
+++ b/launcher/resources/sources/ftb-glow.svg
diff --git a/application/resources/sources/ftb-logo.svg b/launcher/resources/sources/ftb-logo.svg
index 8cf73567..8cf73567 100644
--- a/application/resources/sources/ftb-logo.svg
+++ b/launcher/resources/sources/ftb-logo.svg
diff --git a/application/resources/sources/gear.svg b/launcher/resources/sources/gear.svg
index c0169aec..c0169aec 100644
--- a/application/resources/sources/gear.svg
+++ b/launcher/resources/sources/gear.svg
diff --git a/application/resources/sources/herobrine.svg b/launcher/resources/sources/herobrine.svg
index 7392ba36..7392ba36 100644
--- a/application/resources/sources/herobrine.svg
+++ b/launcher/resources/sources/herobrine.svg
diff --git a/application/resources/sources/magitech.svg b/launcher/resources/sources/magitech.svg
index c6dd6bc0..c6dd6bc0 100644
--- a/application/resources/sources/magitech.svg
+++ b/launcher/resources/sources/magitech.svg
diff --git a/application/resources/sources/meat.svg b/launcher/resources/sources/meat.svg
index 69a20073..69a20073 100644
--- a/application/resources/sources/meat.svg
+++ b/launcher/resources/sources/meat.svg
diff --git a/application/resources/sources/multimc-discord.svg b/launcher/resources/sources/multimc-discord.svg
index c3c73044..c3c73044 100644
--- a/application/resources/sources/multimc-discord.svg
+++ b/launcher/resources/sources/multimc-discord.svg
diff --git a/application/resources/sources/netherstar.svg b/launcher/resources/sources/netherstar.svg
index 4046e4ec..4046e4ec 100644
--- a/application/resources/sources/netherstar.svg
+++ b/launcher/resources/sources/netherstar.svg
diff --git a/application/resources/sources/pskeleton.svg b/launcher/resources/sources/pskeleton.svg
index c2783df8..c2783df8 100644
--- a/application/resources/sources/pskeleton.svg
+++ b/launcher/resources/sources/pskeleton.svg
diff --git a/application/resources/sources/skeleton.svg b/launcher/resources/sources/skeleton.svg
index 5d55f272..5d55f272 100644
--- a/application/resources/sources/skeleton.svg
+++ b/launcher/resources/sources/skeleton.svg
diff --git a/application/resources/sources/squarecreeper.svg b/launcher/resources/sources/squarecreeper.svg
index a1b0f4d1..a1b0f4d1 100644
--- a/application/resources/sources/squarecreeper.svg
+++ b/launcher/resources/sources/squarecreeper.svg
diff --git a/application/resources/sources/steve.svg b/launcher/resources/sources/steve.svg
index 2233272c..2233272c 100644
--- a/application/resources/sources/steve.svg
+++ b/launcher/resources/sources/steve.svg
diff --git a/api/logic/screenshots/ImgurAlbumCreation.cpp b/launcher/screenshots/ImgurAlbumCreation.cpp
index 1f195f00..1f195f00 100644
--- a/api/logic/screenshots/ImgurAlbumCreation.cpp
+++ b/launcher/screenshots/ImgurAlbumCreation.cpp
diff --git a/api/logic/screenshots/ImgurAlbumCreation.h b/launcher/screenshots/ImgurAlbumCreation.h
index 55478021..954637e6 100644
--- a/api/logic/screenshots/ImgurAlbumCreation.h
+++ b/launcher/screenshots/ImgurAlbumCreation.h
@@ -2,10 +2,8 @@
 #include "net/NetAction.h"
 #include "Screenshot.h"
 
-#include "multimc_logic_export.h"
-
 typedef std::shared_ptr<class ImgurAlbumCreation> ImgurAlbumCreationPtr;
-class MULTIMC_LOGIC_EXPORT ImgurAlbumCreation : public NetAction
+class ImgurAlbumCreation : public NetAction
 {
 public:
     explicit ImgurAlbumCreation(QList<ScreenshotPtr> screenshots);
diff --git a/api/logic/screenshots/ImgurUpload.cpp b/launcher/screenshots/ImgurUpload.cpp
index 7e95d5ca..7e95d5ca 100644
--- a/api/logic/screenshots/ImgurUpload.cpp
+++ b/launcher/screenshots/ImgurUpload.cpp
diff --git a/api/logic/screenshots/ImgurUpload.h b/launcher/screenshots/ImgurUpload.h
index d79807f2..0507d499 100644
--- a/api/logic/screenshots/ImgurUpload.h
+++ b/launcher/screenshots/ImgurUpload.h
@@ -2,10 +2,8 @@
 #include "net/NetAction.h"
 #include "Screenshot.h"
 
-#include "multimc_logic_export.h"
-
 typedef std::shared_ptr<class ImgurUpload> ImgurUploadPtr;
-class MULTIMC_LOGIC_EXPORT ImgurUpload : public NetAction
+class ImgurUpload : public NetAction
 {
 public:
     explicit ImgurUpload(ScreenshotPtr shot);
diff --git a/api/logic/screenshots/Screenshot.h b/launcher/screenshots/Screenshot.h
index 9db3a8a1..9db3a8a1 100644
--- a/api/logic/screenshots/Screenshot.h
+++ b/launcher/screenshots/Screenshot.h
diff --git a/api/logic/settings/INIFile.cpp b/launcher/settings/INIFile.cpp
index 6a3c801d..6a3c801d 100644
--- a/api/logic/settings/INIFile.cpp
+++ b/launcher/settings/INIFile.cpp
diff --git a/api/logic/settings/INIFile.h b/launcher/settings/INIFile.h
index 9e8c68ea..4313e829 100644
--- a/api/logic/settings/INIFile.h
+++ b/launcher/settings/INIFile.h
@@ -19,10 +19,8 @@
 #include <QVariant>
 #include <QIODevice>
 
-#include "multimc_logic_export.h"
-
 // Sectionless INI parser (for instance config files)
-class MULTIMC_LOGIC_EXPORT INIFile : public QMap<QString, QVariant>
+class INIFile : public QMap<QString, QVariant>
 {
 public:
     explicit INIFile();
diff --git a/api/logic/settings/INIFile_test.cpp b/launcher/settings/INIFile_test.cpp
index 08c2155e..08c2155e 100644
--- a/api/logic/settings/INIFile_test.cpp
+++ b/launcher/settings/INIFile_test.cpp
diff --git a/api/logic/settings/INISettingsObject.cpp b/launcher/settings/INISettingsObject.cpp
index 12513403..12513403 100644
--- a/api/logic/settings/INISettingsObject.cpp
+++ b/launcher/settings/INISettingsObject.cpp
diff --git a/api/logic/settings/INISettingsObject.h b/launcher/settings/INISettingsObject.h
index 313f1512..26cc32e5 100644
--- a/api/logic/settings/INISettingsObject.h
+++ b/launcher/settings/INISettingsObject.h
@@ -21,12 +21,10 @@
 
 #include "settings/SettingsObject.h"
 
-#include "multimc_logic_export.h"
-
 /*!
  * \brief A settings object that stores its settings in an INIFile.
  */
-class MULTIMC_LOGIC_EXPORT INISettingsObject : public SettingsObject
+class INISettingsObject : public SettingsObject
 {
     Q_OBJECT
 public:
diff --git a/api/logic/settings/OverrideSetting.cpp b/launcher/settings/OverrideSetting.cpp
index 4396a381..4396a381 100644
--- a/api/logic/settings/OverrideSetting.cpp
+++ b/launcher/settings/OverrideSetting.cpp
diff --git a/api/logic/settings/OverrideSetting.h b/launcher/settings/OverrideSetting.h
index 9f0c98b5..9f0c98b5 100644
--- a/api/logic/settings/OverrideSetting.h
+++ b/launcher/settings/OverrideSetting.h
diff --git a/api/logic/settings/PassthroughSetting.cpp b/launcher/settings/PassthroughSetting.cpp
index 8f93b251..8f93b251 100644
--- a/api/logic/settings/PassthroughSetting.cpp
+++ b/launcher/settings/PassthroughSetting.cpp
diff --git a/api/logic/settings/PassthroughSetting.h b/launcher/settings/PassthroughSetting.h
index 22008f83..22008f83 100644
--- a/api/logic/settings/PassthroughSetting.h
+++ b/launcher/settings/PassthroughSetting.h
diff --git a/api/logic/settings/Setting.cpp b/launcher/settings/Setting.cpp
index cfe5a7f9..cfe5a7f9 100644
--- a/api/logic/settings/Setting.cpp
+++ b/launcher/settings/Setting.cpp
diff --git a/api/logic/settings/Setting.h b/launcher/settings/Setting.h
index a31193ac..9beeb35e 100644
--- a/api/logic/settings/Setting.h
+++ b/launcher/settings/Setting.h
@@ -20,14 +20,12 @@
 #include <QStringList>
 #include <memory>
 
-#include "multimc_logic_export.h"
-
 class SettingsObject;
 
 /*!
  *
  */
-class MULTIMC_LOGIC_EXPORT Setting : public QObject
+class Setting : public QObject
 {
     Q_OBJECT
 public:
diff --git a/api/logic/settings/SettingsObject.cpp b/launcher/settings/SettingsObject.cpp
index 8a0bc045..8a0bc045 100644
--- a/api/logic/settings/SettingsObject.cpp
+++ b/launcher/settings/SettingsObject.cpp
diff --git a/api/logic/settings/SettingsObject.h b/launcher/settings/SettingsObject.h
index 3ebdebdf..3d61e707 100644
--- a/api/logic/settings/SettingsObject.h
+++ b/launcher/settings/SettingsObject.h
@@ -21,8 +21,6 @@
 #include <QVariant>
 #include <memory>
 
-#include "multimc_logic_export.h"
-
 class Setting;
 class SettingsObject;
 
@@ -40,7 +38,7 @@ typedef std::shared_ptr<SettingsObject> SettingsObjectPtr;
  *
  * \sa Setting
  */
-class MULTIMC_LOGIC_EXPORT SettingsObject : public QObject
+class SettingsObject : public QObject
 {
     Q_OBJECT
 public:
diff --git a/application/setupwizard/AnalyticsWizardPage.cpp b/launcher/setupwizard/AnalyticsWizardPage.cpp
index 4fb0bcca..4fb0bcca 100644
--- a/application/setupwizard/AnalyticsWizardPage.cpp
+++ b/launcher/setupwizard/AnalyticsWizardPage.cpp
diff --git a/application/setupwizard/AnalyticsWizardPage.h b/launcher/setupwizard/AnalyticsWizardPage.h
index c451db2c..c451db2c 100644
--- a/application/setupwizard/AnalyticsWizardPage.h
+++ b/launcher/setupwizard/AnalyticsWizardPage.h
diff --git a/application/setupwizard/BaseWizardPage.h b/launcher/setupwizard/BaseWizardPage.h
index 72dbecfd..72dbecfd 100644
--- a/application/setupwizard/BaseWizardPage.h
+++ b/launcher/setupwizard/BaseWizardPage.h
diff --git a/application/setupwizard/JavaWizardPage.cpp b/launcher/setupwizard/JavaWizardPage.cpp
index ad571c09..ad571c09 100644
--- a/application/setupwizard/JavaWizardPage.cpp
+++ b/launcher/setupwizard/JavaWizardPage.cpp
diff --git a/application/setupwizard/JavaWizardPage.h b/launcher/setupwizard/JavaWizardPage.h
index 0d749039..0d749039 100644
--- a/application/setupwizard/JavaWizardPage.h
+++ b/launcher/setupwizard/JavaWizardPage.h
diff --git a/application/setupwizard/LanguageWizardPage.cpp b/launcher/setupwizard/LanguageWizardPage.cpp
index ca93c6f5..ca93c6f5 100644
--- a/application/setupwizard/LanguageWizardPage.cpp
+++ b/launcher/setupwizard/LanguageWizardPage.cpp
diff --git a/application/setupwizard/LanguageWizardPage.h b/launcher/setupwizard/LanguageWizardPage.h
index 45a0e5c0..45a0e5c0 100644
--- a/application/setupwizard/LanguageWizardPage.h
+++ b/launcher/setupwizard/LanguageWizardPage.h
diff --git a/application/setupwizard/SetupWizard.cpp b/launcher/setupwizard/SetupWizard.cpp
index 60a78b8d..60a78b8d 100644
--- a/application/setupwizard/SetupWizard.cpp
+++ b/launcher/setupwizard/SetupWizard.cpp
diff --git a/application/setupwizard/SetupWizard.h b/launcher/setupwizard/SetupWizard.h
index 9b8adb4d..9b8adb4d 100644
--- a/application/setupwizard/SetupWizard.h
+++ b/launcher/setupwizard/SetupWizard.h
diff --git a/api/logic/status/StatusChecker.cpp b/launcher/status/StatusChecker.cpp
index 38fc2163..38fc2163 100644
--- a/api/logic/status/StatusChecker.cpp
+++ b/launcher/status/StatusChecker.cpp
diff --git a/api/logic/status/StatusChecker.h b/launcher/status/StatusChecker.h
index e9961aff..06b3f576 100644
--- a/api/logic/status/StatusChecker.h
+++ b/launcher/status/StatusChecker.h
@@ -21,9 +21,7 @@
 
 #include <net/NetJob.h>
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT StatusChecker : public QObject
+class StatusChecker : public QObject
 {
     Q_OBJECT
 public: /* con/des */
diff --git a/api/logic/tasks/SequentialTask.cpp b/launcher/tasks/SequentialTask.cpp
index d0777132..d0777132 100644
--- a/api/logic/tasks/SequentialTask.cpp
+++ b/launcher/tasks/SequentialTask.cpp
diff --git a/api/logic/tasks/SequentialTask.h b/launcher/tasks/SequentialTask.h
index 2ca77c00..6898c8a6 100644
--- a/api/logic/tasks/SequentialTask.h
+++ b/launcher/tasks/SequentialTask.h
@@ -5,9 +5,7 @@
 #include <QQueue>
 #include <memory>
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT SequentialTask : public Task
+class SequentialTask : public Task
 {
     Q_OBJECT
 public:
diff --git a/api/logic/tasks/Task.cpp b/launcher/tasks/Task.cpp
index d0ac7569..d0ac7569 100644
--- a/api/logic/tasks/Task.cpp
+++ b/launcher/tasks/Task.cpp
diff --git a/api/logic/tasks/Task.h b/launcher/tasks/Task.h
index 7ed7086c..2367f1ec 100644
--- a/api/logic/tasks/Task.h
+++ b/launcher/tasks/Task.h
@@ -19,9 +19,7 @@
 #include <QString>
 #include <QStringList>
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT Task : public QObject
+class Task : public QObject
 {
     Q_OBJECT
 public:
diff --git a/api/logic/testdata/FileSystem-test_createShortcut-unix b/launcher/testdata/FileSystem-test_createShortcut-unix
index 1ce3a2bd..1ce3a2bd 100755
--- a/api/logic/testdata/FileSystem-test_createShortcut-unix
+++ b/launcher/testdata/FileSystem-test_createShortcut-unix
diff --git a/api/logic/testdata/test_folder/assets/minecraft/textures/blah.txt b/launcher/testdata/test_folder/assets/minecraft/textures/blah.txt
index 8d1c8b69..8d1c8b69 100644
--- a/api/logic/testdata/test_folder/assets/minecraft/textures/blah.txt
+++ b/launcher/testdata/test_folder/assets/minecraft/textures/blah.txt
diff --git a/api/logic/testdata/test_folder/pack.mcmeta b/launcher/testdata/test_folder/pack.mcmeta
index 67ee0434..67ee0434 100644
--- a/api/logic/testdata/test_folder/pack.mcmeta
+++ b/launcher/testdata/test_folder/pack.mcmeta
diff --git a/api/logic/testdata/test_folder/pack.nfo b/launcher/testdata/test_folder/pack.nfo
index 8d1c8b69..8d1c8b69 100644
--- a/api/logic/testdata/test_folder/pack.nfo
+++ b/launcher/testdata/test_folder/pack.nfo
diff --git a/application/themes/BrightTheme.cpp b/launcher/themes/BrightTheme.cpp
index b9188bdd..b9188bdd 100644
--- a/application/themes/BrightTheme.cpp
+++ b/launcher/themes/BrightTheme.cpp
diff --git a/application/themes/BrightTheme.h b/launcher/themes/BrightTheme.h
index c61f52d5..c61f52d5 100644
--- a/application/themes/BrightTheme.h
+++ b/launcher/themes/BrightTheme.h
diff --git a/application/themes/CustomTheme.cpp b/launcher/themes/CustomTheme.cpp
index 3e3e27de..3e3e27de 100644
--- a/application/themes/CustomTheme.cpp
+++ b/launcher/themes/CustomTheme.cpp
diff --git a/application/themes/CustomTheme.h b/launcher/themes/CustomTheme.h
index d216895d..d216895d 100644
--- a/application/themes/CustomTheme.h
+++ b/launcher/themes/CustomTheme.h
diff --git a/application/themes/DarkTheme.cpp b/launcher/themes/DarkTheme.cpp
index 31ecd559..31ecd559 100644
--- a/application/themes/DarkTheme.cpp
+++ b/launcher/themes/DarkTheme.cpp
diff --git a/application/themes/DarkTheme.h b/launcher/themes/DarkTheme.h
index 9bd2f343..9bd2f343 100644
--- a/application/themes/DarkTheme.h
+++ b/launcher/themes/DarkTheme.h
diff --git a/application/themes/FusionTheme.cpp b/launcher/themes/FusionTheme.cpp
index cf3286ba..cf3286ba 100644
--- a/application/themes/FusionTheme.cpp
+++ b/launcher/themes/FusionTheme.cpp
diff --git a/application/themes/FusionTheme.h b/launcher/themes/FusionTheme.h
index ee34245a..ee34245a 100644
--- a/application/themes/FusionTheme.h
+++ b/launcher/themes/FusionTheme.h
diff --git a/application/themes/ITheme.cpp b/launcher/themes/ITheme.cpp
index bfec87e7..bfec87e7 100644
--- a/application/themes/ITheme.cpp
+++ b/launcher/themes/ITheme.cpp
diff --git a/application/themes/ITheme.h b/launcher/themes/ITheme.h
index c2347cf6..c2347cf6 100644
--- a/application/themes/ITheme.h
+++ b/launcher/themes/ITheme.h
diff --git a/application/themes/SystemTheme.cpp b/launcher/themes/SystemTheme.cpp
index 49b1afaa..49b1afaa 100644
--- a/application/themes/SystemTheme.cpp
+++ b/launcher/themes/SystemTheme.cpp
diff --git a/application/themes/SystemTheme.h b/launcher/themes/SystemTheme.h
index fe450600..fe450600 100644
--- a/application/themes/SystemTheme.h
+++ b/launcher/themes/SystemTheme.h
diff --git a/api/logic/tools/BaseExternalTool.cpp b/launcher/tools/BaseExternalTool.cpp
index 38d81788..38d81788 100644
--- a/api/logic/tools/BaseExternalTool.cpp
+++ b/launcher/tools/BaseExternalTool.cpp
diff --git a/api/logic/tools/BaseExternalTool.h b/launcher/tools/BaseExternalTool.h
index b393b9ef..1ebed6ae 100644
--- a/api/logic/tools/BaseExternalTool.h
+++ b/launcher/tools/BaseExternalTool.h
@@ -3,13 +3,11 @@
 #include <QObject>
 #include <BaseInstance.h>
 
-#include "multimc_logic_export.h"
-
 class BaseInstance;
 class SettingsObject;
 class QProcess;
 
-class MULTIMC_LOGIC_EXPORT BaseExternalTool : public QObject
+class BaseExternalTool : public QObject
 {
     Q_OBJECT
 public:
@@ -21,7 +19,7 @@ protected:
     SettingsObjectPtr globalSettings;
 };
 
-class MULTIMC_LOGIC_EXPORT BaseDetachedTool : public BaseExternalTool
+class BaseDetachedTool : public BaseExternalTool
 {
     Q_OBJECT
 public:
@@ -35,7 +33,7 @@ protected:
     virtual void runImpl() = 0;
 };
 
-class MULTIMC_LOGIC_EXPORT BaseExternalToolFactory
+class BaseExternalToolFactory
 {
 public:
     virtual ~BaseExternalToolFactory();
@@ -53,7 +51,7 @@ protected:
     SettingsObjectPtr globalSettings;
 };
 
-class MULTIMC_LOGIC_EXPORT BaseDetachedToolFactory : public BaseExternalToolFactory
+class BaseDetachedToolFactory : public BaseExternalToolFactory
 {
 public:
     virtual BaseDetachedTool *createDetachedTool(InstancePtr instance, QObject *parent = 0);
diff --git a/api/logic/tools/BaseProfiler.cpp b/launcher/tools/BaseProfiler.cpp
index 300d1a73..300d1a73 100644
--- a/api/logic/tools/BaseProfiler.cpp
+++ b/launcher/tools/BaseProfiler.cpp
diff --git a/api/logic/tools/BaseProfiler.h b/launcher/tools/BaseProfiler.h
index da817f52..1c934aa3 100644
--- a/api/logic/tools/BaseProfiler.h
+++ b/launcher/tools/BaseProfiler.h
@@ -3,14 +3,12 @@
 #include "BaseExternalTool.h"
 #include "QObjectPtr.h"
 
-#include "multimc_logic_export.h"
-
 class BaseInstance;
 class SettingsObject;
 class LaunchTask;
 class QProcess;
 
-class MULTIMC_LOGIC_EXPORT BaseProfiler : public BaseExternalTool
+class BaseProfiler : public BaseExternalTool
 {
     Q_OBJECT
 public:
@@ -32,7 +30,7 @@ signals:
     void abortLaunch(const QString &message);
 };
 
-class MULTIMC_LOGIC_EXPORT BaseProfilerFactory : public BaseExternalToolFactory
+class BaseProfilerFactory : public BaseExternalToolFactory
 {
 public:
     virtual BaseProfiler *createProfiler(InstancePtr instance, QObject *parent = 0);
diff --git a/api/logic/tools/JProfiler.cpp b/launcher/tools/JProfiler.cpp
index 1dc0d109..1dc0d109 100644
--- a/api/logic/tools/JProfiler.cpp
+++ b/launcher/tools/JProfiler.cpp
diff --git a/api/logic/tools/JProfiler.h b/launcher/tools/JProfiler.h
index f211ddbf..0e9a3a85 100644
--- a/api/logic/tools/JProfiler.h
+++ b/launcher/tools/JProfiler.h
@@ -2,9 +2,7 @@
 
 #include "BaseProfiler.h"
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT JProfilerFactory : public BaseProfilerFactory
+class JProfilerFactory : public BaseProfilerFactory
 {
 public:
     QString name() const override { return "JProfiler"; }
diff --git a/api/logic/tools/JVisualVM.cpp b/launcher/tools/JVisualVM.cpp
index b1acc3c0..b1acc3c0 100644
--- a/api/logic/tools/JVisualVM.cpp
+++ b/launcher/tools/JVisualVM.cpp
diff --git a/api/logic/tools/JVisualVM.h b/launcher/tools/JVisualVM.h
index 91d48d94..ebdea9f3 100644
--- a/api/logic/tools/JVisualVM.h
+++ b/launcher/tools/JVisualVM.h
@@ -2,9 +2,7 @@
 
 #include "BaseProfiler.h"
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT JVisualVMFactory : public BaseProfilerFactory
+class JVisualVMFactory : public BaseProfilerFactory
 {
 public:
     QString name() const override { return "JVisualVM"; }
diff --git a/api/logic/tools/MCEditTool.cpp b/launcher/tools/MCEditTool.cpp
index 880327c7..880327c7 100644
--- a/api/logic/tools/MCEditTool.cpp
+++ b/launcher/tools/MCEditTool.cpp
diff --git a/api/logic/tools/MCEditTool.h b/launcher/tools/MCEditTool.h
index 1465494e..733dff86 100644
--- a/api/logic/tools/MCEditTool.h
+++ b/launcher/tools/MCEditTool.h
@@ -2,9 +2,8 @@
 
 #include <QString>
 #include "settings/SettingsObject.h"
-#include "multimc_logic_export.h"
 
-class MULTIMC_LOGIC_EXPORT MCEditTool
+class MCEditTool
 {
 public:
     MCEditTool(SettingsObjectPtr settings);
diff --git a/api/logic/translations/POTranslator.cpp b/launcher/translations/POTranslator.cpp
index 1ffcb9a4..1ffcb9a4 100644
--- a/api/logic/translations/POTranslator.cpp
+++ b/launcher/translations/POTranslator.cpp
diff --git a/api/logic/translations/POTranslator.h b/launcher/translations/POTranslator.h
index 6d518560..6d518560 100644
--- a/api/logic/translations/POTranslator.h
+++ b/launcher/translations/POTranslator.h
diff --git a/api/logic/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp
index 29a952b0..29a952b0 100644
--- a/api/logic/translations/TranslationsModel.cpp
+++ b/launcher/translations/TranslationsModel.cpp
diff --git a/api/logic/translations/TranslationsModel.h b/launcher/translations/TranslationsModel.h
index 17e5b124..3abf84e6 100644
--- a/api/logic/translations/TranslationsModel.h
+++ b/launcher/translations/TranslationsModel.h
@@ -17,11 +17,10 @@
 
 #include <QAbstractListModel>
 #include <memory>
-#include "multimc_logic_export.h"
 
 struct Language;
 
-class MULTIMC_LOGIC_EXPORT TranslationsModel : public QAbstractListModel
+class TranslationsModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
diff --git a/api/logic/updater/DownloadTask.cpp b/launcher/updater/DownloadTask.cpp
index 20b26ebb..20b26ebb 100644
--- a/api/logic/updater/DownloadTask.cpp
+++ b/launcher/updater/DownloadTask.cpp
diff --git a/api/logic/updater/DownloadTask.h b/launcher/updater/DownloadTask.h
index 88e60865..fc5030b4 100644
--- a/api/logic/updater/DownloadTask.h
+++ b/launcher/updater/DownloadTask.h
@@ -19,15 +19,13 @@
 #include "net/NetJob.h"
 #include "GoUpdate.h"
 
-#include "multimc_logic_export.h"
-
 namespace GoUpdate
 {
 /*!
  * The DownloadTask is a task that takes a given version ID and repository URL,
  * downloads that version's files from the repository, and prepares to install them.
  */
-class MULTIMC_LOGIC_EXPORT DownloadTask : public Task
+class DownloadTask : public Task
 {
     Q_OBJECT
 
@@ -95,4 +93,4 @@ protected slots:
     void fileDownloadProgressChanged(qint64 current, qint64 total);
 };
 
-}
\ No newline at end of file
+}
diff --git a/api/logic/updater/DownloadTask_test.cpp b/launcher/updater/DownloadTask_test.cpp
index 8d5375e8..8d5375e8 100644
--- a/api/logic/updater/DownloadTask_test.cpp
+++ b/launcher/updater/DownloadTask_test.cpp
diff --git a/api/logic/updater/GoUpdate.cpp b/launcher/updater/GoUpdate.cpp
index 6167418e..6167418e 100644
--- a/api/logic/updater/GoUpdate.cpp
+++ b/launcher/updater/GoUpdate.cpp
diff --git a/api/logic/updater/GoUpdate.h b/launcher/updater/GoUpdate.h
index 8f92bb99..8058e543 100644
--- a/api/logic/updater/GoUpdate.h
+++ b/launcher/updater/GoUpdate.h
@@ -2,15 +2,13 @@
 #include <QByteArray>
 #include <net/NetJob.h>
 
-#include "multimc_logic_export.h"
-
 namespace GoUpdate
 {
 
 /**
  * A temporary object exchanged between updated checker and the actual update task
  */
-struct MULTIMC_LOGIC_EXPORT Status
+struct Status
 {
     bool updateAvailable = false;
 
@@ -27,7 +25,7 @@ struct MULTIMC_LOGIC_EXPORT Status
 /**
  * Struct that describes an entry in a VersionFileEntry's `Sources` list.
  */
-struct MULTIMC_LOGIC_EXPORT FileSource
+struct FileSource
 {
     FileSource(QString type, QString url, QString compression="")
     {
@@ -50,7 +48,7 @@ typedef QList<FileSource> FileSourceList;
 /**
  * Structure that describes an entry in a GoUpdate version's `Files` list.
  */
-struct MULTIMC_LOGIC_EXPORT VersionFileEntry
+struct VersionFileEntry
 {
     QString path;
     int mode;
@@ -66,7 +64,7 @@ typedef QList<VersionFileEntry> VersionFileList;
 /**
  * Structure that describes an operation to perform when installing updates.
  */
-struct MULTIMC_LOGIC_EXPORT Operation
+struct Operation
 {
     static Operation CopyOp(QString from, QString to, int fmode=0644)
     {
@@ -107,13 +105,13 @@ typedef QList<Operation> OperationList;
 /**
  * Loads the file list from the given version info JSON object into the given list.
  */
-bool MULTIMC_LOGIC_EXPORT parseVersionInfo(const QByteArray &data, VersionFileList& list, QString &error);
+bool parseVersionInfo(const QByteArray &data, VersionFileList& list, QString &error);
 
 /*!
  * Takes a list of file entries for the current version's files and the new version's files
  * and populates the downloadList and operationList with information about how to download and install the update.
  */
-bool MULTIMC_LOGIC_EXPORT processFileLists
+bool processFileLists
 (
     const VersionFileList &currentVersion,
     const VersionFileList &newVersion,
diff --git a/api/logic/updater/UpdateChecker.cpp b/launcher/updater/UpdateChecker.cpp
index be33c73c..be33c73c 100644
--- a/api/logic/updater/UpdateChecker.cpp
+++ b/launcher/updater/UpdateChecker.cpp
diff --git a/api/logic/updater/UpdateChecker.h b/launcher/updater/UpdateChecker.h
index 20906207..91b6e26e 100644
--- a/api/logic/updater/UpdateChecker.h
+++ b/launcher/updater/UpdateChecker.h
@@ -18,9 +18,7 @@
 #include "net/NetJob.h"
 #include "GoUpdate.h"
 
-#include "multimc_logic_export.h"
-
-class MULTIMC_LOGIC_EXPORT UpdateChecker : public QObject
+class UpdateChecker : public QObject
 {
     Q_OBJECT
 
diff --git a/api/logic/updater/UpdateChecker_test.cpp b/launcher/updater/UpdateChecker_test.cpp
index 5702d9c6..5702d9c6 100644
--- a/api/logic/updater/UpdateChecker_test.cpp
+++ b/launcher/updater/UpdateChecker_test.cpp
diff --git a/api/logic/updater/testdata/1.json b/launcher/updater/testdata/1.json
index 7af7e52d..7af7e52d 100644
--- a/api/logic/updater/testdata/1.json
+++ b/launcher/updater/testdata/1.json
diff --git a/api/logic/updater/testdata/2.json b/launcher/updater/testdata/2.json
index 96d430d5..96d430d5 100644
--- a/api/logic/updater/testdata/2.json
+++ b/launcher/updater/testdata/2.json
diff --git a/api/logic/updater/testdata/channels.json b/launcher/updater/testdata/channels.json
index 5c6e42cb..5c6e42cb 100644
--- a/api/logic/updater/testdata/channels.json
+++ b/launcher/updater/testdata/channels.json
diff --git a/api/logic/updater/testdata/errorChannels.json b/launcher/updater/testdata/errorChannels.json
index a2cb2165..a2cb2165 100644
--- a/api/logic/updater/testdata/errorChannels.json
+++ b/launcher/updater/testdata/errorChannels.json
diff --git a/api/logic/updater/testdata/fileOneA b/launcher/updater/testdata/fileOneA
index f2e41136..f2e41136 100644
--- a/api/logic/updater/testdata/fileOneA
+++ b/launcher/updater/testdata/fileOneA
diff --git a/api/logic/updater/testdata/fileOneB b/launcher/updater/testdata/fileOneB
index f9aba922..f9aba922 100644
--- a/api/logic/updater/testdata/fileOneB
+++ b/launcher/updater/testdata/fileOneB
diff --git a/api/logic/updater/testdata/fileThree b/launcher/updater/testdata/fileThree
index 6353ff16..6353ff16 100644
--- a/api/logic/updater/testdata/fileThree
+++ b/launcher/updater/testdata/fileThree
diff --git a/api/logic/updater/testdata/fileTwo b/launcher/updater/testdata/fileTwo
index aad9a93a..aad9a93a 100644
--- a/api/logic/updater/testdata/fileTwo
+++ b/launcher/updater/testdata/fileTwo
diff --git a/api/logic/updater/testdata/garbageChannels.json b/launcher/updater/testdata/garbageChannels.json
index 34437451..34437451 100644
--- a/api/logic/updater/testdata/garbageChannels.json
+++ b/launcher/updater/testdata/garbageChannels.json
diff --git a/api/logic/updater/testdata/index.json b/launcher/updater/testdata/index.json
index 867bdcfb..867bdcfb 100644
--- a/api/logic/updater/testdata/index.json
+++ b/launcher/updater/testdata/index.json
diff --git a/api/logic/updater/testdata/noChannels.json b/launcher/updater/testdata/noChannels.json
index 76988982..76988982 100644
--- a/api/logic/updater/testdata/noChannels.json
+++ b/launcher/updater/testdata/noChannels.json
diff --git a/api/logic/updater/testdata/oneChannel.json b/launcher/updater/testdata/oneChannel.json
index cc8ed255..cc8ed255 100644
--- a/api/logic/updater/testdata/oneChannel.json
+++ b/launcher/updater/testdata/oneChannel.json
diff --git a/api/logic/updater/testdata/tst_DownloadTask-test_writeInstallScript.xml b/launcher/updater/testdata/tst_DownloadTask-test_writeInstallScript.xml
index 09c162ca..09c162ca 100644
--- a/api/logic/updater/testdata/tst_DownloadTask-test_writeInstallScript.xml
+++ b/launcher/updater/testdata/tst_DownloadTask-test_writeInstallScript.xml
diff --git a/application/widgets/Common.cpp b/launcher/widgets/Common.cpp
index f72f3596..f72f3596 100644
--- a/application/widgets/Common.cpp
+++ b/launcher/widgets/Common.cpp
diff --git a/application/widgets/Common.h b/launcher/widgets/Common.h
index b3fbe1a0..b3fbe1a0 100644
--- a/application/widgets/Common.h
+++ b/launcher/widgets/Common.h
diff --git a/application/widgets/CustomCommands.cpp b/launcher/widgets/CustomCommands.cpp
index 24bdc07d..24bdc07d 100644
--- a/application/widgets/CustomCommands.cpp
+++ b/launcher/widgets/CustomCommands.cpp
diff --git a/application/widgets/CustomCommands.h b/launcher/widgets/CustomCommands.h
index 8db991fa..8db991fa 100644
--- a/application/widgets/CustomCommands.h
+++ b/launcher/widgets/CustomCommands.h
diff --git a/application/widgets/CustomCommands.ui b/launcher/widgets/CustomCommands.ui
index 25b2681b..25b2681b 100644
--- a/application/widgets/CustomCommands.ui
+++ b/launcher/widgets/CustomCommands.ui
diff --git a/application/widgets/DropLabel.cpp b/launcher/widgets/DropLabel.cpp
index a900e57c..a900e57c 100644
--- a/application/widgets/DropLabel.cpp
+++ b/launcher/widgets/DropLabel.cpp
diff --git a/application/widgets/DropLabel.h b/launcher/widgets/DropLabel.h
index c5ca0bcc..c5ca0bcc 100644
--- a/application/widgets/DropLabel.h
+++ b/launcher/widgets/DropLabel.h
diff --git a/application/widgets/FocusLineEdit.cpp b/launcher/widgets/FocusLineEdit.cpp
index b272100c..b272100c 100644
--- a/application/widgets/FocusLineEdit.cpp
+++ b/launcher/widgets/FocusLineEdit.cpp
diff --git a/application/widgets/FocusLineEdit.h b/launcher/widgets/FocusLineEdit.h
index 71b4f140..71b4f140 100644
--- a/application/widgets/FocusLineEdit.h
+++ b/launcher/widgets/FocusLineEdit.h
diff --git a/application/widgets/IconLabel.cpp b/launcher/widgets/IconLabel.cpp
index bf1c2358..bf1c2358 100644
--- a/application/widgets/IconLabel.cpp
+++ b/launcher/widgets/IconLabel.cpp
diff --git a/application/widgets/IconLabel.h b/launcher/widgets/IconLabel.h
index 6d212c4c..6d212c4c 100644
--- a/application/widgets/IconLabel.h
+++ b/launcher/widgets/IconLabel.h
diff --git a/application/widgets/InstanceCardWidget.ui b/launcher/widgets/InstanceCardWidget.ui
index 6eeeb076..6eeeb076 100644
--- a/application/widgets/InstanceCardWidget.ui
+++ b/launcher/widgets/InstanceCardWidget.ui
diff --git a/application/widgets/JavaSettingsWidget.cpp b/launcher/widgets/JavaSettingsWidget.cpp
index 7f53dc23..7f53dc23 100644
--- a/application/widgets/JavaSettingsWidget.cpp
+++ b/launcher/widgets/JavaSettingsWidget.cpp
diff --git a/application/widgets/JavaSettingsWidget.h b/launcher/widgets/JavaSettingsWidget.h
index 0d280daf..0d280daf 100644
--- a/application/widgets/JavaSettingsWidget.h
+++ b/launcher/widgets/JavaSettingsWidget.h
diff --git a/application/widgets/LabeledToolButton.cpp b/launcher/widgets/LabeledToolButton.cpp
index ab2d3278..ab2d3278 100644
--- a/application/widgets/LabeledToolButton.cpp
+++ b/launcher/widgets/LabeledToolButton.cpp
diff --git a/application/widgets/LabeledToolButton.h b/launcher/widgets/LabeledToolButton.h
index 51f99e9b..51f99e9b 100644
--- a/application/widgets/LabeledToolButton.h
+++ b/launcher/widgets/LabeledToolButton.h
diff --git a/application/widgets/LanguageSelectionWidget.cpp b/launcher/widgets/LanguageSelectionWidget.cpp
index 8d23bdc5..8d23bdc5 100644
--- a/application/widgets/LanguageSelectionWidget.cpp
+++ b/launcher/widgets/LanguageSelectionWidget.cpp
diff --git a/application/widgets/LanguageSelectionWidget.h b/launcher/widgets/LanguageSelectionWidget.h
index e65936db..e65936db 100644
--- a/application/widgets/LanguageSelectionWidget.h
+++ b/launcher/widgets/LanguageSelectionWidget.h
diff --git a/application/widgets/LineSeparator.cpp b/launcher/widgets/LineSeparator.cpp
index d03e6762..d03e6762 100644
--- a/application/widgets/LineSeparator.cpp
+++ b/launcher/widgets/LineSeparator.cpp
diff --git a/application/widgets/LineSeparator.h b/launcher/widgets/LineSeparator.h
index 22927b68..22927b68 100644
--- a/application/widgets/LineSeparator.h
+++ b/launcher/widgets/LineSeparator.h
diff --git a/application/widgets/LogView.cpp b/launcher/widgets/LogView.cpp
index 26a2a527..26a2a527 100644
--- a/application/widgets/LogView.cpp
+++ b/launcher/widgets/LogView.cpp
diff --git a/application/widgets/LogView.h b/launcher/widgets/LogView.h
index 3143360a..3143360a 100644
--- a/application/widgets/LogView.h
+++ b/launcher/widgets/LogView.h
diff --git a/application/widgets/MCModInfoFrame.cpp b/launcher/widgets/MCModInfoFrame.cpp
index 5b1f6230..5b1f6230 100644
--- a/application/widgets/MCModInfoFrame.cpp
+++ b/launcher/widgets/MCModInfoFrame.cpp
diff --git a/application/widgets/MCModInfoFrame.h b/launcher/widgets/MCModInfoFrame.h
index 0b7ef537..0b7ef537 100644
--- a/application/widgets/MCModInfoFrame.h
+++ b/launcher/widgets/MCModInfoFrame.h
diff --git a/application/widgets/MCModInfoFrame.ui b/launcher/widgets/MCModInfoFrame.ui
index 5ef33379..5ef33379 100644
--- a/application/widgets/MCModInfoFrame.ui
+++ b/launcher/widgets/MCModInfoFrame.ui
diff --git a/application/widgets/ModListView.cpp b/launcher/widgets/ModListView.cpp
index c8ccd292..c8ccd292 100644
--- a/application/widgets/ModListView.cpp
+++ b/launcher/widgets/ModListView.cpp
diff --git a/application/widgets/ModListView.h b/launcher/widgets/ModListView.h
index 881e092f..881e092f 100644
--- a/application/widgets/ModListView.h
+++ b/launcher/widgets/ModListView.h
diff --git a/application/widgets/PageContainer.cpp b/launcher/widgets/PageContainer.cpp
index 05a5e6b4..05a5e6b4 100644
--- a/application/widgets/PageContainer.cpp
+++ b/launcher/widgets/PageContainer.cpp
diff --git a/application/widgets/PageContainer.h b/launcher/widgets/PageContainer.h
index 976d34e9..976d34e9 100644
--- a/application/widgets/PageContainer.h
+++ b/launcher/widgets/PageContainer.h
diff --git a/application/widgets/PageContainer_p.h b/launcher/widgets/PageContainer_p.h
index da1a66f4..da1a66f4 100644
--- a/application/widgets/PageContainer_p.h
+++ b/launcher/widgets/PageContainer_p.h
diff --git a/application/widgets/ProgressWidget.cpp b/launcher/widgets/ProgressWidget.cpp
index 911e555d..911e555d 100644
--- a/application/widgets/ProgressWidget.cpp
+++ b/launcher/widgets/ProgressWidget.cpp
diff --git a/application/widgets/ProgressWidget.h b/launcher/widgets/ProgressWidget.h
index fa67748a..fa67748a 100644
--- a/application/widgets/ProgressWidget.h
+++ b/launcher/widgets/ProgressWidget.h
diff --git a/application/widgets/ServerStatus.cpp b/launcher/widgets/ServerStatus.cpp
index 87c34f70..87c34f70 100644
--- a/application/widgets/ServerStatus.cpp
+++ b/launcher/widgets/ServerStatus.cpp
diff --git a/application/widgets/ServerStatus.h b/launcher/widgets/ServerStatus.h
index e1e70dfb..e1e70dfb 100644
--- a/application/widgets/ServerStatus.h
+++ b/launcher/widgets/ServerStatus.h
diff --git a/application/widgets/VersionListView.cpp b/launcher/widgets/VersionListView.cpp
index 8424fedd..8424fedd 100644
--- a/application/widgets/VersionListView.cpp
+++ b/launcher/widgets/VersionListView.cpp
diff --git a/application/widgets/VersionListView.h b/launcher/widgets/VersionListView.h
index 4153b314..4153b314 100644
--- a/application/widgets/VersionListView.h
+++ b/launcher/widgets/VersionListView.h
diff --git a/application/widgets/VersionSelectWidget.cpp b/launcher/widgets/VersionSelectWidget.cpp
index 9925a6b4..9925a6b4 100644
--- a/application/widgets/VersionSelectWidget.cpp
+++ b/launcher/widgets/VersionSelectWidget.cpp
diff --git a/application/widgets/VersionSelectWidget.h b/launcher/widgets/VersionSelectWidget.h
index 0a649408..0a649408 100644
--- a/application/widgets/VersionSelectWidget.h
+++ b/launcher/widgets/VersionSelectWidget.h
diff --git a/application/widgets/WideBar.cpp b/launcher/widgets/WideBar.cpp
index cbd6c617..cbd6c617 100644
--- a/application/widgets/WideBar.cpp
+++ b/launcher/widgets/WideBar.cpp
diff --git a/application/widgets/WideBar.h b/launcher/widgets/WideBar.h
index d1b8cbe7..d1b8cbe7 100644
--- a/application/widgets/WideBar.h
+++ b/launcher/widgets/WideBar.h