diff --git a/applications/json_packager/deploywin/json_packager.iss b/applications/json_packager/deploywin/json_packager.iss
index 959e32d35..fd25bd1ea 100644
--- a/applications/json_packager/deploywin/json_packager.iss
+++ b/applications/json_packager/deploywin/json_packager.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=External OPM JSON package Editor
-AppVersion=0.1.16.0
+AppVersion=0.1.17.0
 DefaultDirName={pf}\OPMUtilities
 DefaultGroupName=OPM
 UninstallDisplayIcon={app}\jsoneditor.exe
@@ -35,14 +35,15 @@ InfoAfterFile="readme.txt"
 Source: "jsoneditor64.exe"; DestDir: "{app}"; DestName: "jsoneditor.exe"; Check: Is64BitInstallMode
 ; Place all x86 files here, first one should be marked 'solidbreak'
 Source: "jsoneditor.exe"; DestDir: "{app}"; Check: not Is64BitInstallMode; Flags: solidbreak
+; Enable line below if using Lazarus < V1.7
+;Source: "translate.lrs"; DestDir: "{app}";
+
 ; Place all common files here, first one should be marked 'solidbreak'
 ; Source: "readmepreinstall.txt"; DestDir: "{app}"; Flags: isreadme
 ; Source: "readme.txt"; DestDir: "{app}"; Flags: isreadme
-Source: ".\locale\jsoneditor.en.po"; DestDir: "{app}\locale";  Flags: solidbreak
-Source: ".\locale\jsoneditor.es.po"; DestDir: "{app}\locale";
-Source: ".\locale\jsoneditor.en.mo"; DestDir: "{app}\locale";
-Source: ".\locale\jsoneditor.es.mo"; DestDir: "{app}\locale";
-Source: ".\locale\jsoneditor.po"; DestDir: "{app}\locale";
+; Source: ".\locale\jsoneditor.en.po"; DestDir: "{app}\locale";  Flags: solidbreak
+; Source: ".\locale\jsoneditor.es.po"; DestDir: "{app}\locale";
+; Source: ".\locale\jsoneditor.po"; DestDir: "{app}\locale";
 
 [Icons]
 Name: "{group}\External OPM JSON package Editor"; Filename: "{app}\jsoneditor.exe"
diff --git a/applications/json_packager/jsonpackage.lps b/applications/json_packager/jsonpackage.lps
index 6b2257e1f..cdca22a12 100644
--- a/applications/json_packager/jsonpackage.lps
+++ b/applications/json_packager/jsonpackage.lps
@@ -3,7 +3,7 @@
   <ProjectSession>
     <PathDelim Value="\"/>
     <Version Value="10"/>
-    <BuildModes Active="Win64"/>
+    <BuildModes Active="DEBUG Win64"/>
     <Units Count="24">
       <Unit0>
         <Filename Value="jsonpackage.lpr"/>
@@ -20,12 +20,12 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="34"/>
-        <CursorPos X="56" Y="60"/>
+        <TopLine Value="13"/>
+        <CursorPos X="71" Y="6"/>
         <UsageCount Value="78"/>
         <Bookmarks Count="2">
-          <Item0 Y="507" ID="1"/>
-          <Item1 Y="791"/>
+          <Item0 Y="510" ID="1"/>
+          <Item1 Y="792"/>
         </Bookmarks>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -198,123 +198,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="umain.pas"/>
-        <Caret Line="897" TopLine="850"/>
+        <Caret Line="898" Column="3" TopLine="863"/>
       </Position1>
       <Position2>
         <Filename Value="umain.pas"/>
-        <Caret Line="904" Column="47" TopLine="862"/>
+        <Caret Line="902" Column="44" TopLine="863"/>
       </Position2>
       <Position3>
         <Filename Value="umain.pas"/>
-        <Caret Line="898" Column="3" TopLine="863"/>
+        <Caret Line="903" Column="42" TopLine="863"/>
       </Position3>
       <Position4>
         <Filename Value="umain.pas"/>
-        <Caret Line="902" Column="44" TopLine="863"/>
+        <Caret Line="899" Column="45" TopLine="863"/>
       </Position4>
       <Position5>
         <Filename Value="umain.pas"/>
-        <Caret Line="903" Column="42" TopLine="863"/>
+        <Caret Line="900" Column="44" TopLine="864"/>
       </Position5>
       <Position6>
         <Filename Value="umain.pas"/>
-        <Caret Line="899" Column="45" TopLine="863"/>
+        <Caret Line="188" Column="4" TopLine="175"/>
       </Position6>
       <Position7>
         <Filename Value="umain.pas"/>
-        <Caret Line="900" Column="44" TopLine="864"/>
+        <Caret Line="900" Column="50" TopLine="864"/>
       </Position7>
       <Position8>
         <Filename Value="umain.pas"/>
-        <Caret Line="188" Column="4" TopLine="175"/>
+        <Caret Line="188" Column="4" TopLine="159"/>
       </Position8>
       <Position9>
         <Filename Value="umain.pas"/>
-        <Caret Line="900" Column="50" TopLine="864"/>
+        <Caret Line="900" Column="45" TopLine="864"/>
       </Position9>
       <Position10>
         <Filename Value="umain.pas"/>
-        <Caret Line="188" Column="4" TopLine="159"/>
+        <Caret Line="188" TopLine="154"/>
       </Position10>
       <Position11>
         <Filename Value="umain.pas"/>
-        <Caret Line="900" Column="45" TopLine="864"/>
+        <Caret Line="903" Column="34" TopLine="863"/>
       </Position11>
       <Position12>
         <Filename Value="umain.pas"/>
