diff --git a/ide/codetoolsdefpreview.lfm b/ide/codetoolsdefpreview.lfm
index 2ad9b0d59a..5d9cdf54fc 100644
--- a/ide/codetoolsdefpreview.lfm
+++ b/ide/codetoolsdefpreview.lfm
@@ -12,22 +12,24 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
   OnClose = CodeToolsDefinesDialogCLOSE
   OnCreate = CodeToolsDefinesDialogCREATE
   OnDestroy = FormDestroy
+  LCLVersion = '0.9.25'
   object DirectoryGroupbox: TGroupBox
     Height = 48
     Width = 502
     Align = alTop
     Caption = 'DirectoryGroupbox'
-    ClientHeight = 29
+    ClientHeight = 30
     ClientWidth = 498
     ParentCtl3D = False
     TabOrder = 0
     OnResize = DirectoryGroupboxRESIZE
     object DirectoryCombobox: TComboBox
       Left = 6
-      Height = 25
+      Height = 21
       Top = 1
       Width = 360
       AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+      ItemHeight = 13
       MaxLength = 0
       OnChange = DirectoryComboboxCHANGE
       ParentCtl3D = False
@@ -45,7 +47,7 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
     end
   end
   object ValuesListview: TListView
-    Height = 271
+    Height = 255
     Top = 48
     Width = 296
     Align = alLeft
@@ -56,17 +58,17 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
   end
   object ValueGroupbox: TGroupBox
     Height = 102
-    Top = 319
+    Top = 303
     Width = 502
     Align = alBottom
     Anchors = [akLeft, akBottom]
     Caption = 'Value'
-    ClientHeight = 83
+    ClientHeight = 84
     ClientWidth = 498
     ParentCtl3D = False
     TabOrder = 2
     object ValueSynedit: TSynEdit
-      Height = 83
+      Height = 84
       Width = 498
       Align = alClient
       Font.Height = -15
@@ -408,37 +410,27 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
       SelectedColor.OnChange = nil
     end
   end
-  object CloseButton: TButton
-    Height = 29
-    Top = 421
-    Width = 502
-    Align = alBottom
-    Anchors = [akLeft, akBottom]
-    Caption = 'CloseButton'
-    ModalResult = 2
-    TabOrder = 3
-  end
   object MainSplitter: TSplitter
     Left = 296
-    Height = 271
+    Height = 255
     Top = 48
     Width = 4
   end
   object TemplatesGroupBox: TGroupBox
     Left = 300
-    Height = 271
+    Height = 255
     Top = 48
     Width = 202
     Align = alClient
     Caption = 'TemplatesGroupBox'
-    ClientHeight = 252
+    ClientHeight = 237
     ClientWidth = 198
-    TabOrder = 4
+    TabOrder = 3
     object ParsedTemplatesTreeView: TTreeView
       Height = 122
       Width = 198
       Align = alTop
-      DefaultItemHeight = 19
+      DefaultItemHeight = 15
       TabOrder = 0
       OnSelectionChanged = ParsedTemplatesTreeViewSelectionChanged
     end
@@ -451,7 +443,7 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
       ResizeAnchor = akTop
     end
     object TemplatesMemo: TMemo
-      Height = 125
+      Height = 110
       Top = 127
       Width = 198
       Align = alClient
@@ -461,4 +453,29 @@ object CodeToolsDefinesDialog: TCodeToolsDefinesDialog
       TabOrder = 1
     end
   end
+  object CloseButtonPanel: TPanel
+    Height = 45
+    Top = 405
+    Width = 502
+    Align = alBottom
+    BevelOuter = bvSpace
+    ClientHeight = 45
+    ClientWidth = 502
+    TabOrder = 5
+    object CloseButton: TButton
+      AnchorSideRight.Control = CloseButtonPanel
+      AnchorSideRight.Side = asrBottom
+      Left = 413
+      Height = 23
+      Top = 15
+      Width = 83
+      Anchors = [akRight, akBottom]
+      AutoSize = True
+      BorderSpacing.Right = 6
+      BorderSpacing.Bottom = 4
+      Caption = 'CloseButton'
+      ModalResult = 2
+      TabOrder = 0
+    end
+  end
 end
