Update to experimental r13598

(bzr r13341.5.17)

40 files changed, 145 insertions, 473 deletions

diff --git a/share/extensions/gcodetools_area.inx b/share/extensions/gcodetools_area.inx
index ad27ecee4..b487f2c54 100644
--- a/share/extensions/gcodetools_area.inx
+++ b/share/extensions/gcodetools_area.inx
@@ -88,7 +88,7 @@ For depth function c=color intensity from 0.0 (white) to 1.0 (black), d is the d
 				<_item value="G20 (All units in inches)">in</_item>
 			</param>
 			<param name="postprocessor" type="enum" _gui-text="Post-processor:">
-				<_item value=" ">None</_item>
+				<_item msgctxt="GCode postprocessor" value=" ">None</_item>
 				<_item value="parameterize();">Parameterize Gcode</_item>
 				<_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item>
 				<_item value="round(4);">Round all values to 4 digits</_item>
diff --git a/share/extensions/gcodetools_dxf_points.inx b/share/extensions/gcodetools_dxf_points.inx
index e4534e8af..4367353b9 100644
--- a/share/extensions/gcodetools_dxf_points.inx
+++ b/share/extensions/gcodetools_dxf_points.inx
@@ -34,7 +34,7 @@ Also you can manually select object, open XML editor (Shift+Ctrl+X) and add or r
 				<_item value="G20 (All units in inches)">in</_item>
 			</param>
 			<param name="postprocessor" type="enum" _gui-text="Post-processor:">
-				<_item value=" ">None</_item>
+				<_item msgctxt="GCode postprocessor" value=" ">None</_item>
 				<_item value="parameterize();">Parameterize Gcode</_item>
 				<_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item>
 				<_item value="round(4);">Round all values to 4 digits</_item>
diff --git a/share/extensions/gcodetools_engraving.inx b/share/extensions/gcodetools_engraving.inx
index 6885f32fd..a488f45a1 100644
--- a/share/extensions/gcodetools_engraving.inx
+++ b/share/extensions/gcodetools_engraving.inx
@@ -46,7 +46,7 @@ ellipse.(minor axis r, major 4r).....: math.sqrt(max(0,r**2-w**2))*4</_param>
 				<_item value="G20 (All units in inches)">in</_item>
 			</param>
 			<param name="postprocessor" type="enum" _gui-text="Post-processor:">
-				<_item value=" ">None</_item>
+				<_item msgctxt="GCode postprocessor" value=" ">None</_item>
 				<_item value="parameterize();">Parameterize Gcode</_item>
 				<_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item>
 				<_item value="round(4);">Round all values to 4 digits</_item>
diff --git a/share/extensions/gcodetools_graffiti.inx b/share/extensions/gcodetools_graffiti.inx
index 7253b8fa4..bcaec76d4 100644
--- a/share/extensions/gcodetools_graffiti.inx
+++ b/share/extensions/gcodetools_graffiti.inx
@@ -73,7 +73,7 @@ Now press apply to create control points (independent set for each layer).
 				<_item value="G20 (All units in inches)">in</_item>
 			</param>
 			<param name="postprocessor" type="enum" _gui-text="Post-processor:">
-				<_item value=" ">None</_item>
+				<_item msgctxt="GCode postprocessor" value=" ">None</_item>
 				<_item value="parameterize();">Parameterize Gcode</_item>
 				<_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item>
 				<_item value="round(4);">Round all values to 4 digits</_item>
diff --git a/share/extensions/gcodetools_lathe.inx b/share/extensions/gcodetools_lathe.inx
index d3c6916fd..c74ae267c 100644
--- a/share/extensions/gcodetools_lathe.inx
+++ b/share/extensions/gcodetools_lathe.inx
@@ -68,7 +68,7 @@ For depth function c=color intensity from 0.0 (white) to 1.0 (black), d is the d
 				<_item value="G20 (All units in inches)">in</_item>
 			</param>
 			<param name="postprocessor" type="enum" _gui-text="Post-processor:">
