diff --git a/TwilightBoxart.CLI/Properties/PublishProfiles/Linux.pubxml b/TwilightBoxart.CLI/Properties/PublishProfiles/Linux.pubxml
index 3ba2281..3607516 100644
--- a/TwilightBoxart.CLI/Properties/PublishProfiles/Linux.pubxml
+++ b/TwilightBoxart.CLI/Properties/PublishProfiles/Linux.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <PublishDir>bin\Release\linux-x64</PublishDir>
+    <PublishDir>bin\Release\TwilightBoxart-Linux-CLI</PublishDir>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
   </PropertyGroup>
diff --git a/TwilightBoxart.CLI/Properties/PublishProfiles/MacOS.pubxml b/TwilightBoxart.CLI/Properties/PublishProfiles/MacOS.pubxml
index 7676a89..4c3fbde 100644
--- a/TwilightBoxart.CLI/Properties/PublishProfiles/MacOS.pubxml
+++ b/TwilightBoxart.CLI/Properties/PublishProfiles/MacOS.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <PublishDir>bin\Release\TwilightBoxart-MacOS.CLI</PublishDir>
+    <PublishDir>bin\Release\TwilightBoxart-MacOS-CLI</PublishDir>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
   </PropertyGroup>
diff --git a/TwilightBoxart/Models/Base/LibRetroRom.cs b/TwilightBoxart/Models/Base/LibRetroRom.cs
index b66a1d1..9199d18 100644
--- a/TwilightBoxart/Models/Base/LibRetroRom.cs
+++ b/TwilightBoxart/Models/Base/LibRetroRom.cs
@@ -71,8 +71,20 @@ private void Download(ConsoleType consoleType, string name, string targetFile)
             // We can generate the LibRetro content url based on the NoIntroDb name.
             var consoleStr = consoleType.GetDescription().Replace(" ", "_");
             var url = $"https://github.com/libretro-thumbnails/{consoleStr}/raw/master/Named_Boxarts/";
-            name = name.Replace("&", "_"); // Todo: There are probably more replacements going on, search & add them.
+
+            // Found the characters: https://docs.libretro.com/guides/roms-playlists-thumbnails/
+            // &*/:`<>?\|
+            name = name.Replace("&", "_");
+            name = name.Replace("*", "_");
             name = name.Replace("/", "_");
+            name = name.Replace(":", "_");
+            name = name.Replace("`", "_");
+            name = name.Replace("<", "_");
+            name = name.Replace(">", "_");
+            name = name.Replace("?", "_");
+            name = name.Replace("\\", "_");
+            name = name.Replace("|", "_");
+
             url = FileHelper.CombineUri(url, $"{name}.png");
             ImgDownloader.DownloadAndResize(url, targetFile);
         }