diff --git a/uppsrc/CtrlCore/Ctrl.cpp b/uppsrc/CtrlCore/Ctrl.cpp
index f56b58e24..6eabef144 100644
--- a/uppsrc/CtrlCore/Ctrl.cpp
+++ b/uppsrc/CtrlCore/Ctrl.cpp
@@ -984,21 +984,15 @@ void Ctrl::ReSkin()
 	if(lock)
 		return;
 	lock++;
-	DLOG("============== Reskin");
-	DDUMP(SColorPaper());
 	ChReset();
-	DDUMP(SColorPaper());
 	Csize.cx = Dsize.cx = IsNoLayoutZoom;
 	if(s_chdefault)
 		(*s_chdefault)();
-	DDUMP(SColorPaper());
 	if(skin)
 		(*skin)();
-	DDUMP(SColorPaper());
 	Csize.cx = Dsize.cx = IsNoLayoutZoom;
 	Csizeinit();
 	ChFinish();
-	DDUMP(SColorPaper());
 	Vector<Ctrl *> ctrl = GetTopCtrls();
 	for(int i = 0; i < ctrl.GetCount(); i++) {
 		ctrl[i]->RefreshLayoutDeep();
diff --git a/uppsrc/CtrlCore/ToDo.txt b/uppsrc/CtrlCore/ToDo.txt
index 07f9f7afd..e1fd52145 100644
--- a/uppsrc/CtrlCore/ToDo.txt
+++ b/uppsrc/CtrlCore/ToDo.txt
@@ -2,8 +2,7 @@
 - U++ menu has some issues
 - Vertical centering of DropList text is a bit off
 - Classic is broken
-- Standard visual glitches in dark theme
-- Option box focus issue
+- Inactive doc icon is not updated - [B] does not blink anymore
 
 NTH:
 
@@ -13,3 +12,5 @@ DONE:
 - Slider in dark mode is transparent
 - spin buttons slight visual problem in dark mode
 - <-|-> cursor looks bad in dark mode
+- Standard visual glitches in dark theme
+- Option box focus issue
diff --git a/uppsrc/CtrlLib/Button.cpp b/uppsrc/CtrlLib/Button.cpp
index f55246316..672ba0dc6 100644
--- a/uppsrc/CtrlLib/Button.cpp
+++ b/uppsrc/CtrlLib/Button.cpp
@@ -641,7 +641,7 @@ void Option::Paint(Draw& w) {
 		              ds || IsReadOnly() ? SColorDisabled : Nvl(color, GetLabelTextColor(this)),
 		              VisibleAccessKeys() ? accesskey : 0);
 		if(HasFocus())
-			DrawFocus(w, RectC(isz.cx + DPI(2), ty - DPI(1), tsz.cx + DPI(3), tsz.cy + DPI(2)) & sz);
+			DrawFocus(w, RectC(ix + isz.cx + DPI(2), ty - DPI(1), tsz.cx + DPI(3), tsz.cy + DPI(2)) & sz);
 	}
 	
 	if(box) {
@@ -746,7 +746,7 @@ void  ButtonOption::Paint(Draw& w) {
 
 CH_STYLE(ButtonOption, Style, StyleDefault)
 {
-	const Button::Style& bs = Button::StyleNormal(); 
+	const Button::Style& bs = Button::StyleNormal();
 	for (int i = 0; i < 4; i++)
 	{
 		look[i] = bs.look[i];
@@ -757,7 +757,7 @@ CH_STYLE(ButtonOption, Style, StyleDefault)
 
 CH_STYLE(ButtonOption, Style, StyleFlat)
 {
-	const ToolButton::Style& tbs = ToolButton::StyleDefault(); 
+	const ToolButton::Style& tbs = ToolButton::StyleDefault();
 	for (int i = 0; i < 4; i++)
 	{
 		look[i] = tbs.look[i];
diff --git a/uppsrc/CtrlLib/Ch.cpp b/uppsrc/CtrlLib/Ch.cpp
index 516975a92..5372e4a45 100644
--- a/uppsrc/CtrlLib/Ch.cpp
+++ b/uppsrc/CtrlLib/Ch.cpp
@@ -9,8 +9,8 @@ namespace Upp {
 #define IMAGEFILE <CtrlLib/Ctrls.iml>
 #include <Draw/iml_source.h>
 
-#define FIXED_COLORS
-#define FIXED_SIZE
+// #define FIXED_COLORS
+// #define FIXED_SIZE
 #define IMAGECLASS ClassicCtrlsImg
 #define IMAGEFILE <CtrlLib/ClassicCtrls.iml>
 #include <Draw/iml_source.h>
diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay
index 6b067352b..e54f4461e 100644
--- a/uppsrc/ide/ide.lay
+++ b/uppsrc/ide/ide.lay
@@ -523,13 +523,13 @@ END_LAYOUT
 LAYOUT(SetupHlLayout, 544, 300)
 	ITEM(ArrayCtrl, hlstyle, LeftPosZ(4, 368).TopPosZ(4, 292))
 	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, 52))
-	ITEM(Label, dv___3, SetLabel(t_("Matching bracket highlighting")).LeftPosZ(380, 160).TopPosZ(68, 16))
-	ITEM(Switch, hilite_bracket, SetLabel(t_("None\nNormal\nFlashing")).LeftPosZ(380, 160).TopPosZ(84, 52))
-	ITEM(Label, dv___5, SetLabel(t_("#else/#elif/#endif info")).LeftPosZ(380, 160).TopPosZ(132, 16))
-	ITEM(Switch, hilite_ifdef, SetLabel(t_("None\nNormal\nWith line number")).LeftPosZ(380, 160).TopPosZ(148, 52))
-	ITEM(Option, hilite_if_endif, SetLabel(t_("#if/#endif tracing")).LeftPosZ(380, 160).TopPosZ(196, 18))
-	ITEM(Option, thousands_separator, SetLabel(t_("Thousands separator")).LeftPosZ(380, 160).TopPosZ(212, 18))
+	ITEM(Switch, hilite_scope, SetLabel(t_("None\n2 colors\n5 colors")).LeftPosZ(380, 160).TopPosZ(20, 20))
+	ITEM(Label, dv___3, SetLabel(t_("Matching bracket highlighting")).LeftPosZ(380, 160).TopPosZ(52, 16))
+	ITEM(Switch, hilite_bracket, SetLabel(t_("None\nNormal\nFlashing")).LeftPosZ(380, 160).TopPosZ(68, 20))
+	ITEM(Label, dv___5, SetLabel(t_("#else/#elif/#endif info")).LeftPosZ(380, 160).TopPosZ(100, 16))
+	ITEM(Switch, hilite_ifdef, SetLabel(t_("None\nNormal\nWith line number")).LeftPosZ(380, 160).TopPosZ(120, 48))
+	ITEM(Option, hilite_if_endif, SetLabel(t_("#if/#endif tracing")).LeftPosZ(380, 160).TopPosZ(180, 18))
+	ITEM(Option, thousands_separator, SetLabel(t_("Thousands separator")).LeftPosZ(380, 160).TopPosZ(200, 18))
 	ITEM(Option, hline, SetLabel(t_("Line")).LeftPosZ(432, 160).TopPosZ(228, 18))
 	ITEM(Option, vline, SetLabel(t_("Column")).LeftPosZ(480, 84).TopPosZ(228, 18))
 	ITEM(Button, hl_restore, SetLabel(t_("Restore default colors")).LeftPosZ(380, 160).TopPosZ(252, 20))