-				<_item value=" ">None</_item>
+				<_item msgctxt="GCode postprocessor" value=" ">None</_item>
 				<_item value="parameterize();">Parameterize Gcode</_item>
 				<_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item>
 				<_item value="round(4);">Round all values to 4 digits</_item>
diff --git a/share/extensions/gcodetools_path_to_gcode.inx b/share/extensions/gcodetools_path_to_gcode.inx
index 8a79d6aae..39cc6571b 100644
--- a/share/extensions/gcodetools_path_to_gcode.inx
+++ b/share/extensions/gcodetools_path_to_gcode.inx
@@ -48,7 +48,7 @@ For depth function c=color intensity from 0.0 (white) to 1.0 (black), d is the d
 				<_item value="G20 (All units in inches)">in</_item>
 			</param>
 			<param name="postprocessor" type="enum" _gui-text="Post-processor:">
-				<_item value=" ">None</_item>
+				<_item msgctxt="GCode postprocessor" value=" ">None</_item>
 				<_item value="parameterize();">Parameterize Gcode</_item>
 				<_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item>
 				<_item value="round(4);">Round all values to 4 digits</_item>
diff --git a/share/extensions/grid_polar.inx b/share/extensions/grid_polar.inx
index ee468fa34..ffc64a3d5 100644
--- a/share/extensions/grid_polar.inx
+++ b/share/extensions/grid_polar.inx
@@ -6,7 +6,7 @@
   <dependency type="executable" location="extensions">inkex.py</dependency>
   <param name="c_dot_dia"    type="float" min="1" max="1000" _gui-text="Centre Dot Diameter (px):">5.0</param>
   <param name="a_labels"     type="enum"  _gui-text="Circumferential Labels:">
-    <_item value="none">None</_item>
+    <_item msgctxt="Label" value="none">None</_item>
     <_item value="deg">Degrees</_item>
   </param>
   <param name="a_label_size"   type="int"   min="1" max="1000" _gui-text="Circumferential Label Size (px):">18</param>
diff --git a/share/extensions/guides_creator.inx b/share/extensions/guides_creator.inx
index 4d032e024..baaa093c3 100644
--- a/share/extensions/guides_creator.inx
+++ b/share/extensions/guides_creator.inx
@@ -39,7 +39,7 @@
         <item value="4">1/4</item>
         <item value="3">1/3</item>
         <item value="2">1/2</item>
-        <_item value="0">None</_item>
+        <_item msgctxt="Margin" value="0">None</_item>
       </param>
       <param name="footer_margin" type="enum" appearance="minimal" _gui-text="Footer margin:">
         <item value="10">1/10</item>
@@ -51,7 +51,7 @@
         <item value="4">1/4</item>
         <item value="3">1/3</item>
         <item value="2">1/2</item>
-        <_item value="0">None</_item>
+        <_item msgctxt="Margin" value="0">None</_item>
       </param>
       <param name="left_margin" type="enum" appearance="minimal" _gui-text="Left margin:">
         <item value="10">1/10</item>
@@ -63,7 +63,7 @@
         <item value="4">1/4</item>
         <item value="3">1/3</item>
         <item value="2">1/2</item>
-        <_item value="0">None</_item>
+        <_item msgctxt="Margin" value="0">None</_item>
       </param>
       <param name="right_margin" type="enum" appearance="minimal" _gui-text="Right margin:">
         <item value="10">1/10</item>
@@ -75,7 +75,7 @@
         <item value="4">1/4</item>
         <item value="3">1/3</item>
         <item value="2">1/2</item>
-        <_item value="0">None</_item>
+        <_item msgctxt="Margin" value="0">None</_item>
       </param>
       <param name="vertical_subdivisions"    type="int"   min="1" max="1000" _gui-text="Columns:">2</param>
       <param name="horizontal_subdivisions"  type="int"   min="1" max="1000" _gui-text="Rows:">3</param>
diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
index 4ed5ce9de..80543f02a 100644
--- a/share/extensions/plotter.inx
+++ b/share/extensions/plotter.inx
@@ -31,7 +31,7 @@
         <_item value="xonxoff">Software (XON/XOFF)</_item>
         <_item value="rtscts">Hardware (RTS/CTS)</_item>
         <_item value="dsrdtrrtscts">Hardware (DSR/DTR + RTS/CTS)</_item>
