diff --git a/developer/src/kmconvert/Keyman.Developer.System.KeyboardProjectTemplate.pas b/developer/src/kmconvert/Keyman.Developer.System.KeyboardProjectTemplate.pas
index ce4add7717..1ba224d50b 100644
--- a/developer/src/kmconvert/Keyman.Developer.System.KeyboardProjectTemplate.pas
+++ b/developer/src/kmconvert/Keyman.Developer.System.KeyboardProjectTemplate.pas
@@ -258,6 +258,7 @@ begin
     f := TPackageContentFile.Create(kps);
     f.FileName := BasePath + ID + '\' + SFolder_Source + '\' + SFile_WelcomeHTM;
     kps.Files.Add(f);
+    kps.Options.WelcomeFile := f;
 
     // Add readme
     f := TPackageContentFile.Create(kps);
diff --git a/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas b/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas
index d8cfa9cd8f..77d93d8df9 100644
--- a/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas
+++ b/developer/src/kmconvert/Keyman.Developer.System.LdmlKeyboardProjectTemplate.pas
@@ -217,6 +217,7 @@ begin
     f := TPackageContentFile.Create(kps);
     f.FileName := BasePath + ID + '\' + SFolder_Source + '\' + SFile_WelcomeHTM;
     kps.Files.Add(f);
+    kps.Options.WelcomeFile := f;
 
     // Add readme
     f := TPackageContentFile.Create(kps);
diff --git a/developer/src/kmconvert/Keyman.Developer.System.ModelProjectTemplate.pas b/developer/src/kmconvert/Keyman.Developer.System.ModelProjectTemplate.pas
index b5b64f6b86..6edd42dfa2 100644
--- a/developer/src/kmconvert/Keyman.Developer.System.ModelProjectTemplate.pas
+++ b/developer/src/kmconvert/Keyman.Developer.System.ModelProjectTemplate.pas
@@ -19,13 +19,11 @@ type
     procedure WriteWordlist;
     procedure WriteKPS;
     procedure WriteKPJ;
-    procedure WriteModelInfo;
     function GetModelFilename: string;
     function GetWordlistFilename: string;
 
   protected
     const
-      SFileTemplate_ModelInfo = '%s.model_info'; // in root
       SFileTemplate_Package = '%s.model.kps';
       SFilename_Model = 'model.ts'; // Only for source
       SFilename_Wordlist = 'wordlist.tsv';
@@ -82,8 +80,6 @@ begin
   WriteKPJ;
 
   WriteRepositoryMetadata;
-
-  WriteModelInfo;
 end;
 
 function TModelProjectTemplate.GetModelFilename: string;
@@ -107,15 +103,6 @@ begin
     Format(SFolder_Source + '\' + SFileTemplate_Model, [ID]));
 end;
 
-procedure TModelProjectTemplate.WriteModelInfo;
-begin
-  // Write modelid.model_info
-  Transform(
-    Format(SFileTemplate_ModelInfo, ['model']),
-    Format(SFileTemplate_ModelInfo, [ID])
-  );
-end;
-
 procedure TModelProjectTemplate.WriteWordlist;
 begin
   Transform(SFolder_Source + '\' + SFilename_Wordlist);
@@ -127,10 +114,13 @@ var
 begin
   kpj := TProject.Create(ptLexicalModel, GetProjectFilename, False);
   try
+    kpj.Options.Version := pv20;
     kpj.Options.BuildPath := '$PROJECTPATH\' + SFolder_Build;
+    kpj.Options.SourcePath := '$PROJECTPATH\' + SFolder_Source;
     kpj.Options.WarnDeprecatedCode := True;
     kpj.Options.CompilerWarningsAsErrors := True;
     kpj.Options.CheckFilenameConventions := True;
+    kpj.Options.SkipMetadataFiles := False;
 
     // Add model and package to project
     kpj.Files.Add(TmodelTsProjectFile.Create(kpj, GetModelFilename, nil));
@@ -140,7 +130,6 @@ begin
     kpj.Files.Add(TOpenableProjectFile.Create(kpj, BasePath + ID + '\' + SFile_HistoryMD, nil));
     kpj.Files.Add(TOpenableProjectFile.Create(kpj, BasePath + ID + '\' + SFile_LicenseMD, nil));
     kpj.Files.Add(TOpenableProjectFile.Create(kpj, BasePath + ID + '\' + SFile_ReadmeMD, nil));
-    kpj.Files.Add(TOpenableProjectFile.Create(kpj, BasePath + ID + '\' + Format(SFileTemplate_ModelInfo, [ID]), nil));
 
     kpj.Save;
   finally
@@ -173,6 +162,7 @@ begin
     f := TPackageContentFile.Create(kps);
     f.FileName := BasePath + ID + '\' + SFolder_Source + '\' + SFile_WelcomeHTM;
     kps.Files.Add(f);
+    kps.Options.WelcomeFile := f;
 
     // Add readme
     f := TPackageContentFile.Create(kps);
diff --git a/developer/src/tike/project/Keyman.Developer.UI.Project.UfrmNewLDMLKeyboardProjectParameters.dfm b/developer/src/tike/project/Keyman.Developer.UI.Project.UfrmNewLDMLKeyboardProjectParameters.dfm
index 3942364fd8..6ef44a8f7a 100644
--- a/developer/src/tike/project/Keyman.Developer.UI.Project.UfrmNewLDMLKeyboardProjectParameters.dfm
+++ b/developer/src/tike/project/Keyman.Developer.UI.Project.UfrmNewLDMLKeyboardProjectParameters.dfm
@@ -94,7 +94,7 @@ inherited frmNewLDMLKeyboardProjectParameters: TfrmNewLDMLKeyboardProjectParamet
     Top = 260
     Width = 102
     Height = 13
-    Caption = 'Supported &languages'
+    Caption = '&Supported languages'
     FocusControl = memoLanguages
   end
   object Label4: TLabel