diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay
index f3c9317b4..260d0beb7 100644
--- a/uppsrc/ide/ide.lay
+++ b/uppsrc/ide/ide.lay
@@ -16,15 +16,15 @@ LAYOUT(ConfigLayout, 724, 214)
 	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 80).BottomPosZ(4, 22))
 END_LAYOUT
 
-LAYOUT(BaseSetupLayout, 608, 112)
+LAYOUT(BaseSetupLayout, 608, 104)
 	ITEM(Label, dv___0, SetLabel(t_("&Package nests:")).LeftPosZ(4, 88).TopPosZ(4, 19))
-	ITEM(EditString, upp, LeftPosZ(96, 508).TopPosZ(4, 19))
+	ITEM(EditString, upp, HSizePosZ(96, 4).TopPosZ(4, 19))
 	ITEM(Label, dv___2, SetLabel(t_("&Output directory:")).LeftPosZ(4, 88).TopPosZ(28, 19))
-	ITEM(EditString, output, LeftPosZ(96, 508).TopPosZ(28, 19))
-	ITEM(Label, dv___4, SetLabel(t_("&Assembly name:")).LeftPosZ(4, 84).TopPosZ(52, 19))
-	ITEM(EditString, base, NotNull(true).LeftPosZ(96, 136).TopPosZ(52, 19))
-	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(460, 64).TopPosZ(80, 24))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(536, 64).TopPosZ(80, 24))
+	ITEM(EditString, output, HSizePosZ(96, 4).TopPosZ(28, 19))
+	ITEM(Label, dv___4, SetLabel(t_("&Assembly name:")).LeftPosZ(4, 88).TopPosZ(52, 19))
+	ITEM(EditString, base, NotNull(true).LeftPosZ(96, 148).TopPosZ(52, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(72, 64).BottomPosZ(4, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 64).BottomPosZ(4, 24))
 END_LAYOUT
 
 LAYOUT(ConfLayout, 344, 416)
@@ -32,10 +32,10 @@ LAYOUT(ConfLayout, 344, 416)
 	ITEM(Switch, dll, SetLabel(t_("Executable\nDynamic library")).LeftPosZ(16, 96).TopPosZ(16, 34))
 	ITEM(LabelBox, dv___2, SetLabel(t_("App style")).LeftPosZ(116, 82).TopPosZ(0, 52))
 	ITEM(Switch, gui, SetLabel(t_("Console\nGUI")).LeftPosZ(124, 70).TopPosZ(16, 34))
-	ITEM(LabelBox, dv___4, SetLabel(t_("Thread model")).LeftPosZ(204, 130).TopPosZ(0, 52))
+	ITEM(LabelBox, dv___4, SetLabel(t_("Thread model")).LeftPosZ(204, 132).TopPosZ(0, 52))
 	ITEM(Switch, mt, SetLabel(t_("Singlethreaded\nMultithreaded")).LeftPosZ(212, 118).TopPosZ(16, 34))
 	ITEM(Option, sse2, SetLabel(t_("Use SSE2")).LeftPosZ(8, 248).TopPosZ(56, 16))
-	ITEM(ArrayCtrl, accepts, AutoHideSb(true).VertGrid(false).HorzGrid(false).SetLineCy(20).HSizePosZ(8, 10).VSizePosZ(76, 64))
+	ITEM(ArrayCtrl, accepts, AutoHideSb(true).VertGrid(false).HorzGrid(false).SetLineCy(20).HSizePosZ(8, 8).VSizePosZ(76, 64))
 	ITEM(Label, dv___8, SetLabel(t_("&Other flags:")).LeftPosZ(8, 58).BottomPosZ(39, 19))
 	ITEM(EditString, other, LeftPosZ(68, 268).BottomPosZ(39, 19))
 	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24))
@@ -53,19 +53,19 @@ LAYOUT(CustomLayout, 608, 410)
 	ITEM(Button, exit, SetLabel(t_("Close")).RightPosZ(4, 80).BottomPosZ(4, 22))
 END_LAYOUT
 
-LAYOUT(RunLayout, 410, 148)
-	ITEM(Label, dv___0, SetLabel(t_("&Program arguments:")).LeftPosZ(4, 128).TopPosZ(4, 19))
-	ITEM(WithDropChoice<EditString>, arg, HSizePosZ(106, 4).TopPosZ(4, 19))
-	ITEM(Label, dv___2, SetLabel(t_("&Working directory:")).LeftPosZ(4, 100).TopPosZ(28, 19))
-	ITEM(EditString, dir, HSizePosZ(106, 4).TopPosZ(28, 19))
-	ITEM(Label, dv___4, SetLabel(t_("STDOUT file:")).LeftPosZ(4, 100).TopPosZ(52, 19))
-	ITEM(WithDropChoice<EditString>, stdout_file, HSizePosZ(106, 4).TopPosZ(52, 19))
-	ITEM(Label, dv___6, SetLabel(t_("Standard output:")).LeftPosZ(4, 100).TopPosZ(76, 19))
-	ITEM(Switch, runmode, SetLabel(t_("&Standalone\n&Console\n&File")).LeftPosZ(106, 196).TopPosZ(78, 19))
-	ITEM(Option, external, SetLabel(t_("&External application")).LeftPosZ(106, 122).TopPosZ(100, 15))
-	ITEM(Option, forceconsole, SetLabel(t_("&Always open console (POSIX)")).LeftPosZ(236, 160).TopPosZ(100, 15))
-	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(74, 64).BottomPosZ(4, 24))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(6, 64).BottomPosZ(4, 24))
+LAYOUT(RunLayout, 416, 156)
+	ITEM(Label, dv___0, SetLabel(t_("&Program arguments:")).LeftPosZ(4, 112).TopPosZ(4, 19))
+	ITEM(WithDropChoice<EditString>, arg, HSizePosZ(116, 4).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("&Working directory:")).LeftPosZ(4, 112).TopPosZ(28, 19))
+	ITEM(EditString, dir, HSizePosZ(116, 4).TopPosZ(28, 19))
+	ITEM(Label, dv___4, SetLabel(t_("STDOUT file:")).LeftPosZ(4, 112).TopPosZ(52, 19))
+	ITEM(WithDropChoice<EditString>, stdout_file, HSizePosZ(116, 4).TopPosZ(52, 19))
+	ITEM(Label, dv___6, SetLabel(t_("Standard output:")).LeftPosZ(4, 112).TopPosZ(76, 19))
+	ITEM(Switch, runmode, SetLabel(t_("&Standalone\n&Console\n&File")).LeftPosZ(116, 212).TopPosZ(78, 19))
+	ITEM(Option, external, SetLabel(t_("&External application")).LeftPosZ(116, 122).TopPosZ(100, 15))
+	ITEM(Option, forceconsole, SetLabel(t_("&Always open console (POSIX)")).LeftPosZ(244, 168).TopPosZ(100, 15))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(72, 64).BottomPosZ(4, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 64).BottomPosZ(4, 24))
 END_LAYOUT
 
 LAYOUT(FindInFilesLayout, 420, 152)
@@ -82,10 +82,10 @@ LAYOUT(FindInFilesLayout, 420, 152)
 	ITEM(Option, wholeword, SetLabel(t_("&Whole word")).LeftPosZ(54, 80).BottomPosZ(34, 18))
 	ITEM(Option, wildcards, SetLabel(t_("Wild&cards")).LeftPosZ(140, 72).BottomPosZ(34, 18))
 	ITEM(Option, ignorecase, SetLabel(t_("&Ignore case")).LeftPosZ(216, 84).BottomPosZ(34, 18))
-	ITEM(Option, samecase, SetLabel(t_("Mimic case")).LeftPosZ(304, 108).BottomPosZ(34, 18))
+	ITEM(Option, samecase, SetLabel(t_("Mimic case")).LeftPosZ(304, 112).BottomPosZ(34, 18))
 	ITEM(Option, readonly, ThreeState(true).SetLabel(t_("Read-only files")).LeftPosZ(54, 142).BottomPosZ(14, 16))
-	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(6, 22))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(6, 22))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(72, 64).BottomPosZ(6, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 64).BottomPosZ(6, 22))
 END_LAYOUT
 
 LAYOUT(BatchBuildLayout, 276, 276)
@@ -117,9 +117,9 @@ LAYOUT(UppLayout, 800, 576)
 	ITEM(ArrayCtrl, fileoption, HSizePosZ(248, 4).BottomPosZ(32, 92))
 	ITEM(Option, optimize_speed_file, SetLabel(t_("Optimize the file for speed")).LeftPosZ(248, 152).BottomPosZ(9, 19))
 	ITEM(Option, include_path_file, SetLabel(t_("Add to include path")).RightPosZ(268, 124).BottomPosZ(9, 19))
