diff --git a/upptst/TestChStyle/TestChStyle.lay b/upptst/TestChStyle/TestChStyle.lay
index 98db4dfd0..2d4cf9463 100644
--- a/upptst/TestChStyle/TestChStyle.lay
+++ b/upptst/TestChStyle/TestChStyle.lay
@@ -1,42 +1,45 @@
 LAYOUT(TestChStyleLayout, 680, 492)
-	ITEM(OptionBox, dv___0, SetLabel(t_("OptionBox")).LeftPosZ(8, 468).TopPosZ(8, 40))
+	ITEM(OptionBox, dv___0, SetLabel(t_("OptionBox")).LeftPosZ(12, 140).TopPosZ(324, 128))
 	ITEM(EditString, readonly, SetEditable(false).LeftPosZ(20, 80).TopPosZ(52, 19))
 	ITEM(DropList, dl_readonly, SetEditable(false).LeftPosZ(108, 96).TopPosZ(52, 19))
 	ITEM(WithDropChoice<EditString>, dc_readonly, SetEditable(false).LeftPosZ(212, 96).TopPosZ(52, 19))
 	ITEM(EditString, disabled, LeftPosZ(20, 80).TopPosZ(76, 19))
 	ITEM(DropList, dl_disabled, LeftPosZ(108, 96).TopPosZ(76, 19))
 	ITEM(WithDropChoice<EditString>, dc_disabled, LeftPosZ(212, 96).TopPosZ(76, 19))
-	ITEM(DropTime, dv___7, LeftPosZ(20, 120).TopPosZ(100, 19))
-	ITEM(DropDate, dv___8, LeftPosZ(144, 104).TopPosZ(100, 19))
-	ITEM(LabelBox, dv___9, SetLabel(t_("LabelBox")).LeftPosZ(316, 148).TopPosZ(24, 104))
-	ITEM(Label, dv___10, SetLabel(t_("Label")).LeftPosZ(324, 40).TopPosZ(52, 19))
+	ITEM(EditString, normal1, LeftPosZ(20, 80).TopPosZ(28, 19))
+	ITEM(DropList, dl_normal1, LeftPosZ(108, 96).TopPosZ(28, 19))
+	ITEM(WithDropChoice<EditString>, dc_normal1, LeftPosZ(212, 96).TopPosZ(28, 19))
+	ITEM(DropTime, dv___10, LeftPosZ(20, 120).TopPosZ(100, 19))
+	ITEM(DropDate, dv___11, LeftPosZ(144, 104).TopPosZ(100, 19))
+	ITEM(LabelBox, dv___12, SetLabel(t_("LabelBox")).LeftPosZ(316, 148).TopPosZ(24, 104))
+	ITEM(Label, dv___13, SetLabel(t_("Label")).LeftPosZ(324, 40).TopPosZ(52, 19))
 	ITEM(DropTime, tm_dis, LeftPosZ(20, 120).TopPosZ(124, 19))
 	ITEM(DropDate, dt_dis, LeftPosZ(144, 104).TopPosZ(124, 19))
 	ITEM(EditIntSpin, spin_sides, LeftPosZ(20, 64).TopPosZ(148, 19))
-	ITEM(Option, dv___14, ThreeState(true).SetLabel(t_("Option")).LeftPosZ(92, 80).TopPosZ(148, 16))
+	ITEM(Option, dv___17, ThreeState(true).SetLabel(t_("Option")).LeftPosZ(92, 80).TopPosZ(148, 16))
 	ITEM(EditIntSpin, dis1, LeftPosZ(20, 64).TopPosZ(172, 19))
 	ITEM(Option, option1, ThreeState(true).SetLabel(t_("Disabled")).LeftPosZ(92, 80).TopPosZ(168, 16))
-	ITEM(Switch, dv___17, SetLabel(t_("One\nTwo")).LeftPosZ(176, 84).TopPosZ(148, 40))
+	ITEM(Switch, dv___20, SetLabel(t_("One\nTwo")).LeftPosZ(176, 84).TopPosZ(148, 40))
 	ITEM(Option, option2, ThreeState(true).SetLabel(t_("Disabled")).LeftPosZ(92, 80).TopPosZ(188, 16))
 	ITEM(EditIntSpin, dis2, LeftPosZ(20, 64).TopPosZ(196, 19))
 	ITEM(Option, option3, ThreeState(true).SetLabel(t_("Disabled")).LeftPosZ(92, 80).TopPosZ(208, 16))
 	ITEM(Switch, switch1, SetLabel(t_("One\nTwo")).LeftPosZ(176, 84).TopPosZ(192, 40))
 	ITEM(TabCtrl, tab, LeftPosZ(316, 150).TopPosZ(136, 100))
