diff --git a/components/anchordocking/languages/anchordockstr.cs.po b/components/anchordocking/languages/anchordockstr.cs.po
index 5a0bd48de0..8408ad36ce 100644
--- a/components/anchordocking/languages/anchordockstr.cs.po
+++ b/components/anchordocking/languages/anchordockstr.cs.po
@@ -242,10 +242,6 @@ msgstr "Obnovit výchozí rozložení"
 msgid "right"
 msgstr "vpravo"
 
-#: anchordockstr.adrssavelayoutonclose
-msgid "Save layout on close"
-msgstr ""
-
 #: anchordockstr.adrssavewindowlayoutasdefault
 msgid "Save window layout as default"
 msgstr "Uložit rozvržení oken jako výchozí"
diff --git a/components/anchordocking/languages/anchordockstr.de.po b/components/anchordocking/languages/anchordockstr.de.po
index 891701e3fc..5251ae1048 100644
--- a/components/anchordocking/languages/anchordockstr.de.po
+++ b/components/anchordocking/languages/anchordockstr.de.po
@@ -229,10 +229,6 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: anchordockstr.adrssavelayoutonclose
-msgid "Save layout on close"
-msgstr ""
-
 #: anchordockstr.adrssavewindowlayoutasdefault
 msgid "Save window layout as default"
 msgstr "Speichere Fensterlayout als Vorgabe"
diff --git a/components/anchordocking/languages/anchordockstr.es.po b/components/anchordocking/languages/anchordockstr.es.po
index 585e3bd36d..5b1b93fb19 100644
--- a/components/anchordocking/languages/anchordockstr.es.po
+++ b/components/anchordocking/languages/anchordockstr.es.po
@@ -207,7 +207,7 @@ msgstr "No titulos para sitios flotantes"
 
 #: anchordockstr.adrsnochildrenallowedfornodetype
 msgid "No children allowed for Node=\"%s\" Type=%s"
-msgstr "Hijos no permitidos para Nodo=\"%s\ Tipo=%s"
+msgstr "Hijos no permitidos para Nodo=\"%s Tipo=%s"
 
 #: anchordockstr.adrsnotsupportedhasparent
 msgid "Not supported: %s has parent %s"
@@ -229,10 +229,6 @@ msgstr "Restaurar el diseño predeterminado"
 msgid "right"
 msgstr "derecha"
 
-#: anchordockstr.adrssavelayoutonclose
-msgid "Save layout on close"
-msgstr "Guardar diseño al cerrar"
-
 #: anchordockstr.adrssavewindowlayoutasdefault
 msgid "Save window layout as default"
 msgstr "Guardar diseño de ventana como predeterminado"
diff --git a/components/anchordocking/languages/anchordockstr.fr.po b/components/anchordocking/languages/anchordockstr.fr.po
index f0ce5894dc..4afbc7a6c9 100644
--- a/components/anchordocking/languages/anchordockstr.fr.po
+++ b/components/anchordocking/languages/anchordockstr.fr.po
@@ -231,10 +231,6 @@ msgstr "Revenir à la disposition par défaut"
 msgid "right"
 msgstr "droite"
 
-#: anchordockstr.adrssavelayoutonclose
-msgid "Save layout on close"
-msgstr "Enregistrer la disposition à la fermeture"
-
 #: anchordockstr.adrssavewindowlayoutasdefault
 msgid "Save window layout as default"
 msgstr "Enregistrer la disposition comme celle par défaut"
@@ -294,3 +290,4 @@ msgstr "Pour utiliser l'amarrage par ancres vous devez tout d'abord désinstalle
 #: anchordockstr.adrsundock
 msgid "Undock"
 msgstr "Désamarrer"
