diff --git a/uppbox/uppweb/gsoc.tpp/application$en-us.tpp b/uppbox/uppweb/gsoc.tpp/application$en-us.tpp
index 2fb2dce8a..7978093a7 100644
--- a/uppbox/uppweb/gsoc.tpp/application$en-us.tpp
+++ b/uppbox/uppweb/gsoc.tpp/application$en-us.tpp
@@ -182,7 +182,7 @@ time before it.]&]
 [ {{10000f0;g0;^l/0t/25b4/25 [s0;# [*2 If you are a small or new organization applying to GSoC, 
 please list a larger, established GSoC organization or a Googler 
 that can vouch for you here.]]}}&]
-[s0;# [2 TBD.]&]
+[s0;# [2 Not found.]&]
 [s0;# &]
 [ {{10000f0;g0;^l/0t/25b4/25 [s0;# [*2 If you are a large organization who is vouching for a small 
 organization applying to GSoC for their first time this year, 
diff --git a/uppbox/uppweb/gsoc.tpp/application$en-us.tppi b/uppbox/uppweb/gsoc.tpp/application$en-us.tppi
index 28e875fd0..ebaa732eb 100644
--- a/uppbox/uppweb/gsoc.tpp/application$en-us.tppi
+++ b/uppbox/uppweb/gsoc.tpp/application$en-us.tppi
@@ -1,17 +1,17 @@
 TITLE("GSoC 2011. Mentor page")
 COMPRESSED
-120,156,173,90,109,115,219,54,18,254,43,152,38,189,38,87,87,146,29,199,205,217,31,114,137,211,23,207,184,73,38,78,46,115,227,177,43,136,132,36,196,36,192,2,164,21,165,211,255,126,207,46,0,138,148,165,36,118,175,31,236,90,34,23,251,242,236,238,179,139,156,139,251,247,71,59,163,123,163,47,252,119,248,66,77,101,83,212,23,231,147,221,221,31,143,254,249,61,126,226,213,93,188,186,247,227,254,227,31,247,31,61,218,223,125,50,26,237,239,142,118,247,247,246,31,29,140,70,143,159,60,57,216,219,31,237,29,30,203,170,214,214,92,156,255,249,251,95,223,254,244,242,135,119,103,226,220,239,30,221,155,140,142,196,249,155,203,218,86,58,27,31,142,135,227,97,83,85,11,53,25,15,103,222,102,225,231,222,104,119,119,124,95,153,241,15,141,191,60,16,191,156,217,99,65,159,93,156,191,57,16,3,241,172,170,10,157,73,18,47,126,182,174,188,248,199,69,43,26,255,43,254,252,115,151,180,159,142,142,102,163,163,203,122,184,247,120,178,143,31,56,127,116,116,79,156,
-7,51,78,76,237,108,222,100,172,228,197,95,127,173,100,236,145,144,240,232,158,120,59,215,94,72,81,57,117,173,213,66,216,169,168,231,138,79,21,181,21,19,37,124,51,41,117,93,171,156,254,254,197,218,89,161,6,226,164,22,120,13,15,103,182,113,94,65,192,194,186,43,161,13,4,217,76,121,47,26,83,235,66,76,181,145,133,144,43,123,6,226,117,161,36,222,240,202,228,66,22,244,200,71,5,13,240,23,94,173,172,151,133,167,147,46,206,47,231,117,93,5,15,46,22,139,241,0,113,210,165,172,85,85,141,7,214,205,198,195,169,117,77,57,30,94,238,145,186,77,121,1,107,6,23,193,180,100,226,222,183,63,124,189,199,110,184,61,122,109,116,180,81,74,49,28,221,20,180,39,94,185,153,52,250,83,16,243,82,150,234,112,37,135,28,254,46,154,49,254,126,252,189,120,240,142,126,61,76,106,223,230,156,23,202,103,78,51,6,59,39,112,76,89,40,2,87,85,214,213,193,183,185,186,86,133,173,16,168,99,254,178,208,19,39,221,146,191,59,201,21,121,28,238,159,57,
-89,210,239,15,42,195,123,174,49,70,155,25,69,245,151,151,239,134,167,218,52,31,249,133,247,218,228,118,225,147,214,247,122,128,122,213,56,145,235,233,84,57,101,50,37,22,186,158,11,11,76,57,49,133,116,69,56,241,4,30,130,89,174,84,37,26,160,1,72,10,122,45,230,186,80,132,70,175,220,53,29,126,60,12,95,56,2,84,169,68,54,151,78,102,181,114,218,215,58,243,131,0,224,82,73,67,34,101,13,68,230,42,217,82,2,181,141,39,49,193,37,120,210,151,0,29,148,33,59,50,64,209,40,183,19,79,157,40,122,114,42,125,205,223,58,157,205,239,18,152,95,45,212,172,228,108,61,240,4,231,195,33,97,185,3,101,66,242,48,30,242,245,71,156,234,76,25,191,126,192,75,228,47,41,126,166,75,0,121,170,97,252,243,179,23,8,53,63,220,134,235,235,143,121,63,95,146,203,150,200,113,97,187,176,166,132,94,146,179,8,54,210,33,16,186,130,57,140,148,88,203,70,79,241,58,194,145,91,122,95,204,109,197,32,155,73,60,51,89,118,222,130,152,167,27,241,
-27,113,40,230,210,39,248,194,34,41,102,214,230,17,45,45,162,2,204,212,199,10,246,147,94,192,148,19,19,212,153,29,1,176,232,107,224,198,150,101,99,116,29,32,47,241,183,83,98,230,108,83,17,248,146,124,7,16,201,43,146,144,73,167,82,53,100,72,253,209,200,2,175,111,6,253,179,172,198,215,197,50,170,190,58,172,77,38,18,151,17,244,114,49,254,230,185,252,36,165,27,127,195,186,204,37,212,155,54,40,133,49,99,201,141,37,249,137,64,196,143,64,137,37,75,208,38,43,154,28,50,180,241,154,210,22,218,241,163,103,255,121,41,174,161,62,69,39,179,84,250,33,110,233,107,85,110,86,248,87,187,128,201,14,2,116,155,141,156,95,139,185,50,98,161,130,86,8,24,156,98,232,119,72,215,214,75,198,214,226,67,67,153,146,101,170,170,217,99,173,209,172,128,158,52,132,21,47,240,59,189,73,143,73,225,107,7,176,204,150,36,150,123,1,201,14,114,36,149,12,120,221,68,40,251,43,205,46,243,53,172,54,177,150,181,226,173,91,213,160,91,20,78,157,111,128,
-244,26,140,43,170,2,132,101,255,84,156,76,133,183,59,162,138,141,171,41,75,233,244,39,21,132,104,115,109,139,107,85,66,187,20,42,60,146,81,15,140,109,13,21,11,54,152,153,226,134,201,47,117,208,143,150,184,150,197,56,74,195,99,208,18,78,190,75,1,58,153,126,222,190,188,111,96,107,89,161,106,36,142,184,50,118,193,102,56,122,147,116,110,189,143,151,124,76,251,85,68,138,194,102,36,117,71,168,193,108,128,220,31,29,28,138,71,195,3,129,254,44,30,9,139,240,67,198,65,95,74,80,130,158,189,97,126,157,248,194,4,76,227,214,53,107,163,241,84,66,8,177,204,114,108,227,139,229,13,127,144,43,118,2,234,169,94,177,10,225,27,114,5,121,171,5,2,217,181,160,218,182,84,210,61,240,15,159,246,45,248,175,130,75,145,65,29,17,84,15,239,82,126,101,157,114,243,221,155,83,62,55,96,46,71,188,184,58,244,142,254,34,97,98,2,122,63,210,209,251,44,165,203,68,199,131,121,93,22,151,159,235,84,95,144,192,2,238,128,216,174,165,92,206,98,189,
-224,172,194,7,5,129,174,64,199,95,249,160,27,223,167,129,4,252,209,40,207,225,94,160,104,48,117,157,219,133,233,129,117,49,183,96,170,77,145,67,218,85,104,72,0,125,105,185,180,66,118,25,251,219,132,80,219,237,114,55,49,69,154,180,205,110,176,25,119,13,213,0,150,14,106,98,132,53,138,173,104,51,174,148,87,84,45,28,107,18,107,59,10,100,190,162,118,169,5,177,241,190,99,9,103,41,120,75,54,167,119,113,208,90,30,17,13,235,118,80,25,72,178,0,17,3,111,8,207,21,187,255,218,251,26,220,172,136,246,118,100,240,51,195,53,250,77,138,132,81,1,189,102,217,246,146,84,221,27,147,234,59,245,107,191,78,222,249,237,216,5,191,98,28,232,99,51,58,234,111,225,123,131,140,128,112,40,70,81,65,220,168,41,115,128,115,85,3,167,240,115,158,59,197,245,173,139,59,102,166,125,224,49,186,86,163,95,96,48,76,31,238,82,243,111,100,208,201,155,99,234,60,198,168,98,75,210,244,74,135,118,113,88,245,133,244,115,163,106,140,173,164,11,188,133,175,
-224,172,244,121,248,248,214,181,236,133,85,155,136,36,215,91,105,186,19,162,0,103,169,10,106,195,84,135,251,62,243,74,173,124,10,204,172,247,102,0,254,154,104,17,250,39,210,163,157,53,81,250,85,8,129,102,39,201,0,71,38,146,84,195,56,28,254,170,19,46,219,138,98,37,40,52,240,172,118,204,61,192,40,251,213,194,115,55,105,187,123,50,128,102,147,238,59,9,34,92,158,168,29,113,137,2,130,242,112,2,247,29,176,26,18,155,49,155,188,214,146,35,186,66,137,215,117,55,211,239,181,13,39,88,22,91,49,245,156,91,103,76,39,6,227,223,147,13,127,43,127,190,40,177,205,166,205,36,21,201,31,216,214,146,205,11,245,209,167,234,117,79,239,62,30,29,189,138,180,1,131,64,18,210,253,252,212,70,84,49,55,35,130,251,9,85,120,211,147,199,33,74,135,226,39,106,56,59,98,48,216,244,212,59,163,153,102,199,57,130,16,163,87,163,85,95,30,79,34,63,125,4,95,214,52,10,31,138,83,105,102,13,170,25,83,46,89,19,130,252,240,213,217,78,59,37,
-108,146,243,58,114,150,30,211,68,124,251,67,18,41,195,5,126,179,136,184,88,217,137,78,132,98,171,30,112,208,127,248,108,105,108,229,181,63,140,27,134,73,36,186,105,59,67,103,79,81,192,49,118,229,173,194,55,164,188,142,122,189,8,152,63,20,63,211,128,179,214,216,146,92,122,114,171,36,114,96,70,152,70,89,5,218,182,31,121,150,205,85,222,20,42,238,59,10,10,20,113,72,191,237,133,147,212,112,243,92,147,74,108,91,39,173,13,21,30,115,181,49,42,207,174,97,22,73,199,12,170,226,232,148,55,142,34,78,201,186,233,149,46,18,94,167,177,144,103,99,42,130,61,62,202,96,85,217,220,216,194,206,128,175,180,217,160,90,56,33,170,82,163,247,120,154,186,54,234,182,178,135,102,50,174,104,15,48,231,6,26,243,240,14,35,19,119,23,68,142,214,46,146,71,19,210,155,22,55,92,148,11,138,52,213,41,141,233,27,85,179,161,29,30,83,45,170,116,84,250,36,173,104,12,13,108,219,24,92,44,213,176,14,207,122,132,92,79,117,198,165,213,98,230,128,163,
-215,138,222,219,64,221,84,235,212,80,67,123,131,34,241,140,118,19,228,40,131,240,142,1,42,10,38,232,133,108,12,97,6,255,227,3,153,71,103,24,127,131,194,185,97,121,75,21,116,88,211,204,9,175,183,187,91,232,17,63,130,1,210,80,41,195,84,255,96,123,129,36,49,109,125,92,23,199,229,240,33,205,246,149,118,171,177,100,115,113,100,202,139,50,2,155,128,116,64,100,1,127,43,117,229,65,241,138,138,221,204,208,196,183,113,236,38,167,114,91,161,9,158,225,145,22,14,228,44,29,247,197,76,120,105,228,225,135,210,232,223,171,45,107,187,15,196,152,199,69,245,71,3,181,3,222,232,120,54,207,199,189,197,215,244,163,141,206,41,165,1,158,110,244,160,214,239,191,241,247,76,201,152,41,222,214,249,125,249,49,4,193,33,119,214,153,127,111,87,249,53,244,100,133,111,171,107,79,110,80,117,27,56,148,95,139,8,133,129,105,143,215,37,74,151,75,145,69,59,228,197,68,24,128,49,98,208,82,190,135,234,110,32,91,126,233,145,194,97,87,195,228,36,102,247,160,
-93,44,145,148,74,89,16,179,84,188,74,226,187,137,74,9,162,2,174,175,97,26,219,194,42,72,229,3,177,21,111,97,42,42,219,45,213,132,140,157,97,70,82,238,142,236,39,24,176,145,238,252,198,95,125,85,212,190,36,179,3,175,108,110,109,220,125,133,121,158,151,124,125,190,27,4,164,16,255,251,193,222,147,193,254,222,96,239,241,227,135,119,153,13,66,187,165,128,82,118,226,76,30,171,57,34,185,246,32,107,168,128,244,73,170,161,235,107,217,247,164,45,26,34,235,124,21,54,146,50,146,101,196,220,212,155,197,48,110,152,107,199,79,98,199,72,61,54,66,103,174,171,207,175,42,245,148,119,135,65,68,78,243,4,113,104,105,252,2,95,46,84,128,79,77,99,38,204,156,160,61,210,158,89,17,153,67,171,137,87,16,241,158,192,118,150,92,112,3,253,240,171,89,123,138,87,48,147,15,136,127,6,236,82,103,162,19,56,56,116,68,92,28,208,220,0,35,102,168,179,76,203,216,151,228,92,245,81,150,4,125,25,69,131,41,44,195,156,56,45,212,71,106,103,194,39,
-186,130,199,103,22,29,115,203,117,74,123,199,6,251,91,29,200,242,169,230,69,182,183,69,179,98,184,115,181,213,69,68,224,148,131,30,56,208,107,206,198,54,94,97,99,21,100,167,113,37,220,245,177,141,215,86,19,41,1,60,209,41,57,233,167,141,201,239,116,163,112,59,40,70,108,172,35,241,153,95,235,246,45,162,118,58,112,234,224,44,78,198,17,167,116,31,208,186,173,181,143,87,225,112,18,130,179,165,211,1,15,137,43,114,125,227,98,184,58,46,93,125,166,58,86,53,19,140,63,84,141,222,235,43,205,112,154,146,99,233,175,240,80,90,249,80,148,172,41,218,235,2,225,172,204,75,89,113,76,169,169,227,43,167,248,54,111,39,236,211,1,81,84,242,154,198,100,148,108,93,183,135,54,180,122,224,250,33,197,4,236,241,51,228,33,169,224,218,37,124,58,62,222,117,48,21,139,104,90,101,106,123,212,212,22,5,114,51,167,60,107,151,255,3,241,188,169,211,218,52,36,93,123,83,177,186,33,96,17,196,91,66,25,111,121,136,15,125,35,170,145,28,74,113,97,95,
-126,206,24,185,236,196,67,168,233,148,4,182,148,153,166,79,203,55,158,78,49,211,204,233,176,206,149,5,160,152,91,1,73,67,82,249,131,157,108,33,59,102,73,39,193,183,50,187,2,167,94,115,73,174,144,149,144,93,41,215,27,205,120,133,203,3,27,119,203,103,121,169,141,230,123,144,244,114,110,163,139,48,86,105,19,55,33,210,175,166,143,110,245,191,101,194,33,103,171,24,110,226,237,181,12,221,5,172,25,105,72,156,169,187,248,224,225,130,96,154,118,18,173,37,227,239,186,30,155,40,120,88,237,164,169,135,111,213,166,53,95,41,181,247,175,235,121,11,22,89,55,48,78,109,184,41,11,44,54,94,239,37,64,212,129,142,16,145,47,85,57,9,55,79,32,32,117,60,72,187,112,69,180,165,120,38,106,26,208,176,202,204,156,54,177,144,77,55,30,93,220,199,17,51,50,138,206,101,27,245,98,217,14,221,145,251,208,253,226,42,171,59,224,3,122,210,81,51,109,34,43,15,254,10,241,167,188,2,206,90,125,136,79,181,181,42,162,126,39,78,79,21,109,162,86,85,
-189,179,83,217,73,25,28,136,187,2,122,75,70,111,109,215,210,141,203,136,238,220,48,226,201,238,184,218,137,94,167,99,197,177,54,42,174,235,187,94,198,48,1,144,225,230,157,154,15,69,115,235,117,114,160,161,233,70,138,182,222,18,92,209,205,232,154,30,61,29,106,105,79,51,27,171,221,147,98,73,249,208,180,92,234,219,70,92,219,38,155,167,161,147,183,223,235,235,179,183,207,95,220,97,36,238,153,198,10,246,181,161,241,151,246,222,116,60,255,179,2,86,47,249,224,51,198,135,209,137,161,61,213,14,246,115,16,184,57,209,136,218,247,77,120,206,200,50,108,61,22,243,101,200,240,68,211,150,227,239,184,252,113,82,101,116,57,158,35,251,252,234,242,34,92,7,244,29,210,191,130,187,189,107,80,35,107,182,89,21,158,151,71,164,68,162,180,200,253,2,77,106,189,50,176,50,157,57,188,179,15,110,203,20,93,19,176,136,64,192,38,220,226,20,151,130,181,37,210,90,21,96,96,27,157,5,39,97,188,104,232,2,58,242,34,56,195,217,82,156,42,95,232,240,192,177,
-116,54,108,8,64,209,120,160,64,161,231,106,200,203,129,91,77,132,168,231,87,90,221,24,41,142,249,99,241,154,238,145,111,185,52,232,75,140,3,69,196,12,27,9,31,166,218,218,222,147,15,196,41,207,91,11,106,81,153,206,195,245,4,128,228,76,48,191,179,71,65,55,15,155,145,180,9,184,189,213,235,139,141,13,35,240,255,109,91,66,84,60,18,9,113,5,74,76,246,119,218,7,21,155,224,14,190,99,10,91,61,178,155,180,152,211,16,96,219,4,121,219,255,39,5,61,16,189,164,235,54,181,54,159,77,194,177,189,124,102,36,231,252,239,151,20,230,225,247,225,142,136,215,253,122,198,228,45,92,122,240,159,115,69,23,7,15,198,151,227,223,199,151,119,250,103,96,207,3,15,97,70,33,30,156,82,222,159,188,120,216,191,11,44,49,98,95,181,213,251,226,127,164,175,250,106,
+120,156,173,90,109,115,219,54,18,254,43,152,38,189,58,87,87,146,29,199,205,217,31,114,137,211,23,207,184,73,38,110,46,115,227,177,43,136,132,36,212,36,192,2,164,21,165,211,255,126,207,46,0,138,148,165,36,118,175,31,236,90,34,23,251,242,236,238,179,139,92,136,135,15,71,187,163,7,163,207,252,119,244,82,77,101,83,212,151,23,147,189,189,239,143,255,249,45,126,226,213,61,188,186,255,253,193,147,239,15,30,63,62,216,123,58,26,29,236,141,246,14,246,15,30,31,142,70,79,158,62,61,220,63,24,237,31,157,200,170,214,214,92,94,252,249,219,95,95,255,240,234,187,119,231,226,194,239,29,63,152,140,142,197,197,219,171,218,86,58,27,31,141,135,227,97,83,85,11,53,25,15,103,222,102,225,231,254,104,111,111,252,80,153,241,119,141,191,58,20,63,157,219,19,65,159,93,94,188,61,20,3,241,188,170,10,157,73,18,47,126,180,174,188,252,199,101,43,26,255,43,254,252,115,143,180,159,142,142,103,163,227,171,122,184,255,100,114,128,31,56,127,116,252,64,92,
+4,51,78,77,237,108,222,100,172,228,229,95,127,173,100,236,147,144,240,232,190,248,117,174,189,144,162,114,234,70,171,133,176,83,81,207,21,159,42,106,43,38,74,248,102,82,234,186,86,57,253,253,147,181,179,66,13,196,105,45,240,26,30,206,108,227,188,130,128,133,117,215,66,27,8,178,153,242,94,52,166,214,133,152,106,35,11,33,87,246,12,196,155,66,73,188,225,149,201,133,44,232,145,15,10,26,224,47,188,90,89,47,11,79,39,93,94,92,205,235,186,10,30,92,44,22,227,1,226,164,75,89,171,170,26,15,172,155,141,135,83,235,154,114,60,188,218,39,117,155,242,18,214,12,46,131,105,201,196,253,175,191,251,114,143,221,114,123,244,218,232,120,163,148,98,56,186,45,104,95,188,118,51,105,244,199,32,230,149,44,213,209,74,14,57,252,93,52,99,252,237,248,91,177,243,142,126,61,74,106,223,229,156,151,202,103,78,51,6,59,39,112,76,89,40,2,87,85,214,213,193,183,185,186,81,133,173,16,168,19,254,178,208,19,39,221,146,191,59,205,21,121,28,238,159,57,
+89,210,239,223,85,134,247,92,99,140,54,51,138,234,79,175,222,13,207,180,105,62,240,11,239,181,201,237,194,39,173,31,244,0,245,186,113,34,215,211,169,114,202,100,74,44,116,61,23,22,152,114,98,10,233,138,112,226,9,60,4,179,92,169,74,52,64,3,144,20,244,90,204,117,161,8,141,94,185,27,58,252,100,24,190,112,4,168,82,137,108,46,157,204,106,229,180,175,117,230,7,1,192,165,146,134,68,202,26,136,204,85,178,165,4,106,27,79,98,130,75,240,164,47,1,58,40,67,118,100,128,162,81,110,55,158,58,81,244,228,84,250,154,191,117,58,155,223,39,48,63,91,168,89,201,217,122,224,9,206,71,67,194,114,7,202,132,228,97,60,228,203,143,56,211,153,50,126,253,128,87,200,95,82,252,92,151,0,242,84,195,248,23,231,47,17,106,126,184,13,215,151,31,243,126,190,36,151,45,145,227,194,118,97,77,9,189,36,103,17,108,164,67,32,116,5,115,24,41,177,150,141,158,225,117,132,35,183,244,190,152,219,138,65,54,147,120,102,178,236,188,5,49,207,54,226,
+55,226,80,204,165,79,240,133,69,82,204,172,205,35,90,90,68,5,152,169,15,21,236,39,189,128,41,39,38,168,51,187,2,96,209,55,192,141,45,203,198,232,58,64,94,226,111,167,196,204,217,166,34,240,37,249,14,32,146,215,36,33,147,78,165,106,200,144,250,163,145,5,94,223,12,250,231,89,141,175,139,101,84,125,117,88,155,76,36,46,35,232,229,98,252,213,11,249,81,74,55,254,138,117,153,75,168,55,109,80,10,99,198,146,27,75,242,19,129,136,31,129,18,75,150,160,77,86,52,57,100,104,227,53,165,45,180,227,71,207,255,243,74,220,64,125,138,78,102,169,244,67,220,210,215,170,220,172,240,207,118,1,147,29,4,232,54,27,57,191,22,115,101,196,66,5,173,16,48,56,197,208,239,144,174,173,151,140,173,197,239,13,101,74,150,169,170,102,143,181,70,179,2,122,210,16,86,188,192,239,244,38,61,38,133,175,29,192,50,91,146,88,238,5,36,59,200,145,84,50,224,117,19,161,236,175,53,187,204,215,176,218,196,90,214,138,183,110,85,131,238,80,56,117,190,1,
+210,107,48,174,168,10,16,150,253,51,113,58,21,222,238,138,42,54,174,166,44,165,211,31,85,16,162,205,141,45,110,84,9,237,82,168,240,72,70,61,48,182,53,84,44,216,96,102,138,27,38,191,212,65,63,90,226,90,22,227,40,13,143,65,75,56,249,62,5,232,116,250,105,251,242,190,129,173,101,133,170,145,56,226,218,216,5,155,225,232,77,210,185,245,62,94,242,49,237,87,17,41,10,155,145,212,93,161,6,179,1,114,127,116,120,36,30,15,15,5,250,179,120,44,44,194,15,25,135,125,41,65,9,122,246,150,249,117,226,11,19,48,141,59,215,172,141,198,83,9,33,196,50,203,177,141,47,150,183,252,65,174,216,13,168,167,122,197,42,132,111,200,21,228,173,22,8,100,215,130,106,219,82,73,183,227,31,61,235,91,240,95,5,151,34,131,58,34,168,30,222,167,252,202,58,229,230,187,183,103,124,110,192,92,142,120,113,117,232,29,253,89,194,196,4,244,97,164,163,15,89,74,151,137,142,7,243,186,44,174,62,213,169,62,35,129,5,220,3,177,93,75,185,156,197,122,
+193,89,133,15,10,2,93,129,142,191,242,65,55,190,207,2,9,248,163,81,158,195,189,64,209,96,234,58,183,11,211,3,235,98,110,193,84,155,34,135,180,235,208,144,0,250,210,114,105,133,236,50,246,183,9,161,182,219,229,110,99,138,52,105,155,221,96,51,238,26,170,1,44,29,212,196,8,107,20,91,209,102,92,41,175,169,90,56,214,36,214,118,20,200,124,69,237,82,11,98,227,125,199,18,206,82,240,150,108,78,239,226,160,181,60,34,26,214,237,160,50,144,100,1,34,6,222,16,158,43,246,254,181,255,37,184,89,17,237,237,200,224,103,134,107,244,155,20,9,163,2,122,205,178,237,37,169,186,55,38,213,119,234,215,126,157,188,243,219,177,11,126,193,56,208,199,102,116,212,223,194,247,6,25,1,225,80,140,162,130,184,81,83,230,0,231,170,6,78,225,231,60,119,138,235,91,23,119,204,76,251,192,99,116,173,70,191,192,96,152,62,220,167,230,223,202,160,211,183,39,212,121,140,81,197,150,164,233,149,14,237,226,176,234,11,233,231,70,213,24,91,73,23,120,11,95,
+193,89,233,243,240,241,157,107,217,75,171,54,17,73,174,183,210,116,39,68,1,206,82,21,212,134,169,14,247,125,230,149,90,249,20,152,89,239,205,0,252,13,209,34,244,79,164,71,59,107,162,244,171,16,2,205,78,146,1,142,76,36,169,134,113,56,252,117,39,92,182,21,197,74,80,104,224,89,237,152,123,128,81,246,171,133,231,110,210,118,247,100,0,205,38,221,119,18,68,184,60,81,59,226,18,5,4,229,225,4,238,59,96,53,36,54,99,54,121,163,37,71,116,133,18,175,235,110,166,63,104,27,78,176,44,182,98,234,57,119,206,152,78,12,198,191,37,27,254,86,254,124,86,98,155,77,155,73,42,146,63,176,173,37,155,23,234,163,79,213,235,129,222,123,50,58,126,29,105,3,6,129,36,164,251,249,153,141,168,98,110,70,4,247,35,170,240,166,39,79,66,148,142,196,15,212,112,118,197,96,176,233,169,119,70,51,205,142,115,4,33,70,175,70,171,190,60,158,68,126,248,0,190,172,105,20,62,18,103,210,204,26,84,51,166,92,178,38,4,249,225,235,243,221,118,74,
+216,36,231,77,228,44,61,166,137,248,246,135,36,82,134,11,252,102,17,113,177,178,27,157,8,197,86,61,224,176,255,240,249,210,216,202,107,127,20,55,12,147,72,116,211,118,134,206,158,162,128,99,236,202,91,133,111,73,121,19,245,122,25,48,127,36,126,164,1,103,173,177,37,185,244,228,86,73,228,192,140,48,141,178,10,180,109,63,242,60,155,171,188,41,84,220,119,20,20,40,226,144,126,219,11,167,169,225,230,185,38,149,216,182,78,90,27,42,60,230,122,99,84,158,223,192,44,146,142,25,84,197,209,41,111,28,69,156,146,117,211,43,93,36,188,73,99,33,207,198,84,4,123,124,148,193,170,178,185,177,133,157,1,95,105,179,65,181,112,66,84,165,70,239,241,52,117,109,212,109,101,15,205,100,92,209,118,48,231,6,26,243,232,30,35,19,119,23,68,142,214,46,146,71,19,210,155,22,55,92,148,11,138,52,213,41,141,233,27,85,179,161,29,30,83,45,170,116,84,250,36,173,104,12,13,108,219,24,92,44,213,176,14,207,122,132,92,79,117,198,165,213,98,230,128,163,
+215,138,222,175,129,186,169,214,169,161,134,246,6,69,226,25,237,38,200,81,6,225,29,3,84,20,76,208,11,217,24,194,12,254,199,7,50,143,206,48,254,10,133,115,195,242,150,42,232,176,166,153,19,94,111,119,183,208,35,126,4,3,164,161,82,134,169,126,103,123,129,36,49,109,125,92,23,199,229,240,17,205,246,149,118,171,177,100,115,113,100,202,139,50,2,155,128,116,64,100,1,127,43,117,237,65,241,138,138,221,204,208,196,183,113,236,38,167,114,91,161,9,158,225,145,22,14,228,44,29,247,197,76,120,105,228,225,135,210,232,223,171,45,107,187,15,196,152,199,69,245,71,3,181,3,222,232,120,54,207,199,189,197,151,244,163,141,206,41,165,1,158,110,245,160,214,239,191,240,247,76,201,152,41,222,213,249,125,249,49,4,193,33,247,214,153,127,111,87,249,13,244,100,133,239,170,107,79,110,80,117,27,56,148,95,139,8,133,129,105,143,215,37,74,151,75,145,69,59,228,197,68,24,128,49,98,208,82,190,135,234,110,32,91,126,233,145,194,97,87,195,228,36,102,247,160,
+93,44,145,148,74,89,16,179,84,188,74,226,187,137,74,9,162,2,174,175,97,26,219,194,42,72,229,3,177,21,111,97,42,42,219,45,213,132,140,157,97,70,82,238,158,236,39,24,176,145,238,252,194,95,125,81,212,62,39,179,3,175,108,110,109,220,125,133,121,158,151,124,125,190,27,4,164,16,255,123,103,255,233,224,96,127,176,255,228,201,163,251,204,6,161,221,82,64,41,59,113,38,143,213,28,145,92,123,144,53,84,64,250,36,213,208,245,181,236,123,210,22,13,145,117,190,14,27,73,25,201,50,98,110,234,205,98,24,55,204,181,227,39,177,99,164,30,27,161,51,215,213,167,87,149,122,202,187,195,32,34,167,121,130,56,180,52,126,129,47,23,42,192,167,166,49,19,102,78,208,30,105,207,172,136,204,161,213,196,43,136,120,79,96,59,75,46,184,129,126,248,213,172,61,197,43,152,201,7,196,63,3,118,169,51,209,9,28,28,58,34,46,14,104,110,128,17,51,212,89,166,101,236,75,114,174,250,32,75,130,190,140,162,193,20,150,97,78,156,22,234,3,181,51,225,19,
+93,193,227,51,139,142,185,229,58,165,189,99,131,253,173,14,100,249,84,243,34,219,219,162,89,49,220,185,218,234,34,34,112,202,65,15,28,232,53,103,99,27,175,176,177,10,178,211,184,18,238,250,216,198,27,171,137,148,0,158,232,148,156,244,211,198,228,247,186,81,184,27,20,35,54,214,145,248,220,175,117,251,22,81,187,29,56,117,112,22,39,227,136,83,186,15,104,221,214,218,199,171,112,56,9,193,217,210,233,128,135,196,21,185,190,113,49,92,29,151,174,62,83,29,171,154,9,198,31,170,70,239,245,181,102,56,77,201,177,244,87,120,40,173,124,40,74,214,20,237,117,129,112,86,230,165,172,56,166,212,212,241,149,83,124,155,183,27,246,233,128,40,42,121,77,99,50,74,182,174,219,67,27,90,61,112,253,144,98,2,246,248,9,242,144,84,112,237,18,62,29,31,239,58,152,138,69,52,173,50,181,61,106,106,139,2,185,153,83,158,181,203,255,129,120,209,212,105,109,26,146,174,189,169,88,221,16,176,8,226,45,161,140,183,60,196,135,190,17,213,72,14,165,184,176,47,
+63,101,140,92,118,226,33,212,116,74,2,91,202,76,211,167,229,27,79,167,152,105,230,116,88,231,202,2,80,204,173,128,164,33,169,252,187,157,108,33,59,102,73,39,193,183,50,187,6,167,94,115,73,174,144,149,144,93,41,215,27,205,120,133,203,3,27,119,203,231,121,169,141,230,123,144,244,114,110,163,139,48,86,105,19,55,33,210,175,166,143,110,245,191,99,194,33,103,171,24,110,226,237,181,12,221,5,172,25,105,72,156,169,187,248,224,225,130,96,154,118,18,173,37,227,111,186,30,155,40,120,88,237,166,169,135,111,213,166,53,95,41,181,247,175,235,121,11,22,89,55,48,78,109,184,41,11,44,54,94,239,37,64,212,129,142,16,145,47,85,57,9,55,79,32,32,117,60,72,187,112,69,180,165,120,38,106,26,208,176,202,204,156,54,177,144,77,55,30,93,220,199,17,51,50,138,206,101,27,245,98,217,14,221,145,251,208,253,226,42,171,59,224,3,122,210,81,51,109,34,43,15,254,10,241,167,188,2,206,90,125,136,79,181,181,42,162,126,55,78,79,21,109,162,86,85,
+189,179,83,217,77,25,28,136,187,2,122,75,70,111,109,215,210,141,203,136,238,220,48,226,201,238,184,218,137,94,167,99,197,177,54,42,174,235,251,94,198,48,1,144,225,230,157,154,15,69,115,235,117,114,160,161,233,70,138,182,222,18,92,209,205,232,154,30,61,29,106,105,79,51,27,171,221,147,98,73,249,208,180,92,234,219,70,220,216,38,155,167,161,147,183,223,235,235,51,186,113,154,90,244,179,123,12,198,61,3,89,205,190,78,52,4,211,246,155,148,224,127,92,192,74,38,79,124,194,5,97,128,98,128,79,181,131,23,56,20,220,162,104,80,237,123,40,60,103,100,25,118,31,139,249,50,228,121,34,107,203,241,55,92,4,57,181,50,186,34,207,145,131,126,117,133,17,46,5,110,187,101,117,17,119,119,215,160,82,214,108,179,42,60,175,144,72,137,68,108,81,1,10,180,170,245,250,192,202,116,166,241,206,86,184,45,86,116,89,192,34,2,13,155,112,163,83,92,16,214,86,73,107,181,128,225,109,116,22,156,132,33,163,161,107,232,200,142,224,12,103,75,113,166,124,161,
+195,3,39,210,217,176,39,0,81,227,177,2,229,158,107,34,175,8,238,52,23,162,170,95,107,117,107,176,56,225,143,197,27,186,77,190,227,234,160,47,49,142,21,17,51,108,36,124,152,42,108,123,91,62,16,103,60,117,45,168,81,101,58,15,151,20,0,146,51,193,252,206,54,5,61,61,236,71,210,62,224,238,86,175,175,55,54,12,194,255,183,157,9,17,242,72,39,196,53,136,49,217,223,105,34,84,114,130,59,248,166,41,236,246,200,110,210,98,78,163,128,109,19,228,215,254,63,44,232,129,232,21,93,186,169,181,41,109,18,142,237,229,51,35,57,231,127,197,164,48,21,191,15,55,69,188,244,215,51,166,112,225,234,131,255,156,43,186,62,216,25,95,141,127,27,95,221,235,31,131,189,8,108,132,121,133,216,57,163,188,63,125,249,168,127,35,88,98,208,190,110,107,248,229,255,0,44,73,252,253,
 
diff --git a/uppbox/uppweb/gsoc.tpp/application_template2011$en-us.tpp b/uppbox/uppweb/gsoc.tpp/application_template2011$en-us.tpp
index e6192f26e..add95af20 100644
--- a/uppbox/uppweb/gsoc.tpp/application_template2011$en-us.tpp
+++ b/uppbox/uppweb/gsoc.tpp/application_template2011$en-us.tpp
@@ -2,7 +2,8 @@ topic "GSoC 2011. Application Template";
 [ $$0,0#00000000000000000000000000000000:Default]
 [b117;*+117 $$1,0#27457433418004101424360058862402:Caption]
 [{_}%EN-US 
-[s1;#b0; [R6 GSoC 2011. Student Application Template]&]
+[s1;#b0; [R^topic`:`/`/uppweb`/gsoc`/gsoc2011`$en`-us^6 GSoC 2011][R6 . 
+Student Application Template]&]
 [s1;#b0; &]
 [ {{10000f0;g0;^t/25b4/25 [s0;# [*+117 Introduction]]}}&]
 [s1;#b0; &]
diff --git a/uppbox/uppweb/gsoc.tpp/application_template2011$en-us.tppi b/uppbox/uppweb/gsoc.tpp/application_template2011$en-us.tppi
index edef4fc03..d73423390 100644
--- a/uppbox/uppweb/gsoc.tpp/application_template2011$en-us.tppi
+++ b/uppbox/uppweb/gsoc.tpp/application_template2011$en-us.tppi
@@ -1,6 +1,6 @@
 TITLE("GSoC 2011. Application Template")
 COMPRESSED
-120,156,141,84,107,79,219,48,20,253,43,87,130,161,141,66,155,132,150,178,86,108,66,60,54,36,4,136,142,79,85,138,221,248,166,245,230,216,150,237,52,48,196,127,159,157,62,120,76,116,203,7,231,229,123,238,185,231,30,223,33,108,110,70,59,209,70,244,143,171,119,130,57,45,133,75,135,227,56,238,246,183,27,126,245,161,177,15,77,186,237,78,183,189,183,215,142,15,162,168,29,71,113,59,105,239,237,71,81,231,224,96,63,105,71,73,239,152,106,199,149,76,135,143,119,79,31,78,47,119,111,7,48,180,113,127,99,28,245,97,120,179,15,223,6,234,24,146,40,142,155,48,112,37,67,233,224,72,107,193,51,26,194,224,7,22,90,80,135,233,86,186,10,243,143,240,248,24,7,102,121,212,159,68,253,145,107,37,157,113,219,47,30,59,234,111,192,112,78,241,92,58,163,88,153,213,4,210,167,167,215,24,54,48,72,224,60,135,7,85,2,53,8,84,130,157,115,216,129,156,11,1,110,202,45,184,5,5,200,149,16,170,226,114,226,191,251,55,142,130,89,31,195,64,43,235,
-128,59,112,10,84,105,32,29,142,166,206,105,210,35,45,210,170,170,138,52,189,118,188,240,16,90,147,166,50,19,210,202,149,41,11,210,226,146,225,61,105,234,169,38,95,29,57,116,83,131,148,145,173,220,20,228,142,51,114,120,240,153,108,141,18,56,11,187,129,75,184,196,106,204,17,142,149,145,104,82,79,190,153,206,11,73,224,197,253,255,196,89,41,187,16,38,234,111,47,81,120,220,137,250,87,115,121,46,105,129,111,146,188,252,125,161,22,141,10,58,248,34,17,126,43,185,46,224,88,73,71,51,215,131,211,130,114,177,3,205,230,219,26,94,238,190,149,124,134,198,114,247,80,39,8,221,225,104,215,194,179,208,160,211,123,141,134,163,204,176,7,23,84,78,74,58,65,187,3,161,96,47,125,97,91,87,3,255,102,212,79,204,156,93,71,224,218,224,140,171,210,122,245,103,74,204,176,8,6,245,157,184,37,13,210,88,34,212,220,234,38,173,69,82,222,39,84,44,217,139,120,255,245,134,193,131,84,218,114,219,131,19,180,153,225,99,12,198,52,33,73,29,24,210,230,88,
-65,165,12,91,113,254,11,229,122,65,233,4,157,215,215,131,157,149,222,200,172,70,172,79,34,168,124,133,27,118,190,139,20,52,204,28,50,48,104,189,129,223,79,57,200,166,200,74,129,181,12,12,69,104,25,29,11,124,183,210,115,153,9,127,204,128,50,198,3,165,186,182,208,151,103,43,9,46,127,173,109,204,209,204,151,23,178,64,110,16,231,214,99,165,9,205,15,35,101,77,228,75,111,44,212,178,245,8,152,210,25,130,166,198,241,140,107,26,42,175,77,141,217,84,42,161,38,222,120,254,224,83,7,153,42,5,3,223,30,46,29,122,113,156,79,186,150,234,115,153,153,42,130,131,44,124,44,117,24,23,62,237,167,55,145,95,96,56,114,74,243,108,62,63,74,173,43,28,147,214,196,170,108,190,134,97,73,54,81,146,221,210,142,26,221,14,220,160,43,141,12,112,171,97,10,223,85,17,106,153,44,143,34,164,127,0,246,134,220,118,
+120,156,149,84,93,79,219,48,20,253,43,87,130,161,13,74,155,132,182,176,86,108,154,248,216,144,16,32,58,158,162,20,187,241,77,235,205,177,45,219,105,97,136,255,62,59,45,165,48,209,109,125,112,155,212,247,220,115,206,61,118,10,155,155,81,35,218,136,254,242,233,29,99,65,43,225,178,116,20,199,251,253,237,29,191,250,210,216,151,38,251,237,206,126,123,111,175,29,31,68,81,59,142,226,118,210,222,235,70,81,231,224,160,155,180,163,164,119,68,181,227,74,102,233,195,237,227,187,147,139,221,155,1,164,54,238,111,140,162,62,164,215,67,167,52,207,73,143,180,72,171,210,122,134,35,210,26,91,149,207,215,36,138,99,178,137,146,236,86,118,216,133,175,3,117,4,225,93,150,94,119,161,9,3,87,49,148,14,190,104,45,120,78,67,27,248,142,165,22,212,97,182,149,45,219,248,159,240,240,16,7,37,69,212,31,71,253,161,107,37,157,81,219,47,158,75,212,223,128,116,46,233,76,58,163,88,149,215,132,179,199,199,151,24,54,48,78,224,172,128,123,85,1,53,8,84,
+130,157,115,104,64,193,133,0,55,225,22,220,130,2,20,74,8,53,227,114,236,223,251,39,142,130,89,95,195,64,43,235,128,59,112,10,84,101,32,75,135,19,231,244,220,133,217,108,70,154,222,107,94,122,8,173,73,83,153,49,105,21,202,84,37,105,113,201,240,142,52,245,68,147,207,142,28,186,137,65,202,200,86,97,74,114,203,25,57,60,248,72,182,134,9,156,134,221,192,37,92,224,108,196,17,142,148,145,104,50,79,190,153,205,133,36,176,242,253,111,230,44,157,93,24,19,245,183,159,80,120,220,137,250,151,115,123,46,104,137,175,154,172,254,125,174,22,131,10,62,120,145,8,191,148,92,87,112,164,164,163,185,235,193,73,73,185,104,64,179,249,90,195,234,238,27,201,167,104,44,119,247,117,131,48,29,142,118,45,60,11,3,58,185,211,104,56,202,28,123,112,78,229,184,162,99,180,13,8,130,189,245,165,109,93,14,252,147,81,63,48,119,118,29,129,43,131,83,174,42,235,221,159,42,49,197,50,4,212,79,226,134,236,144,157,39,132,154,91,61,164,181,72,202,231,132,
+138,39,246,34,238,190,220,48,184,151,74,91,110,123,112,140,54,55,124,132,33,152,38,52,169,11,67,219,2,103,48,83,134,45,57,255,129,114,181,160,116,140,206,251,235,193,78,43,31,100,86,35,214,39,23,84,177,196,13,59,223,68,10,30,230,14,25,24,180,62,192,111,183,28,228,19,100,149,192,218,6,134,34,140,140,142,4,190,169,244,76,230,194,31,51,160,140,241,64,169,214,22,230,242,28,37,193,229,207,181,131,249,50,245,242,66,23,40,12,226,60,122,172,50,97,248,225,94,89,83,185,154,141,133,91,182,190,2,38,116,138,160,169,113,60,231,154,6,229,117,168,49,159,72,37,212,216,7,207,31,124,234,32,87,149,96,224,199,195,165,67,111,142,243,77,215,82,125,150,153,171,50,36,200,194,251,74,135,235,194,183,253,240,170,242,19,164,255,113,139,238,236,119,224,26,93,101,100,128,91,222,168,240,77,149,65,203,248,233,40,66,246,27,3,90,237,2,
 
diff --git a/uppbox/uppweb/www.tpp/all.i b/uppbox/uppweb/www.tpp/all.i
index 565db4c2b..5064a8c23 100644
--- a/uppbox/uppweb/www.tpp/all.i
+++ b/uppbox/uppweb/www.tpp/all.i
@@ -1,105 +1,165 @@
-TOPIC("reference$zh-tw")
-#include "reference$zh-tw.tppi"
-END_TOPIC
-
-TOPIC("tutoring$es-es")
-#include "tutoring$es-es.tppi"
-END_TOPIC
-
-TOPIC("reference$es-es")
-#include "reference$es-es.tppi"
-END_TOPIC
-
-TOPIC("examples$en-us")
-#include "examples$en-us.tppi"
-END_TOPIC
-
-TOPIC("overview$en-us")
-#include "overview$en-us.tppi"
-END_TOPIC
-
-TOPIC("comparison$cs-cz")
-#include "comparison$cs-cz.tppi"
-END_TOPIC
-
-TOPIC("Roadmap$en-us")
-#include "Roadmap$en-us.tppi"
-END_TOPIC
-
-TOPIC("contribweb$ca-es")
-#include "contribweb$ca-es.tppi"
-END_TOPIC
-
-TOPIC("vsqt$fr-fr")
-#include "vsqt$fr-fr.tppi"
-END_TOPIC
-
-TOPIC("vsstd$cs-cz")
-#include "vsstd$cs-cz.tppi"
-END_TOPIC
-
-TOPIC("index$es-es")
-#include "index$es-es.tppi"
-END_TOPIC
-
-TOPIC("idess$ru-ru")
-#include "idess$ru-ru.tppi"
-END_TOPIC
-
-TOPIC("vsswing$cs-cz")
-#include "vsswing$cs-cz.tppi"
-END_TOPIC
-
 TOPIC("20081chlog$en-us")
 #include "20081chlog$en-us.tppi"
 END_TOPIC
 
-TOPIC("extlinks$en-us")
-#include "extlinks$en-us.tppi"
-END_TOPIC
-
-TOPIC("contribweb$fr-fr")
-#include "contribweb$fr-fr.tppi"
-END_TOPIC
-
-TOPIC("comparison$en-us")
-#include "comparison$en-us.tppi"
-END_TOPIC
-
-TOPIC("index$zh-cn")
-#include "index$zh-cn.tppi"
-END_TOPIC
-
-TOPIC("idess$fr-fr")
-#include "idess$fr-fr.tppi"
-END_TOPIC
-
-TOPIC("contribweb$es-es")
-#include "contribweb$es-es.tppi"
+TOPIC("apps$en-us")
+#include "apps$en-us.tppi"
 END_TOPIC
 
 TOPIC("apps$ru-ru")
 #include "apps$ru-ru.tppi"
 END_TOPIC
 
-TOPIC("vswx$zh-tw")
-#include "vswx$zh-tw.tppi"
+TOPIC("bazaar$en-us")
+#include "bazaar$en-us.tppi"
+END_TOPIC
+
+TOPIC("bazaar_submission$en-us")
+#include "bazaar_submission$en-us.tppi"
+END_TOPIC
+
+TOPIC("bazaar_support$en-us")
+#include "bazaar_support$en-us.tppi"
+END_TOPIC
+
+TOPIC("bazaar_user$en-us")
+#include "bazaar_user$en-us.tppi"
+END_TOPIC
+
+TOPIC("bugreports$en-us")
+#include "bugreports$en-us.tppi"
+END_TOPIC
+
+TOPIC("chss$cs-cz")
+#include "chss$cs-cz.tppi"
+END_TOPIC
+
+TOPIC("chss$en-us")
+#include "chss$en-us.tppi"
 END_TOPIC
 
 TOPIC("chss$fr-fr")
 #include "chss$fr-fr.tppi"
 END_TOPIC
 
-TOPIC("download$en-us")
-#include "download$en-us.tppi"
-END_TOPIC
-
 TOPIC("chss$ru-ru")
 #include "chss$ru-ru.tppi"
 END_TOPIC
 
-TOPIC("apps$en-us")
-#include "apps$en-us.tppi"
+TOPIC("codestyle$en-us")
+#include "codestyle$en-us.tppi"
+END_TOPIC
+
+TOPIC("comparison$cs-cz")
+#include "comparison$cs-cz.tppi"
+END_TOPIC
+
+TOPIC("comparison$en-us")
+#include "comparison$en-us.tppi"
+END_TOPIC
+
+TOPIC("comparison$fr-fr")
+#include "comparison$fr-fr.tppi"
+END_TOPIC
+
+TOPIC("comparison$ru-ru")
+#include "comparison$ru-ru.tppi"
+END_TOPIC
+
+TOPIC("contribweb$ca-es")
+#include "contribweb$ca-es.tppi"
+END_TOPIC
+
+TOPIC("contribweb$cs-cz")
+#include "contribweb$cs-cz.tppi"
+END_TOPIC
+
+TOPIC("contribweb$en-us")
+#include "contribweb$en-us.tppi"
+END_TOPIC
+
+TOPIC("contribweb$es-es")
+#include "contribweb$es-es.tppi"
+END_TOPIC
+
+TOPIC("contribweb$fr-fr")
+#include "contribweb$fr-fr.tppi"
+END_TOPIC
+
+TOPIC("cookie$en-us")
+#include "cookie$en-us.tppi"
+END_TOPIC
+
+TOPIC("currenttopics$en-us")
+#include "currenttopics$en-us.tppi"
+END_TOPIC
+
+TOPIC("devmovie$en-us")
+#include "devmovie$en-us.tppi"
+END_TOPIC
+
+TOPIC("documentation$en-us")
+#include "documentation$en-us.tppi"
+END_TOPIC
+
+TOPIC("download$en-us")
+#include "download$en-us.tppi"
+END_TOPIC
+
+TOPIC("download$fr-fr")
+#include "download$fr-fr.tppi"
+END_TOPIC
+
+TOPIC("examples$ca-es")
+#include "examples$ca-es.tppi"
+END_TOPIC
+
+TOPIC("examples$cs-cz")
+#include "examples$cs-cz.tppi"
+END_TOPIC
+
+TOPIC("examples$en-us")
+#include "examples$en-us.tppi"
+END_TOPIC
+
+TOPIC("examples$es-es")
+#include "examples$es-es.tppi"
+END_TOPIC
+
+TOPIC("examples$fr-fr")
+#include "examples$fr-fr.tppi"
+END_TOPIC
+
+TOPIC("examples$ru-ru")
+#include "examples$ru-ru.tppi"
+END_TOPIC
+
+TOPIC("extlinks$en-us")
+#include "extlinks$en-us.tppi"
+END_TOPIC
+
+TOPIC("FAQ$en-us")
+#include "FAQ$en-us.tppi"
+END_TOPIC
+
+TOPIC("Funding$ca-es")
+#include "Funding$ca-es.tppi"
+END_TOPIC
+
+TOPIC("Funding$cs-cz")
+#include "Funding$cs-cz.tppi"
+END_TOPIC
+
+TOPIC("Funding$en-us")
+#include "Funding$en-us.tppi"
+END_TOPIC
+
+TOPIC("Funding$es-es")
+#include "Funding$es-es.tppi"
+END_TOPIC
+
+TOPIC("Funding$fr-fr")
+#include "Funding$fr-fr.tppi"
 END_TOPIC
 
 TOPIC("Funding$ru-ru")
@@ -110,28 +170,32 @@ TOPIC("helpus$en-us")
 #include "helpus$en-us.tppi"
 END_TOPIC
 
-TOPIC("overview$cs-cz")
-#include "overview$cs-cz.tppi"
+TOPIC("IDEoverview$en-us")
+#include "IDEoverview$en-us.tppi"
 END_TOPIC
 
-TOPIC("Funding$cs-cz")
-#include "Funding$cs-cz.tppi"
+TOPIC("idess$cs-cz")
+#include "idess$cs-cz.tppi"
 END_TOPIC
 
-TOPIC("comparison$ru-ru")
-#include "comparison$ru-ru.tppi"
+TOPIC("idess$en-us")
+#include "idess$en-us.tppi"
 END_TOPIC
 
-TOPIC("svnInstall$en-us")
-#include "svnInstall$en-us.tppi"
+TOPIC("idess$fr-fr")
+#include "idess$fr-fr.tppi"
 END_TOPIC
 
-TOPIC("vsstd2$zh-tw")
-#include "vsstd2$zh-tw.tppi"
+TOPIC("idess$ru-ru")
+#include "idess$ru-ru.tppi"
 END_TOPIC
 
-TOPIC("videotutorials$en-us")
-#include "videotutorials$en-us.tppi"
+TOPIC("idess$zh-tw")
+#include "idess$zh-tw.tppi"
+END_TOPIC
+
+TOPIC("index$ca-es")
+#include "index$ca-es.tppi"
 END_TOPIC
 
 TOPIC("index$cs-cz")
@@ -142,148 +206,60 @@ TOPIC("index$en-us")
 #include "index$en-us.tppi"
 END_TOPIC
 
-TOPIC("index$ca-es")
-#include "index$ca-es.tppi"
+TOPIC("index$es-es")
+#include "index$es-es.tppi"
 END_TOPIC
 
-TOPIC("bugreports$en-us")
-#include "bugreports$en-us.tppi"
+TOPIC("index$fr-fr")
+#include "index$fr-fr.tppi"
 END_TOPIC
 
-TOPIC("ss$zh-tw")
-#include "ss$zh-tw.tppi"
+TOPIC("index$ro-ro")
+#include "index$ro-ro.tppi"
 END_TOPIC
 
-TOPIC("contribweb$en-us")
-#include "contribweb$en-us.tppi"
+TOPIC("index$ru-ru")
+#include "index$ru-ru.tppi"
 END_TOPIC
 
-TOPIC("examples$ru-ru")
-#include "examples$ru-ru.tppi"
+TOPIC("index$zh-cn")
+#include "index$zh-cn.tppi"
 END_TOPIC
 
-TOPIC("Funding$ca-es")
-#include "Funding$ca-es.tppi"
+TOPIC("index$zh-tw")
+#include "index$zh-tw.tppi"
 END_TOPIC
 
-TOPIC("tutoringtutor$en-us")
-#include "tutoringtutor$en-us.tppi"
+TOPIC("overview$cs-cz")
+#include "overview$cs-cz.tppi"
 END_TOPIC
 
-TOPIC("examples$ca-es")
-#include "examples$ca-es.tppi"
-END_TOPIC
-
-TOPIC("Funding$fr-fr")
-#include "Funding$fr-fr.tppi"
-END_TOPIC
-
-TOPIC("examples$fr-fr")
-#include "examples$fr-fr.tppi"
-END_TOPIC
-
-TOPIC("idess$en-us")
-#include "idess$en-us.tppi"
-END_TOPIC
-
-TOPIC("vswx$en-us")
-#include "vswx$en-us.tppi"
-END_TOPIC
-
-TOPIC("vsd$en-us")
-#include "vsd$en-us.tppi"
-END_TOPIC
-
-TOPIC("currenttopics$en-us")
-#include "currenttopics$en-us.tppi"
-END_TOPIC
-
-TOPIC("overview$ru-ru")
-#include "overview$ru-ru.tppi"
-END_TOPIC
-
-TOPIC("tutoringmanual$en-us")
-#include "tutoringmanual$en-us.tppi"
-END_TOPIC
-
-TOPIC("chss$en-us")
-#include "chss$en-us.tppi"
-END_TOPIC
-
-TOPIC("idess$zh-tw")
-#include "idess$zh-tw.tppi"
-END_TOPIC
-
-TOPIC("download$fr-fr")
-#include "download$fr-fr.tppi"
-END_TOPIC
-
-TOPIC("vsstd2$en-us")
-#include "vsstd2$en-us.tppi"
-END_TOPIC
-
-TOPIC("devmovie$en-us")
-#include "devmovie$en-us.tppi"
-END_TOPIC
-
-TOPIC("examples$cs-cz")
-#include "examples$cs-cz.tppi"
-END_TOPIC
-
-TOPIC("vsqt$cs-cz")
-#include "vsqt$cs-cz.tppi"
-END_TOPIC
-
-TOPIC("reference$en-us")
-#include "reference$en-us.tppi"
-END_TOPIC
-
-TOPIC("bazaar$en-us")
-#include "bazaar$en-us.tppi"
-END_TOPIC
-
-TOPIC("ss$en-us")
-#include "ss$en-us.tppi"
-END_TOPIC
-
-TOPIC("comparison$fr-fr")
-#include "comparison$fr-fr.tppi"
-END_TOPIC
-
-TOPIC("documentation$en-us")
-#include "documentation$en-us.tppi"
-END_TOPIC
-
-TOPIC("idess$cs-cz")
-#include "idess$cs-cz.tppi"
-END_TOPIC
-
-TOPIC("vsswing$zh-tw")
-#include "vsswing$zh-tw.tppi"
+TOPIC("overview$en-us")
+#include "overview$en-us.tppi"
 END_TOPIC
 
 TOPIC("overview$fr-fr")
 #include "overview$fr-fr.tppi"
 END_TOPIC
 
-TOPIC("Funding$en-us")
-#include "Funding$en-us.tppi"
+TOPIC("overview$ru-ru")
+#include "overview$ru-ru.tppi"
+END_TOPIC
+
+TOPIC("reference$ca-es")
+#include "reference$ca-es.tppi"
 END_TOPIC
 
 TOPIC("reference$cs-cz")
 #include "reference$cs-cz.tppi"
 END_TOPIC
 
-TOPIC("vsd$ru-ru")
-#include "vsd$ru-ru.tppi"
+TOPIC("reference$en-us")
+#include "reference$en-us.tppi"
 END_TOPIC
 
-TOPIC("vsqt$en-us")
-#include "vsqt$en-us.tppi"
-END_TOPIC
-
-TOPIC("index$ro-ro")
-#include "index$ro-ro.tppi"
+TOPIC("reference$es-es")
+#include "reference$es-es.tppi"
 END_TOPIC
 
 TOPIC("reference$fr-fr")
@@ -294,99 +270,123 @@ TOPIC("reference$ru-ru")
 #include "reference$ru-ru.tppi"
 END_TOPIC
 
-TOPIC("bazaar_user$en-us")
-#include "bazaar_user$en-us.tppi"
+TOPIC("reference$zh-tw")
+#include "reference$zh-tw.tppi"
 END_TOPIC
 
-TOPIC("vsd$cs-cz")
-#include "vsd$cs-cz.tppi"
-END_TOPIC
-
-TOPIC("index$fr-fr")
-#include "index$fr-fr.tppi"
+TOPIC("Roadmap$en-us")
+#include "Roadmap$en-us.tppi"
 END_TOPIC
 
 TOPIC("ss$cs-cz")
 #include "ss$cs-cz.tppi"
 END_TOPIC
 
-TOPIC("index$ru-ru")
-#include "index$ru-ru.tppi"
-END_TOPIC
-
-TOPIC("codestyle$en-us")
-#include "codestyle$en-us.tppi"
-END_TOPIC
-
-TOPIC("tutoring$en-us")
-#include "tutoring$en-us.tppi"
-END_TOPIC
-
-TOPIC("bazaar_submission$en-us")
-#include "bazaar_submission$en-us.tppi"
-END_TOPIC
-
-TOPIC("vswx$cs-cz")
-#include "vswx$cs-cz.tppi"
-END_TOPIC
-
-TOPIC("index$zh-tw")
-#include "index$zh-tw.tppi"
-END_TOPIC
-
-TOPIC("contribweb$cs-cz")
-#include "contribweb$cs-cz.tppi"
-END_TOPIC
-
-TOPIC("ss$ru-ru")
-#include "ss$ru-ru.tppi"
-END_TOPIC
-
-TOPIC("IDEoverview$en-us")
-#include "IDEoverview$en-us.tppi"
-END_TOPIC
-
-TOPIC("chss$cs-cz")
-#include "chss$cs-cz.tppi"
-END_TOPIC
-
-TOPIC("vsqt$ru-ru")
-#include "vsqt$ru-ru.tppi"
-END_TOPIC
-
-TOPIC("Funding$es-es")
-#include "Funding$es-es.tppi"
-END_TOPIC
-
-TOPIC("cookie$en-us")
-#include "cookie$en-us.tppi"
-END_TOPIC
-
-TOPIC("bazaar_support$en-us")
-#include "bazaar_support$en-us.tppi"
-END_TOPIC
-
-TOPIC("vsstd$en-us")
-#include "vsstd$en-us.tppi"
-END_TOPIC
-
-TOPIC("vsswing$en-us")
-#include "vsswing$en-us.tppi"
-END_TOPIC
-
-TOPIC("examples$es-es")
-#include "examples$es-es.tppi"
+TOPIC("ss$en-us")
+#include "ss$en-us.tppi"
 END_TOPIC
 
 TOPIC("ss$fr-fr")
 #include "ss$fr-fr.tppi"
 END_TOPIC
 
-TOPIC("FAQ$en-us")
-#include "FAQ$en-us.tppi"
+TOPIC("ss$ru-ru")
+#include "ss$ru-ru.tppi"
 END_TOPIC
 
-TOPIC("reference$ca-es")
-#include "reference$ca-es.tppi"
+TOPIC("ss$zh-tw")
+#include "ss$zh-tw.tppi"
+END_TOPIC
+
+TOPIC("svnInstall$en-us")
+#include "svnInstall$en-us.tppi"
+END_TOPIC
+
+TOPIC("tutoring$en-us")
+#include "tutoring$en-us.tppi"
+END_TOPIC
+
+TOPIC("tutoring$es-es")
+#include "tutoring$es-es.tppi"
+END_TOPIC
+
+TOPIC("tutoringmanual$en-us")
+#include "tutoringmanual$en-us.tppi"
+END_TOPIC
+
+TOPIC("tutoringtutor$en-us")
+#include "tutoringtutor$en-us.tppi"
+END_TOPIC
+
+TOPIC("videotutorials$en-us")
+#include "videotutorials$en-us.tppi"
+END_TOPIC
+
+TOPIC("vsd$cs-cz")
+#include "vsd$cs-cz.tppi"
+END_TOPIC
+
+TOPIC("vsd$en-us")
+#include "vsd$en-us.tppi"
+END_TOPIC
+
+TOPIC("vsd$ru-ru")
+#include "vsd$ru-ru.tppi"
+END_TOPIC
+
+TOPIC("vsqt$cs-cz")
+#include "vsqt$cs-cz.tppi"
+END_TOPIC
+
+TOPIC("vsqt$en-us")
+#include "vsqt$en-us.tppi"
+END_TOPIC
+
+TOPIC("vsqt$fr-fr")
+#include "vsqt$fr-fr.tppi"
+END_TOPIC
+
+TOPIC("vsqt$ru-ru")
+#include "vsqt$ru-ru.tppi"
+END_TOPIC
+
+TOPIC("vsstd$cs-cz")
+#include "vsstd$cs-cz.tppi"
+END_TOPIC
+
+TOPIC("vsstd$en-us")
+#include "vsstd$en-us.tppi"
+END_TOPIC
+
+TOPIC("vsstd2$en-us")
+#include "vsstd2$en-us.tppi"
+END_TOPIC
+
+TOPIC("vsstd2$zh-tw")
+#include "vsstd2$zh-tw.tppi"
+END_TOPIC
+
+TOPIC("vsswing$cs-cz")
+#include "vsswing$cs-cz.tppi"
+END_TOPIC
+
+TOPIC("vsswing$en-us")
+#include "vsswing$en-us.tppi"
+END_TOPIC
+
+TOPIC("vsswing$zh-tw")
+#include "vsswing$zh-tw.tppi"
+END_TOPIC
+
+TOPIC("vswx$cs-cz")
+#include "vswx$cs-cz.tppi"
+END_TOPIC
+
+TOPIC("vswx$en-us")
+#include "vswx$en-us.tppi"
+END_TOPIC
+
+TOPIC("vswx$zh-tw")
+#include "vswx$zh-tw.tppi"
 END_TOPIC