-	ITEM(Label, dv___23, SetLabel(t_("This is label")).LeftPosZ(16, 168).TopPosZ(240, 19))
-	ITEM(DropTime, dv___24, LeftPosZ(316, 120).TopPosZ(252, 19))
-	ITEM(SliderCtrl, dv___25, LeftPosZ(16, 64).TopPosZ(272, 24))
+	ITEM(Label, dv___26, SetLabel(t_("This is label")).LeftPosZ(16, 168).TopPosZ(240, 19))
+	ITEM(DropTime, dv___27, LeftPosZ(316, 120).TopPosZ(252, 19))
+	ITEM(SliderCtrl, dv___28, LeftPosZ(16, 64).TopPosZ(272, 24))
 	ITEM(Button, dis, SetLabel(t_("disabled")).LeftPosZ(88, 56).TopPosZ(272, 24))
-	ITEM(ArrayCtrl, dv___27, LeftPosZ(256, 52).TopPosZ(216, 100))
+	ITEM(ArrayCtrl, dv___30, LeftPosZ(256, 52).TopPosZ(216, 100))
 	ITEM(ProgressIndicator, pi, LeftPosZ(172, 136).TopPosZ(332, 12))
-	ITEM(SliderCtrl, dv___29, LeftPosZ(180, 20).TopPosZ(356, 88))
+	ITEM(SliderCtrl, dv___32, LeftPosZ(180, 20).TopPosZ(356, 88))
 	UNTYPED(sample, LeftPosZ(228, 232).TopPosZ(360, 80))
 	ITEM(DropList, dl_empty, LeftPosZ(480, 96).TopPosZ(4, 19))
 	ITEM(WithDropChoice<EditString>, dc_empty, LeftPosZ(480, 96).TopPosZ(28, 19))
-	ITEM(DataPusher, dv___33, LeftPosZ(480, 152).TopPosZ(52, 24))
+	ITEM(DataPusher, dv___36, LeftPosZ(480, 152).TopPosZ(52, 24))
 	ITEM(EditString, es_error, LeftPosZ(480, 164).TopPosZ(80, 19))
 	ITEM(WithDropChoice<EditString>, dc_error, LeftPosZ(480, 96).TopPosZ(104, 19))
 	ITEM(WithDropChoice<EditString>, dc_error2, LeftPosZ(580, 96).TopPosZ(104, 19))
-	ITEM(EditIntSpin, dv___37, LeftPosZ(492, 64).TopPosZ(144, 56))
+	ITEM(EditIntSpin, dv___40, LeftPosZ(492, 64).TopPosZ(144, 56))
 	ITEM(EditString, normal, LeftPosZ(492, 180).TopPosZ(204, 48))
 	ITEM(DropList, dl_normal, LeftPosZ(492, 180).TopPosZ(256, 44))
 	ITEM(WithDropChoice<EditString>, dc_normal, LeftPosZ(492, 180).TopPosZ(304, 44))
diff --git a/upptst/TestChStyle/main.cpp b/upptst/TestChStyle/main.cpp
index 634dd4b23..ceb0a3f5b 100644
--- a/upptst/TestChStyle/main.cpp
+++ b/upptst/TestChStyle/main.cpp
@@ -58,11 +58,13 @@ TestChStyle::TestChStyle()
 	disabled.Disable();
 	
 	Dl(dl_normal);
+	Dl(dl_normal1);
 	Dl(dl_readonly);
 	Dl(dl_disabled);
 	dl_disabled.Disable();
 
 	Dc(dc_normal);
+	Dc(dc_normal1);
 	Dc(dc_readonly);
 	Dc(dc_disabled);
 	dc_disabled.Disable();
@@ -137,5 +139,7 @@ GUI_APP_MAIN
 	RDUMP(SColorDisabled());
 	RDUMP(SColorText());
 	
+	RDUMP(EditField::StyleDefault().disabled);
+	
 	TestChStyle().Run();
 }