diff --git a/reference/AK/main.cpp b/reference/AK/main.cpp
index 25ff14d59..12cd044cb 100644
--- a/reference/AK/main.cpp
+++ b/reference/AK/main.cpp
@@ -29,7 +29,7 @@ App::App()
 {
 	SetLang(LNGC_('E','N','U','S', CHARSET_UTF8));
 	AddFrame(menubar);
-	menubar.Set(THISBACK(MainMenu));
+	menubar.Set(THISFN(MainMenu));
 	Sizeable();
 }
 
diff --git a/reference/RescaleFilter/RescaleFilter.upp b/reference/RescaleFilter/RescaleFilter.upp
index 07de18edf..4cb1a2a20 100644
--- a/reference/RescaleFilter/RescaleFilter.upp
+++ b/reference/RescaleFilter/RescaleFilter.upp
@@ -1,7 +1,5 @@
 description "Demonstrates RescaleFilter for hight-quality image resizing\377";
 
-optimize_speed;
-
 uses
 	CtrlLib,
 	Painter,
diff --git a/reference/RescaleFilter/main.cpp b/reference/RescaleFilter/main.cpp
index b761e4dc7..d49b9266b 100644
--- a/reference/RescaleFilter/main.cpp
+++ b/reference/RescaleFilter/main.cpp
@@ -59,9 +59,9 @@ struct MyApp : TopWindow {
 		method.Add(FILTER_LANCZOS3, "Lanczos 3");
 		method.Add(FILTER_LANCZOS4, "Lanczos 4");
 		method.Add(FILTER_LANCZOS5, "Lanczos 5");
-		method <<= THISBACK(Sync);
 		Add(method.TopPos(0, STDSIZE).RightPos(0, 200));
 		method <<= FILTER_NEAREST;;
+		method << [=] { Refresh(); };
 
 		Zoomable();
 		Maximize();
diff --git a/reference/ScrollBar/ScrollBar.upp b/reference/ScrollBar/ScrollBar.upp
index 2e5af8e01..b560dba21 100644
--- a/reference/ScrollBar/ScrollBar.upp
+++ b/reference/ScrollBar/ScrollBar.upp
@@ -1,4 +1,4 @@
-description "Scrolling view using ScrollBar";
+description "Scrolling view using ScrollBar\377";
 
 uses
 	CtrlLib;
diff --git a/reference/ScrollBar/init b/reference/ScrollBar/init
new file mode 100644
index 000000000..96246e16c
--- /dev/null
+++ b/reference/ScrollBar/init
@@ -0,0 +1,4 @@
+#ifndef _ScrollBar_icpp_init_stub
+#define _ScrollBar_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/reference/ScrollBar/main.cpp b/reference/ScrollBar/main.cpp
index f06f57d08..83683522b 100644
--- a/reference/ScrollBar/main.cpp
+++ b/reference/ScrollBar/main.cpp
@@ -42,17 +42,10 @@ struct App : TopWindow {
 		sb.SetTotal(n * GetLineHeight());
 	}
 
-	void Scroll()
-	{
-		Refresh();
-	}
-
-	typedef App CLASSNAME;
-
 	App() {
 		Sizeable().Zoomable().BackPaint();
 		AddFrame(sb);
-		sb.WhenScroll = THISBACK(Scroll);
+		sb.WhenScroll = [=] { Refresh(); };
 		sb.SetLine(GetLineHeight());
 	}
 };
diff --git a/reference/SetLayout/SetLayout.cpp b/reference/SetLayout/SetLayout.cpp
index b1ed56b63..4749471f5 100644
--- a/reference/SetLayout/SetLayout.cpp
+++ b/reference/SetLayout/SetLayout.cpp
@@ -7,16 +7,11 @@ using namespace Upp;
 
 class MyApp : public WithLayout1<TopWindow> {
 public:
-	void Layout1()   { SetLayout_Layout1(*this); }
-	void Layout2()   { SetLayout_Layout2(*this); }
-
-	typedef MyApp CLASSNAME;
-
 	MyApp()
 	{
 		CtrlLayout(*this, "Window title");
-		layout1 <<= THISBACK(Layout1);
-		layout2 <<= THISBACK(Layout2);
+		layout1 << [=] { SetLayout_Layout1(*this); };
+		layout2 << [=] { SetLayout_Layout2(*this); };
 	}
 };
 
diff --git a/reference/Slider/Slider.upp b/reference/Slider/Slider.upp
index 7125c2475..c38ffa04c 100644
--- a/reference/Slider/Slider.upp
+++ b/reference/Slider/Slider.upp
@@ -1,4 +1,4 @@
-description "SliderCtrl example";
+description "SliderCtrl example\377";
 
 uses
 	CtrlLib;
