diff --git a/upptst/DarkTheme/DarkTheme.h b/upptst/DarkTheme/DarkTheme.h
new file mode 100644
index 000000000..99b9fec11
--- /dev/null
+++ b/upptst/DarkTheme/DarkTheme.h
@@ -0,0 +1,17 @@
+#ifndef _DarkTheme_DarkTheme_h
+#define _DarkTheme_DarkTheme_h
+
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+#define LAYOUTFILE <DarkTheme/DarkTheme.lay>
+#include <CtrlCore/lay.h>
+
+class DarkTheme : public WithDarkThemeLayout<TopWindow> {
+public:
+	typedef DarkTheme CLASSNAME;
+	DarkTheme();
+};
+
+#endif
diff --git a/upptst/DarkTheme/DarkTheme.lay b/upptst/DarkTheme/DarkTheme.lay
new file mode 100644
index 000000000..93b0d6864
--- /dev/null
+++ b/upptst/DarkTheme/DarkTheme.lay
@@ -0,0 +1,3 @@
+
+LAYOUT(DarkThemeLayout, 200, 100)
+END_LAYOUT
diff --git a/upptst/DarkTheme/DarkTheme.upp b/upptst/DarkTheme/DarkTheme.upp
new file mode 100644
index 000000000..ab3a9e02d
--- /dev/null
+++ b/upptst/DarkTheme/DarkTheme.upp
@@ -0,0 +1,11 @@
+uses
+	CtrlLib;
+
+file
+	DarkTheme.h,
+	main.cpp,
+	DarkTheme.lay;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/upptst/DarkTheme/main.cpp b/upptst/DarkTheme/main.cpp
new file mode 100644
index 000000000..c3699b114
--- /dev/null
+++ b/upptst/DarkTheme/main.cpp
@@ -0,0 +1,11 @@
+#include "DarkTheme.h"
+
+DarkTheme::DarkTheme()
+{
+	CtrlLayout(*this, "Window title");
+}
+
+GUI_APP_MAIN
+{
+	PromptOK("{{@Y Just a test}}");
+}
diff --git a/upptst/DarkingColors/main.cpp b/upptst/DarkingColors/main.cpp
index 0b85b87a0..2a2fd6c90 100644
--- a/upptst/DarkingColors/main.cpp
+++ b/upptst/DarkingColors/main.cpp
@@ -13,7 +13,7 @@ struct ColorTest : TopWindow {
 	
 	ColorTest() {
 		Add(color.LeftPosZ(0, 300).TopPosZ(0, 300));
-		color << [=] { Refresh(); };
+		color << [=] { Refresh(); Title(AsString(DarkTheme(~color))); };
 	}
 };