diff --git a/uppsrc/ide/UppHub.cpp b/uppsrc/ide/UppHub.cpp
index 84fba7821..6e64a1605 100644
--- a/uppsrc/ide/UppHub.cpp
+++ b/uppsrc/ide/UppHub.cpp
@@ -60,8 +60,8 @@ void UppHubDlg::Load(const String& url)
 
 	String s = r.GetContent();
 	
-	int begin = s.FindAfter("UPPIVERSE_BEGIN");
-	int end = s.Find("UPPIVERSE_END");
+	int begin = s.FindAfter("UPPHUB_BEGIN");
+	int end = s.Find("UPPHUB_END");
 	
 	if(begin >= 0 && end >= 0) {
 		s = s.Mid(begin, end - begin);
diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay
index a65c45c04..70c9a1440 100644
--- a/uppsrc/ide/ide.lay
+++ b/uppsrc/ide/ide.lay
@@ -516,22 +516,22 @@ LAYOUT(SetupFontLayout, 528, 312)
 	ITEM(Upp::Button, defaults, SetLabel(t_("Restore defaults")).RightPosZ(8, 116).BottomPosZ(4, 24))
 END_LAYOUT
 
-LAYOUT(SetupHlLayout, 544, 316)
-	ITEM(Upp::ArrayCtrl, hlstyle, LeftPosZ(4, 368).VSizePosZ(4, 4))
-	ITEM(Upp::Label, dv___1, SetLabel(t_("Scope highlighting")).LeftPosZ(380, 160).TopPosZ(4, 16))
-	ITEM(Upp::Switch, hilite_scope, SetLabel(t_("None\n2 colors\n5 colors")).LeftPosZ(380, 160).TopPosZ(20, 20))
-	ITEM(Upp::Label, dv___3, SetLabel(t_("Matching bracket highlighting")).LeftPosZ(380, 160).TopPosZ(52, 16))
-	ITEM(Upp::Switch, hilite_bracket, SetLabel(t_("None\nNormal\nFlashing")).LeftPosZ(380, 160).TopPosZ(68, 20))
-	ITEM(Upp::Label, dv___5, SetLabel(t_("#else/#elif/#endif info")).LeftPosZ(380, 160).TopPosZ(100, 16))
-	ITEM(Upp::Switch, hilite_ifdef, SetLabel(t_("None\nNormal\nWith line number")).LeftPosZ(380, 160).TopPosZ(120, 48))
-	ITEM(Upp::Option, hilite_if_endif, SetLabel(t_("#if/#endif tracing")).LeftPosZ(380, 160).TopPosZ(180, 18))
-	ITEM(Upp::Option, thousands_separator, SetLabel(t_("Thousands separator")).LeftPosZ(380, 160).TopPosZ(200, 18))
+LAYOUT(SetupHlLayout, 544, 344)
+	ITEM(Upp::ArrayCtrl, hlstyle, LeftPosZ(4, 360).VSizePosZ(4, 8))
+	ITEM(Upp::Label, dv___1, SetLabel(t_("Scope highlighting")).LeftPosZ(372, 160).TopPosZ(4, 16))
+	ITEM(Upp::Switch, hilite_scope, SetLabel(t_("None\n2 colors\n5 colors")).LeftPosZ(372, 188).TopPosZ(20, 20))
+	ITEM(Upp::Label, dv___3, SetLabel(t_("Matching bracket highlighting")).LeftPosZ(372, 160).TopPosZ(52, 16))
+	ITEM(Upp::Switch, hilite_bracket, SetLabel(t_("None\nNormal\nFlashing")).LeftPosZ(372, 180).TopPosZ(68, 20))
+	ITEM(Upp::Label, dv___5, SetLabel(t_("#else/#elif/#endif info")).LeftPosZ(372, 160).TopPosZ(100, 16))
+	ITEM(Upp::Switch, hilite_ifdef, SetLabel(t_("None\nNormal\nWith line number")).LeftPosZ(372, 196).TopPosZ(120, 60))
+	ITEM(Upp::Option, hilite_if_endif, SetLabel(t_("#if/#endif tracing")).LeftPosZ(372, 160).TopPosZ(184, 18))
+	ITEM(Upp::Option, thousands_separator, SetLabel(t_("Thousands separator")).LeftPosZ(372, 160).TopPosZ(204, 18))
 	ITEM(Upp::Option, hline, SetLabel(t_("Line")).LeftPosZ(432, 160).TopPosZ(228, 18))
-	ITEM(Upp::Option, vline, SetLabel(t_("Column")).LeftPosZ(480, 84).TopPosZ(228, 18))
-	ITEM(Upp::Button, hl_restore, SetLabel(t_("Restore default colors")).RightPosZ(4, 160).BottomPosZ(28, 20))
-	ITEM(Upp::Button, hl_restore_dark, SetLabel(t_("Dark theme")).RightPosZ(4, 80).BottomPosZ(4, 20))
-	ITEM(Upp::Button, hl_restore_white, SetLabel(t_("White theme")).RightPosZ(88, 76).BottomPosZ(4, 20))
-	ITEM(Upp::Label, dv___14, SetLabel(t_("Current")).LeftPosZ(380, 40).TopPosZ(228, 18))
+	ITEM(Upp::Option, vline, SetLabel(t_("Column")).LeftPosZ(472, 84).TopPosZ(228, 18))
+	ITEM(Upp::Button, hl_restore, SetLabel(t_("Restore default colors")).RightPosZ(4, 160).BottomPosZ(56, 20))
+	ITEM(Upp::Button, hl_restore_dark, SetLabel(t_("Dark theme")).RightPosZ(4, 160).BottomPosZ(8, 20))
+	ITEM(Upp::Button, hl_restore_white, SetLabel(t_("White theme")).RightPosZ(4, 160).BottomPosZ(32, 20))
+	ITEM(Upp::Label, dv___14, SetLabel(t_("Current")).LeftPosZ(372, 40).TopPosZ(228, 18))
 END_LAYOUT
 
 LAYOUT(SetupEditorLayout, 544, 304)
@@ -563,10 +563,10 @@ LAYOUT(SetupEditorLayout, 544, 304)
 	ITEM(Upp::DropList, filetabs, LeftPosZ(372, 64).TopPosZ(4, 19))
 	ITEM(Upp::Label, dv___26, SetLabel(t_("Crosses")).LeftPosZ(304, 64).TopPosZ(24, 19))
 	ITEM(Upp::DropList, tabs_crosses, LeftPosZ(372, 64).TopPosZ(24, 19))
-	ITEM(Upp::Option, tabs_icons, SetLabel(t_("Icons")).LeftPosZ(304, 132).VCenterPosZ(16, -100))
-	ITEM(Upp::Option, tabs_grouping, SetLabel(t_("Group by file folders")).LeftPosZ(304, 132).VCenterPosZ(16, -84))
-	ITEM(Upp::Option, tabs_stacking, SetLabel(t_("Stacking")).LeftPosZ(304, 132).VCenterPosZ(16, -68))
-	ITEM(Upp::Option, tabs_serialize, SetLabel(t_("Persistent tabs")).LeftPosZ(304, 132).VCenterPosZ(16, -52))
+	ITEM(Upp::Option, tabs_icons, SetLabel(t_("Icons")).LeftPosZ(304, 132).TopPosZ(44, 16))
+	ITEM(Upp::Option, tabs_grouping, SetLabel(t_("Group by file folders")).LeftPosZ(304, 132).TopPosZ(60, 16))
+	ITEM(Upp::Option, tabs_stacking, SetLabel(t_("Stacking")).LeftPosZ(304, 132).TopPosZ(76, 16))
+	ITEM(Upp::Option, tabs_serialize, SetLabel(t_("Persistent tabs")).LeftPosZ(304, 132).TopPosZ(92, 16))
 	ITEM(Upp::Label, dv___32, SetLabel(t_("Spellcheck comments")).LeftPosZ(304, 120).TopPosZ(116, 19))
 	ITEM(Upp::DropList, spellcheck_comments, LeftPosZ(428, 92).TopPosZ(116, 19))
 END_LAYOUT