diff --git a/uppsrc/Core/src.tpp/all.i b/uppsrc/Core/src.tpp/all.i
index cac742f44..5331f454f 100644
--- a/uppsrc/Core/src.tpp/all.i
+++ b/uppsrc/Core/src.tpp/all.i
@@ -2,35 +2,7 @@ TOPIC("AMap_en-us")
 #include "AMap_en-us.tppi"
 END_TOPIC
 
-TOPIC("Function_en-us")
-#include "Function_en-us.tppi"
-END_TOPIC
-
 TOPIC("MapKVRange_en-us")
 #include "MapKVRange_en-us.tppi"
 END_TOPIC
 
-TOPIC("Point_en-us")
-#include "Point_en-us.tppi"
-END_TOPIC
-
-TOPIC("PrimitiveDataTypes_en-us")
-#include "PrimitiveDataTypes_en-us.tppi"
-END_TOPIC
-
-TOPIC("Rect_en-us")
-#include "Rect_en-us.tppi"
-END_TOPIC
-
-TOPIC("Size_en-us")
-#include "Size_en-us.tppi"
-END_TOPIC
-
-TOPIC("StreamFn_en-us")
-#include "StreamFn_en-us.tppi"
-END_TOPIC
-
-TOPIC("String_en-us")
-#include "String_en-us.tppi"
-END_TOPIC
-
diff --git a/uppsrc/CtrlLib/src.tpp/ParentCtrl_en-us.tpp b/uppsrc/CtrlLib/src.tpp/ParentCtrl_en-us.tpp
new file mode 100644
index 000000000..4ecb60887
--- /dev/null
+++ b/uppsrc/CtrlLib/src.tpp/ParentCtrl_en-us.tpp
@@ -0,0 +1,32 @@
+topic "ParentCtrl";
+[i448;a25;kKO9;2 $$1,0#37138531426314131252341829483380:class]
+[l288;2 $$2,2#27521748481378242620020725143825:desc]
+[0 $$3,0#96390100711032703541132217272105:end]
+[H6;0 $$4,0#05600065144404261032431302351956:begin]
+[i448;a25;kKO9;2 $$5,0#37138531426314131252341829483370:item]
+[l288;a4;*@5;1 $$6,6#70004532496200323422659154056402:requirement]
+[l288;i1121;b17;O9;~~~.1408;2 $$7,0#10431211400427159095818037425705:param]
+[i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam]
+[b42;2 $$9,9#13035079074754324216151401829390:normal]
+[2 $$0,0#00000000000000000000000000000000:Default]
+[{_} 
+[ {{10000@(113.42.0) [s0;%% [*@7;4 ParentCtrl]]}}&]
+[s0; &]
+[s1;:ParentCtrl`:`:class: [@(0.0.255)3 class][3 _][*3 ParentCtrl][3 _:_][@(0.0.255)3 public][3 _][*@3;3 C
+trl]&]
+[s0;%% This class is supposed to be used as logical parent in situation 
+when more widgets are to be grouped together. The only difference 
+from [*^topic`:`/`/CtrlCore`/src`/Ctrl`_en`-us`#Ctrl`:`:class^ Ctrl] 
+is that [* ParentCtrl ]activates transparent and disables focus 
+in the constructor.&]
+[s3; &]
+[s0; &]
+[ {{10000F(128)G(128)@1 [s0;%% [* Constructor detail]]}}&]
+[s3; &]
+[s5;:Upp`:`:ParentCtrl`:`:ParentCtrl`(`): [* ParentCtrl]()&]
+[s2;%% Default construct for ParentCtrl. Initializes the control 
+with the following default behavior:&]
+[s2;l448;i150;O0;%% [* Focus:] Disabled&]
+[s2;l448;i150;O0;%% [* Transparency:] Enabled&]
+[s3; &]
+[s0;%% ]]
\ No newline at end of file
diff --git a/uppsrc/CtrlLib/src.tpp/Static_en-us.tpp b/uppsrc/CtrlLib/src.tpp/Static_en-us.tpp
index e3c68a7d0..557cd4a8f 100644
--- a/uppsrc/CtrlLib/src.tpp/Static_en-us.tpp
+++ b/uppsrc/CtrlLib/src.tpp/Static_en-us.tpp
@@ -149,18 +149,6 @@ abel]&]
 olor]_[*@3 c])&]
 [s2;%% Sets the color of LabelBox.&]
 [s3;%% &]
-[s0;%% &]
-[s0; &]
-[ {{10000@3 [s0;%% [*@(229)4 ParentCtrl]]}}&]
-[s3;%% &]
-[s1;:ParentCtrl`:`:class: [@(0.0.255)3 class][3 _][*3 ParentCtrl][3 _:_][@(0.0.255)3 public][3 _][*@3;3 C
-trl]&]
-[s9;%% This class is supposed to be used as logical parent in situation 
-when more widgets are to be grouped together. The only difference 
-from Ctrl is that ParentCtrl activates Transparent in constructor.&]
-[s3;%% &]
-[s0;%% &]
-[s0;%% &]
 [s0; &]
 [ {{10000@3 [s0;%% [*@(229)4 StaticRect]]}}&]
 [s3;%% &]
@@ -169,6 +157,8 @@ trl]&]
 [s9;%% Widget completely filled with single color.&]
 [s3; &]
 [s0; &]
+[s0; &]
+[s0; &]
 [ {{10000F(128)G(128)@1 [s0;%% [* Public Method List]]}}&]
 [s3; &]
 [s5;:StaticRect`:`:Color`(class Color`): [_^StaticRect^ StaticRect][@(0.0.255) `&]_[* Color
diff --git a/uppsrc/CtrlLib/src.tpp/index_en-us.tpp b/uppsrc/CtrlLib/src.tpp/index_en-us.tpp
index bfa329f2b..82de4982d 100644
--- a/uppsrc/CtrlLib/src.tpp/index_en-us.tpp
+++ b/uppsrc/CtrlLib/src.tpp/index_en-us.tpp
@@ -212,7 +212,7 @@ ColumnList).]
 (A4gAEQAAAO//AAAAAHic7ZhLTkJBEEXX5Drcgwtw4NQNOHELxiUYZw78oCPjQEFlpET8hI98Hn8BQYiWNikrVV3YaR2Qii8nL+nq23dwb0h4nVRvkn8Wle2d1MbW3trmrgbsgiZcHwi1bdRyVokOGcg9lpNW9933wBx2nSxEH/gw22b9zioRIQNQE0yOr5L5ZLJpUIbrA0HbVuPBKhEhA/ALgrJSlzXG8so6Xebz2U+lrndA9d63Btq2m09W8YbG4mVpuCMQ3VGmSoFTDpzMzBU9AltLq6fyrenRttMqWkWGJuNlaZAjFYSc+h6KXipe9F78erTtdcpWiQgZjxymnx2ox4mD9cJ2Ea0XTY+2L92KVbTQZNSyl4OLMoBKt6SwXqTAofWi6dG236tbZU5oLHBfLyUHUZYoopeSF70Xvx5tB/2GVbTQZNSyl/3zIoJ6OmS90C2K1oumR9vhoG2ViJDJkQKFnJpNRC8Fja8WPG8vaDt67VpFhibjZWngX+uTzD0DTtEl+36R+jjQdjzqW8UbGouXpYGfomfXt/Nh3/s/6gNB27fx0CoRIePVDUygLO+tJsxhl92PzdEHwmwnk7FVIkKOvur88/vk6XRilbiQF4TfXE0v+BORxgeMhnn+)
 ]
 ::^ [s0; Horizontal scrollbar.]
-:: [s0; ImageCtrl]
+:: [s0; [^topic`:`/`/CtrlLib`/src`/Static`_en`-us`#ImageCtrl`:`:class^ ImageCtrl]]
 ::= [s0;= ]
 ::^ [s0; Static widget displaying image.]
 :: [s0; InfoCtrl]
@@ -227,7 +227,7 @@ ColumnList).]
 (A8gAGAAAAOj/AAAAAHic7ZpRDoQgDAU9sffYy+x59gqbeAf8M0qhRaFByEzeF9JG46RG4/b/bYQQMk7Wz5eQJom8CgDV4BV4gFfgAV6BB6ZXy4lcE/1QVCs3HytKn+QGcz/0QvcqeR8VMZR1U54Su/BqFG55lVss8ap8M15NwDOvjsElJ5j+yAunoReJJNuaDfHqtdTMq+SEkbdeeiKNynUzmxdcInSgoVfLFbMqWF7Jhng1Ct7zSqkKzKt5qXkfNL0y3wfxalaefb/STUiWR7WyT8nQy50PvA2+t4MHeAUe4BV4gFfgAV6BB9IrQpqk+0/1hBByKzshtxZC)
 ]
 ::^ [s0; Widget for defining accelerator keys.]
-:: [s0; Label]
+:: [s0; [^topic`:`/`/CtrlLib`/src`/Static`_en`-us`#Label`:`:class^ Label]]
 ::= [s0;= 
 @@image:375&156
 (AzwAGQAAAOf/AAAAAHic7ZfRDYAgDESZ2D1cxnlcwYQd9FftcRSoAkmb+zBS8HG9H+OxR5drEi3rxtWdEDKftLoTOvMUzOFZRR8q7TdkrsZwZhPmV2BkhORSai88rYUZ5lk+8zf6TjgdE5/lXQgJ6eTOmDNDDyWz3n8ic2bOVpqi73y+DxQGgGRD7oWnVTPrlZ1vi/TMIVEjM48jZ/6Nebr/FNcgugDakXei)
@@ -277,7 +277,7 @@ Also can enable/disable grouped widgets (AutoBox modifier).]
 (A3AAoAAAAGD/AAAAAHic7Z1hatswGIZzp5ykl9g5BjvFbrAfO88IIxRKCSEUShlj7J8mLCaE9VmW5FeWLL0P+VGrqe08lWVJb4SVIoSQFc7nTzGv2qdZn5OE/zbt6sfE5XL5OfH8/Pzy8vL6n8fjQZ+iOrE84FObvN/ve/r0T2/pg+xMks/LxNOXJ/+1j097Vo3Y80nyaaql6FPLfHt7o09zYn7jKfq8Xq/a25LPj48P0eesTXb37BbO3jM7Dfc8/U23ZFY++3QbVEURqJ/fv301L1OiXekGM9Wnby+pRNSl4kwu7bw0kW27dmXuPqLPXxOiT796iHLEqyPwJ7Ozjf9nlSbep+kXiT5/T4Tr56xQlDMrOaLPyIMan7fbTfT5ZyLmeo/52W/9Zu9s3Kd49Bna1X3iMaHv5rrB1Ne4rpba5N+JmPuRe7il9wQkhL2Jf+g3OPsQPpzrU8t8f3+P9Fn0rGrtajsZ4/eTR9IRITWqVuUkhJAAduhEINAnFvrEEvbJfCQSv1e5NN5nPrLKUq/YL8/OR4bqfif5zMhHak1f1CLJZ0Y+MqZPv/EUfWbkI2P6FMsL5SPd43/Mpft7Xj4S3m1/xPvcmI8M4lPVyEe6Z+k2ZMHmIyPQZj5yXDh+x8L5JSz0iYU+saT6pP8w9ImFPrFgfbJ/Bfc5eD6ym89B8hG4T5OPaJPX69WtnHbc2vf8CdynqZZGpr3M3UmA8PVOny42H9H4MgPrRywD+hRf5rc2H3l1eDiEfR5dpipQP927uT9xKuYjhg5kqgI+RZkaM2sq5iOqF5mqjM/b7WbvPq7MmHzk6MB9ZuQjW76f3xrlfI6Zj3D8joXzS1joEwt9YqFPLPSJhT6xsL+EJdIn14NEEuMTtR5EbzLvUFnrQfy84/T5tORztLwjYz3ILO/QMo1P5h0qfT2I9qbtzWTqF/MOQ+p6EOPTKHVlhn2O036qlPUL5nq3Gs0rJu8I7PZAwH36l3lM3hHe7YGI788nrQcxU8ozmSOsB0kaH3E9yCqp402uBwmDnd/g+J3zRVjoEwt9Yintc7T/F31ioU8sdX3217+q7rOzfKSEz/jvy+XlIy1/Hw/uU5yJCsyfbMxHWqOoz9WJo7x8hD7FTZWbjzR7satiPpeaOBuRmM28fKTl+dLq9bOzfKR6+9lZPlL9/t5ZPlK9/9lZPlJ9fNRZPlLdJ8fvTe2/NegTC31ioU8s9ImFPrGwv4Sluk/mHauUzjvUSOPNnfOO1pRWn69j3hFmn7wDe85ADpp3jNl+Fso72H6q5fYzI+8Y1qctYd6xBeYdtWDegYXjdxKGPrHQJxb6xEKfWOgTy2h5RGlGyyNKU+h5HKq9kfU+FHoeR5uD6x0o9zwO+vQ5b3gex7A+Cz2PY1ifgd+eh38eRyqFnseh6FPinPU8DgN9+mTnEYo+JfrLI0rD8TsWzi9hoU8s9ImFPrHQJxb6xML+EhbmHdtBrb8I5x1qjCEnav1FIO9Y3W1PQNZfROYdI/v0N9WGvMOuSijwCdoiY/1FRt4xmk//Z39T5eYddj8j+1xdfxGfd8T3Hzpgy/qLpLxDPFaX7LD+wh6owOkfGOYdWDh+J4QQQgghhBBCsvkHPj+qdA==)
 ]
 ::^ [s0; Tree of options.]
-:: [s0; ParentCtrl]
+:: [s0; [^topic`:`/`/CtrlLib`/src`/ParentCtrl`_en`-us`#ParentCtrl`:`:class^ ParentCtrl]]
 ::= [s0;= ]
 ::^ [s0; Parent for grouping widgets in TabCtrl and similar situations.]
 :: [s0; Picture]
@@ -326,7 +326,7 @@ to hyper`-links.]
 :: [s0; ScrollBars]
 ::= [s0;= ]
 ::^ [s0; Horizontal and vertical scrollbar (Frame).]
-:: [s0; SeparatorCtrl]
+:: [s0; [^topic`:`/`/CtrlLib`/src`/Static`_en`-us`#SeparatorCtrl`:`:class^ SeparatorCtrl]]
 ::= [s0;= ]
 ::^ [s0; Simple static widget used as separator line.]
 :: [s0; Slider]