+
diff --git a/components/anchordocking/languages/anchordockstr.hu.po b/components/anchordocking/languages/anchordockstr.hu.po
index 8a8a5f4b55..2389b397b3 100644
--- a/components/anchordocking/languages/anchordockstr.hu.po
+++ b/components/anchordocking/languages/anchordockstr.hu.po
@@ -231,10 +231,6 @@ msgstr "Alapértelmezett elrendezés visszaállítása"
 msgid "right"
 msgstr "jobbra"
 
-#: anchordockstr.adrssavelayoutonclose
-msgid "Save layout on close"
-msgstr "Elrendezés mentése kilépéskor"
-
 #: anchordockstr.adrssavewindowlayoutasdefault
 msgid "Save window layout as default"
 msgstr "Ablakelrendezés mentése alapértelmezettnek"
@@ -294,3 +290,4 @@ msgstr "Az ablakok rögzítésének használatához először el kell távolíta
 #: anchordockstr.adrsundock
 msgid "Undock"
 msgstr "Rögzítés feloldása"
+
diff --git a/components/anchordocking/languages/anchordockstr.it.po b/components/anchordocking/languages/anchordockstr.it.po
index c2af68171d..17356688d3 100644
--- a/components/anchordocking/languages/anchordockstr.it.po
+++ b/components/anchordocking/languages/anchordockstr.it.po
@@ -233,10 +233,6 @@ msgstr "Ripristina la disposizione predefinita"
 msgid "right"
 msgstr "destra"
 
-#: anchordockstr.adrssavelayoutonclose
-msgid "Save layout on close"
-msgstr "Salva la disposizione della finestra alla chiusura"
-
 #: anchordockstr.adrssavewindowlayoutasdefault
 msgid "Save window layout as default"
 msgstr "Salva la disposizione della finestra come default"
diff --git a/components/anchordocking/languages/anchordockstr.lt.po b/components/anchordocking/languages/anchordockstr.lt.po
index b10151637f..b375a88c58 100644
--- a/components/anchordocking/languages/anchordockstr.lt.po
+++ b/components/anchordocking/languages/anchordockstr.lt.po
@@ -247,10 +247,6 @@ msgstr "Atstatyti numatytąjį maketą"
 msgid "right"
 msgstr "dešinysis"
 
-#: anchordockstr.adrssavelayoutonclose
-msgid "Save layout on close"
-msgstr ""
-
 #: anchordockstr.adrssavewindowlayoutasdefault
 msgid "Save window layout as default"
 msgstr "Lango maketą įrašyti kaip numatytąjį"
diff --git a/components/anchordocking/languages/anchordockstr.po b/components/anchordocking/languages/anchordockstr.po
index ca5356a002..58ef4d465e 100644
--- a/components/anchordocking/languages/anchordockstr.po
+++ b/components/anchordocking/languages/anchordockstr.po
@@ -221,10 +221,6 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: anchordockstr.adrssavelayoutonclose
-msgid "Save layout on close"
-msgstr ""
-
 #: anchordockstr.adrssavewindowlayoutasdefault
 msgid "Save window layout as default"
 msgstr ""
diff --git a/components/anchordocking/languages/anchordockstr.pt_BR.po b/components/anchordocking/languages/anchordockstr.pt_BR.po
index 19166caad4..86cbbcea44 100644
--- a/components/anchordocking/languages/anchordockstr.pt_BR.po
+++ b/components/anchordocking/languages/anchordockstr.pt_BR.po
@@ -245,10 +245,6 @@ msgstr "Restaurar layout padrão"
 msgid "right"
 msgstr "direita"
 
-#: anchordockstr.adrssavelayoutonclose
-msgid "Save layout on close"
-msgstr ""
-
 #: anchordockstr.adrssavewindowlayoutasdefault
 msgid "Save window layout as default"
 msgstr "Salvar \"layout\" da janela como padrão"
diff --git a/components/anchordocking/languages/anchordockstr.ru.po b/components/anchordocking/languages/anchordockstr.ru.po
index 5cd61d8cbb..476737789f 100644
--- a/components/anchordocking/languages/anchordockstr.ru.po
+++ b/components/anchordocking/languages/anchordockstr.ru.po
@@ -239,10 +239,6 @@ msgstr "Восстановить разбивку окна по умолчани
 msgid "right"
 msgstr "справа"
 