-	ITEM(Option, includeable_file, SetLabel(t_("Includeable group")).RightPosZ(148, 112).BottomPosZ(9, 19))
-	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(6, 22))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(6, 22))
+	ITEM(Option, includeable_file, SetLabel(t_("Includeable group")).RightPosZ(140, 120).BottomPosZ(9, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(72, 64).BottomPosZ(6, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 64).BottomPosZ(6, 22))
 	ITEM(Label, dv___17, SetLabel(t_("Highlight")).RightPosZ(156, 48).TopPosZ(4, 19))
 	ITEM(ColorPusher, ink, RightPosZ(104, 52).TopPosZ(4, 20))
 	ITEM(Option, bold, SetLabel(t_("Bold")).RightPosZ(56, 44).TopPosZ(4, 20))
@@ -134,29 +134,29 @@ LAYOUT(NewPackageLayout, 728, 560)
 	ITEM(ArrayCtrl, templist, AutoHideSb(true).LeftPosZ(8, 236).TopPosZ(52, 272))
 	ITEM(Label, dv___5, SetLabel(t_("Package description")).LeftPosZ(248, 108).TopPosZ(4, 20))
 	ITEM(EditString, description, HSizePosZ(356, 8).TopPosZ(4, 19))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(176, 64).BottomPosZ(4, 24))
-	ITEM(Button, ok, SetLabel(t_("Create")).LeftPosZ(108, 64).BottomPosZ(4, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(180, 64).BottomPosZ(4, 24))
+	ITEM(Button, ok, SetLabel(t_("Create")).LeftPosZ(112, 64).BottomPosZ(4, 24))
 	UNTYPED(preview, HSizePosZ(248, 8).VSizePosZ(28, 4))
 END_LAYOUT
 
-LAYOUT(FileFormatLayout, 348, 92)
+LAYOUT(FileFormatLayout, 348, 100)
 	ITEM(Label, dv___0, SetLabel(t_("&Encoding")).LeftPosZ(8, 49).TopPosZ(8, 20))
-	ITEM(DropList, charset, LeftPosZ(60, 120).TopPosZ(8, 19))
+	ITEM(DropList, charset, LeftPosZ(64, 120).TopPosZ(8, 19))
 	ITEM(Label, dv___2, SetLabel(t_("&Font")).LeftPosZ(8, 49).TopPosZ(32, 20))
-	ITEM(DropList, font, LeftPosZ(60, 120).TopPosZ(32, 19))
-	ITEM(Label, dv___4, SetLabel(t_("T&ab size")).LeftPosZ(200, 48).TopPosZ(8, 19))
+	ITEM(DropList, font, LeftPosZ(64, 120).TopPosZ(32, 19))
+	ITEM(Label, dv___4, SetLabel(t_("T&ab size")).LeftPosZ(196, 48).TopPosZ(8, 19))
 	ITEM(EditIntSpin, tabsize, LeftPosZ(264, 50).TopPosZ(8, 19))
-	ITEM(Label, dv___6, SetLabel(t_("&Highlighting")).LeftPosZ(200, 63).TopPosZ(32, 19))
+	ITEM(Label, dv___6, SetLabel(t_("&Highlighting")).LeftPosZ(196, 63).TopPosZ(32, 19))
 	ITEM(DropList, highlight, LeftPosZ(264, 76).TopPosZ(32, 19))
-	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(204, 64).TopPosZ(60, 22))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(276, 64).TopPosZ(60, 22))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(6, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(6, 22))
 END_LAYOUT
 
-LAYOUT(CharsetLayout, 180, 60)
-	ITEM(DropList, charset, LeftPosZ(60, 112).TopPosZ(4, 19))
-	ITEM(Label, dv___1, SetLabel(t_("Encoding")).LeftPosZ(4, 52).TopPosZ(4, 19))
-	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(36, 64).TopPosZ(32, 22))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(108, 64).TopPosZ(32, 22))
+LAYOUT(CharsetLayout, 204, 64)
+	ITEM(DropList, charset, HSizePosZ(64, 8).TopPosZ(8, 19))
+	ITEM(Label, dv___1, SetLabel(t_("Encoding")).LeftPosZ(8, 52).TopPosZ(8, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(6, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(6, 22))
 END_LAYOUT
 
 LAYOUT(StatisticsLayout, 242, 94)
@@ -170,42 +170,42 @@ LAYOUT(StatisticsLayout, 242, 94)
 	ITEM(EditField, idle_time, LeftPosZ(88, 150).TopPosZ(70, 19))
 END_LAYOUT
 
-LAYOUT(BuildMethodsLayout, 724, 560)
+LAYOUT(BuildMethodsLayout, 732, 560)
 	ITEM(ArrayCtrl, method, AutoHideSb(true).LeftPosZ(4, 150).VSizePosZ(4, 180))
 	ITEM(Label, dv___1, SetLabel(t_("&Builder:")).LeftPosZ(164, 42).TopPosZ(4, 19))
 	ITEM(DropList, builder, LeftPosZ(208, 100).TopPosZ(4, 19))
 	ITEM(Label, dv___3, SetLabel(t_("&Compiler name:")).HSizePosZ(320, 324).TopPosZ(4, 19))
 	ITEM(EditString, compiler, RightPosZ(232, 88).TopPosZ(4, 19))
-	ITEM(LabelBox, dv___5, SetLabel(t_("Debug mode defaults")).HSizePosZ(164, 284).TopPosZ(32, 76))
+	ITEM(LabelBox, dv___5, SetLabel(t_("Debug mode defaults")).HSizePosZ(164, 292).TopPosZ(32, 76))
 	ITEM(Label, dv___6, SetLabel(t_("Default debug info level:")).LeftPosZ(172, 132).TopPosZ(48, 19))
 	ITEM(DropList, debug_info, HSizePosZ(308, 308).TopPosZ(48, 19))
-	UNTYPED(debug_blitz, SwitchImage(false).SetLabel(t_("Use BLIT&Z")).LeftPosZ(172, 240).TopPosZ(72, 15))
+	UNTYPED(debug_blitz, SwitchImage(false).SetLabel(t_("Use BLIT&Z")).HSizePosZ(172, 308).TopPosZ(72, 15))
 	UNTYPED(debug_linkmode, SetLabel(t_("All static\nShared libs\nAll shared")).HSizePosZ(172, 308).TopPosZ(88, 15))
 	ITEM(Label, dv___10, SetLabel(t_("&Debug options:")).LeftPosZ(164, 100).TopPosZ(112, 19))
-	ITEM(EditString, debug_options, HSizePosZ(264, 284).TopPosZ(112, 19))
+	ITEM(EditString, debug_options, HSizePosZ(264, 292).TopPosZ(112, 19))
 	ITEM(Label, dv___12, SetLabel(t_("Debug fixed flags:")).LeftPosZ(164, 100).TopPosZ(132, 19))
-	ITEM(EditString, debug_flags, HSizePosZ(264, 284).TopPosZ(132, 19))
+	ITEM(EditString, debug_flags, HSizePosZ(264, 292).TopPosZ(132, 19))
 	ITEM(Label, dv___14, SetLabel(t_("Debug link options:")).LeftPosZ(164, 100).TopPosZ(152, 19))
-	ITEM(EditString, debug_link, HSizePosZ(264, 284).TopPosZ(152, 19))
+	ITEM(EditString, debug_link, HSizePosZ(264, 292).TopPosZ(152, 19))
 	ITEM(Label, dv___16, SetLabel(t_("&External debugger:")).RightPosZ(116, 96).TopPosZ(4, 19))
 	ITEM(EditString, debugger, RightPosZ(4, 112).TopPosZ(4, 20))
-	ITEM(LabelBox, dv___18, SetLabel(t_("Release mode defaults")).RightPosZ(4, 272).TopPosZ(32, 56))
-	UNTYPED(release_blitz, SwitchImage(false).SetLabel(t_("&Use BLITZ")).RightPosZ(12, 256).TopPosZ(48, 15))
-	UNTYPED(release_linkmode, SetLabel(t_("All static\nShared libs\nAll shared")).RightPosZ(12, 256).TopPosZ(64, 15))
-	ITEM(Label, dv___21, SetLabel(t_("Optimize for speed:")).RightPosZ(176, 100).TopPosZ(92, 19))
+	ITEM(LabelBox, dv___18, SetLabel(t_("Release mode defaults")).RightPosZ(4, 280).TopPosZ(32, 56))
+	UNTYPED(release_blitz, SwitchImage(false).SetLabel(t_("&Use BLITZ")).RightPosZ(20, 256).TopPosZ(48, 15))
+	UNTYPED(release_linkmode, SetLabel(t_("All static\nShared libs\nAll shared")).RightPosZ(20, 256).TopPosZ(64, 15))
+	ITEM(Label, dv___21, SetLabel(t_("Optimize for speed:")).RightPosZ(176, 108).TopPosZ(92, 19))
 	ITEM(EditString, speed_options, RightPosZ(4, 172).TopPosZ(92, 19))
-	ITEM(Label, dv___23, SetLabel(t_("Optimize for size:")).RightPosZ(176, 100).TopPosZ(112, 19))
+	ITEM(Label, dv___23, SetLabel(t_("Optimize for size:")).RightPosZ(176, 108).TopPosZ(112, 19))
 	ITEM(EditString, size_options, RightPosZ(4, 172).TopPosZ(112, 19))
-	ITEM(Label, dv___25, SetLabel(t_("Release fixed flags:")).RightPosZ(176, 100).TopPosZ(132, 19))
+	ITEM(Label, dv___25, SetLabel(t_("Release fixed flags:")).RightPosZ(176, 108).TopPosZ(132, 19))
 	ITEM(EditString, release_flags, RightPosZ(4, 172).TopPosZ(132, 19))
-	ITEM(Label, dv___27, SetLabel(t_("Release link options:")).RightPosZ(176, 100).TopPosZ(152, 19))
+	ITEM(Label, dv___27, SetLabel(t_("Release link options:")).RightPosZ(176, 108).TopPosZ(152, 19))
 	ITEM(EditString, release_link, RightPosZ(4, 172).TopPosZ(152, 19))
 	ITEM(TabCtrl, paths, HSizePosZ(160, 4).VSizePosZ(180, 40))
 	ITEM(Button, setdefault, SetLabel(t_("&Set as default")).LeftPosZ(4, 152).BottomPosZ(40, 22))
-	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(6, 22))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(6, 22))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(72, 64).BottomPosZ(6, 22))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 64).BottomPosZ(6, 22))
 	ITEM(Option, use_target, SetLabel(t_("Store all target files\nin the same directory")).LeftPosZ(4, 148).BottomPosZ(74, 28))
