diff --git a/upptst/ColorPopup/ColorPopup.lay b/upptst/ColorPopup/ColorPopup.lay
new file mode 100644
index 000000000..65a2a9e69
--- /dev/null
+++ b/upptst/ColorPopup/ColorPopup.lay
@@ -0,0 +1,15 @@
+LAYOUT(MyAppLayout, 576, 64)
+	ITEM(ColorPusher, c0, LeftPosZ(8, 84).TopPosZ(36, 20))
+	ITEM(Label, dv___1, SetLabel(t_("Full. Scolors(0)")).LeftPosZ(8, 84).TopPosZ(8, 19))
+	ITEM(Label, dv___2, SetLabel(t_("Full. Scolors(1)")).LeftPosZ(108, 84).TopPosZ(8, 19))
+	ITEM(Label, dv___3, SetLabel(t_("NotNull")).LeftPosZ(204, 84).TopPosZ(8, 19))
+	ITEM(ColorPusher, c1, LeftPosZ(108, 84).TopPosZ(36, 20))
+	ITEM(ColorPusher, c2, LeftPosZ(204, 84).TopPosZ(36, 20))
+	ITEM(Label, dv___6, SetLabel(t_("NoRamp")).LeftPosZ(300, 84).TopPosZ(8, 19))
+	ITEM(ColorPusher, c3, LeftPosZ(300, 84).TopPosZ(36, 20))
+	ITEM(Label, dv___8, SetLabel(t_("NotNull.NoRamp")).LeftPosZ(392, 84).TopPosZ(8, 19))
+	ITEM(ColorPusher, c4, LeftPosZ(392, 84).TopPosZ(36, 20))
+	ITEM(Label, dv___10, SetLabel(t_("WithVoid")).LeftPosZ(484, 84).TopPosZ(8, 19))
+	ITEM(ColorPusher, c5, LeftPosZ(484, 84).TopPosZ(36, 20))
+END_LAYOUT
+
diff --git a/upptst/ColorPopup/ColorPopup.upp b/upptst/ColorPopup/ColorPopup.upp
index 30ae0ced1..4b1df1568 100644
--- a/upptst/ColorPopup/ColorPopup.upp
+++ b/upptst/ColorPopup/ColorPopup.upp
@@ -2,9 +2,8 @@ uses
 	CtrlLib;
 
 file
-	colorpopup.h,
 	main.cpp,
-	colorpopup.lay;
+	ColorPopup.lay;
 
 mainconfig
 	"" = "GUI ST";
diff --git a/upptst/ColorPopup/colorpopup.h b/upptst/ColorPopup/colorpopup.h
deleted file mode 100644
index df8f213cb..000000000
--- a/upptst/ColorPopup/colorpopup.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _colorpopup_colorpopup_h
-#define _colorpopup_colorpopup_h
-
-#include <CtrlLib/CtrlLib.h>
-
-using namespace Upp;
-
-#define LAYOUTFILE <colorpopup/colorpopup.lay>
-#include <CtrlCore/lay.h>
-
-class colorpopup : public WithcolorpopupLayout<TopWindow> {
-public:
-	typedef colorpopup CLASSNAME;
-	colorpopup();
-};
-
-#endif
diff --git a/upptst/ColorPopup/main.cpp b/upptst/ColorPopup/main.cpp
index 8b3a95adf..0801f5dee 100644
--- a/upptst/ColorPopup/main.cpp
+++ b/upptst/ColorPopup/main.cpp
@@ -1,6 +1,17 @@
-#include "colorpopup.h"
+#include <CtrlLib/CtrlLib.h>
 
-colorpopup::colorpopup()
+using namespace Upp;
+
+#define LAYOUTFILE <ColorPopup/ColorPopup.lay>
+#include <CtrlCore/lay.h>
+
+class MyApp : public WithMyAppLayout<TopWindow> {
+public:
+	typedef MyApp CLASSNAME;
+	MyApp();
+};
+
+MyApp::MyApp()
 {
 	CtrlLayout(*this, "Window title");
 	c0.SColors(false);
@@ -15,5 +26,5 @@ GUI_APP_MAIN
 {
 //	SetStdFont(Arial(25));
 	SyncUHDMode();
-	colorpopup().Run();
+	MyApp().Run();
 }