-        <_item value="">None</_item>
+        <_item msgctxt="Flow control" value="">None</_item>
       </param>
       <param name="commandLanguage" type="enum" _gui-text="Command language:" _gui-description="The command language to use (Default: HPGL)">
         <_item value="HPGL">HPGL</_item>
diff --git a/share/extensions/scour.inx b/share/extensions/scour.inx
index ee245b149..45719deeb 100644
--- a/share/extensions/scour.inx
+++ b/share/extensions/scour.inx
@@ -22,7 +22,7 @@
       	    <param name="indent" type="enum" _gui-text="XML indentation (pretty-printing):">
                 <_item value="space">Space</_item>
                 <_item value="tab">Tab</_item>
-                <_item value="none">None</_item>
+                <_item msgctxt="Indent" value="none">None</_item>
             </param>
         </page>
         <page name="Ids" _gui-text="Ids">            
diff --git a/share/templates/CD_label_120x120.svg b/share/templates/CD_label_120x120.svg
index 979c0d91a..1f1e44bcd 100644
--- a/share/templates/CD_label_120x120.svg
+++ b/share/templates/CD_label_120x120.svg
@@ -5,19 +5,13 @@
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="425.19684"
-   height="425.19684"
-   id="svg2816"
-   version="1.1"
-   inkscape:version="0.48+devel r9861"
-   sodipodi:docname="CD-Label_120x120.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2818" />
+   width="120mm"
+   height="120mm"
+   viewBox="-60 -60 120 120"
+   sodipodi:docname="CD-Label_120x120.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -25,11 +19,10 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="148.69955"
-     inkscape:cy="198.95067"
+     inkscape:cx="226.771653543"
+     inkscape:cy="226.771653543"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
-     id="namedview2820"
      showgrid="false"
      units="mm"
      showguides="true"
@@ -48,11 +41,11 @@
      inkscape:snap-grids="true">
     <sodipodi:guide
        orientation="1,0"
-       position="212.59843,212.59843"
+       position="226.771653543,226.771653543"
        id="guide2827" />
     <sodipodi:guide
        orientation="0,1"
-       position="212.59843,212.59843"
+       position="226.771653543,226.771653543"
        id="guide2829" />
     <inkscape:grid
        type="xygrid"
@@ -79,45 +72,19 @@
     </rdf:RDF>
   </metadata>
   <inkscape:_templateinfo>
-      <inkscape:_name>CD Label 120x120 </inkscape:_name>
-      <inkscape:author>JazzyNico</inkscape:author>
+      <inkscape:_name>CD Label 120mmx120mm </inkscape:_name>
+      <inkscape:author>Tavmjong Bah, based on tempate by JazzyNico</inkscape:author>
       <inkscape:_shortdesc>Simple CD Label template with disc's pattern.</inkscape:_shortdesc>