-	ITEM(Label, dv___34, SetLabel(t_("Script file:")).LeftPosZ(4, 54).BottomPosZ(133, 19))
+	ITEM(Label, dv___34, SetLabel(t_("Script file:")).LeftPosZ(4, 68).BottomPosZ(133, 19))
 	ITEM(EditField, scriptfile, LeftPosZ(4, 152).BottomPosZ(113, 19))
 	UNTYPED(linkmode_lock, LeftPosZ(4, 148).TopPosZ(384, 20))
 END_LAYOUT
@@ -225,9 +225,9 @@ LAYOUT(ModePaneLayout, 288, 460)
 END_LAYOUT
 
 LAYOUT(LicenseLayout, 700, 536)
-	ITEM(Label, dv___0, SetLabel(t_("Please read the following license agreement")).HSizePosZ(8, 176).TopPosZ(8, 19))
+	ITEM(Label, dv___0, SetLabel(t_("Please read the following license agreement")).HSizePosZ(8, 8).TopPosZ(8, 19))
 	ITEM(RichTextView, license, HSizePosZ(8, 8).VSizePosZ(31, 68))
-	ITEM(Label, dv___2, SetLabel(t_("Do you accept all the terms of the preceding license agreement?")).HSizePosZ(8, 164).BottomPosZ(36, 28))
+	ITEM(Label, dv___2, SetLabel(t_("Do you accept all the terms of the preceding license agreement?")).HSizePosZ(8, 8).BottomPosZ(36, 28))
 	ITEM(Button, cancel, SetLabel(t_("No")).LeftPosZ(8, 64).BottomPosZ(8, 24))
 	ITEM(Button, ok, SetLabel(t_("Yes")).RightPosZ(8, 64).BottomPosZ(8, 24))
 END_LAYOUT
@@ -236,7 +236,7 @@ LAYOUT(OutputModeLayout, 616, 480)
 	ITEM(Label, dv___0, SetLabel(t_("&Build method:")).LeftPosZ(10, 70).TopPosZ(4, 19))
 	ITEM(DropList, method, LeftPosZ(82, 184).TopPosZ(4, 19))
 	ITEM(Switch, mode, SetLabel(t_("Debug         \nOptimal\nOptimize speed\nOptimize size")).LeftPosZ(244, 356).TopPosZ(32, 18))
-	ITEM(LabelBox, dv___3, LeftPosZ(304, 4).TopPosZ(28, 356))
+	ITEM(LabelBox, dv___3, LeftPosZ(304, 4).TopPosZ(28, 360))
 	UNTYPED(debug, LeftPosZ(8, 288).TopPosZ(56, 332))
 	ITEM(LabelBox, dv___5, SetLabel(t_("Release")).LeftPosZ(320, 288).TopPosZ(16, 36))
 	UNTYPED(release, LeftPosZ(320, 288).TopPosZ(56, 332))
@@ -251,7 +251,7 @@ LAYOUT(OutputModeLayout, 616, 480)
 END_LAYOUT
 
 LAYOUT(InstallLayout, 400, 88)
-	ITEM(Label, dv___0, SetLabel(t_("MyApps directory")).LeftPosZ(8, 84).TopPosZ(8, 19))
+	ITEM(Label, dv___0, SetLabel(t_("MyApps directory")).LeftPosZ(8, 120).TopPosZ(8, 19))
 	ITEM(WithDropChoice<EditString>, myapps, LeftPosZ(8, 316).TopPosZ(28, 19))
 	ITEM(Button, browse, SetLabel(t_("Browse..")).LeftPosZ(328, 64).TopPosZ(28, 20))
 	ITEM(Option, icon, SetLabel(t_("Create desktop icon")).LeftPosZ(8, 184).TopPosZ(56, 20))
@@ -356,43 +356,43 @@ LAYOUT(AutoSetupOther, 276, 84)
 	ITEM(EditString, mysql, HSizePosZ(0, 0).TopPosZ(64, 19))
 END_LAYOUT
 
-LAYOUT(LangLayout, 716, 480)
+LAYOUT(LangLayout, 720, 480)
 	ITEM(ArrayCtrl, file, LeftPosZ(8, 192).VSizePosZ(4, 40))
 	ITEM(ArrayCtrl, lang, LeftPosZ(204, 80).VSizePosZ(4, 40))
-	ITEM(ArrayCtrl, text, HSizePosZ(288, 172).VSizePosZ(4, 40))
-	ITEM(ArrayCtrl, source, RightPosZ(4, 164).VSizePosZ(4, 40))
+	ITEM(ArrayCtrl, text, HSizePosZ(288, 176).VSizePosZ(4, 40))
+	ITEM(ArrayCtrl, source, RightPosZ(8, 164).VSizePosZ(4, 40))
 	ITEM(Option, remove, SetLabel(t_("Remove obsolete items")).LeftPosZ(8, 184).BottomPosZ(13, 15))
 	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24))
 	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24))
 END_LAYOUT
 
-LAYOUT(ExportTrLayout, 328, 92)
-	ITEM(Label, dv___0, SetLabel(t_("Language")).LeftPosZ(4, 52).TopPosZ(8, 19))
-	ITEM(LNGCtrl, lang, LeftPosZ(56, 104).TopPosZ(8, 20))
-	ITEM(Label, dv___2, SetLabel(t_("&Encoding")).LeftPosZ(164, 49).TopPosZ(8, 20))
-	ITEM(DropList, charset, LeftPosZ(212, 108).TopPosZ(8, 19))
-	ITEM(Label, dv___4, SetLabel(t_("Directory")).LeftPosZ(4, 52).TopPosZ(32, 19))
-	ITEM(EditString, folder, LeftPosZ(56, 264).TopPosZ(32, 19))
-	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(188, 64).TopPosZ(60, 24))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(256, 64).TopPosZ(60, 24))
+LAYOUT(ExportTrLayout, 336, 92)
+	ITEM(Label, dv___0, SetLabel(t_("Language")).LeftPosZ(4, 56).TopPosZ(8, 19))
+	ITEM(LNGCtrl, lang, LeftPosZ(60, 100).TopPosZ(8, 20))
+	ITEM(Label, dv___2, SetLabel(t_("&Encoding")).LeftPosZ(164, 52).TopPosZ(8, 20))
+	ITEM(DropList, charset, HSizePosZ(216, 8).TopPosZ(8, 19))
+	ITEM(Label, dv___4, SetLabel(t_("Directory")).LeftPosZ(4, 56).TopPosZ(32, 19))
+	ITEM(EditString, folder, HSizePosZ(60, 8).TopPosZ(32, 19))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24))
 END_LAYOUT
 
 LAYOUT(AddLangLayout, 148, 68)
