diff --git a/NuGet.Config b/NuGet.Config
index f8dc68d26a..955cb08d39 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -10,5 +10,6 @@
         <add key="nuget" value="https://api.nuget.org/v3/index.json" />
         <add key="UmbracoCoreMyGet" value="https://www.myget.org/F/umbracocore/api/v3/index.json" />
         <add key="SmidgeAppVeyor" value="https://ci.appveyor.com/nuget/smidge" />
+        <add key="Umbraco Nightly" value="https://www.myget.org/F/umbraconightly/api/v3/index.json" />
     </packageSources>
 </configuration>
diff --git a/src/JsonSchema/AppSettings.cs b/src/JsonSchema/AppSettings.cs
index 729d0a3b03..0e2c6ce1b6 100644
--- a/src/JsonSchema/AppSettings.cs
+++ b/src/JsonSchema/AppSettings.cs
@@ -1,4 +1,6 @@
 using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Forms.Core.Configuration;
+using SecuritySettings = Umbraco.Cms.Core.Configuration.Models.SecuritySettings;
 
 namespace JsonSchema
 {
@@ -52,7 +54,17 @@ namespace JsonSchema
             /// </summary>
             public class FormsDefinition
             {
+                public FormDesignSettings FormDesign { get; set; }
+                public PackageOptionSettings Options { get; set; }
+                public SecuritySettings Security { get; set; }
+                public FieldTypesDefinition FieldTypes { get; set; }
 
+                public class FieldTypesDefinition
+                {
+                    public DatePickerSettings DatePicker { get; set; }
+                    public Recaptcha2Settings Recaptcha2 { get; set; }
+                    public Recaptcha3Settings Recaptcha3 { get; set; }
+                }
             }
 
             /// <summary>
diff --git a/src/JsonSchema/JsonSchema.csproj b/src/JsonSchema/JsonSchema.csproj
index c1c02ec32f..6236738b5d 100644
--- a/src/JsonSchema/JsonSchema.csproj
+++ b/src/JsonSchema/JsonSchema.csproj
@@ -10,6 +10,7 @@
       <PackageReference Include="CommandLineParser" Version="2.8.0" />
       <PackageReference Include="NJsonSchema" Version="10.4.4" />
       <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
+      <PackageReference Include="Umbraco.Forms" Version="9.0.0-preview20210614.65556" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/JsonSchema/Program.cs b/src/JsonSchema/Program.cs
index 3341858dfe..698ad379ac 100644
--- a/src/JsonSchema/Program.cs
+++ b/src/JsonSchema/Program.cs
@@ -9,7 +9,7 @@ namespace JsonSchema
     {
         private class Options
         {
-            [Option('o', "outputFile", Required = false, HelpText = "Set path of the output file.", Default = "../../../../Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json")]
+            [Option('o', "outputFile", Required = false, HelpText = "Set path of the output file.", Default = "../Umbraco.Web.UI.NetCore/umbraco/config/appsettings-schema.json")]
             public string OutputFile { get; set; }
 
             [Option('d', "definitionPrefix", Required = false, HelpText = "Set prefix used for all definisions.", Default = "umbraco")]