diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
index 5093b1af..7f92f83a 100644
--- a/FModel/FModel.csproj
+++ b/FModel/FModel.csproj
@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{8FABCD3A-9D55-4B54-B237-B259D815DEB8}</ProjectGuid>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <RootNamespace>FModel</RootNamespace>
     <AssemblyName>FModel</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs
index a6475e88..660a7b6c 100644
--- a/FModel/MainWindow.cs
+++ b/FModel/MainWindow.cs
@@ -24,7 +24,6 @@ using FModel.Parser.Challenges;
 using FModel.Parser.Featured;
 using FModel.Parser.Items;
 using FModel.Parser.Quests;
-using FModel.Parser.RenderMat;
 using FModel.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -1672,12 +1671,12 @@ namespace FModel
             }
             if (featured)
             {
-                if (theItem.DisplayAssetPath != null && theItem.DisplayAssetPath.AssetPathName.Contains("/Game/Catalog/DisplayAssets/") && theItem.ExportType != "AthenaItemWrapDefinition")
+                if (theItem.DisplayAssetPath != null && theItem.DisplayAssetPath.AssetPathName.Contains("/Game/Catalog/DisplayAssets/"))
                 {
                     string catalogName = theItem.DisplayAssetPath.AssetPathName;
                     SearchFeaturedCharacterIcon(theItem, catalogName);
                 }
-                else if (theItem.DisplayAssetPath == null && theItem.ExportType != "AthenaItemWrapDefinition")
+                else if (theItem.DisplayAssetPath == null)
                 {
                     SearchFeaturedCharacterIcon(theItem, "DA_Featured_" + ThePak.CurrentUsedItem, true);
                 }
@@ -1888,7 +1887,8 @@ namespace FModel
                     catName == "DA_Featured_Glider_ID_017_Assassin" || 
                     catName == "DA_Featured_Pickaxe_ID_027_Scavenger" || 
                     catName == "DA_Featured_Pickaxe_ID_028_Space" || 
-                    catName == "DA_Featured_Pickaxe_ID_029_Assassin")
+                    catName == "DA_Featured_Pickaxe_ID_029_Assassin" ||
+                    catName == "DA_Featured_EID_Dunk")
                     GetItemIcon(theItem);
                 else if (ThePak.AllpaksDictionary.ContainsKey(catName))
                 {
@@ -2430,24 +2430,18 @@ namespace FModel
         }
         private void DrawV2(ChallengeBundleIdParser myBundle, ItemsIdParser theItem, string questJson, Graphics toDrawOn, Bitmap myBitmap)
         {
-            int sRed;
-            int sGreen;
-            int sBlue;
-
             string seasonFolder = questJson.Substring(questJson.Substring(0, questJson.LastIndexOf("\\", StringComparison.Ordinal)).LastIndexOf("\\", StringComparison.Ordinal) + 1).ToUpper();
-            sRed = (int)(myBundle.DisplayStyle.AccentColor.R * 255);
-            sGreen = (int)(myBundle.DisplayStyle.AccentColor.G * 255);
-            sBlue = (int)(myBundle.DisplayStyle.AccentColor.B * 255);
+            int sRed = (int)(myBundle.DisplayStyle.SecondaryColor.R * 255);
+            int sGreen = (int)(myBundle.DisplayStyle.SecondaryColor.G * 255);
+            int sBlue = (int)(myBundle.DisplayStyle.SecondaryColor.B * 255);
 
-            if (sRed <= 25 && sGreen <= 25 && sBlue <= 25)
+            if (string.Equals(seasonFolder.Substring(0, seasonFolder.LastIndexOf("\\", StringComparison.Ordinal)), "LTM") || sRed + sGreen + sBlue <= 75)
             {
-                sRed = (int)(myBundle.DisplayStyle.SecondaryColor.R * 255);
-                sGreen = (int)(myBundle.DisplayStyle.SecondaryColor.G * 255);
-                sBlue = (int)(myBundle.DisplayStyle.SecondaryColor.B * 255);
+                sRed = (int)(myBundle.DisplayStyle.AccentColor.R * 255);
+                sGreen = (int)(myBundle.DisplayStyle.AccentColor.G * 255);
+                sBlue = (int)(myBundle.DisplayStyle.AccentColor.B * 255);
             }
 
-            Console.WriteLine(sRed + " " + sGreen + " " + sBlue);
-
             int seasonRed = Convert.ToInt32(sRed / 1.5);
             int seasonGreen = Convert.ToInt32(sGreen / 1.5);
             int seasonBlue = Convert.ToInt32(sBlue / 1.5);
diff --git a/FModel/Methods/JohnWick/JohnWick.cs b/FModel/Methods/JohnWick/JohnWick.cs
index 4164b485..fccb9df1 100644
--- a/FModel/Methods/JohnWick/JohnWick.cs
+++ b/FModel/Methods/JohnWick/JohnWick.cs
@@ -4,7 +4,6 @@ using FModel.Properties;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 
@@ -73,7 +72,7 @@ namespace FModel
 
 
             string TexturePath = string.Empty;
-            if (textureFilePath != null && (textureFilePath.Contains("MI_UI_FeaturedRenderSwitch_") || textureFilePath.Contains("M_UI_ChallengeTile_PCB")))
+            if (textureFilePath != null && (textureFilePath.Contains("MI_UI_FeaturedRenderSwitch_") || textureFilePath.Contains("M_UI_ChallengeTile_PCB") || textureFilePath.Contains("Wraps\\FeaturedMaterials\\")))
             {
                 return GetRenderSwitchMaterialTexture(AssetName, textureFilePath);
             }