diff --git a/uppbox/MakeInstall4/Main.cpp b/uppbox/MakeInstall4/Main.cpp
index 6263f000f..afa6dee95 100644
--- a/uppbox/MakeInstall4/Main.cpp
+++ b/uppbox/MakeInstall4/Main.cpp
@@ -1,3 +1,127 @@
+<<<<<<< .mine
+#include <Core/Core.h>
+#include <plugin/bz2/bz2.h>
+
+using namespace Upp;
+
+void Log(const char *txt)
+{
+	Cout() << txt << "\r\n";
+}
+
+void Error(const char *e)
+{
+	Log(e);
+	abort();
+}
+
+String Syx(const char *s)
+{
+	Log(s);
+	String r;
+	int q = Sys(s, r);
+	if(q)
+		Error(String().Cat() << "Failed: " << s << "\r\n" <<
+		      "Exit code: " << q << "\r\n" <<
+		      "Output: " << r);
+	return r;
+}
+
+void CopyFolder(const char *src, const char *dst, bool deep = true)
+{
+	Cout() << Sprintf("Directory %s\n", src);
+	RealizeDirectory(dst);
+	FindFile ff(String(src) + "/*.*");
+	while(ff) {
+		String s = AppendFileName(src, ff.GetName());
+		String d = AppendFileName(dst, ff.GetName());
+		if(ff.IsFile()) {
+			String q = LoadFile(s);
+			String ext = ToLower(GetFileExt(s));
+			if(ext != ".aux" && ext != ".$old")
+				SaveFile(d, q);
+		}
+		else
+		if(ff.IsFolder() && *ff.GetName() != '.') {
+			if(deep || *GetFileExt(s))
+				CopyFolder(s, d, deep);
+		}
+		ff.Next();
+	}
+}
+
+int CrLfSm(int c)
+{
+	return c == ';' || c == '\r' || c == '\n';
+}
+
+void CopyFolders(const char *src, const char *dst, const char *folders, bool deep = true)
+{
+	Vector<String> folder = Split(LoadFile(folders), CrLfSm);
+	for(int i = 0; i < folder.GetCount(); i++)
+		CopyFolder(AppendFileName(src, folder[i]), AppendFileName(dst, folder[i]), deep);
+}
+
+String tmp = "u:/upp.tmp";
+String upptmp = tmp + "/u";
+String ass = upptmp + "/uppsrc";
+String upp = "u:/upp.src";
+String uppsrc = upp + "/uppsrc";
+String win32 = "u:/theide";
+
+void CopyIdeFile(const String& fn)
+{
+	SaveFile(upptmp + '/' + fn, LoadFile(win32 + '/' + fn));
+}
+
+int NoDigit(int c) { return IsDigit(c) ? 0 : c; }
+int FilterVersion(int c) { return c == ':' ? '_' : c; }
+
+void Make(String pkg, String exe)
+{
+	Syx(win32 + "/umk " + ass + " " + pkg + " " + win32 + "/MSC9.bm -ar " + upptmp + "/" + exe);
+}
+
+CONSOLE_APP_MAIN
+{
+	if(FileExists("u:/upp/umk.exe"))
+		win32 = "u:/upp";
+	else
+		win32 = "u:/Win32/theide";
+
+	Vector<String> s = Split(Syx("svnversion " + upp), NoDigit);
+	if(s.GetCount() == 0)
+		Error("Invalid version");
+	String version = s.Top();
+	Log("version: " + version);
+	
+	DeleteFolderDeep(tmp);
+	RealizeDirectory(tmp);
+	
+	CopyFolders(uppsrc, ass, uppsrc + "/packages");
+	CopyFolders(uppsrc, ass, uppsrc + "/packages1", false);
+	CopyFolders(upp, upptmp, uppsrc + "/assemblies");
+	SaveFile(upptmp + "/uppsrc/guiplatform.h", "");
+	SaveFile(upptmp + "/uppsrc/uppconfig.h", LoadFile(uppsrc + "/uppconfig.h"));
+	SaveFile(upptmp + "/uppsrc/ide/version.h", "#define IDE_VERSION \"" + version + "\"\r\n");
+	Make("ide", "theide.exe");
+	Make("umk", "umk.exe");
+
+	CopyIdeFile("dbghelp.dll");
+	CopyIdeFile("en-us.scd");
+	CopyIdeFile("en-gb.scd");
+
+	SetCurrentDirectory(upptmp);
+	
+	SaveFile("install.upp", LoadFile(uppsrc + "/install.upp"));
+	SaveFile("license.chk", "1");
+
+	Syx(win32 + "/7za/7za.exe a " + tmp + "/upp.7z * -r -mx -m0fb=255 -mf=off");
+	SetCurrentDirectory(tmp);
+	Syx(win32 + "/umk " + upp + "/uppbox," + upp + "/uppsrc WinInstaller2 " + win32 +
+	    "/MSC9 -ar u:/upload/upp-win32-" + Filter(version, FilterVersion) + ".exe");
+}
+=======
 #include <Core/Core.h>
 #include <plugin/bz2/bz2.h>
 
