Clean up and improve project templates

templates/UmbracoProject/appsettings.Development.json

@@ -1,5 +1,5 @@
 {
-  "$schema" : "./umbraco/config/appsettings-schema.json",
+  "$schema": "./umbraco/config/appsettings-schema.json",
   "Serilog": {
     "MinimumLevel": {
       "Default": "Information"
@@ -19,22 +19,22 @@
   },
   //#if (HasConnectionString)
   "ConnectionStrings": {
-    "umbracoDbDSN": "CONNECTION_FROM_TEMPLATE"
+    "umbracoDbDSN": "CONNECTION_STRING_FROM_TEMPLATE"
   },
   //#endif
   "Umbraco": {
     "CMS": {
-      "Content": {
-        "MacroErrors": "Throw"
-      },
       //#if (UsingUnattenedInstall)
       "Unattended": {
         "InstallUnattended": true,
-        "UnattendedUserName": "FRIENDLY_NAME_FROM_TEMPLATE",
-        "UnattendedUserEmail": "EMAIL_FROM_TEMPLATE",
-        "UnattendedUserPassword": "PASSWORD_FROM_TEMPLATE"
+        "UnattendedUserName": "UNATTENDED_USER_NAME_FROM_TEMPLATE",
+        "UnattendedUserEmail": "UNATTENDED_USER_EMAIL_FROM_TEMPLATE",
+        "UnattendedUserPassword": "UNATTENDED_USER_PASSWORD_FROM_TEMPLATE"
       },
       //#endif
+      "Content": {
+        "MacroErrors": "Throw"
+      },
       "Global": {
         "Smtp": {
           "From": "your@email.here",
@@ -51,4 +51,4 @@
       }
     }
   }
-}
+}