-        <Caret Line="188" TopLine="154"/>
+        <Caret Line="54" Column="49" TopLine="20"/>
       </Position12>
       <Position13>
         <Filename Value="umain.pas"/>
-        <Caret Line="903" Column="34" TopLine="863"/>
+        <Caret Line="3"/>
       </Position13>
       <Position14>
         <Filename Value="umain.pas"/>
-        <Caret Line="54" Column="49" TopLine="20"/>
+        <Caret Line="184" Column="23" TopLine="162"/>
       </Position14>
       <Position15>
         <Filename Value="umain.pas"/>
-        <Caret Line="3"/>
+        <Caret Line="55" Column="78" TopLine="37"/>
       </Position15>
       <Position16>
         <Filename Value="umain.pas"/>
-        <Caret Line="184" Column="23" TopLine="162"/>
+        <Caret Line="905" Column="26" TopLine="864"/>
       </Position16>
       <Position17>
         <Filename Value="umain.pas"/>
-        <Caret Line="55" Column="78" TopLine="37"/>
+        <Caret Line="922" Column="5" TopLine="878"/>
       </Position17>
       <Position18>
         <Filename Value="umain.pas"/>
-        <Caret Line="905" Column="26" TopLine="864"/>
+        <Caret Line="193" TopLine="183"/>
       </Position18>
       <Position19>
         <Filename Value="umain.pas"/>
-        <Caret Line="922" Column="5" TopLine="878"/>
+        <Caret Line="63" Column="99" TopLine="31"/>
       </Position19>
       <Position20>
         <Filename Value="umain.pas"/>
-        <Caret Line="193" TopLine="183"/>
+        <Caret Line="947" Column="66" TopLine="917"/>
       </Position20>
       <Position21>
         <Filename Value="umain.pas"/>
-        <Caret Line="63" Column="99" TopLine="31"/>
+        <Caret Line="961" Column="56" TopLine="929"/>
       </Position21>
       <Position22>
         <Filename Value="umain.pas"/>
-        <Caret Line="947" Column="66" TopLine="917"/>
+        <Caret Line="947" Column="65" TopLine="930"/>
       </Position22>
       <Position23>
         <Filename Value="umain.pas"/>
-        <Caret Line="961" Column="56" TopLine="929"/>
+        <Caret Line="59" Column="78" TopLine="35"/>
       </Position23>
       <Position24>
         <Filename Value="umain.pas"/>
-        <Caret Line="947" Column="65" TopLine="930"/>
+        <Caret Line="947" Column="75" TopLine="923"/>
       </Position24>
       <Position25>
         <Filename Value="umain.pas"/>
-        <Caret Line="59" Column="78" TopLine="35"/>
+        <Caret Column="2"/>
       </Position25>
       <Position26>
         <Filename Value="umain.pas"/>
-        <Caret Line="947" Column="75" TopLine="923"/>
+        <Caret Line="909" Column="20" TopLine="893"/>
       </Position26>
       <Position27>
         <Filename Value="umain.pas"/>
-        <Caret Column="2"/>
+        <Caret Line="935" Column="35" TopLine="923"/>
       </Position27>
       <Position28>
         <Filename Value="umain.pas"/>
-        <Caret Line="909" Column="20" TopLine="893"/>
+        <Caret Line="47" Column="57" TopLine="7"/>
       </Position28>
       <Position29>
         <Filename Value="umain.pas"/>
-        <Caret Line="935" Column="35" TopLine="923"/>
+        <Caret Line="60" Column="56" TopLine="34"/>
       </Position29>
       <Position30>
         <Filename Value="umain.pas"/>
-        <Caret Line="47" Column="57" TopLine="7"/>
+        <Caret Line="433" Column="3" TopLine="428"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/applications/json_packager/umain.lfm b/applications/json_packager/umain.lfm
index bfe93271f..2fe6caca5 100644
--- a/applications/json_packager/umain.lfm
+++ b/applications/json_packager/umain.lfm
@@ -19,6 +19,7 @@ object frmMain: TfrmMain
   OnShow = FormShow
   Position = poScreenCenter
   LCLVersion = '1.7'
+  Scaled = True
   object lblName: TLabel
     Left = 8
     Height = 15
diff --git a/applications/json_packager/umain.pas b/applications/json_packager/umain.pas
index 17d5720c5..2fae9310d 100644
--- a/applications/json_packager/umain.pas
+++ b/applications/json_packager/umain.pas
@@ -1,6 +1,9 @@
 unit umain;
 
 {$DEFINE PO_BUILTINRES}// Use built-in resources for .po files
+// If compiling with Laz Version < 1.7 then use lazres to make a translate.lrs from the .po files
+// If compiling Laz V >=1.7 then add the .po files in Project/Options/resources
+// Without this DEFINE, include the /locale folder in the distribution
 
 { OnlinePackageManager Update JSON Editor
 
@@ -585,10 +588,8 @@ begin
         s += RightStr(VInfo.VersionStrings[1], Length(VInfo.VersionStrings[1]) -
           EqualsPos) + LineEnding;
     end;
-    {
     s+=Format(rsCompiledWith2,
     [{$I %FPCVERSION%},lcl_major,lcl_minor,LineEnding,{$I %FPCTARGETCPU%},{$I %FPCTARGETOS%},LineEnding,LineEnding]);
-    }
     if VInfo.VersionStrings.Count > 1 then
     begin
       EqualsPos := Pos('=', VInfo.VersionStrings[0]); // File Deswcription