diff --git a/ide/condef.lfm b/ide/condef.lfm
index e1b1304635..38735cfea0 100644
--- a/ide/condef.lfm
+++ b/ide/condef.lfm
@@ -1,50 +1,52 @@
 object CondForm: TCondForm
+  Left = 328
+  Height = 238
+  Top = 287
+  Width = 330
+  HorzScrollBar.Page = 329
+  HorzScrollBar.Range = 186
+  VertScrollBar.Page = 237
+  VertScrollBar.Range = 157
   ActiveControl = ListBox
   Caption = 'Conditional Defines'
-  ClientHeight = 238
-  ClientWidth = 213
   OnClose = CondFormCLOSE
   OnCreate = CondFormCREATE
   OnDestroy = FormDestroy
   OnShow = FormShow
-  PixelsPerInch = 95
   Position = poDesktopCenter
-  TextHeight = 13
-  HorzScrollBar.Page = 212
-  HorzScrollBar.Range = 186
-  VertScrollBar.Page = 237
-  VertScrollBar.Range = 157
-  Left = 360
-  Height = 238
-  Top = 344
-  Width = 213
   object FirstLabel: TLabel
+    Left = 6
+    Height = 17
+    Top = 2
+    Width = 75
     Caption = '&First test'
     Color = clNone
     FocusControl = FirstTest
     ParentColor = False
-    Left = 6
-    Height = 13
-    Top = 2
-    Width = 57
   end
   object SecondLabel: TLabel
+    AnchorSideTop.Control = FirstTest
+    AnchorSideTop.Side = asrBottom
+    Left = 6
+    Height = 17
+    Top = 46
+    Width = 99
     BorderSpacing.Top = 6
     Caption = '&Second test'
     Color = clNone
     FocusControl = SecondTest
     ParentColor = False
-    AnchorSideTop.Control = FirstTest
-    AnchorSideTop.Side = asrBottom
-    Left = 6
-    Height = 13
-    Top = 42
-    Width = 76
   end
   object FirstTest: TComboBox
+    AnchorSideTop.Control = FirstLabel
+    AnchorSideTop.Side = asrBottom
+    Left = 5
+    Height = 21
+    Top = 19
+    Width = 217
     Anchors = [akTop, akLeft, akRight]
     AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