-	ITEM(LNGCtrl, lang, LeftPosZ(8, 128).TopPosZ(8, 20))
+	ITEM(LNGCtrl, lang, LeftPosZ(8, 132).TopPosZ(8, 20))
 	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(8, 64).TopPosZ(36, 24))
 	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(76, 64).TopPosZ(36, 24))
 END_LAYOUT
 
-LAYOUT(XInstallLayout, 336, 176)
-	ITEM(Option, uppsrc, SetLabel(t_("Create user copy of uppsrc package (Ultimate++)")).LeftPosZ(8, 320).TopPosZ(8, 17))
-	ITEM(Option, reference, SetLabel(t_("Create user copy of reference package (reference examples)")).LeftPosZ(8, 320).TopPosZ(28, 17))
-	ITEM(Option, tutorial, SetLabel(t_("Create user copy of tutorials package")).LeftPosZ(8, 320).TopPosZ(68, 17))
-	ITEM(Option, examples, SetLabel(t_("Create user copy of examples package")).LeftPosZ(8, 320).TopPosZ(48, 17))
-	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(196, 64).TopPosZ(144, 24))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(264, 64).TopPosZ(144, 24))
-	ITEM(EditField, path, LeftPosZ(84, 244).TopPosZ(116, 17))
-	ITEM(Label, out, SetLabel(t_("Output Folder:")).LeftPosZ(4, 76).TopPosZ(116, 17))
-	ITEM(Option, bazaar, SetLabel(t_("Create user copy of bazaar package")).LeftPosZ(8, 320).TopPosZ(88, 16))
+LAYOUT(XInstallLayout, 348, 176)
+	ITEM(Option, uppsrc, SetLabel(t_("Create user copy of uppsrc package (Ultimate++)")).HSizePosZ(8, 8).TopPosZ(8, 17))
+	ITEM(Option, reference, SetLabel(t_("Create user copy of reference package (reference examples)")).HSizePosZ(8, 8).TopPosZ(28, 17))
+	ITEM(Option, tutorial, SetLabel(t_("Create user copy of tutorials package")).HSizePosZ(8, 8).TopPosZ(68, 17))
+	ITEM(Option, examples, SetLabel(t_("Create user copy of examples package")).HSizePosZ(8, 8).TopPosZ(48, 17))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24))
+	ITEM(EditField, path, HSizePosZ(92, 8).TopPosZ(116, 17))
+	ITEM(Label, out, SetLabel(t_("Output Folder:")).LeftPosZ(8, 80).TopPosZ(116, 17))
+	ITEM(Option, bazaar, SetLabel(t_("Create user copy of bazaar package")).HSizePosZ(8, 8).TopPosZ(88, 16))
 END_LAYOUT
 
 LAYOUT(StatLayout, 732, 552)
@@ -402,96 +402,96 @@ END_LAYOUT
 
 LAYOUT(SetupFontLayout, 528, 148)
 	ITEM(Label, dv___0, SetLabel(t_("Normal")).LeftPosZ(4, 48).TopPosZ(4, 19))
-	ITEM(DropList, face, LeftPosZ(52, 208).TopPosZ(4, 19))
-	ITEM(DropList, height, LeftPosZ(268, 50).TopPosZ(4, 19))
-	ITEM(Option, bold, SetLabel(t_("Bold")).LeftPosZ(322, 44).TopPosZ(4, 18))
-	ITEM(Option, italic, SetLabel(t_("Italic")).LeftPosZ(370, 44).TopPosZ(4, 18))
-	ITEM(Option, naa, SetLabel(t_("NonAntiAliased")).LeftPosZ(420, 100).TopPosZ(4, 18))
+	ITEM(DropList, face, HSizePosZ(52, 268).TopPosZ(4, 19))
+	ITEM(DropList, height, RightPosZ(210, 50).TopPosZ(4, 19))
+	ITEM(Option, bold, SetLabel(t_("Bold")).RightPosZ(162, 44).TopPosZ(4, 18))
+	ITEM(Option, italic, SetLabel(t_("Italic")).RightPosZ(114, 44).TopPosZ(4, 18))
+	ITEM(Option, naa, SetLabel(t_("NonAntiAliased")).RightPosZ(8, 100).TopPosZ(4, 18))
 	ITEM(Label, dv___6, SetLabel(t_("V. split")).LeftPosZ(4, 48).TopPosZ(28, 19))
-	ITEM(DropList, vface, LeftPosZ(52, 208).TopPosZ(28, 19))
-	ITEM(DropList, vheight, LeftPosZ(268, 50).TopPosZ(28, 19))
-	ITEM(Option, vbold, SetLabel(t_("Bold")).LeftPosZ(322, 44).TopPosZ(28, 18))
-	ITEM(Option, vitalic, SetLabel(t_("Italic")).LeftPosZ(370, 44).TopPosZ(28, 18))
-	ITEM(Option, vnaa, SetLabel(t_("NonAntiAliased")).LeftPosZ(420, 100).TopPosZ(28, 18))
+	ITEM(DropList, vface, HSizePosZ(52, 268).TopPosZ(28, 19))
+	ITEM(DropList, vheight, RightPosZ(210, 50).TopPosZ(28, 19))
+	ITEM(Option, vbold, SetLabel(t_("Bold")).RightPosZ(162, 44).TopPosZ(28, 18))
+	ITEM(Option, vitalic, SetLabel(t_("Italic")).RightPosZ(114, 44).TopPosZ(28, 18))
+	ITEM(Option, vnaa, SetLabel(t_("NonAntiAliased")).RightPosZ(8, 100).TopPosZ(28, 18))
 	ITEM(Label, dv___12, SetLabel(t_("Small")).LeftPosZ(4, 52).TopPosZ(52, 19))
-	ITEM(DropList, face1, LeftPosZ(52, 208).TopPosZ(52, 19))
-	ITEM(DropList, height1, LeftPosZ(268, 50).TopPosZ(52, 19))
-	ITEM(Option, bold1, SetLabel(t_("Bold")).LeftPosZ(322, 44).TopPosZ(52, 18))
-	ITEM(Option, italic1, SetLabel(t_("Italic")).LeftPosZ(370, 44).TopPosZ(52, 18))
-	ITEM(Option, naa1, SetLabel(t_("NonAntiAliased")).LeftPosZ(420, 100).TopPosZ(52, 18))
+	ITEM(DropList, face1, HSizePosZ(52, 268).TopPosZ(52, 19))
+	ITEM(DropList, height1, RightPosZ(210, 50).TopPosZ(52, 19))
+	ITEM(Option, bold1, SetLabel(t_("Bold")).RightPosZ(162, 44).TopPosZ(52, 18))
+	ITEM(Option, italic1, SetLabel(t_("Italic")).RightPosZ(114, 44).TopPosZ(52, 18))
+	ITEM(Option, naa1, SetLabel(t_("NonAntiAliased")).RightPosZ(8, 100).TopPosZ(52, 18))
 	ITEM(Label, dv___18, SetLabel(t_("Special")).LeftPosZ(4, 48).TopPosZ(76, 19))
-	ITEM(DropList, face2, LeftPosZ(52, 208).TopPosZ(76, 19))
-	ITEM(DropList, height2, LeftPosZ(268, 50).TopPosZ(76, 19))
-	ITEM(Option, bold2, SetLabel(t_("Bold")).LeftPosZ(322, 44).TopPosZ(76, 18))
-	ITEM(Option, italic2, SetLabel(t_("Italic")).LeftPosZ(370, 44).TopPosZ(76, 18))
-	ITEM(Option, naa2, SetLabel(t_("NonAntiAliased")).LeftPosZ(420, 100).TopPosZ(76, 18))
+	ITEM(DropList, face2, HSizePosZ(52, 268).TopPosZ(76, 19))
+	ITEM(DropList, height2, RightPosZ(210, 50).TopPosZ(76, 19))
+	ITEM(Option, bold2, SetLabel(t_("Bold")).RightPosZ(162, 44).TopPosZ(76, 18))
+	ITEM(Option, italic2, SetLabel(t_("Italic")).RightPosZ(114, 44).TopPosZ(76, 18))
+	ITEM(Option, naa2, SetLabel(t_("NonAntiAliased")).RightPosZ(8, 100).TopPosZ(76, 18))
 	ITEM(Label, dv___24, SetLabel(t_("Console")).LeftPosZ(4, 48).TopPosZ(100, 19))
