diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
index df876829..29195bbe 100644
--- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs
+++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
@@ -1,20 +1,21 @@
+using System;
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Mvc;
-using Oqtane.Models;
-using Oqtane.Shared;
-using Microsoft.AspNetCore.Authorization;
+using System.Diagnostics;
 using System.IO;
-using System.Reflection;
 using System.Linq;
+using System.Net;
+using System.Reflection;
+using System.Text.Json;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
 using Oqtane.Enums;
 using Oqtane.Infrastructure;
+using Oqtane.Models;
 using Oqtane.Repository;
 using Oqtane.Security;
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using System.Text.Json;
-using System.Net;
+using Oqtane.Shared;
 
 namespace Oqtane.Controllers
 {
@@ -271,9 +272,10 @@ namespace Oqtane.Controllers
                 foreach (string directory in Directory.GetDirectories(templatePath))
                 {
                     string name = directory.Replace(templatePath, "");
-                    if (System.IO.File.Exists(Path.Combine(directory, "template.json")))
+                    var manifest = Directory.GetFiles(directory, "*.json");
+                    if (manifest.Any())
                     {
-                        var template = JsonSerializer.Deserialize<Template>(System.IO.File.ReadAllText(Path.Combine(directory, "template.json")));
+                        var template = JsonSerializer.Deserialize<Template>(System.IO.File.ReadAllText(manifest[0]));
                         template.Name = name;
                         template.Location = "";
                         if (template.Type.ToLower() != "internal")
diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs
index 0463ae34..335a939c 100644
--- a/Oqtane.Server/Controllers/ThemeController.cs
+++ b/Oqtane.Server/Controllers/ThemeController.cs
@@ -183,9 +183,10 @@ namespace Oqtane.Controllers
                 foreach (string directory in Directory.GetDirectories(templatePath))
                 {
                     string name = directory.Replace(templatePath, "");
-                    if (System.IO.File.Exists(Path.Combine(directory, "template.json")))
+                    var manifest = Directory.GetFiles(directory, "*.json");
+                    if (manifest.Any())
                     {
-                        var template = JsonSerializer.Deserialize<Template>(System.IO.File.ReadAllText(Path.Combine(directory, "template.json")));
+                        var template = JsonSerializer.Deserialize<Template>(System.IO.File.ReadAllText(manifest[0]));
                         template.Name = name;
                         template.Location = "";
                         if (template.Type.ToLower() != "internal")
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/template.json b/Oqtane.Server/wwwroot/Modules/Templates/External/exteneral.module.template.json
similarity index 100%
rename from Oqtane.Server/wwwroot/Modules/Templates/External/template.json
rename to Oqtane.Server/wwwroot/Modules/Templates/External/exteneral.module.template.json
diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/template.json b/Oqtane.Server/wwwroot/Themes/Templates/External/exteneral.theme.template.json
similarity index 100%
rename from Oqtane.Server/wwwroot/Themes/Templates/External/template.json
rename to Oqtane.Server/wwwroot/Themes/Templates/External/exteneral.theme.template.json