@@ -120,3 +244,4 @@ CONSOLE_APP_MAIN
 	Syx(win32 + "/umk " + upp + "/uppbox," + upp + "/uppsrc WinInstaller2 " + win32 +
 	    "/MSC9 -ar u:/upload/upp-win32-" + Filter(version, FilterVersion) + ".exe");
 }
+>>>>>>> .r5024
diff --git a/uppbox/MakeInstall4/MakeInstall4.upp b/uppbox/MakeInstall4/MakeInstall4.upp
index dce329ef9..09d311a8e 100644
--- a/uppbox/MakeInstall4/MakeInstall4.upp
+++ b/uppbox/MakeInstall4/MakeInstall4.upp
@@ -1,4 +1,4 @@
-description "Install creator - Wine version for nightly builds";
+description "Install creator - Wine version for nightly builds\377";
 
 uses
 	plugin\bz2,
diff --git a/uppbox/uppweb/article.tpp/all.i b/uppbox/uppweb/article.tpp/all.i
index 68ba7a2cd..3d0f820e8 100644
--- a/uppbox/uppweb/article.tpp/all.i
+++ b/uppbox/uppweb/article.tpp/all.i
@@ -1,64 +1,64 @@
-TOPIC("uppp$en-us")
-#include "uppp$en-us.tppi"
-END_TOPIC
-
-TOPIC("IDEoverview$en-us")
-#include "IDEoverview$en-us.tppi"
-END_TOPIC
-
-TOPIC("IDE$en-us")
-#include "IDE$en-us.tppi"
-END_TOPIC
-
-TOPIC("roadmap$en-us")
-#include "roadmap$en-us.tppi"
-END_TOPIC
-
-TOPIC("Menu$en-us")
-#include "Menu$en-us.tppi"
-END_TOPIC
-
-TOPIC("upp$en-us")
-#include "upp$en-us.tppi"
-END_TOPIC
-
-TOPIC("IDE$pl-pl")
-#include "IDE$pl-pl.tppi"
-END_TOPIC
-
-TOPIC("article2$en-us")
-#include "article2$en-us.tppi"
-END_TOPIC
-
-TOPIC("uppheap$en-us")
-#include "uppheap$en-us.tppi"
-END_TOPIC
-
-TOPIC("CallbackExample$en-us")
-#include "CallbackExample$en-us.tppi"
+TOPIC("602$en-us")
+#include "602$en-us.tppi"
 END_TOPIC
 
 TOPIC("602long$en-us")
 #include "602long$en-us.tppi"
 END_TOPIC
 
-TOPIC("602$en-us")
-#include "602$en-us.tppi"
+TOPIC("CallbackExample$en-us")
+#include "CallbackExample$en-us.tppi"
 END_TOPIC
 
