diff --git a/source/Directory.Build.props b/source/Directory.Build.props
index b572e0479..8df9eb209 100644
--- a/source/Directory.Build.props
+++ b/source/Directory.Build.props
@@ -18,8 +18,8 @@
     </ItemGroup>
 
    <ItemGroup Condition="$(DefineConstants.Contains('FNA'))">
-        <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\..\FNA\FNA.NetStandard.csproj" />
-    </ItemGroup>
+        <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\FNA\FNA.NetStandard.csproj" />
+   </ItemGroup>
 
   <ItemGroup Condition="$(DefineConstants.Contains('KNI'))">
         <PackageReference Include="nkast.Xna.Framework"
diff --git a/source/MonoGame.Extended/Content/ExtendedContentManager.cs b/source/MonoGame.Extended/Content/ExtendedContentManager.cs
index 7c9ae79a2..e0307b86d 100644
--- a/source/MonoGame.Extended/Content/ExtendedContentManager.cs
+++ b/source/MonoGame.Extended/Content/ExtendedContentManager.cs
@@ -42,6 +42,29 @@ public List<IDisposable> DisposeableAssets
         }
     }
 
+
+#if KNI || FNA
+    private Dictionary<string, object> _loadedAssets;
+    public Dictionary<string, object> LoadedAssets
+    {
+        get
+        {
+            if(_loadedAssets is null)
+            {
+                //  KNI please make this public so I don't have to use reflection
+                FieldInfo field = typeof(ContentManager).GetField(nameof(_loadedAssets), BindingFlags.NonPublic | BindingFlags.Instance);
+                if (field is null)
+                {
+                    throw new InvalidOperationException("Unable to get source loaded assets field");
+                }
+                _loadedAssets = field.GetValue(this) as Dictionary<string, object>;
+            }
+
+            return _loadedAssets;
+        }
+    }
+#endif
+
     public ExtendedContentManager(IServiceProvider serviceProvider) : base(serviceProvider)
     {
         _graphicsDeviceService = serviceProvider.GetService(typeof(IGraphicsDeviceService)) as IGraphicsDeviceService;
@@ -51,7 +74,40 @@ public ExtendedContentManager(IServiceProvider serviceProvider, string rootDirec
     {
         _graphicsDeviceService = serviceProvider.GetService(typeof(IGraphicsDeviceService)) as IGraphicsDeviceService;
     }
+    
+#if KNI || FNA
+    /// <summary>
+    /// Loads a <see cref="Texture2D"/> asset.
+    /// </summary>
+    /// <remarks>
+    /// If the <paramref name="path"/> parameter is a relative path, it must be relative to the
+    /// <see cref="ContentManager.RootDirectory"/> path.
+    /// </remarks>
+    /// <param name="path">The path to the asset to load</param>
+    /// <param name="premultiplyAlpha">
+    /// Specifies whether the color data of the texture should be premultiplied by its alpha value.
+    /// </param>
+    /// <returns></returns>
+    public Texture2D LoadTexture2D(string path)
+    {
+        if (TryGetCachedAsset<Texture2D>(path, out Texture2D texture))
+        {
+            return texture;
+        }
+
+        if (NoExtension(path))
+        {
+            return Load<Texture2D>(path);
+        }
+
+        using Stream stream = GetStream(path);
+        texture = Texture2D.FromStream(_graphicsDeviceService.GraphicsDevice, stream);
+        texture.Name = path;
+        CacheAsset(path, texture);
+        return texture;
+    }
 
+#else
     /// <summary>
     /// Loads a <see cref="Texture2D"/> asset.
     /// </summary>
@@ -95,6 +151,7 @@ public Texture2D LoadTexture2D(string path, bool premultiplyAlpha)
         CacheAsset(path, texture);
         return texture;
     }
+#endif
 
     /// <summary>
     /// Loads a <see cref="SoundEffect"/> asset.
@@ -178,11 +235,18 @@ public BitmapFont LoadBitmapFont(string path)
     /// Loads a <see cref="Texture2DAtlas"/> from a TexturePacker JSON file.
     /// </summary>
     /// <param name="path">The path to the TexturePacker JSON file</param>
+
+#if !KNI && !FNA
     /// <param name="premultiplyAlpha">
     /// Specifies whether the color data of the texture should be premultiplied by its alpha value.
     /// </param>
+#endif
     /// <returns>The <see cref="Texture2DAtlas"/> created from the TexturePacker JSON file content.</returns>
+#if KNI || FNA
+    public Texture2DAtlas LoadTexturePacker(string path)
+#else
     public Texture2DAtlas LoadTexturePacker(string path, bool premultiplyAlpha)
+#endif
     {
         if (TryGetCachedAsset<Texture2DAtlas>(path, out var atlas))
         {
@@ -199,8 +263,12 @@ public Texture2DAtlas LoadTexturePacker(string path, bool premultiplyAlpha)
         var tpFile = TexturePackerFileReader.Read(stream);
         var dir = Path.GetDirectoryName(path);
         var imageAssetPath = Path.Combine(dir, tpFile.Meta.Image);
-        var texture = LoadTexture2D(imageAssetPath, premultiplyAlpha);
 
+#if KNI || FNA
+        var texture = LoadTexture2D(imageAssetPath);
+#else
+        var texture = LoadTexture2D(imageAssetPath, premultiplyAlpha);
+#endif
         atlas = new Texture2DAtlas(Path.GetFileNameWithoutExtension(tpFile.Meta.Image), texture);
 
         foreach(var region in tpFile.Regions)
diff --git a/source/MonoGame.Extended/KNI.Extended.csproj b/source/MonoGame.Extended/KNI.Extended.csproj
index 5278f109c..2c68ed8ce 100644
--- a/source/MonoGame.Extended/KNI.Extended.csproj
+++ b/source/MonoGame.Extended/KNI.Extended.csproj
@@ -15,6 +15,8 @@
             <_Parameter1>Kni.Extended.Content.Pipeline</_Parameter1>
         </AssemblyAttribute>
     </ItemGroup>
-
+    <ItemGroup>
+      <PackageReference Include="nkast.Xna.Framework.Audio" Version="3.12.9001" />
+    </ItemGroup>
 
 </Project>
diff --git a/tests/MonoGame.Extended.Tests/FNA.Extended.Tests.csproj b/tests/MonoGame.Extended.Tests/FNA.Extended.Tests.csproj
index 21424fc23..6d051b294 100644
--- a/tests/MonoGame.Extended.Tests/FNA.Extended.Tests.csproj
+++ b/tests/MonoGame.Extended.Tests/FNA.Extended.Tests.csproj
@@ -6,7 +6,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\source\MonoGame.Extended\FNA.Extended.csproj" />
-        <ProjectReference Include="..\..\source\MonoGame.Extended.Particles\FNA.Extended.Particles.csproj" />
     </ItemGroup>
 
     <ItemGroup>