diff --git a/pwa/package-lock.json b/pwa/package-lock.json index 3ba00ff1..965dd77d 100644 --- a/pwa/package-lock.json +++ b/pwa/package-lock.json @@ -8,8 +8,8 @@ "name": "product-website-template", "version": "1.0.0", "dependencies": { - "@conduction/components": "2.2.8", - "@conduction/theme": "1.0.45", + "@conduction/components": "2.2.16", + "@conduction/theme": "1.0.48", "@fortawesome/fontawesome-svg-core": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.4.0", "@fortawesome/react-fontawesome": "^0.1.18", @@ -1997,9 +1997,9 @@ } }, "node_modules/@conduction/components": { - "version": "2.2.8", - "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.8.tgz", - "integrity": "sha512-eaCLSm2giu+kCNlC6+H+gqZkehIeIFxOVGz/MYfhHBTP+lRulV1C258jQXpK8DjxXY65XHKruNVYrgi2ZEyYpA==", + "version": "2.2.16", + "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.16.tgz", + "integrity": "sha512-XvPNtjuNzwUegoln7uZjBNxjUInpbWI8Oie+8XOhlDssDVZq/t1mYka/eXn8n/chdOwxD5vZ3qZZjU7L4UbSoA==", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.2.0", "@fortawesome/free-solid-svg-icons": "^6.2.0", @@ -2052,9 +2052,9 @@ } }, "node_modules/@conduction/theme": { - "version": "1.0.45", - "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.0.45.tgz", - "integrity": "sha512-h+RcKStBOilUj3xkxg8xE82aDkBzkBiI7MtvuoGOeKkOdAJ/I/UECAjebP85601JMO6A3N8RIkwNCTuOFPtUTQ==", + "version": "1.0.48", + "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.0.48.tgz", + "integrity": "sha512-5XRYHl9W0NvBxVJBZ1/SYyhNYV4hHpm/9taDEw1hjuGzzzyz+XhpN2UMkbtiqFwgN/U6pcZMdxfJIcsw49iI0Q==", "dependencies": { "@nl-design-system-unstable/rotterdam-design-tokens": "^1.0.0-alpha.100" } @@ -13601,7 +13601,7 @@ } }, "node_modules/react-datepicker": { - "version": "4.18.0", + "version": "4.20.0", "license": "MIT", "dependencies": { "@popperjs/core": "^2.11.8", @@ -13920,7 +13920,7 @@ } }, "node_modules/react-tooltip": { - "version": "5.21.4", + "version": "5.21.5", "license": "MIT", "dependencies": { "@floating-ui/dom": "^1.0.0", diff --git a/pwa/package.json b/pwa/package.json index 59acb0d4..eb7eb869 100644 --- a/pwa/package.json +++ b/pwa/package.json @@ -4,9 +4,7 @@ "private": true, "description": "Product Website Template", "author": "Conduction", - "keywords": [ - "gatsby" - ], + "keywords": ["gatsby"], "scripts": { "develop": "gatsby develop", "start": "gatsby develop", @@ -24,8 +22,8 @@ "prepare": "cd .. && husky install" }, "dependencies": { - "@conduction/components": "2.2.8", - "@conduction/theme": "1.0.45", + "@conduction/components": "2.2.17", + "@conduction/theme": "1.0.48", "@fortawesome/fontawesome-svg-core": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.4.0", "@fortawesome/react-fontawesome": "^0.1.18", diff --git a/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.tsx b/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.tsx index cd09666e..f30b3af7 100644 --- a/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.tsx +++ b/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.tsx @@ -22,7 +22,7 @@ const ResultsDisplaySwitch: React.FC = ({ layoutClass appearance={isActive(displayKey, "cards") ? "primary-action-button" : "secondary-action-button"} className={styles.button} onClick={() => setDisplay({ [displayKey]: "cards" })} - discription={t("Show cards")} + aria-label={t("Cards view")} > {t("Cards")} @@ -31,7 +31,7 @@ const ResultsDisplaySwitch: React.FC = ({ layoutClass appearance={isActive(displayKey, "table") ? "primary-action-button" : "secondary-action-button"} className={styles.button} onClick={() => setDisplay({ [displayKey]: "table" })} - discription={t("Show table")} + aria-label={t("Table view")} > {t("Table")} diff --git a/pwa/src/data/content.ts b/pwa/src/data/content.ts deleted file mode 100644 index 279cf246..00000000 --- a/pwa/src/data/content.ts +++ /dev/null @@ -1,8 +0,0 @@ -export const README = - '

Common Gateway

Introducing the Common Gateway - a cutting-edge, advanced technology platform designed to enhance data interaction and exchange for local governments. The Common Gateway is a critical tool for the seamless provision of data to Common Ground services, ensuring smooth, efficient, and secure data transactions.

At its core, the Common Gateway is a plugin-based system, allowing for flexible and customizable operations. It is capable of handling multiple plugins, each with its own unique set of functionalities, encapsulated in the form of installation.json files. The platform comes with a robust Installation Service that can read these installation.json files, understand the plugin\'s requirements, and create basic schema\'s accordingly.

But the Common Gateway is more than just a tool for data exchange. It\'s a comprehensive solution designed to handle a multitude of request types and generate appropriate responses. Whether it\'s an HTTP GET, PUT, POST, or a user downloading a file, the Gateway is equipped to handle it all. It identifies the endpoint, processes the request, and generates an appropriate response, ensuring that any incoming request can be accurately interpreted and handled.

Moreover, the Gateway follows an API-first approach, developing APIs that are consistent and reusable. It also follows the principles of Role-Based Access Control (RBAC), granting permissions to users and applications based on their roles. This ensures a secure and controlled environment for data exchange.

This is a transformative approach to data management, enabling governments to maintain control over their own data while allowing for efficient communication with Common Ground services. It\'s not just about data exchange, but also about creating an ecosystem where information is democratized, access is broadened, and operations are streamlined.

The Common Gateway is built with the future in mind, designed to adapt and grow with the needs of local governments and the communities they serve. It brings the power of data exchange to your fingertips, providing a platform that is as intuitive as it is powerful.

Embrace the future of data exchange with Common Gateway. It\'s time to revolutionize the way your local government handles data, enhancing efficiency, security, and adaptability. With the Common Gateway, you\'re not just preparing for the future, you\'re shaping it.

Documentation

Since documentation for a technical application like the common gateway can be a bit overwhelming, we decided to spread it out in different levels of technical difficulty

  1. (Non-technical) Aimed at product owners and interested parties with no to little technical background: The product page.
  2. (A bit technical) Aimed at architects and engineers: The read the docs page.
  3. (Technical) Aimed at developers want to build plugins or use the gateway as backend: Readme files in the codebase.
  4. (Very technical) Aimed people who want to improve and extend the code base: In code documentations.

If you don\'t like to read documentation online there is also a complete manual available in pdf.

CoreBundle Codacy Badge

This repository holds the common-gateway Core Bundle code base. For more information about the Common Gateway project, please visit the Common Gateway Documentation.

License

This project is released under the EUPL licence program.

'; - -export const ArchitectureContent = - '

Architecture

WarningThis file is maintained at the Conduction Google Drive. Please make any suggestions of alterations there.

Main Process

The Common Gateway is designed to handle a multitude of request types. Upon receiving a request, the Gateway commences a series of steps to handle the request and provide an appropriate response. The main process is as follows:

  1. Receipt of Request: The Gateway can receive a wide range of request types. These include:HTTP GET, PUT, POST, etc., containing a JSON, XML, or SOAP objectA browser GET request (HTML)A user posting a formA user downloading a file
  2. Endpoint Identification: Once the Gateway receives a request, the first task is to identify the endpoint. The endpoint is a primary determinant of how the request will be processed. Endpoints are mapped to specific functions or services in the Gateway, and the identified endpoint dictates the necessary operations to be performed.
  3. Response Generation: After the request has been processed according to the rules of the identified endpoint, the Gateway generates an appropriate response. This could be a JSON or XML response for API requests, an HTML page for browser requests, or the requested file for download requests.

This main process forms the backbone of the Common Gateway\'s operation. It ensures that any incoming request can be accurately interpreted and handled, and that an appropriate response can be generated and returned to the user.

The use of endpoints allows the Gateway to be highly flexible and adaptable, capable of handling a wide variety of requests and responses, making it an ideal solution for various use cases.

Main request components

  1. Endpoint
  2. Source
  3. Datalayer
  4. Request Service
  5. Events

Two codebases to rule them all

As part of our ongoing efforts to improve and streamline our development process, we\'re transitioning from a single codebase setup to a library-based one. This shift involves migrating code from the existing repository at ConductionNL/commonground-gateway to a new repository at CommonGateway/CoreBundle.

This transition is not just about moving code; it\'s about enhancing the quality of our codebase. We\'re taking this opportunity to clean up both our code and documentation and to increase the coverage of our unit tests. However, this is a significant undertaking, and we\'re not finished yet. As of now, Entities, Controllers, and some workflows, including unit testing, are still located in the old repository. We expect the migration to be completed by summer 2023.

An integral part of this transition is the decoupling of client-specific code from the core codebase. This code will now reside in separate plugin repositories. This separation of concerns ensures a cleaner, more maintainable codebase, and allows for more customizable client implementations.

Please bear with us during this period of transition. We\'re confident that these changes will result in a more robust and efficient gateway, and we appreciate your understanding and patience during this time.

Design Decisions

API First

An API-first approach means that for any given development project, your APIs are treated as "first-class citizens." An API-first approach involves developing APIs that are consistent and reusable, which can be accomplished by using an API description language to establish a contract for how the API is supposed to behave. The specification we use is the OpenAPI Specification. You can view the latest version of this specification (3.0.1) on GitHub.

Documentation

We host technical documentation on Read the Doc\'s and general user information on GitHub pages, to make the documentation compatible with GitHub we document in markdown (instead of reStructuredText). Documentation is part of the project and contained within the /docs folder.

Common Ground

All applications are developed following the Common Ground standards on how a data exchange system should be: modular and open-source. More information on Common Ground can be found here

'; - -export const endpointContent = - '

Endpoints

WarningThis file is maintained at the Conduction Google Drive. Please make any suggestions or alterations there.

Endpoints are locations (with addresses) where applications can send and receive messages. The generally consist of a domain and path part together forming an URL. For example in case of thedemo.commongateway.nl/api/pets url, the /api/pets would be the path and and demo.commongateway.nl/ the domain.

The common gateway uses endpoint to allow applications to access it, it splits al endpoints into two categories wich are separated by their first path part.

/admin for endpoints that are part of the gateways internal workings/api for user created endpoints

Index

  1. Defining an endpoint

Defining an endpoint

The Common Gateway stores,imports and exports endpoints as JSON mapping objects. Bellow you can find an example endpoint object

Endpoint objects MUST follow the bellow specifications
PropertyRequiredUsageAllowed Value
titleYesUser friendly single sentence describing of the endpoint used for identificationstring, max 255 characters
descriptionNoUser friendly multi line description of the endpoint used for explaining purpose and workings of the mappingstring, max 2555 characters
$idNoUsed during the import of endpoint to see if a endpoint is already presentstring, max 255 characters
$schemaYesTells the common gatway that this object is a endpointAlways: \'https://docs.commongateway.nl/schemas/Endpoint.schema.json\'
versionnoUsed during the import of endpoint to see if endpoint should be overwritten (updated)A valid semantic version number
pathRegexnoThe regex used by the Gateway to find the endpoint. For the above  example, that would be ^pets, but the regex could also allow for variable parts like ^pets/?([a-z0-9-]+)?$. The pathRegex MUST be unique within a Gateway installation
pathnoAn array of the items in the path that are separated by / in the endpoint. For the above example that would be [‘pets’,’id’]. Path parts MUST exist of letters and numbers.
pathPartsnoAn array containing the parts of the path for setting variables for later processes to use later on. Based on their index in the path array and the variable’s name that should be created. For the above example, that would be [‘1’=>’id’]
methodsnoDetermins the HTTP methods suported by this endpointAn array of the methods that are allowed on this path, for example [‘GET’,’PUT’,’POST’,’PATCH’,’DELETE’]. An endpoint must have at least one method
sourcenoTurns the endpoint into a proxy for a differend APIONE external source that is proxied by the endpoint (see Proxy)
schemasnoAny schemas provided by the endpoint (see schema’s)Array of schema\'s
throwsnoAny events thrown by the endpoint (see event-driven)Array of events thrown when the endpoint is called
Handling incoming traffic
Once an endpoint is called by an external application  calls an endpoint(or user, a browser is also an application), the endpoint will handle the following actions in the following order.
request.svg
As you can see can see there are three basic alternatives
  1. An endpoint is linked to a source (becoming a proxy for that source)
  2. An endpoint is linked to one or more schema\'s
  3. An endpoint is not linked to sources or schema\'s
Note
  • When a proxy (source) is set on an endpoint the schema fase wil be skipped
  • Events are always thrown (in all three cases)
  • If an endpoint is not linked to a source, schema\'s AND dosn\'t contain event it wil always return an error
Proxy
An endpoint MAY be a proxy for another (external) source. In this case, the endpoint will forward all traffic to the external source (and attach authorization if required by that source). It will also pass along:any headers, query parameters, body, and methods (e.g., GET)sent to the endpoint. Keep in mind that it will only do so if the method used is activeated on the endpoint (in practice, it is quite common not to expose delete through an endpoint)
Suppose the endpoint path contains an endpoint parameter in the path regex e.g. example. In that case, it will also forward that message to that specific endpoint on the external source. So gateway.com/api/petstore/pets would be forwarded to   petstore.com/pets.
request_proxy.svg
Keep in mind that a proxy does not transform or translate data, it simply forwards the received request to a source and then returns the response of that source. If you require more functionality (e.g. datatransformation or translations) you should setup a schema.
Schema\'s
If an endpoint connects is connected to one or more schemas, it will try to handle the traffic based on the requested service.
Note
  • If an endpoint is hooked to schema(‘s) it will automatically create an API and appropriate Redoc based on its settings. See API for more information on the API.
  • It is possible to hook an endpoint to multiple schemas. When hooked to multiple schemas, the endpoint can still handle POST requests, BUT a POST request must include a valid _self.scheme.id or _self. scheme.ref that refersto the appropriate schema so that the endpoint understands what schema you are trying to create.
  • If an endpoint is hooked to more than one entity, it will render search results from all linked entities based on supplied queries.
GET
request_get.svg
POST
request_post.svg
PUT
Put request are handled roughly  the same as an POST request, with one exception.
  1. On a PUT request an exisiting object wil be entirely replaced by the new object. Values that where present in the original object but are not present in the new object wil be DELETED.
request_put.svg
PATCH
Put request are handled roughly the same as an PUT request, with two exception.
  1. On a PATCH request an exisiting object wil be updated  by the new object. Values that where present in the original object but are not present in the new object wil be KEPT.
  2. Validity will of the request will be determend afther merging the original and new object. e.g. a required value dosn\'t need to be pressent in an patch request if it was already present in the original object. Assuming that the orignal object already had al required values (or else it could note have been created) a patch requests only required value should be it\'s id (excpetion being that the object definition could have been changed afther the original object was created)
request_patch.svg
DELETE
request_delete.svg
Throwing Events
As a final step the endpoint will ALWAYS fire any events that are defined under throws. You can read more about events under events.
request_throws.svg
When the endpoint throws events, it generates a response in the call cache. After handling all the throws ,are handled it will return the response to the user. The response starts as a 200 OK “your request has been processed”, but may be altered by any action that subscribed to a thrown event may alter it.
Note
  • Any action can subscribe to an event thrown by an endpoint, but common examples are proxy en request actions. These fulfill the same functionality as the direct proxy or event link but allow additional configuration, such as mapping.
  • It recomended to ALWAYS fire event asynchronysly
Serialization
Return an error
The endpoint will return an error if no proxy, entities, or throws are defined.
Security
Endpoints MAY be secured by assigning them to user groups. This is done on the basis of methods.
';
diff --git a/pwa/src/data/detail.ts b/pwa/src/data/detail.ts
deleted file mode 100644
index e06c6f3c..00000000
--- a/pwa/src/data/detail.ts
+++ /dev/null
@@ -1,278 +0,0 @@
-export const TEMP_OBJECTS = [
-  {
-    id: "92620d6e-7112-4853-9f9d-a10859ea7e3d",
-    name: "Voorbereiding en plaatsing schakelkast glasvezelnetwerk",
-    reference: "775323",
-    subject: "Voorbereiding en plaatsing schakelkast glasvezelnetwerk",
-    resume:
-      "Een bewoner van de gemeente Barendrecht was het niet eens met de plaatsing van de schakelkast voor het glasvezelnetwerk. De bewoner heeft hierover een klacht ingediend. Alle documentatie over zowel de voorbereiding en de plaatsing van de schakelkast als de behandeling van de klacht is opgevraagd.",
-    termOverrun: "nee",
-    receiptDate: new Date("2023-04-14T11:29:09+00:00"),
-    decisionDate: new Date("2023-06-08T11:29:09+00:00"),
-    decision: "Deels openbaar gemaakt",
-    "Theme's": "Hoofdthema: Ruimte en infrastructuur",
-    "attachment information request": {
-      name: "Woo-verzoek-geanonimiseerd-1.pdf",
-      href: "https://openpub.barendrecht.nl/wp-content/uploads/2022/08/Woo-verzoek-geanonimiseerd-1.pdf",
-    },
-    "attachment inventory list": {
-      name: "Inventarisatielijst.pdf",
-      href: "https://openpub.barendrecht.nl/wp-content/uploads/2022/08/Inventarisatielijst.pdf",
-    },
-    "attachment decision": {
-      name: "Woo-besluit-geanonimiseerd-1.pdf",
-      href: "https://openpub.barendrecht.nl/wp-content/uploads/2022/08/Woo-besluit-geanonimiseerd-1.pdf",
-    },
-    attachments: [
-      {
-        name: "Whatsappberichten-bewoner-en-gemeente-2022-en-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Whathsappberichten-bewoner-en-gemeente-2022-en-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Whatsappberichten-bewoner-en-gemeente-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06/Whathsappberichten-bewoner-en-gemeente-2023-geanonimiseerd.pdf",
-      },
-
-      {
-        name: "Vergunningstekening-Barendrecht-Nieuwland-Vergunning-Overzicht-TOTAAL-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Vergunningstekening-Barendrecht-Nieuwland-Vergunning-Overzicht-TOTAAL-geanonimiseerd.pdf",
-      },
-      {
-        name: "Uitvoeringstekening-verplaatsen-kast-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Uitvoeringstekening-verplaatsen-kast-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Tekening-Brd-AHY-DP-Areas-Brd-AHY-DP007-2vd2-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Tekening-Brd-AHY-DP-Areas-Brd-AHY-DP007-2vd2-geanonimiseerd.pdf",
-      },
-      {
-        name: "Tekening-Brd-AHY-DP-Areas-Brd-AHY-DP007-1vd2-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Tekening-Brd-AHY-DP-Areas-Brd-AHY-DP007-1vd2-geanonimiseerd.pdf",
-      },
-      {
-        name: "Ondertekend-contract-KPN-NEM-SOK-Glasvezel-Barendrecht-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Ondertekend-contract-KPN-NEM-SOK-Glasvezel-Barendrecht-geanonimiseerd.pdf",
-      },
-      {
-        name: "Offerte-Verplaatsen-OAP-AHW-11-01-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Offerte-Verplaatsen-OAP-AHW-11-01-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "OAP-Tekening-Barendrecht-Nieuwland.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06OAP-Tekening-Barendrecht-Nieuwland.pdf",
-      },
-      {
-        name: "Notulen-gespreksverslag-klacht-08-02-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Notulen-gespreksverslag-klacht-08-02-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Moor-379451-tekening-10-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Moor-379451-tekening-10-geanonimiseerd.pdf",
-      },
-      {
-        name: "Memo-Klachtenbehandeling-klacht-plaatsing-OAP-kast-24-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Memo-Klachtenbehandeling-klacht-plaatsing-OAP-kast-24-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-VWT-kast-06-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-VWT-kast-06-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-van-VWT-Kast-compleet-17-03-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-van-VWT-Kast-compleet-17-03-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-van-KPN-verplaatsing-mogelijk-07-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-van-KPN-verplaatsing-mogelijk-07-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-van-KPN-kosten-verplaatsen-Kast-03-03-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-van-KPN-kosten-verplaatsen-Kast-03-03-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-van-bewoner-reactie-klacht-30-01-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-van-bewoner-reactie-klacht-30-01-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-KPN-Procedure-verplaatsing-kast-07-03-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-KPN-Procedure-verplaatsing-kast-07-03-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-intern-verzoek-klacht-oppakken-25-10-2022-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-intern-verzoek-klacht-oppakken-25-10-2022-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-intern-Schakelkast-KPN-21-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-intern-Schakelkast-KPN-21-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-intern-oppakken-klacht-637384-info-–-24-03-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-intern-oppakken-klacht-637384-info-%E2%80%93-24-03-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-intern-Klacht-bespreken-17-03-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-intern-Klacht-bespreken-17-03-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-intern-klacht-637384-aanvulling-info-–-23-03-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-intern-klacht-637384-aanvulling-info-%E2%80%93-23-03-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-intern-Dringend-verzoek-locatie-kast-–-14-02-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-intern-%E2%80%93-Dringend-verzoek-locatie-kast-%E2%80%93-14-02-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-bewoner-Schakelkast-KPN-–-19-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-bewoner-Schakelkast-KPN-%E2%80%93-19-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-bewoner-reactie-gespreksverslag-V2-24-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-bewoner-reactie-gespreksverslag-V2-24-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-bewoner-klacht-637384-gespreksnotitie-14-02-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-bewoner-klacht-637384-gespreksnotitie-14-02-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-bewoner-kast-andere-locatie-–-10-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-bewoner-kast-andere-locatie-%E2%80%93-10-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-bewoner-info-klachtencoordinator-14-02-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-bewoner-info-klachtencoordinator-14-02-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-bewoner-indiening-WOO-verzoek-–-14-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-bewoner-indiening-WOO-verzoek-%E2%80%93-14-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-aan-KPN-Voorstel-locatie-–-06-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-aan-KPN-Voorstel-locatie-%E2%80%93-06-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-aan-KPN-akkoord-verplaatsing-OAP-kast-19-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-aan-KPN-akkoord-verplaatsing-OAP-kast-19-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-aan-bewoner-Klacht-schakelkast-16-02-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-aan-bewoner-Klacht-schakelkast-16-02-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-aan-bewoner-gespreksverslag-klacht-V2-21-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-aan-bewoner-gespreksverslag-klacht-V2-21-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-aan-bewoner-Contactgegevens-wethouder-24-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-aan-bewoner-Contactgegevens-wethouder-24-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-intern-Klachten-kast-on-hold-09-02-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Mail-intern-Klachten-kast-on-hold-09-02-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Luchtfoto-voorstel-verplaatsen-kast-04-2023.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Luchtfoto-voorstel-verplaatsen-kast-04-2023.pdf",
-      },
-      {
-        name: "Klacht-zaaksysteem-23-10-2022-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Klacht-zaaksysteem-23-10-2022-geanonimiseerd.pdf",
-      },
-      {
-        name: "Instemmingsbesluit_392417-05-09-2022-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Instemmingsbesluit_392417-05-09-2022-geanonimiseerd.pdf",
-      },
-      {
-        name: "Foto-nieuwe-locatie-kast.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Foto-nieuwe-locatie-kast.pdf",
-      },
-      {
-        name: "Foto-2-nieuwe-locatie-kast-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Foto-2-nieuwe-locatie-kast-geanonimiseerd.pdf",
-      },
-      {
-        name: "Extra-info-klacht-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Extra-info-klacht-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Brief-aan-bewoner-Formele-verklaring-wethouder-18-04-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Brief-aan-bewoner-Formele-verklaring-wethouder-18-04-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Brief-bewoner-Conclusie-onderzoek-klacht-04-05-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Brief-bewoner-Conclusie-onderzoek-klacht-04-05-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Bewoner-klacht-gemeente-23-10-2022-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Bewoner-klacht-gemeente-23-10-2022-geanonimiseerd.pdf",
-      },
-      {
-        name: "Bewoner-aanvullende-klacht-gemeente-glasvezel-–-29-01-2023-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Bewoner-aanvullende-klacht-gemeente-glasvezel-%E2%80%93-29-01-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "Besluit-Glasvezel-11-mei-2021-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Besluit-Glasvezel-11-mei-2021-geanonimiseerd.pdf",
-      },
-      {
-        name: "Mail-intern-vergunningtraject-MOOR-19-04-2023-geanonimiseerd",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06/Mail-intern-vergunningtraject-MOOR-19-04-2023-geanonimiseerd.pdf",
-      },
-    ],
-  },
-  {
-    id: "142ea10e-7660-49dc-9eef-d49e87874d44",
-    name: "Aantal WMO-vragen ingediend in 2020, 2021 en 2022",
-    reference: "719709",
-    subject: "Aantal WMO-vragen ingediend in 2020, 2021 en 2022",
-    resume:
-      "Opgevraagd is het aantal WMO-aanvragen in de jaren 2020, 2021 en 2022. Hierbij is ook opgevraagd wanneer de WMO-aanvragen zijn ingediend, of de WMO-aanvragen zijn toe- of afgewezen en wat de reden was van de eventuele afwijzing. Het Woo-verzoek was echter niet via de juiste (elektronische) kanaal ingediend. Het Woo-verzoek wordt daarom niet behandeld.",
-    termOverrun: "Ja",
-    receiptDate: new Date("2023-02-14T11:29:09+00:00"),
-    decisionDate: new Date("2023-05-16T11:29:09+00:00"),
-    decision: "Niet openbaar gemaakt",
-    "Theme's": "Hoofdthema: Sociale zekerheid",
-    "attachment information request": {
-      name: "WOO-verzoek-geanonimiseerd.pdf",
-      href: "https://openpub.barendrecht.nl/wp-content/uploads/2022/08/WOO-verzoek-geanonimiseerd.pdf",
-    },
-    "attachment decision": {
-      name: "Woo-besluit-Barendrecht-geanonimiseerd.pdf",
-      href: "https://openpub.barendrecht.nl/wp-content/uploads/2022/08/Woo-besluit-Barendrecht-geanonimiseerd.pdf",
-    },
-  },
-  {
-    id: "cc2a2f12-7ef0-4563-8338-ae7a1979178e",
-    name: "Exploitatievergunningen Diggels Barendrecht B.V., Ristorante Papi en Café De Uitspanning B.V.",
-    reference: "733982",
-    subject: "Exploitatievergunningen Diggels Barendrecht B.V., Ristorante Papi en Café De Uitspanning B.V.",
-    resume:
-      "De exploitatievergunningen van Diggels Barendrecht B.V., Ristorante Papi en Café De Uitspanning B.V. zijn opgevraagd en worden gedeeltelijk openbaar gemaakt.",
-    termOverrun: "Nee",
-    receiptDate: new Date("2023-02-22T11:29:09+00:00"),
-    decisionDate: new Date("2023-04-11T11:29:09+00:00"),
-    decision: "	Deels openbaar gemaakt",
-    "Theme's": "Hoofdthema: Openbare orde en veiligheid",
-    "attachment information request": {
-      name: "Woo-verzoek-geanonimiseerd.pdf",
-      href: "https://openpub.barendrecht.nl/wp-content/uploads/2022/08/Woo-verzoek-geanonimiseerd.pdf",
-    },
-    "attachment decision": {
-      name: "Woo-besluit-geanonimiseerd.pdf",
-      href: "https://openpub.barendrecht.nl/wp-content/uploads/2022/08/Woo-besluit-geanonimiseerd.pdf",
-    },
-    attachments: [
-      {
-        name: "04Exploitatievergunning-Uitspanning-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/06Whathsappberichten-bewoner-en-gemeente-2022-en-2023-geanonimiseerd.pdf",
-      },
-      {
-        name: "04Exploitatievergunning-PaPi-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/04Exploitatievergunning-PaPi-geanonimiseerd.pdf",
-      },
-      {
-        name: "04Exploitatievergunning-Diggels-geanonimiseerd.pdf",
-        href: "https://openpub.barendrecht.nl/wp-content/uploads/2023/04Exploitatievergunning-Diggels-geanonimiseerd.pdf",
-      },
-    ],
-  },
-];
diff --git a/pwa/src/templates/jumbotronTemplate/JumbotronTemplate.tsx b/pwa/src/templates/jumbotronTemplate/JumbotronTemplate.tsx
index 35aed429..a600f0c3 100644
--- a/pwa/src/templates/jumbotronTemplate/JumbotronTemplate.tsx
+++ b/pwa/src/templates/jumbotronTemplate/JumbotronTemplate.tsx
@@ -1,27 +1,30 @@
 import * as React from "react";
 import * as styles from "./JumbotronTemplate.module.css";
 import { Heading2, Paragraph, Page, PageContent } from "@utrecht/component-library-react/dist/css-module";
-import { CardWrapper } from "@conduction/components/lib/components/card";
+import { CardWrapper } from "@conduction/components";
 import { useTranslation } from "react-i18next";
 
 export const JumbotronTemplate: React.FC = () => {
   const { t } = useTranslation();
 
   return (
-    

+    

       
         
-          

-            
-              
-                {t("Woo-publications of")} {process.env.GATSBY_ORGANISATION_NAME}
-              
+          
+            
+              {t("Woo-publications of")} {process.env.GATSBY_ORGANISATION_NAME}
+            
 
-              
-                {t("On this page you will find the Woo-publications of")} {process.env.GATSBY_ORGANISATION_NAME}
-              
-            
-          

+            
+              {t("On this page you will find the Woo-publications of")} {process.env.GATSBY_ORGANISATION_NAME}
+            
+          
         
       
     

diff --git a/pwa/src/templates/landing/LandingTemplate.module.css b/pwa/src/templates/landing/LandingTemplate.module.css
index c8adac52..48669c37 100644
--- a/pwa/src/templates/landing/LandingTemplate.module.css
+++ b/pwa/src/templates/landing/LandingTemplate.module.css
@@ -5,3 +5,8 @@
 .container > *:not(:last-child) {
   margin-block-end: var(--utrecht-space-block-lg);
 }
+
+.header1 {
+  margin-block-start: 0px;
+  margin-block-end: 0px;
+}
diff --git a/pwa/src/templates/landing/LandingTemplate.tsx b/pwa/src/templates/landing/LandingTemplate.tsx
index 1460c7e8..fd8e27be 100644
--- a/pwa/src/templates/landing/LandingTemplate.tsx
+++ b/pwa/src/templates/landing/LandingTemplate.tsx
@@ -10,31 +10,37 @@ import Skeleton from "react-loading-skeleton";
 import { QueryClient } from "react-query";
 import { Pagination } from "@conduction/components";
 import { usePaginationContext } from "../../context/pagination";
+import { useTranslation } from "react-i18next";
 
 export const LandingTemplate: React.FC = () => {
   const { currentPage, setCurrentPage } = usePaginationContext();
   const { filters } = useFiltersContext();
+  const { t } = useTranslation();
 
   const queryClient = new QueryClient();
   const getItems = useOpenWoo(queryClient).getAll(filters, currentPage);
 
   return (
     <>
+      

       
 
       
         
           
-          {getItems.data?.results?.length === 0 && !getItems.isLoading && Geen Woo verzoeken gevonden.}
+          {getItems.data?.results?.length === 0 && !getItems.isLoading && {t("No results found")}.}
 
           {getItems.data?.results && getItems.data?.results?.length > 0 && (
-            <>
+            

               
 
-              
-            
+              
+            

           )}
-
           {getItems.isLoading && }
         
       
diff --git a/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx b/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx
index eca5443d..f5bd4828 100644
--- a/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx
+++ b/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.tsx
@@ -4,7 +4,7 @@ import { Heading2, Paragraph } from "@utrecht/component-library-react/dist/css-m
 import { translateDate } from "../../../services/dateFormat";
 import { useTranslation } from "react-i18next";
 import { navigate } from "gatsby";
-import { CardHeader, CardHeaderDate, CardHeaderTitle, CardWrapper } from "@conduction/components/lib/components/card";
+import { CardHeader, CardHeaderDate, CardHeaderTitle, CardWrapper } from "@conduction/components";
 
 interface CardsResultsTemplateProps {
   requests: any[];
@@ -17,7 +17,15 @@ export const CardsResultsTemplate: React.FC = ({ requ
     <>
       

         {requests.map((request) => (
-           navigate(request.id)}>
+           navigate(request.id)}
+            tabIndex={0}
+            aria-label={`${request.Titel}, ${request.Samenvatting}, ${
+              request.Publicatiedatum ? translateDate(i18n.language, request.Publicatiedatum) : t("N/A")
+            }`}
+          >
             
               
                 {request.Publicatiedatum ? translateDate(i18n.language, request.Publicatiedatum) : t("N/A")}
diff --git a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx
index 3f2d4428..0cba6fd1 100644
--- a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx
+++ b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx
@@ -49,12 +49,13 @@ export const FiltersTemplate: React.FC = ({ isLoading }) =
   }, [watcher]);
 
   return (
-    

+    

       

         
          = ({ isLoading }) =
           placeholder={t("Year")}
           isClearable
           {...{ register, errors, control }}
+          ariaLabel={t("Select year")}
         />
          = ({ isLoading }) =
           defaultValue={TEMP_PUBLICATION_TYPES.find((option) => option.value === filters.Categorie)}
           isClearable
           {...{ register, errors, control }}
+          ariaLabel={t("Select category")}
         />
 
-        
       
diff --git a/pwa/src/templates/templateParts/footer/FooterTemplate.module.css b/pwa/src/templates/templateParts/footer/FooterTemplate.module.css
index c53dc304..d5e22e04 100644
--- a/pwa/src/templates/templateParts/footer/FooterTemplate.module.css
+++ b/pwa/src/templates/templateParts/footer/FooterTemplate.module.css
@@ -1,24 +1,17 @@
 .container {
-  display: flex;
-  justify-content: space-between;
+  width: 100%;
   margin: auto;
   box-sizing: border-box;
   max-inline-size: var(--utrecht-page-max-inline-size);
   padding-inline-start: var(--utrecht-page-margin-inline-start);
   padding-inline-end: var(--utrecht-page-margin-inline-end);
-  width: 100%;
-  align-items: center;
 }
 
 .footer {
-  --utrecht-unordered-list-item-padding-inline-start: 0;
-  --utrecht-unordered-list-padding-inline-start: 0;
-  --utrecht-unordered-list-item-margin-block-end: 0;
-  --utrecht-unordered-list-item-margin-block-start: 0;
   display: flex;
   align-items: center;
   background-repeat: no-repeat;
-  background-size: cover;
+  background-size: var(--utrecht-page-footer-background-size);
   background-position: var(--utrecht-page-footer-background-position);
   min-height: var(--utrecht-page-footer-min-height);
 }
@@ -41,5 +34,45 @@
 }
 
 .link:hover {
-  color: black !important;
+  cursor: pointer;
+}
+
+.withLoveConductionLink {
+  display: inline-block;
+}
+.withLoveConductionLink:hover {
+  margin-inline-start: 10px;
+}
+
+.withLoveLink:hover > :first-child {
+  transform: scale(1.2);
+}
+.withLoveLink > :first-child {
+  transition: all 1s;
+  transform-origin: 50% 50%;
+  margin-inline-end: unset;
+}
+
+.contentGrid {
+  gap: 28px;
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+}
+
+.dynamicSectionTitle {
+  margin-block-end: 18px;
+  color: inherit !important;
+}
+
+.dynamicSectionContent {
+  display: flex;
+  flex-direction: column;
+  margin-block-end: 8px;
+}
+
+.logoAndConduction {
+  margin-top: 38px;
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
 }
diff --git a/pwa/src/templates/templateParts/footer/FooterTemplate.tsx b/pwa/src/templates/templateParts/footer/FooterTemplate.tsx
index 950062b2..3dd44467 100644
--- a/pwa/src/templates/templateParts/footer/FooterTemplate.tsx
+++ b/pwa/src/templates/templateParts/footer/FooterTemplate.tsx
@@ -1,58 +1,142 @@
 import * as React from "react";
 import * as styles from "./FooterTemplate.module.css";
-import { PageFooter, Link } from "@utrecht/component-library-react/dist/css-module";
+import { PageFooter, Link, Heading3 } from "@utrecht/component-library-react/dist/css-module";
 import { navigate } from "gatsby-link";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faCode } from "@fortawesome/free-solid-svg-icons";
+import { faCode, faHeart } from "@fortawesome/free-solid-svg-icons";
 import { useTranslation } from "react-i18next";
 
+type TDynamicContentItem = {
+  title: string;
+  items: { label: string; value: string; link?: string }[];
+};
+
 export const FooterTemplate: React.FC = () => {
-  const { t } = useTranslation();
+  const [footerContent, setFooterContent] = React.useState([]);
+
+  React.useEffect(() => {
+    if (!process.env.GATSBY_FOOTER_CONTENT) return;
+
+    try {
+      setFooterContent(JSON.parse(process.env.GATSBY_FOOTER_CONTENT));
+    } catch {
+      console.warn("Could not parse footer content.");
+    }
+  }, [process.env.GATSBY_FOOTER_CONTENT]);
 
   return (
     
       

-        

-          {process.env.GATSBY_FOOTER_LOGO_URL !== "false" && (
-            
-                process.env.GATSBY_FOOTER_LOGO_HREF ? open(process.env.GATSBY_FOOTER_LOGO_HREF) : navigate("/")
-              }
-              src={process.env.GATSBY_FOOTER_LOGO_URL}
-              alt={"Footer-logo"}
-            />
-          )}
+        

+          {footerContent?.map((content, idx) => (
+            
+          ))}
         

-        

-          
-            
-          {" "}
-          with{" "}
-          
-            ❤️
-          {" "}
-          by{" "}
-          
-            Conduction.
-          
+
+        

+          
+          
         

       

     
   );
 };
+
+const DynamicSection: React.FC<{ content: TDynamicContentItem }> = ({ content }) => {
+  const { t } = useTranslation();
+
+  return (
+    

+      {t(content.title)}
+
+      {content.items.map((item, idx) => (
+        

+          {t(item.label)}
+          {/* External Link */}
+          {item.link && item.link.includes("http") && (
+            
+              {item.value}
+            
+          )}
+
+          {/* Internal Link */}
+          {item.link && !item.link.includes("http") && (
+             navigate(item.link ?? "")}
+              tabIndex={0}
+              aria-label={`${t(item.label)}, ${t(item.value)}`}
+              role="button"
+            >
+              {item.value}
+            
+          )}
+
+          {/* No Link */}
+          {!item.link && {item.value}}
+        

+      ))}
+    

+  );
+};
+
+const Logo: React.FC = () => {
+  if (process.env.GATSBY_FOOTER_LOGO_URL === "false") return <>;
+  const { t } = useTranslation();
+
+  return (
+    

+      
+          process.env.GATSBY_FOOTER_LOGO_HREF ? open(process.env.GATSBY_FOOTER_LOGO_HREF) : navigate("/")
+        }
+        src={process.env.GATSBY_FOOTER_LOGO_URL}
+        alt={t("Footer-logo")}
+        aria-label={`${t("Footer-logo")}, ${t("Can open a new window")}`}
+        tabIndex={0}
+      />
+    

+  );
+};
+
+const WithLoveByConduction: React.FC = () => {
+  const { t } = useTranslation();
+
+  return (
+    

+      
+        
+      {" "}
+      with{" "}
+      
+        
+      {" "}
+      by{" "}
+      
+         Conduction.
+      
+    

+  );
+};
diff --git a/pwa/src/templates/templateParts/header/HeaderTemplate.module.css b/pwa/src/templates/templateParts/header/HeaderTemplate.module.css
index a15a4f11..bf51b9f3 100644
--- a/pwa/src/templates/templateParts/header/HeaderTemplate.module.css
+++ b/pwa/src/templates/templateParts/header/HeaderTemplate.module.css
@@ -5,6 +5,14 @@
   padding-inline-start: var(--utrecht-page-margin-inline-start);
   padding-inline-end: var(--utrecht-page-margin-inline-end);
   display: flex;
+}
+.skipLinkContainer:focus-within {
+  margin-inline-end: 10%;
+}
+
+.navContainer {
+  flex: 1;
+  display: flex;
   justify-content: space-between;
 }
 
diff --git a/pwa/src/templates/templateParts/header/HeaderTemplate.tsx b/pwa/src/templates/templateParts/header/HeaderTemplate.tsx
index 15a69675..6e649819 100644
--- a/pwa/src/templates/templateParts/header/HeaderTemplate.tsx
+++ b/pwa/src/templates/templateParts/header/HeaderTemplate.tsx
@@ -1,9 +1,10 @@
 import * as React from "react";
 import * as styles from "./HeaderTemplate.module.css";
 import clsx from "clsx";
-import { PageHeader } from "@utrecht/component-library-react/dist/css-module";
+import { PageHeader, SkipLink } from "@utrecht/component-library-react/dist/css-module";
 import { navigate } from "gatsby";
 import { useTranslation } from "react-i18next";
+import { useGatsbyContext } from "../../../context/gatsby";
 
 interface HeaderTemplateProps {
   layoutClassName: string;
@@ -11,32 +12,48 @@ interface HeaderTemplateProps {
 
 export const HeaderTemplate: React.FC = ({ layoutClassName }) => {
   const { t, i18n } = useTranslation();
+  const { gatsbyContext } = useGatsbyContext();
 
   return (
     
       

-        

-           navigate("/")}
-            src={process.env.GATSBY_HEADER_LOGO_URL}
-            alt={t("Navbar-Logo")}
-          />
+        

+          
+            {t("Skip to filters")}
+          
+          
+            {t("Skip to main content")}
+          
         

-        

-           i18n.changeLanguage("nl")}
-          >
-            NL
-          {" "}
-          /{" "}
-           i18n.changeLanguage("en")}
-          >
-            EN
-          
+        

+          

+             navigate("/")}
+              src={process.env.GATSBY_HEADER_LOGO_URL}
+              alt={t("Navbar-Logo")}
+              tabIndex={0}
+            />
+          

+          

+             i18n.changeLanguage("nl")}
+              tabIndex={0}
+              aria-label="Vertaal pagina naar het Nederlands"
+            >
+              NL
+            {" "}
+            /{" "}
+             i18n.changeLanguage("en")}
+              tabIndex={0}
+              aria-label="Translate page to English"
+            >
+              EN
+            
+          

         

       

     
diff --git a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.module.css b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.module.css
index bb82a942..11a90740 100644
--- a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.module.css
+++ b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.module.css
@@ -1,5 +1,6 @@
 .table {
   background-color: var(--utrecht-table-background-color);
+  border-collapse: var(--utrecht-table-border-collapse) !important;
 }
 
 .tableHeader > * {
diff --git a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx
index 85272347..990c0164 100644
--- a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx
+++ b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx
@@ -30,7 +30,15 @@ export const TableResultsTemplate: React.FC = ({ requ
       
       
         {requests.map((request) => (
-           navigate(request.id)}>
+           navigate(request.id)}
+            tabIndex={0}
+            aria-label={`${request.Titel},  ${
+              request.Publicatiedatum ? translateDate(i18n.language, request.Publicatiedatum) : t("N/A")
+            }, ${request.Samenvatting}`}
+          >
             {request.Titel ?? t("No subject available")}
             
               {request.Publicatiedatum
diff --git a/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx b/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx
index f8bdc2a4..3b618a5d 100644
--- a/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx
+++ b/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.tsx
@@ -39,14 +39,16 @@ export const WOOItemDetailTemplate: React.FC = ({ wo
     
       
         

-           navigate("/")}>
+           navigate("/")} tabIndex={0}>
              {t("Back to homepage")}
           
         

 
         {getItems.isSuccess && (
           <>
-            {getItems.data.Titel !== "" ? getItems.data.Titel : t("No title available")}
+            
+              {getItems.data.Titel !== "" ? getItems.data.Titel : t("No title available")}
+            
 
             
@@ -97,7 +99,7 @@ export const WOOItemDetailTemplate: React.FC = ({ wo
 
                 {getItems.data.Ontvangstdatum && (
                   
-                    {t("Received date")}
+                    {t("Registration date")}
 
                     {translateDate(i18n.language, getItems.data.Ontvangstdatum) ?? "-"}
                   
@@ -123,45 +125,43 @@ export const WOOItemDetailTemplate: React.FC = ({ wo
                   
                 )}
 
-                {getItems.data.URL_informatieverzoek && (
+                {getItems.data?.embedded?.informatieverzoek && (
                   
                     {t("Information request")}
                     
-                      
-                        {getBijlageTitleFromURL(
-                          getItems.data.URL_informatieverzoek,
-                          getItems.data?.embedded?.Bijlagen,
-                        ) ?? getPDFName(getItems.data.URL_informatieverzoek)}
+                      
+                        {getItems.data?.embedded?.informatieverzoek?.Titel_Bijlage}
                       
                     
                   
                 )}
 
-                {(getItems.data.Besluit || getItems.data.URL_besluit) && (
+                {(getItems.data.Besluit || (getItems.data?.embedded?.besluit ?? getItems.data.URL_besluit)) && (
                   
                     {t("Decision")}
                     
                       {getItems.data.Besluit}
-                      {getItems.data.Besluit && getItems.data.URL_besluit && ","}{" "}
-                      {getItems.data.URL_besluit && (
-                        
-                          {getBijlageTitleFromURL(getItems.data.URL_besluit, getItems.data?.embedded?.Bijlagen) ??
-                            getPDFName(getItems.data.URL_besluit)}
+                      {getItems.data.Besluit &&
+                        (getItems.data?.embedded?.besluit ?? getItems.data.URL_besluit) &&
+                        ","}{" "}
+                      {(getItems.data?.embedded?.besluit ?? getItems.data.URL_besluit) && (
+                        
+                          {getItems.data?.embedded?.besluit?.Titel_Bijlage ?? getPDFName(getItems.data.URL_besluit)}
                         
                       )}
                     
                   
                 )}
 
-                {getItems.data.URL_inventarisatielijst && (
+                {getItems.data?.embedded?.inventarisatielijst && (
                   
                     {t("Inventory list")}
                     
-                      
-                        {getBijlageTitleFromURL(
-                          getItems.data.URL_inventarisatielijst,
-                          getItems.data?.embedded?.Bijlagen,
-                        ) ?? getPDFName(getItems.data.URL_inventarisatielijst)}
+                      
+                        {getItems.data?.embedded?.inventarisatielijst?.Titel_Bijlage}
                       
                     
                   
diff --git a/pwa/src/translations/en.ts b/pwa/src/translations/en.ts
index dbca55b2..1570bfbd 100644
--- a/pwa/src/translations/en.ts
+++ b/pwa/src/translations/en.ts
@@ -11,6 +11,10 @@ export const en = {
   Attachments: "Attachments",
   Decision: "Decision",
   Subject: "Subject",
+  Address: "Address",
+  Page: "Page",
+  Jumbotron: "Jumbotron",
+  "Jumbotron card": "Jumbotron card",
   "N/A": "N/A",
   "Details page": "Details page",
   "Back to homepage": "Back to homepage",
@@ -20,10 +24,10 @@ export const en = {
   "Inventory list": "Inventory list",
   "Exceeding the term": "Exceeding the term",
   "Publication date": "Publication date",
-  "Received date": "Received date",
+  "Registration date": "Registration date",
   "Decision date": "Decision date",
-  "Show cards": "Show cards",
-  "Show table": "Show table",
+  "Cards view": "Cards view",
+  "Table view": "Table view",
   "Link to github repository": "Link to github repository",
   "Link to github contributors page": "Link to github contributors page",
   "Link to conduction website": "Link to conduction website",
@@ -32,4 +36,19 @@ export const en = {
   "No publication date available": "No publication date available",
   "No summary available": "No summary available",
   "Navbar-Logo": "Navbar-Logo",
+  "Opens a new window": "Opens a new window",
+  "Translate page to Dutch": "Translate page to Dutch",
+  "Translate page to English": "Translate page to English",
+  "Skip to filters": "Skip to filters",
+  "Skip to main content": "Skip to main content",
+  "Skip to footer content": "Skip to footer content",
+  "Phone number": "Phone number",
+  "Email address": "Email address",
+  "Select year": "Select year",
+  "Select category": "Select category",
+  "Previous page": "Previous page",
+  "Next page": "Next page",
+  "Can open a new window": "Can open a new window",
+  "No results found": "No results found",
+  "Enter search query": "Enter search query",
 };
diff --git a/pwa/src/translations/nl.ts b/pwa/src/translations/nl.ts
index d8c67dcf..49eae986 100644
--- a/pwa/src/translations/nl.ts
+++ b/pwa/src/translations/nl.ts
@@ -11,6 +11,10 @@ export const nl = {
   Attachments: "Bijlagen",
   Decision: "Besluit",
   Subject: "Onderwerp",
+  Address: "Adres",
+  Page: "Pagina",
+  Jumbotron: "Jumbotron",
+  "Jumbotron card": "Jumbotron tegel",
   "N/A": "N.v.t",
   "Details page": "Detailpagina",
   "Back to homepage": "Terug naar home",
@@ -20,10 +24,10 @@ export const nl = {
   "Inventory list": "Inventarisatielijst",
   "Exceeding the term": "Termijnoverschrijding",
   "Publication date": "Publicatiedatum",
-  "Received date": "Ontvangstdatum",
+  "Registration date": "Registratiedatum",
   "Decision date": "Besluitdatum",
-  "Show cards": "Toon tegels",
-  "Show table": "Toon tabel",
+  "Cards view": "Tegelweergave",
+  "Table view": "Tabelweergave",
   "Link to github repository": "Link naar github repository",
   "Link to github contributors page": "Link naar github bijdragers pagina",
   "Link to conduction website": "Link naar conduction website",
@@ -31,5 +35,20 @@ export const nl = {
   "No subject available": "Geen onderwerp beschikbaar",
   "No publication date available": "Geen publicatiedatum beschikbaar",
   "No summary available": "Geen samenvatting beschikbaar",
-  "Navbar-Logo": "Navigatie-Logo"
+  "Navbar-Logo": "Navigatie-Logo",
+  "Opens a new window": "Opent een nieuw venster",
+  "Translate page to Dutch": "Vertaal pagina naar het Nederlands",
+  "Translate page to English": "Vertaal pagina naar het Engels",
+  "Skip to filters": "Ga naar de filters",
+  "Skip to main content": "Ga naar de hoofdinhoud",
+  "Skip to footer content": "Ga naar de voettekst",
+  "Phone number": "Telefoonnummer",
+  "Email address": "E-mailadres",
+  "Select year": "Selecteer jaar",
+  "Select category": "Selecteer categorie",
+  "Previous page": "Vorige pagina",
+  "Next page": "Volgende pagina",
+  "Can open a new window": "Kan een nieuw venster openen",
+  "No results found": "Geen resultaten gevonden",
+  "Enter search query": "Voer zoekopdracht in",
 };
diff --git a/pwa/static/.env.development b/pwa/static/.env.development
index 73ccde57..6032211b 100644
--- a/pwa/static/.env.development
+++ b/pwa/static/.env.development
@@ -9,15 +9,16 @@ GATSBY_NL_DESIGN_THEME_CLASSNAME=conduction-theme
 
 # Header
 GATSBY_FAVICON_URL="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICAgICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgICAgd2lkdGg9IjcxLjAwMDAwMHB0IiBoZWlnaHQ9IjcwLjAwMDAwMHB0IiB2aWV3Qm94PSIwIDAgNzEuMDAwMDAwIDcwLjAwMDAwMCIKICAgICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZWV0Ij4KCiAgICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLjAwMDAwMCw3MC4wMDAwMDApIHNjYWxlKDAuMTAwMDAwLC0wLjEwMDAwMCkiCiAgICAgICBmaWxsPSIjNDM3NkZDIiBzdHJva2U9Im5vbmUiPgogICAgICAgIDxwYXRoIGQ9Ik0yMTggNTkyIGwtMTM3IC03NyAwIC0xNjUgMCAtMTY1IDEzMSAtNzQgYzcyIC00MSAxMzcgLTc0IDE0MyAtNzQgNgowIDcwIDMzIDE0MyA3NCBsMTMxIDc0IDEgMTY1IDAgMTY1IC02OCAzNyBjLTM3IDIxIC05OSA1NiAtMTM3IDc3IGwtNzEgNDAKLTEzNiAtNzd6IG0yOTUgLTg1IGw1NyAtMzIgMCAtMTI1IDAgLTEyNSAtMTA2IC02MCBjLTU4IC0zMyAtMTA4IC02MCAtMTExCi01OSAtMyAwIC01MiAyNyAtMTA5IDYwIGwtMTAzIDU5IDAgMTI1IDAgMTI1IDEwNyA2MSAxMDcgNjIgNTAgLTI5IGMyNyAtMTYKNzYgLTQ0IDEwOCAtNjJ6Ii8+CiAgICAgICAgPHBhdGggZD0iTTI3OCA0NzIgbC02OCAtMzcgMCAtODUgMCAtODUgNzMgLTM5IDczIC0zOSA2MiAzNCBjMzQgMTggNjIgMzcgNjIKNDEgMCA0IC0xNCAxNSAtMzEgMjMgLTI4IDE1IC0zMyAxNSAtNTQgMSAtMzEgLTIwIC00NiAtMjAgLTg0IDIgLTI3IDE1IC0zMQoyMiAtMzEgNjIgMCA0MCA0IDQ3IDMxIDYzIDM4IDIxIDUzIDIxIDg0IDEgMjEgLTE0IDI2IC0xNCA1NCAxIDE3IDggMzEgMTkgMzEKMjMgMCA4IC0xMTMgNzIgLTEyNiA3MiAtNSAwIC0zOSAtMTcgLTc2IC0zOHoiLz4KICAgIDwvZz4KPC9zdmc+Cg=="
-GATSBY_HEADER_LOGO_URL="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='155' height='88' viewBox='0 0 155 88' class='logo__svg' role='img' aria-hidden='true'%3E%3Ctitle id='site-logo-title'%3EGemeente Epe%3C/title%3E%3Cdesc id='site-logo-desc'%3ELogo dat naar de hoofdpagina leidt%3C/desc%3E%3Cpath fill='%23231f20' class='logo__svg--letters-path' d='M7.7,74.621h5.957v8.144a16.255,16.255,0,0,1-5.594.8C4.916,83.57,0,82.137,0,75.642c0-3.715,2.325-7.754,8.767-7.754A16.751,16.751,0,0,1,13.2,68.5l-.242,2.975a9.753,9.753,0,0,0-3.875-.847c-4.19,0-5.013,3.453-5.013,5.169,0,2.824,1.453,5.038,4.48,5.038a3.46,3.46,0,0,0,1.381-.217V77.184H7.7ZM19.69,76.684c0-.607,0-2.781,1.962-2.781,1.574,0,1.985,1.347,1.985,2.781Zm7.435,1.043c0-5.909-4.335-5.909-5.473-5.909a5.478,5.478,0,0,0-5.6,5.8c0,3.454,1.962,5.865,6.394,5.865a13.084,13.084,0,0,0,4-.653l-.073-2.583a8.557,8.557,0,0,1-3.56.89c-2.156,0-3.124-1.238-3.124-2.585h7.435Zm15.96-1.389c0-1.3-.605-1.782-1.453-1.782a1.445,1.445,0,0,0-1.574,1.586v7.167H36.231V76.338c0-1.434-.7-1.782-1.332-1.782-1.259,0-1.7.977-1.7,2.411v6.342H29.377V74.36a19.59,19.59,0,0,0-.1-2.368h3.488c.048.5.1,1.13.1,1.891h.049a3.461,3.461,0,0,1,3.56-2.065,3.212,3.212,0,0,1,3.27,1.891,3.434,3.434,0,0,1,3.463-1.891c2.786,0,3.706,1.826,3.706,4.085v7.406H43.085Zm9.809.346c0-.607,0-2.781,1.961-2.781,1.575,0,1.987,1.347,1.987,2.781Zm7.435,1.043c0-5.909-4.335-5.909-5.474-5.909a5.478,5.478,0,0,0-5.594,5.8c0,3.454,1.962,5.865,6.394,5.865a13.084,13.084,0,0,0,4-.653l-.073-2.583a8.553,8.553,0,0,1-3.56.89c-2.155,0-3.124-1.238-3.124-2.585h7.435Zm5.57-1.043c0-.607,0-2.781,1.962-2.781,1.574,0,1.986,1.347,1.986,2.781Zm7.435,1.043c0-5.909-4.335-5.909-5.473-5.909a5.478,5.478,0,0,0-5.6,5.8c0,3.454,1.962,5.865,6.394,5.865a13.079,13.079,0,0,0,4-.653l-.072-2.583a8.561,8.561,0,0,1-3.561.89c-2.155,0-3.124-1.238-3.124-2.585h7.435Zm9.228-1.389c0-1.412-.7-1.782-1.478-1.782-1.235,0-1.67.955-1.67,2.411v6.342H75.587V74.36a19.8,19.8,0,0,0-.1-2.368h3.487c.049.5.1,1.13.1,1.891h.048a3.463,3.463,0,0,1,3.561-2.065c2.785,0,3.7,1.826,3.7,4.085v7.406H82.562Zm5.5-4.346h2.18V69.669l3.73-1.064v3.387h2.47V74.4h-2.47v5.19c0,1.108.557,1.412,1.283,1.412a3.133,3.133,0,0,0,1.261-.239v2.411a10.072,10.072,0,0,1-2.665.305c-1.986,0-3.706-.869-3.706-3.345V74.4H88.059Zm13.733,4.692c0-.607,0-2.781,1.961-2.781,1.575,0,1.986,1.347,1.986,2.781Zm7.434,1.043c0-5.909-4.335-5.909-5.473-5.909a5.479,5.479,0,0,0-5.595,5.8c0,3.454,1.961,5.865,6.395,5.865a13.089,13.089,0,0,0,4-.653l-.074-2.583a8.544,8.544,0,0,1-3.559.89c-2.156,0-3.124-1.238-3.124-2.585h7.434Zm8.815-9.578H127.8V70.8h-5.933v3.39h5.642v2.648h-5.642V80.66h6.223v2.649H118.041Zm19.885,9.491c0,1.8-.146,3.5-1.841,3.5-1.551,0-1.913-1.694-1.913-3.5,0-1.3.339-3.345,1.913-3.345C137.828,74.3,137.926,76.467,137.926,77.64ZM130.345,88h3.827V81.637h.048a3.278,3.278,0,0,0,3.245,1.846c3.173,0,4.432-2.52,4.432-5.561,0-3.6-1.6-6.1-4.432-6.1a3.607,3.607,0,0,0-3.439,1.978h-.048a15.517,15.517,0,0,0-.1-1.8h-3.632a23.955,23.955,0,0,1,.1,2.542Zm17.22-11.316c0-.607,0-2.781,1.962-2.781,1.574,0,1.986,1.347,1.986,2.781ZM155,77.727c0-5.909-4.335-5.909-5.473-5.909a5.479,5.479,0,0,0-5.6,5.8c0,3.454,1.963,5.865,6.394,5.865a13.091,13.091,0,0,0,4-.653l-.072-2.583a8.569,8.569,0,0,1-3.561.89c-2.156,0-3.124-1.238-3.124-2.585H155Z'%3E%3C/path%3E%3Cpath fill='%2300539f' class='logo__svg--deer-path' d='M102.234,38.54l.11-.063c-.038-7.534-2.5-14.87-6.094-21.718v-.248l8.5-2.678-.6-2.989-7.8-.437A8.7,8.7,0,0,0,99.4,7.557l-1.809-1c-1.073,1.529-3.054,3.053-6.7,3.053-9.735,0-15.672-7.5-17.153-9.614L71.754.783c.956,1.481,5.885,8.486,14.6,10.413l-6.025,3.031,6,.436L87.5,25.622l-39.711-.006.054,2.164c1.447-.083,3.011-.042,3.975,1a4.948,4.948,0,0,1,.5,5.167,37.313,37.313,0,0,1-2.967,5.109c-9.037,2-16.871,5-22.686,8.82l2.466,3.062c5.771-3.791,13.73-6.721,22.965-8.591l.005,0v0a126.7,126.7,0,0,1,26.561-2.336c17.5.231,34.074,3.822,44.985,9.683l2.119-3.266A83.593,83.593,0,0,0,102.234,38.54Z'%3E%3C/path%3E%3Cpath fill='%23d5a10f' class='logo__svg--emblem-path' d='M115.353,41.321c.036.224.068.458.1.684-.8-.273-1.615-.532-2.44-.787.3-.845.732-1.635,1.208-1.58C114.809,39.706,115.217,40.479,115.353,41.321Zm-82.624-.978c1.1,1.09,2.674,2.585,2.982,2.873q1.681-.684,3.475-1.308a12.483,12.483,0,0,1-.321-2.475,19.928,19.928,0,0,1,.363-3.388.927.927,0,0,0-.272-1.069.535.535,0,0,0-.794.159,19.482,19.482,0,0,0-1.382,2.411s-.136.492-.333.477-.075-.5-.061-.591a16.765,16.765,0,0,1,1.588-4.866c1.284-2.562,1.1-1.971,1.194-2.3s.226-1.046-.485-.849-.694.243-.785.106.121-.349.257-.606a16.566,16.566,0,0,1,3.4-3.684s.757-.591.438-1.015-.68-.152-.906-.122-.363.106-.438-.03.1-.576.544-.849a42.561,42.561,0,0,0,5.244-3.9c.862-1,1.33-1.622.968-2.077s-1.345-.379-2.086.091a24.753,24.753,0,0,0-3.31,2.926,9.567,9.567,0,0,1-1.375,1.379c-.151.061-.378.167-.181-.182s.5-.924.226-1.121-.65-.273-1.33.182a11.369,11.369,0,0,0-3.37,3.986,17.766,17.766,0,0,0-.877,2.744c-.03.137-.332.561-.453.076a7.037,7.037,0,0,1-.181-1.152c-.016-.212-.046-.561-.318-.606a.919.919,0,0,0-.967.5c-.257.47-1.633,3.683-1.149,6.033a23.4,23.4,0,0,0,.877,3.532c.151.364.257.531.106.622a1,1,0,0,1-.877-.318c-.227-.258-.71-.9-.8-1.032s-.439-.454-.756-.227a2,2,0,0,0-.242,1.85A12.089,12.089,0,0,0,32.729,40.343ZM114.5,23.213c.44.273.62.712.545.849s-.212.06-.439.03-.588-.3-.906.122.438,1.015.438,1.015a16.609,16.609,0,0,1,3.4,3.684c.136.257.347.47.256.606s-.075.091-.785-.106-.576.515-.484.849-.092-.258,1.194,2.3a16.744,16.744,0,0,1,1.587,4.866c.014.091.136.576-.061.591s-.332-.477-.332-.477a19.61,19.61,0,0,0-1.382-2.411.535.535,0,0,0-.794-.159.928.928,0,0,0-.273,1.069,20.012,20.012,0,0,1,.364,3.388,14.049,14.049,0,0,1-.418,2.912q1.629.579,3.176,1.206c.134-.115.273-.222.34-.283.166-.152,1.873-1.773,3.037-2.925a12.07,12.07,0,0,0,2.388-3.82,2,2,0,0,0-.241-1.85c-.318-.227-.665.091-.756.227s-.574.774-.8,1.032a1,1,0,0,1-.878.318c-.15-.091-.044-.258.107-.622a23.621,23.621,0,0,0,.876-3.532c.485-2.35-.892-5.563-1.149-6.033a.919.919,0,0,0-.967-.5c-.272.045-.3.394-.316.606a7.1,7.1,0,0,1-.183,1.152c-.12.485-.423.061-.452-.076a17.581,17.581,0,0,0-.878-2.744,11.368,11.368,0,0,0-3.369-3.986c-.681-.455-1.058-.38-1.33-.182s.03.773.225,1.121-.03.243-.18.182a9.567,9.567,0,0,1-1.375-1.379,24.815,24.815,0,0,0-3.31-2.926c-.742-.47-1.723-.545-2.086-.091s.1,1.077.967,2.077A42.561,42.561,0,0,0,114.5,23.213Zm5.79,20.62q1.323.553,2.579,1.144a20.9,20.9,0,0,0,2.438-2.3c.3-.378.832-1.485.513-1.819s-1.48.622-2.388,1.334A15.2,15.2,0,0,1,120.288,43.833Zm-2.025,5.045c-.274.076-1.332.348-1.981.47s-3.128.273-3.416.287-.287.076-.3-.167.166-.211.166-.211.982-.274,2.508-.713a34.4,34.4,0,0,0,3.383-1.219q-3.251-1.358-6.921-2.491a10.7,10.7,0,0,1-.791,1.534,7.909,7.909,0,0,1-3.037,2.365c-.636.228-.25-.341-.25-.341s.18-.227.522-.682a10.755,10.755,0,0,0,1.019-2.387,1.742,1.742,0,0,0-.107-1.257c-.209-.057-.425-.11-.635-.166a1.173,1.173,0,0,0-.39.444,20.853,20.853,0,0,1-9.3,6.458c-6.849,2.465-14.532,3.2-20.964,3.267-6.4-.073-14.02-.821-20.814-3.267a20.848,20.848,0,0,1-9.3-6.458s-.362-.749-.861-.432-.317,1.115-.272,1.411a10.716,10.716,0,0,0,1.02,2.387c.34.455.522.682.522.682s.386.569-.25.341a7.9,7.9,0,0,1-3.038-2.365,12.548,12.548,0,0,1-.971-1.958,69.708,69.708,0,0,0-7.355,2.653,35.7,35.7,0,0,0,4,1.481c1.526.439,2.509.713,2.509.713s.181-.031.165.211-.014.182-.3.167-2.766-.167-3.415-.287-1.708-.394-1.981-.47-.694-.167-.846.273.968,1.136,1.224,1.273A28.168,28.168,0,0,0,44.73,52.8a92,92,0,0,0,9.944,1.7s.529,0,.529.226-.3.213-.529.228-2.145.075-2.539.061-2.765-.212-3.052-.258-1.18-.061-1.134.228.257.7,1.013.864,6.544,1.106,7.737,1.182,6.485.318,6.772.318.876.379.03.41-3.2.091-3.2.091-.439.014-.439.242.258.3.514.334,3.764.546,3.764.546,6.59.818,7.375.894c.577.055,3.637.235,6.175.3,0,0,.606.028.917.018.087,0,.261-.01.261-.01,2.328-.089,4.8-.259,5.316-.308.786-.076,7.376-.894,7.376-.894s3.507-.516,3.763-.546.515-.107.515-.334-.439-.242-.439-.242-2.358-.061-3.2-.091-.257-.41.03-.41,5.577-.242,6.772-.318,6.981-1.016,7.737-1.182.967-.577,1.012-.864-.846-.273-1.134-.228-2.658.243-3.053.258-2.311-.046-2.538-.061-.529,0-.529-.228.529-.226.529-.226a91.957,91.957,0,0,0,9.944-1.7,28.13,28.13,0,0,0,6.923-2.379c.257-.137,1.375-.834,1.224-1.273S118.534,48.8,118.263,48.878ZM32.438,44.657q1.155-.55,2.376-1.067a13.562,13.562,0,0,1-2.553-1.4c-.907-.712-2.071-1.667-2.388-1.334s.212,1.441.514,1.819A20.028,20.028,0,0,0,32.438,44.657Zm9.034-5.019c-.589.068-1,.841-1.133,1.683-.01.067-.021.137-.031.206q1.092-.363,2.22-.7C42.24,40.146,41.872,39.592,41.472,39.638Z'%3E%3C/path%3E%3C/svg%3E"
+GATSBY_HEADER_LOGO_URL=https://conduction.nl/wp-content/uploads/2021/07/cropped-conductionlogo-1.png
 
 #Jumbotron
 GATSBY_ORGANISATION_NAME=Conduction
 GATSBY_JUMBOTRON_IMAGE_URL=https://www.conduction.nl/wp-content/uploads/2021/07/cropped-Conduction_HOME_0000_afb1-1.png
 
 # Footer
-GATSBY_FOOTER_LOGO_URL="false"
+GATSBY_FOOTER_LOGO_URL="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICAgICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgICAgd2lkdGg9IjcxLjAwMDAwMHB0IiBoZWlnaHQ9IjcwLjAwMDAwMHB0IiB2aWV3Qm94PSIwIDAgNzEuMDAwMDAwIDcwLjAwMDAwMCIKICAgICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZWV0Ij4KCiAgICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLjAwMDAwMCw3MC4wMDAwMDApIHNjYWxlKDAuMTAwMDAwLC0wLjEwMDAwMCkiCiAgICAgICBmaWxsPSIjNDM3NkZDIiBzdHJva2U9Im5vbmUiPgogICAgICAgIDxwYXRoIGQ9Ik0yMTggNTkyIGwtMTM3IC03NyAwIC0xNjUgMCAtMTY1IDEzMSAtNzQgYzcyIC00MSAxMzcgLTc0IDE0MyAtNzQgNgowIDcwIDMzIDE0MyA3NCBsMTMxIDc0IDEgMTY1IDAgMTY1IC02OCAzNyBjLTM3IDIxIC05OSA1NiAtMTM3IDc3IGwtNzEgNDAKLTEzNiAtNzd6IG0yOTUgLTg1IGw1NyAtMzIgMCAtMTI1IDAgLTEyNSAtMTA2IC02MCBjLTU4IC0zMyAtMTA4IC02MCAtMTExCi01OSAtMyAwIC01MiAyNyAtMTA5IDYwIGwtMTAzIDU5IDAgMTI1IDAgMTI1IDEwNyA2MSAxMDcgNjIgNTAgLTI5IGMyNyAtMTYKNzYgLTQ0IDEwOCAtNjJ6Ii8+CiAgICAgICAgPHBhdGggZD0iTTI3OCA0NzIgbC02OCAtMzcgMCAtODUgMCAtODUgNzMgLTM5IDczIC0zOSA2MiAzNCBjMzQgMTggNjIgMzcgNjIKNDEgMCA0IC0xNCAxNSAtMzEgMjMgLTI4IDE1IC0zMyAxNSAtNTQgMSAtMzEgLTIwIC00NiAtMjAgLTg0IDIgLTI3IDE1IC0zMQoyMiAtMzEgNjIgMCA0MCA0IDQ3IDMxIDYzIDM4IDIxIDUzIDIxIDg0IDEgMjEgLTE0IDI2IC0xNCA1NCAxIDE3IDggMzEgMTkgMzEKMjMgMCA4IC0xMTMgNzIgLTEyNiA3MiAtNSAwIC0zOSAtMTcgLTc2IC0zOHoiLz4KICAgIDwvZz4KPC9zdmc+Cg=="
 GATSBY_FOOTER_LOGO_HREF=https://conduction.nl/
+GATSBY_FOOTER_CONTENT=[{"title":"Contact","items":[{"label":"Phone number","value":"+31 (0)85 3036840","link":"tel:+31 (0)85 3036840"},{"label":"Email address","value":"info@conduction.nl","link":"mailto:info@conduction.nl"},{"label":"Address","value":"Lauriergracht 14h"}]}]
 
 #OIDN
 GATSBY_OIDN_NUMBER=""