-      <inkscape:date>2010-11-15</inkscape:date>
+      <inkscape:date>2014-10-06</inkscape:date>
       <inkscape:_keywords>CD label 120x120 disc disk</inkscape:_keywords>
   </inkscape:_templateinfo>
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#000000;stroke-width:0.14648895;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path2831"
-       sodipodi:cx="-132.58252"
-       sodipodi:cy="210.41315"
-       sodipodi:rx="83.968933"
-       sodipodi:ry="90.156113"
-       d="m -48.613586,210.41315 a 83.968933,90.156113 0 1 1 -167.937864,0 83.968933,90.156113 0 1 1 167.937864,0 z"
-       transform="matrix(2.5297404,0,0,2.3561309,547.99778,-283.1625)" />
-    <path
-       transform="matrix(0.31591735,0,-0.01153582,0.29446415,256.91083,150.63929)"
-       d="m -48.613586,210.41315 a 83.968933,90.156113 0 1 1 -167.937864,0 83.968933,90.156113 0 1 1 167.937864,0 z"
-       sodipodi:ry="90.156113"
-       sodipodi:rx="83.968933"
-       sodipodi:cy="210.41315"
-       sodipodi:cx="-132.58252"
-       id="path3605"
-       style="fill:none;stroke:#000000;stroke-width:0.14648895;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#000000;stroke-width:0.14648895;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3607"
-       sodipodi:cx="-132.58252"
-       sodipodi:cy="210.41315"
-       sodipodi:rx="83.968933"
-       sodipodi:ry="90.156113"
-       d="m -48.613586,210.41315 a 83.968933,90.156113 0 1 1 -167.937864,0 83.968933,90.156113 0 1 1 167.937864,0 z"
-       transform="matrix(0.79925011,0,-0.02918487,0.74498189,324.70589,55.844435)" />
+     id="Template"
+     style="fill:none;stroke:black;stroke-width:0.05">
+    <circle cx="0" cy="0" r="60"/>
+    <circle cx="0" cy="0" r="19"/>
+    <circle cx="0" cy="0" r="7.5"/>
   </g>
 </svg>
diff --git a/share/templates/LaTeX_Beamer.svg b/share/templates/LaTeX_Beamer.svg
index 9815a2290..d712ab60d 100644
--- a/share/templates/LaTeX_Beamer.svg
+++ b/share/templates/LaTeX_Beamer.svg
@@ -89,6 +89,5 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(4.149475e-6,-698.0315)" />
+     id="layer1" />
 </svg>
diff --git a/share/templates/black_opaque.svg b/share/templates/black_opaque.svg
index 584abe7c0..7bed84ee5 100644
--- a/share/templates/black_opaque.svg
+++ b/share/templates/black_opaque.svg
@@ -9,18 +9,20 @@
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    width="210mm"
-   height="297mm">
+   height="297mm"
+   viewBox="0 0 210 297">
   <defs />
   <sodipodi:namedview
+     id="base"
      pagecolor="#000000"
      bordercolor="#000000"
      borderopacity="1.0"
      inkscape:pageopacity="1.0"
      inkscape:pageshadow="0"
-     inkscape:zoom="0.34"
-     inkscape:cx="350"
-     inkscape:cy="520" 
-     inkscape:document-units="px"
+     inkscape:zoom="0.35"
+     inkscape:cx="400"
+     inkscape:cy="560" 
+     inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
     <rdf:RDF>
diff --git a/share/templates/business_card_85x54mm.svg b/share/templates/business_card_85x54mm.svg
index 227ed6a12..257cb6060 100644
--- a/share/templates/business_card_85x54mm.svg
+++ b/share/templates/business_card_85x54mm.svg
@@ -22,7 +22,7 @@
      inkscape:pageshadow="2"
      inkscape:zoom="1.2"
      inkscape:cx="160"
-     inkscape:cy="90" 
+     inkscape:cy="100" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
@@ -38,7 +38,7 @@
   <inkscape:_templateinfo>
       <inkscape:_name>Business Card 85x54mm</inkscape:_name>
       <inkscape:_shortdesc>Empty business card template.</inkscape:_shortdesc>
-      <inkscape:_keywords>business card empty 85x54</inkscape:_keywords>
+      <inkscape:_keywords>business card empty 85mmx54mm</inkscape:_keywords>
   </inkscape:_templateinfo>
   <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" />
 </svg>
diff --git a/share/templates/business_card_90x50mm.svg b/share/templates/business_card_90x50mm.svg
index a2e40fe9e..c25556468 100644
--- a/share/templates/business_card_90x50mm.svg
+++ b/share/templates/business_card_90x50mm.svg
@@ -21,8 +21,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.2"
-     inkscape:cx="160"
-     inkscape:cy="90" 
+     inkscape:cx="170"
+     inkscape:cy="95" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
@@ -38,7 +38,7 @@
   <inkscape:_templateinfo>
       <inkscape:_name>Business Card 90x50mm</inkscape:_name>
       <inkscape:_shortdesc>Empty business card template.</inkscape:_shortdesc>
