--- a/flys-client/src/main/webapp/WEB-INF/config.yaml	Sun Apr 21 10:46:06 2013 +0200
+++ b/flys-client/src/main/webapp/WEB-INF/config.yaml	Sun Apr 21 10:46:59 2013 +0200
@@ -69,13 +69,22 @@
   - !localMatch
     dummy: true
   - !dnsMatch
-    host: wsvmapserv.wsv.bund.de
+    host: wsvmapserv.ilmenau.baw.de
+    port: 80
+  - !dnsMatch
+    host: www.pegelonline.wsv.de
+    port: 80
+  - !dnsMatch
+    host: gdz.bkg.bund.de
+    port: 80
+  - !dnsMatch
+    host: ims3.bkg.bund.de
     port: 80
   - !dnsMatch
     host: tile.openstreetmap.org
     port: 80
   - !dnsMatch
-    host: www.pegelonline.wsv.de
+    host: wsvmapserv.wsv.bund.de
     port: 80
   - !dnsMatch
     host: geo4.service24.rlp.de
@@ -93,6 +102,14 @@
   - !dnsMatch
     host: geoportal.bafg.de
     port: 80
+  - !dnsMatch
+    host: wsvmapserv.wsv.bvbs.bund.de
+    port: 80
+
+# We need a font with unicode support the defaults only
+# have latin1
+fonts:
+  - /usr/share/fonts/truetype/freefont/FreeSans.ttf
 
 layouts:
   #===========================================================================
@@ -119,102 +136,160 @@
           absoluteX: 20
           align: left
           absoluteY: 575
-          width: 592
+          width: 587
           height: 555
           spacingAfter: 0
-        #Flys and BFG Logo
+        # The north arrow
         - !columns
-          absoluteX: 747
-          absoluteY: 100
-          width: 60
-          items:
-            - !image
-              maxWidth: 60
-              maxHeight: 60
-              url: '${configDir}/../images/FLYS_Logo.png'
-        - !columns
-          absoluteX: 732
-          absoluteY: 160
-          width: 90
+          absoluteX: 627
+          absoluteY: 65
+          width: 32
           items:
             - !image
-              maxWidth: 90
-              maxHeight: 60
-              url: '${configDir}/../images/bfg_logo.gif'
-        # Legend header, a bit hackish with the border
-        # but I don't know how to put two rows in a column and I don't want to
-        # use tables
+              maxWidth: 20
+              maxHeight: 40
+              url: '${configDir}/../images/north.png'
+        # The scale text
         - !columns
-          absoluteX: 612
-          absoluteY: 575
-          width: 200
+          absoluteX: 615
+          absoluteY: 30
+          width: 45
           items:
             - !text
-              text: "Legende:"
+              fontSize: 8
+              text: '1:${scale}'
               align: center
-          config:
-            borderWidthLeft: 1
-            borderWidthRight: 1
-            borderWidthTop: 1
-            borderWidthBottom: 0
+              fontEncoding: Identity-H
+              font: FreeSans
+              backgroundColor: #FFFFFF
+        #Flys and BFG Logo
+        - !columns
+          absoluteX: 760
+          absoluteY: 70
+          width: 50
+          items:
+            - !image
+              maxWidth: 50
+              maxHeight: 50
+              url: '${configDir}/../images/FLYS_Logo.png'
+        - !columns
+          absoluteX: 665
+          absoluteY: 70
+          width: 75
+          items:
+            - !image
+              maxWidth: 75
+              maxHeight: 50
+              url: '${configDir}/../${logo}'
+        # Scalebar
+        - !columns
+          absoluteX: 460
+          absoluteY: 40
+          width: 150
+          items:
+            - !scalebar
+              type: bar
+              maxSize: 150
+              barSize: 5
+              barBgColor: white
+              fontSize: 8
+              backgroundColor: #FFFFFF
         # The legend
         - !columns
           absoluteX: 612
-          absoluteY: 564
+          absoluteY: 390
           width: 200
           items:
             - !legends
-              maxHeight: 400
+              maxHeight: 310
               maxWidth: 0
               maxIconHeight: 0
-              inline: false
+              inline: true
               classIndentation: 10
-              layerSpace: 5
-              classSpace: 2
-              layerFont: Helvetica
+              layerSpace: 0
+              classSpace: 5
               layerFontSize: 0
-              classFont: Helvetica
-              classFontSize: 0
-              fontEncoding: Cp1252
-              columnMargin: 2
-              defaultScale: 0.7
-          config:
-            borderWidthLeft: 1
-            borderWidthRight: 1
-            borderWidthTop: 0
-            borderWidthBottom: 1
-        # The Stamp
-        - !columns
-          absoluteX: 612
-          absoluteY: 200
-          width: 200
+              classFontSize: 10
+              fontEncoding: Identity-H
+              classFont: FreeSans
+              layerFont: FreeSans
+              defaultScale: 0.5
           config:
             borderWidthLeft: 1
             borderWidthRight: 1
             borderWidthTop: 1
             borderWidthBottom: 1
+        # The stamp background
+        - !columns
+          absoluteX: 557
+          absoluteY: 575
+          width: 260
+          items:
+            - !image
+              maxWidth: 260
+              maxHeight: 184
+              url: '${configDir}/../images/white.png'
+
+        # Title of the map
+        - !columns
+          absoluteX: 562
+          absoluteY: 575
+          width: 250
+          condition: mapTitle
+          items:
+            - !text
+              text: '${mapTitle}'
+
+        # The Stamp
+        - !columns
+          absoluteX: 562
+          absoluteY: 555
+          width: 250
+        #  config:
+        #    borderWidthLeft: 5
+        #    borderWidthRight: 5
+        #    borderWidthTop: 5
+        #    borderWidthBottom: 5
+            #padding: 10
+            #backgroundColor: #FFFFFF
+            #borderColor: #FFFFFF
           items:
             - !attributes
               source: data
-              spacingAfter: 30
+              spacingAfter: 0
               columnDefs:
                 info:
-                  columnWeight: 2
+                  columnWeight: 7
                   header: !text
-                    text: Info
-                    backgroundColor: #A0A0A0
-                  cell: !text
-                    text: '${info}'
-                value:
-                  columnWeight: 5
-                  header: !text
-                    text: value
-                    backgroundColor: #A0A0A0
+                    text: info
+                    fontSize: 0
                   cell: !columns
                     config:
                       cells:
                         - borderWidth: 1
+                          padding: 5
+                    items:
+                      - !text
+                        text: '${info}'
+                        fontSize: 10
+                        fontEncoding: Identity-H
+                        font: FreeSans
+                        fontSize: 10
+                    backgroundColor: #FFFFFF
+                value:
+                  columnWeight: 15
+                  header: !text
+                    text: value
+                    fontSize: 0
+                  cell: !columns
+                    config:
+                      cells:
+                        - borderWidth: 1
+                          padding: 5
                     items:
                       - !text
                         text: '${value}'
-
+                        fontEncoding: Identity-H
+                        font: FreeSans
+                        fontSize: 10
+                    backgroundColor: #FFFFFF