diff --git a/reference/Slider/init b/reference/Slider/init
new file mode 100644
index 000000000..987ff496d
--- /dev/null
+++ b/reference/Slider/init
@@ -0,0 +1,4 @@
+#ifndef _Slider_icpp_init_stub
+#define _Slider_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/reference/Slider/main.cpp b/reference/Slider/main.cpp
index 931beb7aa..991d6fc08 100644
--- a/reference/Slider/main.cpp
+++ b/reference/Slider/main.cpp
@@ -17,7 +17,7 @@ struct App : TopWindow {
 	App() {
 		Sizeable().Zoomable();
 
-		slider <<= THISBACK(Slider);
+		slider << THISFN(Slider);
 		slider.Range(700);
 		slider <<= 250;
 		Add(slider.BottomPosZ(5, 30).HSizePos(10, 10));
diff --git a/reference/SqlCtrls/SqlCtrls.upp b/reference/SqlCtrls/SqlCtrls.upp
index d48405557..4e758677a 100644
--- a/reference/SqlCtrls/SqlCtrls.upp
+++ b/reference/SqlCtrls/SqlCtrls.upp
@@ -12,6 +12,5 @@ file
 	SqlCtrls.lay;
 
 mainconfig
-	"" = "GUI";,
-	"" = "GUI SCH";
+	"" = "GUI";
 
diff --git a/reference/SqlCtrls/main.cpp b/reference/SqlCtrls/main.cpp
index 6413dc85c..e039868c7 100644
--- a/reference/SqlCtrls/main.cpp
+++ b/reference/SqlCtrls/main.cpp
@@ -69,9 +69,9 @@ PersonsDlg::PersonsDlg()
 {
 	CtrlLayout(*this, "Persons");
 
-	create <<= THISBACK(Create);
-	edit <<= THISBACK(Edit);
-	remove <<= THISBACK(Remove);
+	create << THISFN(Create);
+	edit << THISFN(Edit);
+	remove << THISFN(Remove);
 	
 	list.SetTable(PERSON);
 	list.AddKey(ID);
diff --git a/reference/Switch/main.cpp b/reference/Switch/main.cpp
index fe67ecf83..10cefad5e 100644
--- a/reference/Switch/main.cpp
+++ b/reference/Switch/main.cpp
@@ -6,14 +6,8 @@ using namespace Upp;
 #include <CtrlCore/lay.h>
 
 struct MyApp1 : public TopWindow {
-	typedef MyApp1 CLASSNAME;
-
 	Switch s;
 
-	void Change(){
-		PromptOK("Switched to value " + AsString(~s));
-	}
-
 	MyApp1() {
 		Title("Switch example");
 		Add(s);
@@ -24,7 +18,7 @@ struct MyApp1 : public TopWindow {
 		s.Add("Something", "Another case");
 		s.DisableValue(12);
 		s <<= 13.5;
-		s <<= THISBACK(Change);
+		s << [=] { PromptOK("Switched to value " + ~~s); };
 	}
 };
 
diff --git a/reference/TreeCtrl/main.cpp b/reference/TreeCtrl/main.cpp
index 8b7f1705e..c7b5c2957 100644
--- a/reference/TreeCtrl/main.cpp
+++ b/reference/TreeCtrl/main.cpp
@@ -24,7 +24,7 @@ struct App : TopWindow {
 	}
 
 	void CloseDir(int id) {
-		tree1.RemoveChildren(id);
+		;
 	}
 
 	void LoadTree(int parent, const String& path, Progress& pi)
@@ -43,18 +43,13 @@ struct App : TopWindow {
 					q = tree2.Add(parent, ff.IsFolder() ? CtrlImg::Dir() : CtrlImg::File(),
 				                  edit.Top(), 150);
 				else
-				 	q = tree2.Add(parent, ff.IsFolder() ? CtrlImg::Dir() : CtrlImg::File(), n);
+					q = tree2.Add(parent, ff.IsFolder() ? CtrlImg::Dir() : CtrlImg::File(), n);
 				if(ff.IsFolder())
 					LoadTree(q, AppendFileName(path, n), pi);
 			}
 		}
 	}
 
-	void ShowPath() {
-		info = ~tree1;
-	}
-
-
 	App() {
 		horz.Add(tree1);
 		horz.Add(tree2);
@@ -64,8 +59,8 @@ struct App : TopWindow {
 		for(int i = 0; i < 10; i++)
 			optree.Add(i ? rand() % i : 0, x[i], AsString(i));
 		tree1.MultiSelect();
-		tree1.WhenOpen = THISBACK(OpenDir);
-		tree1.WhenClose = THISBACK(CloseDir);
+		tree1.WhenOpen = THISFN(OpenDir);
+		tree1.WhenClose = [=] (int id) { tree1.RemoveChildren(id); };
 	#ifdef PLATFORM_WIN32
 		String dir = String(GetExeFilePath()[0], 1) + ":\\";
 	#else
@@ -80,7 +75,7 @@ struct App : TopWindow {
 		tree2.SortDeep(0);
 		Sizeable();
 
-		tree1.WhenCursor = THISBACK(ShowPath);
+		tree1.WhenCursor = [=] { info = ~tree1; };
 		tree1.AddFrame(info);
 	}
 };