diff --git a/windows/src/desktop/kmshell/kmshell.dproj b/windows/src/desktop/kmshell/kmshell.dproj
index 2bb3c24512..fd30bf1dcf 100644
--- a/windows/src/desktop/kmshell/kmshell.dproj
+++ b/windows/src/desktop/kmshell/kmshell.dproj
@@ -356,11 +356,9 @@
         <DCCReference Include="..\..\..\..\common\windows\delphi\general\Keyman.System.ExecutionHistory.pas"/>
         <DCCReference Include="main\Keyman.Configuration.UI.UfrmStartInstallNow.pas">
             <Form>frmInstallNow</Form>
-            <FormType>dfm</FormType>
         </DCCReference>
         <DCCReference Include="main\Keyman.Configuration.UI.UfrmStartInstall.pas">
             <Form>frmStartInstall</Form>
-            <FormType>dfm</FormType>
         </DCCReference>
         <None Include="Profiling\AQtimeModule1.aqt"/>
         <BuildConfiguration Include="Debug">
@@ -429,24 +427,30 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="bin\Win32\Debug\kmshell.exe" Configuration="Debug" Class="ProjectOutput">
-                    <Platform Name="Win32">
-                        <RemoteName>kmshell.exe</RemoteName>
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
-                <DeployFile LocalName="bin\Win32\Debug\kmshell.exe" Configuration="Debug" Class="ProjectOutput">
-                    <Platform Name="Win32">
-                        <RemoteName>kmshell.exe</RemoteName>
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
                 <DeployFile LocalName="Profiling\AQtimeModule1.aqt" Configuration="Debug" Class="ProjectFile">
                     <Platform Name="Win32">
                         <RemoteDir>.\</RemoteDir>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName="bin\Win32\Debug\kmshell.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>kmshell.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="kmshell.rsm" Configuration="Debug" Class="DebugSymbols">
+                    <Platform Name="Win32">
+                        <RemoteName>kmshell.rsm</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployFile LocalName="kmshell.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>kmshell.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployClass Name="AdditionalDebugSymbols">
                     <Platform Name="OSX32">
                         <Operation>1</Operation>
diff --git a/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstall.dfm b/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstall.dfm
index b7766d09bc..0ca96f7123 100644
--- a/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstall.dfm
+++ b/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstall.dfm
@@ -34,7 +34,7 @@ object frmStartInstall: TfrmStartInstall
     Top = 104
     Width = 75
     Height = 25
-    Caption = 'Install'
+    Caption = 'Update'
     ModalResult = 1
     TabOrder = 0
   end
diff --git a/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstall.pas b/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstall.pas
index 5d3b11767a..1abfcbbcee 100644
--- a/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstall.pas
+++ b/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstall.pas
@@ -28,12 +28,23 @@ type
     lblInstallUpdate: TLabel;
   private
   public
+    constructor Create(AOwner: TComponent); override;
   end;
 
 
 implementation
+uses
+  MessageIdentifiers,
+  MessageIdentifierConsts;
 
 {$R *.dfm}
 
+constructor TfrmStartInstall.Create(AOwner: TComponent);
+begin
+  inherited Create(AOwner);
+  cmdInstall.Caption := MsgFromId(S_Update);
+  cmdLater.Caption := MsgFromId(S_Button_Close);
+  lblInstallUpdate.Caption := 'Keyman Update ready to install.';
+end;
 
 end.
diff --git a/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstallNow.dfm b/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstallNow.dfm
index 8c0e467033..4bb30bbf56 100644
--- a/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstallNow.dfm
+++ b/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstallNow.dfm
@@ -14,14 +14,15 @@ object frmStartInstallNow: TfrmStartInstallNow
   Font.Style = []
   OldCreateOrder = False
   Position = poScreenCenter
+  OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 13
   object lblUpdateMessage: TLabel
-    Left = 32
-    Top = 48
-    Width = 290
-    Height = 41
-    Caption = 'Your computer will be restarted if you update now.'
+    Left = 16
+    Top = 32
+    Width = 323
+    Height = 19
+    Caption = 'Updating now will require a computer restart.'
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
     Font.Height = -16
@@ -35,7 +36,7 @@ object frmStartInstallNow: TfrmStartInstallNow
     Top = 120
     Width = 75
     Height = 25
-    Caption = 'Update now'
+    Caption = 'Update'
     ModalResult = 1
     TabOrder = 0
   end
diff --git a/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstallNow.pas b/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstallNow.pas
index ce3fd29da0..b613a7c856 100644
--- a/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstallNow.pas
+++ b/windows/src/desktop/kmshell/main/Keyman.Configuration.UI.UfrmStartInstallNow.pas
@@ -26,14 +26,25 @@ type
     cmdInstall: TButton;
     cmdLater: TButton;
     lblUpdateMessage: TLabel;
+    procedure FormCreate(Sender: TObject);
   private
   public
   end;
 
 implementation
+uses
+  MessageIdentifiers,
+  MessageIdentifierConsts;
 
 {$R *.dfm}
 
 
+procedure TfrmStartInstallNow.FormCreate(Sender: TObject);
+begin
+  inherited;
+  cmdInstall.Caption := MsgFromId(S_Update);
+  cmdLater.Caption := MsgFromId(S_Button_Close);
+  lblUpdateMessage.Caption := 'Updating now will require a computer restart.';
+end;
 
 end.