-    ItemHeight = 13
+    ItemHeight = 18
     ItemIndex = 0
     Items.Strings = (
       'MSWINDOWS'
@@ -62,31 +64,31 @@ object CondForm: TCondForm
     ParentCtl3D = False
     TabOrder = 0
     Text = 'MSWINDOWS'
-    AnchorSideTop.Control = FirstLabel
-    AnchorSideTop.Side = asrBottom
-    Left = 5
-    Height = 21
-    Top = 15
-    Width = 118
   end
   object ListBox: TListBox
-    Anchors = [akTop, akLeft, akRight, akBottom]
-    BorderSpacing.Top = 6
-    ItemHeight = 13
-    OnKeyDown = ListBoxKeyDown
-    TabOrder = 2
-    TopIndex = -1
     AnchorSideTop.Control = SecondTest
     AnchorSideTop.Side = asrBottom
     Left = 5
-    Height = 149
-    Top = 82
-    Width = 118
+    Height = 141
+    Top = 90
+    Width = 217
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    BorderSpacing.Top = 6
+    ItemHeight = 18
+    OnKeyDown = ListBoxKeyDown
+    TabOrder = 2
+    TopIndex = -1
   end
   object SecondTest: TComboBox
+    AnchorSideTop.Control = SecondLabel
+    AnchorSideTop.Side = asrBottom
+    Left = 5
+    Height = 21
+    Top = 63
+    Width = 217
     Anchors = [akTop, akLeft, akRight]
     AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
-    ItemHeight = 13
+    ItemHeight = 18
     ItemIndex = 0
     Items.Strings = (
       'NONE'
@@ -96,36 +98,34 @@ object CondForm: TCondForm
     ParentCtl3D = False
     TabOrder = 1
     Text = 'NONE'
-    AnchorSideTop.Control = SecondLabel
-    AnchorSideTop.Side = asrBottom
-    Left = 5
-    Height = 21
-    Top = 55
-    Width = 118
   end
   object AddBtn: TBitBtn
+    Left = 229
+    Height = 25
+    Top = 6
+    Width = 97
     Anchors = [akTop, akRight]
     Caption = '&Add'
     NumGlyphs = 0
     OnClick = AddBtnClick
     TabOrder = 3
-    Left = 129
-    Height = 25
-    Top = 6
-    Width = 82
   end
   object RemoveBtn: TBitBtn
+    Left = 229
+    Height = 25
+    Top = 64
+    Width = 97
     Anchors = [akTop, akRight]
     Caption = '&Remove'
     NumGlyphs = 0
     OnClick = RemoveBtnClick
     TabOrder = 5
-    Left = 129
-    Height = 25
-    Top = 64
-    Width = 82
   end
   object OkBtn: TBitBtn
+    Left = 229
+    Height = 25
+    Top = 95
+    Width = 97
     Anchors = [akTop, akRight]
     Caption = '&OK'
     Default = True
@@ -133,12 +133,12 @@ object CondForm: TCondForm
     ModalResult = 1
     NumGlyphs = 0
     TabOrder = 6
-    Left = 129
-    Height = 25
-    Top = 95
-    Width = 82
   end
   object BitBtn1: TBitBtn
+    Left = 229
+    Height = 25
+    Top = 125
+    Width = 97
     Anchors = [akTop, akRight]
     Cancel = True
     Caption = 'Cancel'
@@ -146,21 +146,17 @@ object CondForm: TCondForm
     ModalResult = 2
     NumGlyphs = 0
     TabOrder = 7
-    Left = 129
-    Height = 25
-    Top = 125
-    Width = 82
   end
   object AddInverse: TButton
+    Left = 229
+    Height = 25
+    Top = 34
+    Width = 97
+    HelpType = htKeyword
     Anchors = [akTop, akRight]
     BorderSpacing.InnerBorder = 4
     Caption = 'Add Inverse'
     OnClick = AddInverseCLICK
     TabOrder = 4
-    Left = 129
-    Height = 25
-    Top = 34
-    Width = 82
-    HelpType = htKeyword
   end
 end
diff --git a/ide/condef.lrs b/ide/condef.lrs
index 9494f41722..44803a2dd0 100644
--- a/ide/condef.lrs
+++ b/ide/condef.lrs
@@ -1,50 +1,49 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TCondForm','FORMDATA',[
-  'TPF0'#9'TCondForm'#8'CondForm'#13'ActiveControl'#7#7'ListBox'#7'Caption'#6#19
-  +'Conditional Defines'#12'ClientHeight'#3#238#0#11'ClientWidth'#3#213#0#7'OnC'
-  +'lose'#7#13'CondFormCLOSE'#8'OnCreate'#7#14'CondFormCREATE'#9'OnDestroy'#7#11
-  +'FormDestroy'#6'OnShow'#7#8'FormShow'#13'PixelsPerInch'#2'_'#8'Position'#7#15
-  +'poDesktopCenter'#10'TextHeight'#2#13#18'HorzScrollBar.Page'#3#212#0#19'Horz'
-  +'ScrollBar.Range'#3#186#0#18'VertScrollBar.Page'#3#237#0#19'VertScrollBar.Ra'
-  +'nge'#3#157#0#4'Left'#3'h'#1#6'Height'#3#238#0#3'Top'#3'X'#1#5'Width'#3#213#0
-  +#0#6'TLabel'#10'FirstLabel'#7'Caption'#6#11'&First test'#5'Color'#7#6'clNone'
-  +#12'FocusControl'#7#9'FirstTest'#11'ParentColor'#8#4'Left'#2#6#6'Height'#2#13
-  +#3'Top'#2#2#5'Width'#2'9'#0#0#6'TLabel'#11'SecondLabel'#17'BorderSpacing.Top'
-  +#2#6#7'Caption'#6#12'&Second test'#5'Color'#7#6'clNone'#12'FocusControl'#7#10
-  +'SecondTest'#11'ParentColor'#8#21'AnchorSideTop.Control'#7#9'FirstTest'#18'A'
-  +'nchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#13#3'Top'#2'*'#5
-  +'Width'#2'L'#0#0#9'TComboBox'#9'FirstTest'#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearc'
-  +'hAscending'#0#10'ItemHeight'#2#13#9'ItemIndex'#2#0#13'Items.Strings'#1#6#9
-  +'MSWINDOWS'#6#4'UNIX'#6#5'LINUX'#6#5'WIN32'#6#4'CLX_'#6#4'LCL_'#6#4'VCL_'#6#3
-  +'FPC'#6#5'KYLIX'#6#6'VER1_0'#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'
-  +#2#0#4'Text'#6#9'MSWINDOWS'#21'AnchorSideTop.Control'#7#10'FirstLabel'#18'An'
-  +'chorSideTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#21#3'Top'#2#15#5'W'
-  +'idth'#2'v'#0#0#8'TListBox'#7'ListBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
-  +'Right'#8'akBottom'#0#17'BorderSpacing.Top'#2#6#10'ItemHeight'#2#13#9'OnKeyD'
-  +'own'#7#14'ListBoxKeyDown'#8'TabOrder'#2#2#8'TopIndex'#2#255#21'AnchorSideTo'
-  +'p.Control'#7#10'SecondTest'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
-  +#5#6'Height'#3#149#0#3'Top'#2'R'#5'Width'#2'v'#0#0#9'TComboBox'#10'SecondTes'
-  +'t'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22
-  +'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#10'ItemHeight'#2#13#9'It'
-  +'emIndex'#2#0#13'Items.Strings'#1#6#4'NONE'#6#4'ELSE'#0#9'MaxLength'#2#0#11
-  +'ParentCtl3D'#8#8'TabOrder'#2#1#4'Text'#6#4'NONE'#21'AnchorSideTop.Control'#7
-  +#11'SecondLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'
-  +#2#21#3'Top'#2'7'#5'Width'#2'v'#0#0#7'TBitBtn'#6'AddBtn'#7'Anchors'#11#5'akT'
-  +'op'#7'akRight'#0#7'Caption'#6#4'&Add'#9'NumGlyphs'#2#0#7'OnClick'#7#11'AddB'
-  +'tnClick'#8'TabOrder'#2#3#4'Left'#3#129#0#6'Height'#2#25#3'Top'#2#6#5'Width'
-  +#2'R'#0#0#7'TBitBtn'#9'RemoveBtn'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Capt'
-  +'ion'#6#7'&Remove'#9'NumGlyphs'#2#0#7'OnClick'#7#14'RemoveBtnClick'#8'TabOrd'
-  +'er'#2#5#4'Left'#3#129#0#6'Height'#2#25#3'Top'#2'@'#5'Width'#2'R'#0#0#7'TBit'
-  +'Btn'#5'OkBtn'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#3'&OK'#7'Def'
-  +'ault'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2
-  +#6#4'Left'#3#129#0#6'Height'#2#25#3'Top'#2'_'#5'Width'#2'R'#0#0#7'TBitBtn'#7
-  +'BitBtn1'#7'Anchors'#11#5'akTop'#7'akRight'#0#6'Cancel'#9#7'Caption'#6#6'Can'
-  +'cel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'
-  +#2#7#4'Left'#3#129#0#6'Height'#2#25#3'Top'#2'}'#5'Width'#2'R'#0#0#7'TButton'
-  +#10'AddInverse'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBo'
+  'TPF0'#9'TCondForm'#8'CondForm'#4'Left'#3'H'#1#6'Height'#3#238#0#3'Top'#3#31#1
+  +#5'Width'#3'J'#1#18'HorzScrollBar.Page'#3'I'#1#19'HorzScrollBar.Range'#3#186
+  +#0#18'VertScrollBar.Page'#3#237#0#19'VertScrollBar.Range'#3#157#0#13'ActiveC'
+  +'ontrol'#7#7'ListBox'#7'Caption'#6#19'Conditional Defines'#7'OnClose'#7#13'C'
+  +'ondFormCLOSE'#8'OnCreate'#7#14'CondFormCREATE'#9'OnDestroy'#7#11'FormDestro'
+  +'y'#6'OnShow'#7#8'FormShow'#8'Position'#7#15'poDesktopCenter'#0#6'TLabel'#10
+  +'FirstLabel'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#2#5'Width'#2'K'#7'Caption'#6
+  +#11'&First test'#5'Color'#7#6'clNone'#12'FocusControl'#7#9'FirstTest'#11'Par'
+  +'entColor'#8#0#0#6'TLabel'#11'SecondLabel'#21'AnchorSideTop.Control'#7#9'Fir'
+  +'stTest'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#17#3
+  +'Top'#2'.'#5'Width'#2'c'#17'BorderSpacing.Top'#2#6#7'Caption'#6#12'&Second t'
+  +'est'#5'Color'#7#6'clNone'#12'FocusControl'#7#10'SecondTest'#11'ParentColor'
+  +#8#0#0#9'TComboBox'#9'FirstTest'#21'AnchorSideTop.Control'#7#10'FirstLabel'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#2#21#3'Top'#2#19
+  +#5'Width'#3#217#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompl'
+  +'eteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#10'ItemHe'
+  +'ight'#2#18#9'ItemIndex'#2#0#13'Items.Strings'#1#6#9'MSWINDOWS'#6#4'UNIX'#6#5
+  +'LINUX'#6#5'WIN32'#6#4'CLX_'#6#4'LCL_'#6#4'VCL_'#6#3'FPC'#6#5'KYLIX'#6#6'VER'
+  +'1_0'#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#0#4'Text'#6#9'MSWIN'
+  +'DOWS'#0#0#8'TListBox'#7'ListBox'#21'AnchorSideTop.Control'#7#10'SecondTest'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#5#6'Height'#3#141#0#3'Top'#2
+  +'Z'#5'Width'#3#217#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'
+  +#0#17'BorderSpacing.Top'#2#6#10'ItemHeight'#2#18#9'OnKeyDown'#7#14'ListBoxKe'
+  +'yDown'#8'TabOrder'#2#2#8'TopIndex'#2#255#0#0#9'TComboBox'#10'SecondTest'#21
+  +'AnchorSideTop.Control'#7#11'SecondLabel'#18'AnchorSideTop.Side'#7#9'asrBott'
+  +'om'#4'Left'#2#5#6'Height'#2#21#3'Top'#2'?'#5'Width'#3#217#0#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComp'
+  +'lete'#20'cbactSearchAscending'#0#10'ItemHeight'#2#18#9'ItemIndex'#2#0#13'It'
+  +'ems.Strings'#1#6#4'NONE'#6#4'ELSE'#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'T'
+  +'abOrder'#2#1#4'Text'#6#4'NONE'#0#0#7'TBitBtn'#6'AddBtn'#4'Left'#3#229#0#6'H'
+  +'eight'#2#25#3'Top'#2#6#5'Width'#2'a'#7'Anchors'#11#5'akTop'#7'akRight'#0#7
+  +'Caption'#6#4'&Add'#9'NumGlyphs'#2#0#7'OnClick'#7#11'AddBtnClick'#8'TabOrder'
+  +#2#3#0#0#7'TBitBtn'#9'RemoveBtn'#4'Left'#3#229#0#6'Height'#2#25#3'Top'#2'@'#5
+  +'Width'#2'a'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#7'&Remove'#9'N'
+  +'umGlyphs'#2#0#7'OnClick'#7#14'RemoveBtnClick'#8'TabOrder'#2#5#0#0#7'TBitBtn'
+  +#5'OkBtn'#4'Left'#3#229#0#6'Height'#2#25#3'Top'#2'_'#5'Width'#2'a'#7'Anchors'
+  +#11#5'akTop'#7'akRight'#0#7'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4'bkOK'
+  +#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#6#0#0#7'TBitBtn'#7'BitBt'
+  +'n1'#4'Left'#3#229#0#6'Height'#2#25#3'Top'#2'}'#5'Width'#2'a'#7'Anchors'#11#5
+  +'akTop'#7'akRight'#0#6'Cancel'#9#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'
+  +#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#7#0#0#7'TButton'#10'AddI'
+  +'nverse'#4'Left'#3#229#0#6'Height'#2#25#3'Top'#2'"'#5'Width'#2'a'#8'HelpType'
+  +#7#9'htKeyword'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBo'
   +'rder'#2#4#7'Caption'#6#11'Add Inverse'#7'OnClick'#7#15'AddInverseCLICK'#8'T'
-  +'abOrder'#2#4#4'Left'#3#129#0#6'Height'#2#25#3'Top'#2'"'#5'Width'#2'R'#8'Hel'
-  +'pType'#7#9'htKeyword'#0#0#0
+  +'abOrder'#2#4#0#0#0
 ]);