-	ITEM(DropList, cface, LeftPosZ(52, 208).TopPosZ(100, 19))
-	ITEM(DropList, cheight, LeftPosZ(268, 50).TopPosZ(100, 19))
-	ITEM(Option, cbold, SetLabel(t_("Bold")).LeftPosZ(322, 44).TopPosZ(100, 18))
-	ITEM(Option, citalic, SetLabel(t_("Italic")).LeftPosZ(370, 44).TopPosZ(100, 18))
-	ITEM(Option, cnaa, SetLabel(t_("NonAntiAliased")).LeftPosZ(420, 100).TopPosZ(100, 18))
+	ITEM(DropList, cface, HSizePosZ(52, 268).TopPosZ(100, 19))
+	ITEM(DropList, cheight, RightPosZ(210, 50).TopPosZ(100, 19))
+	ITEM(Option, cbold, SetLabel(t_("Bold")).RightPosZ(162, 44).TopPosZ(100, 18))
+	ITEM(Option, citalic, SetLabel(t_("Italic")).RightPosZ(114, 44).TopPosZ(100, 18))
+	ITEM(Option, cnaa, SetLabel(t_("NonAntiAliased")).RightPosZ(8, 100).TopPosZ(100, 18))
 	ITEM(Label, dv___30, SetLabel(t_(".t file")).LeftPosZ(4, 48).TopPosZ(124, 19))
-	ITEM(DropList, tface, LeftPosZ(52, 208).TopPosZ(124, 19))
-	ITEM(DropList, theight, LeftPosZ(268, 50).TopPosZ(124, 19))
-	ITEM(Option, tbold, SetLabel(t_("Bold")).LeftPosZ(322, 44).TopPosZ(124, 18))
-	ITEM(Option, titalic, SetLabel(t_("Italic")).LeftPosZ(370, 44).TopPosZ(124, 18))
-	ITEM(Option, tnaa, SetLabel(t_("NonAntiAliased")).LeftPosZ(420, 100).TopPosZ(124, 18))
+	ITEM(DropList, tface, HSizePosZ(52, 268).TopPosZ(124, 19))
+	ITEM(DropList, theight, RightPosZ(210, 50).TopPosZ(124, 19))
+	ITEM(Option, tbold, SetLabel(t_("Bold")).RightPosZ(162, 44).TopPosZ(124, 18))
+	ITEM(Option, titalic, SetLabel(t_("Italic")).RightPosZ(114, 44).TopPosZ(124, 18))
+	ITEM(Option, tnaa, SetLabel(t_("NonAntiAliased")).RightPosZ(8, 100).TopPosZ(124, 18))
 END_LAYOUT
 
-LAYOUT(SetupHlLayout, 544, 272)
-	ITEM(ArrayCtrl, hlstyle, LeftPosZ(4, 368).TopPosZ(4, 264))
-	ITEM(Label, dv___1, SetLabel(t_("Scope highlighting")).LeftPosZ(380, 98).TopPosZ(4, 16))
-	ITEM(Switch, hilite_scope, SetLabel(t_("None\n2 colors\n5 colors")).LeftPosZ(380, 64).TopPosZ(20, 50))
-	ITEM(Label, dv___3, SetLabel(t_("Matching bracket highlighting")).LeftPosZ(380, 156).TopPosZ(76, 16))
-	ITEM(Switch, hilite_bracket, SetLabel(t_("None\nNormal\nFlashing")).LeftPosZ(380, 64).TopPosZ(92, 50))
-	ITEM(Label, dv___5, SetLabel(t_("#else/#elif/#endif info")).LeftPosZ(380, 148).TopPosZ(148, 16))
-	ITEM(Switch, hilite_ifdef, SetLabel(t_("None\nNormal\nWith line number")).LeftPosZ(380, 148).TopPosZ(164, 50))
-	ITEM(Option, hilite_if_endif, SetLabel(t_("#if/#endif tracing")).LeftPosZ(380, 128).TopPosZ(216, 18))
-	ITEM(Option, thousands_separator, SetLabel(t_("Thousands separator")).LeftPosZ(380, 128).TopPosZ(232, 18))
-	ITEM(Button, hl_restore, SetLabel(t_("Restore default colors")).LeftPosZ(380, 156).TopPosZ(252, 16))
+LAYOUT(SetupHlLayout, 544, 288)
+	ITEM(ArrayCtrl, hlstyle, LeftPosZ(4, 368).TopPosZ(4, 280))
+	ITEM(Label, dv___1, SetLabel(t_("Scope highlighting")).LeftPosZ(380, 160).TopPosZ(4, 16))
+	ITEM(Switch, hilite_scope, SetLabel(t_("None\n2 colors\n5 colors")).LeftPosZ(380, 160).TopPosZ(20, 50))
+	ITEM(Label, dv___3, SetLabel(t_("Matching bracket highlighting")).LeftPosZ(380, 160).TopPosZ(76, 16))
+	ITEM(Switch, hilite_bracket, SetLabel(t_("None\nNormal\nFlashing")).LeftPosZ(380, 160).TopPosZ(92, 50))
+	ITEM(Label, dv___5, SetLabel(t_("#else/#elif/#endif info")).LeftPosZ(380, 160).TopPosZ(148, 16))
+	ITEM(Switch, hilite_ifdef, SetLabel(t_("None\nNormal\nWith line number")).LeftPosZ(380, 160).TopPosZ(164, 50))
+	ITEM(Option, hilite_if_endif, SetLabel(t_("#if/#endif tracing")).LeftPosZ(380, 160).TopPosZ(216, 18))
+	ITEM(Option, thousands_separator, SetLabel(t_("Thousands separator")).LeftPosZ(380, 160).TopPosZ(236, 18))
+	ITEM(Button, hl_restore, SetLabel(t_("Restore default colors")).LeftPosZ(380, 160).TopPosZ(268, 16))
 END_LAYOUT
 