-TOPIC("trc_commentary$en-us")
-#include "trc_commentary$en-us.tppi"
+TOPIC("IDE$en-us")
+#include "IDE$en-us.tppi"
 END_TOPIC
 
-TOPIC("daniel$en-us")
-#include "daniel$en-us.tppi"
+TOPIC("IDE$pl-pl")
+#include "IDE$pl-pl.tppi"
 END_TOPIC
 
-TOPIC("blitz$en-us")
-#include "blitz$en-us.tppi"
+TOPIC("IDEoverview$en-us")
+#include "IDEoverview$en-us.tppi"
+END_TOPIC
+
+TOPIC("Menu$en-us")
+#include "Menu$en-us.tppi"
 END_TOPIC
 
 TOPIC("article$en-us")
 #include "article$en-us.tppi"
 END_TOPIC
 
+TOPIC("article2$en-us")
+#include "article2$en-us.tppi"
+END_TOPIC
+
+TOPIC("blitz$en-us")
+#include "blitz$en-us.tppi"
+END_TOPIC
+
+TOPIC("daniel$en-us")
+#include "daniel$en-us.tppi"
+END_TOPIC
+
+TOPIC("roadmap$en-us")
+#include "roadmap$en-us.tppi"
+END_TOPIC
+
+TOPIC("trc_commentary$en-us")
+#include "trc_commentary$en-us.tppi"
+END_TOPIC
+
+TOPIC("upp$en-us")
+#include "upp$en-us.tppi"
+END_TOPIC
+
+TOPIC("uppheap$en-us")
+#include "uppheap$en-us.tppi"
+END_TOPIC
+
+TOPIC("uppp$en-us")
+#include "uppp$en-us.tppi"
+END_TOPIC
+
diff --git a/uppbox/uppweb/examples.tpp/all.i b/uppbox/uppweb/examples.tpp/all.i
index a19ff2014..42d49182c 100644
--- a/uppbox/uppweb/examples.tpp/all.i
+++ b/uppbox/uppweb/examples.tpp/all.i
@@ -1,92 +1,92 @@
-TOPIC("Converter$ru-ru")
-#include "Converter$ru-ru.tppi"
-END_TOPIC
-
-TOPIC("AnimatedHello$en-us")
-#include "AnimatedHello$en-us.tppi"
-END_TOPIC
-
-TOPIC("Button$en-us")
-#include "Button$en-us.tppi"
-END_TOPIC
-
-TOPIC("SQLApp$en-us")
-#include "SQLApp$en-us.tppi"
-END_TOPIC
-
-TOPIC("clock$en-us")
-#include "clock$en-us.tppi"
+TOPIC("AddressBook$en-us")
+#include "AddressBook$en-us.tppi"
 END_TOPIC
 
 TOPIC("AddressBook$ru-ru")
 #include "AddressBook$ru-ru.tppi"
 END_TOPIC
 
-TOPIC("Color$en-us")
-#include "Color$en-us.tppi"
-END_TOPIC
-
-TOPIC("ImageView$en-us")
-#include "ImageView$en-us.tppi"
-END_TOPIC
-
-TOPIC("CompDir$en-us")
-#include "CompDir$en-us.tppi"
-END_TOPIC
-
-TOPIC("HelloWorld$en-us")
-#include "HelloWorld$en-us.tppi"
-END_TOPIC
-
-TOPIC("Bombs$en-us")
-#include "Bombs$en-us.tppi"
-END_TOPIC
-
-TOPIC("Puzzle$en-us")
-#include "Puzzle$en-us.tppi"
-END_TOPIC
-
-TOPIC("UWord$en-us")
-#include "UWord$en-us.tppi"
-END_TOPIC
-
-TOPIC("Scribble$en-us")
-#include "Scribble$en-us.tppi"
-END_TOPIC
-
-TOPIC("AddressBook$en-us")
-#include "AddressBook$en-us.tppi"
-END_TOPIC
-
-TOPIC("Converter$en-us")
-#include "Converter$en-us.tppi"
-END_TOPIC
-
-TOPIC("XmlView$en-us")
-#include "XmlView$en-us.tppi"
-END_TOPIC
-
-TOPIC("CodeMetric$en-us")
-#include "CodeMetric$en-us.tppi"
-END_TOPIC
-
-TOPIC("HomeBudget$en-us")
-#include "HomeBudget$en-us.tppi"
-END_TOPIC
-
-TOPIC("EyeCare$en-us")
-#include "EyeCare$en-us.tppi"
-END_TOPIC
-
-TOPIC("HelloWorld$ru-ru")
-#include "HelloWorld$ru-ru.tppi"
+TOPIC("AnimatedHello$en-us")
+#include "AnimatedHello$en-us.tppi"
 END_TOPIC
 
 TOPIC("AnimatedHello$ru-ru")
 #include "AnimatedHello$ru-ru.tppi"
 END_TOPIC
 
