diff --git a/mapstore/configs/localConfig.json b/mapstore/configs/localConfig.json
index 957c5f4b..0f2cda37 100644
--- a/mapstore/configs/localConfig.json
+++ b/mapstore/configs/localConfig.json
@@ -18,6 +18,7 @@
       "enabled": true,
       "contextOnly": true
     },
+    "stylesheetUri": "",
     "header": {
       "height": 90,
       "url": "/header/",
@@ -107,14 +108,6 @@
     }],
     "initialState": {
       "defaultState": {
-        "annotations": {
-          "config": {
-            "multiGeometry": true,
-            "validationErrors": {}
-          },
-          "format": "decimal",
-          "defaultTextAnnotation": "New"
-        },
         "catalog": {
           "default": {
             "newService": {
@@ -237,7 +230,8 @@
                     "group": "background",
                     "title": "Empty Background",
                     "fixed": true,
-                    "type": "empty"
+                    "type": "empty",
+                    "visibility": false
                 }]
               }
             }
@@ -265,7 +259,7 @@
       "homePath": "/home"
     },
     "plugins": {
-        "mobile": ["Header", {
+        "mobile": ["Header", "Easytheming", {
                 "name": "Map",
                 "cfg": {
                     "mapOptions": {
@@ -314,11 +308,8 @@
             }, {
                 "name": "TOC",
                 "cfg": {
-                    "activateMetedataTool": false,
                     "activateMapTitle": false,
-                    "activateSortLayer": false,
-                    "activateLayerFilterTool": false,
-                    "activateQueryTool": false
+                    "activateSortLayer": false
                 }
             }, "AddGroup", {
                 "name": "TOCItemsSettings",
@@ -374,13 +365,28 @@
               }
             },
             "Permalink",
-            "MetadataExplorer",
+            {
+              "name": "MetadataExplorer",
+              "cfg": {
+                  "serviceTypes": [
+                    { "name": "csw", "label": "CSW" },
+                    { "name": "wms", "label": "WMS" },
+                    { "name": "wmts", "label": "WMTS" },
+                    { "name": "tms", "label": "TMS", "allowedProviders": ["OpenStreetMap", "OpenSeaMap", "Stamen"] },
+                    { "name": "wfs", "label": "WFS" },
+                    { "name": "3dtiles", "label": "3D Tiles" },
+                    { "name": "cog", "label": "COG" },
+                    { "name": "model", "label": "IFC Model" },
+                    { "name": "arcgis", "label": "ArcGIS" }
+                  ]
+              }
+          },
             "MapImport",
             "MapExport",
             "GlobeViewSwitcher"
         ],
         "desktop": [
-          "Header",
+          "Header", "Easytheming",
           "Details",
           {
             "name": "Map",
@@ -415,7 +421,9 @@
             }, "AutoMapUpdate", "DrawerMenu", "Version", "Notifications", "BackgroundSelector", {
               "name": "Annotations",
               "cfg": {
-                "symbolsPath": "assets/symbols/"
+                "symbolsPath": "assets/symbols/",
+                "format": "decimal",
+                "defaultTextAnnotation": "New"
               }
             },
             {
@@ -472,52 +480,55 @@
                   ]
               }
             }, {
-                "name": "TOC",
-                "cfg": {
-                    "activateMetedataTool": true,
-                    "metadataOptions": {
-                        "xmlNamespaces": {
-                            "gmd": "http://www.isotc211.org/2005/gmd",
-                            "srv": "http://www.isotc211.org/2005/srv",
-                            "gco": "http://www.isotc211.org/2005/gco",
-                            "gmx": "http://www.isotc211.org/2005/gmx",
-                            "gfc": "http://www.isotc211.org/2005/gfc",
-                            "gts": "http://www.isotc211.org/2005/gts",
-                            "gml": "http://www.opengis.net/gml"
-                        },
-                        "extractors": [{
+            "name": "MetadataInfo",
+            "cfg": {
+              "metadataOptions": {
+                "xmlNamespaces": {
+                  "gmd": "http://www.isotc211.org/2005/gmd",
+                  "srv": "http://www.isotc211.org/2005/srv",
+                  "gco": "http://www.isotc211.org/2005/gco",
+                  "gmx": "http://www.isotc211.org/2005/gmx",
+                  "gfc": "http://www.isotc211.org/2005/gfc",
+                  "gts": "http://www.isotc211.org/2005/gts",
+                  "gml": "http://www.opengis.net/gml"
+                },
+                "extractors": [
+                  {
+                    "properties": {
+                      "title": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString",
+                      "abstract": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:abstract/gco:CharacterString",
+                      "purpose": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:purpose/gco:CharacterString",
+                      "source": "/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:statement/gco:CharacterString",
+                      "createdDate": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date[../../gmd:dateType/gmd:CI_DateTypeCode[@codeListValue='creation']]",
+                      "lastRevisionDate": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date[../../gmd:dateType/gmd:CI_DateTypeCode[@codeListValue='revision']]",
+                      "pointsOfContact": {
+                        "xpath": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty",
+                        "properties": {
+                          "individualName": "gmd:individualName/gco:CharacterString",
+                          "organisationName": "gmd:organisationName/gco:CharacterString",
+                          "contactInfo": {
+                            "xpath": "gmd:contactInfo/gmd:CI_Contact",
                             "properties": {
-                                "title": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString",
-                                "abstract": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:abstract/gco:CharacterString",
-                                "purpose": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:purpose/gco:CharacterString",
-                                "source": "/gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:statement/gco:CharacterString",
-                                "createdDate": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date[../../gmd:dateType/gmd:CI_DateTypeCode[@codeListValue='creation']]",
-                                "lastRevisionDate": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date/gmd:CI_Date/gmd:date/gco:Date[../../gmd:dateType/gmd:CI_DateTypeCode[@codeListValue='revision']]",
-                                "pointsOfContact": {
-                                    "xpath": "/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty",
-                                    "properties": {
-                                        "individualName": "gmd:individualName/gco:CharacterString",
-                                        "organisationName": "gmd:organisationName/gco:CharacterString",
-                                        "contactInfo": {
-                                            "xpath": "gmd:contactInfo/gmd:CI_Contact",
-                                            "properties": {
-                                                "phone": "gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString",
-                                                "deliveryPoints": "gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString",
-                                                "city": "gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString",
-                                                "postalCode": "gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString",
-                                                "country": "gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString",
-                                                "electronicMailAddress": "gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString",
-                                                "URL": "gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL",
-                                                "hoursOfService": "gmd:hoursOfService/gco:CharacterString"
-                                            }
-                                        },
-                                        "role": "gmd:role/gmd:CI_RoleCode/@codeListValue"
-                                    }
-                                }
+                              "phone": "gmd:phone/gmd:CI_Telephone/gmd:voice/gco:CharacterString",
+                              "deliveryPoints": "gmd:address/gmd:CI_Address/gmd:deliveryPoint/gco:CharacterString",
+                              "city": "gmd:address/gmd:CI_Address/gmd:city/gco:CharacterString",
+                              "postalCode": "gmd:address/gmd:CI_Address/gmd:postalCode/gco:CharacterString",
+                              "country": "gmd:address/gmd:CI_Address/gmd:country/gco:CharacterString",
+                              "electronicMailAddress": "gmd:address/gmd:CI_Address/gmd:electronicMailAddress/gco:CharacterString",
+                              "URL": "gmd:onlineResource/gmd:CI_OnlineResource/gmd:linkage/gmd:URL",
+                              "hoursOfService": "gmd:hoursOfService/gco:CharacterString"
                             }
-                        }]
+                          },
+                          "role": "gmd:role/gmd:CI_RoleCode/@codeListValue"
+                        }
+                      }
                     }
-                }
+                  }
+                ]
+              }
+            }
+          }, {
+                "name": "TOC"
             },
             "FilterLayer",
             "AddGroup",
@@ -556,7 +567,18 @@
                 "name": "MetadataExplorer",
                 "cfg": {
                     "zoomToLayer": false,
-                    "wrap": true
+                    "wrap": true,
+                    "serviceTypes": [
+                      { "name": "csw", "label": "CSW" },
+                      { "name": "wms", "label": "WMS" },
+                      { "name": "wmts", "label": "WMTS" },
+                      { "name": "tms", "label": "TMS", "allowedProviders": ["OpenStreetMap", "OpenSeaMap", "Stamen"] },
+                      { "name": "wfs", "label": "WFS" },
+                      { "name": "3dtiles", "label": "3D Tiles" },
+                      { "name": "cog", "label": "COG" },
+                      { "name": "model", "label": "IFC Model" },
+                      { "name": "arcgis", "label": "ArcGIS" }
+                    ]
                 }
             }, {
               "name": "MousePosition",
@@ -722,8 +744,6 @@
             "name": "TOC",
             "cfg": {
               "activateMapTitle": false,
-              "activateSettingsTool": false,
-              "activateMetedataTool": false,
               "activateRemoveLayer": false
             }
           },
@@ -824,17 +844,44 @@
             "fluid": true
           }
         }],
