From 9fa5616d53d298012c9a0738cb5f15b127cf42b7 Mon Sep 17 00:00:00 2001
From: walter bender <walter@walter-laptop.(none)>
Date: Sat, 22 Nov 2008 22:39:25 +0000
Subject: Turtle Art uses SVG and knows about variable screen sizes

---
(limited to 'images/fr/shapes')

diff --git a/images/fr/shapes/t0.gif b/images/fr/shapes/t0.gif
deleted file mode 100644
index 7e934f5..0000000
--- a/images/fr/shapes/t0.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t0.svg b/images/fr/shapes/t0.svg
new file mode 100644
index 0000000..9318ab5
--- /dev/null
+++ b/images/fr/shapes/t0.svg
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g>
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t1.gif b/images/fr/shapes/t1.gif
deleted file mode 100644
index 8b9b24c..0000000
--- a/images/fr/shapes/t1.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t1.svg b/images/fr/shapes/t1.svg
new file mode 100644
index 0000000..7fc857e
--- /dev/null
+++ b/images/fr/shapes/t1.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.9848078,0.1736482,-0.1736482,0.9848078,4.5415568,-4.8036224)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t10.gif b/images/fr/shapes/t10.gif
deleted file mode 100644
index 5b1ff5a..0000000
--- a/images/fr/shapes/t10.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t10.svg b/images/fr/shapes/t10.svg
new file mode 100644
index 0000000..d5fb472
--- /dev/null
+++ b/images/fr/shapes/t10.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.1736482,0.9848078,-0.9848078,-0.1736482,58.080533,-1.6287448)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t11.gif b/images/fr/shapes/t11.gif
deleted file mode 100644
index bebbf07..0000000
--- a/images/fr/shapes/t11.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t11.svg b/images/fr/shapes/t11.svg
new file mode 100644
index 0000000..b11db27
--- /dev/null
+++ b/images/fr/shapes/t11.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.3420201,0.9396926,-0.9396926,-0.3420201,62.022545,3.6779558)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t12.gif b/images/fr/shapes/t12.gif
deleted file mode 100644
index 6e32168..0000000
--- a/images/fr/shapes/t12.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t12.svg b/images/fr/shapes/t12.svg
new file mode 100644
index 0000000..0ecde90
--- /dev/null
+++ b/images/fr/shapes/t12.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.5,0.8660254,-0.8660254,-0.5,64.983169,9.5885588)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t13.gif b/images/fr/shapes/t13.gif
deleted file mode 100644
index 5b2b8a2..0000000
--- a/images/fr/shapes/t13.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t13.svg b/images/fr/shapes/t13.svg
new file mode 100644
index 0000000..f6e445f
--- /dev/null
+++ b/images/fr/shapes/t13.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.6427876,0.7660444,-0.7660444,-0.6427876,66.87245,15.923474)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t14.gif b/images/fr/shapes/t14.gif
deleted file mode 100644
index 11b5e96..0000000
--- a/images/fr/shapes/t14.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t14.svg b/images/fr/shapes/t14.svg
new file mode 100644
index 0000000..eb07232
--- /dev/null
+++ b/images/fr/shapes/t14.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.7660444,0.6427876,-0.6427876,-0.7660444,67.632982,22.490217)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t15.gif b/images/fr/shapes/t15.gif
deleted file mode 100644
index 9093f91..0000000
--- a/images/fr/shapes/t15.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t15.svg b/images/fr/shapes/t15.svg
new file mode 100644
index 0000000..a99aeca
--- /dev/null
+++ b/images/fr/shapes/t15.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.8660254,0.5,-0.5,-0.8660254,67.241656,29.089262)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t16.gif b/images/fr/shapes/t16.gif
deleted file mode 100644
index 682748e..0000000
--- a/images/fr/shapes/t16.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t16.svg b/images/fr/shapes/t16.svg
new file mode 100644
index 0000000..e838d9a
--- /dev/null
+++ b/images/fr/shapes/t16.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.9396926,0.3420201,-0.3420201,-0.9396926,65.710364,35.520099)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t17.gif b/images/fr/shapes/t17.gif
deleted file mode 100644
index a9e9897..0000000
--- a/images/fr/shapes/t17.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t17.svg b/images/fr/shapes/t17.svg
new file mode 100644
index 0000000..6ac72b4
--- /dev/null
+++ b/images/fr/shapes/t17.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.9848078,0.1736482,-0.1736482,-0.9848078,63.085632,41.587331)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t18.gif b/images/fr/shapes/t18.gif
deleted file mode 100644
index 52707a0..0000000
--- a/images/fr/shapes/t18.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t18.svg b/images/fr/shapes/t18.svg
new file mode 100644
index 0000000..dac4e7d
--- /dev/null
+++ b/images/fr/shapes/t18.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-1,0,0,-1,59.447212,47.106609)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t19.gif b/images/fr/shapes/t19.gif
deleted file mode 100644
index 0cd7398..0000000
--- a/images/fr/shapes/t19.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t19.svg b/images/fr/shapes/t19.svg
new file mode 100644
index 0000000..17e0de1
--- /dev/null
+++ b/images/fr/shapes/t19.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.9848078,-0.1736482,0.1736482,-0.9848078,54.905655,51.910231)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t2.gif b/images/fr/shapes/t2.gif
deleted file mode 100644
index 2d74126..0000000
--- a/images/fr/shapes/t2.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t2.svg b/images/fr/shapes/t2.svg
new file mode 100644
index 0000000..a810bf4
--- /dev/null
+++ b/images/fr/shapes/t2.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.9396926,0.3420201,-0.3420201,0.9396926,9.8482574,-8.745634)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t20.gif b/images/fr/shapes/t20.gif
deleted file mode 100644
index 0760f09..0000000
--- a/images/fr/shapes/t20.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t20.svg b/images/fr/shapes/t20.svg
new file mode 100644
index 0000000..f314c05
--- /dev/null
+++ b/images/fr/shapes/t20.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.9396926,-0.3420201,0.3420201,-0.9396926,49.598955,55.852243)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t21.gif b/images/fr/shapes/t21.gif
deleted file mode 100644
index 5861197..0000000
--- a/images/fr/shapes/t21.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t21.svg b/images/fr/shapes/t21.svg
new file mode 100644
index 0000000..31b3497
--- /dev/null
+++ b/images/fr/shapes/t21.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.8660254,-0.5,0.5,-0.8660254,43.688352,58.812868)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t22.gif b/images/fr/shapes/t22.gif
deleted file mode 100644
index 271a3e4..0000000
--- a/images/fr/shapes/t22.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t22.svg b/images/fr/shapes/t22.svg
new file mode 100644
index 0000000..f265deb
--- /dev/null
+++ b/images/fr/shapes/t22.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.7660444,-0.6427876,0.6427876,-0.7660444,37.353437,60.702148)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t23.gif b/images/fr/shapes/t23.gif
deleted file mode 100644
index be44c53..0000000
--- a/images/fr/shapes/t23.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t23.svg b/images/fr/shapes/t23.svg
new file mode 100644
index 0000000..08d4fc7
--- /dev/null
+++ b/images/fr/shapes/t23.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.6427876,-0.7660444,0.7660444,-0.6427876,30.786694,61.46268)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t24.gif b/images/fr/shapes/t24.gif
deleted file mode 100644
index a00417e..0000000
--- a/images/fr/shapes/t24.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t24.svg b/images/fr/shapes/t24.svg
new file mode 100644
index 0000000..92fb1b3
--- /dev/null
+++ b/images/fr/shapes/t24.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.5,-0.8660254,0.8660254,-0.5,24.187649,61.071355)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t25.gif b/images/fr/shapes/t25.gif
deleted file mode 100644
index 8dda1ce..0000000
--- a/images/fr/shapes/t25.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t25.svg b/images/fr/shapes/t25.svg
new file mode 100644
index 0000000..3949efa
--- /dev/null
+++ b/images/fr/shapes/t25.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.3420201,-0.9396926,0.9396926,-0.3420201,17.756812,59.540062)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t26.gif b/images/fr/shapes/t26.gif
deleted file mode 100644
index 24be0da..0000000
--- a/images/fr/shapes/t26.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t26.svg b/images/fr/shapes/t26.svg
new file mode 100644
index 0000000..0166fd0
--- /dev/null
+++ b/images/fr/shapes/t26.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(-0.1736482,-0.9848078,0.9848078,-0.1736482,11.689579,56.915331)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t27.gif b/images/fr/shapes/t27.gif
deleted file mode 100644
index 24e9670..0000000
--- a/images/fr/shapes/t27.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t27.svg b/images/fr/shapes/t27.svg
new file mode 100644
index 0000000..48dcfe0
--- /dev/null
+++ b/images/fr/shapes/t27.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0,-1,1,0,6.1703016,53.276911)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t28.gif b/images/fr/shapes/t28.gif
deleted file mode 100644
index 9364fe3..0000000
--- a/images/fr/shapes/t28.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t28.svg b/images/fr/shapes/t28.svg
new file mode 100644
index 0000000..ee56af7
--- /dev/null
+++ b/images/fr/shapes/t28.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.1736482,-0.9848078,0.9848078,0.1736482,1.3666792,48.735354)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t29.gif b/images/fr/shapes/t29.gif
deleted file mode 100644
index c75cba8..0000000
--- a/images/fr/shapes/t29.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t29.svg b/images/fr/shapes/t29.svg
new file mode 100644
index 0000000..520d24d
--- /dev/null
+++ b/images/fr/shapes/t29.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.3420201,-0.9396926,0.9396926,0.3420201,-2.5753324,43.428653)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t3.gif b/images/fr/shapes/t3.gif
deleted file mode 100644
index f2fcece..0000000
--- a/images/fr/shapes/t3.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t3.svg b/images/fr/shapes/t3.svg
new file mode 100644
index 0000000..cc7c89c
--- /dev/null
+++ b/images/fr/shapes/t3.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.8660254,0.5,-0.5,0.8660254,15.75886,-11.706259)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t30.gif b/images/fr/shapes/t30.gif
deleted file mode 100644
index 4f51b9f..0000000
--- a/images/fr/shapes/t30.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t30.svg b/images/fr/shapes/t30.svg
new file mode 100644
index 0000000..92dd2ff
--- /dev/null
+++ b/images/fr/shapes/t30.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.5,-0.8660254,0.8660254,0.5,-5.535957,37.51805)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t31.gif b/images/fr/shapes/t31.gif
deleted file mode 100644
index b081f2a..0000000
--- a/images/fr/shapes/t31.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t31.svg b/images/fr/shapes/t31.svg
new file mode 100644
index 0000000..d1b0f64
--- /dev/null
+++ b/images/fr/shapes/t31.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.6427876,-0.7660444,0.7660444,0.6427876,-7.4252377,31.183136)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t32.gif b/images/fr/shapes/t32.gif
deleted file mode 100644
index 9c7c8a1..0000000
--- a/images/fr/shapes/t32.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t32.svg b/images/fr/shapes/t32.svg
new file mode 100644
index 0000000..38a6228
--- /dev/null
+++ b/images/fr/shapes/t32.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.7660444,-0.6427876,0.6427876,0.7660444,-8.1857695,24.616392)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t33.gif b/images/fr/shapes/t33.gif
deleted file mode 100644
index dcfbe2e..0000000
--- a/images/fr/shapes/t33.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t33.svg b/images/fr/shapes/t33.svg
new file mode 100644
index 0000000..84127f2
--- /dev/null
+++ b/images/fr/shapes/t33.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.8660254,-0.5,0.5,0.8660254,-7.7944441,18.017348)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t34.gif b/images/fr/shapes/t34.gif
deleted file mode 100644
index 3fe38ca..0000000
--- a/images/fr/shapes/t34.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t34.svg b/images/fr/shapes/t34.svg
new file mode 100644
index 0000000..2c63b22
--- /dev/null
+++ b/images/fr/shapes/t34.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.9396926,-0.3420201,0.3420201,0.9396926,-6.2631518,11.58651)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t35.gif b/images/fr/shapes/t35.gif
deleted file mode 100644
index 94ad89c..0000000
--- a/images/fr/shapes/t35.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t35.svg b/images/fr/shapes/t35.svg
new file mode 100644
index 0000000..ac0b85a
--- /dev/null
+++ b/images/fr/shapes/t35.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.9848078,-0.1736482,0.1736482,0.9848078,-3.63842,5.5192777)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t4.gif b/images/fr/shapes/t4.gif
deleted file mode 100644
index efb878a..0000000
--- a/images/fr/shapes/t4.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t4.svg b/images/fr/shapes/t4.svg
new file mode 100644
index 0000000..9491d51
--- /dev/null
+++ b/images/fr/shapes/t4.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.7660444,0.6427876,-0.6427876,0.7660444,22.093775,-13.595539)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t5.gif b/images/fr/shapes/t5.gif
deleted file mode 100644
index f56e835..0000000
--- a/images/fr/shapes/t5.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t5.svg b/images/fr/shapes/t5.svg
new file mode 100644
index 0000000..0a39cf7
--- /dev/null
+++ b/images/fr/shapes/t5.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.6427876,0.7660444,-0.7660444,0.6427876,28.660518,-14.356071)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t6.gif b/images/fr/shapes/t6.gif
deleted file mode 100644
index 35d038d..0000000
--- a/images/fr/shapes/t6.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t6.svg b/images/fr/shapes/t6.svg
new file mode 100644
index 0000000..f215bee
--- /dev/null
+++ b/images/fr/shapes/t6.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.5,0.8660254,-0.8660254,0.5,35.259563,-13.964746)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t7.gif b/images/fr/shapes/t7.gif
deleted file mode 100644
index 907930b..0000000
--- a/images/fr/shapes/t7.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t7.svg b/images/fr/shapes/t7.svg
new file mode 100644
index 0000000..6ce41cd
--- /dev/null
+++ b/images/fr/shapes/t7.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.3420201,0.9396926,-0.9396926,0.3420201,41.690401,-12.433453)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t8.gif b/images/fr/shapes/t8.gif
deleted file mode 100644
index 95ed9a6..0000000
--- a/images/fr/shapes/t8.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t8.svg b/images/fr/shapes/t8.svg
new file mode 100644
index 0000000..75a0ce8
--- /dev/null
+++ b/images/fr/shapes/t8.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0.1736482,0.9848078,-0.9848078,0.1736482,47.757633,-9.8087216)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
diff --git a/images/fr/shapes/t9.gif b/images/fr/shapes/t9.gif
deleted file mode 100644
index c6d7c19..0000000
--- a/images/fr/shapes/t9.gif
+++ /dev/null
Binary files differ
diff --git a/images/fr/shapes/t9.svg b/images/fr/shapes/t9.svg
new file mode 100644
index 0000000..4b8dbd3
--- /dev/null
+++ b/images/fr/shapes/t9.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   width="60"
+   height="60"
+   version="1.0">
+  <g
+     transform="matrix(0,1,-1,0,53.276911,-6.1703016)">
+  <rect
+     style="fill:#d0d000;stroke:none;"
+     width="21"
+     height="21"
+     x="19.5"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="27" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="21" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="27"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="21"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="33"
+     y="33" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="36" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="30"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="24"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="24" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="30" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="18" />
+  <rect
+     style="fill:#808000;stroke:none;"
+     width="3"
+     height="3"
+     x="36"
+     y="36" />
+  <path
+     style="fill:#008000;stroke:#008000;stroke-opacity:1"
+     d="M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z" />
+  <path
+     style="fill:#00a000;stroke:#00a000;"
+     d="M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="27.5"
+     cy="8" />
+  <circle
+     style="fill:#000000;stroke:#000000;"
+     r="1.25"
+     cx="32.5"
+     cy="8" />
+  </g>
+</svg>
--
cgit v0.9.1