+TOPIC("Bombs$en-us")
+#include "Bombs$en-us.tppi"
+END_TOPIC
+
+TOPIC("Button$en-us")
+#include "Button$en-us.tppi"
+END_TOPIC
+
+TOPIC("CodeMetric$en-us")
+#include "CodeMetric$en-us.tppi"
+END_TOPIC
+
+TOPIC("Color$en-us")
+#include "Color$en-us.tppi"
+END_TOPIC
+
+TOPIC("CompDir$en-us")
+#include "CompDir$en-us.tppi"
+END_TOPIC
+
+TOPIC("Converter$en-us")
+#include "Converter$en-us.tppi"
+END_TOPIC
+
+TOPIC("Converter$ru-ru")
+#include "Converter$ru-ru.tppi"
+END_TOPIC
+
 TOPIC("Days$en-us")
 #include "Days$en-us.tppi"
 END_TOPIC
 
+TOPIC("EyeCare$en-us")
+#include "EyeCare$en-us.tppi"
+END_TOPIC
+
+TOPIC("HelloWorld$en-us")
+#include "HelloWorld$en-us.tppi"
+END_TOPIC
+
+TOPIC("HelloWorld$ru-ru")
+#include "HelloWorld$ru-ru.tppi"
+END_TOPIC
+
+TOPIC("HomeBudget$en-us")
+#include "HomeBudget$en-us.tppi"
+END_TOPIC
+
+TOPIC("ImageView$en-us")
+#include "ImageView$en-us.tppi"
+END_TOPIC
+
+TOPIC("Puzzle$en-us")
+#include "Puzzle$en-us.tppi"
+END_TOPIC
+
+TOPIC("SQLApp$en-us")
+#include "SQLApp$en-us.tppi"
+END_TOPIC
+
+TOPIC("Scribble$en-us")
+#include "Scribble$en-us.tppi"
+END_TOPIC
+
+TOPIC("UWord$en-us")
+#include "UWord$en-us.tppi"
+END_TOPIC
+
+TOPIC("XmlView$en-us")
+#include "XmlView$en-us.tppi"
+END_TOPIC
+
+TOPIC("clock$en-us")
+#include "clock$en-us.tppi"
+END_TOPIC
+
diff --git a/uppbox/uppweb/other.tpp/Centrum1$cs-cz.tpp b/uppbox/uppweb/other.tpp/Centrum1$cs-cz.tpp
index 703bb69d2..880aa2725 100644
--- a/uppbox/uppweb/other.tpp/Centrum1$cs-cz.tpp
+++ b/uppbox/uppweb/other.tpp/Centrum1$cs-cz.tpp
@@ -1,4 +1,5 @@
-topic "Utimate++ - politicky nekorektní platforma";[2 $$0,0#00000000000000000000000000000000:Default]
+topic "Utimate++ - politicky nekorektní platforma";
+[2 $$0,0#00000000000000000000000000000000:Default]
 [l288;i1120;a17;O9;~~~.1408;2 $$1,0#10431211400427159095818037425705:param]
 [a83;*R6 $$2,5#31310162474203024125188417583966:caption]
 [b83;*4 $$3,5#07864147445237544204411237157677:title]
@@ -23,11 +24,11 @@ topic "Utimate++ - politicky nekorektní platforma";[2 $$0,0#0000000000000000000
 [b117;*+117 $$22,21#27457433418004101424360058862402:Caption]
 [i128;*C@(28.42.150)2 $$23,23#90519220486603166734501227306500:code]
 [{_}%CS-CZ 
-[s0;*R6 U`+`+&]
+[s0; [*R6 U`+`+]&]
 [s0;*R6 &]
-[s0;*R6 Úvod do U`+`+&]
+[s0; [*R6 Úvod do U`+`+]&]
 [s0;*R6 &]
-[s0;*R6 1. Utimate`+`+ `- politicky nekorektní platforma&]
+[s0; [*R6 1. Utimate`+`+ `- politicky nekorektní platforma]&]
 [s22; 1. Co je U`+`+&]
 [s21; Pod nabubřelým názvem Ultimate`+`+ (který se většinou 
 zkracuje na přijatelnější U`+`+) najdete cosi, co by se dalo 
@@ -524,41 +525,41 @@ změně datumu:&]
 [s0;= &]
 [s0; Kód aplikace:&]
 [s0; &]
-[s0;i128;*C@(28.42.150) #include <CtrlLib/CtrlLib.h>&]
+[s0;i128; [*C@(28.42.150) #include <CtrlLib/CtrlLib.h>]&]
 [s0;i128;*C@(28.42.150) &]
 [s23; #define LAYOUTFILE <Days/Days.lay>&]
-[s0;i128;*C@(28.42.150) #include <CtrlCore/lay.h>&]
+[s0;i128; [*C@(28.42.150) #include <CtrlCore/lay.h>]&]
 [s0;i128;*C@(28.42.150) &]
-[s0;i128;*C@(28.42.150) class Days : public WithDaysLayout<TopWindow> 
-`{&]
-[s0;i128;*C@(28.42.150) public:&]
-[s0;i128;*C@(28.42.150) -|void Compute();&]
+[s0;i128; [*C@(28.42.150) class Days : public WithDaysLayout<TopWindow> 
+`{]&]
+[s0;i128; [*C@(28.42.150) public:]&]
+[s0;i128; [*C@(28.42.150) -|void Compute();]&]
 [s0;i128;*C@(28.42.150) &]
-[s0;i128;*C@(28.42.150) -|typedef Days CLASSNAME;&]
-[s0;i128;*C@(28.42.150) -|Days();&]
-[s0;i128;*C@(28.42.150) `};&]
+[s0;i128; [*C@(28.42.150) -|typedef Days CLASSNAME;]&]
+[s0;i128; [*C@(28.42.150) -|Days();]&]
+[s0;i128; [*C@(28.42.150) `};]&]
 [s0;i128;*C@(28.42.150) &]
-[s0;i128;*C@(28.42.150) void Days`::Compute()&]
-[s0;i128;*C@(28.42.150) `{&]
-[s0;i128;*C@(28.42.150) -|result `= IsNull(date1) `|`| IsNull(date2) 
-? `"`" :&]
-[s0;i128;*C@(28.42.150) -|         Format(`"There is %d day(s) between 
-%`` and %```",&]
-[s0;i128;*C@(28.42.150)                     abs(Date(`~date1) `- 
-Date(`~date2)), `~date1, `~date2);&]
-[s0;i128;*C@(28.42.150) `}&]
+[s0;i128; [*C@(28.42.150) void Days`::Compute()]&]
+[s0;i128; [*C@(28.42.150) `{]&]
+[s0;i128; [*C@(28.42.150) -|result `= IsNull(date1) `|`| IsNull(date2) 
+? `"`" :]&]
+[s0;i128; [*C@(28.42.150) -|         Format(`"There is %d day(s) between 
+%`` and %```",]&]
+[s0;i128; [*C@(28.42.150)                     abs(Date(`~date1) `- 
+Date(`~date2)), `~date1, `~date2);]&]
+[s0;i128; [*C@(28.42.150) `}]&]
 [s0;i128;*C@(28.42.150) &]
-[s0;i128;*C@(28.42.150) Days`::Days()&]
-[s0;i128;*C@(28.42.150) `{&]
-[s0;i128;*C@(28.42.150) -|CtrlLayout(`*this, `"Days`");&]
-[s0;i128;*C@(28.42.150) -|date1 <<`= THISBACK(Compute);&]
-[s0;i128;*C@(28.42.150) -|date2 <<`= THISBACK(Compute);&]
-[s0;i128;*C@(28.42.150) `}&]
+[s0;i128; [*C@(28.42.150) Days`::Days()]&]
+[s0;i128; [*C@(28.42.150) `{]&]
+[s0;i128; [*C@(28.42.150) -|CtrlLayout(`*this, `"Days`");]&]
+[s0;i128; [*C@(28.42.150) -|date1 <<`= THISBACK(Compute);]&]
+[s0;i128; [*C@(28.42.150) -|date2 <<`= THISBACK(Compute);]&]
+[s0;i128; [*C@(28.42.150) `}]&]
 [s0;i128;*C@(28.42.150) &]
-[s0;i128;*C@(28.42.150) GUI`_APP`_MAIN&]
-[s0;i128;*C@(28.42.150) `{&]
-[s0;i128;*C@(28.42.150) -|Days().Run();&]
-[s0;i128;*C@(28.42.150) `}&]
+[s0;i128; [*C@(28.42.150) GUI`_APP`_MAIN]&]
+[s0;i128; [*C@(28.42.150) `{]&]
+[s0;i128; [*C@(28.42.150) -|Days().Run();]&]
+[s0;i128; [*C@(28.42.150) `}]&]
 [s0;i128;*C@(28.42.150) &]
 [s22; 3. Trocha filozofie a politicky nekorektních názorů&]
 [s21; Základní kritikou se kterou se ohledně U`+`+ setkáváme 
diff --git a/uppbox/uppweb/reference.tpp/all.i b/uppbox/uppweb/reference.tpp/all.i
index 8f578efcd..95297303c 100644
--- a/uppbox/uppweb/reference.tpp/all.i
+++ b/uppbox/uppweb/reference.tpp/all.i
@@ -22,10 +22,6 @@ TOPIC("ArrayCtrlEdits$en-us")
 #include "ArrayCtrlEdits$en-us.tppi"
 END_TOPIC
 
-TOPIC("callback$en-us")
-#include "callback$en-us.tppi"
-END_TOPIC
-
 TOPIC("CallbackArgTarget$en-us")
 #include "CallbackArgTarget$en-us.tppi"
 END_TOPIC
@@ -38,42 +34,14 @@ TOPIC("ColumnList$en-us")
 #include "ColumnList$en-us.tppi"
 END_TOPIC
 
-TOPIC("convert$en-us")
-#include "convert$en-us.tppi"
-END_TOPIC
-
-TOPIC("cparser$en-us")
-#include "cparser$en-us.tppi"
-END_TOPIC
-
-TOPIC("ctrlpos$en-us")
-#include "ctrlpos$en-us.tppi"
-END_TOPIC
-
 TOPIC("CtrlRetriever$en-us")
 #include "CtrlRetriever$en-us.tppi"
 END_TOPIC
 
-TOPIC("display$en-us")
-#include "display$en-us.tppi"
-END_TOPIC
-
-TOPIC("draw$en-us")
-#include "draw$en-us.tppi"
-END_TOPIC
-
-TOPIC("drawing$en-us")
-#include "drawing$en-us.tppi"
-END_TOPIC
-
 TOPIC("DynamicDlg$en-us")
 #include "DynamicDlg$en-us.tppi"
 END_TOPIC
 
-TOPIC("events$en-us")
-#include "events$en-us.tppi"
-END_TOPIC
-
 TOPIC("Format$en-us")
 #include "Format$en-us.tppi"
 END_TOPIC
@@ -86,22 +54,10 @@ TOPIC("GuiMT$en-us")
 #include "GuiMT$en-us.tppi"
 END_TOPIC
 
-TOPIC("image$en-us")
-#include "image$en-us.tppi"
-END_TOPIC
-
 TOPIC("ImageDraw$en-us")
 #include "ImageDraw$en-us.tppi"
 END_TOPIC
 
-TOPIC("log$en-us")
-#include "log$en-us.tppi"
-END_TOPIC
-
-TOPIC("menu$en-us")
-#include "menu$en-us.tppi"
-END_TOPIC
-
 TOPIC("OpenGL$en-us")
 #include "OpenGL$en-us.tppi"
 END_TOPIC
@@ -138,6 +94,10 @@ TOPIC("RichTextObject$en-us")
 #include "RichTextObject$en-us.tppi"
 END_TOPIC
 
+TOPIC("SQL_Sqlite3$en-us")
+#include "SQL_Sqlite3$en-us.tppi"
+END_TOPIC
+
 TOPIC("ScrollBar$en-us")
 #include "ScrollBar$en-us.tppi"
 END_TOPIC
@@ -174,10 +134,6 @@ TOPIC("SqlCtrls$en-us")
 #include "SqlCtrls$en-us.tppi"
 END_TOPIC
 
-TOPIC("SQL_Sqlite3$en-us")
-#include "SQL_Sqlite3$en-us.tppi"
-END_TOPIC
-
 TOPIC("StatusBar$en-us")
 #include "StatusBar$en-us.tppi"
 END_TOPIC
@@ -198,14 +154,6 @@ TOPIC("TreeCtrl$en-us")
 #include "TreeCtrl$en-us.tppi"
 END_TOPIC
 
-TOPIC("uscctrl$en-us")
-#include "uscctrl$en-us.tppi"
-END_TOPIC
-
-TOPIC("value$en-us")
-#include "value$en-us.tppi"
-END_TOPIC
-
 TOPIC("VirtualArray$en-us")
 #include "VirtualArray$en-us.tppi"
 END_TOPIC
@@ -214,3 +162,55 @@ TOPIC("XML$en-us")
 #include "XML$en-us.tppi"
 END_TOPIC
 
+TOPIC("callback$en-us")
+#include "callback$en-us.tppi"
+END_TOPIC
+
+TOPIC("convert$en-us")
+#include "convert$en-us.tppi"
+END_TOPIC
+
+TOPIC("cparser$en-us")
+#include "cparser$en-us.tppi"
+END_TOPIC
+
+TOPIC("ctrlpos$en-us")
+#include "ctrlpos$en-us.tppi"
+END_TOPIC
+
+TOPIC("display$en-us")
+#include "display$en-us.tppi"
+END_TOPIC
+
+TOPIC("draw$en-us")
+#include "draw$en-us.tppi"
+END_TOPIC
+
+TOPIC("drawing$en-us")
+#include "drawing$en-us.tppi"
+END_TOPIC
+
+TOPIC("events$en-us")
+#include "events$en-us.tppi"
+END_TOPIC
+
+TOPIC("image$en-us")
+#include "image$en-us.tppi"
+END_TOPIC
+
+TOPIC("log$en-us")
+#include "log$en-us.tppi"
+END_TOPIC
+
+TOPIC("menu$en-us")
+#include "menu$en-us.tppi"
+END_TOPIC
+
+TOPIC("uscctrl$en-us")
+#include "uscctrl$en-us.tppi"
+END_TOPIC
+
+TOPIC("value$en-us")
+#include "value$en-us.tppi"
+END_TOPIC
+