-      <inkscape:_keywords>business card empty 90x50</inkscape:_keywords>
+      <inkscape:_keywords>business card empty 90mmx50mm</inkscape:_keywords>
   </inkscape:_templateinfo>
   <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" />
 </svg>
diff --git a/share/templates/default.be.svg b/share/templates/default.be.svg
index ef272db54..ef450f74c 100644
--- a/share/templates/default.be.svg
+++ b/share/templates/default.be.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.ca.svg b/share/templates/default.ca.svg
index fc9f74d41..150acd020 100644
--- a/share/templates/default.ca.svg
+++ b/share/templates/default.ca.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.cs.svg b/share/templates/default.cs.svg
index 583d27bb7..c33a69a9d 100644
--- a/share/templates/default.cs.svg
+++ b/share/templates/default.cs.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.de.svg b/share/templates/default.de.svg
index c18e303b7..700a7562b 100644
--- a/share/templates/default.de.svg
+++ b/share/templates/default.de.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.eo.svg b/share/templates/default.eo.svg
index 3614b4a73..186b34709 100644
--- a/share/templates/default.eo.svg
+++ b/share/templates/default.eo.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.es.svg b/share/templates/default.es.svg
index fc9f74d41..150acd020 100644
--- a/share/templates/default.es.svg
+++ b/share/templates/default.es.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.eu.svg b/share/templates/default.eu.svg
index fc9f74d41..150acd020 100644
--- a/share/templates/default.eu.svg
+++ b/share/templates/default.eu.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.fi.svg b/share/templates/default.fi.svg
index 8b8e71330..42b05bf85 100644
--- a/share/templates/default.fi.svg
+++ b/share/templates/default.fi.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.fr.svg b/share/templates/default.fr.svg
index 2622b1d33..813e4add0 100644
--- a/share/templates/default.fr.svg
+++ b/share/templates/default.fr.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.hu.svg b/share/templates/default.hu.svg
index f091ddee4..f35127844 100644
--- a/share/templates/default.hu.svg
+++ b/share/templates/default.hu.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.it.svg b/share/templates/default.it.svg
index 422e95e1d..a1cff6bea 100644
--- a/share/templates/default.it.svg
+++ b/share/templates/default.it.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.ja.svg b/share/templates/default.ja.svg
index db943edf6..665287a61 100644
--- a/share/templates/default.ja.svg
+++ b/share/templates/default.ja.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.lt.svg b/share/templates/default.lt.svg
index 9f6666eda..742966399 100644
--- a/share/templates/default.lt.svg
+++ b/share/templates/default.lt.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.nl.svg b/share/templates/default.nl.svg
index da08cc5a8..82494c269 100644
--- a/share/templates/default.nl.svg
+++ b/share/templates/default.nl.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.pl.svg b/share/templates/default.pl.svg
index 6a1161799..35348419c 100644
--- a/share/templates/default.pl.svg
+++ b/share/templates/default.pl.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.pt_BR.svg b/share/templates/default.pt_BR.svg
index e1c26c7fb..e905ab405 100644
--- a/share/templates/default.pt_BR.svg
+++ b/share/templates/default.pt_BR.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.ro.svg b/share/templates/default.ro.svg
index 906db67b4..bf3bb7074 100644
--- a/share/templates/default.ro.svg
+++ b/share/templates/default.ro.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.sk.svg b/share/templates/default.sk.svg
index 583d27bb7..c33a69a9d 100644
--- a/share/templates/default.sk.svg
+++ b/share/templates/default.sk.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.svg b/share/templates/default.svg
index f5da5fdfd..71e3f4276 100644
--- a/share/templates/default.svg
+++ b/share/templates/default.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/default.zh_TW.svg b/share/templates/default.zh_TW.svg
index 6dcee2ef9..54a9da3b7 100644
--- a/share/templates/default.zh_TW.svg
+++ b/share/templates/default.zh_TW.svg
@@ -20,8 +20,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="375"
-     inkscape:cy="520" 
+     inkscape:cx="400"
+     inkscape:cy="560" 
      inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
