diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bf051c..04c312e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Changelog
 
 ## 2024.2
-* Adds support for [Parent=""] attributes
+ * Adds support for [Parent=""] attributes
+ * Makes the New Mod template modular, allowing you to select the components you want included in your mod
 
 ## 2024.1.7
  * Solved some incompatibilities for ReSharper
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/.template.config/template.json b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/.template.config/template.json
index 99bcb8d..3e4e45e 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/.template.config/template.json
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/.template.config/template.json
@@ -41,6 +41,38 @@
       "isRequired": "false",
       "defaultValue": ""
     },
+    "PublisherPlus": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Include a PublisherPlus config",
+      "description": "If enabled, a PublisherPlus config file will be included in the mod",
+      "isRequired": "false",
+      "defaultValue": "true"
+    },
+    "CSharp": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Add a C# Project and Sources",
+      "description": "If enabled, this mod will be created with a .sln file, Sources folder and a csproj file",
+      "isRequired": "false",
+      "defaultValue": "true"
+    },
+    "XML": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Add a Defs folder with a starting XML file",
+      "description": "If enabled, this mod will be created with a Defs folder and a starting XML file",
+      "isRequired": "false",
+      "defaultValue": "true"
+    },
+    "Languages": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Add a Languages folder",
+      "description": "If enabled, this mod will be created with a Languages folder with a starting English.xml file",
+      "isRequired": "false",
+      "defaultValue": "true"
+    },
     "AssemblyDir": {
       "type": "derived",
       "valueSource": "RimworldDLL",
@@ -64,11 +96,22 @@
         {
           "type": "conditional",
           "configuration": {
-            "if": [ "<!--#if" ],
-            "else": [ "#else", "<!--#else" ],
-            "elseif": [ "#elseif", "<!--#elseif" ],
-            "endif": [ "#endif", "<!--#endif" ],
-            "trim" : "true",
+            "if": [
+              "<!--#if"
+            ],
+            "else": [
+              "#else",
+              "<!--#else"
+            ],
+            "elseif": [
+              "#elseif",
+              "<!--#elseif"
+            ],
+            "endif": [
+              "#endif",
+              "<!--#endif"
+            ],
+            "trim": "true",
             "wholeLine": "true"
           }
         }
@@ -82,6 +125,28 @@
       "replacement": "$1"
     }
   },