-#: anchordockstr.adrssavelayoutonclose
-msgid "Save layout on close"
-msgstr "Сохранять разбивку окна при выходе"
-
 #: anchordockstr.adrssavewindowlayoutasdefault
 msgid "Save window layout as default"
 msgstr "Сохранить разбивку окна как разбивку по умолчанию"
diff --git a/components/anchordocking/languages/anchordockstr.uk.po b/components/anchordocking/languages/anchordockstr.uk.po
index fb9f7c1d4c..fb3d737f38 100644
--- a/components/anchordocking/languages/anchordockstr.uk.po
+++ b/components/anchordocking/languages/anchordockstr.uk.po
@@ -247,10 +247,6 @@ msgstr "Відновити стандартну схему"
 msgid "right"
 msgstr "правий"
 
-#: anchordockstr.adrssavelayoutonclose
-msgid "Save layout on close"
-msgstr ""
-
 #: anchordockstr.adrssavewindowlayoutasdefault
 msgid "Save window layout as default"
 msgstr "Зберегти схему вікон як типову"
diff --git a/ide/codetoolsdefpreview.lfm b/ide/codetoolsdefpreview.lfm
index 26be13b80d..18a34d3108 100644
--- a/ide/codetoolsdefpreview.lfm
+++ b/ide/codetoolsdefpreview.lfm
@@ -3,6 +3,7 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
   Height = 581
   Top = 175
   Width = 592
+  BorderIcons = [biSystemMenu, biMaximize]
   Caption = 'CodeToolsDefinesDialog'
   ClientHeight = 581
   ClientWidth = 592
@@ -10,13 +11,13 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
   OnCreate = CodeToolsDefinesDialogCREATE
   OnDestroy = FormDestroy
   Position = poScreenCenter
-  LCLVersion = '1.1'
+  LCLVersion = '1.5'
   object DirectoryGroupbox: TGroupBox
     AnchorSideLeft.Control = ValuesTabSheet
     AnchorSideTop.Control = ValuesTabSheet
     AnchorSideRight.Control = ValuesTabSheet
     Left = 6
-    Height = 62
+    Height = 60
     Top = 6
     Width = 580
     Align = alTop
@@ -24,13 +25,14 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
     BorderSpacing.Around = 6
     Caption = 'DirectoryGroupbox'
     ClientHeight = 41
-    ClientWidth = 572
-    TabOrder = 2
+    ClientWidth = 576
+    TabOrder = 0
     object DirectoryCombobox: TComboBox
+      AnchorSideRight.Control = DirectoryBrowseButton
       Left = 6
       Height = 29
       Top = 6
-      Width = 470
+      Width = 508
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Around = 6
       ItemHeight = 0
@@ -44,12 +46,11 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = DirectoryCombobox
       AnchorSideBottom.Side = asrBottom
-      Left = 541
+      Left = 520
       Height = 29
       Top = 6
-      Width = 26
+      Width = 51
       Anchors = [akTop, akRight, akBottom]
-      AutoSize = True
       BorderSpacing.Right = 5
       Caption = '...'
       OnClick = DirectoryBrowseButtonCLICK
@@ -57,21 +58,22 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
     end
   end
   object PageControl1: TPageControl
-    Left = 0
-    Height = 462
-    Top = 74
-    Width = 592
+    Left = 6
+    Height = 468
+    Top = 72
+    Width = 580
     ActivePage = ValuesTabSheet
     Align = alClient
+    BorderSpacing.Around = 6
     TabIndex = 0
-    TabOrder = 0
+    TabOrder = 1
     object ValuesTabSheet: TTabSheet
       Caption = 'ValuesTabSheet'