diff --git a/share/templates/no_borders.svg b/share/templates/no_borders.svg
index 8c30476cf..95ac43302 100644
--- a/share/templates/no_borders.svg
+++ b/share/templates/no_borders.svg
@@ -8,8 +8,9 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   width="744.09448819"
-   height="1052.3622047">
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 210 297">
   <defs />
   <sodipodi:namedview
      id="base"
@@ -19,9 +20,9 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="0"
      inkscape:zoom="0.35"
-     inkscape:cx="350"
-     inkscape:cy="520" 
-     inkscape:document-units="px"
+     inkscape:cx="400"
+     inkscape:cy="560" 
+     inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
     <rdf:RDF>
diff --git a/share/templates/no_layers.svg b/share/templates/no_layers.svg
index 0af38fbbe..a82a392e5 100644
--- a/share/templates/no_layers.svg
+++ b/share/templates/no_layers.svg
@@ -8,8 +8,9 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   width="744.09448819"
-   height="1052.3622047">
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 210 297">
   <defs />
   <sodipodi:namedview
      id="base"
@@ -19,9 +20,9 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.35"
-     inkscape:cx="350"
-     inkscape:cy="520" 
-     inkscape:document-units="px"/>
+     inkscape:cx="400"
+     inkscape:cy="560" 
+     inkscape:document-units="mm"/>
   <metadata>
     <rdf:RDF>
       <cc:Work
diff --git a/share/templates/web_banners.svg b/share/templates/web_banners.svg
index b94d538e8..02ad6bcac 100644
--- a/share/templates/web_banners.svg
+++ b/share/templates/web_banners.svg
@@ -64,341 +64,49 @@
       <inkscape:date>2010-05-27</inkscape:date>
       <inkscape:_keywords>web banners collection</inkscape:_keywords>
   </inkscape:_templateinfo>
