diff --git a/upptst/DarkingColors/main.cpp b/upptst/DarkingColors/main.cpp
index ad8732734..403a0cd43 100644
--- a/upptst/DarkingColors/main.cpp
+++ b/upptst/DarkingColors/main.cpp
@@ -3,7 +3,7 @@
 using namespace Upp;
 
 struct ColorTest : TopWindow {
-	ColorSelector color;
+	ColorPusher color;
 	
 	void Paint(Draw& w) override {
 		Size sz = GetSize();
diff --git a/upptst/I18NCtrlLayoutTest/Layout.lay b/upptst/I18NCtrlLayoutTest/Layout.lay
index 9cac8efdb..9a0ba1ec4 100644
--- a/upptst/I18NCtrlLayoutTest/Layout.lay
+++ b/upptst/I18NCtrlLayoutTest/Layout.lay
@@ -1,8 +1,8 @@
 LAYOUT(MainDlg, 328, 108)
-	ITEM(Button, m_file, SetLabel(t_("File Selection...")).LeftPosZ(12, 116).TopPosZ(12, 24))
-	ITEM(Button, m_pallette, SetLabel(t_("Pallette...")).LeftPosZ(136, 92).TopPosZ(12, 24))
-	ITEM(Button, m_printer, SetLabel(t_("Printer...")).LeftPosZ(236, 80).TopPosZ(12, 24))
-	ITEM(Button, m_close, SetLabel(t_("Close")).SetFont(StdFontZ(11).Bold()).RightPosZ(12, 56).BottomPosZ(12, 24))
-	ITEM(EditString, m_current, SetEditable(false).HSizePosZ(12, 84).BottomPosZ(13, 19))
+	ITEM(Upp::Button, m_file, SetLabel(t_("File Selection...")).LeftPosZ(12, 116).TopPosZ(12, 24))
+	ITEM(Upp::Button, m_pallette, SetLabel(t_("Pallette...")).LeftPosZ(136, 92).TopPosZ(12, 24))
+	ITEM(Upp::Button, m_printer, SetLabel(t_("Printer...")).LeftPosZ(236, 80).TopPosZ(12, 24))
+	ITEM(Upp::Button, m_close, SetLabel(t_("Close")).SetFont(Upp::StdFontZ(11).Bold()).RightPosZ(12, 56).BottomPosZ(12, 24))
+	ITEM(Upp::EditString, m_current, SetEditable(false).HSizePosZ(12, 84).BottomPosZ(13, 19))
 END_LAYOUT
 
diff --git a/upptst/I18NCtrlLayoutTest/main.cpp b/upptst/I18NCtrlLayoutTest/main.cpp
index 380710f6d..1c36cef8f 100644
--- a/upptst/I18NCtrlLayoutTest/main.cpp
+++ b/upptst/I18NCtrlLayoutTest/main.cpp
@@ -28,7 +28,7 @@ void MainDlg::OnFile()
 
 void MainDlg::OnPallette()
 {
-	::RunDlgSelectColor();
+	
 }
 
 void MainDlg::OnPrinter()