-LAYOUT(SetupEditorLayout, 488, 280)
-	ITEM(Label, dv___0, SetLabel(t_("Tab size")).LeftPosZ(4, 44).TopPosZ(4, 19))
-	ITEM(EditIntSpin, tabsize, LeftPosZ(104, 52).TopPosZ(4, 19))
-	ITEM(Label, dv___2, SetLabel(t_("Indent")).LeftPosZ(4, 36).TopPosZ(28, 19))
-	ITEM(EditIntSpin, indent_amount, LeftPosZ(104, 52).TopPosZ(28, 19))
-	ITEM(Label, dv___4, SetLabel(t_("Paint line at column")).HSizePosZ(4, 388).TopPosZ(52, 19))
-	ITEM(EditIntSpin, bordercolumn, Min(0).LeftPosZ(104, 52).TopPosZ(52, 19))
-	ITEM(ColorPusher, bordercolor, LeftPosZ(160, 48).TopPosZ(52, 20))
-	ITEM(Label, dv___7, SetLabel(t_("Default charset")).LeftPosZ(4, 76).TopPosZ(76, 19))
-	ITEM(DropList, charset, LeftPosZ(104, 104).TopPosZ(76, 19))
-	ITEM(Label, dv___9, SetLabel(t_("Line endings")).LeftPosZ(4, 76).TopPosZ(100, 19))
-	ITEM(DropList, lineends, LeftPosZ(104, 156).TopPosZ(100, 19))
-	ITEM(Option, showtabs, SetLabel(t_("Show tabs and line endings")).LeftPosZ(4, 176).TopPosZ(124, 16))
-	ITEM(Option, indent_spaces, SetLabel(t_("Indent using spaces")).LeftPosZ(4, 176).TopPosZ(140, 16))
-	ITEM(Option, no_parenthesis_indent, SetLabel(t_("No indent after parenthesis")).LeftPosZ(4, 176).TopPosZ(156, 16))
-	ITEM(Option, numbers, SetLabel(t_("Show line numbers")).LeftPosZ(4, 176).TopPosZ(172, 16))
-	ITEM(Option, bookmark_pos, SetLabel(t_("Bookmarks restore position")).LeftPosZ(4, 176).TopPosZ(188, 16))
-	ITEM(Option, findpicksel, SetLabel(t_("Find picks selection")).LeftPosZ(4, 176).TopPosZ(204, 16))
-	ITEM(Option, findpicktext, SetLabel(t_("Find picks selection or text")).LeftPosZ(4, 176).TopPosZ(220, 16))
-	ITEM(Option, deactivate_save, SetLabel(t_("Save file on TheIde window deactivation")).LeftPosZ(4, 224).TopPosZ(236, 16))
-	ITEM(Option, persistent_find_replace, SetLabel(t_("Do not close Find/Replace dialog automatically")).LeftPosZ(4, 268).TopPosZ(252, 16))
-	ITEM(Label, dv___20, SetLabel(t_("File Tabs")).LeftPosZ(272, 64).TopPosZ(4, 19))
-	ITEM(DropList, filetabs, LeftPosZ(340, 64).TopPosZ(4, 19))
-	ITEM(Label, dv___22, SetLabel(t_("Crosses")).LeftPosZ(272, 64).TopPosZ(28, 19))
-	ITEM(DropList, tabs_crosses, LeftPosZ(340, 64).TopPosZ(28, 19))
-	ITEM(Option, tabs_icons, SetLabel(t_("Icons")).LeftPosZ(272, 64).TopPosZ(48, 16))
-	ITEM(Option, tabs_grouping, SetLabel(t_("Grouping")).LeftPosZ(272, 64).TopPosZ(68, 16))
-	ITEM(Option, tabs_stacking, SetLabel(t_("Stacking")).LeftPosZ(272, 64).TopPosZ(88, 16))
-	ITEM(Option, tabs_serialize, SetLabel(t_("Persistent tabs")).LeftPosZ(272, 108).TopPosZ(108, 16))
+LAYOUT(SetupEditorLayout, 544, 276)
+	ITEM(Label, dv___0, SetLabel(t_("Tab size")).LeftPosZ(4, 108).TopPosZ(4, 19))
+	ITEM(EditIntSpin, tabsize, LeftPosZ(116, 52).TopPosZ(4, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Indent")).LeftPosZ(4, 108).TopPosZ(28, 19))
+	ITEM(EditIntSpin, indent_amount, LeftPosZ(116, 52).TopPosZ(28, 19))
+	ITEM(Label, dv___4, SetLabel(t_("Paint line at column")).HSizePosZ(4, 432).TopPosZ(52, 19))
+	ITEM(EditIntSpin, bordercolumn, Min(0).LeftPosZ(116, 52).TopPosZ(52, 19))
+	ITEM(ColorPusher, bordercolor, LeftPosZ(172, 48).TopPosZ(52, 20))
+	ITEM(Label, dv___7, SetLabel(t_("Default charset")).LeftPosZ(4, 108).TopPosZ(76, 19))
+	ITEM(DropList, charset, LeftPosZ(116, 104).TopPosZ(76, 19))
+	ITEM(Label, dv___9, SetLabel(t_("Line endings")).LeftPosZ(4, 108).TopPosZ(100, 19))
+	ITEM(DropList, lineends, LeftPosZ(116, 160).TopPosZ(100, 19))
+	ITEM(Option, showtabs, SetLabel(t_("Show tabs and line endings")).LeftPosZ(4, 272).TopPosZ(124, 16))
+	ITEM(Option, indent_spaces, SetLabel(t_("Indent using spaces")).HSizePosZ(4, 268).TopPosZ(140, 16))
+	ITEM(Option, no_parenthesis_indent, SetLabel(t_("No indent after parenthesis")).LeftPosZ(4, 272).TopPosZ(156, 16))
+	ITEM(Option, numbers, SetLabel(t_("Show line numbers")).LeftPosZ(4, 272).TopPosZ(172, 16))
+	ITEM(Option, bookmark_pos, SetLabel(t_("Bookmarks restore position")).LeftPosZ(4, 272).TopPosZ(188, 16))
+	ITEM(Option, findpicksel, SetLabel(t_("Find picks selection")).LeftPosZ(4, 272).TopPosZ(204, 16))
+	ITEM(Option, findpicktext, SetLabel(t_("Find picks selection or text")).LeftPosZ(4, 272).TopPosZ(220, 16))
+	ITEM(Option, deactivate_save, SetLabel(t_("Save file on TheIde window deactivation")).LeftPosZ(4, 272).TopPosZ(236, 16))
+	ITEM(Option, persistent_find_replace, SetLabel(t_("Do not close Find/Replace dialog automatically")).LeftPosZ(4, 272).TopPosZ(252, 16))
+	ITEM(Label, dv___20, SetLabel(t_("File Tabs")).LeftPosZ(304, 64).TopPosZ(4, 19))
+	ITEM(DropList, filetabs, LeftPosZ(372, 64).TopPosZ(4, 19))
+	ITEM(Label, dv___22, SetLabel(t_("Crosses")).LeftPosZ(304, 64).TopPosZ(28, 19))
+	ITEM(DropList, tabs_crosses, LeftPosZ(372, 64).TopPosZ(28, 19))
+	ITEM(Option, tabs_icons, SetLabel(t_("Icons")).LeftPosZ(304, 132).TopPosZ(52, 16))
+	ITEM(Option, tabs_grouping, SetLabel(t_("Grouping")).LeftPosZ(304, 132).TopPosZ(72, 16))
+	ITEM(Option, tabs_stacking, SetLabel(t_("Stacking")).LeftPosZ(304, 132).TopPosZ(92, 16))
+	ITEM(Option, tabs_serialize, SetLabel(t_("Persistent tabs")).LeftPosZ(304, 132).TopPosZ(112, 16))
 END_LAYOUT
 
-LAYOUT(SetupAssistLayout, 520, 124)
-	ITEM(Option, assist, SetLabel(t_("Automatic assist")).HSizePosZ(4, 280).TopPosZ(4, 16))
-	ITEM(Option, commentdp, SetLabel(t_("Comment out default parameters")).Tip(t_("Comment out default parameters when converting declaration to definition instead of removing them")).LeftPosZ(4, 236).TopPosZ(24, 16))
-	ITEM(Option, auto_enclose, SetLabel(t_("[ { ( \" / * enclose selection")).LeftPosZ(4, 236).TopPosZ(44, 16))
-	ITEM(Option, mark_lines, SetLabel(t_("Mark lines with errors, warning and changes")).LeftPosZ(4, 236).TopPosZ(64, 16))
-	ITEM(Option, barline, SetLabel(t_("Highlight line in the left bar")).LeftPosZ(4, 236).TopPosZ(84, 16))
-	ITEM(Option, qtfsel, SetLabel(t_("QTF designer edits selection")).LeftPosZ(4, 236).TopPosZ(104, 16))
-	ITEM(Option, header_guards, SetLabel(t_("Insert guards to new headers")).LeftPosZ(272, 164).TopPosZ(4, 16))
-	ITEM(Switch, insert_include, SetLabel(t_("No #include in new sources\n#include first\n#include previous")).LeftPosZ(272, 156).TopPosZ(24, 52))
+LAYOUT(SetupAssistLayout, 532, 136)
+	ITEM(Option, assist, SetLabel(t_("Automatic assist")).LeftPosZ(4, 252).TopPosZ(4, 16))
+	ITEM(Option, commentdp, SetLabel(t_("Comment out default parameters")).Tip(t_("Comment out default parameters when converting declaration to definition instead of removing them")).LeftPosZ(4, 252).TopPosZ(24, 16))
+	ITEM(Option, auto_enclose, SetLabel(t_("[ { ( \" / * enclose selection")).LeftPosZ(4, 252).TopPosZ(44, 16))
+	ITEM(Option, mark_lines, SetLabel(t_("Mark lines with errors, warning and changes")).LeftPosZ(4, 252).TopPosZ(64, 16))
+	ITEM(Option, barline, SetLabel(t_("Highlight line in the left bar")).LeftPosZ(4, 252).TopPosZ(84, 16))
+	ITEM(Option, qtfsel, SetLabel(t_("QTF designer edits selection")).LeftPosZ(4, 252).TopPosZ(104, 16))
+	ITEM(Option, header_guards, SetLabel(t_("Insert guards to new headers")).LeftPosZ(272, 252).TopPosZ(4, 16))
+	ITEM(Switch, insert_include, SetLabel(t_("No #include in new sources\n#include first\n#include previous")).LeftPosZ(272, 252).TopPosZ(24, 52))
 END_LAYOUT
 
 LAYOUT(SetupIdeLayout, 512, 264)
@@ -501,29 +501,29 @@ LAYOUT(SetupIdeLayout, 512, 264)
 	ITEM(Option, toolbar_in_row, SetLabel(t_("Menu and toolbar in a row")).LeftPosZ(4, 160).TopPosZ(64, 16))
 	ITEM(Option, splash_screen, SetLabel(t_("Show splash screen")).LeftPosZ(4, 160).TopPosZ(84, 16))
 	ITEM(Option, sort, SetLabel(t_("Sort packages by names")).LeftPosZ(4, 160).TopPosZ(104, 16))
-	ITEM(Option, showtime, SetLabel(t_("Underline recently changed files after")).LeftPosZ(4, 200).TopPosZ(124, 16))
-	ITEM(DropDate, showtimeafter, LeftPosZ(208, 128).TopPosZ(123, 19))
-	ITEM(Label, dv___8, SetLabel(t_("GUI theme")).LeftPosZ(4, 92).TopPosZ(148, 19))
-	ITEM(DropList, chstyle, LeftPosZ(108, 228).TopPosZ(148, 19))
-	ITEM(Label, console_txt, SetLabel(t_("Use console in Linux")).LeftPosZ(4, 104).TopPosZ(172, 19))
-	ITEM(EditString, console, LeftPosZ(108, 228).TopPosZ(172, 19))
-	ITEM(Button, xterm, SetLabel(t_("xterm")).LeftPosZ(108, 52).TopPosZ(196, 20))
-	ITEM(Button, gnome, SetLabel(t_("Gnome")).LeftPosZ(164, 52).TopPosZ(196, 20))
-	ITEM(Button, kde, SetLabel(t_("KDE")).LeftPosZ(220, 52).TopPosZ(196, 20))
-	ITEM(Button, mate, SetLabel(t_("Mate")).LeftPosZ(276, 52).TopPosZ(196, 20))
+	ITEM(Option, showtime, SetLabel(t_("Underline recently changed files after")).LeftPosZ(4, 212).TopPosZ(124, 16))
+	ITEM(DropDate, showtimeafter, LeftPosZ(220, 136).TopPosZ(123, 19))
+	ITEM(Label, dv___8, SetLabel(t_("GUI theme")).LeftPosZ(4, 112).TopPosZ(148, 19))
+	ITEM(DropList, chstyle, LeftPosZ(120, 236).TopPosZ(148, 19))
+	ITEM(Label, console_txt, SetLabel(t_("Use console in Linux")).LeftPosZ(4, 112).TopPosZ(172, 19))
+	ITEM(EditString, console, LeftPosZ(120, 236).TopPosZ(172, 19))
+	ITEM(Button, xterm, SetLabel(t_("xterm")).LeftPosZ(120, 56).TopPosZ(196, 20))
+	ITEM(Button, gnome, SetLabel(t_("Gnome")).LeftPosZ(180, 56).TopPosZ(196, 20))
+	ITEM(Button, kde, SetLabel(t_("KDE")).LeftPosZ(240, 56).TopPosZ(196, 20))
+	ITEM(Button, mate, SetLabel(t_("Mate")).LeftPosZ(300, 56).TopPosZ(196, 20))
 	ITEM(Label, dv___16, SetLabel(t_("HYDRA threads:")).LeftPosZ(376, 80).TopPosZ(4, 19))
 	ITEM(EditIntSpin, hydra1_threads, Max(64).Min(1).LeftPosZ(460, 48).TopPosZ(4, 19))
-	ITEM(Option, output_per_assembly, SetLabel(t_("Use unique output directory per assembly (append assembly name to output director)")).LeftPosZ(4, 492).TopPosZ(224, 16))
-	ITEM(Switch, gdbSelector, SetLabel(t_("Legacy\nGDB_MI2 (new)")).LeftPosZ(184, 180).TopPosZ(24, 40))
+	ITEM(Option, output_per_assembly, SetLabel(t_("Use unique output directory per assembly (append assembly name to output director)")).HSizePosZ(4, 4).TopPosZ(224, 16))
+	ITEM(Switch, gdbSelector, SetLabel(t_("Legacy\nGDB_MI2 (new)")).LeftPosZ(184, 172).TopPosZ(24, 40))
 	ITEM(LabelBox, dv___20, SetLabel(t_("GDB Debugger interface")).LeftPosZ(176, 188).TopPosZ(4, 64))
 END_LAYOUT
 
-LAYOUT(SetupAstyleLayout, 544, 280)
+LAYOUT(SetupAstyleLayout, 544, 288)
 	ITEM(LabelBox, dv___0, SetLabel(t_("Indents")).LeftPosZ(4, 180).TopPosZ(4, 140))
 	ITEM(Option, BracketIndent, SetLabel(t_("Brackets")).LeftPosZ(12, 64).TopPosZ(20, 16))
-	ITEM(Option, NamespaceIndent, SetLabel(t_("Namespaces")).HSizePosZ(84, 368).TopPosZ(20, 16))
+	ITEM(Option, NamespaceIndent, SetLabel(t_("Namespaces")).LeftPosZ(84, 92).TopPosZ(20, 16))
 	ITEM(Option, BlockIndent, SetLabel(t_("Blocks")).LeftPosZ(12, 64).TopPosZ(40, 16))
-	ITEM(Option, CaseIndent, SetLabel(t_("Case")).LeftPosZ(84, 92).VSizePosZ(40, 224))
+	ITEM(Option, CaseIndent, SetLabel(t_("Case")).LeftPosZ(84, 92).TopPosZ(40, 16))
 	ITEM(Option, ClassIndent, SetLabel(t_("Class")).LeftPosZ(12, 64).TopPosZ(60, 16))
 	ITEM(Option, LabelIndent, SetLabel(t_("Labels")).LeftPosZ(84, 92).TopPosZ(60, 16))
 	ITEM(Option, SwitchIndent, SetLabel(t_("Switch")).LeftPosZ(12, 64).TopPosZ(80, 16))
@@ -540,32 +540,32 @@ LAYOUT(SetupAstyleLayout, 544, 280)
 	ITEM(Option, SingleStatementsMode, SetLabel(t_("Multiple statements")).LeftPosZ(196, 136).TopPosZ(80, 18))
 	ITEM(Option, BreakBlocksMode, SetLabel(t_("Unrelated blocks")).LeftPosZ(196, 136).TopPosZ(100, 18))
 	ITEM(Option, BreakClosingHeaderBlocksMode, SetLabel(t_("Closing header blocks")).LeftPosZ(196, 136).TopPosZ(120, 18))
-	ITEM(Label, dv___21, SetLabel(t_("Bracket format")).LeftPosZ(12, 112).TopPosZ(148, 19))
-	ITEM(DropList, BracketFormatMode, LeftPosZ(128, 212).TopPosZ(148, 19))
-	ITEM(Label, dv___23, SetLabel(t_("Parenthesis padding")).LeftPosZ(12, 108).TopPosZ(172, 19))
-	ITEM(DropList, ParensPaddingMode, LeftPosZ(128, 212).TopPosZ(172, 19))
-	ITEM(Option, ParensUnPaddingMode, SetLabel(t_("Remove spaces around parenthesis")).LeftPosZ(12, 196).TopPosZ(196, 18))
-	ITEM(Option, OperatorPaddingMode, SetLabel(t_("Pad operators with spaces")).LeftPosZ(12, 144).TopPosZ(216, 18))
-	ITEM(Option, EmptyLineFill, SetLabel(t_("Fill empty lines")).LeftPosZ(12, 108).TopPosZ(236, 16))
-	ITEM(Option, TabSpaceConversionMode, SetLabel(t_("Convert tabs to spaces")).HSizePosZ(12, 400).TopPosZ(256, 18))
-	ITEM(Button, Test, SetLabel(t_("Test")).LeftPosZ(284, 56).TopPosZ(252, 23))
-	ITEM(LabelBox, dv___30, SetLabel(t_("Test box")).LeftPosZ(344, 196).TopPosZ(4, 272))
-	ITEM(LineEdit, TestBox, SetFont(MonospaceZ(11)).LeftPosZ(348, 188).TopPosZ(20, 252))
-	ITEM(Button, Defaults, SetLabel(t_("Upp defaults")).LeftPosZ(176, 72).TopPosZ(252, 23))
+	ITEM(Label, dv___21, SetLabel(t_("Bracket format")).LeftPosZ(4, 120).TopPosZ(152, 19))
+	ITEM(DropList, BracketFormatMode, LeftPosZ(128, 212).TopPosZ(152, 19))
+	ITEM(Label, dv___23, SetLabel(t_("Parenthesis padding")).LeftPosZ(4, 120).TopPosZ(176, 19))
+	ITEM(DropList, ParensPaddingMode, LeftPosZ(128, 212).TopPosZ(176, 19))
+	ITEM(Option, ParensUnPaddingMode, SetLabel(t_("Remove spaces around parenthesis")).LeftPosZ(4, 212).TopPosZ(200, 18))
+	ITEM(Option, OperatorPaddingMode, SetLabel(t_("Pad operators with spaces")).LeftPosZ(4, 180).TopPosZ(222, 18))
+	ITEM(Option, EmptyLineFill, SetLabel(t_("Fill empty lines")).LeftPosZ(4, 180).TopPosZ(244, 16))
+	ITEM(Option, TabSpaceConversionMode, SetLabel(t_("Convert tabs to spaces")).HSizePosZ(4, 360).TopPosZ(264, 18))
+	ITEM(Button, Test, SetLabel(t_("Test")).LeftPosZ(284, 56).TopPosZ(260, 23))
+	ITEM(LabelBox, dv___30, SetLabel(t_("Test box")).HSizePosZ(344, 4).VSizePosZ(4, 4))
+	ITEM(LineEdit, TestBox, SetFont(MonospaceZ(11)).HSizePosZ(348, 8).VSizePosZ(20, 8))
+	ITEM(Button, Defaults, SetLabel(t_("Upp defaults")).LeftPosZ(208, 72).TopPosZ(260, 23))
 END_LAYOUT
 
 LAYOUT(GotoLayout, 796, 524)
 	ITEM(Label, dv___0, SetLabel(t_("Go to")).LeftPosZ(188, 40).TopPosZ(12, 19))
 	ITEM(EditString, target, HSizePosZ(228, 296).TopPosZ(12, 19))
 	ITEM(ArrayCtrl, list, HSizePosZ(8, 8).VSizePosZ(40, 8))
-	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(80, 64).TopPosZ(8, 24))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(12, 64).TopPosZ(8, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).TopPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).TopPosZ(8, 24))
 END_LAYOUT
 
 LAYOUT(VirtualsLayout, 712, 496)
 	ITEM(ArrayCtrl, list, HSizePosZ(8, 8).VSizePosZ(8, 40))