-  <g
-     inkscape:label="Camada 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="cell_phone_header"
-       width="300"
-       height="50"
-       x="20"
-       y="120" />
-    <rect
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="full_banner"
-       width="468"
-       height="60"
-       x="692"
-       y="758" />
-    <rect
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="leaderboard"
-       width="728"
-       height="90"
-       x="20"
-       y="16" />
-    <rect
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="square_pop-up"
-       width="250"
-       height="250"
-       x="20"
-       y="271" />
-    <rect
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="square"
-       width="200"
-       height="200"
-       x="288"
-       y="321" />
-    <rect
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="large_rectangle"
-       width="336"
-       height="280"
-       x="20"
-       y="538" />
-    <rect
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="medium_rectangle"
-       width="300"
-       height="250"
-       x="373"
-       y="568" />
-    <rect
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="skyscraper"
-       width="120"
-       height="600"
-       x="1290"
-       y="138" />
-    <rect
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="wide_skyscraper"
-       width="160"
-       height="600"
-       x="1101"
-       y="138" />
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="168"
-       y="155"
-       id="text2888"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan2890"
-         x="168"
-         y="155">Cell Phone Header</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="923"
-       y="798"
-       id="text2892"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan2894"
-         x="923"
-         y="798">Full Banner</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="382"
-       y="71"
-       id="text2896"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan2898"
-         x="382"
-         y="71">Leaderboard</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="143"
-       y="403"
-       id="text2900"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan2902"
-         x="143"
-         y="403">Square Pop-Up</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="387"
-       y="429"
-       id="text2904"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan2906"
-         x="387"
-         y="429">Square</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="186"
-       y="685"
-       id="text2908"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan2910"
-         x="186"
-         y="685">Large Rectangle</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="521"
-       y="700"
-       id="text2912"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan2914"
-         x="521"
-         y="700">Medium Rectangle</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="436"
-       y="-1173"
-       id="text2916"
-       sodipodi:linespacing="100%"
-       transform="matrix(0,1,-1,0,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan2918"
-         x="436"
-         y="-1173">Wide Skyscraper</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="436"
-       y="-1342"
-       id="text2920"
-       sodipodi:linespacing="100%"
-       transform="matrix(0,1,-1,0,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan2922"
-         x="436"
-         y="-1342">Skyscraper</tspan></text>
-    <rect
-       y="138"
-       x="772"
-       height="600"
-       width="300"
-       id="half_page_ad"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <text
-       transform="matrix(0,1,-1,0,0,0)"
-       sodipodi:linespacing="100%"
-       id="text2926"
-       y="-914"
-       x="436"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       xml:space="preserve"><tspan
-         y="-914"
-         x="436"
-         id="tspan2928"
-         sodipodi:role="line">Half Page Ad</tspan></text>
-    <rect
-       y="758"
-       x="1176"
-       height="60"
-       width="234"
-       id="half_banner"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <text
-       sodipodi:linespacing="100%"
-       id="text2932"
-       y="798"
-       x="1290"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       xml:space="preserve"><tspan
-         y="798"
-         x="1290"
-         id="tspan2934"
-         sodipodi:role="line">Half Banner</tspan></text>
-    <rect
-       y="16"
-       x="772"
-       height="100"
-       width="300"
-       id="3:1_rectangle"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="920"
-       y="73"
-       id="text2938"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan2940"
-         x="920"
-         y="73">3:1 Rectangle</tspan></text>
-    <rect
-       y="121"
-       x="627"
-       height="240"
-       width="120"
-       id="vertical_banner"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <text
-       transform="matrix(0,1,-1,0,0,0)"
-       sodipodi:linespacing="100%"
-       id="text2926-3"
-       y="-677"
-       x="240"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       xml:space="preserve"><tspan
-         y="-677"
-         x="240"
-         sodipodi:role="line"
-         id="tspan2969">Vertical Banner</tspan></text>
-    <rect
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="button1"
-       width="120"
-       height="90"
-       x="488"
-       y="121" />
-    <rect
-       y="231"
-       x="488"
-       height="60"
-       width="120"
-       id="button2"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <rect
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       id="micro_bar"
-       width="88"
-       height="31"
-       x="520"
-       y="311" />
-    <text
-       xml:space="preserve"
-       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="562"
-       y="334"
-       id="text2979"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan2981"
-         x="562"
-         y="334">Micro Bar</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="547"
-       y="176"
-       id="text2983"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan2985"
-         x="547"
-         y="176">Button 1</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="547"
-       y="271"
-       id="text2987"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan2989"
-         x="547"
-         y="271">Button 2</tspan></text>
-    <rect
-       y="166"
-       x="347"
-       height="125"
-       width="125"
-       id="square_button"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <rect
-       y="388"
-       x="535"
-       height="150"
-       width="180"
-       id="rectangle"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-    <text
-       xml:space="preserve"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       x="623"
-       y="471"
-       id="text2995"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan2997"
-         x="623"
-         y="471">Rectangle</tspan></text>
-    <text
-       sodipodi:linespacing="100%"
-       id="text2865"
-       y="225"
-       x="408"
-       style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:-2px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       xml:space="preserve"><tspan
-         y="225"
-         x="408"
-         id="tspan2867"
-         sodipodi:role="line">Square</tspan><tspan
-         y="253"
-         x="408"
-         sodipodi:role="line"
-         id="tspan2869">Button</tspan></text>
+  <g inkscape:label="Camada 1" inkscape:groupmode="layer" id="layer1">
+    <g id="Areas" style="fill:#999999">
+       <rect id="cell_phone_header" width="300" height="50"  x="20"   y="120" />
+       <rect id="full_banner"       width="468" height="60"  x="692"  y="758" />
+       <rect id="leaderboard"       width="728" height="90"  x="20"   y="16"  />
+       <rect id="square_pop-up"     width="250" height="250" x="20"   y="271" />
+       <rect id="square"            width="200" height="200" x="288"  y="321" />
+       <rect id="large_rectangle"   width="336" height="280" x="20"   y="538" />
+       <rect id="medium_rectangle"  width="300" height="250" x="373"  y="568" />
+       <rect id="skyscraper"        width="120" height="600" x="1290" y="138" />
+       <rect id="wide_skyscraper"   width="160" height="600" x="1101" y="138" />
+       <rect id="half_page_ad"      width="300" height="600" x="772"  y="138" />
+       <rect id="half_banner"       width="234" height="60"  x="1176" y="758" />
+       <rect id="3:1_rectangle"     width="300" height="100" x="772"  y="16"  />
+       <rect id="vertical_banner"   width="120" height="240" x="627"  y="121" />
+       <rect id="button1"           width="120" height="90"  x="488"  y="121" />
+       <rect id="button2"           width="120" height="60"  x="488"  y="231" />
+       <rect id="micro_bar"         width="88"  height="31"  x="520"  y="311" />
+       <rect id="square_button"     width="125" height="125" x="347"  y="166" />
+       <rect id="rectangle"         width="180" height="150" x="535"  y="388" />
+    </g>
+    <g id="Text" style="font-family:sans-serif;font-size:28px;letter-spacing:-2px;text-anchor:middle;fill:#000000">
+      <text x="168" y="155">Cell Phone Header</text>
+      <text x="923" y="798">Full Banner</text>
+      <text x="382" y="71">Leaderboard</text>
+      <text x="143" y="403">Square Pop-Up</text>
+      <text x="387" y="429">Square</text>
+      <text x="186" y="685">Large Rectangle</text>
+      <text x="521" y="700">Medium Rectangle</text>
+      <text x="436" y="-1173" transform="matrix(0,1,-1,0,0,0)">Wide Skyscraper</text>
+      <text x="436" y="-1342" transform="matrix(0,1,-1,0,0,0)">Skyscraper</text>
+      <text x="436" y="-914"  transform="matrix(0,1,-1,0,0,0)">Half Page Ad</text>
+      <text x="1290" y="798">Half Banner</text>
+      <text x="920" y="73">3:1 Rectangle</text>
+      <text x="240" y="-677" transform="matrix(0,1,-1,0,0,0)">Vertical Banner</text>
+      <text x="562" y="334" style="font-size:20px">Micro Bar</text>
+      <text x="547" y="176">Button 1</text>
+      <text x="547" y="271">Button 2</text>
+      <text x="623" y="471">Rectangle</text>
+      <text x="408" y="225">
+	<tspan  x="408" y="225">Square</tspan>
+	<tspan  x="408" y="253">Button</tspan>
+      </text>
+    </g>
   </g>
 </svg>