-      ClientHeight = 429
-      ClientWidth = 588
+      ClientHeight = 437
+      ClientWidth = 576
       object ValuesListview: TListView
         Left = 6
-        Height = 277
+        Height = 285
         Top = 6
         Width = 296
         Align = alLeft
@@ -85,21 +87,21 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
       object ValueGroupbox: TGroupBox
         Left = 6
         Height = 123
-        Top = 300
-        Width = 576
+        Top = 308
+        Width = 564
         Align = alBottom
         Anchors = [akLeft, akBottom]
         BorderSpacing.Around = 6
         Caption = 'Value'
-        ClientHeight = 102
-        ClientWidth = 568
-        TabOrder = 2
+        ClientHeight = 104
+        ClientWidth = 560
+        TabOrder = 4
         inline ValueSynedit: TSynEdit
           Cursor = crDefault
           Left = 6
-          Height = 90
+          Height = 92
           Top = 6
-          Width = 556
+          Width = 548
           Align = alClient
           BorderSpacing.Around = 6
           Font.Height = -15
@@ -542,6 +544,7 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
               ShiftMask = [ssShift, ssAlt, ssCtrl]
               Command = emcMouseLink
             end>
+          MouseTextActions = <>
           MouseSelActions = <          
             item
               ClickDir = cdDown
@@ -567,13 +570,17 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
               ClickDir = cdDown
               Command = emcStartDragMove
             end>
-          Lines.Strings = (
-            'ValueSynedit'
-          )
           Options = [eoAutoIndent, eoBracketHighlight, eoScrollPastEol, eoShowScrollHint, eoSmartTabs, eoTabsToSpaces, eoTrimTrailingSpaces, eoDragDropEditing, eoShowCtrlMouseLinks]
           MouseOptions = [emDragDropEditing, emShowCtrlMouseLinks]
           VisibleSpecialChars = [vscSpace, vscTabAtLast]
           ReadOnly = True
+          SelectedColor.BackPriority = 50
+          SelectedColor.ForePriority = 50
+          SelectedColor.FramePriority = 50
+          SelectedColor.BoldPriority = 50
+          SelectedColor.ItalicPriority = 50
+          SelectedColor.UnderlinePriority = 50
+          SelectedColor.StrikeOutPriority = 50
           BracketHighlightStyle = sbhsBoth
           BracketMatchColor.Background = clNone
           BracketMatchColor.Foreground = clNone
@@ -585,6 +592,7 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
           MouseLinkColor.Foreground = clBlue
           LineHighlightColor.Background = clNone
           LineHighlightColor.Foreground = clNone
+          WantTabs = False
           inline TSynGutterPartList
             object TSynGutterMarks
               Width = 24
@@ -609,6 +617,8 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
             object TSynGutterSeparator
               Width = 2
               MouseActions = <>
+              MarkupInfo.Background = clWhite
+              MarkupInfo.Foreground = clGray
             end
             object TSynGutterCodeFolding
               MouseActions = <              
@@ -666,26 +676,26 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
       end
       object MainSplitter: TSplitter
         Left = 308
-        Height = 289
+        Height = 297
         Top = 0
         Width = 5
       end
       object TemplatesGroupBox: TGroupBox
         Left = 319
-        Height = 277
+        Height = 285
         Top = 6
-        Width = 263
+        Width = 251
         Align = alClient
         BorderSpacing.Around = 6
         Caption = 'TemplatesGroupBox'
-        ClientHeight = 256
-        ClientWidth = 255
-        TabOrder = 3
+        ClientHeight = 266
+        ClientWidth = 247
+        TabOrder = 1
         object ParsedTemplatesTreeView: TTreeView
           Left = 6
           Height = 122
           Top = 6
-          Width = 243
+          Width = 235
           Align = alTop
           BorderSpacing.Around = 6
           ReadOnly = True
@@ -698,54 +708,44 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
           Left = 0
           Height = 5
           Top = 134