-	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(80, 64).BottomPosZ(8, 24))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(12, 64).BottomPosZ(8, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24))
 	ITEM(Label, dv___3, SetLabel(t_("Find")).LeftPosZ(8, 60).BottomPosZ(9, 19))
 	ITEM(EditString, find, LeftPosZ(72, 124).BottomPosZ(9, 19))
 END_LAYOUT
@@ -573,25 +573,25 @@ END_LAYOUT
 LAYOUT(UppOptDlg, 520, 68)
 	ITEM(Label, dv___0, SetLabel(t_("When")).LeftPosZ(4, 36).TopPosZ(8, 19))
 	ITEM(EditString, when, LeftPosZ(40, 128).TopPosZ(8, 19))
-	ITEM(Label, dv___2, SetLabel(t_(":")).LeftPosZ(172, 8).TopPosZ(8, 19))
+	ITEM(Label, dv___2, SetLabel(t_(":")).LeftPosZ(176, 8).TopPosZ(8, 19))
 	ITEM(EditString, text, LeftPosZ(184, 328).TopPosZ(8, 19))
 	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(380, 64).TopPosZ(36, 24))
 	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(448, 64).TopPosZ(36, 24))
 END_LAYOUT
 
-LAYOUT(UppOptPushDlg, 336, 68)
+LAYOUT(UppOptPushDlg, 340, 68)
 	ITEM(Label, dv___0, SetLabel(t_("When")).LeftPosZ(4, 36).TopPosZ(8, 19))
 	ITEM(EditString, when, LeftPosZ(40, 128).TopPosZ(8, 19))
