diff --git a/uppdev/ArrayCtrl/ArrayCtrl.upp b/uppdev/ArrayCtrl/ArrayCtrl.upp
index fd10d1890..280951725 100644
--- a/uppdev/ArrayCtrl/ArrayCtrl.upp
+++ b/uppdev/ArrayCtrl/ArrayCtrl.upp
@@ -1,16 +1,15 @@
-description "\377B";
-
-uses
-	CtrlLib,
-	Crypto;
-
-file
-	app.tpp,
-	ArrayCtrl.h,
-	main.cpp optimize_speed,
-	src.tpp,
-	srcimp.tpp;
-
-mainconfig
-	"" = "GUI";
-
+description "\377B";
+
+uses
+	CtrlLib;
+
+file
+	app.tpp,
+	ArrayCtrl.h,
+	main.cpp optimize_speed,
+	src.tpp,
+	srcimp.tpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/uppdev/ArrayCtrl/main.cpp b/uppdev/ArrayCtrl/main.cpp
index 4e5685e94..59cd2d9d1 100644
--- a/uppdev/ArrayCtrl/main.cpp
+++ b/uppdev/ArrayCtrl/main.cpp
@@ -1,74 +1,68 @@
-#include <CtrlLib/CtrlLib.h>
-
-using namespace Upp;
-
-struct App : TopWindow {
-	ArrayCtrl a, b;
-	Splitter  s;
-
-	void DnD(PasteClip& d)
-	{
-		if(AcceptText(d))
-			a.Add(GetString(d), GetString(d));
-	}
-	
-	void DnDInsert(int line, PasteClip& d)
-	{
-		if(AcceptInternal<ArrayCtrl>(d, "array"))
-			a.InsertDrop(line, d);
-		if(AcceptText(d)) {
-			a.Insert(line);
-			a.Set(line, 0, GetString(d));
-			a.SetCursor(line);
-		}
-	}
-
-	void DnDInsertB(int line, PasteClip& d)
-	{
-		if(AcceptInternal()<ArrayCtrl>(d, "array"))
-			b.InsertDrop(line, d);
-	}
-
-	void Drag()
-	{
-		if(DoDragAndDrop(InternalClip(a, "array")) == DND_MOVE)
-			a.RemoveSelection();
-	}
-
-	void DragB()
-	{
-		if(DoDragAndDrop(InternalClip(b, "array")) == DND_MOVE)
-			b.RemoveSelection();
-	}
-
-	typedef App CLASSNAME;
-
-	App() {
-		a.AddColumn("Text");
-		a.MultiSelect();
-		a.NoGrid();
-		a.WhenDropInsert = THISBACK(DnDInsert);
-		a.WhenDrop = THISBACK(DnD);
-		a.WhenDrag = THISBACK(Drag);
-		
-		b.AddColumn("Text");
-		b.MultiSelect();
-		b.WhenDropInsert = THISBACK(DnDInsertB);
-		b.WhenDrag = THISBACK(DragB);
-
-		Add(s.Horz(a, b));
-		for(int i = 0; i < 200; i++) {
-			a.Add(i);
-			b.Add(FormatIntRoman(i, true));
-			if((i & 3) == 0)
-				a.AddSeparator();
-		}
-		Sizeable();
-	}
-};
-
-GUI_APP_MAIN
-{
-	DUMP("Test");
-	App().Run();
-}
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct App : TopWindow {
+	ArrayCtrl a, b;
+	Splitter  s;
+
+	void DnD(PasteClip& d)
+	{
+		if(AcceptText(d))
+			a.Add(GetString(d), GetString(d));
+	}
+	
+	void DnDInsert(int line, PasteClip& d)
+	{
+		if(AcceptInternal<ArrayCtrl>(d, "array"))
+			a.InsertDrop(line, d);
+		if(AcceptText(d)) {
+			a.Insert(line);
+			a.Set(line, 0, GetString(d));
+			a.SetCursor(line);
+		}
+	}
+
+	void DnDInsertB(int line, PasteClip& d)
+	{
+	}
+
+	void Drag()
+	{
+	}
+
+	void DragB()
+	{
+	}
+
+	typedef App CLASSNAME;
+
+	App() {
+		a.AddColumn("Text");
+		a.MultiSelect();
+		a.NoGrid();
+		a.WhenDropInsert = THISBACK(DnDInsert);
+		a.WhenDrop = THISBACK(DnD);
+		a.WhenDrag = THISBACK(Drag);
+		
+		b.AddColumn("Text");
+		b.MultiSelect();
+		b.WhenDropInsert = THISBACK(DnDInsertB);
+		b.WhenDrag = THISBACK(DragB);
+
+		Add(s.Horz(a, b));
+		for(int i = 0; i < 200; i++) {
+			a.Add(i);
+			b.Add(FormatIntRoman(i, true));
+			if((i & 3) == 0)
+				a.AddSeparator();
+		}
+		Sizeable();
+	}
+};
+
+GUI_APP_MAIN
+{
+	DUMP("Test");
+	App().Run();
+}
diff --git a/uppdev/Cham/main.cpp b/uppdev/Cham/main.cpp
index 992e63778..3d6fb81dd 100644
--- a/uppdev/Cham/main.cpp
+++ b/uppdev/Cham/main.cpp
@@ -1,62 +1,164 @@
-#include <CtrlLib/CtrlLib.h>
-
-CH_INTS(ChA, 2, 1 << 2);
-CH_INTS(ChB, 2, ChA);
-CH_INT(ChC, 123456);
-
-#define IMAGECLASS TImg
-#define IMAGEFILE <CtrlLib/ClassicCtrls.iml>
-#include <Draw/iml.h>
-
-struct MyApp : TopWindow {
-	virtual void Paint(Draw& w)
-	{
-		w.DrawRect(GetSize(), Cyan);
-		ChPaint(w, GetSize(), TImg::TB1());
-	}
-};
-
-GUI_APP_MAIN
-{
-	MyApp().Run();
-	return;
-	TopWindow w;
-	Button b;
-	FrameRight<Button> b1;
-	w.Add(b.EdgeStyle().SizePos());
-	b.AddFrame(b1);
-	w.Sizeable().Run();
-	return;
-
-	PromptOKCancel("Test");
-
-	DUMP(ChA(0));
-	DUMP(ChA(1));
-	DUMP(ChB(0));
-	DUMP(ChB(1));
-	VectorMap<String, Value> map;
-	ChSet("ChB", 0, 55);
-	DUMP(ChA(0));
-	DUMP(ChA(1));
-	DUMP(ChB(0));
-	DUMP(ChB(1));
-	DUMP(ChC());
-	DUMP(ChGet("ChA", 1));
-
-	DUMP(CtrlsImg::Iml().GetBinSize());
-
-	int sz2 = 0;
-	int szn = 0;
-	for(int q = 0; q < CtrlsImg::GetCount(); q++) {
-		sz2 += StoreImageAsString(CtrlsImg::Get(q)).GetLength();
-		szn += CtrlsImg::GetId(q).GetLength() + 1;
-	}
-	DUMP(sz2);
-	DUMP(szn);
-	String h;
-	for(int q = 0; q < CtrlsImg::GetCount(); q++) {
-		Image m = CtrlsImg::Get(q);
-		h.Cat((byte *)~m, 4 * m.GetLength());
-	}
-	DUMP(ZCompress(h).GetLength());
-}
+#include <CtrlLib/CtrlLib.h>
+
+#define Time    XTime
+#define Font    XFont
+#define Display XDisplay
+#define Picture XPicture
+
+#include <limits.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
+#undef Picture
+#undef Time
+#undef Font
+#undef Display
+
+
+namespace Upp {
+enum {
+	GTK_BOX,
+	GTK_CHECK,
+	GTK_OPTION,
+	GTK_ARROW,
+	GTK_SLIDER,
+	GTK_ICON,
+	GTK_EXT,
+	GTK_SHADOW,
+	GTK_FOCUS,
+	GTK_FLATBOX,
+	GTK_BGBOX,
+	GTK_THEMEICON,
+
+	GTK_MARGIN1 = 0x0010,
+	GTK_MARGIN2 = 0x0020,
+	GTK_MARGIN3 = 0x0030,
+	GTK_MARGIN4 = 0x0040,
+	GTK_XMARGIN = 0x0080,
+
+	GTK_VAL1    = 0x0100,
+	GTK_VAL2    = 0x0200,
+	GTK_VAL3    = 0x0300,
+	GTK_VAL4    = 0x0400,
+
+	GTK_TOP     = 0x1000,
+	GTK_VCENTER = 0x2000,
+	GTK_BOTTOM  = 0x3000,
+	GTK_LEFT    = 0x4000,
+	GTK_HCENTER = 0x5000,
+	GTK_RIGHT   = 0x6000,
+
+	GTK_DEFLATE1 = 0x10000,
+	GTK_DEFLATE2 = 0x20000,
+	GTK_DEFLATE3 = 0x30000,
+	GTK_DEFLATE4 = 0x40000,
+
+	GTK_RANGEA =  0x100000,
+	GTK_RANGEB =  0x200000,
+	GTK_RANGEC =  0x400000,
+	GTK_RANGED =  0x800000,
+};
+	struct ChGtkI : Moveable<ChGtkI> {
+		GtkWidget  *widget;
+		const char *detail;
+		int         type;
+	};
+
+	Image GetGTK(GtkWidget *widget, int state, int shadow, const char *detail, int type, int cx, int cy);
+	Vector<ChGtkI>& ChGtkIs();
+	GtkWidget *ChGtkLast();
+	const char *ChGtkLastDetail();
+	int ChGtkLastType();
+	void ChGtkNew(GtkWidget *widget, const char *detail, int type);
+	void ChGtkNew(const char *detail, int type);
+	Value GtkLookFn(Draw& w, const Rect& rect, const Value& v, int op);
+	Value GtkMakeCh(int shadow, int state, const Rect& r, const Rect& m);
+	Value GtkMakeCh(int shadow, int state, const Rect& r);
+	Value GtkMakeCh(int shadow, int state);
+	void GtkCh(Value& look, int shadow, int state);
+	void GtkCh(Value *look, const char *d);
+	void GtkCh(Value *look);
+	void GtkChButton(Value *look);
+	void GtkChSlider(Value *look);
+	void GtkChTrough(Value *look);
+	void GtkChWith(Value& look, int shadow, int state, const Image& img, Color c, Point offset = Point(0, 0));
+	void GtkChWith(Value *look, const char *d, const Image& img, Point offset = Point(0, 0));
+	void GtkChButtonWith(Value *look, const Image& img);
+	void GtkChArrow(Value *look, const Image& img, Point offset = Point(0, 0));
+	int GtkInt(GtkWidget *widget, const char *id);
+	int GtkInt(const char *id);
+	void GtkIml(int uii, GtkWidget *w, int shadow, int state, const char *detail, int type, int cx, int cy);
+	void GtkIml(int uii, GtkWidget *w, int shadow, const char *detail, int type, int cx, int cy);
+	Color ChGtkColor(int ii, GtkWidget *widget);
+	void ChGtkColor(Color& c, int ii);
+	void ChGtkColor(Color *c, int ii);
+	Image GtkImage(const char *id, int size, int maxh = INT_MAX);
+	void ChCtrlImg(int ii, const char *id, int size, int maxh = INT_MAX);
+	Image GtkChImgLook(int shadow, int state, int kind);
+	void GtkChImgWith(Value& look, int shadow, int state, const Image& img, Color c, int kind, Point offset = Point(0, 0));
+	void GtkChImgWith(Value *look, const Image& img, int kind, Point offset = Point(0, 0));
+	bool IsEmptyImage(const Image& m);
+	Image GtkThemeIcon(const char *name, int size);
+	int GtkStyleInt(const char *name);
+	String GtkStyleString(const char *name);
+};
+
+using namespace Upp;
+
+struct LookDisplay : public Display {
+	virtual void Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const
+	{
+		w.DrawRect(r, Cyan);
+		Rect rr = r;
+		rr.SetSize(16, 16);
+		ChPaint(w, rr, q);
+		rr.left += 20;
+		rr.SetSize(16, 50);
+		ChPaint(w, rr, q);
+		rr.left += 20;
+		rr.SetSize(50, 16);
+		ChPaint(w, rr, q);
+		rr.left += 55;
+		rr.SetSize(50, 50);
+		ChPaint(w, rr, q);
+	}
+};
+
+struct MyApp : TopWindow {
+	ArrayCtrl list;
+	
+	void PutLook(const char *s, Value look)
+	{
+		list.Add(s, look);
+	}
+	
+	void PutLooks(const char *s, const Value *look, int count = 4)
+	{
+		for(int i = 0; i < count; i++)
+			PutLook(String().Cat() << s << " " << i, look[i]);
+	}
+	
+	MyApp() {
+		Title(GtkStyleString("gtk-theme-name"));
+		
+		list.SetLineCy(50);
+		list.AddColumn("Element");
+		list.AddColumn("Image").SetDisplay(Single<LookDisplay>());
+
+
+		PutLooks("ScrollBar::GetStyle().up", ScrollBar::StyleDefault().up.look);
+
+		Value look[4];
+		ChGtkNew("vscrollbar", GTK_BGBOX|GTK_TOP|GTK_RANGEA);
+		GtkCh(look, "02141111");
+		PutLooks("ChGtkNew(vscrollbar, GTK_ARROW)", look);
+
+		Add(list.SizePos());
+		list.NoCursor();
+	}
+};
+
+GUI_APP_MAIN
+{
+	MyApp().Run();
+}
diff --git a/uppdev/Chameleon/Chameleon.iml b/uppdev/Chameleon/Chameleon.iml
index 447e209b1..68e38df6b 100644
--- a/uppdev/Chameleon/Chameleon.iml
+++ b/uppdev/Chameleon/Chameleon.iml
@@ -1,3 +1,4 @@
+PREMULTIPLIED
 IMAGE_ID(B)
 IMAGE_ID(Bh)
 IMAGE_ID(Bp)
diff --git a/uppdev/Chameleon/Chameleon.lay b/uppdev/Chameleon/Chameleon.lay
index 718563bd6..30fe0a724 100644
--- a/uppdev/Chameleon/Chameleon.lay
+++ b/uppdev/Chameleon/Chameleon.lay
@@ -6,3 +6,4 @@ LAYOUT(ChameleonLayout, 228, 68)
 	ITEM(Button, img, SetLabel(t_("Image")).LeftPosZ(80, 68).TopPosZ(36, 24))
 	ITEM(Button, fn, SetLabel(t_("Function")).LeftPosZ(152, 68).TopPosZ(36, 24))
 END_LAYOUT
+