-          Width = 255
+          Width = 247
           Align = alTop
           ResizeAnchor = akTop
         end
         object TemplatesMemo: TMemo
           Left = 6
-          Height = 105
+          Height = 115
           Top = 145
-          Width = 243
+          Width = 235
           Align = alClient
           BorderSpacing.Around = 6
-          Lines.Strings = (
-            'Memo1'
-            ''
-            ''
-            ''
-            ''
-            ''
-          )
           ReadOnly = True
-          TabOrder = 1
+          ScrollBars = ssBoth
+          TabOrder = 2
+          WordWrap = False
         end
       end
       object Splitter1: TSplitter
         Cursor = crVSplit
         Left = 0
         Height = 5
-        Top = 289
-        Width = 588
+        Top = 297
+        Width = 576
         Align = alBottom
         ResizeAnchor = akBottom
       end
     end
     object ReportTabSheet: TTabSheet
       Caption = 'ReportTabSheet'
-      ClientHeight = 429
-      ClientWidth = 588
+      ClientHeight = 437
+      ClientWidth = 576
       object ReportMemo: TMemo
-        Left = 0
-        Height = 429
-        Top = 0
-        Width = 588
+        Left = 6
+        Height = 425
+        Top = 6
+        Width = 564
         Align = alClient
-        Lines.Strings = (
-          'ReportMemo'
-          ''
-          ''
-        )
+        BorderSpacing.Around = 6
         ReadOnly = True
         ScrollBars = ssBoth
         TabOrder = 0
@@ -754,8 +754,8 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
   end
   object ButtonPanel: TButtonPanel
     Left = 6
-    Height = 33
-    Top = 542
+    Height = 29
+    Top = 546
     Width = 580
     OKButton.Name = 'OKButton'
     OKButton.DefaultCaption = True
@@ -767,7 +767,7 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
     CancelButton.Name = 'CancelButton'
     CancelButton.DefaultCaption = True
     CancelButton.Enabled = False
-    TabOrder = 1
+    TabOrder = 2
     ShowButtons = [pbOK, pbHelp]
     ShowBevel = False
   end
diff --git a/ide/lazbuild.lpr b/ide/lazbuild.lpr
index 6a64d7cf5a..390a6b7529 100644
--- a/ide/lazbuild.lpr
+++ b/ide/lazbuild.lpr
@@ -265,6 +265,9 @@ begin
     DebugLn(['TLazBuildApplication.OnCodeBufferEncodeSaving Filename=',Code.Filename,' Mem=',Code.MemEncoding,' to Disk=',Code.DiskEncoding]);
     {$ENDIF}
     Source:=ConvertEncoding(Source,Code.MemEncoding,Code.DiskEncoding);
+    {$IF FPC_FULLVERSION >= 20701}
+    SetCodePage(Source,CP_ACP);
+    {$ENDIF}
   end;
 end;
 
diff --git a/ide/main.pp b/ide/main.pp
index 000a5bb6c9..03f38e433c 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -8767,6 +8767,8 @@ end;
 
 procedure TMainIDE.OnCodeBufferEncodeSaving(Code: TCodeBuffer;
   const Filename: string; var Source: string);
+//var
+//  r: RawByteString;
 begin
   if (Code.DiskEncoding<>'') and (Code.MemEncoding<>'')
   and (Code.DiskEncoding<>Code.MemEncoding) then begin
@@ -8774,6 +8776,10 @@ begin
     DebugLn(['TMainIDE.OnCodeBufferEncodeSaving Filename=',Code.Filename,' Mem=',Code.MemEncoding,' to Disk=',Code.DiskEncoding]);
     {$ENDIF}
     Source:=ConvertEncoding(Source,Code.MemEncoding,Code.DiskEncoding);
+    {$IF FPC_FULLVERSION >= 20701}
+    //r:=Source;
+    //SetCodePage(Source,CP_ACP);
+    {$ENDIF}
   end;
 end;