-      "dashboard": [{
-        "name": "OmniBar",
-        "cfg": {
-          "containerPosition": "header",
-          "className": "navbar shadow navbar-home"
-        }
-      }, "Login", "Language", "NavMenu",
+      "dashboard": [
+        {
+          "name": "OmniBar",
+          "cfg": {
+            "containerPosition": "header",
+            "className": "navbar shadow navbar-home"
+          }
+        },
+        "Details",
+        "AddWidgetDashboard",
+        "MapConnectionDashboard",
+        {
+          "name": "SidebarMenu",
+          "cfg": {
+            "containerPosition": "columns"
+          }
+        },
+        {
+          "name": "Home",
+          "override": {
+            "OmniBar": {
+              "priority": 5
+            }
+          }
+        },
+        {
+          "name": "Login",
+          "override": {
+            "OmniBar": {
+              "priority": 5
+            }
+          }
+        },
+        "Language", "NavMenu",
         "DashboardSave", "DashboardSaveAs",
         "DashboardExport", "DashboardImport",
         "DeleteDashboard",
-        "Attribution", "Home", {
+        "Attribution", {
         "name": "Share",
         "cfg": {
           "showAPI": false,
@@ -879,7 +926,7 @@
             },
             "containerPosition": "columns"
           }
-        }, "BurgerMenu", "Dashboard", "Notifications", {
+        }, "Dashboard", "Notifications", {
           "name": "Tutorial",
           "cfg": {
             "allowClicksThruHole": false,
@@ -1057,7 +1104,7 @@
           "ContextExport"
         ],
         "context": [
-          "Header"
+          "Header", "Easytheming"
         ]
     }
 }
diff --git a/mapstore/printing/config.yaml b/mapstore/printing/config.yaml
index 224cb4ab..3f471d1a 100644
--- a/mapstore/printing/config.yaml
+++ b/mapstore/printing/config.yaml
@@ -39,7 +39,7 @@ hosts:
     dummy: true
 
   - !ipMatch
-    host: 127.0.0.1
+    ip: 127.0.0.1
     # Allow to all hosts
     mask: 0.0.0.0
 
@@ -111,7 +111,7 @@ layouts:
               rotation: '${rotation}'
         - !columns
           absoluteX: 30
-          absoluteY: 740
+          absoluteY: 745
           width: 395
           widths: [395]
           items:
@@ -122,12 +122,11 @@ layouts:
               text: '${mapTitle}'
         - !columns
           absoluteX: 30
-          absoluteY: 710
+          absoluteY: 715
           width: 395
           widths: [395]
           items:
             - !text
-              width: 300
               text: '${comment}'
               fontEncoding: Cp1252
               fontSize: 9
@@ -135,7 +134,7 @@ layouts:
               vertAlign: middle
         - !columns
           absoluteX: 30
-          absoluteY: 55
+          absoluteY: 60
           width: 395
           widths: [240, 240]
           items:
@@ -143,7 +142,6 @@ layouts:
               nbColumns: 1
               items:
                 - !text
-                  width: 300
                   text: '${now MM.dd.yyyy}'
                   fontEncoding: Cp1252
                   fontSize: 9
@@ -155,6 +153,16 @@ layouts:
               maxSize: 200
               type: 'bar sub'
               intervals: 5
+        - !columns
+          absoluteX: 30
+          absoluteY: 40
+          width: 395
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
   #=======A4 landscape with legend============================================
   A4_landscape :
   #===========================================================================
@@ -174,8 +182,8 @@ layouts:
         - !map
           width: 592
           height: 400
-          absoluteX:30
-          absoluteY:475
+          absoluteX: 30
+          absoluteY: 475
         #legend panel
         - !columns
           config:
@@ -216,7 +224,7 @@ layouts:
               rotation: '${rotation}'
         - !columns
           absoluteX: 30
-          absoluteY: 55
+          absoluteY: 60
           width: 782
           widths: [240, 300, 240]
           items:
@@ -224,14 +232,12 @@ layouts:
               nbColumns: 1
               items:
                 - !text
-                  width: 300
                   text: '${comment}'
                   fontEncoding: Cp1252
                   fontSize: 9
                   align: left
                   vertAlign: middle
                 - !text
-                  width: 300
                   text: '${now MM.dd.yyyy}'
                   fontEncoding: Cp1252
                   fontSize: 9
@@ -248,6 +254,16 @@ layouts:
               maxSize: 200
               type: 'bar sub'
               intervals: 5
+        - !columns
+          absoluteX: 30
+          absoluteY: 40
+          width: 592
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
   #=======A4 portrait no legend=============================================
   A4_no_legend :
   #=========================================================================
@@ -281,7 +297,7 @@ layouts:
               rotation: '${rotation}'
         - !columns
           absoluteX: 30
-          absoluteY: 740
+          absoluteY: 745
           width: 395
           widths: [395]
           items:
@@ -292,12 +308,11 @@ layouts:
               text: '${mapTitle}'
         - !columns
           absoluteX: 30
-          absoluteY: 710
+          absoluteY: 715
           width: 395
           widths: [395]
           items:
             - !text
-              width: 300
               text: '${comment}'
               fontEncoding: Cp1252
               fontSize: 9
@@ -305,7 +320,7 @@ layouts:
               vertAlign: middle
         - !columns
           absoluteX: 30
-          absoluteY: 55
+          absoluteY: 60
           width: 535
           widths: [240, 240]
           items:
@@ -313,7 +328,6 @@ layouts:
               nbColumns: 1
               items:
                 - !text
-                  width: 300
                   text: '${now MM.dd.yyyy}'
                   fontEncoding: Cp1252
                   fontSize: 9
@@ -325,6 +339,16 @@ layouts:
               maxSize: 200
               type: 'bar sub'
               intervals: 5
+        - !columns
+          absoluteX: 30
+          absoluteY: 40
+          width: 535
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
   #=======A4 landscape no legend=============================================
   A4_no_legend_landscape :
   #===========================================================================
@@ -344,8 +368,8 @@ layouts:
         - !map
           width: 780
           height: 400
-          absoluteX:30
-          absoluteY:475
+          absoluteX: 30
+          absoluteY: 475
         - !columns
           absoluteX: 750
           absoluteY: 140
@@ -358,7 +382,7 @@ layouts:
               rotation: '${rotation}'
         - !columns
           absoluteX: 30
-          absoluteY: 55
+          absoluteY: 60
           width: 782
           widths: [240, 300, 240]
           items:
@@ -366,14 +390,12 @@ layouts:
               nbColumns: 1
               items:
                 - !text
-                  width: 300
                   text: '${comment}'
                   fontEncoding: Cp1252
                   fontSize: 9
                   align: left
                   vertAlign: middle
                 - !text
-                  width: 300
                   text: '${now MM.dd.yyyy}'
                   fontEncoding: Cp1252
                   fontSize: 9
@@ -390,6 +412,16 @@ layouts:
               maxSize: 200
               type: 'bar sub'
               intervals: 5
+        - !columns
+          absoluteX: 30
+          absoluteY: 40
+          width: 780
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
   #=======A4 portrait with 2 pages legend=====================================
   A4_2_pages_legend :
   #===========================================================================
@@ -423,7 +455,7 @@ layouts:
               rotation: '${rotation}'
         - !columns
           absoluteX: 30
-          absoluteY: 740
+          absoluteY: 745
           width: 395
           widths: [395]
           items:
@@ -434,12 +466,11 @@ layouts:
               text: '${mapTitle}'
         - !columns
           absoluteX: 30
-          absoluteY: 710
+          absoluteY: 715
           width: 395
           widths: [395]
           items:
             - !text
-              width: 300
               text: '${comment}'
               fontEncoding: Cp1252
               fontSize: 9
@@ -447,7 +478,7 @@ layouts:
               vertAlign: middle
         - !columns
           absoluteX: 30
-          absoluteY: 55
+          absoluteY: 60
           width: 535
           widths: [240, 240]
           items:
@@ -455,7 +486,6 @@ layouts:
               nbColumns: 1
               items:
                 - !text
-                  width: 300
                   text: '${now MM.dd.yyyy}'
                   fontEncoding: Cp1252
                   fontSize: 9
@@ -467,8 +497,17 @@ layouts:
               maxSize: 200
               type: 'bar sub'
               intervals: 5
+        - !columns
+          absoluteX: 30
+          absoluteY: 40
+          width: 535
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
     lastPage:
-      rotation: true
       pageSize: 595 842
       landscape: false
       items:
@@ -524,8 +563,8 @@ layouts:
         - !map
           width: 780
           height: 400
-          absoluteX:30
-          absoluteY:475
+          absoluteX: 30
+          absoluteY: 475
         - !columns
           absoluteX: 750
           absoluteY: 140
@@ -538,7 +577,7 @@ layouts:
               rotation: '${rotation}'
         - !columns
           absoluteX: 30
-          absoluteY: 55
+          absoluteY: 60
           width: 782
           widths: [240, 300, 240]
           items:
@@ -546,14 +585,12 @@ layouts:
               nbColumns: 1
               items:
                 - !text
-                  width: 300
                   text: '${comment}'
                   fontEncoding: Cp1252
                   fontSize: 9
                   align: left
                   vertAlign: middle
                 - !text
-                  width: 300
                   text: '${now MM.dd.yyyy}'
                   fontEncoding: Cp1252
                   fontSize: 9
@@ -570,8 +607,17 @@ layouts:
               maxSize: 200
               type: 'bar sub'
               intervals: 5
+        - !columns
+          absoluteX: 30
+          absoluteY: 40
+          width: 780
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
     lastPage:
-      rotation: true
       pageSize: 842 595
       landscape: false
       items:
@@ -586,7 +632,7 @@ layouts:
                 padding: 4
                 backgroundColor: white
                 vertAlign: bottom
-          absoluteX:30
+          absoluteX: 30
           absoluteY: 535
           width: 780
           widths: [780]
@@ -669,7 +715,7 @@ layouts:
               rotation: '${rotation}'
         - !columns
           absoluteX: 42
-          absoluteY: 1050
+          absoluteY: 1060
           width: 424
           widths: [424]
           items:
@@ -680,12 +726,11 @@ layouts:
               text: '${mapTitle}'
         - !columns
           absoluteX: 42
-          absoluteY: 1000
+          absoluteY: 1010
           width: 424
           widths: [424]
           items:
             - !text
-              width: 424
               text: '${comment}'
               fontEncoding: Cp1252
               fontSize: 9
@@ -693,7 +738,7 @@ layouts:
               vertAlign: middle
         - !columns
           absoluteX: 42
-          absoluteY: 50
+          absoluteY: 65
           width: 550
           widths: [340, 424]
           items:
@@ -701,7 +746,6 @@ layouts:
               nbColumns: 1
               items:
                 - !text
-                  width: 424
                   text: '${now MM.dd.yyyy}'
                   fontEncoding: Cp1252
                   fontSize: 9
@@ -713,6 +757,16 @@ layouts:
               maxSize: 200
               type: 'bar sub'
               intervals: 5
+        - !columns
+          absoluteX: 42
+          absoluteY: 40
+          width: 550
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
   #=======A3 landscape with legend============================================
   A3_landscape :
   #===========================================================================
@@ -732,8 +786,8 @@ layouts:
         - !map
           width: 837
           height: 594
-          absoluteX:42
-          absoluteY:700
+          absoluteX: 42
+          absoluteY: 700
         #legend panel
         - !columns
           config:
@@ -774,7 +828,7 @@ layouts:
               rotation: '${rotation}'
         - !columns
           absoluteX: 42
-          absoluteY: 78
+          absoluteY: 85
           width: 1105
           widths: [340, 424, 340]
           items:
@@ -782,14 +836,12 @@ layouts:
               nbColumns: 1
               items:
                 - !text
-                  width: 424
                   text: '${comment}'
                   fontEncoding: Cp1252
                   fontSize: 9
                   align: left
                   vertAlign: middle
                 - !text
-                  width: 424
                   text: '${now MM.dd.yyyy}'
                   fontEncoding: Cp1252
                   fontSize: 9
@@ -806,6 +858,16 @@ layouts:
               maxSize: 200
               type: 'bar sub'
               intervals: 5
+        - !columns
+          absoluteX: 42
+          absoluteY: 60
+          width: 837
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
   #=======A3 portrait no legend============================================
   A3_no_legend :
   #========================================================================
@@ -839,7 +901,7 @@ layouts:
               rotation: '${rotation}'
         - !columns
           absoluteX: 42
-          absoluteY: 1050
+          absoluteY: 1060
           width: 424
           widths: [424]
           items:
@@ -850,12 +912,11 @@ layouts:
               text: '${mapTitle}'
         - !columns
           absoluteX: 42
-          absoluteY: 1000
+          absoluteY: 1010
           width: 424
           widths: [424]
           items:
             - !text
-              width: 424
               text: '${comment}'
               fontEncoding: Cp1252
               fontSize: 9
@@ -863,7 +924,7 @@ layouts:
               vertAlign: middle
         - !columns
           absoluteX: 42
-          absoluteY: 50
+          absoluteY: 65
           width: 760
           widths: [340, 424]
           items:
@@ -871,7 +932,6 @@ layouts:
               nbColumns: 1
               items:
                 - !text
-                  width: 424
                   text: '${now MM.dd.yyyy}'
                   fontEncoding: Cp1252
                   fontSize: 9
@@ -883,6 +943,16 @@ layouts:
               maxSize: 200
               type: 'bar sub'
               intervals: 5
+        - !columns
+          absoluteX: 42
+          absoluteY: 40
+          width: 760
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
   #=======A3 landscape no legend============================================
   A3_no_legend_landscape :
   #=========================================================================
@@ -902,8 +972,8 @@ layouts:
         - !map
           width: 1102
           height: 594
-          absoluteX:42
-          absoluteY:700
+          absoluteX: 42
+          absoluteY: 700
         - !columns
           absoluteX: 1060
           absoluteY: 198
@@ -916,7 +986,7 @@ layouts:
               rotation: '${rotation}'
         - !columns
           absoluteX: 42
-          absoluteY: 78
+          absoluteY: 85
           width: 1105
           widths: [339, 424, 339]
           items:
@@ -924,14 +994,12 @@ layouts:
               nbColumns: 1
               items:
                 - !text
-                  width: 424
                   text: '${comment}'
                   fontEncoding: Cp1252
                   fontSize: 9
                   align: left
                   vertAlign: middle
                 - !text
-                  width: 424
                   text: '${now MM.dd.yyyy}'
                   fontEncoding: Cp1252
                   fontSize: 9
@@ -948,6 +1016,16 @@ layouts:
               maxSize: 200
               type: 'bar sub'
               intervals: 5
+        - !columns
+          absoluteX: 42
+          absoluteY: 60
+          width: 1102
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
   #=======A3 portrait two pages legend======================================
   A3_2_pages_legend :
   #=========================================================================
@@ -981,7 +1059,7 @@ layouts:
               rotation: '${rotation}'
         - !columns
           absoluteX: 42
-          absoluteY: 1050
+          absoluteY: 1060
           width: 424
           widths: [424]
           items:
@@ -992,12 +1070,11 @@ layouts:
               text: '${mapTitle}'
         - !columns
           absoluteX: 42
-          absoluteY: 1000
+          absoluteY: 1010
           width: 424
           widths: [424]
           items:
             - !text
-              width: 424
               text: '${comment}'
               fontEncoding: Cp1252
               fontSize: 9
@@ -1005,7 +1082,7 @@ layouts:
               vertAlign: middle
         - !columns
           absoluteX: 42
-          absoluteY: 50
+          absoluteY: 65
           width: 760
           widths: [340, 424]
           items:
@@ -1013,7 +1090,6 @@ layouts:
               nbColumns: 1
               items:
                 - !text
-                  width: 424
                   text: '${now MM.dd.yyyy}'
                   fontEncoding: Cp1252
                   fontSize: 9
@@ -1025,8 +1101,17 @@ layouts:
               maxSize: 200
               type: 'bar sub'
               intervals: 5
+        - !columns
+          absoluteX: 42
+          absoluteY: 40
+          width: 760
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
     lastPage:
-      rotation: true
       pageSize: 842 1190
       landscape: false
       items:
@@ -1082,8 +1167,8 @@ layouts:
         - !map
           width: 1102
           height: 594
-          absoluteX:42
-          absoluteY:700
+          absoluteX: 42
+          absoluteY: 700
         - !columns
           absoluteX: 1070
           absoluteY: 198
@@ -1096,7 +1181,7 @@ layouts:
               rotation: '${rotation}'
         - !columns
           absoluteX: 42
-          absoluteY: 78
+          absoluteY: 85
           width: 1105
           widths: [339, 424, 339]
           items:
@@ -1104,14 +1189,12 @@ layouts:
               nbColumns: 1
               items:
                 - !text
-                  width: 424
                   text: '${comment}'
                   fontEncoding: Cp1252
                   fontSize: 9
                   align: left
                   vertAlign: middle
                 - !text
-                  width: 424
                   text: '${now MM.dd.yyyy}'
                   fontEncoding: Cp1252
                   fontSize: 9
@@ -1128,8 +1211,17 @@ layouts:
               maxSize: 200
               type: 'bar sub'
               intervals: 5
+        - !columns
+          absoluteX: 42
+          absoluteY: 60
+          width: 1102
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
     lastPage:
-      rotation: true
       pageSize: 1190 842
       landscape: false
       items:
@@ -1144,7 +1236,7 @@ layouts:
                 padding: 4
                 backgroundColor: white
                 vertAlign: bottom
-          absoluteX:30
+          absoluteX: 30
           absoluteY: 800
           width: 780
           widths: [780]
@@ -1166,3 +1258,624 @@ layouts:
               reorderColumns: true
               dontBreakItems: true
               overflow: true
+  #============================ A2 ===========================================
+  #=======A2 portrait with legend=============================================
+  A2 :
+  #===========================================================================
+    mainPage:
+      rotation: true
+      pageSize: 1191 1684
+      landscape: false
+      items:
+        - !columns
+          absoluteX: 42
+          absoluteY: 1650
+          width: 1105
+          items:
+            - !image
+              maxWidth: 1105
+              url: '/${configDir}/print_header.png'
+        - !map
+          width: 837
+          height: 1340
+          absoluteX: 42
+          absoluteY: 1400
+        #legend panel
+        - !columns
+          config:
+            borderWidth: 1
+            cells:
+              - borderWidth: 2
+                borderWidthLeft: 1
+                borderColor: black
+                padding: 4
+                backgroundColor: white
+                vertAlign: bottom
+          widths: [170]
+          absoluteX: 907
+          absoluteY: 1520
+          width: 240
+          items:
+            - !legends
+              horizontalAlignment: left
+              #iconMaxWidth: 150
+              iconMaxHeight: 0
+              layerSpace: 5
+              layerFontSize: 12
+              classIndentation: 5
+              classFontSize: 10
+              classSpace: 4
+              backgroundColor: #ffffff
+              failOnBrokenUrl: false
+        - !columns
+          absoluteX: 834
+          absoluteY: 198
+          width: 40
+          items:
+            - !image
+              maxWidth: 40
+              maxHeight: 40
+              url: 'file:/${configDir}/Arrow_North_CFCF.svg'
+              rotation: '${rotation}'
+        - !columns
+          absoluteX: 42
+          absoluteY: 1525
+          width: 1105
+          widths: [424]
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 14
+              text: '${mapTitle}'
+        - !columns
+          absoluteX: 42
+          absoluteY: 1485
+          width: 1105
+          widths: [1105]
+          items:
+            - !text
+              text: '${comment}'
+              fontEncoding: Cp1252
+              fontSize: 9
+              align: left
+              vertAlign: middle
+        - !columns
+          absoluteX: 42
+          absoluteY: 55
+          width: 837
+          widths: [340, 424]
+          items:
+            - !columns
+              nbColumns: 1
+              items:
+                - !text
+                  text: '${comment}'
+                  fontEncoding: Cp1252
+                  fontSize: 8
+                  align: left
+                  vertAlign: middle
+                - !text
+                  text: '${now MM.dd.yyyy}'
+                  fontEncoding: Cp1252
+                  fontSize: 8
+                  align: left
+                  vertAlign: middle
+            - !scalebar
+              align: right
+              vertAlign: middle
+              maxSize: 200
+              type: 'bar sub'
+              intervals: 5
+        - !columns
+          absoluteX: 42
+          absoluteY: 35
+          width: 837
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
+  #=======A2 landscape with legend============================================
+  A2_landscape :
+  #===========================================================================
+    mainPage:
+      rotation: true
+      pageSize: 1684 1191
+      landscape: false
+      items:
+        - !columns
+          absoluteX: 42
+          absoluteY: 1151
+          width: 1600
+          items:
+            - !image
+              maxWidth: 1563
+              url: '/${configDir}/print_header.png'
+        - !map
+          width: 1184
+          height: 840
+          absoluteX: 42
+          absoluteY: 990
+        #legend panel
+        - !columns
+          config:
+            borderWidth: 1
+            cells:
+              - borderWidth: 2
+                borderWidthLeft: 1
+                borderColor: black
+                padding: 4
+                backgroundColor: white
+                vertAlign: bottom
+          widths: [170]
+          absoluteX: 1283
+          absoluteY: 990
+          width: 340
+          items:
+            - !legends
+              horizontalAlignment: left
+              #iconMaxWidth: 150
+              iconMaxHeight: 0
+              layerSpace: 5
+              layerFontSize: 12
+              classIndentation: 5
+              classFontSize: 10
+              classSpace: 4
+              backgroundColor: #ffffff
+              failOnBrokenUrl: false
+        - !columns
+          absoluteX: 834
+          absoluteY: 198
+          width: 40
+          items:
+            - !image
+              maxWidth: 40
+              maxHeight: 40
+              url: 'file:/${configDir}/Arrow_North_CFCF.svg'
+              rotation: '${rotation}'
+        - !columns
+          absoluteX: 42
+          absoluteY: 85
+          width: 1105
+          widths: [339, 423, 339]
+          items:
+            - !columns
+              nbColumns: 1
+              items:
+                - !text
+                  text: '${comment}'
+                  fontEncoding: Cp1252
+                  fontSize: 8
+                  align: left
+                  vertAlign: middle
+                - !text
+                  text: '${now MM.dd.yyyy}'
+                  fontEncoding: Cp1252
+                  fontSize: 8
+                  align: left
+                  vertAlign: middle
+            - !text
+              align: center
+              vertAlign: middle
+              fontSize: 14
+              text: '${mapTitle}'
+            - !scalebar
+              align: right
+              vertAlign: middle
+              maxSize: 200
+              type: 'bar sub'
+              intervals: 5
+        - !columns
+          absoluteX: 42
+          absoluteY: 65
+          width: 1184
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
+  #=======A2 portrait no legend============================================
+  A2_no_legend :
+  #========================================================================
+    mainPage:
+      rotation: true
+      pageSize: 1191 1684
+      landscape: false
+      items:
+        - !columns
+          absoluteX: 42
+          absoluteY: 1650
+          width: 1105
+          items:
+            - !image
+              maxWidth: 1105
+              url: '/${configDir}/print_header.png'
+        - !map
+          width: 1111
+          height: 1340
+          absoluteX: 42
+          absoluteY: 1400
+        - !columns
+          absoluteX: 834
+          absoluteY: 198
+          width: 40
+          items:
+            - !image
+              maxWidth: 40
+              maxHeight: 40
+              url: 'file:/${configDir}/Arrow_North_CFCF.svg'
+              rotation: '${rotation}'
+        - !columns
+          absoluteX: 42
+          absoluteY: 1525
+          width: 1105
+          widths: [424]
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 14
+              text: '${mapTitle}'
+        - !columns
+          absoluteX: 42
+          absoluteY: 1485
+          width: 1105
+          widths: [1105]
+          items:
+            - !text
+              text: '${comment}'
+              fontEncoding: Cp1252
+              fontSize: 9
+              align: left
+              vertAlign: middle
+        - !columns
+          absoluteX: 42
+          absoluteY: 55
+          width: 1111
+          widths: [340, 424]
+          items:
+            - !columns
+              nbColumns: 1
+              items:
+                - !text
+                  text: '${comment}'
+                  fontEncoding: Cp1252
+                  fontSize: 8
+                  align: left
+                  vertAlign: middle
+                - !text
+                  text: '${now MM.dd.yyyy}'
+                  fontEncoding: Cp1252
+                  fontSize: 8
+                  align: left
+                  vertAlign: middle
+            - !scalebar
+              align: right
+              vertAlign: middle
+              maxSize: 200
+              type: 'bar sub'
+              intervals: 5
+        - !columns
+          absoluteX: 42
+          absoluteY: 35
+          width: 1111
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
+  #=======A2 landscape no legend============================================
+  A2_no_legend_landscape :
+  #=========================================================================
+    mainPage:
+      rotation: true
+      pageSize: 1684 1191
+      landscape: false
+      items:
+        - !columns
+          absoluteX: 42
+          absoluteY: 1151
+          width: 1600
+          items:
+            - !image
+              maxWidth: 1563
+              url: '/${configDir}/print_header.png'
+        - !map
+          width: 1600
+          height: 840
+          absoluteX: 42
+          absoluteY: 990
+        - !columns
+          absoluteX: 834
+          absoluteY: 198
+          width: 40
+          items:
+            - !image
+              maxWidth: 40
+              maxHeight: 40
+              url: 'file:/${configDir}/Arrow_North_CFCF.svg'
+              rotation: '${rotation}'
+        - !columns
+          absoluteX: 42
+          absoluteY: 95
+          width: 1600
+          widths: [339, 423, 339]
+          items:
+            - !columns
+              nbColumns: 1
+              items:
+                - !text
+                  text: '${comment}'
+                  fontEncoding: Cp1252
+                  fontSize: 8
+                  align: left
+                  vertAlign: middle
+                - !text
+                  text: '${now MM.dd.yyyy}'
+                  fontEncoding: Cp1252
+                  fontSize: 8
+                  align: left
+                  vertAlign: middle
+            - !text
+              align: center
+              vertAlign: middle
+              fontSize: 14
+              text: '${mapTitle}'
+            - !scalebar
+              align: right
+              vertAlign: middle
+              maxSize: 200
+              type: 'bar sub'
+              intervals: 5
+        - !columns
+          absoluteX: 42
+          absoluteY: 75
+          width: 1600
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
+  #=======A2 portrait two pages legend======================================
+  A2_2_pages_legend :
+  #=========================================================================
+    mainPage:
+      rotation: true
+      pageSize: 1191 1684
+      landscape: false
+      items:
+        - !columns
+          absoluteX: 42
+          absoluteY: 1650
+          width: 1105
+          items:
+            - !image
+              maxWidth: 1105
+              url: '/${configDir}/print_header.png'
+        - !map
+          width: 1111
+          height: 1340
+          absoluteX: 42
+          absoluteY: 1400
+        - !columns
+          absoluteX: 834
+          absoluteY: 198
+          width: 40
+          items:
+            - !image
+              maxWidth: 40
+              maxHeight: 40
+              url: 'file:/${configDir}/Arrow_North_CFCF.svg'
+              rotation: '${rotation}'
+        - !columns
+          absoluteX: 42
+          absoluteY: 1525
+          width: 1105
+          widths: [424]
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 14
+              text: '${mapTitle}'
+        - !columns
+          absoluteX: 42
+          absoluteY: 1485
+          width: 1105
+          widths: [1105]
+          items:
+            - !text
+              text: '${comment}'
+              fontEncoding: Cp1252
+              fontSize: 9
+              align: left
+              vertAlign: middle
+        - !columns
+          absoluteX: 42
+          absoluteY: 55
+          width: 1111
+          widths: [340, 424]
+          items:
+            - !columns
+              nbColumns: 1
+              items:
+                - !text
+                  text: '${comment}'
+                  fontEncoding: Cp1252
+                  fontSize: 8
+                  align: left
+                  vertAlign: middle
+                - !text
+                  text: '${now MM.dd.yyyy}'
+                  fontEncoding: Cp1252
+                  fontSize: 8
+                  align: left
+                  vertAlign: middle
+            - !scalebar
+              align: right
+              vertAlign: middle
+              maxSize: 200
+              type: 'bar sub'
+              intervals: 5
+        - !columns
+          absoluteX: 42
+          absoluteY: 35
+          width: 1111
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
+    lastPage:
+      pageSize: 1191 1684
+      landscape: false
+      items:
+        #legend panel
+        - !columns
+          config:
+            borderWidth: 0
+            cells:
+              - borderWidth: 0
+                borderWidthLeft: 0
+                borderColor: black
+                padding: 4
+                backgroundColor: white
+                vertAlign: bottom
+          widths: [440]
+          absoluteX: 30
+          absoluteY: 1627
+          width: 440
+          items:
+            - !legends
+              failOnBrokenUrl: false
+              horizontalAlignment: left
+              iconMaxWidth: 0
+              iconMaxHeight: 1486
+              maxHeight: 1486
+              maxColumns: 4
+              maxWidth: 800
+              layerSpace: 5
+              layerFontSize: 12
+              classIndentation: 5
+              classFontSize: 8
+              classSpace: 4
+              backgroundColor: #ffffff
+              reorderColumns: true
+              dontBreakItems: true
+              overflow: true
+  #===========================================================================
+  A2_2_pages_legend_landscape :
+  #===========================================================================
+    mainPage:
+      rotation: true
+      pageSize: 1684 1191
+      landscape: false
+      items:
+        - !columns
+          absoluteX: 42
+          absoluteY: 1151
+          width: 1600
+          items:
+            - !image
+              maxWidth: 1563
+              url: '/${configDir}/print_header.png'
+        - !map
+          width: 1600
+          height: 840
+          absoluteX: 42
+          absoluteY: 990
+        - !columns
+          absoluteX: 834
+          absoluteY: 198
+          width: 40
+          items:
+            - !image
+              maxWidth: 40
+              maxHeight: 40
+              url: 'file:/${configDir}/Arrow_North_CFCF.svg'
+              rotation: '${rotation}'
+        - !columns
+          absoluteX: 42
+          absoluteY: 95
+          width: 1600
+          widths: [339, 423, 339]
+          items:
+            - !columns
+              nbColumns: 1
+              items:
+                - !text
+                  text: '${comment}'
+                  fontEncoding: Cp1252
+                  fontSize: 8
+                  align: left
+                  vertAlign: middle
+                - !text
+                  text: '${now MM.dd.yyyy}'
+                  fontEncoding: Cp1252
+                  fontSize: 8
+                  align: left
+                  vertAlign: middle
+            - !text
+              align: center
+              vertAlign: middle
+              fontSize: 14
+              text: '${mapTitle}'
+            - !scalebar
+              align: right
+              vertAlign: middle
+              maxSize: 200
+              type: 'bar sub'
+              intervals: 5
+        - !columns
+          absoluteX: 42
+          absoluteY: 75
+          width: 1600
+          items:
+            - !text
+              align: left
+              vertAlign: middle
+              fontSize: 6
+              text: '${credits}'
+    lastPage:
+      pageSize: 1684 1191
+      landscape: false
+      items:
+        #legend panel
+        - !columns
+          config:
+            borderWidth: 0
+            cells:
+              - borderWidth: 0
+                borderWidthLeft: 0
+                borderColor: black
+                padding: 4
+                backgroundColor: white
+                vertAlign: bottom
+          absoluteX: 30
+          absoluteY: 1131
+          width: 1103
+          widths: [1103]
+          items:
+            - !legends
+              failOnBrokenUrl: false
+              horizontalAlignment: left
+              iconMaxWidth: 0
+              iconMaxHeight: 700
+              maxHeight: 700
+              maxColumns: 3
+              maxWidth: 1200
+              layerSpace: 5
+              layerFontSize: 12
+              classIndentation: 5
+              classFontSize: 8
+              classSpace: 4
+              backgroundColor: #ffffff
+              reorderColumns: true
+              dontBreakItems: true
+              overflow: true
\ No newline at end of file