-	ITEM(Label, dv___2, SetLabel(t_(":")).LeftPosZ(172, 8).TopPosZ(8, 19))
-	ITEM(DataPusher, text, LeftPosZ(180, 148).TopPosZ(8, 24))
-	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(196, 64).TopPosZ(36, 24))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(264, 64).TopPosZ(36, 24))
+	ITEM(Label, dv___2, SetLabel(t_(":")).LeftPosZ(176, 8).TopPosZ(8, 19))
+	ITEM(DataPusher, text, HSizePosZ(184, 8).TopPosZ(8, 20))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24))
 END_LAYOUT
 
 LAYOUT(ThisbacksLayout, 712, 496)
 	ITEM(ArrayCtrl, list, HSizePosZ(8, 8).VSizePosZ(8, 40))
-	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(80, 64).BottomPosZ(8, 24))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(12, 64).BottomPosZ(8, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24))
 END_LAYOUT
 
 LAYOUT(SimpleListLayout, 408, 212)
@@ -611,8 +611,8 @@ LAYOUT(TppLayout, 200, 284)
 	ITEM(Label, name_lbl, SetLabel(t_("Other:")).LeftPosZ(8, 36).TopPosZ(224, 19))
 	ITEM(EditString, name, LeftPosZ(44, 120).TopPosZ(224, 19))
 	ITEM(Label, name_tpp, SetLabel(t_(".tpp")).LeftPosZ(168, 25).TopPosZ(224, 19))
-	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(60, 64).TopPosZ(252, 24))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(128, 64).TopPosZ(252, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(64, 64).TopPosZ(252, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(132, 64).TopPosZ(252, 24))
 END_LAYOUT
 
 LAYOUT(ExportLayout, 400, 116)
@@ -625,14 +625,14 @@ LAYOUT(ExportLayout, 400, 116)
 	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(328, 64).TopPosZ(84, 24))
 END_LAYOUT
 
-LAYOUT(PrintLayout, 148, 128)
-	ITEM(Label, dv___0, SetLabel(t_("Characters per line")).LeftPosZ(8, 100).TopPosZ(8, 19))
-	ITEM(EditInt, line, Max(1000).Min(10).NotNull(true).LeftPosZ(108, 32).TopPosZ(8, 19))
-	ITEM(Label, dv___2, SetLabel(t_("Number of columns")).LeftPosZ(8, 100).TopPosZ(32, 19))
-	ITEM(EditInt, columns, Max(8).Min(1).NotNull(true).LeftPosZ(108, 32).TopPosZ(32, 19))
-	ITEM(Switch, orientation, SetLabel(t_("Portrait\nLandscape")).LeftPosZ(8, 96).TopPosZ(56, 32))
-	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(8, 64).TopPosZ(96, 24))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(76, 64).TopPosZ(96, 24))
+LAYOUT(PrintLayout, 164, 128)
+	ITEM(Label, dv___0, SetLabel(t_("Characters per line")).LeftPosZ(8, 104).TopPosZ(8, 19))
+	ITEM(EditInt, line, Max(1000).Min(10).NotNull(true).LeftPosZ(116, 40).TopPosZ(8, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Number of columns")).LeftPosZ(8, 104).TopPosZ(32, 19))
+	ITEM(EditInt, columns, Max(8).Min(1).NotNull(true).LeftPosZ(116, 40).TopPosZ(32, 19))
+	ITEM(Switch, orientation, SetLabel(t_("Portrait\nLandscape")).LeftPosZ(8, 144).TopPosZ(56, 32))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(8, 72).BottomPosZ(8, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(84, 72).BottomPosZ(8, 24))
 END_LAYOUT
 
 LAYOUT(InsertColorLayout, 432, 520)
@@ -651,8 +651,8 @@ LAYOUT(AbbreviationsLayout, 664, 476)
 	ITEM(Button, add, SetLabel(t_("Add")).LeftPosZ(4, 64).TopPosZ(444, 24))
 	ITEM(Button, edit, SetLabel(t_("Edit")).LeftPosZ(72, 64).TopPosZ(444, 24))
 	ITEM(Button, remove, SetLabel(t_("Remove")).LeftPosZ(140, 64).TopPosZ(444, 24))
-	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(524, 64).TopPosZ(444, 24))
-	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(592, 64).TopPosZ(444, 24))
+	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(528, 64).TopPosZ(444, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(596, 64).TopPosZ(444, 24))
 	ITEM(Label, dv___7, SetLabel(t_("Use '@' character to place the caret.")).LeftPosZ(116, 304).TopPosZ(416, 19))
 END_LAYOUT