+  "sources": [
+    {
+      "modifiers": [
+        {
+          "condition": "PublisherPlus == false",
+          "exclude": ["_PublisherPlus.xml"]
+        },
+        {
+          "condition": "CSharp == false",
+          "exclude": ["Source/**/*"]
+        },
+        {
+          "condition": "XML == false",
+          "exclude": ["Defs/**/*"]
+        },
+        {
+          "condition": "Languages == false",
+          "exclude": ["Languages/**/*"]
+        }
+      ]
+    }
+  ],
   "primaryOutputs": [
     {
       "path": "About/About.xml"
@@ -120,9 +185,11 @@
     },
     {
       "description": "Restore NuGet packages required by this project.",
-      "manualInstructions": [{
-        "text": "Run 'dotnet restore'"
-      }],
+      "manualInstructions": [
+        {
+          "text": "Run 'dotnet restore'"
+        }
+      ],
       "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025",
       "continueOnError": true
     }
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/ModAuthorParameter.cs b/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/ModAuthorParameter.cs
deleted file mode 100644
index 11a9a40..0000000
--- a/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/ModAuthorParameter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// using System.Collections.Generic;
-// using JetBrains.Application;
-// using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetExtensions;
-// using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetTemplates;
-// using JetBrains.Rider.Model;
-//
-// namespace ReSharperPlugin.RimworldDev.TemplateParameters;
-//
-// public class ModAuthorNameParameter: DotNetTemplateParameter
-// {
-//     public ModAuthorNameParameter() : base("ModAuthor", "Mod Author Name", "Mod Author Name")
-//     {
-//     }
-//
-//     public override RdProjectTemplateContent CreateContent(DotNetProjectTemplateExpander expander, IDotNetTemplateContentFactory factory,
-//         int index, IDictionary<string, string> context)
-//     {
-//         var content = factory.CreateNextParameters(new[] {expander}, index + 1, context);
-//         var parameter = expander.TemplateInfo.GetParameter(Name);
-//         if (parameter == null)
-//         {
-//             return content;
-//         }
-//         
-//         return new RdProjectTemplateTextParameter(Name, PresentableName, null, Tooltip, RdTextParameterStyle.Text, content);
-//     }
-// }
-//
-// [ShellComponent]
-// public class UnityPathParameterProvider : IDotNetTemplateParameterProvider
-// {
-//     public int Priority => 50;
-//
-//     public IReadOnlyCollection<DotNetTemplateParameter> Get()
-//     {
-//         return new[] {new ModAuthorNameParameter()};
-//     }
-// }
\ No newline at end of file
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/RimworldDLLParameter.cs b/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/RimworldDLLParameter.cs
index f7ccafe..8595df3 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/RimworldDLLParameter.cs
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/RimworldDLLParameter.cs
@@ -1,93 +1,34 @@
-// using System.Collections.Generic;
-// using System.Linq;
-// using JetBrains.Application;
-// using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetExtensions;
-// using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetTemplates;
-// using JetBrains.Rider.Model;
-// using JetBrains.Util;
-// using Microsoft.TemplateEngine.Abstractions;
-//
-// namespace ReSharperPlugin.RimworldDev.TemplateParameters;
-//
-// public class RimworldDLLParameter : DotNetTemplateParameter
-// {
-//     public RimworldDLLParameter() : base("RimworldDLL", "Rimworld DLL", "Path to Assembly-CSharp.dll")
-//     {
-//     }
-//
-//     public override RdProjectTemplateOption CreateContent(ITemplateInfo templateInfo, ITemplateParameter templateParameter,
-//         Dictionary<string, object> context)
-//     {
-//         var locations = new List<string>
-//         {
-//             "C:\\Program Files (x86)\\Steam\\steamapps\\common\\RimWorld\\RimWorldWin64_Data\\Managed\\Assembly-CSharp.dll",
-//             "C:\\Program Files\\Steam\\steamapps\\common\\RimWorld\\RimWorldWin64_Data\\Managed\\Assembly-CSharp.dll",
-//             "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\RimWorldWin64_Data\\Managed\\Assembly-CSharp.dll",
-//             "~/.steam/steam/steamapps/common/RimWorld/RimWorldLinux_Data/Managed/Assembly-CSharp.dll"
-//         };
-//         
-//         var possiblePaths = locations
-//             .Select(location => FileSystemPath.TryParse(location)).Where(location => location.ExistsFile)
-//             .ToArray();
-//
-//         var detectedPath = possiblePaths.FirstOrDefault()?.FullPath;
-//
-//         return new RdProjectTemplateTextOption(detectedPath ?? "", Name, PresentableName, Tooltip);
-//     }
-//
-//     public override RdProjectTemplateContent CreateContent(
-//         DotNetProjectTemplateExpander expander,
-//         IDotNetTemplateContentFactory factory,
-//         int index, IDictionary<string, string> context
-//     )
-//     {
-//         var locations = new List<string>
-//         {
-//             "C:\\Program Files (x86)\\Steam\\steamapps\\common\\RimWorld\\RimWorldWin64_Data\\Managed\\Assembly-CSharp.dll",
-//             "C:\\Program Files\\Steam\\steamapps\\common\\RimWorld\\RimWorldWin64_Data\\Managed\\Assembly-CSharp.dll",
-//             "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\RimWorldWin64_Data\\Managed\\Assembly-CSharp.dll",
-//             "~/.steam/steam/steamapps/common/RimWorld/RimWorldLinux_Data/Managed/Assembly-CSharp.dll"
-//         };
-//
-//         var content = factory.CreateNextParameters(new[] { expander }, index + 1, context);
-//         var parameter = expander.TemplateInfo.GetParameter(Name);
-//         if (parameter == null)
-//         {
-//             return content;
-//         }
-//
-//         var possiblePaths = locations
-//             .Select(location => FileSystemPath.TryParse(location)).Where(location => location.ExistsFile)
-//             .ToArray();
-//
-//         var options = new List<RdProjectTemplateGroupOption>();
-//
-//         foreach (var path in possiblePaths)
-//         {
-//             var optionContext = new Dictionary<string, string>(context) { { Name, path.FullPath } };
-//             var content1 = factory.CreateNextParameters(new[] { expander }, index + 1, optionContext);
-//             options.Add(new RdProjectTemplateGroupOption(path.FullPath, path.FullPath, null, content1));
-//         }
-//
-//         options.Add(new RdProjectTemplateGroupOption(
-//             "Custom",
-//             possiblePaths.Any() ? "Custom" : "Custom (Assembly-CSharp.dll not found)",
-//             null,
-//             new RdProjectTemplateTextParameter(Name, "Custom path", null, Tooltip, RdTextParameterStyle.FileChooser,
-//                 content)));
-//
-//         return new RdProjectTemplateGroupParameter(Name, PresentableName,
-//             possiblePaths.Any() ? possiblePaths.Last().FullPath : string.Empty, null, options);
-//     }
-// }
-//
-// [ShellComponent]
-// public class RimworldDLLParameterProvider : IDotNetTemplateParameterProvider
-// {
-//     public int Priority => 50;
-//
-//     public IReadOnlyCollection<DotNetTemplateParameter> Get()
-//     {
-//         return new[] { new RimworldDLLParameter() };
-//     }
-// }
\ No newline at end of file
+using System.Collections.Generic;
+using System.IO;
+using JetBrains.Application;
+using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetExtensions;
+using JetBrains.Rider.Model;
+using Microsoft.TemplateEngine.Abstractions;
+
+namespace ReSharperPlugin.RimworldDev.TemplateParameters;
+
+public class RimworldDLLParameter : DotNetTemplateParameter
+{
+    public RimworldDLLParameter() : base("RimworldDLL", "Rimworld DLL", "Path to Assembly-CSharp.dll")
+    {
+    }
+
+    public override RdProjectTemplateOption CreateContent(ITemplateInfo templateInfo, ITemplateParameter templateParameter,
+        Dictionary<string, object> context)
+    {
+        var detectedPath = ScopeHelper.FindRimworldDll(Directory.GetCurrentDirectory())?.FullPath;
+        
+        return new RdProjectTemplateTextOption(detectedPath ?? "",  "string", Name, PresentableName, Tooltip);
+    }
+}
+
+[ShellComponent]
+public class RimworldDLLParameterProvider : IDotNetTemplateParameterProvider
+{
+    public int Priority => 50;
+
+    public IReadOnlyCollection<DotNetTemplateParameter> Get()
+    {
+        return new[] { new RimworldDLLParameter() };
+    }
+}
\ No newline at end of file