diff --git a/share/templates/white_opaque.svg b/share/templates/white_opaque.svg
index 0fb83ceab..b94aaeb75 100644
--- a/share/templates/white_opaque.svg
+++ b/share/templates/white_opaque.svg
@@ -8,8 +8,9 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   width="744.09448819"
-   height="1052.3622047">
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 210 297">
   <defs />
   <sodipodi:namedview
      id="base"
@@ -18,10 +19,10 @@
      borderopacity="1.0"
      inkscape:pageopacity="1.0"
      inkscape:pageshadow="0"
-     inkscape:zoom="0.34"
-     inkscape:cx="350"
-     inkscape:cy="520" 
-     inkscape:document-units="px"
+     inkscape:zoom="0.35"
+     inkscape:cx="400"
+     inkscape:cy="560" 
+     inkscape:document-units="mm"
      inkscape:current-layer="layer1" />
   <metadata>
     <rdf:RDF>
diff --git a/share/ui/menus-bars.xml b/share/ui/menus-bars.xml
index ade758788..5ff7f5b83 100644
--- a/share/ui/menus-bars.xml
+++ b/share/ui/menus-bars.xml
@@ -173,13 +173,6 @@
       <separator/>
       <menuitem action='RemoveManualKerns'/>
     </menu>
-	<menu action='MenuWhiteboard'>
-	  <menuitem action='DialogWhiteboardConnect'/>
-	  <separator/>
-	  <menuitem action='DialogWhiteboardShareWithUser'/>
-	  <menuitem action='DialogWhiteboardShareWithChat'/>
-	  <separator/>
-	</menu>
     <menu action='MenuHelp'>
       <menuitem action='KeysAndMouse'/>
       <menu action='Tutorials'>