diff --git a/ide/codetoolsdefpreview.lrs b/ide/codetoolsdefpreview.lrs
index 41403fd6e1..1878645bde 100644
--- a/ide/codetoolsdefpreview.lrs
+++ b/ide/codetoolsdefpreview.lrs
@@ -6,85 +6,181 @@ LazarusResources.Add('TCodeToolsDefinesDialog','FORMDATA',[
   +#1#18'VertScrollBar.Page'#3#193#1#13'ActiveControl'#7#17'DirectoryCombobox'#7
   +'Caption'#6#22'CodeToolsDefinesDialog'#12'ClientHeight'#3#194#1#11'ClientWid'
   +'th'#3#246#1#7'OnClose'#7#27'CodeToolsDefinesDialogCLOSE'#8'OnCreate'#7#28'C'
-  +'odeToolsDefinesDialogCREATE'#9'OnDestroy'#7#11'FormDestroy'#0#9'TGroupBox'
-  +#17'DirectoryGroupbox'#6'Height'#2'0'#5'Width'#3#246#1#5'Align'#7#5'alTop'#7
-  +'Caption'#6#17'DirectoryGroupbox'#12'ClientHeight'#2#29#11'ClientWidth'#3#242
-  +#1#11'ParentCtl3D'#8#8'TabOrder'#2#0#8'OnResize'#7#23'DirectoryGroupboxRESIZ'
-  +'E'#0#9'TComboBox'#17'DirectoryCombobox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2
-  +#1#5'Width'#3'h'#1#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cba'
-  +'ctSearchAscending'#0#9'MaxLength'#2#0#8'OnChange'#7#23'DirectoryComboboxCHA'
-  +'NGE'#11'ParentCtl3D'#8#8'TabOrder'#2#0#4'Text'#6#17'DirectoryCombobox'#0#0#7
-  +'TButton'#21'DirectoryBrowseButton'#4'Left'#3'w'#1#6'Height'#2#26#3'Top'#2#1
-  +#5'Width'#2#31#7'Caption'#6#3'...'#7'OnClick'#7#26'DirectoryBrowseButtonCLIC'
-  +'K'#8'TabOrder'#2#1#0#0#0#9'TListView'#14'ValuesListview'#6'Height'#3#15#1#3
-  +'Top'#2'0'#5'Width'#3'('#1#5'Align'#7#6'alLeft'#7'Columns'#14#0#8'TabOrder'#2
-  +#1#9'ViewStyle'#7#8'vsReport'#12'OnSelectItem'#7#24'ValuesListviewSELECTITEM'
-  +#0#0#9'TGroupBox'#13'ValueGroupbox'#6'Height'#2'f'#3'Top'#3'?'#1#5'Width'#3
-  +#246#1#5'Align'#7#8'alBottom'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Captio'
-  +'n'#6#5'Value'#12'ClientHeight'#2'S'#11'ClientWidth'#3#242#1#11'ParentCtl3D'
-  +#8#8'TabOrder'#2#2#0#8'TSynEdit'#12'ValueSynedit'#6'Height'#2'S'#5'Width'#3
-  +#242#1#5'Align'#7#8'alClient'#11'Font.Height'#2#241#9'Font.Name'#6#7'courier'
-  +#11'ParentColor'#8#11'ParentCtl3D'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoff'
-  +'set'#2#238#24'BookMarkOptions.OnChange'#13#14'Gutter.Visible'#8#15'Gutter.O'
-  +'nChange'#13#23'Gutter.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1#7'Command'
-  +#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3
-  +#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2
-  +'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'
-  +#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2
-  +#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2
-  +#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6
-  +#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2
-  +#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2
-  +#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2
-  +#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13
-  +#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8
-  +'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8
-  +'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8
-  +'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8
-  +'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0
-  +#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3
-  +'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Comman'
-  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
-  +'mmand'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'
-  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'Short'
-  +'Cut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3
-  +#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Comm'
-  +'and'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7
-  +'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'
-  +#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3
-  +'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortC'
-  +'ut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8
-  +'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'
-  +#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3
-  +'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Comman'
-  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
-  +'ommand'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1
-  +#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'
-  +#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3
-  +'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCu'
-  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
-  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1
-  +#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3
-  ,'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Comma'
-  +'nd'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7
-  +'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1
-  +#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#12'ValueSyne'
-  +'dit'#0#7'Options'#11#12'eoAutoIndent'#17'eoDragDropEditing'#15'eoScrollPast'
-  +'Eol'#16'eoShowScrollHint'#11'eoSmartTabs'#14'eoTabsToSpaces'#20'eoTrimTrail'
-  +'ingSpaces'#18'eoBracketHighlight'#20'eoShowCtrlMouseLinks'#0#8'ReadOnly'#9
-  +#22'SelectedColor.OnChange'#13#0#0#0#7'TButton'#11'CloseButton'#6'Height'#2
-  +#29#3'Top'#3#165#1#5'Width'#3#246#1#5'Align'#7#8'alBottom'#7'Anchors'#11#6'a'
-  +'kLeft'#8'akBottom'#0#7'Caption'#6#11'CloseButton'#11'ModalResult'#2#2#8'Tab'
-  +'Order'#2#3#0#0#9'TSplitter'#12'MainSplitter'#4'Left'#3'('#1#6'Height'#3#15#1
-  +#3'Top'#2'0'#5'Width'#2#4#0#0#9'TGroupBox'#17'TemplatesGroupBox'#4'Left'#3','
-  +#1#6'Height'#3#15#1#3'Top'#2'0'#5'Width'#3#202#0#5'Align'#7#8'alClient'#7'Ca'
-  +'ption'#6#17'TemplatesGroupBox'#12'ClientHeight'#3#252#0#11'ClientWidth'#3
-  +#198#0#8'TabOrder'#2#4#0#9'TTreeView'#23'ParsedTemplatesTreeView'#6'Height'#2
-  +'z'#5'Width'#3#198#0#5'Align'#7#5'alTop'#17'DefaultItemHeight'#2#19#8'TabOrd'
-  +'er'#2#0#18'OnSelectionChanged'#7'''ParsedTemplatesTreeViewSelectionChanged'
-  +#0#0#9'TSplitter'#17'TemplatesSplitter'#6'Cursor'#7#8'crVSplit'#6'Height'#2#5
-  +#3'Top'#2'z'#5'Width'#3#198#0#5'Align'#7#5'alTop'#12'ResizeAnchor'#7#5'akTop'
-  +#0#0#5'TMemo'#13'TemplatesMemo'#6'Height'#2'}'#3'Top'#2''#5'Width'#3#198#0#5
-  +'Align'#7#8'alClient'#13'Lines.Strings'#1#6#5'Memo1'#0#8'TabOrder'#2#1#0#0#0
-  +#0
+  +'odeToolsDefinesDialogCREATE'#9'OnDestroy'#7#11'FormDestroy'#10'LCLVersion'#6
+  +#6'0.9.25'#0#9'TGroupBox'#17'DirectoryGroupbox'#6'Height'#2'0'#5'Width'#3#246
+  +#1#5'Align'#7#5'alTop'#7'Caption'#6#17'DirectoryGroupbox'#12'ClientHeight'#2
+  +#30#11'ClientWidth'#3#242#1#11'ParentCtl3D'#8#8'TabOrder'#2#0#8'OnResize'#7
+  +#23'DirectoryGroupboxRESIZE'#0#9'TComboBox'#17'DirectoryCombobox'#4'Left'#2#6
+  +#6'Height'#2#21#3'Top'#2#1#5'Width'#3'h'#1#16'AutoCompleteText'#11#22'cbactE'
+  +'ndOfLineComplete'#20'cbactSearchAscending'#0#10'ItemHeight'#2#13#9'MaxLengt'
+  +'h'#2#0#8'OnChange'#7#23'DirectoryComboboxCHANGE'#11'ParentCtl3D'#8#8'TabOrd'
+  +'er'#2#0#4'Text'#6#17'DirectoryCombobox'#0#0#7'TButton'#21'DirectoryBrowseBu'
+  +'tton'#4'Left'#3'w'#1#6'Height'#2#26#3'Top'#2#1#5'Width'#2#31#7'Caption'#6#3
+  +'...'#7'OnClick'#7#26'DirectoryBrowseButtonCLICK'#8'TabOrder'#2#1#0#0#0#9'TL'
+  +'istView'#14'ValuesListview'#6'Height'#3#255#0#3'Top'#2'0'#5'Width'#3'('#1#5
+  +'Align'#7#6'alLeft'#7'Columns'#14#0#8'TabOrder'#2#1#9'ViewStyle'#7#8'vsRepor'
+  +'t'#12'OnSelectItem'#7#24'ValuesListviewSELECTITEM'#0#0#9'TGroupBox'#13'Valu'
+  +'eGroupbox'#6'Height'#2'f'#3'Top'#3'/'#1#5'Width'#3#246#1#5'Align'#7#8'alBot'
+  +'tom'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#5'Value'#12'ClientH'
+  +'eight'#2'T'#11'ClientWidth'#3#242#1#11'ParentCtl3D'#8#8'TabOrder'#2#2#0#8'T'
+  +'SynEdit'#12'ValueSynedit'#6'Height'#2'T'#5'Width'#3#242#1#5'Align'#7#8'alCl'
+  +'ient'#11'Font.Height'#2#241#9'Font.Name'#6#7'courier'#11'ParentColor'#8#11
+  +'ParentCtl3D'#8#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2#238#24'BookMar'
+  +'kOptions.OnChange'#13#14'Gutter.Visible'#8#15'Gutter.OnChange'#13#23'Gutter'
+  +'.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'
+  +#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3
+  +'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'('
+  +' '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2
+  +'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%'
+  +'@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2
+  +''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3
+  +'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'
+  +#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3
+  +'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2
+  +'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3
+  +'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2
+  +'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3
+  +'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2
+  +'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3
+  +'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'
+  +#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'Short'
+  +'Cut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8
+  +'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245
+  +#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Comman'
+  +'d'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160
+  +#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortC'
+  +'ut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8
+  +'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3
+  +#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Comm'
+  +'and'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7
+  +'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0
+  +#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3
+  +'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCu'
+  +'t'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'Sh'
+  +'ortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1
+  +#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3
+  +'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Comman'
+  +'d'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'C'
+  +'ommand'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1
+  +#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'
+  +#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3
+  +'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCu'
+  ,'t'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'Sh'
+  +'ortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232
+  +#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'
+  +#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Comma'
+  +'nd'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#12'ValueSynedit'#0#7
+  +'Options'#11#12'eoAutoIndent'#17'eoDragDropEditing'#15'eoScrollPastEol'#16'e'
+  +'oShowScrollHint'#11'eoSmartTabs'#14'eoTabsToSpaces'#20'eoTrimTrailingSpaces'
+  +#18'eoBracketHighlight'#20'eoShowCtrlMouseLinks'#0#8'ReadOnly'#9#22'Selected'
+  +'Color.OnChange'#13#0#0#0#9'TSplitter'#12'MainSplitter'#4'Left'#3'('#1#6'Hei'
+  +'ght'#3#255#0#3'Top'#2'0'#5'Width'#2#4#0#0#9'TGroupBox'#17'TemplatesGroupBox'
+  +#4'Left'#3','#1#6'Height'#3#255#0#3'Top'#2'0'#5'Width'#3#202#0#5'Align'#7#8
+  +'alClient'#7'Caption'#6#17'TemplatesGroupBox'#12'ClientHeight'#3#237#0#11'Cl'
+  +'ientWidth'#3#198#0#8'TabOrder'#2#3#0#9'TTreeView'#23'ParsedTemplatesTreeVie'
+  +'w'#6'Height'#2'z'#5'Width'#3#198#0#5'Align'#7#5'alTop'#17'DefaultItemHeight'
+  +#2#15#8'TabOrder'#2#0#18'OnSelectionChanged'#7'''ParsedTemplatesTreeViewSele'
+  +'ctionChanged'#0#0#9'TSplitter'#17'TemplatesSplitter'#6'Cursor'#7#8'crVSplit'
+  +#6'Height'#2#5#3'Top'#2'z'#5'Width'#3#198#0#5'Align'#7#5'alTop'#12'ResizeAnc'
+  +'hor'#7#5'akTop'#0#0#5'TMemo'#13'TemplatesMemo'#6'Height'#2'n'#3'Top'#2''#5
+  +'Width'#3#198#0#5'Align'#7#8'alClient'#13'Lines.Strings'#1#6#5'Memo1'#0#8'Ta'
+  +'bOrder'#2#1#0#0#0#6'TPanel'#16'CloseButtonPanel'#6'Height'#2'-'#3'Top'#3#149
+  +#1#5'Width'#3#246#1#5'Align'#7#8'alBottom'#10'BevelOuter'#7#7'bvSpace'#12'Cl'
+  +'ientHeight'#2'-'#11'ClientWidth'#3#246#1#8'TabOrder'#2#5#0#7'TButton'#11'Cl'
+  +'oseButton'#23'AnchorSideRight.Control'#7#16'CloseButtonPanel'#20'AnchorSide'
+  +'Right.Side'#7#9'asrBottom'#4'Left'#3#157#1#6'Height'#2#23#3'Top'#2#15#5'Wid'
+  +'th'#2'S'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpac'
+  +'ing.Right'#2#6#20'BorderSpacing.Bottom'#2#4#7'Caption'#6#11'CloseButton'#11
+  +'ModalResult'#2#2#8'TabOrder'#2#0#0#0#0#0#23'TCodeToolsDefinesDialog'#22'Cod'
+  +'eToolsDefinesDialog'#4'Left'#3'V'#1#6'Height'#3#194#1#3'Top'#3#182#0#5'Widt'
+  +'h'#3#246#1#18'HorzScrollBar.Page'#3#245#1#18'VertScrollBar.Page'#3#193#1#13
+  +'ActiveControl'#7#17'DirectoryCombobox'#7'Caption'#6#22'CodeToolsDefinesDial'
+  +'og'#12'ClientHeight'#3#194#1#11'ClientWidth'#3#246#1#7'OnClose'#7#27'CodeTo'
+  +'olsDefinesDialogCLOSE'#8'OnCreate'#7#28'CodeToolsDefinesDialogCREATE'#9'OnD'
+  +'estroy'#7#11'FormDestroy'#10'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#17'Dire'
+  +'ctoryGroupbox'#6'Height'#2'0'#5'Width'#3#246#1#5'Align'#7#5'alTop'#7'Captio'
+  +'n'#6#17'DirectoryGroupbox'#12'ClientHeight'#2#30#11'ClientWidth'#3#242#1#11
+  +'ParentCtl3D'#8#8'TabOrder'#2#0#8'OnResize'#7#23'DirectoryGroupboxRESIZE'#0#9
+  +'TComboBox'#17'DirectoryCombobox'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#1#5'Wi'
+  +'dth'#3'h'#1#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSear'
+  +'chAscending'#0#10'ItemHeight'#2#13#9'MaxLength'#2#0#8'OnChange'#7#23'Direct'
+  +'oryComboboxCHANGE'#11'ParentCtl3D'#8#8'TabOrder'#2#0#4'Text'#6#17'Directory'
+  +'Combobox'#0#0#7'TButton'#21'DirectoryBrowseButton'#4'Left'#3'w'#1#6'Height'
+  +#2#26#3'Top'#2#1#5'Width'#2#31#7'Caption'#6#3'...'#7'OnClick'#7#26'Directory'
+  +'BrowseButtonCLICK'#8'TabOrder'#2#1#0#0#0#9'TListView'#14'ValuesListview'#6
+  +'Height'#3#255#0#3'Top'#2'0'#5'Width'#3'('#1#5'Align'#7#6'alLeft'#7'Columns'
+  +#14#0#8'TabOrder'#2#1#9'ViewStyle'#7#8'vsReport'#12'OnSelectItem'#7#24'Value'
+  +'sListviewSELECTITEM'#0#0#9'TGroupBox'#13'ValueGroupbox'#6'Height'#2'f'#3'To'
+  +'p'#3'/'#1#5'Width'#3#246#1#5'Align'#7#8'alBottom'#7'Anchors'#11#6'akLeft'#8
+  +'akBottom'#0#7'Caption'#6#5'Value'#12'ClientHeight'#2'T'#11'ClientWidth'#3
+  +#242#1#11'ParentCtl3D'#8#8'TabOrder'#2#2#0#8'TSynEdit'#12'ValueSynedit'#6'He'
+  +'ight'#2'T'#5'Width'#3#242#1#5'Align'#7#8'alClient'#11'Font.Height'#2#241#9
+  +'Font.Name'#6#7'courier'#11'ParentColor'#8#11'ParentCtl3D'#8#8'TabOrder'#2#0
+  +#23'BookMarkOptions.Xoffset'#2#238#24'BookMarkOptions.OnChange'#13#14'Gutter'
+  +'.Visible'#8#15'Gutter.OnChange'#13#23'Gutter.CodeFoldingWidth'#2#14#10'Keys'
+  +'trokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'
+  +#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCu'
+  +'t'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'Shor'
+  +'tCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'Short'
+  +'Cut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'Short'
+  +'Cut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'Short'
+  +'Cut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'Sho'
+  +'rtCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'Sh'
+  +'ortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'S'
+  +'hortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'Sh'
+  +'ortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'S'
+  ,'hortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'Sh'
+  +'ortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'S'
+  +'hortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'Sh'
+  +'ortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'S'
+  +'hortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
+  +#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3
+  +#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Comman'
+  +'d'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7
+  +'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8
+  +#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1
+  +#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3
+  +#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Comma'
+  +'nd'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7
+  +'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0
+  +#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X'
+  +'@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortC'
+  +'ut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'S'
+  +'hortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1
+  +#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3
+  +'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Comman'
+  +'d'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'C'
+  +'ommand'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1
+  +#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'
+  +#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3
+  +'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCu'
+  +'t'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'Sh'
+  +'ortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1
+  +#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3
+  +#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Comm'
+  +'and'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7
+  +'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'
+  +#0#0#13'Lines.Strings'#1#6#12'ValueSynedit'#0#7'Options'#11#12'eoAutoIndent'
+  +#17'eoDragDropEditing'#15'eoScrollPastEol'#16'eoShowScrollHint'#11'eoSmartTa'
+  +'bs'#14'eoTabsToSpaces'#20'eoTrimTrailingSpaces'#18'eoBracketHighlight'#20'e'
+  +'oShowCtrlMouseLinks'#0#8'ReadOnly'#9#22'SelectedColor.OnChange'#13#0#0#0#9
+  +'TSplitter'#12'MainSplitter'#4'Left'#3'('#1#6'Height'#3#255#0#3'Top'#2'0'#5
+  +'Width'#2#4#0#0#9'TGroupBox'#17'TemplatesGroupBox'#4'Left'#3','#1#6'Height'#3
+  +#255#0#3'Top'#2'0'#5'Width'#3#202#0#5'Align'#7#8'alClient'#7'Caption'#6#17'T'
+  +'emplatesGroupBox'#12'ClientHeight'#3#237#0#11'ClientWidth'#3#198#0#8'TabOrd'
+  +'er'#2#3#0#9'TTreeView'#23'ParsedTemplatesTreeView'#6'Height'#2'z'#5'Width'#3
+  +#198#0#5'Align'#7#5'alTop'#17'DefaultItemHeight'#2#15#8'TabOrder'#2#0#18'OnS'
+  +'electionChanged'#7'''ParsedTemplatesTreeViewSelectionChanged'#0#0#9'TSplitt'
+  +'er'#17'TemplatesSplitter'#6'Cursor'#7#8'crVSplit'#6'Height'#2#5#3'Top'#2'z'
+  +#5'Width'#3#198#0#5'Align'#7#5'alTop'#12'ResizeAnchor'#7#5'akTop'#0#0#5'TMem'
+  +'o'#13'TemplatesMemo'#6'Height'#2'n'#3'Top'#2''#5'Width'#3#198#0#5'Align'#7
+  +#8'alClient'#13'Lines.Strings'#1#6#5'Memo1'#0#8'TabOrder'#2#1#0#0#0#6'TPanel'
+  +#16'CloseButtonPanel'#6'Height'#2'-'#3'Top'#3#149#1#5'Width'#3#246#1#5'Align'
+  +#7#8'alBottom'#10'BevelOuter'#7#7'bvSpace'#12'ClientHeight'#2'-'#11'ClientWi'
+  +'dth'#3#246#1#8'TabOrder'#2#5#0#7'TButton'#11'CloseButton'#23'AnchorSideRigh'
+  +'t.Control'#7#16'CloseButtonPanel'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#3#157#1#6'Height'#2#23#3'Top'#2#15#5'Width'#2'S'#7'Anchors'#11#7'akRi'
+  +'ght'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#20'BorderSpaci'
+  +'ng.Bottom'#2#4#7'Caption'#6#11'CloseButton'#11'ModalResult'#2#2#8'TabOrder'
+  +#2#0#0#0#0#0
 ]);
diff --git a/ide/codetoolsdefpreview.pas b/ide/codetoolsdefpreview.pas
index 77922301c5..39c09cb7bd 100644
--- a/ide/codetoolsdefpreview.pas
+++ b/ide/codetoolsdefpreview.pas
@@ -29,6 +29,7 @@ type
     DirectoryBrowseButton: TButton;
     DirectoryCombobox: TComboBox;
     DirectoryGroupbox: TGroupBox;
+    CloseButtonPanel: TPanel;
     TemplatesMemo: TMemo;
     TemplatesSplitter: TSplitter;
     TemplatesGroupBox: TGroupBox;