diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d619f5c2..0e51307b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,52 +10,22 @@ build:
   stage: build
   image:
     name: docker
-  variables:
-    BRANDING: villasweb
-    DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
   script:
-  - docker build --build-arg REACT_APP_BRAND=${BRANDING} --tag ${DOCKER_IMAGE}:${DOCKER_TAG} .
+  - docker build --build-arg REACT_APP_BRAND=${BRANDING} --tag ${DOCKER_IMAGE}:${CI_COMMIT_BRANCH} .
   tags:
   - docker
 
-build.slew:
-  variables:
-    BRANDING: slew
-    DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
-  extends: build
-
-build.opalrt:
-  variables:
-    BRANDING: opalrt
-    DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
-  extends: build
-
 deploy:
   stage: deploy
-  variables:
-    BRANDING: villasweb
-    DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
   before_script:
   - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
   script:
-  - docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
+  - docker push ${DOCKER_IMAGE}:${CI_COMMIT_BRANCH}
   tags:
   - docker
   dependencies:
   - build
 
-deploy.slew:
-  extends: deploy
-  variables:
-    BRANDING: slew
-    DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
-
-deploy.opalrt:
-  extends: deploy
-  variables:
-    BRANDING: opalrt
-    DOCKER_TAG: ${CI_COMMIT_BRANCH}-${BRANDING}
-
 deploy.latest:
   extends: deploy
   variables:
diff --git a/Dockerfile b/Dockerfile
index 8afedf20..1cd11572 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,16 @@ ARG REACT_APP_BRAND
 COPY . /usr/src/app
 # Production build, CI=false prevents warnings from being treated as errors
 RUN CI=false npm run build
+WORKDIR /usr/src/app/build
+
+RUN sed -i 's/<\/body>/<script src="\/static\/js\/injector.js"><\/script><link href="\/static\/css\/style.css" rel="stylesheet"><\/body>/g' index.html
+RUN mkdir -p branding/img
+ADD ./src/branding/default /usr/src/app/build/branding
+ADD ./src/branding/img /usr/src/app/build/branding/img
+ADD ./src/branding/injector.js /usr/src/app/build/static/js
+ADD ./src/branding/style.css /usr/src/app/build/static/css
 
 FROM nginx
 
 COPY --from=builder /usr/src/app/build /usr/share/nginx/html
+#EXPECT BRANDING VOLUME TO /usr/share/nginx/html/branding
diff --git a/compose.yaml b/compose.yaml
new file mode 100644
index 00000000..2fc5858b
--- /dev/null
+++ b/compose.yaml
@@ -0,0 +1,9 @@
+services:
+  web:
+    build:
+      context: .
+    volumes:
+      - ./brand-mount:/usr/share/nginx/html/branding
+    ports:
+      - 2980:80
+      - 2443:443
\ No newline at end of file
diff --git a/package.json b/package.json
index 7429f334..64ad6003 100644
--- a/package.json
+++ b/package.json
@@ -67,12 +67,12 @@
     "react-scripts": "^4.0.3"
   },
   "scripts": {
-    "start": "react-scripts --openssl-legacy-provider start",
+    "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
   },
-  "proxy": "https://villas.k8s.eonerc.rwth-aachen.de",
+  "proxy": "https://slew.k8s.eonerc.rwth-aachen.de/",
   "browserslist": {
     "production": [
       ">0.2%",
diff --git a/src/app.js b/src/app.js
index 79405053..03ca82af 100644
--- a/src/app.js
+++ b/src/app.js
@@ -15,102 +15,133 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import React from 'react';
-import { DndProvider } from 'react-dnd';
-import { HTML5Backend }from 'react-dnd-html5-backend';
-import NotificationSystem from 'react-notification-system';
-import { Redirect, Route } from 'react-router-dom';
-import jwt from 'jsonwebtoken';
-import NotificationsDataManager from './common/data-managers/notifications-data-manager';
-import Home from './common/home';
-import Header from './common/header';
-import Menu from './common/menu';
-import InfrastructureComponent from './pages/infrastructure/ic';
-import Scenarios from './pages/scenarios/scenarios';
-import APIBrowser from './common/api-browser';
-import Scenario from './pages/scenarios/scenario';
-import Users from './pages/users/users';
-import Dashboard from './pages/dashboards/dashboard';
-import Account from './pages/account/account';
-import './styles/app.css';
-import './styles/login.css';
-import branding from './branding/branding';
-import Logout from './pages/login/logout';
-import Infrastructure from './pages/infrastructure/infrastructure';
-import { useSelector } from 'react-redux';
+import React from "react";
+import { useRef, useEffect } from "react";
+import { DndProvider } from "react-dnd";
+import { HTML5Backend } from "react-dnd-html5-backend";
+import NotificationSystem from "react-notification-system";
+import { Redirect, Route } from "react-router-dom";
+import jwt from "jsonwebtoken";
+import NotificationsDataManager from "./common/data-managers/notifications-data-manager";
+import Home from "./common/home";
+import Header from "./common/header";
+import Menu from "./common/menu";
+import InfrastructureComponent from "./pages/infrastructure/ic";
+import Scenarios from "./pages/scenarios/scenarios";
+import APIBrowser from "./common/api-browser";
+import Scenario from "./pages/scenarios/scenario";
+import Users from "./pages/users/users";
+import Dashboard from "./pages/dashboards/dashboard.jsx";
+import Account from "./pages/account/account";
+import "./styles/app.css";
+import "./styles/login.css";
+import Logout from "./pages/login/logout";
+import Infrastructure from "./pages/infrastructure/infrastructure";
+import Usergroup from "./pages/usergroups/usergroup";
+import { useSelector } from "react-redux";
+import DashboardErrorBoundary from "./pages/dashboards/dashboard-error-boundry";
+import { villasweb_footer } from "./branding/functions.js";
 
 const App = () => {
-  
   const isTokenExpired = (token) => {
     let decodedToken = jwt.decode(token);
     let timeNow = (new Date().getTime() + 1) / 1000;
     return decodedToken.exp < timeNow;
-  }
+  };
+
+  const notificationSystem = useRef(null);
+
+  useEffect(() => {
+    NotificationsDataManager.setSystem(notificationSystem.current);
+
+    return () => {
+      NotificationsDataManager.setSystem(null);
+    };
+  }, []);
 
   const { isAuthenticated, token, user } = useSelector((state) => state.auth);
 
   if (!isAuthenticated || isTokenExpired(token)) {
     console.log("APP redirecting to logout/login");
-    return (<Redirect to="/logout" />);
+    return <Redirect to="/logout" />;
   } else {
 
     console.log("APP rendering app");
-    const pages = branding.values.pages;
 
-    return (<DndProvider backend={HTML5Backend} >
-      <div className="app">
-        <NotificationSystem />
-        <Header />
+    return (
+      <DndProvider backend={HTML5Backend}>
+        <div className="app">
+          <NotificationSystem ref={notificationSystem} />
+          <Header />
 
-        <div className='app-body app-body-spacing'>
-          <Menu currentRole={user.role} />
+          <div className="app-body app-body-spacing">
+            <Menu currentRole={user.role} />
 
-          <div className='app-content app-content-margin-left'>
-            <Route exact path="/" component={Home} />
-            { pages.home ? <Route path="/home" component={Home} /> : '' }
-            { pages.scenarios ? <>
-              <Route exact path="/scenarios">
-                <Scenarios />
-              </Route>
-              <Route exact path="/logout">
-                <Logout />
-              </Route>
-              <Route path="/scenarios/:scenario">
-                <Scenario />
-              </Route>
-              <Route path="/dashboards/:dashboard">
-                <Dashboard />
-              </Route>
-              <Route path="/dashboards-new/:dashboard">
-                <Dashboard />
-              </Route>
-              </>
-            : '' }
-            { user.role === "Admin" || pages.infrastructure ? <>
-              <Route exact path="/infrastructure">
-                <Infrastructure />
-              </Route>
-              <Route path="/infrastructure/:ic">
-                <InfrastructureComponent />
-              </Route>
-              </>
-            : '' }
-            { pages.account ? <Route path="/account"><Account /></Route> : '' }
-            { user.role === "Admin" ?
-              <Route path="/users">
-                <Users />
-              </Route>
-            : '' }
-            { user.role === "Admin" || pages.api ?
-              <Route path="/api" component={APIBrowser} />
-            : '' }
+            <div className="app-content app-content-margin-left">
+              <Route exact path="/" component={Home} />
+              <Route path="/home" component={Home} />
+                <>
+                  <Route exact path="/scenarios">
+                    <Scenarios />
+                  </Route>
+                  <Route exact path="/logout">
+                    <Logout />
+                  </Route>
+                  <Route path="/scenarios/:scenario">
+                    <Scenario />
+                  </Route>
+                  <Route path="/dashboards/:dashboard">
+                    <DashboardErrorBoundary>
+                      <Dashboard />
+                    </DashboardErrorBoundary>
+                  </Route>
+                  <Route path="/dashboards-new/:dashboard">
+                    <Dashboard />
+                  </Route>
+                </>
+              
+              {user.role === "Admin" ? (
+                <>
+                  <Route exact path="/infrastructure">
+                    <Infrastructure />
+                  </Route>
+                  <Route path="/infrastructure/:ic">
+                    <InfrastructureComponent />
+                  </Route>
+                </>
+              ) : (
+                ""
+              )}
+                <Route path="/account">
+                  <Account />
+                </Route>
+              
+              {user.role === "Admin" ? (
+                <>
+                  <Route path="/users">
+                    <Users />
+                  </Route>
+                  <Route path="/usergroup/:usergroup">
+                    <Usergroup />
+                  </Route>
+                </>
+              ) : (
+                ""
+              )}
+              {user.role === "Admin"? (
+                <Route path="/api" component={APIBrowser} />
+              ) : (
+                ""
+              )}
+            </div>
           </div>
+          <footer className="app-footer" id="brand-footer"> 
+            {villasweb_footer()}
+          </footer>
         </div>
-
-        {branding.getFooter()}
-      </div>
-  </DndProvider>)
+      </DndProvider>
+    );
   }
-}
+};
 
 export default App;
diff --git a/src/branding/branding.js b/src/branding/branding.js
deleted file mode 100644
index 2d3bf535..00000000
--- a/src/branding/branding.js
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-import { villasweb_footer, villasweb_home, villasweb_welcome } from './villasweb/villasweb-functions';
-import villasweb_values from './villasweb/villasweb-values';
-
-import { slew_home, slew_welcome } from './slew/slew-functions';
-import slew_values from './slew/slew-values';
-
-import { opalrt_footer, opalrt_home, opalrt_welcome } from './opalrt/opalrt-functions';
-import opalrt_values from './opalrt/opalrt-values';
-
-import { template_welcome, template_home, template_footer } from './template/template-functions';
-import template_values from './template/template-values';
-
-class Branding {
-  constructor(brand) {
-    this.brand = brand;
-
-    this.setValues();
-    this.checkValues();
-    this.applyStyle();
-
-    Branding.branding = this;
-  }
-
-  setValues() {
-    switch (this.brand) {
-      case 'villasweb':
-        this.values = villasweb_values;
-        break;
-      case 'slew':
-        this.values = slew_values;
-        break;
-      case 'opalrt':
-        this.values = opalrt_values;
-        break;
-      case 'template':
-        this.values = template_values;
-        break;
-      default:
-        console.error("Branding '" + this.brand + "' not available, will use 'villasweb' branding");
-        this.brand = 'villasweb';
-        this.values = villasweb_values;
-        break;
-    }
-  }
-
-  getHome(username = '', userid = '', role = '') {
-    var homepage = '';
-    switch (this.brand) {
-      case 'villasweb':
-        homepage = villasweb_home(this.getTitle(), username, userid, role);
-        break;
-      case 'slew':
-        homepage = slew_home();
-        break;
-      case 'opalrt':
-        homepage = opalrt_home(this.getTitle(), username, userid, role);
-        break;
-      case 'template':
-        homepage = template_home();
-        break;
-      default:
-        homepage = villasweb_home(this.getTitle(), username, userid, role);
-        break;
-    }
-    return homepage;
-  }
-
-  getFooter() {
-    var footer = '';
-    switch (this.brand) {
-      case 'template':
-        footer = template_footer();
-        break;
-      case 'opalrt':
-        footer = opalrt_footer();
-        break;
-      default:
-        footer = villasweb_footer();
-        break;
-    }
-    return footer;
-  }
-
-  getWelcome() {
-    var welcome = '';
-    switch (this.brand) {
-      case 'villasweb':
-        welcome = villasweb_welcome();
-        break;
-      case 'slew':
-        welcome = slew_welcome();
-        break;
-      case 'opalrt':
-        welcome = opalrt_welcome();
-        break;
-      case 'template':
-        welcome = template_welcome();
-        break;
-      default:
-        welcome = this.defaultWelcome();
-        break;
-    }
-    return welcome;
-  }
-
-  defaultWelcome() {
-    return (<div><h1>Welcome!</h1><p>This is the welcome page and you are very welcome here.</p></div>);
-  }
-
-  // if icon cannot be found, the default favicon will be used
-  changeHead() {
-    // set title of document
-    let title = this.getTitle();
-    if (this.getSubtitle()) {
-      title += " " + this.getSubtitle();
-    }
-    document.title = title;
-
-    // set document icon
-    if (!this.values.icon) {
-      return;
-    }
-    var oldlink = document.getElementById('dynamic-favicon');
-
-    var link = document.createElement('link');
-    link.id = 'dynamic-favicon';
-    link.rel = 'shortcut icon'
-    link.href = '/' + this.values.icon;
-
-    if (oldlink) {
-      document.head.removeChild(oldlink);
-    }
-    document.head.appendChild(link);
-  }
-
-  checkValues() {
-    if (!this.values.hasOwnProperty('pages')) {
-      let pages = {};
-      pages.home = true;
-      pages.scenarios = true;
-      pages.infrastructure = true;
-      pages.users = true;
-      pages.account = true;
-      pages.api = true;
-
-      this.values.pages = pages;
-    } else {
-      if (!this.values.pages.hasOwnProperty('home')) {
-        this.values.pages['home'] = false;
-      }
-      if (!this.values.pages.hasOwnProperty('scenarios')) {
-        this.values.pages['scenarios'] = false;
-      }
-      if (!this.values.pages.hasOwnProperty('infrastructure')) {
-        this.values.pages['infrastructure'] = false;
-      }
-      if (!this.values.pages.hasOwnProperty('users')) {
-        this.values.pages['users'] = false;
-      }
-      if (!this.values.pages.hasOwnProperty('account')) {
-        this.values.pages['account'] = false;
-      }
-      if (!this.values.pages.hasOwnProperty('api')) {
-        this.values.pages['api'] = false;
-      }
-    }
-  }
-
-  applyStyle() {
-    this.changeHead();
-
-    const rootEl = document.querySelector(':root');
-
-    for (const [key, value] of Object.entries(this.values.style)) {
-      rootEl.style.setProperty('--' + key, value);
-    }
-  }
-
-  getLogo(style) {
-    let image = null;
-
-    try {
-      image = <img style={style} src={require('./' + this.brand + '/img/' + this.values.logo).default} alt={'Logo ' + this.values.title} />
-    } catch (err) {
-      console.error("cannot find './" + this.brand + '/img/' + this.values.logo + "'");
-    }
-
-    return image;
-  }
-
-  getTitle() {
-    return this.values.title ? this.values.title : "No Title!";
-  }
-
-  getSubtitle() {
-    return this.values.subtitle ? this.values.subtitle : null;
-  }
-};
-
-var branding = new Branding(process.env.REACT_APP_BRAND);
-
-export default branding;
diff --git a/src/branding/default/footer.html b/src/branding/default/footer.html
new file mode 100644
index 00000000..fcda4f59
--- /dev/null
+++ b/src/branding/default/footer.html
@@ -0,0 +1,3 @@
+<footer className="app-footer">
+    Copyright &copy; 2025 - <a href="https://www.acs.eonerc.rwth-aachen.de">Institute for Automation of Complex Power Systems</a> - <a href="https://www.rwth-aachen.de">RWTH Aachen University</a>
+  </footer>
\ No newline at end of file
diff --git a/src/branding/default/home.html b/src/branding/default/home.html
new file mode 100644
index 00000000..a377c2d8
--- /dev/null
+++ b/src/branding/default/home.html
@@ -0,0 +1,33 @@
+<div>
+    <img id="home-logo-0" src='/branding/img/villas_web.svg' alt="Logo VILLASweb" />
+    <h3>Credits</h3>
+    <p>VILLASweb is an open source project developed by the <a href="http://acs.eonerc.rwth-aachen.de">Institute for Automation of Complex Power Systems</a> at <a href="https;//www.rwth-aachen.de">RWTH Aachen University</a> with the support of other open-source contributors.</p>
+    <img id="home-logo-1" src='/branding/img/eonerc_rwth.svg' alt="Logo ACS" />
+    <ul>
+      <li><a href="mailto:ikoester@eonerc.rwth-aachen.de">Iris Köster</a></li>
+      <li><a href="mailto:post@steffenvogel.de">Steffen Vogel</a></li>
+    </ul>
+    <h3>Links</h3>
+    <ul>
+      <li><a href="http://fein-aachen.org/projects/villas-framework/">Project page of VILLASframework</a></li>
+      <li><a href="https://villas.fein-aachen.org/docs/web">Documentation</a></li>
+      <li>Source Code of <a href="https://github.com/VILLASframework/web">frontend</a> &amp; <a href="https://github.com/VILLASframework/web-backend">backend</a></li>
+    </ul>
+    <h3>Funding</h3>
+    <p>The development of <a href="http://fein-aachen.org/projects/villas-framework/">VILLASframework</a> projects has received funding from</p>
+    <ul>
+      <li><a href="https://www.acs.eonerc.rwth-aachen.de/cms/E-ON-ERC-ACS/Forschung/Forschungsprojekte/Bildungsprojekte/~mikmu/SLEW-SECOND-LIFE-FOR-ENERGIEWENDE/">SLEW:</a> Second Life for Energiewende, an Exploratory Teaching Space project funded by RWTH Aachen University</li>
+      <li><a href="https://erigrid2.eu/">ERIgrid 2.0:</a> An EU Horizon 2020 research and innovation action project for connecting European Smart Grid Infrastructures (grant agreement No 870620)</li>
+      <li><a href="http://www.uel4-0.de/">Urban Energy Lab 4.0:</a> A project funded by EFRE.NRW (European Regional Development Fund) for the setup of a novel energy research infrastructure.</li>
+      <li><a href="http://www.re-serve.eu">RESERVE:</a> An EU Horizon 2020 research and innovation project (grant agreement No 727481)</li>
+      <li><a href="http://www.jara.org/en/research/energy">JARA-ENERGY:</a> Jülich-Aachen Research Alliance (JARA) is an initiative of RWTH Aachen University and Forschungszentrum Jülich.</li>
+    </ul>
+    <p className="funding-logos">
+      <img src='/branding/img/uel_efre.jpeg'/>
+      <img src='/branding/img/uel.png' />
+      <img src='/branding/img/european_commission.svg' />
+      <img src='/branding/img/reserve.svg'/>
+      <img src='/branding/img/european_commission.svg' />
+      <img src='/branding/img/erigrid2.png'/>
+    </p>
+  </div>
\ No newline at end of file
diff --git a/src/branding/default/values.json b/src/branding/default/values.json
new file mode 100644
index 00000000..84843554
--- /dev/null
+++ b/src/branding/default/values.json
@@ -0,0 +1,19 @@
+{
+  "title":"VILLASweb",
+  "subtitle":"ACS",
+  "logo":"villas_web.svg",
+  "pages":{
+     "home":true,
+     "scenarios":true,
+     "infrastructure":true,
+     "usergroups":true,
+     "account":true,
+     "api":true
+  },
+  "style":{
+     "background":"#6EA2B0",
+     "highlights":"#527984",
+     "main":"#4d4d4d",
+     "secondaryText":"#818181"
+  }
+}
\ No newline at end of file
diff --git a/src/branding/default/welcome.html b/src/branding/default/welcome.html
new file mode 100644
index 00000000..8e308eed
--- /dev/null
+++ b/src/branding/default/welcome.html
@@ -0,0 +1,8 @@
+<div>
+    <h1>Welcome!</h1>
+    <p>VILLASweb is a tool to configure real-time co-simulations and display simulation real-time data.
+      It enables the management and monitoring of simulators, models and simulations.</p>
+    <span class='solid-button'>
+      <input type="button" onclick="location = 'https://villas.fein-aachen.org/doc/web.html';" value="Learn More"/>
+    </span>
+  </div>
\ No newline at end of file
diff --git a/src/branding/villasweb/villasweb-functions.js b/src/branding/functions.js
similarity index 70%
rename from src/branding/villasweb/villasweb-functions.js
rename to src/branding/functions.js
index a40f109c..df5d25e8 100644
--- a/src/branding/villasweb/villasweb-functions.js
+++ b/src/branding/functions.js
@@ -18,6 +18,69 @@ import React from 'react';
 import { Button } from 'react-bootstrap';
 import { NavLink } from 'react-router-dom';
 
+function change_head(values) {
+    // set title of document
+    let title = get_title(values);
+    if (get_subtitle(values)) {
+    title += " " + get_subtitle(values);
+    }
+    document.title = title;
+
+    // set document icon
+    if (!values.icon) {
+        return;
+    }
+    var oldlink = document.getElementById("dynamic-favicon");
+
+    var link = document.createElement("link");
+    link.id = "dynamic-favicon";
+    link.rel = "shortcut icon";
+    link.href = "/branding/img/" + values.icon;
+
+    if (oldlink) {
+        document.head.removeChild(oldlink);
+    }
+    document.head.appendChild(link);
+}
+
+
+function apply_style(values) {
+    change_head(values);
+
+    const rootEl = document.querySelector(":root");
+
+    for (const [key, value] of Object.entries(values.style)) {
+        rootEl.style.setProperty("--" + key, value);
+    }
+}
+
+function get_title(values) {
+    return values.title ? values.title : "VILLASweb";
+}
+
+function get_subtitle(values) {
+    return values.subtitle ? values.subtitle : "RT co-simulation";
+}
+
+const values = {
+    "title":"VILLASweb",
+    "subtitle":"ACS",
+    "logo":"villas_web.svg",
+    "pages":{
+       "home":true,
+       "scenarios":true,
+       "infrastructure":true,
+       "usergroups":true,
+       "account":true,
+       "api":true
+    },
+    "style":{
+       "background":"#6EA2B0",
+       "highlights":"#527984",
+       "main":"#4d4d4d",
+       "secondaryText":"#818181"
+    }
+  }
 
 export function villasweb_welcome() {
   let url = 'https://villas.fein-aachen.org/doc/web.html';
@@ -33,13 +96,10 @@ export function villasweb_welcome() {
 }
 
 export function villasweb_home(title, username, userid, role) {
+  apply_style(values)
   return (
     <div className="home-container">
       <img style={{ height: 120, float: 'right' }} src={require('./img/villas_web.svg').default} alt="Logo VILLASweb" />
-      <h1>Home</h1>
-      <p>
-        Welcome to <b>{title}</b>!
-      </p>
       <p>
         You are logged in as user <b>{username}</b> with <b>ID {userid}</b> and role <b>{role}</b>.
       </p>
@@ -84,3 +144,28 @@ export function villasweb_footer() {
     </footer>
   );
 }
+
+export function villasweb_links(){
+    let links = [];
+
+    if (values.links) {
+        Object.keys(values.links).forEach(key => {
+        links.push(<li key={key}><a href={values.links[key]} title={key}>{key}</a></li>);
+        })
+    }
+
+    return links;
+    
+}
+
+export function villasweb_header(){
+    return <header className="app-header">
+                <h1>{get_title(values)} - {get_subtitle(values)}</h1>
+            </header>
+}
+
+export function villasweb_logo(){
+    return require('./img/'+values.logo).default
+}
+
+//apply_style(values)
\ No newline at end of file
diff --git a/src/branding/opalrt/img/datamodel.png b/src/branding/img/datamodel.png
similarity index 100%
rename from src/branding/opalrt/img/datamodel.png
rename to src/branding/img/datamodel.png
diff --git a/src/branding/opalrt/img/eonerc_rwth.svg b/src/branding/img/eonerc_rwth.svg
similarity index 100%
rename from src/branding/opalrt/img/eonerc_rwth.svg
rename to src/branding/img/eonerc_rwth.svg
diff --git a/src/branding/slew/img/erigrid2.png b/src/branding/img/erigrid2.png
similarity index 100%
rename from src/branding/slew/img/erigrid2.png
rename to src/branding/img/erigrid2.png
diff --git a/src/branding/slew/img/european_commission.svg b/src/branding/img/european_commission.svg
similarity index 100%
rename from src/branding/slew/img/european_commission.svg
rename to src/branding/img/european_commission.svg
diff --git a/src/branding/villasweb/img/jara.svg b/src/branding/img/jara.svg
similarity index 100%
rename from src/branding/villasweb/img/jara.svg
rename to src/branding/img/jara.svg
diff --git a/src/branding/villasweb/img/reserve.svg b/src/branding/img/reserve.svg
similarity index 100%
rename from src/branding/villasweb/img/reserve.svg
rename to src/branding/img/reserve.svg
diff --git a/src/branding/villasweb/img/uel.png b/src/branding/img/uel.png
similarity index 100%
rename from src/branding/villasweb/img/uel.png
rename to src/branding/img/uel.png
diff --git a/src/branding/villasweb/img/uel_efre.jpeg b/src/branding/img/uel_efre.jpeg
similarity index 100%
rename from src/branding/villasweb/img/uel_efre.jpeg
rename to src/branding/img/uel_efre.jpeg
diff --git a/src/branding/villasweb/img/villas_web.svg b/src/branding/img/villas_web.svg
similarity index 100%
rename from src/branding/villasweb/img/villas_web.svg
rename to src/branding/img/villas_web.svg
diff --git a/src/branding/injector.js b/src/branding/injector.js
new file mode 100644
index 00000000..27100a1b
--- /dev/null
+++ b/src/branding/injector.js
@@ -0,0 +1,104 @@
+function nxhr_builder(elem,path,next){
+    return ()=>{
+        const e = document.getElementById(elem)
+        let xhr = new XMLHttpRequest()
+        xhr.onreadystatechange = function(){
+            if(xhr.readyState == 4 && xhr.status==200){
+                if(next) next()
+                if(e) e.innerHTML = xhr.responseText
+                else console.log(`Expected to find element ${elem}`)
+            }
+        }
+        xhr.open('GET',path)
+        xhr.send()
+    }
+}
+
+function inject(){
+    const fhr = nxhr_builder('brand-footer','/branding/footer.html')
+    const hhr = nxhr_builder('brand-home','/branding/home.html',fhr)
+    const whr = nxhr_builder('brand-welcome','/branding/welcome.html',hhr)
+    const header = document.getElementById('brand-header')
+    const links = document.getElementById('brand-links')
+    const menu_logo = document.getElementById('brand-menu-logo')
+    let jhr = new XMLHttpRequest();
+    jhr.onreadystatechange = function() {
+        if (jhr.readyState == 4 && jhr.status == 200) {
+            const values = JSON.parse(jhr.responseText)
+            console.log(values)
+            header.innerHTML = get_header(values)
+            if(links) links.innerHTML = get_links(values)
+            whr()
+            if(menu_logo) menu_logo.src = `/branding/img/${values.logo}`
+            apply_style(values);
+        }
+    }
+    jhr.open('GET', '/branding/values.json');
+    jhr.send();
+}
+
+// if icon cannot be found, the default favicon will be used
+function change_head(values) {
+    // set title of document
+    let title = get_title(values);
+    if (get_subtitle(values)) {
+        title += " " + get_subtitle(values);
+    }
+    document.title = title;
+
+    // set document icon
+    if (!values.icon) {
+        return;
+    }
+    var oldlink = document.getElementById("dynamic-favicon");
+
+    var link = document.createElement("link");
+    link.id = "dynamic-favicon";
+    link.rel = "shortcut icon";
+    link.href = "/branding/img/" + values.icon;
+
+    if (oldlink) {
+        document.head.removeChild(oldlink);
+    }
+    document.head.appendChild(link);
+}
+
+function apply_style(values) {
+    change_head(values);
+
+    const rootEl = document.querySelector(":root");
+
+    for (const [key, value] of Object.entries(values.style)) {
+        rootEl.style.setProperty("--" + key, value);
+    }
+}
+
+function get_title(values) {
+    return values.title ? values.title : "VILLASweb";
+}
+
+function get_subtitle(values) {
+    return values.subtitle ? values.subtitle : "RT co-simulation";
+}
+
+function get_links(values){
+    let links = [];
+
+    if (values.links) {
+        Object.keys(values.links).forEach(key => {
+        links.push(`<li key=${key}><a href=${values.links[key]} title=${key}>${key}</a></li>`);
+        })
+    }
+
+    return links.join('\n');
+}
+
+function get_header(values){
+    return `
+        <header class="app-header">
+            <h1>${get_title(values)} - ${get_subtitle(values)}</h1>
+        </header>
+    `
+}
+
+inject()
\ No newline at end of file
diff --git a/src/branding/opalrt/img/logo_opalrt.svg b/src/branding/opalrt/img/logo_opalrt.svg
deleted file mode 100644
index 761d9183..00000000
--- a/src/branding/opalrt/img/logo_opalrt.svg
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   version="1.1"
-   id="svg2"
-   width="701.40002"
-   height="130.14667"
-   viewBox="0 0 701.40002 130.14667"
-   sodipodi:docname="Logo_OPAL-RT_Horizontal_Color.eps"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs6" />
-  <sodipodi:namedview
-     id="namedview4"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1" />
-  <g
-     id="g8"
-     inkscape:groupmode="layer"
-     inkscape:label="ink_ext_XXXXXX"
-     transform="matrix(1.3333333,0,0,-1.3333333,0,130.14667)">
-    <g
-       id="g10"
-       transform="scale(0.1)">
-      <path
-         d="M 900.691,359.191 0,200.41 v -67.051 l 935.426,164.922 c -10.84,20.754 -22.336,41.114 -34.735,60.91"
-         style="fill:#193050;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path12" />
-      <path
-         d="M 951.465,266.32 0,98.5469 V 0 h 1029.37 c -11.92,94.2383 -38.722,183.594 -77.905,266.32"
-         style="fill:#193050;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path14" />
-      <path
-         d="M 0,819.387 V 235.195 L 880.18,390.391 C 695.293,660.117 366.098,831.508 0,819.387"
-         style="fill:#193050;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16" />
-      <path
-         d="M 0,976.094 V 907.367 C 400.563,906.703 748.902,701.539 929.246,399.043 l 90.414,15.937 c -3.72,6.719 -7.36,13.477 -11.25,20.051 l 250.52,4.785 -213.73,-73.195 c -2.76,5.567 -5.65,11.035 -8.53,16.594 l -89.529,-15.832 c 10.996,-20.137 21.332,-40.664 30.839,-61.59 l 88.41,15.566 c -2.76,6.289 -5.35,12.657 -8.23,18.836 l 244.41,4.715 -215.77,-73.933 c -2.28,6.035 -4.68,11.964 -7.04,17.949 L 992.051,273.457 C 1027.26,187.434 1049.78,95.6172 1057.38,0 H 1342.7 V 976.098 L 0,976.094"
-         style="fill:#193050;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18" />
-      <path
-         d="M 1698.06,775.063 V 515.137 h 315.06 v 259.926 z m -95.6,-23.696 c 0,37.317 7.02,62.813 21.01,76.559 13.98,13.633 40.95,20.594 80.82,20.594 h 302.17 c 39.92,0 66.83,-6.961 80.81,-20.594 14,-13.746 21.02,-39.242 21.02,-76.559 V 535.078 c 0,-37.644 -7.02,-63.16 -21.02,-76.785 -13.98,-13.566 -40.89,-20.391 -80.81,-20.391 h -302.17 c -39.87,0 -66.84,6.825 -80.82,20.391 -13.99,13.625 -21.01,39.141 -21.01,76.785 v 216.289"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path20" />
-      <path
-         d="M 2577.42,777.484 H 2362.58 V 668.66 h 214.84 c 16.62,0 27.87,2.379 33.98,7.106 6.1,4.8 9.1,13.445 9.1,25.449 v 43.961 c 0,11.949 -3,20.258 -9.1,25.027 -6.11,4.86 -17.36,7.281 -33.98,7.281 M 2268.66,437.902 V 848.52 h 351.08 c 32.67,0 56.3,-6.262 70.9,-18.797 14.68,-12.7 21.99,-32.95 21.99,-60.852 v -91.785 c 0,-27.672 -7.31,-47.711 -21.99,-60.231 -14.6,-12.601 -38.23,-18.953 -70.9,-18.953 h -257.16 v -160 h -93.92"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path22" />
-      <path
-         d="m 2937.16,601.777 h 179.78 l -88.46,167.094 z M 2753.37,437.902 2985.69,848.52 h 92.09 l 235.39,-410.618 h -107.18 l -49.33,89.735 h -260.28 l -47.82,-89.735 h -95.19"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path24" />
-      <path
-         d="M 3462.22,437.902 V 848.52 h 95.5 V 515.137 h 308.1 v -77.235 h -403.6"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path26" />
-      <path
-         d="m 3936.79,690.836 v -81.984 h 126.71 v 81.984 h -126.71"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path28" />
-      <path
-         d="m 4529.14,777.484 h -214.8 V 663.313 h 214.8 c 16.69,0 27.93,2.375 34.06,7.101 6.07,4.742 9.17,13.242 9.17,25.41 v 49.352 c 0,11.949 -3.1,20.258 -9.17,25.027 -6.13,4.86 -17.37,7.281 -34.06,7.281 M 4220.37,437.902 V 848.52 h 351.16 c 32.63,0 56.33,-6.262 70.96,-18.797 14.56,-12.746 21.89,-33.004 21.89,-60.852 v -96.32 c 0,-27.746 -7.33,-47.832 -21.89,-60.621 -14.63,-12.676 -38.33,-19.028 -70.96,-19.028 h -53.66 l 189.67,-155 h -137.23 l -165.41,155 h -90.56 v -155 h -93.97"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path30" />
-      <path
-         d="M 5071.43,775.137 V 437.902 h -95.66 v 337.235 h -188.42 v 73.383 h 473.15 v -73.383 h -189.07"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path32" />
-      <path
-         d="m 1745.33,284.016 v -168.43 h -47.67 v 168.43 h -94.15 v 36.543 h 236.36 v -36.543 h -94.54"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path34" />
-      <path
-         d="m 1898.26,115.586 v 204.973 h 209.75 v -34.954 h -162.07 v -45.683 h 94.54 v -34.961 h -94.54 V 154.113 H 2110 v -38.527 h -211.74"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path36" />
-      <path
-         d="M 2370.19,284.016 H 2241.48 V 154.113 h 128.71 v 44.102 l 47.67,-9.934 v -24.226 c 0,-19.075 -3.57,-31.926 -10.72,-38.535 -7.15,-6.633 -20.53,-9.934 -40.12,-9.934 h -122.36 c -19.6,0 -32.97,3.301 -40.12,9.934 -7.15,6.609 -10.73,19.46 -10.73,38.535 V 272.09 c 0,19.07 3.58,31.926 10.73,38.535 7.15,6.633 20.52,9.934 40.12,9.934 h 122.36 c 19.59,0 32.97,-3.301 40.12,-9.934 7.15,-6.609 10.72,-19.465 10.72,-38.535 v -19.461 l -47.67,-7.539 v 38.926"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path38" />
-      <path
-         d="m 2516.38,115.586 v 204.973 h 47.67 v -79.446 h 148.97 v 79.446 h 48.06 V 115.586 h -48.06 v 88.184 h -148.97 v -88.184 h -47.67"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path40" />
-      <path
-         d="m 2865.56,115.586 v 204.973 h 32.57 l 144.21,-120.762 c 10.33,-8.742 18.13,-16.152 23.44,-22.246 -1.34,19.07 -2,30.847 -2,35.359 v 107.649 h 42.89 V 115.586 h -32.57 l -150.54,126.719 c -6.37,5.293 -12.06,10.859 -17.08,16.691 1.3,-13.254 1.98,-24.101 1.98,-32.59 v -110.82 h -42.9"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path42" />
-      <path
-         d="m 3254.45,154.113 h 157.33 v 129.903 h -157.33 z m -47.66,117.977 c 0,19.07 3.57,31.926 10.73,38.535 7.15,6.633 20.52,9.934 40.13,9.934 h 150.95 c 19.59,0 32.96,-3.301 40.11,-9.934 7.15,-6.609 10.73,-19.465 10.73,-38.535 V 164.055 c 0,-19.075 -3.58,-31.926 -10.73,-38.535 -7.15,-6.633 -20.52,-9.934 -40.11,-9.934 h -150.95 c -19.61,0 -32.98,3.301 -40.13,9.934 -7.16,6.609 -10.73,19.46 -10.73,38.535 V 272.09"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path44" />
-      <path
-         d="m 3559.95,115.586 v 204.973 h 47.67 V 154.113 h 153.72 v -38.527 h -201.39"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path46" />
-      <path
-         d="m 3874.56,154.113 h 157.32 v 129.903 h -157.32 z m -47.67,117.977 c 0,19.07 3.59,31.926 10.74,38.535 7.15,6.633 20.51,9.934 40.12,9.934 h 150.96 c 19.59,0 32.96,-3.301 40.11,-9.934 7.15,-6.609 10.73,-19.465 10.73,-38.535 V 164.055 c 0,-19.075 -3.58,-31.926 -10.73,-38.535 -7.15,-6.633 -20.52,-9.934 -40.11,-9.934 h -150.96 c -19.61,0 -32.97,3.301 -40.12,9.934 -7.15,6.609 -10.74,19.46 -10.74,38.535 V 272.09"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path48" />
-      <path
-         d="M 4372.31,284.016 H 4223.34 V 154.113 h 148.97 v 45.684 h -77.85 v 34.969 h 124.33 v -70.711 c 0,-19.075 -3.57,-31.926 -10.71,-38.535 -7.15,-6.633 -20.54,-9.934 -40.13,-9.934 h -141.42 c -19.61,0 -32.98,3.301 -40.12,9.934 -7.15,6.609 -10.74,19.46 -10.74,38.535 V 272.09 c 0,19.07 3.59,31.926 10.74,38.535 7.14,6.633 20.51,9.934 40.12,9.934 h 141.42 c 19.07,0 32.31,-3.243 39.72,-9.731 7.41,-6.5 11.12,-18.738 11.12,-36.746 v -4.754 l -46.48,-8.359 v 23.047"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path50" />
-      <path
-         d="m 4519.7,115.586 v 204.973 h 47.67 V 115.586 h -47.67"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path52" />
-      <path
-         d="m 4672.24,115.586 v 204.973 h 209.74 V 285.605 H 4719.9 v -45.683 h 94.54 v -34.961 h -94.54 v -50.848 h 164.07 v -38.527 h -211.73"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path54" />
-      <path
-         d="m 5149.72,284.816 h -134.67 v -44.101 h 128.19 c 19.64,0 33.12,-3.313 40.41,-9.922 7.31,-6.633 10.95,-19.484 10.95,-38.535 v -28.203 c 0,-19.075 -3.64,-31.926 -10.92,-38.535 -7.28,-6.633 -20.72,-9.934 -40.32,-9.934 h -126.72 c -19.61,0 -33.06,3.301 -40.33,9.934 -7.29,6.609 -10.92,19.46 -10.92,38.535 v 5.547 l 42.11,8.75 v -24.239 h 145 v 46.875 h -127.93 c -19.59,0 -32.96,3.309 -40.11,9.93 -7.16,6.613 -10.73,19.465 -10.73,38.535 v 22.637 c 0,19.07 3.57,31.926 10.73,38.535 7.15,6.633 20.52,9.934 40.11,9.934 h 116.4 c 18.81,0 31.98,-3.176 39.53,-9.524 7.55,-6.355 11.33,-18.144 11.33,-35.359 v -4.367 l -42.11,-9.93 v 23.437"
-         style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path56" />
-    </g>
-  </g>
-</svg>
diff --git a/src/branding/opalrt/img/logo_opalrt_square.svg b/src/branding/opalrt/img/logo_opalrt_square.svg
deleted file mode 100755
index 2e3ccad2..00000000
--- a/src/branding/opalrt/img/logo_opalrt_square.svg
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="38.204632mm"
-   height="38.362537mm"
-   viewBox="0 0 38.204632 38.362537"
-   version="1.1"
-   id="svg526"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   sodipodi:docname="logo_opalrt_square.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview528"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:zoom="0.914906"
-     inkscape:cx="271.0661"
-     inkscape:cy="361.7858"
-     inkscape:window-width="3440"
-     inkscape:window-height="1377"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g132" />
-  <defs
-     id="defs523">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath138">
-      <path
-         d="M 475.811,66.248 H 584.806 V 179.684 H 475.811 Z"
-         id="path136" />
-    </clipPath>
-  </defs>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-33.2414,-52.538299)">
-    <g
-       id="g132"
-       transform="matrix(0.35277777,0,0,-0.35277777,-134.73758,115.92682)">
-      <g
-         id="g134"
-         clip-path="url(#clipPath138)">
-        <g
-           id="g140"
-           transform="translate(548.5841,130.0806)">
-          <path
-             d="m 0,0 -72.423,-12.77 v -5.389 L 2.794,-4.897 C 1.922,-3.23 0.998,-1.592 0,0"
-             style="fill:#003057;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path142" />
-        </g>
-        <g
-           id="g144"
-           transform="translate(552.6679,122.6127)">
-          <path
-             d="m 0,0 -76.506,-13.49 -0.001,-7.926 H 6.263 C 5.304,-13.838 3.151,-6.652 0,0"
-             style="fill:#003057;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path146" />
-        </g>
-        <g
-           id="g148"
-           transform="translate(476.1624,167.0828)">
-          <path
-             d="m 0,0 -0.001,-46.973 70.774,12.479 C 55.907,-12.807 29.437,0.977 0,0"
-             style="fill:#003057;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path150" />
-        </g>
-        <g
-           id="g152"
-           transform="translate(476.1624,179.684)">
-          <path
-             d="M 0,0 V -5.529 C 32.207,-5.58 60.218,-22.078 74.719,-46.4 l 7.27,1.283 c -0.299,0.539 -0.592,1.081 -0.907,1.611 l 20.145,0.385 -17.185,-5.886 c -0.221,0.447 -0.455,0.888 -0.686,1.333 l -7.199,-1.271 c 0.884,-1.62 1.716,-3.27 2.48,-4.953 l 7.108,1.253 c -0.22,0.504 -0.43,1.016 -0.661,1.514 l 19.652,0.377 -17.349,-5.943 c -0.182,0.485 -0.378,0.963 -0.567,1.444 l -7.052,-1.244 c 2.832,-6.917 4.643,-14.3 5.253,-21.99 h 22.942 V 0 Z"
-             style="fill:#003057;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path154" />
-        </g>
-        <path
-           d="m 479.03,83.212 h 9.324 v 7.692 h -9.324 z m -2.83,6.99 c 0,1.105 0.208,1.859 0.622,2.266 0.414,0.404 1.212,0.61 2.392,0.61 h 8.942 c 1.182,0 1.978,-0.206 2.392,-0.61 0.414,-0.407 0.622,-1.161 0.622,-2.266 v -6.4 c 0,-1.115 -0.208,-1.869 -0.622,-2.273 -0.414,-0.401 -1.21,-0.603 -2.392,-0.603 h -8.942 c -1.18,0 -1.978,0.202 -2.392,0.603 -0.414,0.404 -0.622,1.158 -0.622,2.273 z"
-           style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path156" />
-        <g
-           id="g158"
-           transform="translate(505.0534,90.9755)">
-          <path
-             d="M 0,0 H -6.358 V -3.221 H 0 c 0.492,0 0.825,0.071 1.006,0.21 0.18,0.143 0.269,0.398 0.269,0.754 v 1.301 c 0,0.353 -0.089,0.599 -0.269,0.74 C 0.825,-0.072 0.492,0 0,0 M -9.137,-10.05 V 2.102 H 1.253 C 2.219,2.102 2.919,1.916 3.351,1.546 3.785,1.17 4.002,0.571 4.002,-0.255 V -2.971 C 4.002,-3.79 3.785,-4.383 3.351,-4.754 2.919,-5.127 2.219,-5.315 1.253,-5.315 h -7.611 v -4.735 z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path160" />
-        </g>
-        <g
-           id="g162"
-           transform="translate(515.6996,85.7754)">
-          <path
-             d="M 0,0 H 5.321 L 2.703,4.945 Z M -5.439,-4.85 1.436,7.302 H 4.162 L 11.128,-4.85 H 7.956 l -1.46,2.656 H -1.207 L -2.622,-4.85 Z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path164" />
-        </g>
-        <g
-           id="g166"
-           transform="translate(531.2385,80.9256)">
-          <path
-             d="M 0,0 V 12.152 H 2.826 V 2.286 h 9.118 V 0 Z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path168" />
-        </g>
-        <path
-           d="m 545.283,85.985 h 3.75 v 2.426 h -3.75 z"
-           style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path170" />
-        <g
-           id="g172"
-           transform="translate(562.8129,90.9755)">
-          <path
-             d="M 0,0 H -6.357 V -3.379 H 0 c 0.494,0 0.827,0.07 1.008,0.21 0.18,0.141 0.272,0.392 0.272,0.752 v 1.461 c 0,0.353 -0.092,0.599 -0.272,0.74 C 0.827,-0.072 0.494,0 0,0 M -9.138,-10.05 V 2.102 H 1.255 c 0.966,0 1.667,-0.186 2.1,-0.556 0.431,-0.378 0.648,-0.977 0.648,-1.801 v -2.85 C 4.003,-3.927 3.786,-4.521 3.355,-4.9 2.922,-5.275 2.221,-5.463 1.255,-5.463 H -0.334 L 5.28,-10.05 H 1.219 l -4.895,4.587 h -2.681 v -4.587 z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path174" />
-        </g>
-        <g
-           id="g176"
-           transform="translate(578.8615,90.9057)">
-          <path
-             d="M 0,0 V -9.98 H -2.831 V 0 H -8.407 V 2.172 H 5.596 V 0 Z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path178" />
-        </g>
-        <g
-           id="g180"
-           transform="translate(480.4592,75.9135)">
-          <path
-             d="M 0,0 V -4.973 H -1.408 V 0 h -2.78 v 1.079 h 6.98 L 2.792,0 Z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path182" />
-        </g>
-        <g
-           id="g184"
-           transform="translate(484.9752,70.94)">
-          <path
-             d="M 0,0 V 6.052 H 6.194 V 5.02 H 1.408 V 3.671 H 4.2 V 2.639 H 1.408 V 1.138 H 6.252 V 0 Z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path186" />
-        </g>
-        <g
-           id="g188"
-           transform="translate(498.9108,75.9135)">
-          <path
-             d="M 0,0 H -3.801 V -3.836 H 0 v 1.302 L 1.408,-2.827 V -3.543 C 1.408,-4.106 1.302,-4.485 1.091,-4.681 0.88,-4.877 0.485,-4.973 -0.094,-4.973 h -3.613 c -0.578,0 -0.973,0.096 -1.184,0.292 -0.212,0.196 -0.317,0.575 -0.317,1.138 v 3.191 c 0,0.563 0.105,0.942 0.317,1.137 0.211,0.196 0.606,0.294 1.184,0.294 h 3.613 C 0.485,1.079 0.88,0.981 1.091,0.785 1.302,0.59 1.408,0.211 1.408,-0.352 V -0.927 L 0,-1.15 Z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path190" />
-        </g>
-        <g
-           id="g192"
-           transform="translate(503.2275,70.94)">
-          <path
-             d="M 0,0 V 6.052 H 1.408 V 3.706 H 5.807 V 6.052 H 7.226 V 0 H 5.807 V 2.603 H 1.408 V 0 Z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path194" />
-        </g>
-        <g
-           id="g196"
-           transform="translate(513.5384,70.94)">
-          <path
-             d="M 0,0 V 6.052 H 0.962 L 5.221,2.486 C 5.525,2.228 5.756,2.009 5.913,1.829 5.873,2.392 5.853,2.74 5.853,2.873 V 6.052 H 7.12 V 0 H 6.158 L 1.713,3.741 C 1.525,3.898 1.357,4.063 1.209,4.234 1.247,3.843 1.267,3.523 1.267,3.272 V 0 Z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path198" />
-        </g>
-        <path
-           d="m 525.022,72.078 h 4.646 v 3.836 h -4.646 z m -1.407,3.483 c 0,0.563 0.105,0.943 0.317,1.138 0.211,0.196 0.605,0.293 1.185,0.293 h 4.457 c 0.578,0 0.973,-0.097 1.184,-0.293 0.211,-0.195 0.317,-0.575 0.317,-1.138 v -3.19 c 0,-0.563 -0.106,-0.943 -0.317,-1.138 -0.211,-0.196 -0.606,-0.293 -1.184,-0.293 h -4.457 c -0.58,0 -0.974,0.097 -1.185,0.293 -0.212,0.195 -0.317,0.575 -0.317,1.138 z"
-           style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path200" />
-        <g
-           id="g202"
-           transform="translate(534.0432,70.94)">
-          <path
-             d="M 0,0 V 6.052 H 1.407 V 1.138 h 4.54 V 0 Z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path204" />
-        </g>
-        <path
-           d="m 543.333,72.078 h 4.646 v 3.836 h -4.646 z m -1.407,3.483 c 0,0.563 0.106,0.943 0.317,1.138 0.211,0.196 0.606,0.293 1.185,0.293 h 4.457 c 0.578,0 0.973,-0.097 1.185,-0.293 0.211,-0.195 0.316,-0.575 0.316,-1.138 v -3.19 c 0,-0.563 -0.105,-0.943 -0.316,-1.138 -0.212,-0.196 -0.607,-0.293 -1.185,-0.293 h -4.457 c -0.579,0 -0.974,0.097 -1.185,0.293 -0.211,0.195 -0.317,0.575 -0.317,1.138 z"
-           style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path206" />
-        <g
-           id="g208"
-           transform="translate(558.0313,75.9135)">
-          <path
-             d="M 0,0 H -4.398 V -3.836 H 0 v 1.349 h -2.298 v 1.032 h 3.671 v -2.088 c 0,-0.563 -0.106,-0.942 -0.317,-1.138 -0.211,-0.196 -0.607,-0.292 -1.185,-0.292 h -4.176 c -0.579,0 -0.974,0.096 -1.185,0.292 -0.21,0.196 -0.316,0.575 -0.316,1.138 v 3.191 c 0,0.563 0.106,0.942 0.316,1.137 0.211,0.196 0.606,0.294 1.185,0.294 h 4.176 C 0.435,1.079 0.825,0.983 1.044,0.791 1.263,0.599 1.373,0.238 1.373,-0.293 V -0.434 L 0,-0.681 Z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path210" />
-        </g>
-        <path
-           d="m 562.383,76.992 h 1.408 V 70.94 h -1.408 z"
-           style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           id="path212" />
-        <g
-           id="g214"
-           transform="translate(566.8877,70.94)">
-          <path
-             d="M 0,0 V 6.052 H 6.194 V 5.02 H 1.407 V 3.671 H 4.199 V 2.639 H 1.407 V 1.138 H 6.252 V 0 Z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path216" />
-        </g>
-        <g
-           id="g218"
-           transform="translate(580.9873,75.9368)">
-          <path
-             d="m 0,0 h -3.976 v -1.302 h 3.784 c 0.581,0 0.979,-0.098 1.194,-0.293 0.216,-0.196 0.323,-0.575 0.323,-1.138 V -3.566 C 1.325,-4.129 1.218,-4.508 1.003,-4.704 0.788,-4.9 0.391,-4.997 -0.188,-4.997 H -3.93 c -0.579,0 -0.976,0.097 -1.19,0.293 -0.216,0.196 -0.323,0.575 -0.323,1.138 v 0.164 l 1.243,0.258 v -0.715 h 4.282 v 1.383 h -3.777 c -0.579,0 -0.974,0.099 -1.185,0.294 -0.211,0.195 -0.317,0.574 -0.317,1.138 v 0.668 c 0,0.564 0.106,0.943 0.317,1.138 0.211,0.196 0.606,0.293 1.185,0.293 h 3.436 C 0.297,1.055 0.686,0.962 0.909,0.774 1.132,0.586 1.243,0.238 1.243,-0.27 V -0.399 L 0,-0.692 Z"
-             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path220" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/src/branding/opalrt/opalrt-functions.js b/src/branding/opalrt/opalrt-functions.js
deleted file mode 100644
index 42020755..00000000
--- a/src/branding/opalrt/opalrt-functions.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-import React from 'react';
-import { Button } from 'react-bootstrap';
-import { NavLink } from 'react-router-dom';
-
-export function opalrt_welcome() {
-  let url = 'https://villas.fein-aachen.org/doc/web.html';
-  return (
-    <div >
-      <h1>Welcome!</h1>
-      <p>VILLASweb is a tool to configure real-time co-simulations and display simulation real-time data.
-        It enables the management and monitoring of simulators, models and simulations.</p>
-      <span className='solid-button'>
-        <Button key="learnmore" onClick={e => window.location = url}>Learn more</Button>
-      </span>
-    </div>)
-}
-
-export function opalrt_home(title, username, userid, role) {
-  return (
-    <div className="home-container">
-      <h1>Home</h1>
-      <p>
-        Welcome to <b>{title}</b>!
-      </p>
-      <p>
-        You are logged in as user <b>{username}</b> with <b>ID {userid}</b> and role <b>{role}</b>.
-      </p>
-      <h3>Contacts</h3>
-      <ul>
-        <li><a href="mailto:steffen.vogel@opal-rt.com">Steffen Vogel</a> (OPAL-RT)</li>
-        <li><a href="mailto:ikoester@eonerc.rwth-aachen.de">Iris Köster</a> (RWTH)</li>
-      </ul>
-      <h3>Links</h3>
-      <ul>
-        <li><a href="https://opal-rt.com/">OPAL-RT Technologies</a></li>
-        <li><NavLink to="/api">API browser</NavLink></li>
-        <li><a href="https://fein-aachen.org/projects/villas-framework/">Project page of VILLASframework</a></li>
-        <li><a href="https://villas.fein-aachen.org/docs/web">Documentation</a></li>
-        <li>Source Code of <a href="https://github.com/VILLASframework/web">frontend</a> &amp; <a href="https://github.com/VILLASframework/web-backend">backend</a></li>
-      </ul>
-      <h3>Credits</h3>
-      <p>
-        VILLASweb is an open source project developed by the <a href="http://acs.eonerc.rwth-aachen.de">Institute for Automation of Complex Power Systems</a> at <a href="https;//www.rwth-aachen.de">RWTH Aachen University</a> with the support of other open-source contributors.<br />
-        This instance is operated by OPAL-RT Technologies Inc.
-      </p>
-      <p>
-        <a href="https://opal-rt.com/"><img height={60} src={require('./img/logo_opalrt.svg').default} alt="Logo OPAL-RT" style={{marginRight: 15}}  /></a>
-        <a href="https://www.acs.rwth-aachen.de"><img height={60} src={require('./img/eonerc_rwth.svg').default} alt="Logo ACS" /></a>
-      </p>
-    </div>)
-}
-
-export function opalrt_footer() {
-  return (
-    <footer className="app-footer">
-      Copyright &copy; {new Date().getFullYear()} - <a href="https://opal-rt.com/">OPAL-RT Technologies</a> - <a href="https://www.acs.rwth-aachen.de">RWTH Aachen University</a>
-    </footer>
-  );
-}
diff --git a/src/branding/slew/img/eonerc_rwth.svg b/src/branding/slew/img/eonerc_rwth.svg
deleted file mode 100644
index 42c4c3f2..00000000
--- a/src/branding/slew/img/eonerc_rwth.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   xml:space="preserve"
-   width="423.47867"
-   height="63.401333"
-   viewBox="0 0 423.47867 63.401333"
-   sodipodi:docname="eonerc_logo.svg"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs6"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath22"><path
-         d="M 0,0 318,0 318,48 0,48 Z"
-         id="path20"
-         inkscape:connector-curvature="0" /></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="852"
-     inkscape:document-units="px"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="1.1892783"
-     inkscape:cx="-142.81708"
-     inkscape:cy="-48.076868"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g10"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" /><g
-     id="g10"
-     inkscape:groupmode="layer"
-     inkscape:label="rwth_acs_combined"
-     transform="matrix(1.3333333,0,0,-1.3333333,0,63.401468)"><path
-       inkscape:connector-curvature="0"
-       id="path26"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 261.312,20.438102 2.051,0 c 1.961,0 3.016,-0.996 3.016,-2.985 0,-2.324 -1.176,-3.23 -3.258,-3.23 l -1.809,0 z m -4.347,-18.344 4.347,0 0,9.113 2.321,0 c 1.75,0 2.508,-1.027 2.566,-2.718 l 0.121,-4.133 c 0.032,-0.844 0.121,-1.66 0.543,-2.262 l 4.707,0 0,0.18 c -0.816,0.422 -0.937,1.597 -0.965,3.863 -0.062,4.555 -0.515,6.187 -3.472,6.578 l 0,0.059 c 2.445,0.515 3.594,2.445 3.594,5.312 0,3.68 -2.176,5.551 -5.735,5.551 l -8.027,0 0,-21.543" /><path
-       inkscape:connector-curvature="0"
-       id="path28"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 192.902,23.637102 0,-15.027 c 0,-5.762 3.352,-6.942 6.879,-6.942 3.531,0 6.883,1.449 6.883,6.942 l 0,15.027 -4.348,0 0,-15.027 c 0,-2.141 -0.511,-3.743 -2.535,-3.743 -2.019,0 -2.531,1.602 -2.531,3.743 l 0,15.027 -4.348,0" /><path
-       inkscape:connector-curvature="0"
-       id="path30"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 207.727,23.637102 0,-21.543 3.984,0 0,15.086 0.059,0 5.312,-15.086 4.949,0 0,21.543 -3.984,0 0,-14.754 -0.059,0 -5.254,14.754 -5.007,0" /><path
-       inkscape:connector-curvature="0"
-       id="path32"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 223.148,23.637102 4.344,0 0,-21.543 -4.344,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path34"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 227.789,23.637102 4.949,-21.543 5.582,0 4.95,21.543 -4.497,0 -3.199,-15.934 -0.09,0 -3.046,15.934 -4.649,0" /><path
-       inkscape:connector-curvature="0"
-       id="path36"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 243.656,23.637102 0,-21.543 12.344,0 0,3.559 -7.996,0 0,5.793 7.242,0 0,3.562 -7.242,0 0,5.07 7.691,0 0,3.559 -12.039,0" /><path
-       inkscape:connector-curvature="0"
-       id="path38"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 271.086,8.821102 0,-0.875 c 0,-3.985 1.934,-6.278 6.852,-6.278 4.707,0 7.48,2.055 7.48,6.61 0,2.625 -0.844,4.285 -4.102,5.703 l -3.351,1.449 c -1.84,0.785 -2.231,1.598 -2.231,2.926 0,1.269 0.512,2.507 2.473,2.507 1.66,0 2.355,-1.179 2.355,-3.199 l 4.165,0 0,0.602 c 0,4.137 -2.809,5.793 -6.668,5.793 -4.106,0 -6.672,-2.141 -6.672,-6.336 0,-3.59 1.781,-5.192 5.644,-6.516 2.867,-0.996 3.864,-1.722 3.864,-3.683 0,-1.809 -1.27,-2.657 -2.598,-2.657 -2.293,0 -2.863,1.297 -2.863,3.321 l 0,0.633 -4.348,0" /><path
-       inkscape:connector-curvature="0"
-       id="path40"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 285.988,23.637102 4.344,0 0,-21.543 -4.344,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path42"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 312.902,23.637102 -3.019,-8.328 -0.059,0 -2.836,8.328 -16.086,0 0,-3.559 4.707,0 0,-17.984 4.348,0 0,17.984 3.664,0 4.059,-9.507 0,-8.477 4.347,0 0,8.477 5.582,13.066 -4.707,0" /><path
-       inkscape:connector-curvature="0"
-       id="path44"
-       style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 154.73,25.598102 -7.199,0 0,21.641 11.805,0 c 3.203,0 5.965,-2.071 6.867,-4.821 0.832,-2.547 0.121,-5.312 -1.762,-7.281 0.25,-0.676 0.497,-1.207 0.727,-1.816 0.523,-1.208 1,-2.411 1.523,-3.602 l 1.715,-4.121 -7.301,0 c 0,-0.004 -0.062,0.172 -0.117,0.246 -0.289,0.641 -0.55,1.32 -0.843,1.961 l -1.754,4.164 c -0.7,1.684 -1.395,3.277 -2.09,4.957 0.867,0.027 1.519,-0.137 2.355,0.25 0.59,0.289 1.485,1.012 1.508,2.395 -0.023,0.683 -0.211,1.203 -0.664,1.742 -0.457,0.504 -1.113,0.875 -1.973,0.886 0,0 -2.797,0 -2.797,0 l 0,-16.601" /><path
-       inkscape:connector-curvature="0"
-       id="path46"
-       style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 229.938,47.239102 0,-21.641 -7.2,0 0,8.824 -5.043,0 0,-8.824 c -1.304,0 -2.715,0.015 -4.019,0 l -3.18,0 0,16.633 -5.035,0 0,-16.633 -7.203,0 0,16.633 -5.078,0 0,-16.633 -7.414,0 c -1.293,3.121 -2.657,6.269 -3.922,9.375 -0.145,0.656 -0.289,1.308 -0.477,1.945 l 0,-11.32 -7.433,0 c -1.473,3.426 -2.887,6.781 -4.356,10.258 -0.508,1.203 -0.926,2.183 -1.453,3.437 l -0.074,0.164 -1.141,2.684 -1.64,3.836 c -0.141,0.433 -0.375,0.828 -0.52,1.262 l 7.414,0 c 1.524,-3.7 3.063,-7.36 4.66,-11 l 0.043,-0.09 c -0.058,0.422 -0.191,0.961 -0.262,1.367 l 0,6.457 c 0.016,1.031 0,2.207 0,3.266 l 7.43,0 c 0.094,-0.235 0.149,-0.364 0.219,-0.551 0.871,-2.047 1.699,-4.078 2.57,-6.11 l 1.946,-4.429 c -0.043,0.464 -0.145,0.914 -0.204,1.367 l 0,9.723 29.129,0 0,-7.809 5.043,0 0,7.809 7.2,0" /><path
-       inkscape:connector-curvature="0"
-       id="path48"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 255.641,47.242102 -5.395,0 -4.516,-17.058 -4.515,17.058 -5.399,0 -5.726,-21.644 4.547,0 1,4.578 5.761,0 0.997,-4.578 6.667,0 1,4.578 5.762,0 1,-4.578 4.547,0 z m -19.246,-13.488 2.089,9.727 0.063,0 2.09,-9.727 z m 14.425,0 2.094,9.727 0.059,0 2.093,-9.727 -4.246,0" /><path
-       inkscape:connector-curvature="0"
-       id="path50"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 274.371,39.856102 c 0,3.136 -0.453,7.695 -6.668,7.695 -6.519,0 -7.336,-4.648 -7.336,-11.195 0,-6.547 0.817,-11.196 7.336,-11.196 5.703,0 6.848,4.016 6.848,8.661 l -4.344,0 c 0,-4.645 -1.148,-5.461 -2.715,-5.461 -1.871,0 -2.777,1.175 -2.777,7.695 0,6.094 0.512,8.297 2.715,8.297 1.961,0 2.597,-1.36 2.597,-4.496 l 4.344,0" /><path
-       inkscape:connector-curvature="0"
-       id="path52"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 275.41,25.598102 4.363,0 0,9.609 5.094,0 0,-9.609 4.363,0 0,21.641 -4.363,0 0,-8.274 -5.094,0 0,8.274 -4.363,0 0,-21.641" /><path
-       inkscape:connector-curvature="0"
-       id="path54"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 290.176,47.242102 0,-21.644 12.402,0 0,3.578 -8.035,0 0,5.82 7.277,0 0,3.578 -7.277,0 0,5.09 7.73,0 0,3.578 -12.097,0" /><path
-       inkscape:connector-curvature="0"
-       id="path56"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 303.227,47.239102 0,-21.641 4,0 0,15.156 0.058,0 5.336,-15.156 4.969,0 0,21.641 -4,0 0,-14.821 -0.059,0 -5.277,14.821 -5.027,0" /><path
-       inkscape:connector-curvature="0"
-       id="path58"
-       style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 132.859,47.270102 1,0 0,-45.355 -1,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path60"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 41.984,47.266102 35.23,0 0,-5.246 -35.23,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path62"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 41.984,35.649102 35.23,0 0,-5.246 -35.23,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path64"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 41.984,24.031102 35.23,0 0,-5.246 -35.23,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path66"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 83.957,47.266102 35.227,0 0,-5.246 -35.227,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path68"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 83.957,35.649102 35.227,0 0,-5.246 -35.227,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path70"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 0.012,47.266102 35.227,0 0,-28.48 -35.227,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path72"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 0,9.254102 0,-7.359 4.215,0 0,1.218 -2.731,0 0,1.977 2.473,0 0,1.215 -2.473,0 0,1.734 2.629,0 0,1.215 z m 5.145,-7.359 1.359,0 0,1.609 -1.359,0 z m 2.214,2.14 c 0.051,-0.472 0.168,-0.875 0.34,-1.211 0.176,-0.335 0.43,-0.601 0.758,-0.789 0.328,-0.191 0.773,-0.285 1.328,-0.285 0.559,0 1,0.094 1.332,0.285 0.328,0.188 0.582,0.454 0.754,0.789 0.18,0.336 0.289,0.739 0.344,1.211 0.051,0.469 0.074,0.985 0.074,1.539 0,0.559 -0.023,1.071 -0.074,1.543 -0.055,0.469 -0.164,0.872 -0.344,1.211 -0.172,0.336 -0.426,0.598 -0.754,0.785 -0.332,0.192 -0.773,0.286 -1.332,0.286 -0.555,0 -1,-0.094 -1.328,-0.286 -0.328,-0.187 -0.582,-0.449 -0.758,-0.785 -0.172,-0.339 -0.289,-0.742 -0.34,-1.211 -0.05,-0.472 -0.078,-0.984 -0.078,-1.543 0,-0.554 0.028,-1.07 0.078,-1.539 m 1.442,2.797 c 0.027,0.344 0.074,0.625 0.144,0.844 0.075,0.219 0.176,0.379 0.313,0.48 0.133,0.098 0.308,0.149 0.527,0.149 0.223,0 0.399,-0.051 0.531,-0.149 0.137,-0.101 0.239,-0.261 0.313,-0.48 0.07,-0.219 0.117,-0.5 0.141,-0.844 0.027,-0.343 0.039,-0.761 0.039,-1.258 0,-0.496 -0.012,-0.914 -0.039,-1.261 -0.024,-0.348 -0.071,-0.629 -0.141,-0.844 -0.074,-0.219 -0.176,-0.375 -0.313,-0.477 -0.132,-0.097 -0.308,-0.148 -0.531,-0.148 -0.219,0 -0.394,0.051 -0.527,0.148 -0.137,0.102 -0.238,0.258 -0.313,0.477 -0.07,0.215 -0.117,0.496 -0.144,0.844 -0.024,0.347 -0.035,0.765 -0.035,1.261 0,0.497 0.011,0.915 0.035,1.258 m 4.398,2.422 0,-7.359 1.36,0 0,5.152 0.019,0 1.813,-5.152 1.691,0 0,7.359 -1.359,0 0,-5.039 -0.02,0 -1.797,5.039 z m 8.281,0 0,-7.359 4.215,0 0,1.218 -2.73,0 0,1.977 2.473,0 0,1.215 -2.473,0 0,1.734 2.629,0 0,1.215 z m 4.95,-7.359 1.422,0 0,3.679 c 0,0.61 0.253,0.918 0.753,0.918 0.211,0 0.368,-0.058 0.465,-0.171 0.094,-0.114 0.145,-0.313 0.145,-0.602 l 0,-3.824 1.422,0 0,4.113 c 0,0.555 -0.125,0.957 -0.367,1.207 -0.243,0.246 -0.594,0.371 -1.047,0.371 -0.309,0 -0.582,-0.066 -0.825,-0.191 -0.238,-0.129 -0.433,-0.328 -0.586,-0.606 l -0.023,0 0,0.649 -1.359,0 z m 9.226,2.558 0,0.317 c 0,0.426 -0.031,0.812 -0.086,1.16 -0.054,0.348 -0.156,0.644 -0.308,0.887 -0.153,0.242 -0.36,0.433 -0.621,0.566 -0.266,0.133 -0.606,0.203 -1.016,0.203 -0.48,0 -0.867,-0.082 -1.156,-0.238 -0.289,-0.16 -0.508,-0.371 -0.664,-0.641 -0.153,-0.265 -0.258,-0.574 -0.309,-0.918 -0.051,-0.34 -0.078,-0.699 -0.078,-1.07 0,-0.344 0.016,-0.691 0.047,-1.047 0.031,-0.351 0.117,-0.672 0.254,-0.957 0.136,-0.285 0.347,-0.516 0.636,-0.695 0.29,-0.18 0.692,-0.27 1.207,-0.27 0.68,0 1.176,0.176 1.493,0.52 0.316,0.347 0.488,0.843 0.515,1.492 l -1.277,0 c -0.039,-0.352 -0.117,-0.613 -0.227,-0.785 -0.109,-0.172 -0.285,-0.258 -0.527,-0.258 -0.129,0 -0.238,0.039 -0.328,0.109 -0.09,0.075 -0.16,0.168 -0.215,0.289 -0.055,0.122 -0.094,0.258 -0.117,0.411 -0.027,0.156 -0.039,0.316 -0.039,0.48 l 0,0.445 z m -2.816,0.844 0,0.215 c 0,0.133 0.012,0.262 0.039,0.394 0.023,0.129 0.062,0.247 0.117,0.352 0.055,0.109 0.129,0.195 0.223,0.258 0.09,0.066 0.211,0.101 0.351,0.101 0.149,0 0.266,-0.031 0.36,-0.089 0.09,-0.059 0.164,-0.145 0.215,-0.258 0.05,-0.114 0.085,-0.25 0.109,-0.41 0.019,-0.164 0.031,-0.352 0.039,-0.563 z m 3.594,-3.402 1.421,0 0,3.328 c 0,0.187 0.032,0.344 0.09,0.473 0.063,0.125 0.145,0.226 0.25,0.308 0.102,0.078 0.215,0.133 0.34,0.168 0.121,0.035 0.246,0.051 0.371,0.051 0.074,0 0.149,0 0.223,-0.004 0.07,-0.004 0.144,-0.008 0.219,-0.016 l 0,1.36 c -0.039,0.008 -0.082,0.011 -0.129,0.015 -0.043,0.004 -0.086,0.008 -0.129,0.008 -0.293,0 -0.543,-0.082 -0.75,-0.246 -0.207,-0.16 -0.383,-0.375 -0.528,-0.641 l -0.019,0 0,0.739 -1.359,0 z m 4.836,3.539 c 0.015,0.262 0.05,0.465 0.109,0.621 0.055,0.152 0.129,0.266 0.226,0.332 0.094,0.07 0.223,0.105 0.379,0.105 0.282,0 0.477,-0.14 0.582,-0.421 0.11,-0.282 0.161,-0.762 0.161,-1.434 0,-0.234 -0.012,-0.449 -0.036,-0.645 -0.023,-0.195 -0.066,-0.363 -0.125,-0.5 -0.058,-0.136 -0.136,-0.246 -0.234,-0.324 -0.102,-0.078 -0.227,-0.117 -0.379,-0.117 -0.148,0 -0.273,0.039 -0.363,0.117 -0.094,0.078 -0.164,0.184 -0.219,0.321 -0.051,0.132 -0.086,0.285 -0.101,0.457 -0.016,0.171 -0.028,0.355 -0.028,0.546 0,0.371 0.012,0.684 0.028,0.942 m 1.457,2.004 0,-0.617 -0.02,0 c -0.137,0.289 -0.312,0.488 -0.527,0.597 -0.211,0.11 -0.418,0.168 -0.618,0.168 -0.382,0 -0.691,-0.086 -0.921,-0.258 -0.231,-0.172 -0.407,-0.394 -0.528,-0.668 -0.117,-0.269 -0.199,-0.574 -0.234,-0.91 -0.039,-0.336 -0.059,-0.668 -0.059,-0.988 0,-1.012 0.145,-1.731 0.43,-2.16 0.285,-0.43 0.707,-0.645 1.273,-0.645 0.223,0 0.442,0.063 0.653,0.184 0.211,0.125 0.386,0.289 0.531,0.496 l 0.02,0 0,-0.731 c 0,-0.289 -0.059,-0.527 -0.176,-0.718 -0.117,-0.188 -0.317,-0.282 -0.606,-0.282 -0.09,0 -0.175,0.016 -0.254,0.043 -0.078,0.028 -0.152,0.063 -0.222,0.11 -0.141,0.105 -0.215,0.246 -0.215,0.426 l -1.359,0 c 0,-0.477 0.164,-0.84 0.488,-1.098 0.328,-0.258 0.793,-0.387 1.398,-0.387 0.828,0 1.422,0.176 1.778,0.531 0.351,0.352 0.531,0.899 0.531,1.641 l 0,5.266 z m 2.39,-7.356 0.578,0 c 0.332,0 0.602,0.024 0.821,0.071 0.214,0.05 0.398,0.152 0.554,0.304 0.157,0.156 0.309,0.43 0.465,0.824 0.153,0.395 0.25,0.723 0.293,0.985 l 1.34,5.172 -1.422,0 -0.719,-3.832 -0.023,0 -0.824,3.832 -1.485,0 1.559,-5.543 c -0.024,-0.246 -0.09,-0.438 -0.203,-0.574 -0.113,-0.141 -0.301,-0.208 -0.563,-0.208 -0.121,0 -0.246,0.008 -0.371,0.032 z m 6.985,1.813 1.484,0 0,3.113 0.785,0 c 0.305,0 0.524,-0.082 0.652,-0.246 0.129,-0.168 0.2,-0.395 0.215,-0.68 l 0.039,-1.414 c 0.008,-0.144 0.02,-0.281 0.043,-0.418 0.02,-0.133 0.067,-0.25 0.145,-0.355 l 1.625,0 0,0.062 c -0.137,0.074 -0.223,0.215 -0.262,0.422 -0.039,0.207 -0.058,0.504 -0.066,0.899 -0.008,0.39 -0.028,0.718 -0.055,0.988 -0.031,0.269 -0.09,0.488 -0.172,0.664 -0.082,0.176 -0.199,0.309 -0.351,0.402 -0.153,0.094 -0.352,0.157 -0.606,0.192 l 0,0.019 c 0.418,0.09 0.727,0.289 0.926,0.602 0.199,0.316 0.301,0.718 0.301,1.215 0,0.636 -0.172,1.113 -0.52,1.425 -0.34,0.313 -0.82,0.469 -1.441,0.469 l -2.742,0 z m 1.484,6.265 0.703,0 c 0.688,0 1.031,-0.339 1.031,-1.019 0,-0.399 -0.097,-0.68 -0.289,-0.852 -0.191,-0.168 -0.469,-0.25 -0.824,-0.25 l -0.621,0 z m 8.207,-3.707 0,0.317 c 0,0.426 -0.027,0.812 -0.082,1.16 -0.055,0.348 -0.156,0.644 -0.309,0.887 -0.152,0.242 -0.359,0.433 -0.625,0.566 -0.261,0.133 -0.601,0.203 -1.015,0.203 -0.481,0 -0.864,-0.082 -1.153,-0.238 -0.289,-0.16 -0.511,-0.371 -0.664,-0.641 -0.156,-0.265 -0.257,-0.574 -0.308,-0.918 -0.051,-0.34 -0.078,-0.699 -0.078,-1.07 0,-0.344 0.015,-0.691 0.046,-1.047 0.032,-0.351 0.114,-0.672 0.25,-0.957 0.137,-0.285 0.352,-0.516 0.641,-0.695 0.289,-0.18 0.692,-0.27 1.207,-0.27 0.68,0 1.176,0.176 1.492,0.52 0.317,0.347 0.489,0.843 0.516,1.492 l -1.277,0 c -0.043,-0.352 -0.118,-0.613 -0.227,-0.785 -0.109,-0.172 -0.285,-0.258 -0.527,-0.258 -0.129,0 -0.239,0.039 -0.328,0.109 -0.09,0.075 -0.161,0.168 -0.215,0.289 -0.055,0.122 -0.098,0.258 -0.121,0.411 -0.024,0.156 -0.036,0.316 -0.036,0.48 l 0,0.445 z m -2.813,0.844 0,0.215 c 0,0.133 0.012,0.262 0.036,0.394 0.023,0.129 0.066,0.247 0.121,0.352 0.054,0.109 0.125,0.195 0.218,0.258 0.094,0.066 0.211,0.101 0.356,0.101 0.144,0 0.262,-0.031 0.355,-0.089 0.094,-0.059 0.164,-0.145 0.219,-0.258 0.051,-0.114 0.086,-0.25 0.106,-0.41 0.019,-0.164 0.035,-0.352 0.043,-0.563 z m 3.36,-1.586 0,-0.199 c 0,-0.266 0.031,-0.508 0.094,-0.727 0.058,-0.214 0.168,-0.398 0.324,-0.554 0.152,-0.157 0.359,-0.274 0.621,-0.356 0.262,-0.082 0.598,-0.125 1,-0.125 0.297,0 0.57,0.039 0.824,0.11 0.254,0.07 0.473,0.179 0.656,0.324 0.18,0.144 0.325,0.328 0.426,0.547 0.106,0.218 0.156,0.472 0.156,0.761 0,0.418 -0.093,0.75 -0.277,0.997 -0.187,0.242 -0.504,0.441 -0.949,0.589 l -0.856,0.289 c -0.242,0.079 -0.402,0.168 -0.488,0.278 -0.086,0.113 -0.129,0.234 -0.129,0.371 0,0.199 0.067,0.351 0.199,0.449 0.137,0.102 0.289,0.152 0.469,0.152 0.235,0 0.399,-0.07 0.492,-0.203 0.09,-0.133 0.137,-0.343 0.137,-0.633 l 1.277,0 0,0.227 c 0,0.5 -0.152,0.887 -0.461,1.164 -0.312,0.274 -0.789,0.414 -1.433,0.414 -0.363,0 -0.676,-0.047 -0.934,-0.137 -0.258,-0.089 -0.468,-0.207 -0.633,-0.359 -0.164,-0.152 -0.285,-0.328 -0.363,-0.531 -0.074,-0.203 -0.109,-0.418 -0.109,-0.645 0,-0.39 0.097,-0.711 0.297,-0.961 0.199,-0.254 0.496,-0.445 0.886,-0.586 l 1,-0.359 c 0.137,-0.055 0.258,-0.129 0.36,-0.223 0.105,-0.089 0.156,-0.226 0.156,-0.406 0,-0.219 -0.066,-0.383 -0.195,-0.496 -0.133,-0.109 -0.309,-0.164 -0.528,-0.164 -0.242,0 -0.425,0.074 -0.55,0.223 -0.129,0.148 -0.192,0.343 -0.192,0.582 l 0,0.187 z m 8.887,0.742 0,0.317 c 0,0.426 -0.028,0.812 -0.082,1.16 -0.055,0.348 -0.161,0.644 -0.309,0.887 -0.152,0.242 -0.359,0.433 -0.625,0.566 -0.266,0.133 -0.602,0.203 -1.016,0.203 -0.48,0 -0.863,-0.082 -1.152,-0.238 -0.289,-0.16 -0.512,-0.371 -0.664,-0.641 -0.156,-0.265 -0.258,-0.574 -0.313,-0.918 -0.05,-0.34 -0.074,-0.699 -0.074,-1.07 0,-0.344 0.016,-0.691 0.043,-1.047 0.031,-0.351 0.117,-0.672 0.254,-0.957 0.137,-0.285 0.352,-0.516 0.641,-0.695 0.289,-0.18 0.687,-0.27 1.207,-0.27 0.679,0 1.175,0.176 1.492,0.52 0.316,0.347 0.488,0.843 0.516,1.492 l -1.278,0 c -0.043,-0.352 -0.117,-0.613 -0.226,-0.785 -0.11,-0.172 -0.286,-0.258 -0.528,-0.258 -0.129,0 -0.242,0.039 -0.328,0.109 -0.09,0.075 -0.164,0.168 -0.219,0.289 -0.054,0.122 -0.093,0.258 -0.117,0.411 -0.023,0.156 -0.035,0.316 -0.035,0.48 l 0,0.445 z m -2.813,0.844 0,0.215 c 0,0.133 0.012,0.262 0.035,0.394 0.024,0.129 0.063,0.247 0.117,0.352 0.055,0.109 0.129,0.195 0.223,0.258 0.094,0.066 0.211,0.101 0.356,0.101 0.144,0 0.261,-0.031 0.355,-0.089 0.094,-0.059 0.164,-0.145 0.219,-0.258 0.051,-0.114 0.086,-0.25 0.105,-0.41 0.024,-0.164 0.035,-0.352 0.043,-0.563 z m 4.816,0.442 0,0.156 c 0,0.218 0.055,0.394 0.168,0.523 0.11,0.133 0.274,0.199 0.493,0.199 0.242,0 0.41,-0.062 0.511,-0.183 0.098,-0.121 0.149,-0.285 0.149,-0.5 0,-0.184 -0.039,-0.324 -0.125,-0.422 -0.082,-0.094 -0.231,-0.172 -0.442,-0.227 l -0.804,-0.214 c -0.246,-0.071 -0.457,-0.149 -0.633,-0.239 -0.176,-0.09 -0.32,-0.199 -0.434,-0.336 -0.113,-0.133 -0.199,-0.293 -0.254,-0.484 -0.054,-0.188 -0.078,-0.414 -0.078,-0.672 0,-0.187 0.024,-0.375 0.071,-0.562 0.046,-0.192 0.125,-0.36 0.226,-0.512 0.102,-0.149 0.238,-0.274 0.41,-0.371 0.172,-0.094 0.383,-0.145 0.629,-0.145 0.344,0 0.625,0.051 0.84,0.145 0.219,0.097 0.41,0.289 0.574,0.578 l 0.02,0 c 0.019,-0.098 0.043,-0.195 0.066,-0.293 0.024,-0.102 0.063,-0.195 0.11,-0.285 l 1.359,0 c -0.066,0.164 -0.113,0.32 -0.141,0.465 -0.023,0.144 -0.035,0.347 -0.035,0.609 l 0,2.914 c 0,0.25 -0.023,0.477 -0.074,0.688 -0.055,0.207 -0.152,0.386 -0.297,0.539 -0.144,0.152 -0.348,0.269 -0.613,0.351 -0.262,0.082 -0.606,0.125 -1.024,0.125 -0.269,0 -0.519,-0.031 -0.757,-0.09 -0.239,-0.058 -0.442,-0.156 -0.618,-0.289 -0.175,-0.133 -0.316,-0.312 -0.418,-0.531 -0.101,-0.219 -0.156,-0.488 -0.156,-0.801 l 0,-0.136 z m 1.321,-2.165 c 0,-0.156 -0.028,-0.289 -0.082,-0.394 -0.055,-0.109 -0.125,-0.195 -0.211,-0.266 -0.086,-0.066 -0.18,-0.117 -0.285,-0.148 -0.102,-0.031 -0.203,-0.047 -0.297,-0.047 -0.192,0 -0.332,0.078 -0.414,0.227 -0.082,0.152 -0.121,0.335 -0.121,0.546 0,0.25 0.062,0.446 0.183,0.59 0.125,0.141 0.332,0.246 0.617,0.309 0.09,0.019 0.192,0.051 0.301,0.098 0.11,0.042 0.215,0.105 0.309,0.179 z m 2.347,-1.679 1.422,0 0,3.328 c 0,0.187 0.032,0.344 0.09,0.473 0.063,0.125 0.149,0.226 0.25,0.308 0.102,0.078 0.215,0.133 0.34,0.168 0.121,0.035 0.246,0.051 0.371,0.051 0.074,0 0.149,0 0.223,-0.004 0.07,-0.004 0.144,-0.008 0.218,-0.016 l 0,1.36 c -0.039,0.008 -0.082,0.011 -0.128,0.015 -0.043,0.004 -0.086,0.008 -0.129,0.008 -0.293,0 -0.543,-0.082 -0.75,-0.246 -0.207,-0.16 -0.383,-0.375 -0.528,-0.641 l -0.019,0 0,0.739 -1.36,0 z m 7.551,3.547 c 0,0.66 -0.168,1.179 -0.5,1.566 -0.332,0.383 -0.828,0.578 -1.488,0.578 -0.328,0 -0.633,-0.047 -0.906,-0.137 -0.274,-0.089 -0.512,-0.246 -0.711,-0.468 -0.199,-0.223 -0.356,-0.52 -0.465,-0.895 -0.109,-0.375 -0.164,-0.847 -0.164,-1.418 0,-0.555 0.043,-1.023 0.133,-1.398 0.09,-0.375 0.222,-0.672 0.398,-0.895 0.176,-0.222 0.395,-0.383 0.66,-0.48 0.262,-0.094 0.574,-0.145 0.93,-0.145 0.758,0 1.297,0.199 1.625,0.59 0.324,0.391 0.488,0.949 0.488,1.68 l -1.359,0 c 0,-0.453 -0.055,-0.785 -0.164,-0.989 -0.11,-0.207 -0.285,-0.312 -0.528,-0.312 -0.156,0 -0.285,0.039 -0.386,0.109 -0.098,0.075 -0.176,0.188 -0.231,0.344 -0.054,0.16 -0.093,0.359 -0.113,0.606 -0.02,0.242 -0.031,0.535 -0.031,0.878 0,0.317 0.011,0.594 0.031,0.836 0.02,0.243 0.059,0.438 0.113,0.594 0.055,0.153 0.137,0.27 0.242,0.348 0.106,0.078 0.25,0.121 0.43,0.121 0.129,0 0.235,-0.035 0.324,-0.098 0.082,-0.066 0.149,-0.152 0.196,-0.258 0.043,-0.109 0.074,-0.226 0.089,-0.363 0.02,-0.133 0.028,-0.265 0.028,-0.394 z m 0.766,-3.547 1.422,0 0,3.679 c 0,0.61 0.25,0.918 0.754,0.918 0.211,0 0.363,-0.058 0.461,-0.171 0.097,-0.114 0.144,-0.313 0.144,-0.602 l 0,-3.824 1.422,0 0,4.113 c 0,0.555 -0.121,0.957 -0.367,1.207 -0.242,0.246 -0.59,0.371 -1.043,0.371 -0.625,0 -1.074,-0.238 -1.352,-0.715 l -0.019,0 0,2.383 -1.422,0 z m 12.187,4.875 c 0,0.269 -0.019,0.554 -0.054,0.859 -0.039,0.309 -0.133,0.594 -0.286,0.856 -0.148,0.265 -0.378,0.484 -0.683,0.656 -0.305,0.172 -0.723,0.258 -1.25,0.258 -0.559,0 -1,-0.094 -1.332,-0.286 -0.332,-0.187 -0.582,-0.449 -0.758,-0.785 -0.176,-0.339 -0.289,-0.742 -0.34,-1.211 -0.051,-0.472 -0.078,-0.984 -0.078,-1.543 0,-0.554 0.027,-1.07 0.078,-1.539 0.051,-0.472 0.164,-0.875 0.34,-1.211 0.176,-0.335 0.426,-0.601 0.758,-0.789 0.332,-0.191 0.773,-0.285 1.332,-0.285 0.484,0 0.883,0.082 1.187,0.239 0.305,0.156 0.543,0.371 0.711,0.644 0.168,0.27 0.285,0.586 0.344,0.941 0.063,0.36 0.094,0.735 0.094,1.133 l -1.481,0 c 0,-0.398 -0.027,-0.718 -0.074,-0.961 -0.047,-0.246 -0.113,-0.433 -0.195,-0.566 -0.082,-0.137 -0.18,-0.223 -0.297,-0.27 -0.109,-0.043 -0.234,-0.066 -0.363,-0.066 -0.16,0 -0.297,0.031 -0.418,0.098 -0.121,0.066 -0.219,0.191 -0.301,0.382 -0.078,0.188 -0.137,0.454 -0.172,0.797 -0.039,0.344 -0.059,0.793 -0.059,1.352 0,0.519 0.016,0.961 0.043,1.324 0.028,0.359 0.075,0.652 0.145,0.875 0.066,0.223 0.16,0.383 0.281,0.484 0.121,0.098 0.274,0.149 0.461,0.149 0.336,0 0.567,-0.121 0.695,-0.367 0.129,-0.242 0.188,-0.633 0.188,-1.168 z m 4.953,-2.317 0,0.317 c 0,0.426 -0.031,0.812 -0.085,1.16 -0.055,0.348 -0.157,0.644 -0.309,0.887 -0.149,0.242 -0.359,0.433 -0.625,0.566 -0.262,0.133 -0.602,0.203 -1.012,0.203 -0.484,0 -0.867,-0.082 -1.156,-0.238 -0.289,-0.16 -0.508,-0.371 -0.664,-0.641 -0.152,-0.265 -0.258,-0.574 -0.309,-0.918 -0.05,-0.34 -0.078,-0.699 -0.078,-1.07 0,-0.344 0.016,-0.691 0.047,-1.047 0.031,-0.351 0.113,-0.672 0.254,-0.957 0.137,-0.285 0.348,-0.516 0.637,-0.695 0.289,-0.18 0.691,-0.27 1.207,-0.27 0.679,0 1.179,0.176 1.492,0.52 0.316,0.347 0.488,0.843 0.516,1.492 l -1.278,0 c -0.039,-0.352 -0.117,-0.613 -0.226,-0.785 -0.11,-0.172 -0.286,-0.258 -0.524,-0.258 -0.133,0 -0.242,0.039 -0.332,0.109 -0.09,0.075 -0.16,0.168 -0.215,0.289 -0.054,0.122 -0.093,0.258 -0.121,0.411 -0.023,0.156 -0.035,0.316 -0.035,0.48 l 0,0.445 z m -2.816,0.844 0,0.215 c 0,0.133 0.012,0.262 0.035,0.394 0.028,0.129 0.067,0.247 0.121,0.352 0.055,0.109 0.129,0.195 0.219,0.258 0.094,0.066 0.215,0.101 0.359,0.101 0.141,0 0.262,-0.031 0.356,-0.089 0.09,-0.059 0.164,-0.145 0.215,-0.258 0.051,-0.114 0.086,-0.25 0.109,-0.41 0.02,-0.164 0.031,-0.352 0.039,-0.563 z m 3.594,-3.402 1.422,0 0,3.679 c 0,0.61 0.25,0.918 0.75,0.918 0.215,0 0.367,-0.058 0.465,-0.171 0.097,-0.114 0.144,-0.313 0.144,-0.602 l 0,-3.824 1.422,0 0,4.113 c 0,0.555 -0.121,0.957 -0.367,1.207 -0.242,0.246 -0.59,0.371 -1.047,0.371 -0.309,0 -0.582,-0.066 -0.82,-0.191 -0.243,-0.129 -0.438,-0.328 -0.59,-0.606 l -0.02,0 0,0.649 -1.359,0 z m 5.5,5.543 -0.723,0 0,-0.965 0.723,0 0,-3.176 c 0,-0.281 0.019,-0.516 0.051,-0.699 0.035,-0.188 0.097,-0.336 0.191,-0.449 0.094,-0.114 0.227,-0.196 0.398,-0.243 0.172,-0.046 0.399,-0.074 0.68,-0.074 0.164,0 0.32,0.008 0.469,0.024 0.148,0.011 0.301,0.027 0.457,0.039 l 0,0.988 c -0.047,-0.004 -0.098,-0.012 -0.152,-0.012 -0.059,-0.004 -0.114,-0.008 -0.165,-0.008 -0.207,0 -0.343,0.047 -0.41,0.141 -0.066,0.094 -0.097,0.25 -0.097,0.469 l 0,3 0.824,0 0,0.965 -0.824,0 0,1.59 -1.422,0 z m 6.855,-2.985 0,0.317 c 0,0.426 -0.027,0.812 -0.082,1.16 -0.054,0.348 -0.156,0.644 -0.308,0.887 -0.149,0.242 -0.36,0.433 -0.621,0.566 -0.266,0.133 -0.606,0.203 -1.016,0.203 -0.481,0 -0.867,-0.082 -1.156,-0.238 -0.285,-0.16 -0.508,-0.371 -0.664,-0.641 -0.153,-0.265 -0.258,-0.574 -0.309,-0.918 -0.051,-0.34 -0.078,-0.699 -0.078,-1.07 0,-0.344 0.016,-0.691 0.047,-1.047 0.031,-0.351 0.113,-0.672 0.254,-0.957 0.136,-0.285 0.347,-0.516 0.636,-0.695 0.289,-0.18 0.692,-0.27 1.207,-0.27 0.68,0 1.18,0.176 1.497,0.52 0.312,0.347 0.484,0.843 0.511,1.492 l -1.277,0 c -0.039,-0.352 -0.117,-0.613 -0.227,-0.785 -0.109,-0.172 -0.285,-0.258 -0.523,-0.258 -0.133,0 -0.242,0.039 -0.332,0.109 -0.09,0.075 -0.16,0.168 -0.215,0.289 -0.055,0.122 -0.094,0.258 -0.121,0.411 -0.023,0.156 -0.035,0.316 -0.035,0.48 l 0,0.445 z m -2.812,0.844 0,0.215 c 0,0.133 0.012,0.262 0.035,0.394 0.027,0.129 0.066,0.247 0.121,0.352 0.055,0.109 0.129,0.195 0.219,0.258 0.094,0.066 0.215,0.101 0.359,0.101 0.141,0 0.262,-0.031 0.356,-0.089 0.093,-0.059 0.164,-0.145 0.214,-0.258 0.051,-0.114 0.086,-0.25 0.11,-0.41 0.019,-0.164 0.031,-0.352 0.039,-0.563 z m 3.594,-3.402 1.421,0 0,3.328 c 0,0.187 0.032,0.344 0.09,0.473 0.063,0.125 0.145,0.226 0.25,0.308 0.102,0.078 0.215,0.133 0.34,0.168 0.121,0.035 0.246,0.051 0.371,0.051 0.074,0 0.149,0 0.219,-0.004 0.074,-0.004 0.148,-0.008 0.223,-0.016 l 0,1.36 c -0.039,0.008 -0.082,0.011 -0.129,0.015 -0.043,0.004 -0.086,0.008 -0.129,0.008 -0.293,0 -0.547,-0.082 -0.75,-0.246 -0.207,-0.16 -0.383,-0.375 -0.528,-0.641 l -0.019,0 0,0.739 -1.359,0 0,-5.543" /></g></svg>
\ No newline at end of file
diff --git a/src/branding/slew/img/slew_blue.svg b/src/branding/slew/img/slew_blue.svg
deleted file mode 100644
index 3d1c10e0..00000000
--- a/src/branding/slew/img/slew_blue.svg
+++ /dev/null
@@ -1,1024 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="183.56662mm"
-   height="174.99965mm"
-   viewBox="0 0 183.56662 174.99965"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="slew_blue.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   inkscape:export-filename="/home/iko/Documents/Projects/VILLAS/VILLASweb/public/blue.png"
-   inkscape:export-xdpi="1.8859175"
-   inkscape:export-ydpi="1.8859175">
-  <defs
-     id="defs2"
-     style="stroke-linecap:butt;stroke-linejoin:round">
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect1772"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect1768"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect1764"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect1760"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3002"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect2998"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect2994"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect2988"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect2984"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6665"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6661"
-       is_visible="true" />
-    <linearGradient
-       id="linearGradient5493"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#6264cc;stop-opacity:1;"
-         offset="0"
-         id="stop5491" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2424"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2422" />
-    </linearGradient>
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4159"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4155"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4151"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4147"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4143"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4139"
-       effect="bspline" />
-    <style
-       type="text/css"
-       id="style3286">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
-    <path
-       inkscape:connector-curvature="0"
-       d="M 0,0 V 3.5"
-       id="me6029f38e9"
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 12.40625,8.296875 h 16.109375 v 55.625 L 10.984375,60.40625 v 8.984375 l 17.4375,3.515625 H 38.28125 V 8.296875 H 54.390625 V 0 H 12.40625 Z"
-       id="DejaVuSans-49" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 31.78125,66.40625 q -7.609375,0 -11.453125,-7.5 Q 16.5,51.421875 16.5,36.375 q 0,-14.984375 3.828125,-22.484375 3.84375,-7.5 11.453125,-7.5 7.671875,0 11.5,7.5 3.84375,7.5 3.84375,22.484375 0,15.046875 -3.84375,22.53125 -3.828125,7.5 -11.5,7.5 z m 0,7.8125 q 12.265625,0 18.734375,-9.703125 6.46875,-9.6875 6.46875,-28.140625 0,-18.40625 -6.46875,-28.109375 -6.46875,-9.6875 -18.734375,-9.6875 -12.25,0 -18.71875,9.6875 Q 6.59375,17.96875 6.59375,36.375 q 0,18.453125 6.46875,28.140625 6.46875,9.703125 18.71875,9.703125 z"
-       id="DejaVuSans-48" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 19.1875,8.296875 H 53.609375 V 0 H 7.328125 v 8.296875 q 5.609375,5.8125 15.296875,15.59375 9.703125,9.796875 12.1875,12.640625 4.734375,5.3125 6.609375,9 1.890625,3.6875 1.890625,7.25 0,5.8125 -4.078125,9.46875 -4.078125,3.671875 -10.625,3.671875 -4.640625,0 -9.796875,-1.609375 -5.140625,-1.609375 -11,-4.890625 v 9.96875 Q 13.765625,71.78125 18.9375,73 q 5.1875,1.21875 9.484375,1.21875 11.328125,0 18.0625,-5.671875 6.734375,-5.65625 6.734375,-15.125 0,-4.5 -1.6875,-8.53125 Q 49.859375,40.875 45.40625,35.40625 44.1875,33.984375 37.640625,27.21875 31.109375,20.453125 19.1875,8.296875 Z"
-       id="DejaVuSans-50" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 37.796875,64.3125 12.890625,25.390625 h 24.90625 z m -2.59375,8.59375 h 12.40625 V 25.390625 h 10.40625 V 17.1875 H 47.609375 V 0 h -9.8125 V 17.1875 H 4.890625 v 9.515625 z"
-       id="DejaVuSans-52" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 33.015625,40.375 q -6.640625,0 -10.53125,-4.546875 -3.875,-4.53125 -3.875,-12.4375 0,-7.859375 3.875,-12.4375 3.890625,-4.5625 10.53125,-4.5625 6.640625,0 10.515625,4.5625 3.875,4.578125 3.875,12.4375 0,7.90625 -3.875,12.4375 Q 39.65625,40.375 33.015625,40.375 Z M 52.59375,71.296875 V 62.3125 q -3.71875,1.75 -7.5,2.671875 -3.78125,0.9375 -7.5,0.9375 -9.765625,0 -14.921875,-6.59375 -5.140625,-6.59375 -5.875,-19.921875 2.875,4.25 7.21875,6.515625 4.359375,2.265625 9.578125,2.265625 10.984375,0 17.359375,-6.671875 6.375,-6.65625 6.375,-18.125 0,-11.234375 -6.640625,-18.03125 -6.640625,-6.78125 -17.671875,-6.78125 -12.65625,0 -19.34375,9.6875 -6.6875,9.703125 -6.6875,28.109375 0,17.28125 8.203125,27.5625 8.203125,10.28125 22.015625,10.28125 3.71875,0 7.5,-0.734375 3.78125,-0.734375 7.890625,-2.1875 z"
-       id="DejaVuSans-54" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 31.78125,34.625 q -7.03125,0 -11.0625,-3.765625 -4.015625,-3.765625 -4.015625,-10.34375 0,-6.59375 4.015625,-10.359375 4.03125,-3.765625 11.0625,-3.765625 7.03125,0 11.078125,3.78125 4.0625,3.796875 4.0625,10.34375 0,6.578125 -4.03125,10.34375 Q 38.875,34.625 31.78125,34.625 Z m -9.859375,4.1875 Q 15.578125,40.375 12.03125,44.71875 8.5,49.078125 8.5,55.328125 q 0,8.734375 6.21875,13.8125 6.234375,5.078125 17.0625,5.078125 10.890625,0 17.09375,-5.078125 6.203125,-5.078125 6.203125,-13.8125 0,-6.25 -3.546875,-10.609375 Q 48,40.375 41.703125,38.8125 q 7.125,-1.65625 11.09375,-6.5 3.984375,-4.828125 3.984375,-11.796875 0,-10.609375 -6.46875,-16.28125 -6.46875,-5.65625 -18.53125,-5.65625 -12.046875,0 -18.53125,5.65625 -6.46875,5.671875 -6.46875,16.28125 0,6.96875 4,11.796875 4.015625,4.84375 11.140625,6.5 z M 18.3125,54.390625 q 0,-5.65625 3.53125,-8.828125 3.546875,-3.171875 9.9375,-3.171875 6.359375,0 9.9375,3.171875 3.59375,3.171875 3.59375,8.828125 0,5.671875 -3.59375,8.84375 -3.578125,3.171875 -9.9375,3.171875 -6.390625,0 -9.9375,-3.171875 Q 18.3125,60.0625 18.3125,54.390625 Z"
-       id="DejaVuSans-56" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 18.3125,70.21875 V 54.6875 h 18.5 v -6.984375 h -18.5 v -29.6875 q 0,-6.6875 1.828125,-8.59375 1.828125,-1.90625 7.453125,-1.90625 H 36.8125 V 0 H 27.59375 Q 17.1875,0 13.234375,3.875 9.28125,7.765625 9.28125,18.015625 v 29.6875 H 2.6875 V 54.6875 h 6.59375 v 15.53125 z"
-       id="DejaVuSans-116" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 9.421875,54.6875 H 18.40625 V 0 H 9.421875 Z m 0,21.296875 H 18.40625 V 64.59375 H 9.421875 Z"
-       id="DejaVuSans-105" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 52,44.1875 Q 55.375,50.25 60.0625,53.125 64.75,56 71.09375,56 q 8.546875,0 13.1875,-5.984375 4.640625,-5.96875 4.640625,-17 V 0 h -9.03125 v 32.71875 q 0,7.859375 -2.796875,11.65625 -2.78125,3.8125 -8.484375,3.8125 -6.984375,0 -11.046875,-4.640625 -4.046875,-4.625 -4.046875,-12.640625 V 0 h -9.03125 v 32.71875 q 0,7.90625 -2.78125,11.6875 -2.78125,3.78125 -8.59375,3.78125 -6.890625,0 -10.953125,-4.65625 -4.046875,-4.65625 -4.046875,-12.625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.078125,5.03125 7.375,7.421875 Q 29.78125,56 35.6875,56 41.65625,56 45.828125,52.96875 50,49.953125 52,44.1875 Z"
-       id="DejaVuSans-109" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 56.203125,29.59375 v -4.390625 h -41.3125 q 0.59375,-9.28125 5.59375,-14.140625 5,-4.859375 13.9375,-4.859375 5.171875,0 10.03125,1.265625 4.859375,1.265625 9.65625,3.8125 v -8.5 q -4.84375,-2.046875 -9.921875,-3.125 -5.078125,-1.078125 -10.296875,-1.078125 -13.09375,0 -20.734375,7.609375 -7.640625,7.625 -7.640625,20.625 0,13.421875 7.25,21.296875 Q 20.015625,56 32.328125,56 q 11.03125,0 17.453125,-7.109375 6.421875,-7.09375 6.421875,-19.296875 z m -8.984375,2.640625 q -0.09375,7.359375 -4.125,11.75 -4.03125,4.40625 -10.671875,4.40625 -7.515625,0 -12.03125,-4.25 -4.515625,-4.25 -5.203125,-11.96875 z"
-       id="DejaVuSans-101" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 31,75.875 Q 24.46875,64.65625 21.28125,53.65625 18.109375,42.671875 18.109375,31.390625 18.109375,20.125 21.3125,9.0625 24.515625,-2 31,-13.1875 H 23.1875 Q 15.875,-1.703125 12.234375,9.375 8.59375,20.453125 8.59375,31.390625 q 0,10.890625 3.609375,21.921875 3.625,11.046875 10.984375,22.5625 z"
-       id="DejaVuSans-40" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 44.28125,53.078125 v -8.5 Q 40.484375,46.53125 36.375,47.5 q -4.09375,0.984375 -8.5,0.984375 -6.6875,0 -10.03125,-2.046875 Q 14.5,44.390625 14.5,40.28125 q 0,-3.125 2.390625,-4.90625 2.390625,-1.78125 9.625,-3.390625 l 3.078125,-0.6875 Q 39.15625,29.25 43.1875,25.515625 47.21875,21.78125 47.21875,15.09375 q 0,-7.625 -6.03125,-12.078125 -6.03125,-4.4375 -16.578125,-4.4375 -4.390625,0 -9.15625,0.859375 Q 10.6875,0.296875 5.421875,2 v 9.28125 q 4.984375,-2.59375 9.8125,-3.890625 4.828125,-1.28125 9.578125,-1.28125 6.34375,0 9.75,2.171875 3.421875,2.171875 3.421875,6.125 0,3.65625 -2.46875,5.609375 -2.453125,1.953125 -10.8125,3.765625 l -3.125,0.734375 q -8.34375,1.75 -12.0625,5.390625 -3.703125,3.640625 -3.703125,9.984375 0,7.71875 5.46875,11.90625 Q 16.75,56 26.8125,56 q 4.96875,0 9.359375,-0.734375 4.40625,-0.71875 8.109375,-2.1875 z"
-       id="DejaVuSans-115" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 8.015625,75.875 h 7.8125 q 7.3125,-11.515625 10.953125,-22.5625 3.640625,-11.03125 3.640625,-21.921875 0,-10.9375 -3.640625,-22.015625 -3.640625,-11.078125 -10.953125,-22.5625 h -7.8125 Q 14.5,-2 17.703125,9.0625 20.90625,20.125 20.90625,31.390625 q 0,11.28125 -3.203125,22.265625 -3.203125,11 -9.6875,22.21875 z"
-       id="DejaVuSans-41" />
-    <path
-       inkscape:connector-curvature="0"
-       d="M 0,0 H -3.5"
-       id="m80d070c6bd"
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 40.578125,39.3125 Q 47.65625,37.796875 51.625,33 q 3.984375,-4.78125 3.984375,-11.8125 0,-10.78125 -7.421875,-16.703125 -7.421875,-5.90625 -21.09375,-5.90625 -4.578125,0 -9.4375,0.90625 -4.859375,0.90625 -10.03125,2.71875 v 9.515625 q 4.09375,-2.390625 8.96875,-3.609375 4.890625,-1.21875 10.21875,-1.21875 9.265625,0 14.125,3.65625 4.859375,3.65625 4.859375,10.640625 0,6.453125 -4.515625,10.078125 -4.515625,3.640625 -12.5625,3.640625 h -8.5 v 8.109375 h 8.890625 q 7.265625,0 11.125,2.90625 3.859375,2.90625 3.859375,8.375 0,5.609375 -3.984375,8.609375 -3.96875,3.015625 -11.390625,3.015625 -4.0625,0 -8.703125,-0.890625 Q 15.375,64.15625 9.8125,62.3125 v 8.78125 q 5.625,1.5625 10.53125,2.34375 4.90625,0.78125 9.25,0.78125 11.234375,0 17.765625,-5.109375 6.546875,-5.09375 6.546875,-13.78125 0,-6.0625 -3.46875,-10.234375 -3.46875,-4.171875 -9.859375,-5.78125 z"
-       id="DejaVuSans-51" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 34.28125,27.484375 q -10.890625,0 -15.09375,-2.484375 -4.203125,-2.484375 -4.203125,-8.5 0,-4.78125 3.15625,-7.59375 3.15625,-2.796875 8.5625,-2.796875 7.484375,0 12,5.296875 4.515625,5.296875 4.515625,14.078125 v 2 z m 17.921875,3.71875 V 0 H 43.21875 v 8.296875 q -3.078125,-4.96875 -7.671875,-7.34375 -4.59375,-2.375 -11.234375,-2.375 -8.390625,0 -13.359375,4.71875 Q 6,8.015625 6,15.921875 q 0,9.21875 6.171875,13.90625 6.1875,4.6875 18.4375,4.6875 H 43.21875 v 0.890625 q 0,6.203125 -4.078125,9.59375 -4.078125,3.390625 -11.453125,3.390625 -4.6875,0 -9.140625,-1.125 -4.4375,-1.125 -8.53125,-3.375 v 8.3125 q 4.921875,1.90625 9.5625,2.84375 Q 24.21875,56 28.609375,56 q 11.875,0 17.734375,-6.15625 5.859375,-6.140625 5.859375,-18.640625 z"
-       id="DejaVuSans-97" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 54.890625,33.015625 V 0 H 45.90625 v 32.71875 q 0,7.765625 -3.03125,11.609375 -3.03125,3.859375 -9.078125,3.859375 -7.28125,0 -11.484375,-4.640625 -4.203125,-4.625 -4.203125,-12.640625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.234375,4.9375 7.59375,7.375 4.375,2.4375 10.09375,2.4375 9.421875,0 14.25,-5.828125 4.84375,-5.828125 4.84375,-17.15625 z"
-       id="DejaVuSans-110" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 45.40625,27.984375 q 0,9.765625 -4.03125,15.125 -4.015625,5.375 -11.296875,5.375 -7.21875,0 -11.25,-5.375 -4.03125,-5.359375 -4.03125,-15.125 0,-9.71875 4.03125,-15.09375 4.03125,-5.375 11.25,-5.375 7.28125,0 11.296875,5.375 4.03125,5.375 4.03125,15.09375 z M 54.390625,6.78125 q 0,-13.953125 -6.203125,-20.765625 -6.1875,-6.8125 -18.984375,-6.8125 -4.734375,0 -8.9375,0.703125 -4.203125,0.703125 -8.15625,2.171875 V -9.1875 q 3.953125,-2.140625 7.8125,-3.15625 3.859375,-1.03125 7.859375,-1.03125 8.84375,0 13.234375,4.609375 4.390625,4.609375 4.390625,13.9375 V 9.625 Q 42.625,4.78125 38.28125,2.390625 33.9375,0 27.875,0 17.828125,0 11.671875,7.65625 q -6.15625,7.671875 -6.15625,20.328125 0,12.6875 6.15625,20.34375 Q 17.828125,56 27.875,56 q 6.0625,0 10.40625,-2.390625 4.34375,-2.390625 7.125,-7.21875 V 54.6875 h 8.984375 z"
-       id="DejaVuSans-103" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 9.421875,75.984375 H 18.40625 V 0 H 9.421875 Z"
-       id="DejaVuSans-108" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 25,67.921875 q -3.90625,0 -6.59375,-2.71875 -2.6875,-2.703125 -2.6875,-6.609375 0,-3.859375 2.6875,-6.515625 2.6875,-2.65625 6.59375,-2.65625 3.90625,0 6.59375,2.65625 2.6875,2.65625 2.6875,6.515625 0,3.859375 -2.71875,6.59375 Q 28.859375,67.921875 25,67.921875 Z m 0,6.296875 q 3.125,0 6,-1.203125 2.890625,-1.1875 4.984375,-3.4375 2.25,-2.1875 3.375,-4.984375 1.125,-2.78125 1.125,-6 0,-6.4375 -4.515625,-10.90625 -4.515625,-4.46875 -11.0625,-4.46875 -6.59375,0 -11,4.390625 Q 9.515625,52 9.515625,58.59375 q 0,6.546875 4.484375,11.078125 4.5,4.546875 11,4.546875 z"
-       id="DejaVuSans-176" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 10.6875,12.40625 H 21 V 0 H 10.6875 Z"
-       id="DejaVuSans-46" />
-    <clipPath
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       id="p8e948c6700">
-      <rect
-         style="stroke-linecap:butt;stroke-linejoin:round"
-         height="277.20001"
-         width="405.81818"
-         x="144"
-         y="43.200001"
-         id="rect3766" />
-    </clipPath>
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4159-9"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4155-3"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4151-6"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4147-0"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4143-6"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4139-2"
-       effect="bspline" />
-    <style
-       type="text/css"
-       id="style3286-6">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
-    <path
-       inkscape:connector-curvature="0"
-       d="M 0,0 V 3.5"
-       id="me6029f38e9-1"
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 12.40625,8.296875 h 16.109375 v 55.625 L 10.984375,60.40625 v 8.984375 l 17.4375,3.515625 H 38.28125 V 8.296875 H 54.390625 V 0 H 12.40625 Z"
-       id="DejaVuSans-49-8" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 31.78125,66.40625 q -7.609375,0 -11.453125,-7.5 Q 16.5,51.421875 16.5,36.375 q 0,-14.984375 3.828125,-22.484375 3.84375,-7.5 11.453125,-7.5 7.671875,0 11.5,7.5 3.84375,7.5 3.84375,22.484375 0,15.046875 -3.84375,22.53125 -3.828125,7.5 -11.5,7.5 z m 0,7.8125 q 12.265625,0 18.734375,-9.703125 6.46875,-9.6875 6.46875,-28.140625 0,-18.40625 -6.46875,-28.109375 -6.46875,-9.6875 -18.734375,-9.6875 -12.25,0 -18.71875,9.6875 Q 6.59375,17.96875 6.59375,36.375 q 0,18.453125 6.46875,28.140625 6.46875,9.703125 18.71875,9.703125 z"
-       id="DejaVuSans-48-7" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 19.1875,8.296875 H 53.609375 V 0 H 7.328125 v 8.296875 q 5.609375,5.8125 15.296875,15.59375 9.703125,9.796875 12.1875,12.640625 4.734375,5.3125 6.609375,9 1.890625,3.6875 1.890625,7.25 0,5.8125 -4.078125,9.46875 -4.078125,3.671875 -10.625,3.671875 -4.640625,0 -9.796875,-1.609375 -5.140625,-1.609375 -11,-4.890625 v 9.96875 Q 13.765625,71.78125 18.9375,73 q 5.1875,1.21875 9.484375,1.21875 11.328125,0 18.0625,-5.671875 6.734375,-5.65625 6.734375,-15.125 0,-4.5 -1.6875,-8.53125 Q 49.859375,40.875 45.40625,35.40625 44.1875,33.984375 37.640625,27.21875 31.109375,20.453125 19.1875,8.296875 Z"
-       id="DejaVuSans-50-9" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 37.796875,64.3125 12.890625,25.390625 h 24.90625 z m -2.59375,8.59375 h 12.40625 V 25.390625 h 10.40625 V 17.1875 H 47.609375 V 0 h -9.8125 V 17.1875 H 4.890625 v 9.515625 z"
-       id="DejaVuSans-52-2" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 33.015625,40.375 q -6.640625,0 -10.53125,-4.546875 -3.875,-4.53125 -3.875,-12.4375 0,-7.859375 3.875,-12.4375 3.890625,-4.5625 10.53125,-4.5625 6.640625,0 10.515625,4.5625 3.875,4.578125 3.875,12.4375 0,7.90625 -3.875,12.4375 Q 39.65625,40.375 33.015625,40.375 Z M 52.59375,71.296875 V 62.3125 q -3.71875,1.75 -7.5,2.671875 -3.78125,0.9375 -7.5,0.9375 -9.765625,0 -14.921875,-6.59375 -5.140625,-6.59375 -5.875,-19.921875 2.875,4.25 7.21875,6.515625 4.359375,2.265625 9.578125,2.265625 10.984375,0 17.359375,-6.671875 6.375,-6.65625 6.375,-18.125 0,-11.234375 -6.640625,-18.03125 -6.640625,-6.78125 -17.671875,-6.78125 -12.65625,0 -19.34375,9.6875 -6.6875,9.703125 -6.6875,28.109375 0,17.28125 8.203125,27.5625 8.203125,10.28125 22.015625,10.28125 3.71875,0 7.5,-0.734375 3.78125,-0.734375 7.890625,-2.1875 z"
-       id="DejaVuSans-54-0" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 31.78125,34.625 q -7.03125,0 -11.0625,-3.765625 -4.015625,-3.765625 -4.015625,-10.34375 0,-6.59375 4.015625,-10.359375 4.03125,-3.765625 11.0625,-3.765625 7.03125,0 11.078125,3.78125 4.0625,3.796875 4.0625,10.34375 0,6.578125 -4.03125,10.34375 Q 38.875,34.625 31.78125,34.625 Z m -9.859375,4.1875 Q 15.578125,40.375 12.03125,44.71875 8.5,49.078125 8.5,55.328125 q 0,8.734375 6.21875,13.8125 6.234375,5.078125 17.0625,5.078125 10.890625,0 17.09375,-5.078125 6.203125,-5.078125 6.203125,-13.8125 0,-6.25 -3.546875,-10.609375 Q 48,40.375 41.703125,38.8125 q 7.125,-1.65625 11.09375,-6.5 3.984375,-4.828125 3.984375,-11.796875 0,-10.609375 -6.46875,-16.28125 -6.46875,-5.65625 -18.53125,-5.65625 -12.046875,0 -18.53125,5.65625 -6.46875,5.671875 -6.46875,16.28125 0,6.96875 4,11.796875 4.015625,4.84375 11.140625,6.5 z M 18.3125,54.390625 q 0,-5.65625 3.53125,-8.828125 3.546875,-3.171875 9.9375,-3.171875 6.359375,0 9.9375,3.171875 3.59375,3.171875 3.59375,8.828125 0,5.671875 -3.59375,8.84375 -3.578125,3.171875 -9.9375,3.171875 -6.390625,0 -9.9375,-3.171875 Q 18.3125,60.0625 18.3125,54.390625 Z"
-       id="DejaVuSans-56-2" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 18.3125,70.21875 V 54.6875 h 18.5 v -6.984375 h -18.5 v -29.6875 q 0,-6.6875 1.828125,-8.59375 1.828125,-1.90625 7.453125,-1.90625 H 36.8125 V 0 H 27.59375 Q 17.1875,0 13.234375,3.875 9.28125,7.765625 9.28125,18.015625 v 29.6875 H 2.6875 V 54.6875 h 6.59375 v 15.53125 z"
-       id="DejaVuSans-116-3" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 9.421875,54.6875 H 18.40625 V 0 H 9.421875 Z m 0,21.296875 H 18.40625 V 64.59375 H 9.421875 Z"
-       id="DejaVuSans-105-7" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 52,44.1875 Q 55.375,50.25 60.0625,53.125 64.75,56 71.09375,56 q 8.546875,0 13.1875,-5.984375 4.640625,-5.96875 4.640625,-17 V 0 h -9.03125 v 32.71875 q 0,7.859375 -2.796875,11.65625 -2.78125,3.8125 -8.484375,3.8125 -6.984375,0 -11.046875,-4.640625 -4.046875,-4.625 -4.046875,-12.640625 V 0 h -9.03125 v 32.71875 q 0,7.90625 -2.78125,11.6875 -2.78125,3.78125 -8.59375,3.78125 -6.890625,0 -10.953125,-4.65625 -4.046875,-4.65625 -4.046875,-12.625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.078125,5.03125 7.375,7.421875 Q 29.78125,56 35.6875,56 41.65625,56 45.828125,52.96875 50,49.953125 52,44.1875 Z"
-       id="DejaVuSans-109-5" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 56.203125,29.59375 v -4.390625 h -41.3125 q 0.59375,-9.28125 5.59375,-14.140625 5,-4.859375 13.9375,-4.859375 5.171875,0 10.03125,1.265625 4.859375,1.265625 9.65625,3.8125 v -8.5 q -4.84375,-2.046875 -9.921875,-3.125 -5.078125,-1.078125 -10.296875,-1.078125 -13.09375,0 -20.734375,7.609375 -7.640625,7.625 -7.640625,20.625 0,13.421875 7.25,21.296875 Q 20.015625,56 32.328125,56 q 11.03125,0 17.453125,-7.109375 6.421875,-7.09375 6.421875,-19.296875 z m -8.984375,2.640625 q -0.09375,7.359375 -4.125,11.75 -4.03125,4.40625 -10.671875,4.40625 -7.515625,0 -12.03125,-4.25 -4.515625,-4.25 -5.203125,-11.96875 z"
-       id="DejaVuSans-101-9" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 31,75.875 Q 24.46875,64.65625 21.28125,53.65625 18.109375,42.671875 18.109375,31.390625 18.109375,20.125 21.3125,9.0625 24.515625,-2 31,-13.1875 H 23.1875 Q 15.875,-1.703125 12.234375,9.375 8.59375,20.453125 8.59375,31.390625 q 0,10.890625 3.609375,21.921875 3.625,11.046875 10.984375,22.5625 z"
-       id="DejaVuSans-40-2" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 44.28125,53.078125 v -8.5 Q 40.484375,46.53125 36.375,47.5 q -4.09375,0.984375 -8.5,0.984375 -6.6875,0 -10.03125,-2.046875 Q 14.5,44.390625 14.5,40.28125 q 0,-3.125 2.390625,-4.90625 2.390625,-1.78125 9.625,-3.390625 l 3.078125,-0.6875 Q 39.15625,29.25 43.1875,25.515625 47.21875,21.78125 47.21875,15.09375 q 0,-7.625 -6.03125,-12.078125 -6.03125,-4.4375 -16.578125,-4.4375 -4.390625,0 -9.15625,0.859375 Q 10.6875,0.296875 5.421875,2 v 9.28125 q 4.984375,-2.59375 9.8125,-3.890625 4.828125,-1.28125 9.578125,-1.28125 6.34375,0 9.75,2.171875 3.421875,2.171875 3.421875,6.125 0,3.65625 -2.46875,5.609375 -2.453125,1.953125 -10.8125,3.765625 l -3.125,0.734375 q -8.34375,1.75 -12.0625,5.390625 -3.703125,3.640625 -3.703125,9.984375 0,7.71875 5.46875,11.90625 Q 16.75,56 26.8125,56 q 4.96875,0 9.359375,-0.734375 4.40625,-0.71875 8.109375,-2.1875 z"
-       id="DejaVuSans-115-2" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 8.015625,75.875 h 7.8125 q 7.3125,-11.515625 10.953125,-22.5625 3.640625,-11.03125 3.640625,-21.921875 0,-10.9375 -3.640625,-22.015625 -3.640625,-11.078125 -10.953125,-22.5625 h -7.8125 Q 14.5,-2 17.703125,9.0625 20.90625,20.125 20.90625,31.390625 q 0,11.28125 -3.203125,22.265625 -3.203125,11 -9.6875,22.21875 z"
-       id="DejaVuSans-41-8" />
-    <path
-       inkscape:connector-curvature="0"
-       d="M 0,0 H -3.5"
-       id="m80d070c6bd-9"
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 40.578125,39.3125 Q 47.65625,37.796875 51.625,33 q 3.984375,-4.78125 3.984375,-11.8125 0,-10.78125 -7.421875,-16.703125 -7.421875,-5.90625 -21.09375,-5.90625 -4.578125,0 -9.4375,0.90625 -4.859375,0.90625 -10.03125,2.71875 v 9.515625 q 4.09375,-2.390625 8.96875,-3.609375 4.890625,-1.21875 10.21875,-1.21875 9.265625,0 14.125,3.65625 4.859375,3.65625 4.859375,10.640625 0,6.453125 -4.515625,10.078125 -4.515625,3.640625 -12.5625,3.640625 h -8.5 v 8.109375 h 8.890625 q 7.265625,0 11.125,2.90625 3.859375,2.90625 3.859375,8.375 0,5.609375 -3.984375,8.609375 -3.96875,3.015625 -11.390625,3.015625 -4.0625,0 -8.703125,-0.890625 Q 15.375,64.15625 9.8125,62.3125 v 8.78125 q 5.625,1.5625 10.53125,2.34375 4.90625,0.78125 9.25,0.78125 11.234375,0 17.765625,-5.109375 6.546875,-5.09375 6.546875,-13.78125 0,-6.0625 -3.46875,-10.234375 -3.46875,-4.171875 -9.859375,-5.78125 z"
-       id="DejaVuSans-51-7" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 34.28125,27.484375 q -10.890625,0 -15.09375,-2.484375 -4.203125,-2.484375 -4.203125,-8.5 0,-4.78125 3.15625,-7.59375 3.15625,-2.796875 8.5625,-2.796875 7.484375,0 12,5.296875 4.515625,5.296875 4.515625,14.078125 v 2 z m 17.921875,3.71875 V 0 H 43.21875 v 8.296875 q -3.078125,-4.96875 -7.671875,-7.34375 -4.59375,-2.375 -11.234375,-2.375 -8.390625,0 -13.359375,4.71875 Q 6,8.015625 6,15.921875 q 0,9.21875 6.171875,13.90625 6.1875,4.6875 18.4375,4.6875 H 43.21875 v 0.890625 q 0,6.203125 -4.078125,9.59375 -4.078125,3.390625 -11.453125,3.390625 -4.6875,0 -9.140625,-1.125 -4.4375,-1.125 -8.53125,-3.375 v 8.3125 q 4.921875,1.90625 9.5625,2.84375 Q 24.21875,56 28.609375,56 q 11.875,0 17.734375,-6.15625 5.859375,-6.140625 5.859375,-18.640625 z"
-       id="DejaVuSans-97-3" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 54.890625,33.015625 V 0 H 45.90625 v 32.71875 q 0,7.765625 -3.03125,11.609375 -3.03125,3.859375 -9.078125,3.859375 -7.28125,0 -11.484375,-4.640625 -4.203125,-4.625 -4.203125,-12.640625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.234375,4.9375 7.59375,7.375 4.375,2.4375 10.09375,2.4375 9.421875,0 14.25,-5.828125 4.84375,-5.828125 4.84375,-17.15625 z"
-       id="DejaVuSans-110-6" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 45.40625,27.984375 q 0,9.765625 -4.03125,15.125 -4.015625,5.375 -11.296875,5.375 -7.21875,0 -11.25,-5.375 -4.03125,-5.359375 -4.03125,-15.125 0,-9.71875 4.03125,-15.09375 4.03125,-5.375 11.25,-5.375 7.28125,0 11.296875,5.375 4.03125,5.375 4.03125,15.09375 z M 54.390625,6.78125 q 0,-13.953125 -6.203125,-20.765625 -6.1875,-6.8125 -18.984375,-6.8125 -4.734375,0 -8.9375,0.703125 -4.203125,0.703125 -8.15625,2.171875 V -9.1875 q 3.953125,-2.140625 7.8125,-3.15625 3.859375,-1.03125 7.859375,-1.03125 8.84375,0 13.234375,4.609375 4.390625,4.609375 4.390625,13.9375 V 9.625 Q 42.625,4.78125 38.28125,2.390625 33.9375,0 27.875,0 17.828125,0 11.671875,7.65625 q -6.15625,7.671875 -6.15625,20.328125 0,12.6875 6.15625,20.34375 Q 17.828125,56 27.875,56 q 6.0625,0 10.40625,-2.390625 4.34375,-2.390625 7.125,-7.21875 V 54.6875 h 8.984375 z"
-       id="DejaVuSans-103-1" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 9.421875,75.984375 H 18.40625 V 0 H 9.421875 Z"
-       id="DejaVuSans-108-2" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 25,67.921875 q -3.90625,0 -6.59375,-2.71875 -2.6875,-2.703125 -2.6875,-6.609375 0,-3.859375 2.6875,-6.515625 2.6875,-2.65625 6.59375,-2.65625 3.90625,0 6.59375,2.65625 2.6875,2.65625 2.6875,6.515625 0,3.859375 -2.71875,6.59375 Q 28.859375,67.921875 25,67.921875 Z m 0,6.296875 q 3.125,0 6,-1.203125 2.890625,-1.1875 4.984375,-3.4375 2.25,-2.1875 3.375,-4.984375 1.125,-2.78125 1.125,-6 0,-6.4375 -4.515625,-10.90625 -4.515625,-4.46875 -11.0625,-4.46875 -6.59375,0 -11,4.390625 Q 9.515625,52 9.515625,58.59375 q 0,6.546875 4.484375,11.078125 4.5,4.546875 11,4.546875 z"
-       id="DejaVuSans-176-9" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 10.6875,12.40625 H 21 V 0 H 10.6875 Z"
-       id="DejaVuSans-46-3" />
-    <clipPath
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       id="p8e948c6700-1">
-      <rect
-         style="stroke-linecap:butt;stroke-linejoin:round"
-         height="277.20001"
-         width="405.81818"
-         x="144"
-         y="43.200001"
-         id="rect3766-9" />
-    </clipPath>
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4159-7"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4155-4"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4151-5"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4147-2"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4143-5"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4139-4"
-       effect="bspline" />
-    <style
-       type="text/css"
-       id="style3286-7">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
-    <path
-       inkscape:connector-curvature="0"
-       d="M 0,0 V 3.5"
-       id="me6029f38e9-4"
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 12.40625,8.296875 h 16.109375 v 55.625 L 10.984375,60.40625 v 8.984375 l 17.4375,3.515625 H 38.28125 V 8.296875 H 54.390625 V 0 H 12.40625 Z"
-       id="DejaVuSans-49-4" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 31.78125,66.40625 q -7.609375,0 -11.453125,-7.5 Q 16.5,51.421875 16.5,36.375 q 0,-14.984375 3.828125,-22.484375 3.84375,-7.5 11.453125,-7.5 7.671875,0 11.5,7.5 3.84375,7.5 3.84375,22.484375 0,15.046875 -3.84375,22.53125 -3.828125,7.5 -11.5,7.5 z m 0,7.8125 q 12.265625,0 18.734375,-9.703125 6.46875,-9.6875 6.46875,-28.140625 0,-18.40625 -6.46875,-28.109375 -6.46875,-9.6875 -18.734375,-9.6875 -12.25,0 -18.71875,9.6875 Q 6.59375,17.96875 6.59375,36.375 q 0,18.453125 6.46875,28.140625 6.46875,9.703125 18.71875,9.703125 z"
-       id="DejaVuSans-48-3" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 19.1875,8.296875 H 53.609375 V 0 H 7.328125 v 8.296875 q 5.609375,5.8125 15.296875,15.59375 9.703125,9.796875 12.1875,12.640625 4.734375,5.3125 6.609375,9 1.890625,3.6875 1.890625,7.25 0,5.8125 -4.078125,9.46875 -4.078125,3.671875 -10.625,3.671875 -4.640625,0 -9.796875,-1.609375 -5.140625,-1.609375 -11,-4.890625 v 9.96875 Q 13.765625,71.78125 18.9375,73 q 5.1875,1.21875 9.484375,1.21875 11.328125,0 18.0625,-5.671875 6.734375,-5.65625 6.734375,-15.125 0,-4.5 -1.6875,-8.53125 Q 49.859375,40.875 45.40625,35.40625 44.1875,33.984375 37.640625,27.21875 31.109375,20.453125 19.1875,8.296875 Z"
-       id="DejaVuSans-50-0" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 37.796875,64.3125 12.890625,25.390625 h 24.90625 z m -2.59375,8.59375 h 12.40625 V 25.390625 h 10.40625 V 17.1875 H 47.609375 V 0 h -9.8125 V 17.1875 H 4.890625 v 9.515625 z"
-       id="DejaVuSans-52-7" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 33.015625,40.375 q -6.640625,0 -10.53125,-4.546875 -3.875,-4.53125 -3.875,-12.4375 0,-7.859375 3.875,-12.4375 3.890625,-4.5625 10.53125,-4.5625 6.640625,0 10.515625,4.5625 3.875,4.578125 3.875,12.4375 0,7.90625 -3.875,12.4375 Q 39.65625,40.375 33.015625,40.375 Z M 52.59375,71.296875 V 62.3125 q -3.71875,1.75 -7.5,2.671875 -3.78125,0.9375 -7.5,0.9375 -9.765625,0 -14.921875,-6.59375 -5.140625,-6.59375 -5.875,-19.921875 2.875,4.25 7.21875,6.515625 4.359375,2.265625 9.578125,2.265625 10.984375,0 17.359375,-6.671875 6.375,-6.65625 6.375,-18.125 0,-11.234375 -6.640625,-18.03125 -6.640625,-6.78125 -17.671875,-6.78125 -12.65625,0 -19.34375,9.6875 -6.6875,9.703125 -6.6875,28.109375 0,17.28125 8.203125,27.5625 8.203125,10.28125 22.015625,10.28125 3.71875,0 7.5,-0.734375 3.78125,-0.734375 7.890625,-2.1875 z"
-       id="DejaVuSans-54-8" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 31.78125,34.625 q -7.03125,0 -11.0625,-3.765625 -4.015625,-3.765625 -4.015625,-10.34375 0,-6.59375 4.015625,-10.359375 4.03125,-3.765625 11.0625,-3.765625 7.03125,0 11.078125,3.78125 4.0625,3.796875 4.0625,10.34375 0,6.578125 -4.03125,10.34375 Q 38.875,34.625 31.78125,34.625 Z m -9.859375,4.1875 Q 15.578125,40.375 12.03125,44.71875 8.5,49.078125 8.5,55.328125 q 0,8.734375 6.21875,13.8125 6.234375,5.078125 17.0625,5.078125 10.890625,0 17.09375,-5.078125 6.203125,-5.078125 6.203125,-13.8125 0,-6.25 -3.546875,-10.609375 Q 48,40.375 41.703125,38.8125 q 7.125,-1.65625 11.09375,-6.5 3.984375,-4.828125 3.984375,-11.796875 0,-10.609375 -6.46875,-16.28125 -6.46875,-5.65625 -18.53125,-5.65625 -12.046875,0 -18.53125,5.65625 -6.46875,5.671875 -6.46875,16.28125 0,6.96875 4,11.796875 4.015625,4.84375 11.140625,6.5 z M 18.3125,54.390625 q 0,-5.65625 3.53125,-8.828125 3.546875,-3.171875 9.9375,-3.171875 6.359375,0 9.9375,3.171875 3.59375,3.171875 3.59375,8.828125 0,5.671875 -3.59375,8.84375 -3.578125,3.171875 -9.9375,3.171875 -6.390625,0 -9.9375,-3.171875 Q 18.3125,60.0625 18.3125,54.390625 Z"
-       id="DejaVuSans-56-6" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 18.3125,70.21875 V 54.6875 h 18.5 v -6.984375 h -18.5 v -29.6875 q 0,-6.6875 1.828125,-8.59375 1.828125,-1.90625 7.453125,-1.90625 H 36.8125 V 0 H 27.59375 Q 17.1875,0 13.234375,3.875 9.28125,7.765625 9.28125,18.015625 v 29.6875 H 2.6875 V 54.6875 h 6.59375 v 15.53125 z"
-       id="DejaVuSans-116-8" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 9.421875,54.6875 H 18.40625 V 0 H 9.421875 Z m 0,21.296875 H 18.40625 V 64.59375 H 9.421875 Z"
-       id="DejaVuSans-105-8" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 52,44.1875 Q 55.375,50.25 60.0625,53.125 64.75,56 71.09375,56 q 8.546875,0 13.1875,-5.984375 4.640625,-5.96875 4.640625,-17 V 0 h -9.03125 v 32.71875 q 0,7.859375 -2.796875,11.65625 -2.78125,3.8125 -8.484375,3.8125 -6.984375,0 -11.046875,-4.640625 -4.046875,-4.625 -4.046875,-12.640625 V 0 h -9.03125 v 32.71875 q 0,7.90625 -2.78125,11.6875 -2.78125,3.78125 -8.59375,3.78125 -6.890625,0 -10.953125,-4.65625 -4.046875,-4.65625 -4.046875,-12.625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.078125,5.03125 7.375,7.421875 Q 29.78125,56 35.6875,56 41.65625,56 45.828125,52.96875 50,49.953125 52,44.1875 Z"
-       id="DejaVuSans-109-4" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 56.203125,29.59375 v -4.390625 h -41.3125 q 0.59375,-9.28125 5.59375,-14.140625 5,-4.859375 13.9375,-4.859375 5.171875,0 10.03125,1.265625 4.859375,1.265625 9.65625,3.8125 v -8.5 q -4.84375,-2.046875 -9.921875,-3.125 -5.078125,-1.078125 -10.296875,-1.078125 -13.09375,0 -20.734375,7.609375 -7.640625,7.625 -7.640625,20.625 0,13.421875 7.25,21.296875 Q 20.015625,56 32.328125,56 q 11.03125,0 17.453125,-7.109375 6.421875,-7.09375 6.421875,-19.296875 z m -8.984375,2.640625 q -0.09375,7.359375 -4.125,11.75 -4.03125,4.40625 -10.671875,4.40625 -7.515625,0 -12.03125,-4.25 -4.515625,-4.25 -5.203125,-11.96875 z"
-       id="DejaVuSans-101-3" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 31,75.875 Q 24.46875,64.65625 21.28125,53.65625 18.109375,42.671875 18.109375,31.390625 18.109375,20.125 21.3125,9.0625 24.515625,-2 31,-13.1875 H 23.1875 Q 15.875,-1.703125 12.234375,9.375 8.59375,20.453125 8.59375,31.390625 q 0,10.890625 3.609375,21.921875 3.625,11.046875 10.984375,22.5625 z"
-       id="DejaVuSans-40-1" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 44.28125,53.078125 v -8.5 Q 40.484375,46.53125 36.375,47.5 q -4.09375,0.984375 -8.5,0.984375 -6.6875,0 -10.03125,-2.046875 Q 14.5,44.390625 14.5,40.28125 q 0,-3.125 2.390625,-4.90625 2.390625,-1.78125 9.625,-3.390625 l 3.078125,-0.6875 Q 39.15625,29.25 43.1875,25.515625 47.21875,21.78125 47.21875,15.09375 q 0,-7.625 -6.03125,-12.078125 -6.03125,-4.4375 -16.578125,-4.4375 -4.390625,0 -9.15625,0.859375 Q 10.6875,0.296875 5.421875,2 v 9.28125 q 4.984375,-2.59375 9.8125,-3.890625 4.828125,-1.28125 9.578125,-1.28125 6.34375,0 9.75,2.171875 3.421875,2.171875 3.421875,6.125 0,3.65625 -2.46875,5.609375 -2.453125,1.953125 -10.8125,3.765625 l -3.125,0.734375 q -8.34375,1.75 -12.0625,5.390625 -3.703125,3.640625 -3.703125,9.984375 0,7.71875 5.46875,11.90625 Q 16.75,56 26.8125,56 q 4.96875,0 9.359375,-0.734375 4.40625,-0.71875 8.109375,-2.1875 z"
-       id="DejaVuSans-115-4" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 8.015625,75.875 h 7.8125 q 7.3125,-11.515625 10.953125,-22.5625 3.640625,-11.03125 3.640625,-21.921875 0,-10.9375 -3.640625,-22.015625 -3.640625,-11.078125 -10.953125,-22.5625 h -7.8125 Q 14.5,-2 17.703125,9.0625 20.90625,20.125 20.90625,31.390625 q 0,11.28125 -3.203125,22.265625 -3.203125,11 -9.6875,22.21875 z"
-       id="DejaVuSans-41-9" />
-    <path
-       inkscape:connector-curvature="0"
-       d="M 0,0 H -3.5"
-       id="m80d070c6bd-2"
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 40.578125,39.3125 Q 47.65625,37.796875 51.625,33 q 3.984375,-4.78125 3.984375,-11.8125 0,-10.78125 -7.421875,-16.703125 -7.421875,-5.90625 -21.09375,-5.90625 -4.578125,0 -9.4375,0.90625 -4.859375,0.90625 -10.03125,2.71875 v 9.515625 q 4.09375,-2.390625 8.96875,-3.609375 4.890625,-1.21875 10.21875,-1.21875 9.265625,0 14.125,3.65625 4.859375,3.65625 4.859375,10.640625 0,6.453125 -4.515625,10.078125 -4.515625,3.640625 -12.5625,3.640625 h -8.5 v 8.109375 h 8.890625 q 7.265625,0 11.125,2.90625 3.859375,2.90625 3.859375,8.375 0,5.609375 -3.984375,8.609375 -3.96875,3.015625 -11.390625,3.015625 -4.0625,0 -8.703125,-0.890625 Q 15.375,64.15625 9.8125,62.3125 v 8.78125 q 5.625,1.5625 10.53125,2.34375 4.90625,0.78125 9.25,0.78125 11.234375,0 17.765625,-5.109375 6.546875,-5.09375 6.546875,-13.78125 0,-6.0625 -3.46875,-10.234375 -3.46875,-4.171875 -9.859375,-5.78125 z"
-       id="DejaVuSans-51-0" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 34.28125,27.484375 q -10.890625,0 -15.09375,-2.484375 -4.203125,-2.484375 -4.203125,-8.5 0,-4.78125 3.15625,-7.59375 3.15625,-2.796875 8.5625,-2.796875 7.484375,0 12,5.296875 4.515625,5.296875 4.515625,14.078125 v 2 z m 17.921875,3.71875 V 0 H 43.21875 v 8.296875 q -3.078125,-4.96875 -7.671875,-7.34375 -4.59375,-2.375 -11.234375,-2.375 -8.390625,0 -13.359375,4.71875 Q 6,8.015625 6,15.921875 q 0,9.21875 6.171875,13.90625 6.1875,4.6875 18.4375,4.6875 H 43.21875 v 0.890625 q 0,6.203125 -4.078125,9.59375 -4.078125,3.390625 -11.453125,3.390625 -4.6875,0 -9.140625,-1.125 -4.4375,-1.125 -8.53125,-3.375 v 8.3125 q 4.921875,1.90625 9.5625,2.84375 Q 24.21875,56 28.609375,56 q 11.875,0 17.734375,-6.15625 5.859375,-6.140625 5.859375,-18.640625 z"
-       id="DejaVuSans-97-6" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 54.890625,33.015625 V 0 H 45.90625 v 32.71875 q 0,7.765625 -3.03125,11.609375 -3.03125,3.859375 -9.078125,3.859375 -7.28125,0 -11.484375,-4.640625 -4.203125,-4.625 -4.203125,-12.640625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.234375,4.9375 7.59375,7.375 4.375,2.4375 10.09375,2.4375 9.421875,0 14.25,-5.828125 4.84375,-5.828125 4.84375,-17.15625 z"
-       id="DejaVuSans-110-8" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 45.40625,27.984375 q 0,9.765625 -4.03125,15.125 -4.015625,5.375 -11.296875,5.375 -7.21875,0 -11.25,-5.375 -4.03125,-5.359375 -4.03125,-15.125 0,-9.71875 4.03125,-15.09375 4.03125,-5.375 11.25,-5.375 7.28125,0 11.296875,5.375 4.03125,5.375 4.03125,15.09375 z M 54.390625,6.78125 q 0,-13.953125 -6.203125,-20.765625 -6.1875,-6.8125 -18.984375,-6.8125 -4.734375,0 -8.9375,0.703125 -4.203125,0.703125 -8.15625,2.171875 V -9.1875 q 3.953125,-2.140625 7.8125,-3.15625 3.859375,-1.03125 7.859375,-1.03125 8.84375,0 13.234375,4.609375 4.390625,4.609375 4.390625,13.9375 V 9.625 Q 42.625,4.78125 38.28125,2.390625 33.9375,0 27.875,0 17.828125,0 11.671875,7.65625 q -6.15625,7.671875 -6.15625,20.328125 0,12.6875 6.15625,20.34375 Q 17.828125,56 27.875,56 q 6.0625,0 10.40625,-2.390625 4.34375,-2.390625 7.125,-7.21875 V 54.6875 h 8.984375 z"
-       id="DejaVuSans-103-9" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 9.421875,75.984375 H 18.40625 V 0 H 9.421875 Z"
-       id="DejaVuSans-108-26" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 25,67.921875 q -3.90625,0 -6.59375,-2.71875 -2.6875,-2.703125 -2.6875,-6.609375 0,-3.859375 2.6875,-6.515625 2.6875,-2.65625 6.59375,-2.65625 3.90625,0 6.59375,2.65625 2.6875,2.65625 2.6875,6.515625 0,3.859375 -2.71875,6.59375 Q 28.859375,67.921875 25,67.921875 Z m 0,6.296875 q 3.125,0 6,-1.203125 2.890625,-1.1875 4.984375,-3.4375 2.25,-2.1875 3.375,-4.984375 1.125,-2.78125 1.125,-6 0,-6.4375 -4.515625,-10.90625 -4.515625,-4.46875 -11.0625,-4.46875 -6.59375,0 -11,4.390625 Q 9.515625,52 9.515625,58.59375 q 0,6.546875 4.484375,11.078125 4.5,4.546875 11,4.546875 z"
-       id="DejaVuSans-176-6" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 10.6875,12.40625 H 21 V 0 H 10.6875 Z"
-       id="DejaVuSans-46-4" />
-    <clipPath
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       id="p8e948c6700-9">
-      <rect
-         style="stroke-linecap:butt;stroke-linejoin:round"
-         height="277.20001"
-         width="405.81818"
-         x="144"
-         y="43.200001"
-         id="rect3766-5" />
-    </clipPath>
-    <style
-       id="style2148"
-       type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
-    <path
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round"
-       id="me6029f38e9-3"
-       d="M 0,0 V 3.5"
-       inkscape:connector-curvature="0" />
-    <path
-       id="DejaVuSans-49-6"
-       d="m 12.40625,8.296875 h 16.109375 v 55.625 L 10.984375,60.40625 v 8.984375 l 17.4375,3.515625 H 38.28125 V 8.296875 H 54.390625 V 0 H 12.40625 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-48-75"
-       d="m 31.78125,66.40625 q -7.609375,0 -11.453125,-7.5 Q 16.5,51.421875 16.5,36.375 q 0,-14.984375 3.828125,-22.484375 3.84375,-7.5 11.453125,-7.5 7.671875,0 11.5,7.5 3.84375,7.5 3.84375,22.484375 0,15.046875 -3.84375,22.53125 -3.828125,7.5 -11.5,7.5 z m 0,7.8125 q 12.265625,0 18.734375,-9.703125 6.46875,-9.6875 6.46875,-28.140625 0,-18.40625 -6.46875,-28.109375 -6.46875,-9.6875 -18.734375,-9.6875 -12.25,0 -18.71875,9.6875 Q 6.59375,17.96875 6.59375,36.375 q 0,18.453125 6.46875,28.140625 6.46875,9.703125 18.71875,9.703125 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-50-3"
-       d="M 19.1875,8.296875 H 53.609375 V 0 H 7.328125 v 8.296875 q 5.609375,5.8125 15.296875,15.59375 9.703125,9.796875 12.1875,12.640625 4.734375,5.3125 6.609375,9 1.890625,3.6875 1.890625,7.25 0,5.8125 -4.078125,9.46875 -4.078125,3.671875 -10.625,3.671875 -4.640625,0 -9.796875,-1.609375 -5.140625,-1.609375 -11,-4.890625 v 9.96875 Q 13.765625,71.78125 18.9375,73 q 5.1875,1.21875 9.484375,1.21875 11.328125,0 18.0625,-5.671875 6.734375,-5.65625 6.734375,-15.125 0,-4.5 -1.6875,-8.53125 Q 49.859375,40.875 45.40625,35.40625 44.1875,33.984375 37.640625,27.21875 31.109375,20.453125 19.1875,8.296875 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-52-5"
-       d="M 37.796875,64.3125 12.890625,25.390625 h 24.90625 z m -2.59375,8.59375 h 12.40625 V 25.390625 h 10.40625 V 17.1875 H 47.609375 V 0 h -9.8125 V 17.1875 H 4.890625 v 9.515625 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-54-6"
-       d="m 33.015625,40.375 q -6.640625,0 -10.53125,-4.546875 -3.875,-4.53125 -3.875,-12.4375 0,-7.859375 3.875,-12.4375 3.890625,-4.5625 10.53125,-4.5625 6.640625,0 10.515625,4.5625 3.875,4.578125 3.875,12.4375 0,7.90625 -3.875,12.4375 Q 39.65625,40.375 33.015625,40.375 Z M 52.59375,71.296875 V 62.3125 q -3.71875,1.75 -7.5,2.671875 -3.78125,0.9375 -7.5,0.9375 -9.765625,0 -14.921875,-6.59375 -5.140625,-6.59375 -5.875,-19.921875 2.875,4.25 7.21875,6.515625 4.359375,2.265625 9.578125,2.265625 10.984375,0 17.359375,-6.671875 6.375,-6.65625 6.375,-18.125 0,-11.234375 -6.640625,-18.03125 -6.640625,-6.78125 -17.671875,-6.78125 -12.65625,0 -19.34375,9.6875 -6.6875,9.703125 -6.6875,28.109375 0,17.28125 8.203125,27.5625 8.203125,10.28125 22.015625,10.28125 3.71875,0 7.5,-0.734375 3.78125,-0.734375 7.890625,-2.1875 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-56-29"
-       d="m 31.78125,34.625 q -7.03125,0 -11.0625,-3.765625 -4.015625,-3.765625 -4.015625,-10.34375 0,-6.59375 4.015625,-10.359375 4.03125,-3.765625 11.0625,-3.765625 7.03125,0 11.078125,3.78125 4.0625,3.796875 4.0625,10.34375 0,6.578125 -4.03125,10.34375 Q 38.875,34.625 31.78125,34.625 Z m -9.859375,4.1875 Q 15.578125,40.375 12.03125,44.71875 8.5,49.078125 8.5,55.328125 q 0,8.734375 6.21875,13.8125 6.234375,5.078125 17.0625,5.078125 10.890625,0 17.09375,-5.078125 6.203125,-5.078125 6.203125,-13.8125 0,-6.25 -3.546875,-10.609375 Q 48,40.375 41.703125,38.8125 q 7.125,-1.65625 11.09375,-6.5 3.984375,-4.828125 3.984375,-11.796875 0,-10.609375 -6.46875,-16.28125 -6.46875,-5.65625 -18.53125,-5.65625 -12.046875,0 -18.53125,5.65625 -6.46875,5.671875 -6.46875,16.28125 0,6.96875 4,11.796875 4.015625,4.84375 11.140625,6.5 z M 18.3125,54.390625 q 0,-5.65625 3.53125,-8.828125 3.546875,-3.171875 9.9375,-3.171875 6.359375,0 9.9375,3.171875 3.59375,3.171875 3.59375,8.828125 0,5.671875 -3.59375,8.84375 -3.578125,3.171875 -9.9375,3.171875 -6.390625,0 -9.9375,-3.171875 Q 18.3125,60.0625 18.3125,54.390625 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-116-1"
-       d="M 18.3125,70.21875 V 54.6875 h 18.5 v -6.984375 h -18.5 v -29.6875 q 0,-6.6875 1.828125,-8.59375 1.828125,-1.90625 7.453125,-1.90625 H 36.8125 V 0 H 27.59375 Q 17.1875,0 13.234375,3.875 9.28125,7.765625 9.28125,18.015625 v 29.6875 H 2.6875 V 54.6875 h 6.59375 v 15.53125 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-105-2"
-       d="M 9.421875,54.6875 H 18.40625 V 0 H 9.421875 Z m 0,21.296875 H 18.40625 V 64.59375 H 9.421875 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-109-7"
-       d="M 52,44.1875 Q 55.375,50.25 60.0625,53.125 64.75,56 71.09375,56 q 8.546875,0 13.1875,-5.984375 4.640625,-5.96875 4.640625,-17 V 0 h -9.03125 v 32.71875 q 0,7.859375 -2.796875,11.65625 -2.78125,3.8125 -8.484375,3.8125 -6.984375,0 -11.046875,-4.640625 -4.046875,-4.625 -4.046875,-12.640625 V 0 h -9.03125 v 32.71875 q 0,7.90625 -2.78125,11.6875 -2.78125,3.78125 -8.59375,3.78125 -6.890625,0 -10.953125,-4.65625 -4.046875,-4.65625 -4.046875,-12.625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.078125,5.03125 7.375,7.421875 Q 29.78125,56 35.6875,56 41.65625,56 45.828125,52.96875 50,49.953125 52,44.1875 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-101-0"
-       d="m 56.203125,29.59375 v -4.390625 h -41.3125 q 0.59375,-9.28125 5.59375,-14.140625 5,-4.859375 13.9375,-4.859375 5.171875,0 10.03125,1.265625 4.859375,1.265625 9.65625,3.8125 v -8.5 q -4.84375,-2.046875 -9.921875,-3.125 -5.078125,-1.078125 -10.296875,-1.078125 -13.09375,0 -20.734375,7.609375 -7.640625,7.625 -7.640625,20.625 0,13.421875 7.25,21.296875 Q 20.015625,56 32.328125,56 q 11.03125,0 17.453125,-7.109375 6.421875,-7.09375 6.421875,-19.296875 z m -8.984375,2.640625 q -0.09375,7.359375 -4.125,11.75 -4.03125,4.40625 -10.671875,4.40625 -7.515625,0 -12.03125,-4.25 -4.515625,-4.25 -5.203125,-11.96875 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-40-9"
-       d="M 31,75.875 Q 24.46875,64.65625 21.28125,53.65625 18.109375,42.671875 18.109375,31.390625 18.109375,20.125 21.3125,9.0625 24.515625,-2 31,-13.1875 H 23.1875 Q 15.875,-1.703125 12.234375,9.375 8.59375,20.453125 8.59375,31.390625 q 0,10.890625 3.609375,21.921875 3.625,11.046875 10.984375,22.5625 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-115-3"
-       d="m 44.28125,53.078125 v -8.5 Q 40.484375,46.53125 36.375,47.5 q -4.09375,0.984375 -8.5,0.984375 -6.6875,0 -10.03125,-2.046875 Q 14.5,44.390625 14.5,40.28125 q 0,-3.125 2.390625,-4.90625 2.390625,-1.78125 9.625,-3.390625 l 3.078125,-0.6875 Q 39.15625,29.25 43.1875,25.515625 47.21875,21.78125 47.21875,15.09375 q 0,-7.625 -6.03125,-12.078125 -6.03125,-4.4375 -16.578125,-4.4375 -4.390625,0 -9.15625,0.859375 Q 10.6875,0.296875 5.421875,2 v 9.28125 q 4.984375,-2.59375 9.8125,-3.890625 4.828125,-1.28125 9.578125,-1.28125 6.34375,0 9.75,2.171875 3.421875,2.171875 3.421875,6.125 0,3.65625 -2.46875,5.609375 -2.453125,1.953125 -10.8125,3.765625 l -3.125,0.734375 q -8.34375,1.75 -12.0625,5.390625 -3.703125,3.640625 -3.703125,9.984375 0,7.71875 5.46875,11.90625 Q 16.75,56 26.8125,56 q 4.96875,0 9.359375,-0.734375 4.40625,-0.71875 8.109375,-2.1875 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-41-6"
-       d="m 8.015625,75.875 h 7.8125 q 7.3125,-11.515625 10.953125,-22.5625 3.640625,-11.03125 3.640625,-21.921875 0,-10.9375 -3.640625,-22.015625 -3.640625,-11.078125 -10.953125,-22.5625 h -7.8125 Q 14.5,-2 17.703125,9.0625 20.90625,20.125 20.90625,31.390625 q 0,11.28125 -3.203125,22.265625 -3.203125,11 -9.6875,22.21875 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round"
-       id="m80d070c6bd-0"
-       d="M 0,0 H -3.5"
-       inkscape:connector-curvature="0" />
-    <path
-       id="DejaVuSans-51-6"
-       d="M 40.578125,39.3125 Q 47.65625,37.796875 51.625,33 q 3.984375,-4.78125 3.984375,-11.8125 0,-10.78125 -7.421875,-16.703125 -7.421875,-5.90625 -21.09375,-5.90625 -4.578125,0 -9.4375,0.90625 -4.859375,0.90625 -10.03125,2.71875 v 9.515625 q 4.09375,-2.390625 8.96875,-3.609375 4.890625,-1.21875 10.21875,-1.21875 9.265625,0 14.125,3.65625 4.859375,3.65625 4.859375,10.640625 0,6.453125 -4.515625,10.078125 -4.515625,3.640625 -12.5625,3.640625 h -8.5 v 8.109375 h 8.890625 q 7.265625,0 11.125,2.90625 3.859375,2.90625 3.859375,8.375 0,5.609375 -3.984375,8.609375 -3.96875,3.015625 -11.390625,3.015625 -4.0625,0 -8.703125,-0.890625 Q 15.375,64.15625 9.8125,62.3125 v 8.78125 q 5.625,1.5625 10.53125,2.34375 4.90625,0.78125 9.25,0.78125 11.234375,0 17.765625,-5.109375 6.546875,-5.09375 6.546875,-13.78125 0,-6.0625 -3.46875,-10.234375 -3.46875,-4.171875 -9.859375,-5.78125 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-97-2"
-       d="m 34.28125,27.484375 q -10.890625,0 -15.09375,-2.484375 -4.203125,-2.484375 -4.203125,-8.5 0,-4.78125 3.15625,-7.59375 3.15625,-2.796875 8.5625,-2.796875 7.484375,0 12,5.296875 4.515625,5.296875 4.515625,14.078125 v 2 z m 17.921875,3.71875 V 0 H 43.21875 v 8.296875 q -3.078125,-4.96875 -7.671875,-7.34375 -4.59375,-2.375 -11.234375,-2.375 -8.390625,0 -13.359375,4.71875 Q 6,8.015625 6,15.921875 q 0,9.21875 6.171875,13.90625 6.1875,4.6875 18.4375,4.6875 H 43.21875 v 0.890625 q 0,6.203125 -4.078125,9.59375 -4.078125,3.390625 -11.453125,3.390625 -4.6875,0 -9.140625,-1.125 -4.4375,-1.125 -8.53125,-3.375 v 8.3125 q 4.921875,1.90625 9.5625,2.84375 Q 24.21875,56 28.609375,56 q 11.875,0 17.734375,-6.15625 5.859375,-6.140625 5.859375,-18.640625 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-110-61"
-       d="M 54.890625,33.015625 V 0 H 45.90625 v 32.71875 q 0,7.765625 -3.03125,11.609375 -3.03125,3.859375 -9.078125,3.859375 -7.28125,0 -11.484375,-4.640625 -4.203125,-4.625 -4.203125,-12.640625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.234375,4.9375 7.59375,7.375 4.375,2.4375 10.09375,2.4375 9.421875,0 14.25,-5.828125 4.84375,-5.828125 4.84375,-17.15625 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-103-8"
-       d="m 45.40625,27.984375 q 0,9.765625 -4.03125,15.125 -4.015625,5.375 -11.296875,5.375 -7.21875,0 -11.25,-5.375 -4.03125,-5.359375 -4.03125,-15.125 0,-9.71875 4.03125,-15.09375 4.03125,-5.375 11.25,-5.375 7.28125,0 11.296875,5.375 4.03125,5.375 4.03125,15.09375 z M 54.390625,6.78125 q 0,-13.953125 -6.203125,-20.765625 -6.1875,-6.8125 -18.984375,-6.8125 -4.734375,0 -8.9375,0.703125 -4.203125,0.703125 -8.15625,2.171875 V -9.1875 q 3.953125,-2.140625 7.8125,-3.15625 3.859375,-1.03125 7.859375,-1.03125 8.84375,0 13.234375,4.609375 4.390625,4.609375 4.390625,13.9375 V 9.625 Q 42.625,4.78125 38.28125,2.390625 33.9375,0 27.875,0 17.828125,0 11.671875,7.65625 q -6.15625,7.671875 -6.15625,20.328125 0,12.6875 6.15625,20.34375 Q 17.828125,56 27.875,56 q 6.0625,0 10.40625,-2.390625 4.34375,-2.390625 7.125,-7.21875 V 54.6875 h 8.984375 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-108-7"
-       d="M 9.421875,75.984375 H 18.40625 V 0 H 9.421875 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-176-92"
-       d="m 25,67.921875 q -3.90625,0 -6.59375,-2.71875 -2.6875,-2.703125 -2.6875,-6.609375 0,-3.859375 2.6875,-6.515625 2.6875,-2.65625 6.59375,-2.65625 3.90625,0 6.59375,2.65625 2.6875,2.65625 2.6875,6.515625 0,3.859375 -2.71875,6.59375 Q 28.859375,67.921875 25,67.921875 Z m 0,6.296875 q 3.125,0 6,-1.203125 2.890625,-1.1875 4.984375,-3.4375 2.25,-2.1875 3.375,-4.984375 1.125,-2.78125 1.125,-6 0,-6.4375 -4.515625,-10.90625 -4.515625,-4.46875 -11.0625,-4.46875 -6.59375,0 -11,4.390625 Q 9.515625,52 9.515625,58.59375 q 0,6.546875 4.484375,11.078125 4.5,4.546875 11,4.546875 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-46-0"
-       d="M 10.6875,12.40625 H 21 V 0 H 10.6875 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <clipPath
-       id="p8e948c6700-2"
-       style="stroke-linecap:butt;stroke-linejoin:round">
-      <rect
-         id="rect2628"
-         y="43.200001"
-         x="144"
-         width="405.81818"
-         height="277.20001"
-         style="stroke-linecap:butt;stroke-linejoin:round" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.96100734"
-     inkscape:cx="208.38834"
-     inkscape:cy="340.23582"
-     inkscape:document-units="pt"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:object-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1853"
-     inkscape:window-height="931"
-     inkscape:window-x="67"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="true"
-     inkscape:snap-midpoints="true" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="wellen"
-     style="display:inline;stroke-linecap:butt;stroke-linejoin:round"
-     transform="translate(1.2853296e-5)">
-    <path
-       style="fill:none;stroke:#646567;stroke-width:1.411111;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 47.448087,129.99557 c 0.486462,-0.48325 0.972658,-0.96623 1.56744,-2.12846 0.594782,-1.16223 1.299059,-3.00566 1.984371,-5.23182 0.685311,-2.22616 1.352314,-4.83696 1.941017,-7.31991 0.588703,-2.48294 1.099361,-4.83907 1.622235,-7.36539 0.522874,-2.52632 1.058173,-5.22382 1.380937,-6.89836 0.322765,-1.674541 0.433101,-2.326625 0.54038,-2.848047 0.10728,-0.521421 0.211581,-0.912604 0.246514,-1.10003 0.03493,-0.187427 2.6e-4,-0.171419 -0.03471,-0.155275"
-       id="path2982"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect2984"
-       inkscape:original-d="m 47.448087,129.99557 c 0.48646,-0.48325 0.972658,-0.96623 1.458589,-1.44895 0.703776,-1.84169 1.408054,-3.68512 2.111685,-5.52729 0.667035,-2.61015 1.334037,-5.22095 2.000657,-7.83103 0.510799,-2.35582 1.021456,-4.71195 1.531787,-7.06753 0.535421,-2.69706 1.070721,-5.39456 1.605687,-8.09145 0.110575,-0.652195 0.220909,-1.304279 0.330967,-1.956022 0.10447,-0.391088 0.208771,-0.782271 0.312759,-1.17301 -0.03436,0.01572 -0.06903,0.03173 -0.103944,0.04799" />
-    <path
-       style="fill:none;stroke:#646567;stroke-width:1.411111;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 47.448087,129.99557 c 0.296331,-0.33418 0.592417,-0.66807 0.900974,-1.12101 0.308557,-0.45293 0.630197,-1.02582 0.958098,-1.73383 0.3279,-0.708 0.668449,-1.5669 1.012404,-2.17897 0.343955,-0.61206 0.694481,-0.98525 0.953215,-1.19705 0.258735,-0.2118 0.425986,-0.2626 0.598041,-0.24897 0.172055,0.0136 0.349904,0.0918 0.554671,0.26719 0.204768,0.17538 0.413883,0.42111 0.639414,0.7635 0.22553,0.34238 0.455939,0.76787 0.689809,1.24417 0.23387,0.47629 0.471081,1.00315 0.66363,1.43816 0.192549,0.435 0.340321,0.77789 0.472147,1.07953 0.131825,0.30165 0.251981,0.57166 0.504422,1.10441 0.252442,0.53275 0.638963,1.33233 0.943957,1.88699 0.304994,0.55466 0.528203,0.86387 0.703616,1.07996 0.175414,0.21608 0.302925,0.3389 0.425119,0.43663 0.122193,0.0977 0.239013,0.17033 0.353296,0.22402 0.114282,0.0537 0.226086,0.0885 0.392885,0.0925 0.1668,0.004 0.389189,-0.0227 0.633416,-0.12299 0.244227,-0.10032 0.511307,-0.2746 0.895643,-0.63304 0.384336,-0.35844 0.891147,-0.90641 1.353147,-1.41874 0.461999,-0.51232 0.882029,-0.99208 1.213102,-1.3372 0.331074,-0.34511 0.573653,-0.55611 0.811609,-0.72074 0.237955,-0.16462 0.471934,-0.28336 0.665822,-0.3624 0.193888,-0.079 0.348393,-0.11869 0.583638,-0.13083 0.235245,-0.0121 0.548148,0.003 0.793842,0.0389 0.245693,0.036 0.422867,0.0928 0.843451,0.30139 0.420585,0.20854 1.225463,0.64513 1.66813,0.88774 0.442666,0.24261 0.593538,0.32944 0.849216,0.46428 0.255678,0.13483 0.616579,0.31788 0.903896,0.4389 0.287317,0.12102 0.501315,0.18016 0.712469,0.22264 0.211154,0.0425 0.419841,0.0684 0.686816,0.074 0.266975,0.006 0.593093,-0.009 0.861992,-0.039 0.268899,-0.0298 0.481242,-0.0747 0.833426,-0.16967 0.352185,-0.095 0.845786,-0.24053 1.402858,-0.39752 0.557072,-0.15699 1.179121,-0.32587 1.782859,-0.43472 0.603739,-0.10886 1.190178,-0.15791 1.88111,-0.14219 0.690932,0.0157 1.487462,0.0962 2.132209,0.16908 0.644747,0.0728 1.137336,0.13793 1.661497,0.20526 0.52416,0.0673 1.080005,0.13692 1.671339,0.1652 0.591334,0.0283 1.218878,0.0153 1.890125,-0.0147 0.671247,-0.03 1.387056,-0.077 2.140291,-0.11145 0.753235,-0.0344 1.54483,-0.0563 2.321094,-0.0942 0.776265,-0.0379 1.538023,-0.0919 2.261149,-0.10543 0.723126,-0.0135 1.408425,0.0134 2.090357,0.0451 0.681932,0.0317 1.361266,0.0683 2.268039,0.0998 0.906773,0.0314 2.042065,0.0578 3.189529,0.0686 1.147464,0.0108 2.308044,0.006 3.362164,-0.0226 1.05412,-0.0286 2.00244,-0.0811 2.95028,-0.13345"
-       id="path2992"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect2994"
-       inkscape:original-d="m 47.448087,129.99557 c 0.296349,-0.33416 0.592433,-0.66806 0.888251,-1.00169 0.321368,-0.5722 0.643006,-1.14509 0.964112,-1.71723 0.335021,-0.84376 0.675296,-1.70277 1.012547,-2.55376 0.350528,-0.37318 0.701056,-0.74637 1.051187,-1.11916 0.167275,-0.051 0.334529,-0.10179 0.501399,-0.15229 0.177435,0.0776 0.355277,0.15579 0.532519,0.23407 0.227989,0.27635 0.441555,0.51829 0.661934,0.77783 0.230714,0.4253 0.461122,0.85079 0.691285,1.27658 0.23758,0.52683 0.474792,1.05369 0.71179,1.58093 0.148103,0.34277 0.295873,0.68566 0.443413,1.02889 0.116109,0.26006 0.236265,0.53007 0.354002,0.7955 0.387143,0.80006 0.773665,1.59964 1.160102,2.39985 0.223533,0.30904 0.446741,0.61826 0.669716,0.92778 0.127815,0.12259 0.255326,0.24541 0.38259,0.36851 0.117068,0.0723 0.233876,0.14492 0.350417,0.21778 0.111932,0.0345 0.22374,0.0693 0.335211,0.10438 0.221994,-0.0269 0.444384,-0.0536 0.666181,-0.08 0.266642,-0.17408 0.533723,-0.34835 0.800188,-0.52213 0.502314,-0.54298 1.009073,-1.091 1.513213,-1.63611 0.419869,-0.47953 0.839898,-0.95929 1.259451,-1.43855 0.242556,-0.21101 0.485134,-0.42201 0.727307,-0.63262 0.233701,-0.11873 0.467683,-0.23746 0.701128,-0.3558 0.154339,-0.0398 0.308834,-0.0795 0.462856,-0.11882 0.316109,0.0238 0.629436,0.0301 0.943756,0.0455 0.177157,0.0565 0.354332,0.11335 0.531103,0.17043 0.668309,0.35293 1.469345,0.7966 2.203622,1.1953 0.15108,0.0865 0.301937,0.17336 0.452509,0.26044 0.360765,0.18258 0.721667,0.36563 1.082103,0.54885 0.21413,0.0588 0.42812,0.11796 0.641782,0.17734 0.208597,0.0256 0.417274,0.0516 0.625514,0.0777 0.325671,-0.015 0.651788,-0.0298 0.977286,-0.0443 0.212262,-0.0451 0.42462,-0.0899 0.636532,-0.13451 0.492443,-0.14538 0.986044,-0.29092 1.478669,-0.43599 0.62152,-0.16892 1.243568,-0.3378 1.864955,-0.5063 0.586116,-0.0493 1.17256,-0.0983 1.758442,-0.14709 0.796026,0.0802 1.592559,0.16068 2.388444,0.24142 0.493623,0.0649 0.986208,0.13002 1.478915,0.19543 0.555607,0.0693 1.111457,0.13885 1.66679,0.20867 0.627293,-0.0132 1.254837,-0.0262 1.881857,-0.0389 0.71546,-0.0473 1.431272,-0.0943 2.146509,-0.14106 0.791242,-0.0221 1.582838,-0.0439 2.37386,-0.0655 0.761497,-0.0542 1.523254,-0.10822 2.284484,-0.16194 0.685051,0.0266 1.370346,0.0536 2.055122,0.0807 0.679095,0.0363 1.358429,0.0729 2.037246,0.10975 1.134722,0.026 2.270012,0.0524 3.404622,0.079 1.160312,-0.005 2.320892,-0.01 3.480942,-0.0144 0.94817,-0.0527 1.8965,-0.1051 2.84435,-0.15726" />
-    <path
-       style="fill:none;stroke:#646567;stroke-width:1.411111;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 47.448087,129.99557 c 0.656689,-1.03275 1.31318,-2.06519 1.927347,-3.36512 0.614166,-1.29993 1.186431,-2.86828 1.590795,-4.07049 0.404363,-1.20221 0.641119,-2.03909 0.99345,-3.40456 0.35233,-1.36548 0.821089,-3.26294 1.094313,-4.38225 0.273225,-1.1193 0.351345,-1.46219 0.519818,-1.81247 0.168473,-0.35027 0.42763,-0.70864 0.596815,-0.92005 0.169186,-0.21141 0.248692,-0.27635 0.325077,-0.31978 0.07639,-0.0434 0.150185,-0.0657 0.259401,-0.0479 0.109216,0.0178 0.255519,0.0758 0.414058,0.21866 0.15854,0.14285 0.330436,0.3713 0.505463,0.68582 0.175027,0.31451 0.353311,0.71525 0.570873,1.33956 0.217561,0.62432 0.474207,1.47166 0.707733,2.35401 0.233525,0.88236 0.443761,1.79913 0.600746,2.51028 0.156985,0.71115 0.260627,1.21628 0.424968,2.05527 0.164341,0.83899 0.389174,2.01078 0.630992,3.28147 0.241817,1.27069 0.500438,2.63933 0.725405,3.8028 0.224966,1.16347 0.416178,2.12125 0.646843,3.15083 0.230665,1.02959 0.500645,2.13035 0.726082,2.94619 0.225437,0.81585 0.406221,1.34634 0.578625,1.75909 0.172405,0.41276 0.336301,0.70744 0.461855,0.90001 0.125553,0.19256 0.212641,0.28281 0.295382,0.34878 0.08274,0.066 0.160988,0.1076 0.236762,0.1308 0.07577,0.0232 0.149005,0.028 0.26212,-0.0135 0.113116,-0.0415 0.26709,-0.12959 0.443634,-0.31716 0.176544,-0.18758 0.377088,-0.47595 0.591413,-0.87076 0.214324,-0.3948 0.443379,-0.89766 0.712314,-1.55956 0.268935,-0.66189 0.578408,-1.48439 0.863566,-2.2454 0.285159,-0.76101 0.547404,-1.46429 0.803185,-2.1106 0.255781,-0.64632 0.505912,-1.23783 0.681221,-1.62571 0.175309,-0.38788 0.275983,-0.57261 0.397082,-0.77319 0.1211,-0.20058 0.263135,-0.41786 0.397023,-0.59712 0.133887,-0.17926 0.260188,-0.3213 0.477121,-0.45942 0.216934,-0.13811 0.556806,-0.28673 0.771453,-0.34775 0.214647,-0.061 0.32048,-0.0416 0.42982,-0.006 0.10934,0.0358 0.222828,0.0883 0.342597,0.16081 0.119768,0.0725 0.246364,0.16549 0.384337,0.2864 0.137972,0.12091 0.287597,0.27002 0.459375,0.46445 0.171777,0.19442 0.365783,0.43425 0.659819,0.82077 0.294037,0.38653 0.688015,0.91965 0.953324,1.27932 0.265308,0.35967 0.401879,0.5458 0.633217,0.83271 0.231338,0.28691 0.553618,0.67005 0.838318,0.95202 0.284701,0.28198 0.529824,0.46045 0.723898,0.58029 0.194073,0.11985 0.337083,0.18107 0.478443,0.22519 0.141359,0.0441 0.281276,0.0712 0.42164,0.0829 0.140365,0.0117 0.281666,0.008 0.427332,-0.0116 0.145666,-0.0197 0.29647,-0.0554 0.456306,-0.10938 0.159836,-0.054 0.329675,-0.12666 0.517768,-0.22473 0.188094,-0.0981 0.395575,-0.22214 0.659188,-0.39305 0.263613,-0.17091 0.584727,-0.38954 0.812962,-0.54561 0.228236,-0.15608 0.364361,-0.25012 0.758414,-0.47989 0.394052,-0.22977 1.049074,-0.59703 1.42837,-0.79581 0.379297,-0.19877 0.485536,-0.23032 0.680751,-0.25859 0.195215,-0.0283 0.481749,-0.0537 0.72801,-0.0571 0.246261,-0.003 0.453558,0.015 0.670832,0.0499 0.217274,0.0349 0.46289,0.0904 0.752268,0.17483 0.289379,0.0845 0.632178,0.20019 1.4589,0.4155 0.826721,0.21531 2.138819,0.53061 3.069459,0.66259 0.93064,0.13198 1.480484,0.0808 1.973576,-0.0237 0.493092,-0.10452 0.929936,-0.26253 1.61148,-0.34094 0.681544,-0.0784 1.609431,-0.0774 2.536375,-0.0764"
-       id="path2996"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect2998"
-       inkscape:original-d="m 47.448087,129.99557 c 0.656754,-1.03271 1.313246,-2.06515 1.969473,-3.09732 0.572188,-1.56768 1.144453,-3.13603 1.716281,-4.70364 0.236924,-0.83681 0.473681,-1.67369 0.710125,-2.51013 0.468244,-1.89451 0.936988,-3.79197 1.405086,-5.68755 0.07836,-0.34304 0.15648,-0.68593 0.234323,-1.0285 0.258956,-0.35799 0.518112,-0.71636 0.776772,-1.07414 0.07964,-0.0651 0.159149,-0.13004 0.238326,-0.19467 0.07355,-0.0224 0.147362,-0.0446 0.220644,-0.0665 0.145322,0.0573 0.291629,0.11533 0.437046,0.17338 0.171834,0.22775 0.343728,0.4562 0.515194,0.68469 0.178613,0.40062 0.356897,0.80136 0.534951,1.20244 0.257066,0.84759 0.513712,1.69493 0.77017,2.54279 0.210585,0.91688 0.420823,1.83365 0.630838,2.75088 0.10395,0.50508 0.207595,1.01021 0.310994,1.51572 0.22528,1.17247 0.450112,2.34426 0.674772,3.51679 0.258974,1.36885 0.517594,2.73749 0.775997,4.10663 0.191534,0.9578 0.382746,1.91558 0.573722,2.87377 0.270359,1.10096 0.540337,2.20172 0.810109,3.30297 0.18111,0.53041 0.361895,1.0609 0.542446,1.59175 0.164256,0.29459 0.32815,0.58928 0.491826,0.88431 0.0874,0.09 0.174472,0.18026 0.261311,0.27078 0.07853,0.0414 0.156789,0.083 0.234788,0.12489 0.07337,0.005 0.146654,0.009 0.219586,0.0144 0.15321,-0.0878 0.307186,-0.17592 0.460383,-0.26349 0.199993,-0.28746 0.400537,-0.57583 0.600408,-0.86335 0.228841,-0.50208 0.457896,-1.00494 0.686448,-1.50701 0.309343,-0.82172 0.618816,-1.64422 0.927828,-2.46593 0.261308,-0.70031 0.523555,-1.40358 0.784934,-2.10498 0.250166,-0.59123 0.500298,-1.18274 0.750049,-1.77372 0.10083,-0.18479 0.201504,-0.36952 0.301858,-0.55389 0.141814,-0.2168 0.28385,-0.43408 0.425375,-0.65072 0.126204,-0.1419 0.2525,-0.28395 0.378352,-0.42552 0.3029,-0.14634 0.647819,-0.28341 0.971333,-0.42472 0.105886,0.0191 0.211717,0.0385 0.317177,0.0581 0.113311,0.052 0.226804,0.10444 0.339807,0.15705 0.126603,0.0925 0.253204,0.18544 0.37941,0.27856 0.149783,0.14874 0.299408,0.29785 0.448715,0.44717 0.194273,0.23956 0.388281,0.47938 0.582022,0.71947 0.394343,0.53298 0.788318,1.0661 1.182079,1.59955 0.136858,0.18589 0.273426,0.37202 0.409744,0.55843 0.326478,0.38728 0.648624,0.77053 0.97254,1.15619 0.245417,0.17823 0.49054,0.3567 0.735412,0.53544 0.143208,0.0609 0.286208,0.12215 0.428913,0.18363 0.13993,0.0268 0.279845,0.0539 0.419367,0.0812 0.141145,-0.004 0.282438,-0.008 0.42326,-0.011 0.150489,-0.0358 0.301294,-0.0715 0.451543,-0.10691 0.169407,-0.0726 0.339246,-0.14524 0.508473,-0.21747 0.206965,-0.12387 0.414446,-0.24794 0.621271,-0.37151 0.320411,-0.21823 0.641522,-0.43686 0.961888,-0.65489 0.136117,-0.0941 0.272232,-0.18816 0.40795,-0.28184 0.652378,-0.36589 1.307399,-0.73315 1.960703,-1.09933 0.105272,-0.0315 0.211526,-0.063 0.316894,-0.0941 0.285094,-0.0255 0.571629,-0.0509 0.857049,-0.076 0.207147,0.0181 0.414446,0.0365 0.621273,0.0552 0.225076,0.063 0.473377,0.10657 0.709668,0.16025 0.342503,0.11526 0.685303,0.23097 1.027557,0.34685 1.311156,0.31475 2.623254,0.63005 3.934481,0.94547 0.549955,-0.0514 1.099801,-0.10252 1.649307,-0.15338 0.436647,-0.1581 0.87349,-0.31611 1.309838,-0.47377 0.926795,5.3e-4 1.854681,0.002 2.781625,0.003" />
-    <path
-       style="fill:none;stroke:#646567;stroke-width:1.411111;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 52.584921,116.67725 c 0.620171,-2.72011 1.240272,-5.43992 1.616299,-7.11994 0.376026,-1.68001 0.508017,-2.32038 0.787786,-3.18365 0.27977,-0.86327 0.707679,-1.95052 0.9804,-2.58625 0.272721,-0.63572 0.390457,-0.82055 0.562566,-1.0376 0.172109,-0.21704 0.399324,-0.46721 0.659884,-0.67833 0.260561,-0.21113 0.555432,-0.38409 0.864766,-0.49594 0.309335,-0.11185 0.634169,-0.16302 0.973123,-0.15402 0.338955,0.009 0.693106,0.0781 1.000094,0.17486 0.306987,0.0967 0.56752,0.22122 0.833682,0.39141 0.266162,0.17019 0.53841,0.38635 0.877095,0.74604 0.338685,0.35968 0.744084,0.86317 1.057931,1.32014 0.313848,0.45696 0.53619,0.86747 0.771885,1.37021 0.235694,0.50273 0.484612,1.09742 0.783114,1.96709 0.298503,0.86967 0.646374,2.0137 0.960928,3.21203 0.314554,1.19833 0.59562,2.45036 0.866726,3.77569 0.271106,1.32534 0.532121,2.72336 0.748133,3.93487 0.216012,1.21152 0.386925,2.23602 0.580957,3.41589 0.194031,1.17986 0.412898,2.52567 0.61512,3.7508 0.202222,1.22513 0.388609,2.33457 0.606997,3.57334 0.218387,1.23878 0.468652,2.60618 0.69138,3.71057 0.222729,1.1044 0.417822,1.94527 0.601237,2.62105 0.183415,0.67579 0.355057,1.18611 0.491005,1.54473 0.135947,0.35862 0.236104,0.56527 0.330368,0.72967 0.09426,0.1644 0.182501,0.2863 0.264998,0.37765 0.0825,0.0914 0.159076,0.15198 0.23168,0.19179 0.0726,0.0398 0.141126,0.0588 0.244561,0.0391 0.103436,-0.0197 0.242395,-0.0781 0.380156,-0.19118 0.137761,-0.11309 0.275396,-0.28163 0.42279,-0.52452 0.147395,-0.24288 0.305485,-0.56155 0.483656,-0.98317 0.17817,-0.42162 0.377123,-0.94778 0.558754,-1.46594 0.18163,-0.51816 0.346358,-1.02947 0.468624,-1.41154 0.122267,-0.38206 0.202271,-0.63549 0.348058,-1.09054 0.145787,-0.45504 0.357931,-1.11349 0.634669,-1.92211 0.276737,-0.80861 0.618649,-1.76913 0.859306,-2.39594 0.240657,-0.6268 0.38028,-0.92055 0.549365,-1.2184 0.169086,-0.29784 0.368068,-0.60056 0.552634,-0.83063 0.184566,-0.23006 0.355209,-0.38818 0.512757,-0.49097 0.157549,-0.10278 0.302598,-0.15069 0.424017,-0.17227 0.121419,-0.0216 0.219954,-0.017 0.320369,0.003 0.100416,0.0203 0.203564,0.0566 0.334267,0.12944 0.130702,0.0729 0.286829,0.18078 0.458107,0.33809 0.171278,0.15731 0.356672,0.36336 0.559086,0.62413 0.202415,0.26077 0.421911,0.57633 0.613312,0.86256 0.191402,0.28623 0.354639,0.54302 0.794917,1.18676 0.440278,0.64375 1.157181,1.67385 1.591314,2.25461 0.434132,0.58076 0.585228,0.71182 0.729578,0.81844 0.14435,0.10663 0.281905,0.18879 0.415574,0.25189 0.133668,0.0631 0.26349,0.10717 0.392347,0.13546 0.128856,0.0283 0.257017,0.0409 0.387693,0.0383 0.130676,-0.003 0.264465,-0.0204 0.436117,-0.0692 0.171653,-0.0488 0.382325,-0.1289 0.593097,-0.237 0.210772,-0.10811 0.422763,-0.24473 0.643404,-0.40405 0.220642,-0.15932 0.450937,-0.34204 0.966832,-0.72744 0.515895,-0.3854 1.319748,-0.97523 1.839715,-1.31206 0.519967,-0.33683 0.757237,-0.42156 1.002523,-0.48119 0.245285,-0.0596 0.499387,-0.0944 0.727878,-0.1042 0.228491,-0.01 0.432222,0.005 0.618442,0.0322 0.18622,0.0271 0.355599,0.0663 0.523947,0.11342 0.168348,0.0471 0.33627,0.10219 1.020083,0.34866 0.683813,0.24647 1.886017,0.68521 2.679633,0.92372 0.793616,0.23851 1.1798,0.27726 1.616454,0.27142 0.436654,-0.006 0.924373,-0.0563 1.772158,-0.19528 0.847784,-0.13901 2.057351,-0.36685 3.018001,-0.48575 0.96065,-0.11889 1.6735,-0.12903 2.24608,-0.10377 0.57257,0.0253 1.00543,0.0859 1.4379,0.14655"
-       id="path3000"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect3002"
-       inkscape:original-d="m 52.584921,116.67725 c 0.620364,-2.72007 1.240465,-5.43988 1.860302,-8.15942 0.132225,-0.64049 0.264215,-1.28086 0.395925,-1.92089 0.427768,-1.08649 0.855676,-2.17375 1.283118,-3.26023 0.11793,-0.18498 0.235667,-0.36981 0.353102,-0.55432 0.226724,-0.24961 0.45394,-0.49978 0.680514,-0.74927 0.294486,-0.17285 0.589359,-0.34581 0.883639,-0.51832 0.324406,-0.0513 0.649235,-0.1025 0.973455,-0.15335 0.353775,0.0688 0.707933,0.13791 1.061503,0.20725 0.260498,0.12409 0.521033,0.24858 0.781151,0.37327 0.272282,0.21572 0.544533,0.43188 0.816403,0.64822 0.405559,0.50309 0.810953,1.00658 1.216036,1.51026 0.222639,0.41031 0.444984,0.82082 0.66708,1.23163 0.249296,0.5947 0.498216,1.18939 0.746927,1.78449 0.34829,1.14427 0.696164,2.2883 1.043847,3.43286 0.281414,1.25213 0.562478,2.50416 0.843323,3.75664 0.26136,1.3982 0.52238,2.79622 0.783172,4.19473 0.171227,1.02453 0.342138,2.04903 0.512812,3.07393 0.217361,1.33484 0.436259,2.68064 0.65399,4.02136 0.186711,1.10954 0.373099,2.21898 0.559252,3.32886 0.250624,1.36766 0.500888,2.73506 0.750938,4.10299 0.195416,0.84085 0.390506,1.68172 0.585364,2.52297 0.171984,0.51028 0.343625,1.0206 0.515038,1.53129 0.100483,0.20651 0.200638,0.41316 0.300558,0.62013 0.08859,0.12176 0.176829,0.24366 0.264846,0.36589 0.07691,0.0604 0.15349,0.12102 0.229838,0.18194 0.06871,0.0187 0.137226,0.0377 0.205441,0.0569 0.138515,-0.0584 0.277484,-0.11679 0.41583,-0.1748 0.137263,-0.16802 0.274891,-0.33657 0.411943,-0.50446 0.157816,-0.31785 0.315907,-0.63652 0.473466,-0.95439 0.198819,-0.52537 0.397772,-1.05153 0.59626,-1.5769 0.164793,-0.51095 0.32952,-1.02226 0.493882,-1.533 0.08017,-0.25339 0.160176,-0.50682 0.239868,-0.75984 0.211879,-0.65707 0.424024,-1.31552 0.635641,-1.97289 0.341846,-0.95986 0.683757,-1.92038 1.025239,-2.88017 0.139795,-0.29382 0.279416,-0.58757 0.418727,-0.88095 0.198813,-0.30232 0.397793,-0.60504 0.596294,-0.90716 0.170561,-0.15806 0.341204,-0.31618 0.51141,-0.47388 0.144852,-0.048 0.289904,-0.0959 0.434462,-0.1435 0.09835,0.004 0.196866,0.009 0.294902,0.0137 0.102896,0.0358 0.206057,0.072 0.308692,0.10844 0.158797,0.10944 0.314986,0.21726 0.472083,0.32629 0.185525,0.20564 0.370919,0.41169 0.555984,0.61793 0.219792,0.31534 0.439291,0.6309 0.658538,0.94676 0.16356,0.25661 0.326794,0.5134 0.489796,0.7705 0.71755,1.03038 1.434452,2.06048 2.151282,3.09112 0.151376,0.13081 0.302472,0.26187 0.453311,0.3932 0.137795,0.0819 0.275362,0.16404 0.412647,0.24647 0.12996,0.0438 0.259807,0.0878 0.389313,0.13217 0.128111,0.0123 0.25627,0.0249 0.384008,0.0377 0.133559,-0.018 0.267348,-0.0358 0.400627,-0.0533 0.210005,-0.08 0.420674,-0.16011 0.630613,-0.23977 0.211614,-0.13648 0.423606,-0.2731 0.635011,-0.40925 0.229893,-0.18246 0.460189,-0.36518 0.68989,-0.54737 0.802084,-0.58861 1.605936,-1.17845 2.40851,-1.76728 0.23735,-0.0849 0.47461,-0.16966 0.711517,-0.25409 0.253688,-0.0349 0.507794,-0.0696 0.761294,-0.10406 0.203528,0.0147 0.407265,0.0296 0.610502,0.0449 0.169246,0.0389 0.338635,0.0781 0.507556,0.1176 0.167804,0.0547 0.335724,0.10981 0.503192,0.16512 1.200169,0.43763 2.402372,0.87637 3.603159,1.31495 0.386355,0.0385 0.772544,0.0772 1.158418,0.11623 0.487383,-0.0506 0.975098,-0.10107 1.462248,-0.15121 1.208403,-0.22785 2.41797,-0.45569 3.62656,-0.68314 0.71275,-0.0104 1.4256,-0.0206 2.13799,-0.0304 0.4328,0.0604 0.86566,0.12103 1.29809,0.18194" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="kringel"
-     style="stroke-linecap:butt;stroke-linejoin:round"
-     transform="translate(1.2853296e-5)">
-    <ellipse
-       style="opacity:0.15;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49982667;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="path1652"
-       cx="67.210365"
-       cy="49.55434"
-       rx="8.9491396"
-       ry="8.545476" />
-    <ellipse
-       style="opacity:0.15;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49704278;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="path1654"
-       cx="104.12398"
-       cy="59.155869"
-       rx="9.1876955"
-       ry="8.7350845" />
-    <ellipse
-       style="opacity:0.15;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49982667;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="path1652-5"
-       cx="34.766869"
-       cy="75.09436"
-       rx="8.9491396"
-       ry="8.545476" />
-    <ellipse
-       style="opacity:0.15;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49982667;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="path1652-3"
-       cx="129.77319"
-       cy="89.28965"
-       rx="8.9491396"
-       ry="8.545476" />
-    <path
-       style="fill:#e96088;fill-opacity:1;stroke:#00549f;stroke-width:1.76388884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 49.69255,96.889507 C 46.956162,92.9617 44.219809,89.033945 41.483495,85.106244"
-       id="path1758"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect1760"
-       inkscape:original-d="M 49.69255,96.889507 C 46.956464,92.96149 44.220112,89.033734 41.483495,85.106244" />
-    <path
-       style="fill:none;stroke:#00549f;stroke-width:1.9402777;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 68.94442,90.484117 C 68.425661,80.803167 67.788368,68.910177 67.210362,58.123584"
-       id="path1762"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect1764"
-       inkscape:original-d="M 68.94442,90.484117 C 68.366666,80.806328 67.788646,68.910162 67.210362,58.123584" />
-    <path
-       style="fill:#00549f;fill-opacity:1;stroke:#00549f;stroke-width:1.9402777;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 93.251473,92.495879 C 95.450579,85.046442 97.649931,77.596176 99.84902,70.146798"
-       id="path1766"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect1768"
-       inkscape:original-d="m 93.251473,92.495879 c 2.21212,-7.445595 4.398629,-14.899653 6.597547,-22.349081" />
-    <path
-       style="fill:none;stroke:#00549f;stroke-width:1.76388884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 120.77344,97.587591 c -2.90619,2.363516 -5.81266,4.727269 -8.71943,7.091259"
-       id="path1770"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect1772"
-       inkscape:original-d="m 120.77344,97.587591 c -2.90621,2.363486 -5.81269,4.727239 -8.71943,7.091259" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="logo"
-     transform="translate(-239.7063,10.906828)"
-     style="display:inline;stroke-linecap:butt;stroke-linejoin:round">
-    <path
-       style="opacity:1;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:49.01657104;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       d="m 1236.6855,-41.222656 a 330.70866,330.70866 0 0 0 -330.70894,330.707036 330.70866,330.70866 0 0 0 330.70894,330.70898 330.70866,330.70866 0 0 0 330.709,-330.70898 330.70866,330.70866 0 0 0 -1.1035,-22.04297 l -28.2461,4.13086 a 302.03602,283.46457 0 0 1 0.6758,17.91211 A 302.03602,283.46457 0 0 1 1236.6855,572.94922 302.03602,283.46457 0 0 1 934.64844,289.48438 302.03602,283.46457 0 0 1 1236.6855,6.0214844 302.03602,283.46457 0 0 1 1464.7734,104.19531 c 10.4697,-7.227913 21.3071,-14.703948 30.1289,-20.816404 A 330.70866,330.70866 0 0 0 1236.6855,-41.222656 Z"
-       transform="scale(0.26458333)"
-       id="path949"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:1;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:37.79527664;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       d="M 556.28711,391.42969 A 150.71429,100.71429 0 0 0 405.57227,492.14258 150.71429,100.71429 0 0 0 556.28711,592.85742 150.71429,100.71429 0 0 0 707.00195,492.14258 150.71429,100.71429 0 0 0 556.28711,391.42969 Z m 0,10.51172 a 132.28348,90.202475 0 0 1 132.2832,90.20117 132.28348,90.202475 0 0 1 -132.2832,90.20312 132.28348,90.202475 0 0 1 -132.2832,-90.20312 132.28348,90.202475 0 0 1 132.2832,-90.20117 z"
-       transform="matrix(0.26458333,0,0,0.26458333,168.95536,-24.462611)"
-       id="path5459"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:1;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:23.93139648;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       d="M 1160,101.19336 A 47.244094,44.920603 0 0 0 1112.7559,146.11523 47.244094,44.920603 0 0 0 1160,191.03516 47.244094,44.920603 0 0 0 1207.2441,146.11523 47.244094,44.920603 0 0 0 1160,101.19336 Z m 0,12.57812 a 34.015748,32.342835 0 0 1 34.0156,32.34375 A 34.015748,32.342835 0 0 1 1160,178.45703 34.015748,32.342835 0 0 1 1125.9844,146.11523 34.015748,32.342835 0 0 1 1160,113.77148 Z"
-       transform="scale(0.26458333)"
-       id="path5607-6"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.29797745px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#00549f;fill-opacity:1;stroke:none;stroke-width:0.25744942;stroke-linecap:butt;stroke-linejoin:round"
-       x="373.39963"
-       y="57.81057"
-       id="text5683"
-       transform="scale(0.98660546,1.0135764)"><tspan
-         sodipodi:role="line"
-         id="tspan5681"
-         x="373.39963"
-         y="57.81057"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:27.46127319px;font-family:'Open Sans Condensed';-inkscape-font-specification:'Open Sans Condensed, Bold Condensed';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#00549f;fill-opacity:1;stroke-width:0.25744942;stroke-linecap:butt;stroke-linejoin:round">SLEW</tspan></text>
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot5685"
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-linecap:butt;stroke-linejoin:round"><flowRegion
-         id="flowRegion5687"
-         style="stroke-linecap:butt;stroke-linejoin:round"><rect
-           id="rect5689"
-           width="89.90358"
-           height="80.812202"
-           x="1514.2186"
-           y="91.988716"
-           style="stroke-linecap:butt;stroke-linejoin:round" /></flowRegion><flowPara
-         id="flowPara5691"
-         style="stroke-linecap:butt;stroke-linejoin:round" /></flowRoot>    <path
-       transform="translate(239.7063,-10.906828)"
-       style="display:inline;opacity:0.15;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.98501724;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       inkscape:transform-center-x="0.88475427"
-       inkscape:transform-center-y="-0.19661715"
-       d="M 111.43325,116.69093 A 35.141579,23.897392 0 0 1 76.291672,140.58833 35.141579,23.897392 0 0 1 41.150093,116.69093 35.141579,23.897392 0 0 1 76.291672,92.793541 35.141579,23.897392 0 0 1 111.43325,116.69093 Z"
-       id="path3004"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;opacity:1;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.33184814;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       d="m 343.83028,36.185995 a 12.499999,11.885242 0 0 0 -12.5,11.885578 12.499999,11.885242 0 0 0 12.5,11.885063 12.499999,11.885242 0 0 0 12.5,-11.885063 12.499999,11.885242 0 0 0 -12.5,-11.885578 z m 0,3.327961 a 8.9999994,8.5573745 0 0 1 8.99996,8.557617 8.9999994,8.5573745 0 0 1 -8.99996,8.5571 8.9999994,8.5573745 0 0 1 -8.99996,-8.5571 8.9999994,8.5573745 0 0 1 8.99996,-8.557617 z"
-       id="path5607-6-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;opacity:1;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.33184814;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       d="m 274.47317,52.290334 a 12.499999,11.885242 0 0 0 -12.5,11.885577 12.499999,11.885242 0 0 0 12.5,11.885064 12.499999,11.885242 0 0 0 12.5,-11.885064 12.499999,11.885242 0 0 0 -12.5,-11.885577 z m 0,3.32796 a 8.9999994,8.5573745 0 0 1 8.99996,8.557617 8.9999994,8.5573745 0 0 1 -8.99996,8.557101 8.9999994,8.5573745 0 0 1 -8.99996,-8.557101 8.9999994,8.5573745 0 0 1 8.99996,-8.557617 z"
-       id="path5607-6-6"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;opacity:1;fill:#00549f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.33184814;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       d="m 369.42868,66.497243 a 12.499999,11.885242 0 0 0 -12.5,11.885577 12.499999,11.885242 0 0 0 12.5,11.885064 12.499999,11.885242 0 0 0 12.5,-11.885064 12.499999,11.885242 0 0 0 -12.5,-11.885577 z m 0,3.32796 a 8.9999994,8.5573745 0 0 1 8.99996,8.557617 8.9999994,8.5573745 0 0 1 -8.99996,8.557101 8.9999994,8.5573745 0 0 1 -8.99996,-8.557101 8.9999994,8.5573745 0 0 1 8.99996,-8.557617 z"
-       id="path5607-6-7"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/src/branding/slew/img/slew_logo.png b/src/branding/slew/img/slew_logo.png
deleted file mode 100644
index 6ed12c68..00000000
Binary files a/src/branding/slew/img/slew_logo.png and /dev/null differ
diff --git a/src/branding/slew/img/slew_magenta.svg b/src/branding/slew/img/slew_magenta.svg
deleted file mode 100644
index b5b5386c..00000000
--- a/src/branding/slew/img/slew_magenta.svg
+++ /dev/null
@@ -1,1057 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="195.85469mm"
-   height="174.99966mm"
-   viewBox="0 0 195.85469 174.99966"
-   version="1.1"
-   id="svg8"
-   sodipodi:docname="slew_magenta.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <defs
-     id="defs2"
-     style="stroke-linecap:butt;stroke-linejoin:round">
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect1772"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect1768"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect1764"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect1760"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4491">
-      <stop
-         style="stop-color:#f9d2da;stop-opacity:1;"
-         offset="0"
-         id="stop4487" />
-      <stop
-         style="stop-color:#f9d2da;stop-opacity:0;"
-         offset="1"
-         id="stop4489" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3002"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect2998"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect2994"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect2988"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect2984"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6665"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect6661"
-       is_visible="true" />
-    <linearGradient
-       id="linearGradient5493"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#6264cc;stop-opacity:1;"
-         offset="0"
-         id="stop5491" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2424"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2422" />
-    </linearGradient>
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4159"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4155"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4151"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4147"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4143"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4139"
-       effect="bspline" />
-    <style
-       type="text/css"
-       id="style3286">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
-    <path
-       inkscape:connector-curvature="0"
-       d="M 0,0 V 3.5"
-       id="me6029f38e9"
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 12.40625,8.296875 h 16.109375 v 55.625 L 10.984375,60.40625 v 8.984375 l 17.4375,3.515625 H 38.28125 V 8.296875 H 54.390625 V 0 H 12.40625 Z"
-       id="DejaVuSans-49" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 31.78125,66.40625 q -7.609375,0 -11.453125,-7.5 Q 16.5,51.421875 16.5,36.375 q 0,-14.984375 3.828125,-22.484375 3.84375,-7.5 11.453125,-7.5 7.671875,0 11.5,7.5 3.84375,7.5 3.84375,22.484375 0,15.046875 -3.84375,22.53125 -3.828125,7.5 -11.5,7.5 z m 0,7.8125 q 12.265625,0 18.734375,-9.703125 6.46875,-9.6875 6.46875,-28.140625 0,-18.40625 -6.46875,-28.109375 -6.46875,-9.6875 -18.734375,-9.6875 -12.25,0 -18.71875,9.6875 Q 6.59375,17.96875 6.59375,36.375 q 0,18.453125 6.46875,28.140625 6.46875,9.703125 18.71875,9.703125 z"
-       id="DejaVuSans-48" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 19.1875,8.296875 H 53.609375 V 0 H 7.328125 v 8.296875 q 5.609375,5.8125 15.296875,15.59375 9.703125,9.796875 12.1875,12.640625 4.734375,5.3125 6.609375,9 1.890625,3.6875 1.890625,7.25 0,5.8125 -4.078125,9.46875 -4.078125,3.671875 -10.625,3.671875 -4.640625,0 -9.796875,-1.609375 -5.140625,-1.609375 -11,-4.890625 v 9.96875 Q 13.765625,71.78125 18.9375,73 q 5.1875,1.21875 9.484375,1.21875 11.328125,0 18.0625,-5.671875 6.734375,-5.65625 6.734375,-15.125 0,-4.5 -1.6875,-8.53125 Q 49.859375,40.875 45.40625,35.40625 44.1875,33.984375 37.640625,27.21875 31.109375,20.453125 19.1875,8.296875 Z"
-       id="DejaVuSans-50" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 37.796875,64.3125 12.890625,25.390625 h 24.90625 z m -2.59375,8.59375 h 12.40625 V 25.390625 h 10.40625 V 17.1875 H 47.609375 V 0 h -9.8125 V 17.1875 H 4.890625 v 9.515625 z"
-       id="DejaVuSans-52" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 33.015625,40.375 q -6.640625,0 -10.53125,-4.546875 -3.875,-4.53125 -3.875,-12.4375 0,-7.859375 3.875,-12.4375 3.890625,-4.5625 10.53125,-4.5625 6.640625,0 10.515625,4.5625 3.875,4.578125 3.875,12.4375 0,7.90625 -3.875,12.4375 Q 39.65625,40.375 33.015625,40.375 Z M 52.59375,71.296875 V 62.3125 q -3.71875,1.75 -7.5,2.671875 -3.78125,0.9375 -7.5,0.9375 -9.765625,0 -14.921875,-6.59375 -5.140625,-6.59375 -5.875,-19.921875 2.875,4.25 7.21875,6.515625 4.359375,2.265625 9.578125,2.265625 10.984375,0 17.359375,-6.671875 6.375,-6.65625 6.375,-18.125 0,-11.234375 -6.640625,-18.03125 -6.640625,-6.78125 -17.671875,-6.78125 -12.65625,0 -19.34375,9.6875 -6.6875,9.703125 -6.6875,28.109375 0,17.28125 8.203125,27.5625 8.203125,10.28125 22.015625,10.28125 3.71875,0 7.5,-0.734375 3.78125,-0.734375 7.890625,-2.1875 z"
-       id="DejaVuSans-54" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 31.78125,34.625 q -7.03125,0 -11.0625,-3.765625 -4.015625,-3.765625 -4.015625,-10.34375 0,-6.59375 4.015625,-10.359375 4.03125,-3.765625 11.0625,-3.765625 7.03125,0 11.078125,3.78125 4.0625,3.796875 4.0625,10.34375 0,6.578125 -4.03125,10.34375 Q 38.875,34.625 31.78125,34.625 Z m -9.859375,4.1875 Q 15.578125,40.375 12.03125,44.71875 8.5,49.078125 8.5,55.328125 q 0,8.734375 6.21875,13.8125 6.234375,5.078125 17.0625,5.078125 10.890625,0 17.09375,-5.078125 6.203125,-5.078125 6.203125,-13.8125 0,-6.25 -3.546875,-10.609375 Q 48,40.375 41.703125,38.8125 q 7.125,-1.65625 11.09375,-6.5 3.984375,-4.828125 3.984375,-11.796875 0,-10.609375 -6.46875,-16.28125 -6.46875,-5.65625 -18.53125,-5.65625 -12.046875,0 -18.53125,5.65625 -6.46875,5.671875 -6.46875,16.28125 0,6.96875 4,11.796875 4.015625,4.84375 11.140625,6.5 z M 18.3125,54.390625 q 0,-5.65625 3.53125,-8.828125 3.546875,-3.171875 9.9375,-3.171875 6.359375,0 9.9375,3.171875 3.59375,3.171875 3.59375,8.828125 0,5.671875 -3.59375,8.84375 -3.578125,3.171875 -9.9375,3.171875 -6.390625,0 -9.9375,-3.171875 Q 18.3125,60.0625 18.3125,54.390625 Z"
-       id="DejaVuSans-56" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 18.3125,70.21875 V 54.6875 h 18.5 v -6.984375 h -18.5 v -29.6875 q 0,-6.6875 1.828125,-8.59375 1.828125,-1.90625 7.453125,-1.90625 H 36.8125 V 0 H 27.59375 Q 17.1875,0 13.234375,3.875 9.28125,7.765625 9.28125,18.015625 v 29.6875 H 2.6875 V 54.6875 h 6.59375 v 15.53125 z"
-       id="DejaVuSans-116" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 9.421875,54.6875 H 18.40625 V 0 H 9.421875 Z m 0,21.296875 H 18.40625 V 64.59375 H 9.421875 Z"
-       id="DejaVuSans-105" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 52,44.1875 Q 55.375,50.25 60.0625,53.125 64.75,56 71.09375,56 q 8.546875,0 13.1875,-5.984375 4.640625,-5.96875 4.640625,-17 V 0 h -9.03125 v 32.71875 q 0,7.859375 -2.796875,11.65625 -2.78125,3.8125 -8.484375,3.8125 -6.984375,0 -11.046875,-4.640625 -4.046875,-4.625 -4.046875,-12.640625 V 0 h -9.03125 v 32.71875 q 0,7.90625 -2.78125,11.6875 -2.78125,3.78125 -8.59375,3.78125 -6.890625,0 -10.953125,-4.65625 -4.046875,-4.65625 -4.046875,-12.625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.078125,5.03125 7.375,7.421875 Q 29.78125,56 35.6875,56 41.65625,56 45.828125,52.96875 50,49.953125 52,44.1875 Z"
-       id="DejaVuSans-109" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 56.203125,29.59375 v -4.390625 h -41.3125 q 0.59375,-9.28125 5.59375,-14.140625 5,-4.859375 13.9375,-4.859375 5.171875,0 10.03125,1.265625 4.859375,1.265625 9.65625,3.8125 v -8.5 q -4.84375,-2.046875 -9.921875,-3.125 -5.078125,-1.078125 -10.296875,-1.078125 -13.09375,0 -20.734375,7.609375 -7.640625,7.625 -7.640625,20.625 0,13.421875 7.25,21.296875 Q 20.015625,56 32.328125,56 q 11.03125,0 17.453125,-7.109375 6.421875,-7.09375 6.421875,-19.296875 z m -8.984375,2.640625 q -0.09375,7.359375 -4.125,11.75 -4.03125,4.40625 -10.671875,4.40625 -7.515625,0 -12.03125,-4.25 -4.515625,-4.25 -5.203125,-11.96875 z"
-       id="DejaVuSans-101" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 31,75.875 Q 24.46875,64.65625 21.28125,53.65625 18.109375,42.671875 18.109375,31.390625 18.109375,20.125 21.3125,9.0625 24.515625,-2 31,-13.1875 H 23.1875 Q 15.875,-1.703125 12.234375,9.375 8.59375,20.453125 8.59375,31.390625 q 0,10.890625 3.609375,21.921875 3.625,11.046875 10.984375,22.5625 z"
-       id="DejaVuSans-40" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 44.28125,53.078125 v -8.5 Q 40.484375,46.53125 36.375,47.5 q -4.09375,0.984375 -8.5,0.984375 -6.6875,0 -10.03125,-2.046875 Q 14.5,44.390625 14.5,40.28125 q 0,-3.125 2.390625,-4.90625 2.390625,-1.78125 9.625,-3.390625 l 3.078125,-0.6875 Q 39.15625,29.25 43.1875,25.515625 47.21875,21.78125 47.21875,15.09375 q 0,-7.625 -6.03125,-12.078125 -6.03125,-4.4375 -16.578125,-4.4375 -4.390625,0 -9.15625,0.859375 Q 10.6875,0.296875 5.421875,2 v 9.28125 q 4.984375,-2.59375 9.8125,-3.890625 4.828125,-1.28125 9.578125,-1.28125 6.34375,0 9.75,2.171875 3.421875,2.171875 3.421875,6.125 0,3.65625 -2.46875,5.609375 -2.453125,1.953125 -10.8125,3.765625 l -3.125,0.734375 q -8.34375,1.75 -12.0625,5.390625 -3.703125,3.640625 -3.703125,9.984375 0,7.71875 5.46875,11.90625 Q 16.75,56 26.8125,56 q 4.96875,0 9.359375,-0.734375 4.40625,-0.71875 8.109375,-2.1875 z"
-       id="DejaVuSans-115" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 8.015625,75.875 h 7.8125 q 7.3125,-11.515625 10.953125,-22.5625 3.640625,-11.03125 3.640625,-21.921875 0,-10.9375 -3.640625,-22.015625 -3.640625,-11.078125 -10.953125,-22.5625 h -7.8125 Q 14.5,-2 17.703125,9.0625 20.90625,20.125 20.90625,31.390625 q 0,11.28125 -3.203125,22.265625 -3.203125,11 -9.6875,22.21875 z"
-       id="DejaVuSans-41" />
-    <path
-       inkscape:connector-curvature="0"
-       d="M 0,0 H -3.5"
-       id="m80d070c6bd"
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 40.578125,39.3125 Q 47.65625,37.796875 51.625,33 q 3.984375,-4.78125 3.984375,-11.8125 0,-10.78125 -7.421875,-16.703125 -7.421875,-5.90625 -21.09375,-5.90625 -4.578125,0 -9.4375,0.90625 -4.859375,0.90625 -10.03125,2.71875 v 9.515625 q 4.09375,-2.390625 8.96875,-3.609375 4.890625,-1.21875 10.21875,-1.21875 9.265625,0 14.125,3.65625 4.859375,3.65625 4.859375,10.640625 0,6.453125 -4.515625,10.078125 -4.515625,3.640625 -12.5625,3.640625 h -8.5 v 8.109375 h 8.890625 q 7.265625,0 11.125,2.90625 3.859375,2.90625 3.859375,8.375 0,5.609375 -3.984375,8.609375 -3.96875,3.015625 -11.390625,3.015625 -4.0625,0 -8.703125,-0.890625 Q 15.375,64.15625 9.8125,62.3125 v 8.78125 q 5.625,1.5625 10.53125,2.34375 4.90625,0.78125 9.25,0.78125 11.234375,0 17.765625,-5.109375 6.546875,-5.09375 6.546875,-13.78125 0,-6.0625 -3.46875,-10.234375 -3.46875,-4.171875 -9.859375,-5.78125 z"
-       id="DejaVuSans-51" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 34.28125,27.484375 q -10.890625,0 -15.09375,-2.484375 -4.203125,-2.484375 -4.203125,-8.5 0,-4.78125 3.15625,-7.59375 3.15625,-2.796875 8.5625,-2.796875 7.484375,0 12,5.296875 4.515625,5.296875 4.515625,14.078125 v 2 z m 17.921875,3.71875 V 0 H 43.21875 v 8.296875 q -3.078125,-4.96875 -7.671875,-7.34375 -4.59375,-2.375 -11.234375,-2.375 -8.390625,0 -13.359375,4.71875 Q 6,8.015625 6,15.921875 q 0,9.21875 6.171875,13.90625 6.1875,4.6875 18.4375,4.6875 H 43.21875 v 0.890625 q 0,6.203125 -4.078125,9.59375 -4.078125,3.390625 -11.453125,3.390625 -4.6875,0 -9.140625,-1.125 -4.4375,-1.125 -8.53125,-3.375 v 8.3125 q 4.921875,1.90625 9.5625,2.84375 Q 24.21875,56 28.609375,56 q 11.875,0 17.734375,-6.15625 5.859375,-6.140625 5.859375,-18.640625 z"
-       id="DejaVuSans-97" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 54.890625,33.015625 V 0 H 45.90625 v 32.71875 q 0,7.765625 -3.03125,11.609375 -3.03125,3.859375 -9.078125,3.859375 -7.28125,0 -11.484375,-4.640625 -4.203125,-4.625 -4.203125,-12.640625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.234375,4.9375 7.59375,7.375 4.375,2.4375 10.09375,2.4375 9.421875,0 14.25,-5.828125 4.84375,-5.828125 4.84375,-17.15625 z"
-       id="DejaVuSans-110" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 45.40625,27.984375 q 0,9.765625 -4.03125,15.125 -4.015625,5.375 -11.296875,5.375 -7.21875,0 -11.25,-5.375 -4.03125,-5.359375 -4.03125,-15.125 0,-9.71875 4.03125,-15.09375 4.03125,-5.375 11.25,-5.375 7.28125,0 11.296875,5.375 4.03125,5.375 4.03125,15.09375 z M 54.390625,6.78125 q 0,-13.953125 -6.203125,-20.765625 -6.1875,-6.8125 -18.984375,-6.8125 -4.734375,0 -8.9375,0.703125 -4.203125,0.703125 -8.15625,2.171875 V -9.1875 q 3.953125,-2.140625 7.8125,-3.15625 3.859375,-1.03125 7.859375,-1.03125 8.84375,0 13.234375,4.609375 4.390625,4.609375 4.390625,13.9375 V 9.625 Q 42.625,4.78125 38.28125,2.390625 33.9375,0 27.875,0 17.828125,0 11.671875,7.65625 q -6.15625,7.671875 -6.15625,20.328125 0,12.6875 6.15625,20.34375 Q 17.828125,56 27.875,56 q 6.0625,0 10.40625,-2.390625 4.34375,-2.390625 7.125,-7.21875 V 54.6875 h 8.984375 z"
-       id="DejaVuSans-103" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 9.421875,75.984375 H 18.40625 V 0 H 9.421875 Z"
-       id="DejaVuSans-108" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 25,67.921875 q -3.90625,0 -6.59375,-2.71875 -2.6875,-2.703125 -2.6875,-6.609375 0,-3.859375 2.6875,-6.515625 2.6875,-2.65625 6.59375,-2.65625 3.90625,0 6.59375,2.65625 2.6875,2.65625 2.6875,6.515625 0,3.859375 -2.71875,6.59375 Q 28.859375,67.921875 25,67.921875 Z m 0,6.296875 q 3.125,0 6,-1.203125 2.890625,-1.1875 4.984375,-3.4375 2.25,-2.1875 3.375,-4.984375 1.125,-2.78125 1.125,-6 0,-6.4375 -4.515625,-10.90625 -4.515625,-4.46875 -11.0625,-4.46875 -6.59375,0 -11,4.390625 Q 9.515625,52 9.515625,58.59375 q 0,6.546875 4.484375,11.078125 4.5,4.546875 11,4.546875 z"
-       id="DejaVuSans-176" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 10.6875,12.40625 H 21 V 0 H 10.6875 Z"
-       id="DejaVuSans-46" />
-    <clipPath
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       id="p8e948c6700">
-      <rect
-         style="stroke-linecap:butt;stroke-linejoin:round"
-         height="277.20001"
-         width="405.81818"
-         x="144"
-         y="43.200001"
-         id="rect3766" />
-    </clipPath>
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4159-9"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4155-3"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4151-6"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4147-0"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4143-6"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4139-2"
-       effect="bspline" />
-    <style
-       type="text/css"
-       id="style3286-6">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
-    <path
-       inkscape:connector-curvature="0"
-       d="M 0,0 V 3.5"
-       id="me6029f38e9-1"
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 12.40625,8.296875 h 16.109375 v 55.625 L 10.984375,60.40625 v 8.984375 l 17.4375,3.515625 H 38.28125 V 8.296875 H 54.390625 V 0 H 12.40625 Z"
-       id="DejaVuSans-49-8" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 31.78125,66.40625 q -7.609375,0 -11.453125,-7.5 Q 16.5,51.421875 16.5,36.375 q 0,-14.984375 3.828125,-22.484375 3.84375,-7.5 11.453125,-7.5 7.671875,0 11.5,7.5 3.84375,7.5 3.84375,22.484375 0,15.046875 -3.84375,22.53125 -3.828125,7.5 -11.5,7.5 z m 0,7.8125 q 12.265625,0 18.734375,-9.703125 6.46875,-9.6875 6.46875,-28.140625 0,-18.40625 -6.46875,-28.109375 -6.46875,-9.6875 -18.734375,-9.6875 -12.25,0 -18.71875,9.6875 Q 6.59375,17.96875 6.59375,36.375 q 0,18.453125 6.46875,28.140625 6.46875,9.703125 18.71875,9.703125 z"
-       id="DejaVuSans-48-7" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 19.1875,8.296875 H 53.609375 V 0 H 7.328125 v 8.296875 q 5.609375,5.8125 15.296875,15.59375 9.703125,9.796875 12.1875,12.640625 4.734375,5.3125 6.609375,9 1.890625,3.6875 1.890625,7.25 0,5.8125 -4.078125,9.46875 -4.078125,3.671875 -10.625,3.671875 -4.640625,0 -9.796875,-1.609375 -5.140625,-1.609375 -11,-4.890625 v 9.96875 Q 13.765625,71.78125 18.9375,73 q 5.1875,1.21875 9.484375,1.21875 11.328125,0 18.0625,-5.671875 6.734375,-5.65625 6.734375,-15.125 0,-4.5 -1.6875,-8.53125 Q 49.859375,40.875 45.40625,35.40625 44.1875,33.984375 37.640625,27.21875 31.109375,20.453125 19.1875,8.296875 Z"
-       id="DejaVuSans-50-9" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 37.796875,64.3125 12.890625,25.390625 h 24.90625 z m -2.59375,8.59375 h 12.40625 V 25.390625 h 10.40625 V 17.1875 H 47.609375 V 0 h -9.8125 V 17.1875 H 4.890625 v 9.515625 z"
-       id="DejaVuSans-52-2" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 33.015625,40.375 q -6.640625,0 -10.53125,-4.546875 -3.875,-4.53125 -3.875,-12.4375 0,-7.859375 3.875,-12.4375 3.890625,-4.5625 10.53125,-4.5625 6.640625,0 10.515625,4.5625 3.875,4.578125 3.875,12.4375 0,7.90625 -3.875,12.4375 Q 39.65625,40.375 33.015625,40.375 Z M 52.59375,71.296875 V 62.3125 q -3.71875,1.75 -7.5,2.671875 -3.78125,0.9375 -7.5,0.9375 -9.765625,0 -14.921875,-6.59375 -5.140625,-6.59375 -5.875,-19.921875 2.875,4.25 7.21875,6.515625 4.359375,2.265625 9.578125,2.265625 10.984375,0 17.359375,-6.671875 6.375,-6.65625 6.375,-18.125 0,-11.234375 -6.640625,-18.03125 -6.640625,-6.78125 -17.671875,-6.78125 -12.65625,0 -19.34375,9.6875 -6.6875,9.703125 -6.6875,28.109375 0,17.28125 8.203125,27.5625 8.203125,10.28125 22.015625,10.28125 3.71875,0 7.5,-0.734375 3.78125,-0.734375 7.890625,-2.1875 z"
-       id="DejaVuSans-54-0" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 31.78125,34.625 q -7.03125,0 -11.0625,-3.765625 -4.015625,-3.765625 -4.015625,-10.34375 0,-6.59375 4.015625,-10.359375 4.03125,-3.765625 11.0625,-3.765625 7.03125,0 11.078125,3.78125 4.0625,3.796875 4.0625,10.34375 0,6.578125 -4.03125,10.34375 Q 38.875,34.625 31.78125,34.625 Z m -9.859375,4.1875 Q 15.578125,40.375 12.03125,44.71875 8.5,49.078125 8.5,55.328125 q 0,8.734375 6.21875,13.8125 6.234375,5.078125 17.0625,5.078125 10.890625,0 17.09375,-5.078125 6.203125,-5.078125 6.203125,-13.8125 0,-6.25 -3.546875,-10.609375 Q 48,40.375 41.703125,38.8125 q 7.125,-1.65625 11.09375,-6.5 3.984375,-4.828125 3.984375,-11.796875 0,-10.609375 -6.46875,-16.28125 -6.46875,-5.65625 -18.53125,-5.65625 -12.046875,0 -18.53125,5.65625 -6.46875,5.671875 -6.46875,16.28125 0,6.96875 4,11.796875 4.015625,4.84375 11.140625,6.5 z M 18.3125,54.390625 q 0,-5.65625 3.53125,-8.828125 3.546875,-3.171875 9.9375,-3.171875 6.359375,0 9.9375,3.171875 3.59375,3.171875 3.59375,8.828125 0,5.671875 -3.59375,8.84375 -3.578125,3.171875 -9.9375,3.171875 -6.390625,0 -9.9375,-3.171875 Q 18.3125,60.0625 18.3125,54.390625 Z"
-       id="DejaVuSans-56-2" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 18.3125,70.21875 V 54.6875 h 18.5 v -6.984375 h -18.5 v -29.6875 q 0,-6.6875 1.828125,-8.59375 1.828125,-1.90625 7.453125,-1.90625 H 36.8125 V 0 H 27.59375 Q 17.1875,0 13.234375,3.875 9.28125,7.765625 9.28125,18.015625 v 29.6875 H 2.6875 V 54.6875 h 6.59375 v 15.53125 z"
-       id="DejaVuSans-116-3" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 9.421875,54.6875 H 18.40625 V 0 H 9.421875 Z m 0,21.296875 H 18.40625 V 64.59375 H 9.421875 Z"
-       id="DejaVuSans-105-7" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 52,44.1875 Q 55.375,50.25 60.0625,53.125 64.75,56 71.09375,56 q 8.546875,0 13.1875,-5.984375 4.640625,-5.96875 4.640625,-17 V 0 h -9.03125 v 32.71875 q 0,7.859375 -2.796875,11.65625 -2.78125,3.8125 -8.484375,3.8125 -6.984375,0 -11.046875,-4.640625 -4.046875,-4.625 -4.046875,-12.640625 V 0 h -9.03125 v 32.71875 q 0,7.90625 -2.78125,11.6875 -2.78125,3.78125 -8.59375,3.78125 -6.890625,0 -10.953125,-4.65625 -4.046875,-4.65625 -4.046875,-12.625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.078125,5.03125 7.375,7.421875 Q 29.78125,56 35.6875,56 41.65625,56 45.828125,52.96875 50,49.953125 52,44.1875 Z"
-       id="DejaVuSans-109-5" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 56.203125,29.59375 v -4.390625 h -41.3125 q 0.59375,-9.28125 5.59375,-14.140625 5,-4.859375 13.9375,-4.859375 5.171875,0 10.03125,1.265625 4.859375,1.265625 9.65625,3.8125 v -8.5 q -4.84375,-2.046875 -9.921875,-3.125 -5.078125,-1.078125 -10.296875,-1.078125 -13.09375,0 -20.734375,7.609375 -7.640625,7.625 -7.640625,20.625 0,13.421875 7.25,21.296875 Q 20.015625,56 32.328125,56 q 11.03125,0 17.453125,-7.109375 6.421875,-7.09375 6.421875,-19.296875 z m -8.984375,2.640625 q -0.09375,7.359375 -4.125,11.75 -4.03125,4.40625 -10.671875,4.40625 -7.515625,0 -12.03125,-4.25 -4.515625,-4.25 -5.203125,-11.96875 z"
-       id="DejaVuSans-101-9" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 31,75.875 Q 24.46875,64.65625 21.28125,53.65625 18.109375,42.671875 18.109375,31.390625 18.109375,20.125 21.3125,9.0625 24.515625,-2 31,-13.1875 H 23.1875 Q 15.875,-1.703125 12.234375,9.375 8.59375,20.453125 8.59375,31.390625 q 0,10.890625 3.609375,21.921875 3.625,11.046875 10.984375,22.5625 z"
-       id="DejaVuSans-40-2" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 44.28125,53.078125 v -8.5 Q 40.484375,46.53125 36.375,47.5 q -4.09375,0.984375 -8.5,0.984375 -6.6875,0 -10.03125,-2.046875 Q 14.5,44.390625 14.5,40.28125 q 0,-3.125 2.390625,-4.90625 2.390625,-1.78125 9.625,-3.390625 l 3.078125,-0.6875 Q 39.15625,29.25 43.1875,25.515625 47.21875,21.78125 47.21875,15.09375 q 0,-7.625 -6.03125,-12.078125 -6.03125,-4.4375 -16.578125,-4.4375 -4.390625,0 -9.15625,0.859375 Q 10.6875,0.296875 5.421875,2 v 9.28125 q 4.984375,-2.59375 9.8125,-3.890625 4.828125,-1.28125 9.578125,-1.28125 6.34375,0 9.75,2.171875 3.421875,2.171875 3.421875,6.125 0,3.65625 -2.46875,5.609375 -2.453125,1.953125 -10.8125,3.765625 l -3.125,0.734375 q -8.34375,1.75 -12.0625,5.390625 -3.703125,3.640625 -3.703125,9.984375 0,7.71875 5.46875,11.90625 Q 16.75,56 26.8125,56 q 4.96875,0 9.359375,-0.734375 4.40625,-0.71875 8.109375,-2.1875 z"
-       id="DejaVuSans-115-2" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 8.015625,75.875 h 7.8125 q 7.3125,-11.515625 10.953125,-22.5625 3.640625,-11.03125 3.640625,-21.921875 0,-10.9375 -3.640625,-22.015625 -3.640625,-11.078125 -10.953125,-22.5625 h -7.8125 Q 14.5,-2 17.703125,9.0625 20.90625,20.125 20.90625,31.390625 q 0,11.28125 -3.203125,22.265625 -3.203125,11 -9.6875,22.21875 z"
-       id="DejaVuSans-41-8" />
-    <path
-       inkscape:connector-curvature="0"
-       d="M 0,0 H -3.5"
-       id="m80d070c6bd-9"
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 40.578125,39.3125 Q 47.65625,37.796875 51.625,33 q 3.984375,-4.78125 3.984375,-11.8125 0,-10.78125 -7.421875,-16.703125 -7.421875,-5.90625 -21.09375,-5.90625 -4.578125,0 -9.4375,0.90625 -4.859375,0.90625 -10.03125,2.71875 v 9.515625 q 4.09375,-2.390625 8.96875,-3.609375 4.890625,-1.21875 10.21875,-1.21875 9.265625,0 14.125,3.65625 4.859375,3.65625 4.859375,10.640625 0,6.453125 -4.515625,10.078125 -4.515625,3.640625 -12.5625,3.640625 h -8.5 v 8.109375 h 8.890625 q 7.265625,0 11.125,2.90625 3.859375,2.90625 3.859375,8.375 0,5.609375 -3.984375,8.609375 -3.96875,3.015625 -11.390625,3.015625 -4.0625,0 -8.703125,-0.890625 Q 15.375,64.15625 9.8125,62.3125 v 8.78125 q 5.625,1.5625 10.53125,2.34375 4.90625,0.78125 9.25,0.78125 11.234375,0 17.765625,-5.109375 6.546875,-5.09375 6.546875,-13.78125 0,-6.0625 -3.46875,-10.234375 -3.46875,-4.171875 -9.859375,-5.78125 z"
-       id="DejaVuSans-51-7" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 34.28125,27.484375 q -10.890625,0 -15.09375,-2.484375 -4.203125,-2.484375 -4.203125,-8.5 0,-4.78125 3.15625,-7.59375 3.15625,-2.796875 8.5625,-2.796875 7.484375,0 12,5.296875 4.515625,5.296875 4.515625,14.078125 v 2 z m 17.921875,3.71875 V 0 H 43.21875 v 8.296875 q -3.078125,-4.96875 -7.671875,-7.34375 -4.59375,-2.375 -11.234375,-2.375 -8.390625,0 -13.359375,4.71875 Q 6,8.015625 6,15.921875 q 0,9.21875 6.171875,13.90625 6.1875,4.6875 18.4375,4.6875 H 43.21875 v 0.890625 q 0,6.203125 -4.078125,9.59375 -4.078125,3.390625 -11.453125,3.390625 -4.6875,0 -9.140625,-1.125 -4.4375,-1.125 -8.53125,-3.375 v 8.3125 q 4.921875,1.90625 9.5625,2.84375 Q 24.21875,56 28.609375,56 q 11.875,0 17.734375,-6.15625 5.859375,-6.140625 5.859375,-18.640625 z"
-       id="DejaVuSans-97-3" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 54.890625,33.015625 V 0 H 45.90625 v 32.71875 q 0,7.765625 -3.03125,11.609375 -3.03125,3.859375 -9.078125,3.859375 -7.28125,0 -11.484375,-4.640625 -4.203125,-4.625 -4.203125,-12.640625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.234375,4.9375 7.59375,7.375 4.375,2.4375 10.09375,2.4375 9.421875,0 14.25,-5.828125 4.84375,-5.828125 4.84375,-17.15625 z"
-       id="DejaVuSans-110-6" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 45.40625,27.984375 q 0,9.765625 -4.03125,15.125 -4.015625,5.375 -11.296875,5.375 -7.21875,0 -11.25,-5.375 -4.03125,-5.359375 -4.03125,-15.125 0,-9.71875 4.03125,-15.09375 4.03125,-5.375 11.25,-5.375 7.28125,0 11.296875,5.375 4.03125,5.375 4.03125,15.09375 z M 54.390625,6.78125 q 0,-13.953125 -6.203125,-20.765625 -6.1875,-6.8125 -18.984375,-6.8125 -4.734375,0 -8.9375,0.703125 -4.203125,0.703125 -8.15625,2.171875 V -9.1875 q 3.953125,-2.140625 7.8125,-3.15625 3.859375,-1.03125 7.859375,-1.03125 8.84375,0 13.234375,4.609375 4.390625,4.609375 4.390625,13.9375 V 9.625 Q 42.625,4.78125 38.28125,2.390625 33.9375,0 27.875,0 17.828125,0 11.671875,7.65625 q -6.15625,7.671875 -6.15625,20.328125 0,12.6875 6.15625,20.34375 Q 17.828125,56 27.875,56 q 6.0625,0 10.40625,-2.390625 4.34375,-2.390625 7.125,-7.21875 V 54.6875 h 8.984375 z"
-       id="DejaVuSans-103-1" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 9.421875,75.984375 H 18.40625 V 0 H 9.421875 Z"
-       id="DejaVuSans-108-2" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 25,67.921875 q -3.90625,0 -6.59375,-2.71875 -2.6875,-2.703125 -2.6875,-6.609375 0,-3.859375 2.6875,-6.515625 2.6875,-2.65625 6.59375,-2.65625 3.90625,0 6.59375,2.65625 2.6875,2.65625 2.6875,6.515625 0,3.859375 -2.71875,6.59375 Q 28.859375,67.921875 25,67.921875 Z m 0,6.296875 q 3.125,0 6,-1.203125 2.890625,-1.1875 4.984375,-3.4375 2.25,-2.1875 3.375,-4.984375 1.125,-2.78125 1.125,-6 0,-6.4375 -4.515625,-10.90625 -4.515625,-4.46875 -11.0625,-4.46875 -6.59375,0 -11,4.390625 Q 9.515625,52 9.515625,58.59375 q 0,6.546875 4.484375,11.078125 4.5,4.546875 11,4.546875 z"
-       id="DejaVuSans-176-9" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 10.6875,12.40625 H 21 V 0 H 10.6875 Z"
-       id="DejaVuSans-46-3" />
-    <clipPath
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       id="p8e948c6700-1">
-      <rect
-         style="stroke-linecap:butt;stroke-linejoin:round"
-         height="277.20001"
-         width="405.81818"
-         x="144"
-         y="43.200001"
-         id="rect3766-9" />
-    </clipPath>
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4159-7"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4155-4"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4151-5"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4147-2"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4143-5"
-       effect="bspline" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       is_visible="true"
-       id="path-effect4139-4"
-       effect="bspline" />
-    <style
-       type="text/css"
-       id="style3286-7">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
-    <path
-       inkscape:connector-curvature="0"
-       d="M 0,0 V 3.5"
-       id="me6029f38e9-4"
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 12.40625,8.296875 h 16.109375 v 55.625 L 10.984375,60.40625 v 8.984375 l 17.4375,3.515625 H 38.28125 V 8.296875 H 54.390625 V 0 H 12.40625 Z"
-       id="DejaVuSans-49-4" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 31.78125,66.40625 q -7.609375,0 -11.453125,-7.5 Q 16.5,51.421875 16.5,36.375 q 0,-14.984375 3.828125,-22.484375 3.84375,-7.5 11.453125,-7.5 7.671875,0 11.5,7.5 3.84375,7.5 3.84375,22.484375 0,15.046875 -3.84375,22.53125 -3.828125,7.5 -11.5,7.5 z m 0,7.8125 q 12.265625,0 18.734375,-9.703125 6.46875,-9.6875 6.46875,-28.140625 0,-18.40625 -6.46875,-28.109375 -6.46875,-9.6875 -18.734375,-9.6875 -12.25,0 -18.71875,9.6875 Q 6.59375,17.96875 6.59375,36.375 q 0,18.453125 6.46875,28.140625 6.46875,9.703125 18.71875,9.703125 z"
-       id="DejaVuSans-48-3" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 19.1875,8.296875 H 53.609375 V 0 H 7.328125 v 8.296875 q 5.609375,5.8125 15.296875,15.59375 9.703125,9.796875 12.1875,12.640625 4.734375,5.3125 6.609375,9 1.890625,3.6875 1.890625,7.25 0,5.8125 -4.078125,9.46875 -4.078125,3.671875 -10.625,3.671875 -4.640625,0 -9.796875,-1.609375 -5.140625,-1.609375 -11,-4.890625 v 9.96875 Q 13.765625,71.78125 18.9375,73 q 5.1875,1.21875 9.484375,1.21875 11.328125,0 18.0625,-5.671875 6.734375,-5.65625 6.734375,-15.125 0,-4.5 -1.6875,-8.53125 Q 49.859375,40.875 45.40625,35.40625 44.1875,33.984375 37.640625,27.21875 31.109375,20.453125 19.1875,8.296875 Z"
-       id="DejaVuSans-50-0" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 37.796875,64.3125 12.890625,25.390625 h 24.90625 z m -2.59375,8.59375 h 12.40625 V 25.390625 h 10.40625 V 17.1875 H 47.609375 V 0 h -9.8125 V 17.1875 H 4.890625 v 9.515625 z"
-       id="DejaVuSans-52-7" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 33.015625,40.375 q -6.640625,0 -10.53125,-4.546875 -3.875,-4.53125 -3.875,-12.4375 0,-7.859375 3.875,-12.4375 3.890625,-4.5625 10.53125,-4.5625 6.640625,0 10.515625,4.5625 3.875,4.578125 3.875,12.4375 0,7.90625 -3.875,12.4375 Q 39.65625,40.375 33.015625,40.375 Z M 52.59375,71.296875 V 62.3125 q -3.71875,1.75 -7.5,2.671875 -3.78125,0.9375 -7.5,0.9375 -9.765625,0 -14.921875,-6.59375 -5.140625,-6.59375 -5.875,-19.921875 2.875,4.25 7.21875,6.515625 4.359375,2.265625 9.578125,2.265625 10.984375,0 17.359375,-6.671875 6.375,-6.65625 6.375,-18.125 0,-11.234375 -6.640625,-18.03125 -6.640625,-6.78125 -17.671875,-6.78125 -12.65625,0 -19.34375,9.6875 -6.6875,9.703125 -6.6875,28.109375 0,17.28125 8.203125,27.5625 8.203125,10.28125 22.015625,10.28125 3.71875,0 7.5,-0.734375 3.78125,-0.734375 7.890625,-2.1875 z"
-       id="DejaVuSans-54-8" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 31.78125,34.625 q -7.03125,0 -11.0625,-3.765625 -4.015625,-3.765625 -4.015625,-10.34375 0,-6.59375 4.015625,-10.359375 4.03125,-3.765625 11.0625,-3.765625 7.03125,0 11.078125,3.78125 4.0625,3.796875 4.0625,10.34375 0,6.578125 -4.03125,10.34375 Q 38.875,34.625 31.78125,34.625 Z m -9.859375,4.1875 Q 15.578125,40.375 12.03125,44.71875 8.5,49.078125 8.5,55.328125 q 0,8.734375 6.21875,13.8125 6.234375,5.078125 17.0625,5.078125 10.890625,0 17.09375,-5.078125 6.203125,-5.078125 6.203125,-13.8125 0,-6.25 -3.546875,-10.609375 Q 48,40.375 41.703125,38.8125 q 7.125,-1.65625 11.09375,-6.5 3.984375,-4.828125 3.984375,-11.796875 0,-10.609375 -6.46875,-16.28125 -6.46875,-5.65625 -18.53125,-5.65625 -12.046875,0 -18.53125,5.65625 -6.46875,5.671875 -6.46875,16.28125 0,6.96875 4,11.796875 4.015625,4.84375 11.140625,6.5 z M 18.3125,54.390625 q 0,-5.65625 3.53125,-8.828125 3.546875,-3.171875 9.9375,-3.171875 6.359375,0 9.9375,3.171875 3.59375,3.171875 3.59375,8.828125 0,5.671875 -3.59375,8.84375 -3.578125,3.171875 -9.9375,3.171875 -6.390625,0 -9.9375,-3.171875 Q 18.3125,60.0625 18.3125,54.390625 Z"
-       id="DejaVuSans-56-6" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 18.3125,70.21875 V 54.6875 h 18.5 v -6.984375 h -18.5 v -29.6875 q 0,-6.6875 1.828125,-8.59375 1.828125,-1.90625 7.453125,-1.90625 H 36.8125 V 0 H 27.59375 Q 17.1875,0 13.234375,3.875 9.28125,7.765625 9.28125,18.015625 v 29.6875 H 2.6875 V 54.6875 h 6.59375 v 15.53125 z"
-       id="DejaVuSans-116-8" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 9.421875,54.6875 H 18.40625 V 0 H 9.421875 Z m 0,21.296875 H 18.40625 V 64.59375 H 9.421875 Z"
-       id="DejaVuSans-105-8" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 52,44.1875 Q 55.375,50.25 60.0625,53.125 64.75,56 71.09375,56 q 8.546875,0 13.1875,-5.984375 4.640625,-5.96875 4.640625,-17 V 0 h -9.03125 v 32.71875 q 0,7.859375 -2.796875,11.65625 -2.78125,3.8125 -8.484375,3.8125 -6.984375,0 -11.046875,-4.640625 -4.046875,-4.625 -4.046875,-12.640625 V 0 h -9.03125 v 32.71875 q 0,7.90625 -2.78125,11.6875 -2.78125,3.78125 -8.59375,3.78125 -6.890625,0 -10.953125,-4.65625 -4.046875,-4.65625 -4.046875,-12.625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.078125,5.03125 7.375,7.421875 Q 29.78125,56 35.6875,56 41.65625,56 45.828125,52.96875 50,49.953125 52,44.1875 Z"
-       id="DejaVuSans-109-4" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 56.203125,29.59375 v -4.390625 h -41.3125 q 0.59375,-9.28125 5.59375,-14.140625 5,-4.859375 13.9375,-4.859375 5.171875,0 10.03125,1.265625 4.859375,1.265625 9.65625,3.8125 v -8.5 q -4.84375,-2.046875 -9.921875,-3.125 -5.078125,-1.078125 -10.296875,-1.078125 -13.09375,0 -20.734375,7.609375 -7.640625,7.625 -7.640625,20.625 0,13.421875 7.25,21.296875 Q 20.015625,56 32.328125,56 q 11.03125,0 17.453125,-7.109375 6.421875,-7.09375 6.421875,-19.296875 z m -8.984375,2.640625 q -0.09375,7.359375 -4.125,11.75 -4.03125,4.40625 -10.671875,4.40625 -7.515625,0 -12.03125,-4.25 -4.515625,-4.25 -5.203125,-11.96875 z"
-       id="DejaVuSans-101-3" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 31,75.875 Q 24.46875,64.65625 21.28125,53.65625 18.109375,42.671875 18.109375,31.390625 18.109375,20.125 21.3125,9.0625 24.515625,-2 31,-13.1875 H 23.1875 Q 15.875,-1.703125 12.234375,9.375 8.59375,20.453125 8.59375,31.390625 q 0,10.890625 3.609375,21.921875 3.625,11.046875 10.984375,22.5625 z"
-       id="DejaVuSans-40-1" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 44.28125,53.078125 v -8.5 Q 40.484375,46.53125 36.375,47.5 q -4.09375,0.984375 -8.5,0.984375 -6.6875,0 -10.03125,-2.046875 Q 14.5,44.390625 14.5,40.28125 q 0,-3.125 2.390625,-4.90625 2.390625,-1.78125 9.625,-3.390625 l 3.078125,-0.6875 Q 39.15625,29.25 43.1875,25.515625 47.21875,21.78125 47.21875,15.09375 q 0,-7.625 -6.03125,-12.078125 -6.03125,-4.4375 -16.578125,-4.4375 -4.390625,0 -9.15625,0.859375 Q 10.6875,0.296875 5.421875,2 v 9.28125 q 4.984375,-2.59375 9.8125,-3.890625 4.828125,-1.28125 9.578125,-1.28125 6.34375,0 9.75,2.171875 3.421875,2.171875 3.421875,6.125 0,3.65625 -2.46875,5.609375 -2.453125,1.953125 -10.8125,3.765625 l -3.125,0.734375 q -8.34375,1.75 -12.0625,5.390625 -3.703125,3.640625 -3.703125,9.984375 0,7.71875 5.46875,11.90625 Q 16.75,56 26.8125,56 q 4.96875,0 9.359375,-0.734375 4.40625,-0.71875 8.109375,-2.1875 z"
-       id="DejaVuSans-115-4" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 8.015625,75.875 h 7.8125 q 7.3125,-11.515625 10.953125,-22.5625 3.640625,-11.03125 3.640625,-21.921875 0,-10.9375 -3.640625,-22.015625 -3.640625,-11.078125 -10.953125,-22.5625 h -7.8125 Q 14.5,-2 17.703125,9.0625 20.90625,20.125 20.90625,31.390625 q 0,11.28125 -3.203125,22.265625 -3.203125,11 -9.6875,22.21875 z"
-       id="DejaVuSans-41-9" />
-    <path
-       inkscape:connector-curvature="0"
-       d="M 0,0 H -3.5"
-       id="m80d070c6bd-2"
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 40.578125,39.3125 Q 47.65625,37.796875 51.625,33 q 3.984375,-4.78125 3.984375,-11.8125 0,-10.78125 -7.421875,-16.703125 -7.421875,-5.90625 -21.09375,-5.90625 -4.578125,0 -9.4375,0.90625 -4.859375,0.90625 -10.03125,2.71875 v 9.515625 q 4.09375,-2.390625 8.96875,-3.609375 4.890625,-1.21875 10.21875,-1.21875 9.265625,0 14.125,3.65625 4.859375,3.65625 4.859375,10.640625 0,6.453125 -4.515625,10.078125 -4.515625,3.640625 -12.5625,3.640625 h -8.5 v 8.109375 h 8.890625 q 7.265625,0 11.125,2.90625 3.859375,2.90625 3.859375,8.375 0,5.609375 -3.984375,8.609375 -3.96875,3.015625 -11.390625,3.015625 -4.0625,0 -8.703125,-0.890625 Q 15.375,64.15625 9.8125,62.3125 v 8.78125 q 5.625,1.5625 10.53125,2.34375 4.90625,0.78125 9.25,0.78125 11.234375,0 17.765625,-5.109375 6.546875,-5.09375 6.546875,-13.78125 0,-6.0625 -3.46875,-10.234375 -3.46875,-4.171875 -9.859375,-5.78125 z"
-       id="DejaVuSans-51-0" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 34.28125,27.484375 q -10.890625,0 -15.09375,-2.484375 -4.203125,-2.484375 -4.203125,-8.5 0,-4.78125 3.15625,-7.59375 3.15625,-2.796875 8.5625,-2.796875 7.484375,0 12,5.296875 4.515625,5.296875 4.515625,14.078125 v 2 z m 17.921875,3.71875 V 0 H 43.21875 v 8.296875 q -3.078125,-4.96875 -7.671875,-7.34375 -4.59375,-2.375 -11.234375,-2.375 -8.390625,0 -13.359375,4.71875 Q 6,8.015625 6,15.921875 q 0,9.21875 6.171875,13.90625 6.1875,4.6875 18.4375,4.6875 H 43.21875 v 0.890625 q 0,6.203125 -4.078125,9.59375 -4.078125,3.390625 -11.453125,3.390625 -4.6875,0 -9.140625,-1.125 -4.4375,-1.125 -8.53125,-3.375 v 8.3125 q 4.921875,1.90625 9.5625,2.84375 Q 24.21875,56 28.609375,56 q 11.875,0 17.734375,-6.15625 5.859375,-6.140625 5.859375,-18.640625 z"
-       id="DejaVuSans-97-6" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 54.890625,33.015625 V 0 H 45.90625 v 32.71875 q 0,7.765625 -3.03125,11.609375 -3.03125,3.859375 -9.078125,3.859375 -7.28125,0 -11.484375,-4.640625 -4.203125,-4.625 -4.203125,-12.640625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.234375,4.9375 7.59375,7.375 4.375,2.4375 10.09375,2.4375 9.421875,0 14.25,-5.828125 4.84375,-5.828125 4.84375,-17.15625 z"
-       id="DejaVuSans-110-8" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 45.40625,27.984375 q 0,9.765625 -4.03125,15.125 -4.015625,5.375 -11.296875,5.375 -7.21875,0 -11.25,-5.375 -4.03125,-5.359375 -4.03125,-15.125 0,-9.71875 4.03125,-15.09375 4.03125,-5.375 11.25,-5.375 7.28125,0 11.296875,5.375 4.03125,5.375 4.03125,15.09375 z M 54.390625,6.78125 q 0,-13.953125 -6.203125,-20.765625 -6.1875,-6.8125 -18.984375,-6.8125 -4.734375,0 -8.9375,0.703125 -4.203125,0.703125 -8.15625,2.171875 V -9.1875 q 3.953125,-2.140625 7.8125,-3.15625 3.859375,-1.03125 7.859375,-1.03125 8.84375,0 13.234375,4.609375 4.390625,4.609375 4.390625,13.9375 V 9.625 Q 42.625,4.78125 38.28125,2.390625 33.9375,0 27.875,0 17.828125,0 11.671875,7.65625 q -6.15625,7.671875 -6.15625,20.328125 0,12.6875 6.15625,20.34375 Q 17.828125,56 27.875,56 q 6.0625,0 10.40625,-2.390625 4.34375,-2.390625 7.125,-7.21875 V 54.6875 h 8.984375 z"
-       id="DejaVuSans-103-9" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 9.421875,75.984375 H 18.40625 V 0 H 9.421875 Z"
-       id="DejaVuSans-108-26" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="m 25,67.921875 q -3.90625,0 -6.59375,-2.71875 -2.6875,-2.703125 -2.6875,-6.609375 0,-3.859375 2.6875,-6.515625 2.6875,-2.65625 6.59375,-2.65625 3.90625,0 6.59375,2.65625 2.6875,2.65625 2.6875,6.515625 0,3.859375 -2.71875,6.59375 Q 28.859375,67.921875 25,67.921875 Z m 0,6.296875 q 3.125,0 6,-1.203125 2.890625,-1.1875 4.984375,-3.4375 2.25,-2.1875 3.375,-4.984375 1.125,-2.78125 1.125,-6 0,-6.4375 -4.515625,-10.90625 -4.515625,-4.46875 -11.0625,-4.46875 -6.59375,0 -11,4.390625 Q 9.515625,52 9.515625,58.59375 q 0,6.546875 4.484375,11.078125 4.5,4.546875 11,4.546875 z"
-       id="DejaVuSans-176-6" />
-    <path
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       inkscape:connector-curvature="0"
-       d="M 10.6875,12.40625 H 21 V 0 H 10.6875 Z"
-       id="DejaVuSans-46-4" />
-    <clipPath
-       style="stroke-linecap:butt;stroke-linejoin:round"
-       id="p8e948c6700-9">
-      <rect
-         style="stroke-linecap:butt;stroke-linejoin:round"
-         height="277.20001"
-         width="405.81818"
-         x="144"
-         y="43.200001"
-         id="rect3766-5" />
-    </clipPath>
-    <style
-       id="style2148"
-       type="text/css">*{stroke-linecap:butt;stroke-linejoin:round;}</style>
-    <path
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round"
-       id="me6029f38e9-3"
-       d="M 0,0 V 3.5"
-       inkscape:connector-curvature="0" />
-    <path
-       id="DejaVuSans-49-6"
-       d="m 12.40625,8.296875 h 16.109375 v 55.625 L 10.984375,60.40625 v 8.984375 l 17.4375,3.515625 H 38.28125 V 8.296875 H 54.390625 V 0 H 12.40625 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-48-75"
-       d="m 31.78125,66.40625 q -7.609375,0 -11.453125,-7.5 Q 16.5,51.421875 16.5,36.375 q 0,-14.984375 3.828125,-22.484375 3.84375,-7.5 11.453125,-7.5 7.671875,0 11.5,7.5 3.84375,7.5 3.84375,22.484375 0,15.046875 -3.84375,22.53125 -3.828125,7.5 -11.5,7.5 z m 0,7.8125 q 12.265625,0 18.734375,-9.703125 6.46875,-9.6875 6.46875,-28.140625 0,-18.40625 -6.46875,-28.109375 -6.46875,-9.6875 -18.734375,-9.6875 -12.25,0 -18.71875,9.6875 Q 6.59375,17.96875 6.59375,36.375 q 0,18.453125 6.46875,28.140625 6.46875,9.703125 18.71875,9.703125 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-50-3"
-       d="M 19.1875,8.296875 H 53.609375 V 0 H 7.328125 v 8.296875 q 5.609375,5.8125 15.296875,15.59375 9.703125,9.796875 12.1875,12.640625 4.734375,5.3125 6.609375,9 1.890625,3.6875 1.890625,7.25 0,5.8125 -4.078125,9.46875 -4.078125,3.671875 -10.625,3.671875 -4.640625,0 -9.796875,-1.609375 -5.140625,-1.609375 -11,-4.890625 v 9.96875 Q 13.765625,71.78125 18.9375,73 q 5.1875,1.21875 9.484375,1.21875 11.328125,0 18.0625,-5.671875 6.734375,-5.65625 6.734375,-15.125 0,-4.5 -1.6875,-8.53125 Q 49.859375,40.875 45.40625,35.40625 44.1875,33.984375 37.640625,27.21875 31.109375,20.453125 19.1875,8.296875 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-52-5"
-       d="M 37.796875,64.3125 12.890625,25.390625 h 24.90625 z m -2.59375,8.59375 h 12.40625 V 25.390625 h 10.40625 V 17.1875 H 47.609375 V 0 h -9.8125 V 17.1875 H 4.890625 v 9.515625 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-54-6"
-       d="m 33.015625,40.375 q -6.640625,0 -10.53125,-4.546875 -3.875,-4.53125 -3.875,-12.4375 0,-7.859375 3.875,-12.4375 3.890625,-4.5625 10.53125,-4.5625 6.640625,0 10.515625,4.5625 3.875,4.578125 3.875,12.4375 0,7.90625 -3.875,12.4375 Q 39.65625,40.375 33.015625,40.375 Z M 52.59375,71.296875 V 62.3125 q -3.71875,1.75 -7.5,2.671875 -3.78125,0.9375 -7.5,0.9375 -9.765625,0 -14.921875,-6.59375 -5.140625,-6.59375 -5.875,-19.921875 2.875,4.25 7.21875,6.515625 4.359375,2.265625 9.578125,2.265625 10.984375,0 17.359375,-6.671875 6.375,-6.65625 6.375,-18.125 0,-11.234375 -6.640625,-18.03125 -6.640625,-6.78125 -17.671875,-6.78125 -12.65625,0 -19.34375,9.6875 -6.6875,9.703125 -6.6875,28.109375 0,17.28125 8.203125,27.5625 8.203125,10.28125 22.015625,10.28125 3.71875,0 7.5,-0.734375 3.78125,-0.734375 7.890625,-2.1875 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-56-29"
-       d="m 31.78125,34.625 q -7.03125,0 -11.0625,-3.765625 -4.015625,-3.765625 -4.015625,-10.34375 0,-6.59375 4.015625,-10.359375 4.03125,-3.765625 11.0625,-3.765625 7.03125,0 11.078125,3.78125 4.0625,3.796875 4.0625,10.34375 0,6.578125 -4.03125,10.34375 Q 38.875,34.625 31.78125,34.625 Z m -9.859375,4.1875 Q 15.578125,40.375 12.03125,44.71875 8.5,49.078125 8.5,55.328125 q 0,8.734375 6.21875,13.8125 6.234375,5.078125 17.0625,5.078125 10.890625,0 17.09375,-5.078125 6.203125,-5.078125 6.203125,-13.8125 0,-6.25 -3.546875,-10.609375 Q 48,40.375 41.703125,38.8125 q 7.125,-1.65625 11.09375,-6.5 3.984375,-4.828125 3.984375,-11.796875 0,-10.609375 -6.46875,-16.28125 -6.46875,-5.65625 -18.53125,-5.65625 -12.046875,0 -18.53125,5.65625 -6.46875,5.671875 -6.46875,16.28125 0,6.96875 4,11.796875 4.015625,4.84375 11.140625,6.5 z M 18.3125,54.390625 q 0,-5.65625 3.53125,-8.828125 3.546875,-3.171875 9.9375,-3.171875 6.359375,0 9.9375,3.171875 3.59375,3.171875 3.59375,8.828125 0,5.671875 -3.59375,8.84375 -3.578125,3.171875 -9.9375,3.171875 -6.390625,0 -9.9375,-3.171875 Q 18.3125,60.0625 18.3125,54.390625 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-116-1"
-       d="M 18.3125,70.21875 V 54.6875 h 18.5 v -6.984375 h -18.5 v -29.6875 q 0,-6.6875 1.828125,-8.59375 1.828125,-1.90625 7.453125,-1.90625 H 36.8125 V 0 H 27.59375 Q 17.1875,0 13.234375,3.875 9.28125,7.765625 9.28125,18.015625 v 29.6875 H 2.6875 V 54.6875 h 6.59375 v 15.53125 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-105-2"
-       d="M 9.421875,54.6875 H 18.40625 V 0 H 9.421875 Z m 0,21.296875 H 18.40625 V 64.59375 H 9.421875 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-109-7"
-       d="M 52,44.1875 Q 55.375,50.25 60.0625,53.125 64.75,56 71.09375,56 q 8.546875,0 13.1875,-5.984375 4.640625,-5.96875 4.640625,-17 V 0 h -9.03125 v 32.71875 q 0,7.859375 -2.796875,11.65625 -2.78125,3.8125 -8.484375,3.8125 -6.984375,0 -11.046875,-4.640625 -4.046875,-4.625 -4.046875,-12.640625 V 0 h -9.03125 v 32.71875 q 0,7.90625 -2.78125,11.6875 -2.78125,3.78125 -8.59375,3.78125 -6.890625,0 -10.953125,-4.65625 -4.046875,-4.65625 -4.046875,-12.625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.078125,5.03125 7.375,7.421875 Q 29.78125,56 35.6875,56 41.65625,56 45.828125,52.96875 50,49.953125 52,44.1875 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-101-0"
-       d="m 56.203125,29.59375 v -4.390625 h -41.3125 q 0.59375,-9.28125 5.59375,-14.140625 5,-4.859375 13.9375,-4.859375 5.171875,0 10.03125,1.265625 4.859375,1.265625 9.65625,3.8125 v -8.5 q -4.84375,-2.046875 -9.921875,-3.125 -5.078125,-1.078125 -10.296875,-1.078125 -13.09375,0 -20.734375,7.609375 -7.640625,7.625 -7.640625,20.625 0,13.421875 7.25,21.296875 Q 20.015625,56 32.328125,56 q 11.03125,0 17.453125,-7.109375 6.421875,-7.09375 6.421875,-19.296875 z m -8.984375,2.640625 q -0.09375,7.359375 -4.125,11.75 -4.03125,4.40625 -10.671875,4.40625 -7.515625,0 -12.03125,-4.25 -4.515625,-4.25 -5.203125,-11.96875 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-40-9"
-       d="M 31,75.875 Q 24.46875,64.65625 21.28125,53.65625 18.109375,42.671875 18.109375,31.390625 18.109375,20.125 21.3125,9.0625 24.515625,-2 31,-13.1875 H 23.1875 Q 15.875,-1.703125 12.234375,9.375 8.59375,20.453125 8.59375,31.390625 q 0,10.890625 3.609375,21.921875 3.625,11.046875 10.984375,22.5625 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-115-3"
-       d="m 44.28125,53.078125 v -8.5 Q 40.484375,46.53125 36.375,47.5 q -4.09375,0.984375 -8.5,0.984375 -6.6875,0 -10.03125,-2.046875 Q 14.5,44.390625 14.5,40.28125 q 0,-3.125 2.390625,-4.90625 2.390625,-1.78125 9.625,-3.390625 l 3.078125,-0.6875 Q 39.15625,29.25 43.1875,25.515625 47.21875,21.78125 47.21875,15.09375 q 0,-7.625 -6.03125,-12.078125 -6.03125,-4.4375 -16.578125,-4.4375 -4.390625,0 -9.15625,0.859375 Q 10.6875,0.296875 5.421875,2 v 9.28125 q 4.984375,-2.59375 9.8125,-3.890625 4.828125,-1.28125 9.578125,-1.28125 6.34375,0 9.75,2.171875 3.421875,2.171875 3.421875,6.125 0,3.65625 -2.46875,5.609375 -2.453125,1.953125 -10.8125,3.765625 l -3.125,0.734375 q -8.34375,1.75 -12.0625,5.390625 -3.703125,3.640625 -3.703125,9.984375 0,7.71875 5.46875,11.90625 Q 16.75,56 26.8125,56 q 4.96875,0 9.359375,-0.734375 4.40625,-0.71875 8.109375,-2.1875 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-41-6"
-       d="m 8.015625,75.875 h 7.8125 q 7.3125,-11.515625 10.953125,-22.5625 3.640625,-11.03125 3.640625,-21.921875 0,-10.9375 -3.640625,-22.015625 -3.640625,-11.078125 -10.953125,-22.5625 h -7.8125 Q 14.5,-2 17.703125,9.0625 20.90625,20.125 20.90625,31.390625 q 0,11.28125 -3.203125,22.265625 -3.203125,11 -9.6875,22.21875 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       style="stroke:#000000;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round"
-       id="m80d070c6bd-0"
-       d="M 0,0 H -3.5"
-       inkscape:connector-curvature="0" />
-    <path
-       id="DejaVuSans-51-6"
-       d="M 40.578125,39.3125 Q 47.65625,37.796875 51.625,33 q 3.984375,-4.78125 3.984375,-11.8125 0,-10.78125 -7.421875,-16.703125 -7.421875,-5.90625 -21.09375,-5.90625 -4.578125,0 -9.4375,0.90625 -4.859375,0.90625 -10.03125,2.71875 v 9.515625 q 4.09375,-2.390625 8.96875,-3.609375 4.890625,-1.21875 10.21875,-1.21875 9.265625,0 14.125,3.65625 4.859375,3.65625 4.859375,10.640625 0,6.453125 -4.515625,10.078125 -4.515625,3.640625 -12.5625,3.640625 h -8.5 v 8.109375 h 8.890625 q 7.265625,0 11.125,2.90625 3.859375,2.90625 3.859375,8.375 0,5.609375 -3.984375,8.609375 -3.96875,3.015625 -11.390625,3.015625 -4.0625,0 -8.703125,-0.890625 Q 15.375,64.15625 9.8125,62.3125 v 8.78125 q 5.625,1.5625 10.53125,2.34375 4.90625,0.78125 9.25,0.78125 11.234375,0 17.765625,-5.109375 6.546875,-5.09375 6.546875,-13.78125 0,-6.0625 -3.46875,-10.234375 -3.46875,-4.171875 -9.859375,-5.78125 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-97-2"
-       d="m 34.28125,27.484375 q -10.890625,0 -15.09375,-2.484375 -4.203125,-2.484375 -4.203125,-8.5 0,-4.78125 3.15625,-7.59375 3.15625,-2.796875 8.5625,-2.796875 7.484375,0 12,5.296875 4.515625,5.296875 4.515625,14.078125 v 2 z m 17.921875,3.71875 V 0 H 43.21875 v 8.296875 q -3.078125,-4.96875 -7.671875,-7.34375 -4.59375,-2.375 -11.234375,-2.375 -8.390625,0 -13.359375,4.71875 Q 6,8.015625 6,15.921875 q 0,9.21875 6.171875,13.90625 6.1875,4.6875 18.4375,4.6875 H 43.21875 v 0.890625 q 0,6.203125 -4.078125,9.59375 -4.078125,3.390625 -11.453125,3.390625 -4.6875,0 -9.140625,-1.125 -4.4375,-1.125 -8.53125,-3.375 v 8.3125 q 4.921875,1.90625 9.5625,2.84375 Q 24.21875,56 28.609375,56 q 11.875,0 17.734375,-6.15625 5.859375,-6.140625 5.859375,-18.640625 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-110-61"
-       d="M 54.890625,33.015625 V 0 H 45.90625 v 32.71875 q 0,7.765625 -3.03125,11.609375 -3.03125,3.859375 -9.078125,3.859375 -7.28125,0 -11.484375,-4.640625 -4.203125,-4.625 -4.203125,-12.640625 V 0 h -9.03125 v 54.6875 h 9.03125 v -8.5 q 3.234375,4.9375 7.59375,7.375 4.375,2.4375 10.09375,2.4375 9.421875,0 14.25,-5.828125 4.84375,-5.828125 4.84375,-17.15625 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-103-8"
-       d="m 45.40625,27.984375 q 0,9.765625 -4.03125,15.125 -4.015625,5.375 -11.296875,5.375 -7.21875,0 -11.25,-5.375 -4.03125,-5.359375 -4.03125,-15.125 0,-9.71875 4.03125,-15.09375 4.03125,-5.375 11.25,-5.375 7.28125,0 11.296875,5.375 4.03125,5.375 4.03125,15.09375 z M 54.390625,6.78125 q 0,-13.953125 -6.203125,-20.765625 -6.1875,-6.8125 -18.984375,-6.8125 -4.734375,0 -8.9375,0.703125 -4.203125,0.703125 -8.15625,2.171875 V -9.1875 q 3.953125,-2.140625 7.8125,-3.15625 3.859375,-1.03125 7.859375,-1.03125 8.84375,0 13.234375,4.609375 4.390625,4.609375 4.390625,13.9375 V 9.625 Q 42.625,4.78125 38.28125,2.390625 33.9375,0 27.875,0 17.828125,0 11.671875,7.65625 q -6.15625,7.671875 -6.15625,20.328125 0,12.6875 6.15625,20.34375 Q 17.828125,56 27.875,56 q 6.0625,0 10.40625,-2.390625 4.34375,-2.390625 7.125,-7.21875 V 54.6875 h 8.984375 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-108-7"
-       d="M 9.421875,75.984375 H 18.40625 V 0 H 9.421875 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-176-92"
-       d="m 25,67.921875 q -3.90625,0 -6.59375,-2.71875 -2.6875,-2.703125 -2.6875,-6.609375 0,-3.859375 2.6875,-6.515625 2.6875,-2.65625 6.59375,-2.65625 3.90625,0 6.59375,2.65625 2.6875,2.65625 2.6875,6.515625 0,3.859375 -2.71875,6.59375 Q 28.859375,67.921875 25,67.921875 Z m 0,6.296875 q 3.125,0 6,-1.203125 2.890625,-1.1875 4.984375,-3.4375 2.25,-2.1875 3.375,-4.984375 1.125,-2.78125 1.125,-6 0,-6.4375 -4.515625,-10.90625 -4.515625,-4.46875 -11.0625,-4.46875 -6.59375,0 -11,4.390625 Q 9.515625,52 9.515625,58.59375 q 0,6.546875 4.484375,11.078125 4.5,4.546875 11,4.546875 z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <path
-       id="DejaVuSans-46-0"
-       d="M 10.6875,12.40625 H 21 V 0 H 10.6875 Z"
-       inkscape:connector-curvature="0"
-       style="stroke-linecap:butt;stroke-linejoin:round" />
-    <clipPath
-       id="p8e948c6700-2"
-       style="stroke-linecap:butt;stroke-linejoin:round">
-      <rect
-         id="rect2628"
-         y="43.200001"
-         x="144"
-         width="405.81818"
-         height="277.20001"
-         style="stroke-linecap:butt;stroke-linejoin:round" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4491"
-       id="linearGradient4493"
-       x1="251.75584"
-       y1="101.30722"
-       x2="414.34918"
-       y2="46.285915"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.36654093"
-     inkscape:cx="-26.497254"
-     inkscape:cy="249.90704"
-     inkscape:document-units="pt"
-     inkscape:current-layer="layer3"
-     showgrid="false"
-     inkscape:object-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:window-width="1853"
-     inkscape:window-height="931"
-     inkscape:window-x="67"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="true"
-     inkscape:snap-midpoints="true" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="wellen"
-     style="display:inline;stroke-linecap:butt;stroke-linejoin:round"
-     transform="translate(4.8532962e-6)">
-    <path
-       style="fill:none;stroke:#646567;stroke-width:1.411111;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 47.448087,129.99557 c 0.486462,-0.48325 0.972658,-0.96623 1.56744,-2.12846 0.594782,-1.16223 1.299059,-3.00566 1.984371,-5.23182 0.685311,-2.22616 1.352314,-4.83696 1.941017,-7.31991 0.588703,-2.48294 1.099361,-4.83907 1.622235,-7.36539 0.522874,-2.52632 1.058173,-5.22382 1.380937,-6.89836 0.322765,-1.674541 0.433101,-2.326625 0.54038,-2.848047 0.10728,-0.521421 0.211581,-0.912604 0.246514,-1.10003 0.03493,-0.187427 2.6e-4,-0.171419 -0.03471,-0.155275"
-       id="path2982"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect2984"
-       inkscape:original-d="m 47.448087,129.99557 c 0.48646,-0.48325 0.972658,-0.96623 1.458589,-1.44895 0.703776,-1.84169 1.408054,-3.68512 2.111685,-5.52729 0.667035,-2.61015 1.334037,-5.22095 2.000657,-7.83103 0.510799,-2.35582 1.021456,-4.71195 1.531787,-7.06753 0.535421,-2.69706 1.070721,-5.39456 1.605687,-8.09145 0.110575,-0.652195 0.220909,-1.304279 0.330967,-1.956022 0.10447,-0.391088 0.208771,-0.782271 0.312759,-1.17301 -0.03436,0.01572 -0.06903,0.03173 -0.103944,0.04799" />
-    <path
-       style="fill:none;stroke:#646567;stroke-width:1.411111;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 47.448087,129.99557 c 0.296331,-0.33418 0.592417,-0.66807 0.900974,-1.12101 0.308557,-0.45293 0.630197,-1.02582 0.958098,-1.73383 0.3279,-0.708 0.668449,-1.5669 1.012404,-2.17897 0.343955,-0.61206 0.694481,-0.98525 0.953215,-1.19705 0.258735,-0.2118 0.425986,-0.2626 0.598041,-0.24897 0.172055,0.0136 0.349904,0.0918 0.554671,0.26719 0.204768,0.17538 0.413883,0.42111 0.639414,0.7635 0.22553,0.34238 0.455939,0.76787 0.689809,1.24417 0.23387,0.47629 0.471081,1.00315 0.66363,1.43816 0.192549,0.435 0.340321,0.77789 0.472147,1.07953 0.131825,0.30165 0.251981,0.57166 0.504422,1.10441 0.252442,0.53275 0.638963,1.33233 0.943957,1.88699 0.304994,0.55466 0.528203,0.86387 0.703616,1.07996 0.175414,0.21608 0.302925,0.3389 0.425119,0.43663 0.122193,0.0977 0.239013,0.17033 0.353296,0.22402 0.114282,0.0537 0.226086,0.0885 0.392885,0.0925 0.1668,0.004 0.389189,-0.0227 0.633416,-0.12299 0.244227,-0.10032 0.511307,-0.2746 0.895643,-0.63304 0.384336,-0.35844 0.891147,-0.90641 1.353147,-1.41874 0.461999,-0.51232 0.882029,-0.99208 1.213102,-1.3372 0.331074,-0.34511 0.573653,-0.55611 0.811609,-0.72074 0.237955,-0.16462 0.471934,-0.28336 0.665822,-0.3624 0.193888,-0.079 0.348393,-0.11869 0.583638,-0.13083 0.235245,-0.0121 0.548148,0.003 0.793842,0.0389 0.245693,0.036 0.422867,0.0928 0.843451,0.30139 0.420585,0.20854 1.225463,0.64513 1.66813,0.88774 0.442666,0.24261 0.593538,0.32944 0.849216,0.46428 0.255678,0.13483 0.616579,0.31788 0.903896,0.4389 0.287317,0.12102 0.501315,0.18016 0.712469,0.22264 0.211154,0.0425 0.419841,0.0684 0.686816,0.074 0.266975,0.006 0.593093,-0.009 0.861992,-0.039 0.268899,-0.0298 0.481242,-0.0747 0.833426,-0.16967 0.352185,-0.095 0.845786,-0.24053 1.402858,-0.39752 0.557072,-0.15699 1.179121,-0.32587 1.782859,-0.43472 0.603739,-0.10886 1.190178,-0.15791 1.88111,-0.14219 0.690932,0.0157 1.487462,0.0962 2.132209,0.16908 0.644747,0.0728 1.137336,0.13793 1.661497,0.20526 0.52416,0.0673 1.080005,0.13692 1.671339,0.1652 0.591334,0.0283 1.218878,0.0153 1.890125,-0.0147 0.671247,-0.03 1.387056,-0.077 2.140291,-0.11145 0.753235,-0.0344 1.54483,-0.0563 2.321094,-0.0942 0.776265,-0.0379 1.538023,-0.0919 2.261149,-0.10543 0.723126,-0.0135 1.408425,0.0134 2.090357,0.0451 0.681932,0.0317 1.361266,0.0683 2.268039,0.0998 0.906773,0.0314 2.042065,0.0578 3.189529,0.0686 1.147464,0.0108 2.308044,0.006 3.362164,-0.0226 1.05412,-0.0286 2.00244,-0.0811 2.95028,-0.13345"
-       id="path2992"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect2994"
-       inkscape:original-d="m 47.448087,129.99557 c 0.296349,-0.33416 0.592433,-0.66806 0.888251,-1.00169 0.321368,-0.5722 0.643006,-1.14509 0.964112,-1.71723 0.335021,-0.84376 0.675296,-1.70277 1.012547,-2.55376 0.350528,-0.37318 0.701056,-0.74637 1.051187,-1.11916 0.167275,-0.051 0.334529,-0.10179 0.501399,-0.15229 0.177435,0.0776 0.355277,0.15579 0.532519,0.23407 0.227989,0.27635 0.441555,0.51829 0.661934,0.77783 0.230714,0.4253 0.461122,0.85079 0.691285,1.27658 0.23758,0.52683 0.474792,1.05369 0.71179,1.58093 0.148103,0.34277 0.295873,0.68566 0.443413,1.02889 0.116109,0.26006 0.236265,0.53007 0.354002,0.7955 0.387143,0.80006 0.773665,1.59964 1.160102,2.39985 0.223533,0.30904 0.446741,0.61826 0.669716,0.92778 0.127815,0.12259 0.255326,0.24541 0.38259,0.36851 0.117068,0.0723 0.233876,0.14492 0.350417,0.21778 0.111932,0.0345 0.22374,0.0693 0.335211,0.10438 0.221994,-0.0269 0.444384,-0.0536 0.666181,-0.08 0.266642,-0.17408 0.533723,-0.34835 0.800188,-0.52213 0.502314,-0.54298 1.009073,-1.091 1.513213,-1.63611 0.419869,-0.47953 0.839898,-0.95929 1.259451,-1.43855 0.242556,-0.21101 0.485134,-0.42201 0.727307,-0.63262 0.233701,-0.11873 0.467683,-0.23746 0.701128,-0.3558 0.154339,-0.0398 0.308834,-0.0795 0.462856,-0.11882 0.316109,0.0238 0.629436,0.0301 0.943756,0.0455 0.177157,0.0565 0.354332,0.11335 0.531103,0.17043 0.668309,0.35293 1.469345,0.7966 2.203622,1.1953 0.15108,0.0865 0.301937,0.17336 0.452509,0.26044 0.360765,0.18258 0.721667,0.36563 1.082103,0.54885 0.21413,0.0588 0.42812,0.11796 0.641782,0.17734 0.208597,0.0256 0.417274,0.0516 0.625514,0.0777 0.325671,-0.015 0.651788,-0.0298 0.977286,-0.0443 0.212262,-0.0451 0.42462,-0.0899 0.636532,-0.13451 0.492443,-0.14538 0.986044,-0.29092 1.478669,-0.43599 0.62152,-0.16892 1.243568,-0.3378 1.864955,-0.5063 0.586116,-0.0493 1.17256,-0.0983 1.758442,-0.14709 0.796026,0.0802 1.592559,0.16068 2.388444,0.24142 0.493623,0.0649 0.986208,0.13002 1.478915,0.19543 0.555607,0.0693 1.111457,0.13885 1.66679,0.20867 0.627293,-0.0132 1.254837,-0.0262 1.881857,-0.0389 0.71546,-0.0473 1.431272,-0.0943 2.146509,-0.14106 0.791242,-0.0221 1.582838,-0.0439 2.37386,-0.0655 0.761497,-0.0542 1.523254,-0.10822 2.284484,-0.16194 0.685051,0.0266 1.370346,0.0536 2.055122,0.0807 0.679095,0.0363 1.358429,0.0729 2.037246,0.10975 1.134722,0.026 2.270012,0.0524 3.404622,0.079 1.160312,-0.005 2.320892,-0.01 3.480942,-0.0144 0.94817,-0.0527 1.8965,-0.1051 2.84435,-0.15726" />
-    <path
-       style="fill:none;stroke:#646567;stroke-width:1.411111;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 47.448087,129.99557 c 0.656689,-1.03275 1.31318,-2.06519 1.927347,-3.36512 0.614166,-1.29993 1.186431,-2.86828 1.590795,-4.07049 0.404363,-1.20221 0.641119,-2.03909 0.99345,-3.40456 0.35233,-1.36548 0.821089,-3.26294 1.094313,-4.38225 0.273225,-1.1193 0.351345,-1.46219 0.519818,-1.81247 0.168473,-0.35027 0.42763,-0.70864 0.596815,-0.92005 0.169186,-0.21141 0.248692,-0.27635 0.325077,-0.31978 0.07639,-0.0434 0.150185,-0.0657 0.259401,-0.0479 0.109216,0.0178 0.255519,0.0758 0.414058,0.21866 0.15854,0.14285 0.330436,0.3713 0.505463,0.68582 0.175027,0.31451 0.353311,0.71525 0.570873,1.33956 0.217561,0.62432 0.474207,1.47166 0.707733,2.35401 0.233525,0.88236 0.443761,1.79913 0.600746,2.51028 0.156985,0.71115 0.260627,1.21628 0.424968,2.05527 0.164341,0.83899 0.389174,2.01078 0.630992,3.28147 0.241817,1.27069 0.500438,2.63933 0.725405,3.8028 0.224966,1.16347 0.416178,2.12125 0.646843,3.15083 0.230665,1.02959 0.500645,2.13035 0.726082,2.94619 0.225437,0.81585 0.406221,1.34634 0.578625,1.75909 0.172405,0.41276 0.336301,0.70744 0.461855,0.90001 0.125553,0.19256 0.212641,0.28281 0.295382,0.34878 0.08274,0.066 0.160988,0.1076 0.236762,0.1308 0.07577,0.0232 0.149005,0.028 0.26212,-0.0135 0.113116,-0.0415 0.26709,-0.12959 0.443634,-0.31716 0.176544,-0.18758 0.377088,-0.47595 0.591413,-0.87076 0.214324,-0.3948 0.443379,-0.89766 0.712314,-1.55956 0.268935,-0.66189 0.578408,-1.48439 0.863566,-2.2454 0.285159,-0.76101 0.547404,-1.46429 0.803185,-2.1106 0.255781,-0.64632 0.505912,-1.23783 0.681221,-1.62571 0.175309,-0.38788 0.275983,-0.57261 0.397082,-0.77319 0.1211,-0.20058 0.263135,-0.41786 0.397023,-0.59712 0.133887,-0.17926 0.260188,-0.3213 0.477121,-0.45942 0.216934,-0.13811 0.556806,-0.28673 0.771453,-0.34775 0.214647,-0.061 0.32048,-0.0416 0.42982,-0.006 0.10934,0.0358 0.222828,0.0883 0.342597,0.16081 0.119768,0.0725 0.246364,0.16549 0.384337,0.2864 0.137972,0.12091 0.287597,0.27002 0.459375,0.46445 0.171777,0.19442 0.365783,0.43425 0.659819,0.82077 0.294037,0.38653 0.688015,0.91965 0.953324,1.27932 0.265308,0.35967 0.401879,0.5458 0.633217,0.83271 0.231338,0.28691 0.553618,0.67005 0.838318,0.95202 0.284701,0.28198 0.529824,0.46045 0.723898,0.58029 0.194073,0.11985 0.337083,0.18107 0.478443,0.22519 0.141359,0.0441 0.281276,0.0712 0.42164,0.0829 0.140365,0.0117 0.281666,0.008 0.427332,-0.0116 0.145666,-0.0197 0.29647,-0.0554 0.456306,-0.10938 0.159836,-0.054 0.329675,-0.12666 0.517768,-0.22473 0.188094,-0.0981 0.395575,-0.22214 0.659188,-0.39305 0.263613,-0.17091 0.584727,-0.38954 0.812962,-0.54561 0.228236,-0.15608 0.364361,-0.25012 0.758414,-0.47989 0.394052,-0.22977 1.049074,-0.59703 1.42837,-0.79581 0.379297,-0.19877 0.485536,-0.23032 0.680751,-0.25859 0.195215,-0.0283 0.481749,-0.0537 0.72801,-0.0571 0.246261,-0.003 0.453558,0.015 0.670832,0.0499 0.217274,0.0349 0.46289,0.0904 0.752268,0.17483 0.289379,0.0845 0.632178,0.20019 1.4589,0.4155 0.826721,0.21531 2.138819,0.53061 3.069459,0.66259 0.93064,0.13198 1.480484,0.0808 1.973576,-0.0237 0.493092,-0.10452 0.929936,-0.26253 1.61148,-0.34094 0.681544,-0.0784 1.609431,-0.0774 2.536375,-0.0764"
-       id="path2996"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect2998"
-       inkscape:original-d="m 47.448087,129.99557 c 0.656754,-1.03271 1.313246,-2.06515 1.969473,-3.09732 0.572188,-1.56768 1.144453,-3.13603 1.716281,-4.70364 0.236924,-0.83681 0.473681,-1.67369 0.710125,-2.51013 0.468244,-1.89451 0.936988,-3.79197 1.405086,-5.68755 0.07836,-0.34304 0.15648,-0.68593 0.234323,-1.0285 0.258956,-0.35799 0.518112,-0.71636 0.776772,-1.07414 0.07964,-0.0651 0.159149,-0.13004 0.238326,-0.19467 0.07355,-0.0224 0.147362,-0.0446 0.220644,-0.0665 0.145322,0.0573 0.291629,0.11533 0.437046,0.17338 0.171834,0.22775 0.343728,0.4562 0.515194,0.68469 0.178613,0.40062 0.356897,0.80136 0.534951,1.20244 0.257066,0.84759 0.513712,1.69493 0.77017,2.54279 0.210585,0.91688 0.420823,1.83365 0.630838,2.75088 0.10395,0.50508 0.207595,1.01021 0.310994,1.51572 0.22528,1.17247 0.450112,2.34426 0.674772,3.51679 0.258974,1.36885 0.517594,2.73749 0.775997,4.10663 0.191534,0.9578 0.382746,1.91558 0.573722,2.87377 0.270359,1.10096 0.540337,2.20172 0.810109,3.30297 0.18111,0.53041 0.361895,1.0609 0.542446,1.59175 0.164256,0.29459 0.32815,0.58928 0.491826,0.88431 0.0874,0.09 0.174472,0.18026 0.261311,0.27078 0.07853,0.0414 0.156789,0.083 0.234788,0.12489 0.07337,0.005 0.146654,0.009 0.219586,0.0144 0.15321,-0.0878 0.307186,-0.17592 0.460383,-0.26349 0.199993,-0.28746 0.400537,-0.57583 0.600408,-0.86335 0.228841,-0.50208 0.457896,-1.00494 0.686448,-1.50701 0.309343,-0.82172 0.618816,-1.64422 0.927828,-2.46593 0.261308,-0.70031 0.523555,-1.40358 0.784934,-2.10498 0.250166,-0.59123 0.500298,-1.18274 0.750049,-1.77372 0.10083,-0.18479 0.201504,-0.36952 0.301858,-0.55389 0.141814,-0.2168 0.28385,-0.43408 0.425375,-0.65072 0.126204,-0.1419 0.2525,-0.28395 0.378352,-0.42552 0.3029,-0.14634 0.647819,-0.28341 0.971333,-0.42472 0.105886,0.0191 0.211717,0.0385 0.317177,0.0581 0.113311,0.052 0.226804,0.10444 0.339807,0.15705 0.126603,0.0925 0.253204,0.18544 0.37941,0.27856 0.149783,0.14874 0.299408,0.29785 0.448715,0.44717 0.194273,0.23956 0.388281,0.47938 0.582022,0.71947 0.394343,0.53298 0.788318,1.0661 1.182079,1.59955 0.136858,0.18589 0.273426,0.37202 0.409744,0.55843 0.326478,0.38728 0.648624,0.77053 0.97254,1.15619 0.245417,0.17823 0.49054,0.3567 0.735412,0.53544 0.143208,0.0609 0.286208,0.12215 0.428913,0.18363 0.13993,0.0268 0.279845,0.0539 0.419367,0.0812 0.141145,-0.004 0.282438,-0.008 0.42326,-0.011 0.150489,-0.0358 0.301294,-0.0715 0.451543,-0.10691 0.169407,-0.0726 0.339246,-0.14524 0.508473,-0.21747 0.206965,-0.12387 0.414446,-0.24794 0.621271,-0.37151 0.320411,-0.21823 0.641522,-0.43686 0.961888,-0.65489 0.136117,-0.0941 0.272232,-0.18816 0.40795,-0.28184 0.652378,-0.36589 1.307399,-0.73315 1.960703,-1.09933 0.105272,-0.0315 0.211526,-0.063 0.316894,-0.0941 0.285094,-0.0255 0.571629,-0.0509 0.857049,-0.076 0.207147,0.0181 0.414446,0.0365 0.621273,0.0552 0.225076,0.063 0.473377,0.10657 0.709668,0.16025 0.342503,0.11526 0.685303,0.23097 1.027557,0.34685 1.311156,0.31475 2.623254,0.63005 3.934481,0.94547 0.549955,-0.0514 1.099801,-0.10252 1.649307,-0.15338 0.436647,-0.1581 0.87349,-0.31611 1.309838,-0.47377 0.926795,5.3e-4 1.854681,0.002 2.781625,0.003" />
-    <path
-       style="fill:none;stroke:#646567;stroke-width:1.411111;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 52.584921,116.67725 c 0.620171,-2.72011 1.240272,-5.43992 1.616299,-7.11994 0.376026,-1.68001 0.508017,-2.32038 0.787786,-3.18365 0.27977,-0.86327 0.707679,-1.95052 0.9804,-2.58625 0.272721,-0.63572 0.390457,-0.82055 0.562566,-1.0376 0.172109,-0.21704 0.399324,-0.46721 0.659884,-0.67833 0.260561,-0.21113 0.555432,-0.38409 0.864766,-0.49594 0.309335,-0.11185 0.634169,-0.16302 0.973123,-0.15402 0.338955,0.009 0.693106,0.0781 1.000094,0.17486 0.306987,0.0967 0.56752,0.22122 0.833682,0.39141 0.266162,0.17019 0.53841,0.38635 0.877095,0.74604 0.338685,0.35968 0.744084,0.86317 1.057931,1.32014 0.313848,0.45696 0.53619,0.86747 0.771885,1.37021 0.235694,0.50273 0.484612,1.09742 0.783114,1.96709 0.298503,0.86967 0.646374,2.0137 0.960928,3.21203 0.314554,1.19833 0.59562,2.45036 0.866726,3.77569 0.271106,1.32534 0.532121,2.72336 0.748133,3.93487 0.216012,1.21152 0.386925,2.23602 0.580957,3.41589 0.194031,1.17986 0.412898,2.52567 0.61512,3.7508 0.202222,1.22513 0.388609,2.33457 0.606997,3.57334 0.218387,1.23878 0.468652,2.60618 0.69138,3.71057 0.222729,1.1044 0.417822,1.94527 0.601237,2.62105 0.183415,0.67579 0.355057,1.18611 0.491005,1.54473 0.135947,0.35862 0.236104,0.56527 0.330368,0.72967 0.09426,0.1644 0.182501,0.2863 0.264998,0.37765 0.0825,0.0914 0.159076,0.15198 0.23168,0.19179 0.0726,0.0398 0.141126,0.0588 0.244561,0.0391 0.103436,-0.0197 0.242395,-0.0781 0.380156,-0.19118 0.137761,-0.11309 0.275396,-0.28163 0.42279,-0.52452 0.147395,-0.24288 0.305485,-0.56155 0.483656,-0.98317 0.17817,-0.42162 0.377123,-0.94778 0.558754,-1.46594 0.18163,-0.51816 0.346358,-1.02947 0.468624,-1.41154 0.122267,-0.38206 0.202271,-0.63549 0.348058,-1.09054 0.145787,-0.45504 0.357931,-1.11349 0.634669,-1.92211 0.276737,-0.80861 0.618649,-1.76913 0.859306,-2.39594 0.240657,-0.6268 0.38028,-0.92055 0.549365,-1.2184 0.169086,-0.29784 0.368068,-0.60056 0.552634,-0.83063 0.184566,-0.23006 0.355209,-0.38818 0.512757,-0.49097 0.157549,-0.10278 0.302598,-0.15069 0.424017,-0.17227 0.121419,-0.0216 0.219954,-0.017 0.320369,0.003 0.100416,0.0203 0.203564,0.0566 0.334267,0.12944 0.130702,0.0729 0.286829,0.18078 0.458107,0.33809 0.171278,0.15731 0.356672,0.36336 0.559086,0.62413 0.202415,0.26077 0.421911,0.57633 0.613312,0.86256 0.191402,0.28623 0.354639,0.54302 0.794917,1.18676 0.440278,0.64375 1.157181,1.67385 1.591314,2.25461 0.434132,0.58076 0.585228,0.71182 0.729578,0.81844 0.14435,0.10663 0.281905,0.18879 0.415574,0.25189 0.133668,0.0631 0.26349,0.10717 0.392347,0.13546 0.128856,0.0283 0.257017,0.0409 0.387693,0.0383 0.130676,-0.003 0.264465,-0.0204 0.436117,-0.0692 0.171653,-0.0488 0.382325,-0.1289 0.593097,-0.237 0.210772,-0.10811 0.422763,-0.24473 0.643404,-0.40405 0.220642,-0.15932 0.450937,-0.34204 0.966832,-0.72744 0.515895,-0.3854 1.319748,-0.97523 1.839715,-1.31206 0.519967,-0.33683 0.757237,-0.42156 1.002523,-0.48119 0.245285,-0.0596 0.499387,-0.0944 0.727878,-0.1042 0.228491,-0.01 0.432222,0.005 0.618442,0.0322 0.18622,0.0271 0.355599,0.0663 0.523947,0.11342 0.168348,0.0471 0.33627,0.10219 1.020083,0.34866 0.683813,0.24647 1.886017,0.68521 2.679633,0.92372 0.793616,0.23851 1.1798,0.27726 1.616454,0.27142 0.436654,-0.006 0.924373,-0.0563 1.772158,-0.19528 0.847784,-0.13901 2.057351,-0.36685 3.018001,-0.48575 0.96065,-0.11889 1.6735,-0.12903 2.24608,-0.10377 0.57257,0.0253 1.00543,0.0859 1.4379,0.14655"
-       id="path3000"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect3002"
-       inkscape:original-d="m 52.584921,116.67725 c 0.620364,-2.72007 1.240465,-5.43988 1.860302,-8.15942 0.132225,-0.64049 0.264215,-1.28086 0.395925,-1.92089 0.427768,-1.08649 0.855676,-2.17375 1.283118,-3.26023 0.11793,-0.18498 0.235667,-0.36981 0.353102,-0.55432 0.226724,-0.24961 0.45394,-0.49978 0.680514,-0.74927 0.294486,-0.17285 0.589359,-0.34581 0.883639,-0.51832 0.324406,-0.0513 0.649235,-0.1025 0.973455,-0.15335 0.353775,0.0688 0.707933,0.13791 1.061503,0.20725 0.260498,0.12409 0.521033,0.24858 0.781151,0.37327 0.272282,0.21572 0.544533,0.43188 0.816403,0.64822 0.405559,0.50309 0.810953,1.00658 1.216036,1.51026 0.222639,0.41031 0.444984,0.82082 0.66708,1.23163 0.249296,0.5947 0.498216,1.18939 0.746927,1.78449 0.34829,1.14427 0.696164,2.2883 1.043847,3.43286 0.281414,1.25213 0.562478,2.50416 0.843323,3.75664 0.26136,1.3982 0.52238,2.79622 0.783172,4.19473 0.171227,1.02453 0.342138,2.04903 0.512812,3.07393 0.217361,1.33484 0.436259,2.68064 0.65399,4.02136 0.186711,1.10954 0.373099,2.21898 0.559252,3.32886 0.250624,1.36766 0.500888,2.73506 0.750938,4.10299 0.195416,0.84085 0.390506,1.68172 0.585364,2.52297 0.171984,0.51028 0.343625,1.0206 0.515038,1.53129 0.100483,0.20651 0.200638,0.41316 0.300558,0.62013 0.08859,0.12176 0.176829,0.24366 0.264846,0.36589 0.07691,0.0604 0.15349,0.12102 0.229838,0.18194 0.06871,0.0187 0.137226,0.0377 0.205441,0.0569 0.138515,-0.0584 0.277484,-0.11679 0.41583,-0.1748 0.137263,-0.16802 0.274891,-0.33657 0.411943,-0.50446 0.157816,-0.31785 0.315907,-0.63652 0.473466,-0.95439 0.198819,-0.52537 0.397772,-1.05153 0.59626,-1.5769 0.164793,-0.51095 0.32952,-1.02226 0.493882,-1.533 0.08017,-0.25339 0.160176,-0.50682 0.239868,-0.75984 0.211879,-0.65707 0.424024,-1.31552 0.635641,-1.97289 0.341846,-0.95986 0.683757,-1.92038 1.025239,-2.88017 0.139795,-0.29382 0.279416,-0.58757 0.418727,-0.88095 0.198813,-0.30232 0.397793,-0.60504 0.596294,-0.90716 0.170561,-0.15806 0.341204,-0.31618 0.51141,-0.47388 0.144852,-0.048 0.289904,-0.0959 0.434462,-0.1435 0.09835,0.004 0.196866,0.009 0.294902,0.0137 0.102896,0.0358 0.206057,0.072 0.308692,0.10844 0.158797,0.10944 0.314986,0.21726 0.472083,0.32629 0.185525,0.20564 0.370919,0.41169 0.555984,0.61793 0.219792,0.31534 0.439291,0.6309 0.658538,0.94676 0.16356,0.25661 0.326794,0.5134 0.489796,0.7705 0.71755,1.03038 1.434452,2.06048 2.151282,3.09112 0.151376,0.13081 0.302472,0.26187 0.453311,0.3932 0.137795,0.0819 0.275362,0.16404 0.412647,0.24647 0.12996,0.0438 0.259807,0.0878 0.389313,0.13217 0.128111,0.0123 0.25627,0.0249 0.384008,0.0377 0.133559,-0.018 0.267348,-0.0358 0.400627,-0.0533 0.210005,-0.08 0.420674,-0.16011 0.630613,-0.23977 0.211614,-0.13648 0.423606,-0.2731 0.635011,-0.40925 0.229893,-0.18246 0.460189,-0.36518 0.68989,-0.54737 0.802084,-0.58861 1.605936,-1.17845 2.40851,-1.76728 0.23735,-0.0849 0.47461,-0.16966 0.711517,-0.25409 0.253688,-0.0349 0.507794,-0.0696 0.761294,-0.10406 0.203528,0.0147 0.407265,0.0296 0.610502,0.0449 0.169246,0.0389 0.338635,0.0781 0.507556,0.1176 0.167804,0.0547 0.335724,0.10981 0.503192,0.16512 1.200169,0.43763 2.402372,0.87637 3.603159,1.31495 0.386355,0.0385 0.772544,0.0772 1.158418,0.11623 0.487383,-0.0506 0.975098,-0.10107 1.462248,-0.15121 1.208403,-0.22785 2.41797,-0.45569 3.62656,-0.68314 0.71275,-0.0104 1.4256,-0.0206 2.13799,-0.0304 0.4328,0.0604 0.86566,0.12103 1.29809,0.18194" />
-    <ellipse
-       transform="translate(-239.7063,10.906828)"
-       style="display:inline;opacity:0.25;fill:url(#linearGradient4493);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.87258095;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="path4484"
-       cx="327.21246"
-       cy="76.593521"
-       rx="79.907387"
-       ry="74.996513" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="kringel"
-     style="stroke-linecap:butt;stroke-linejoin:round"
-     transform="translate(4.8532962e-6)">
-    <ellipse
-       style="opacity:0.5;fill:#ee7596;fill-opacity:0.58823529;fill-rule:nonzero;stroke:none;stroke-width:1.49982667;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="path1652"
-       cx="67.210365"
-       cy="49.55434"
-       rx="8.9491396"
-       ry="8.545476" />
-    <ellipse
-       style="opacity:0.5;fill:#ee7596;fill-opacity:0.58823529;fill-rule:nonzero;stroke:none;stroke-width:1.49704278;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="path1654"
-       cx="104.12398"
-       cy="59.155869"
-       rx="9.1876955"
-       ry="8.7350845" />
-    <ellipse
-       style="opacity:0.5;fill:#ee7596;fill-opacity:0.58823529;fill-rule:nonzero;stroke:none;stroke-width:1.49982667;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="path1652-5"
-       cx="34.766869"
-       cy="75.09436"
-       rx="8.9491396"
-       ry="8.545476" />
-    <ellipse
-       style="opacity:0.5;fill:#ee7596;fill-opacity:0.58823529;fill-rule:nonzero;stroke:none;stroke-width:1.49982667;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="path1652-3"
-       cx="129.77319"
-       cy="89.28965"
-       rx="8.9491396"
-       ry="8.545476" />
-    <path
-       style="fill:#e96088;fill-opacity:1;stroke:#e96088;stroke-width:1.76388884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 49.69255,96.889507 C 46.956162,92.9617 44.219809,89.033945 41.483495,85.106244"
-       id="path1758"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect1760"
-       inkscape:original-d="M 49.69255,96.889507 C 46.956464,92.96149 44.220112,89.033734 41.483495,85.106244" />
-    <path
-       style="fill:none;stroke:#e96088;stroke-width:1.9402777;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 68.94442,90.484117 C 68.425661,80.803167 67.788368,68.910177 67.210362,58.123584"
-       id="path1762"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect1764"
-       inkscape:original-d="M 68.94442,90.484117 C 68.366666,80.806328 67.788646,68.910162 67.210362,58.123584" />
-    <path
-       style="fill:none;stroke:#e96088;stroke-width:1.9402777;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 93.251473,92.495879 C 95.450579,85.046442 97.649931,77.596176 99.84902,70.146798"
-       id="path1766"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect1768"
-       inkscape:original-d="m 93.251473,92.495879 c 2.21212,-7.445595 4.398629,-14.899653 6.597547,-22.349081" />
-    <path
-       style="fill:none;stroke:#e96088;stroke-width:1.76388884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 120.77344,97.587591 c -2.90619,2.363516 -5.81266,4.727269 -8.71943,7.091259"
-       id="path1770"
-       inkscape:connector-curvature="0"
-       inkscape:path-effect="#path-effect1772"
-       inkscape:original-d="m 120.77344,97.587591 c -2.90621,2.363486 -5.81269,4.727239 -8.71943,7.091259" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="logo"
-     transform="translate(-239.7063,10.906828)"
-     style="display:inline;stroke-linecap:butt;stroke-linejoin:round">
-    <path
-       style="opacity:1;fill:#e96088;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:49.01657104;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       d="m 1236.6855,-41.222656 a 330.70866,330.70866 0 0 0 -330.70894,330.707036 330.70866,330.70866 0 0 0 330.70894,330.70898 330.70866,330.70866 0 0 0 330.709,-330.70898 330.70866,330.70866 0 0 0 -1.1035,-22.04297 l -28.2461,4.13086 a 302.03602,283.46457 0 0 1 0.6758,17.91211 A 302.03602,283.46457 0 0 1 1236.6855,572.94922 302.03602,283.46457 0 0 1 934.64844,289.48438 302.03602,283.46457 0 0 1 1236.6855,6.0214844 302.03602,283.46457 0 0 1 1464.7734,104.19531 c 10.4697,-7.227913 21.3071,-14.703948 30.1289,-20.816404 A 330.70866,330.70866 0 0 0 1236.6855,-41.222656 Z"
-       transform="scale(0.26458333)"
-       id="path949"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:1;fill:#e96088;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:37.79527664;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       d="M 556.28711,391.42969 A 150.71429,100.71429 0 0 0 405.57227,492.14258 150.71429,100.71429 0 0 0 556.28711,592.85742 150.71429,100.71429 0 0 0 707.00195,492.14258 150.71429,100.71429 0 0 0 556.28711,391.42969 Z m 0,10.51172 a 132.28348,90.202475 0 0 1 132.2832,90.20117 132.28348,90.202475 0 0 1 -132.2832,90.20312 132.28348,90.202475 0 0 1 -132.2832,-90.20312 132.28348,90.202475 0 0 1 132.2832,-90.20117 z"
-       transform="matrix(0.26458333,0,0,0.26458333,168.95536,-24.462611)"
-       id="path5459"
-       inkscape:connector-curvature="0" />
-    <ellipse
-       style="opacity:0.5;fill:#ff0000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="path5605"
-       cx="222.25"
-       cy="5.3975062"
-       rx="53.294643"
-       ry="29.860117" />
-    <path
-       style="opacity:1;fill:#e96088;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:23.93139648;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       d="M 1160,101.19336 A 47.244094,44.920603 0 0 0 1112.7559,146.11523 47.244094,44.920603 0 0 0 1160,191.03516 47.244094,44.920603 0 0 0 1207.2441,146.11523 47.244094,44.920603 0 0 0 1160,101.19336 Z m 0,12.57812 a 34.015748,32.342835 0 0 1 34.0156,32.34375 A 34.015748,32.342835 0 0 1 1160,178.45703 34.015748,32.342835 0 0 1 1125.9844,146.11523 34.015748,32.342835 0 0 1 1160,113.77148 Z"
-       transform="scale(0.26458333)"
-       id="path5607-6"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:11.57941151px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e96088;fill-opacity:1;stroke:none;stroke-width:0.28948528;stroke-linecap:butt;stroke-linejoin:round"
-       x="373.02008"
-       y="59.403522"
-       id="text5683"><tspan
-         sodipodi:role="line"
-         id="tspan5681"
-         x="373.02008"
-         y="59.403522"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:condensed;font-size:30.87843132px;font-family:'Open Sans Condensed';-inkscape-font-specification:'Open Sans Condensed, Bold Condensed';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#e96088;fill-opacity:1;stroke-width:0.28948528;stroke-linecap:butt;stroke-linejoin:round">SLEW</tspan></text>
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot5685"
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-linecap:butt;stroke-linejoin:round"><flowRegion
-         id="flowRegion5687"
-         style="stroke-linecap:butt;stroke-linejoin:round"><rect
-           id="rect5689"
-           width="89.90358"
-           height="80.812202"
-           x="1514.2186"
-           y="91.988716"
-           style="stroke-linecap:butt;stroke-linejoin:round" /></flowRegion><flowPara
-         id="flowPara5691"
-         style="stroke-linecap:butt;stroke-linejoin:round" /></flowRoot>    <path
-       transform="translate(239.7063,-10.906828)"
-       style="display:inline;opacity:0.25;fill:#ee7596;fill-opacity:0.58823529;fill-rule:nonzero;stroke:none;stroke-width:0.98501724;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       inkscape:transform-center-x="0.88475427"
-       inkscape:transform-center-y="-0.19661715"
-       d="M 111.43325,116.69093 A 35.141579,23.897392 0 0 1 76.291672,140.58833 35.141579,23.897392 0 0 1 41.150093,116.69093 35.141579,23.897392 0 0 1 76.291672,92.793541 35.141579,23.897392 0 0 1 111.43325,116.69093 Z"
-       id="path3004"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;opacity:1;fill:#e96088;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.33184814;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       d="m 343.83028,36.185995 a 12.499999,11.885242 0 0 0 -12.5,11.885578 12.499999,11.885242 0 0 0 12.5,11.885063 12.499999,11.885242 0 0 0 12.5,-11.885063 12.499999,11.885242 0 0 0 -12.5,-11.885578 z m 0,3.327961 a 8.9999994,8.5573745 0 0 1 8.99996,8.557617 8.9999994,8.5573745 0 0 1 -8.99996,8.5571 8.9999994,8.5573745 0 0 1 -8.99996,-8.5571 8.9999994,8.5573745 0 0 1 8.99996,-8.557617 z"
-       id="path5607-6-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;opacity:1;fill:#e96088;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.33184814;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       d="m 274.47317,52.290334 a 12.499999,11.885242 0 0 0 -12.5,11.885577 12.499999,11.885242 0 0 0 12.5,11.885064 12.499999,11.885242 0 0 0 12.5,-11.885064 12.499999,11.885242 0 0 0 -12.5,-11.885577 z m 0,3.32796 a 8.9999994,8.5573745 0 0 1 8.99996,8.557617 8.9999994,8.5573745 0 0 1 -8.99996,8.557101 8.9999994,8.5573745 0 0 1 -8.99996,-8.557101 8.9999994,8.5573745 0 0 1 8.99996,-8.557617 z"
-       id="path5607-6-6"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;opacity:1;fill:#e96088;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.33184814;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       d="m 369.42868,66.497243 a 12.499999,11.885242 0 0 0 -12.5,11.885577 12.499999,11.885242 0 0 0 12.5,11.885064 12.499999,11.885242 0 0 0 12.5,-11.885064 12.499999,11.885242 0 0 0 -12.5,-11.885577 z m 0,3.32796 a 8.9999994,8.5573745 0 0 1 8.99996,8.557617 8.9999994,8.5573745 0 0 1 -8.99996,8.557101 8.9999994,8.5573745 0 0 1 -8.99996,-8.557101 8.9999994,8.5573745 0 0 1 8.99996,-8.557617 z"
-       id="path5607-6-7"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/src/branding/slew/slew-functions.js b/src/branding/slew/slew-functions.js
deleted file mode 100644
index b584a369..00000000
--- a/src/branding/slew/slew-functions.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-import React from 'react';
-import './slew.css'
-
-
-export function slew_home() {
-  return (
-    <div className="home-container">
-      <h1>Home</h1>
-      <p>
-        Welcome to <b>SLEW</b>!
-      </p>
-      <p>SLEW is a learning platform for running experiments in a virtual power engineering world.
-        The platform enables interaction with the experiments in real time and performing analysis on the experimental results.</p>
-
-      <p>The motivation behind SLEW is the ongoing transformation of the energy system, which is making the system more and more complex.
-        Hence, understanding new phenomena and underlying interactions is getting more challenging, also because real experimental
-        activities for obtaining a better understanding are not possible for obvious reasons of security and safety.</p>
-
-      <p>The SLEW platform gives the possibility to perform experiments in a virtual infrastructure and to learn from the execution
-        of complex models. It provides a virtual power engineering world where complex phenomena take place while users can interact
-        with the system in real time.</p>
-
-      <p>The platform is based on the real-time simulation tool DPsim developed in RWTH,
-        which is available as open-source software project to the power engineering community. Besides, it integrates the interactive
-        computing environment Jupyter for further analysis of experimental results.</p>
-
-      <h3>Contacts</h3>
-      <ul>
-        <li><a href="mailto:jdinkelbach@eonerc.rwth-aachen.de">Jan Dinkelbach</a></li>
-        <li><a href="mailto:ikoester@eonerc.rwth-aachen.de">Iris Köster</a></li>
-        <li><a href="mailto:post@steffenvogel.de">Steffen Vogel</a></li>
-      </ul>
-
-      <h3>Credits</h3>
-      <div>
-        <img id="images" height={70} src={require('./img/eonerc_rwth.svg').default} alt="Logo EONERC" />
-        <img id="images" height={70} src={require('./img/erigrid2.png').default} alt="Logo Erigrid" />
-        <img id="images" height={70} src={require('./img/european_commission.svg').default} alt="Logo EU" />
-      </div>
-    </div>)
-}
-
-export function slew_welcome() {
-  return (
-    <div >
-      <h1>Welcome!</h1>
-      <p>SLEW is a learning platform for running experiments in a virtual power engineering world.
-        The platform enables to interact with the experiments in real time and perform analyses on the experimental results.</p>
-    </div>)
-}
diff --git a/src/branding/slew/slew-values.js b/src/branding/slew/slew-values.js
deleted file mode 100644
index 43276562..00000000
--- a/src/branding/slew/slew-values.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-const slew_values = {
-  title: 'SLEW',
-  subtitle: 'Second Life for Energiewende',
-  icon: "slew_blue.png",
-  logo: "slew_logo.png",
-  pages: {
-    home: true,
-    scenarios: true,
-    infrastructure: false,
-    account: false,
-    api: false
-  },
-  links: {
-    "DPsim Simulator": "https://dpsim.fein-aachen.org",
-    "VILLASframework": "https://villas.fein-aachen.org/doc"
-  },
-  style: {
-    background: 'rgba(207,209,210, 1)',
-    highlights: 'rgba(0,84,159, 0.75)',
-    main: 'rgba(80,80,80, 1)',
-    secondaryText: 'rgba(80,80,80, 0.9)',
-    fontFamily: "Roboto, sans-serif",
-    borderRadius: "10px"
-  }
-}
-
-export default slew_values;
diff --git a/src/branding/slew/slew.css b/src/branding/slew/slew.css
deleted file mode 100644
index a91c54bc..00000000
--- a/src/branding/slew/slew.css
+++ /dev/null
@@ -1,4 +0,0 @@
-#images {
-    margin-left: 2em;
-    margin-right: 2em
-}
diff --git a/src/branding/style.css b/src/branding/style.css
new file mode 100644
index 00000000..42980eae
--- /dev/null
+++ b/src/branding/style.css
@@ -0,0 +1,8 @@
+#home-logo-0{
+    float:right;
+    height:120;
+}
+
+#home-logo-1{
+height:60;
+}
\ No newline at end of file
diff --git a/src/branding/template/img/template_logo.svg b/src/branding/template/img/template_logo.svg
deleted file mode 100644
index 6d7f29c8..00000000
--- a/src/branding/template/img/template_logo.svg
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="400"
-     inkscape:cy="560"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1853"
-     inkscape:window-height="921"
-     inkscape:window-x="67"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <ellipse
-       id="path3713"
-       cx="107.34524"
-       cy="152.6131"
-       rx="93.738091"
-       ry="90.714287"
-       style="fill:#ffb380;stroke-width:0.46149299" />
-    <path
-       style="fill:#d45500;stroke-width:0.46149299"
-       id="path3717"
-       sodipodi:type="arc"
-       sodipodi:cx="108.74432"
-       sodipodi:cy="175.60233"
-       sodipodi:rx="30.779675"
-       sodipodi:ry="24.231895"
-       sodipodi:start="0"
-       sodipodi:end="0.17905702"
-       sodipodi:open="true"
-       d="m 139.524,175.60233 a 30.779675,24.231895 0 0 1 -0.4921,4.31574" />
-    <ellipse
-       style="fill:#d45500;stroke-width:0.46149299"
-       id="path3722"
-       cx="108.74432"
-       cy="178.08763"
-       rx="33.577824"
-       ry="26.71722" />
-    <ellipse
-       style="fill:#008080;stroke-width:0.46149299"
-       id="path3729"
-       cx="76.565552"
-       cy="128.38118"
-       rx="9.7935324"
-       ry="10.562623" />
-    <ellipse
-       style="fill:#008080;stroke-width:0.46149299"
-       id="path3729-3"
-       cx="135.32677"
-       cy="127.75985"
-       rx="9.7935324"
-       ry="10.562623" />
-    <ellipse
-       style="fill:#552200;stroke-width:0.46149299"
-       id="path3748"
-       cx="96.152611"
-       cy="183.0583"
-       rx="4.197228"
-       ry="5.5919766" />
-    <ellipse
-       style="fill:#552200;stroke-width:0.46149299"
-       id="path3748-6"
-       cx="117.1388"
-       cy="183.67961"
-       rx="4.197228"
-       ry="5.5919766" />
-  </g>
-</svg>
diff --git a/src/branding/template/template-functions.js b/src/branding/template/template-functions.js
deleted file mode 100644
index 7ddf98d8..00000000
--- a/src/branding/template/template-functions.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-import React from 'react';
-
-
-export function template_home() {
-  return (
-    <div className="home-container">
-      <img style={{ height: 120, float: 'right' }} src={require('./img/template_logo.svg').default} alt="Template Logo" />
-      <h1>Home</h1>
-      <p>
-        Welcome to <b>BRAND</b>!
-      </p>
-      <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut
-        labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
-        Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
-
-      <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
-        et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
-        Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
-    </div>)
-}
-
-export function template_welcome() {
-  return (
-    <div >
-      <h1>Welcome!</h1>
-      <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut
-        labore et dolore magna aliquyam erat, sed diam voluptua.</p>
-    </div>)
-}
-
-export function template_footer() {
-  return (
-    <footer className="app-footer">
-      <p>HELLO WORLD, THIS IS MY FOOTER!</p>
-    </footer>)
-}
diff --git a/src/branding/template/template-values.js b/src/branding/template/template-values.js
deleted file mode 100644
index 4b1bb0c5..00000000
--- a/src/branding/template/template-values.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-const template_values = {
-  title: 'Template',
-  subtitle: 'change me!',
-  icon: "template_logo.svg",
-  pages: {
-    home: true,
-    scenarios: true,
-    infrastructure: true,
-    users: true,
-    account: true,
-    api: true
-  },
-  links: {
-    "Google": "https://www.google.com/",
-    "StackOverFlow": "https://stackoverflow.com/"
-  },
-  style: {
-    background: 'rgba(50,30,90, 0.6)',
-    highlights: 'rgba(0,230,5, 0.75)',
-    main: 'rgba(255,0,0, 1)',
-    secondaryText: 'rgba(0,0,100, 0.8)',
-    fontFamily: "Comic Sans, sans-serif",
-    borderRadius: "60px"
-  }
-}
-
-export default template_values;
diff --git a/src/branding/villasweb/img/datamodel.png b/src/branding/villasweb/img/datamodel.png
deleted file mode 100644
index f98745fc..00000000
Binary files a/src/branding/villasweb/img/datamodel.png and /dev/null differ
diff --git a/src/branding/villasweb/img/eonerc_rwth.svg b/src/branding/villasweb/img/eonerc_rwth.svg
deleted file mode 100644
index 42c4c3f2..00000000
--- a/src/branding/villasweb/img/eonerc_rwth.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   xml:space="preserve"
-   width="423.47867"
-   height="63.401333"
-   viewBox="0 0 423.47867 63.401333"
-   sodipodi:docname="eonerc_logo.svg"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs6"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath22"><path
-         d="M 0,0 318,0 318,48 0,48 Z"
-         id="path20"
-         inkscape:connector-curvature="0" /></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="852"
-     inkscape:document-units="px"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="1.1892783"
-     inkscape:cx="-142.81708"
-     inkscape:cy="-48.076868"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g10"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" /><g
-     id="g10"
-     inkscape:groupmode="layer"
-     inkscape:label="rwth_acs_combined"
-     transform="matrix(1.3333333,0,0,-1.3333333,0,63.401468)"><path
-       inkscape:connector-curvature="0"
-       id="path26"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 261.312,20.438102 2.051,0 c 1.961,0 3.016,-0.996 3.016,-2.985 0,-2.324 -1.176,-3.23 -3.258,-3.23 l -1.809,0 z m -4.347,-18.344 4.347,0 0,9.113 2.321,0 c 1.75,0 2.508,-1.027 2.566,-2.718 l 0.121,-4.133 c 0.032,-0.844 0.121,-1.66 0.543,-2.262 l 4.707,0 0,0.18 c -0.816,0.422 -0.937,1.597 -0.965,3.863 -0.062,4.555 -0.515,6.187 -3.472,6.578 l 0,0.059 c 2.445,0.515 3.594,2.445 3.594,5.312 0,3.68 -2.176,5.551 -5.735,5.551 l -8.027,0 0,-21.543" /><path
-       inkscape:connector-curvature="0"
-       id="path28"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 192.902,23.637102 0,-15.027 c 0,-5.762 3.352,-6.942 6.879,-6.942 3.531,0 6.883,1.449 6.883,6.942 l 0,15.027 -4.348,0 0,-15.027 c 0,-2.141 -0.511,-3.743 -2.535,-3.743 -2.019,0 -2.531,1.602 -2.531,3.743 l 0,15.027 -4.348,0" /><path
-       inkscape:connector-curvature="0"
-       id="path30"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 207.727,23.637102 0,-21.543 3.984,0 0,15.086 0.059,0 5.312,-15.086 4.949,0 0,21.543 -3.984,0 0,-14.754 -0.059,0 -5.254,14.754 -5.007,0" /><path
-       inkscape:connector-curvature="0"
-       id="path32"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 223.148,23.637102 4.344,0 0,-21.543 -4.344,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path34"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 227.789,23.637102 4.949,-21.543 5.582,0 4.95,21.543 -4.497,0 -3.199,-15.934 -0.09,0 -3.046,15.934 -4.649,0" /><path
-       inkscape:connector-curvature="0"
-       id="path36"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 243.656,23.637102 0,-21.543 12.344,0 0,3.559 -7.996,0 0,5.793 7.242,0 0,3.562 -7.242,0 0,5.07 7.691,0 0,3.559 -12.039,0" /><path
-       inkscape:connector-curvature="0"
-       id="path38"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 271.086,8.821102 0,-0.875 c 0,-3.985 1.934,-6.278 6.852,-6.278 4.707,0 7.48,2.055 7.48,6.61 0,2.625 -0.844,4.285 -4.102,5.703 l -3.351,1.449 c -1.84,0.785 -2.231,1.598 -2.231,2.926 0,1.269 0.512,2.507 2.473,2.507 1.66,0 2.355,-1.179 2.355,-3.199 l 4.165,0 0,0.602 c 0,4.137 -2.809,5.793 -6.668,5.793 -4.106,0 -6.672,-2.141 -6.672,-6.336 0,-3.59 1.781,-5.192 5.644,-6.516 2.867,-0.996 3.864,-1.722 3.864,-3.683 0,-1.809 -1.27,-2.657 -2.598,-2.657 -2.293,0 -2.863,1.297 -2.863,3.321 l 0,0.633 -4.348,0" /><path
-       inkscape:connector-curvature="0"
-       id="path40"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 285.988,23.637102 4.344,0 0,-21.543 -4.344,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path42"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 312.902,23.637102 -3.019,-8.328 -0.059,0 -2.836,8.328 -16.086,0 0,-3.559 4.707,0 0,-17.984 4.348,0 0,17.984 3.664,0 4.059,-9.507 0,-8.477 4.347,0 0,8.477 5.582,13.066 -4.707,0" /><path
-       inkscape:connector-curvature="0"
-       id="path44"
-       style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 154.73,25.598102 -7.199,0 0,21.641 11.805,0 c 3.203,0 5.965,-2.071 6.867,-4.821 0.832,-2.547 0.121,-5.312 -1.762,-7.281 0.25,-0.676 0.497,-1.207 0.727,-1.816 0.523,-1.208 1,-2.411 1.523,-3.602 l 1.715,-4.121 -7.301,0 c 0,-0.004 -0.062,0.172 -0.117,0.246 -0.289,0.641 -0.55,1.32 -0.843,1.961 l -1.754,4.164 c -0.7,1.684 -1.395,3.277 -2.09,4.957 0.867,0.027 1.519,-0.137 2.355,0.25 0.59,0.289 1.485,1.012 1.508,2.395 -0.023,0.683 -0.211,1.203 -0.664,1.742 -0.457,0.504 -1.113,0.875 -1.973,0.886 0,0 -2.797,0 -2.797,0 l 0,-16.601" /><path
-       inkscape:connector-curvature="0"
-       id="path46"
-       style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 229.938,47.239102 0,-21.641 -7.2,0 0,8.824 -5.043,0 0,-8.824 c -1.304,0 -2.715,0.015 -4.019,0 l -3.18,0 0,16.633 -5.035,0 0,-16.633 -7.203,0 0,16.633 -5.078,0 0,-16.633 -7.414,0 c -1.293,3.121 -2.657,6.269 -3.922,9.375 -0.145,0.656 -0.289,1.308 -0.477,1.945 l 0,-11.32 -7.433,0 c -1.473,3.426 -2.887,6.781 -4.356,10.258 -0.508,1.203 -0.926,2.183 -1.453,3.437 l -0.074,0.164 -1.141,2.684 -1.64,3.836 c -0.141,0.433 -0.375,0.828 -0.52,1.262 l 7.414,0 c 1.524,-3.7 3.063,-7.36 4.66,-11 l 0.043,-0.09 c -0.058,0.422 -0.191,0.961 -0.262,1.367 l 0,6.457 c 0.016,1.031 0,2.207 0,3.266 l 7.43,0 c 0.094,-0.235 0.149,-0.364 0.219,-0.551 0.871,-2.047 1.699,-4.078 2.57,-6.11 l 1.946,-4.429 c -0.043,0.464 -0.145,0.914 -0.204,1.367 l 0,9.723 29.129,0 0,-7.809 5.043,0 0,7.809 7.2,0" /><path
-       inkscape:connector-curvature="0"
-       id="path48"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 255.641,47.242102 -5.395,0 -4.516,-17.058 -4.515,17.058 -5.399,0 -5.726,-21.644 4.547,0 1,4.578 5.761,0 0.997,-4.578 6.667,0 1,4.578 5.762,0 1,-4.578 4.547,0 z m -19.246,-13.488 2.089,9.727 0.063,0 2.09,-9.727 z m 14.425,0 2.094,9.727 0.059,0 2.093,-9.727 -4.246,0" /><path
-       inkscape:connector-curvature="0"
-       id="path50"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 274.371,39.856102 c 0,3.136 -0.453,7.695 -6.668,7.695 -6.519,0 -7.336,-4.648 -7.336,-11.195 0,-6.547 0.817,-11.196 7.336,-11.196 5.703,0 6.848,4.016 6.848,8.661 l -4.344,0 c 0,-4.645 -1.148,-5.461 -2.715,-5.461 -1.871,0 -2.777,1.175 -2.777,7.695 0,6.094 0.512,8.297 2.715,8.297 1.961,0 2.597,-1.36 2.597,-4.496 l 4.344,0" /><path
-       inkscape:connector-curvature="0"
-       id="path52"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 275.41,25.598102 4.363,0 0,9.609 5.094,0 0,-9.609 4.363,0 0,21.641 -4.363,0 0,-8.274 -5.094,0 0,8.274 -4.363,0 0,-21.641" /><path
-       inkscape:connector-curvature="0"
-       id="path54"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 290.176,47.242102 0,-21.644 12.402,0 0,3.578 -8.035,0 0,5.82 7.277,0 0,3.578 -7.277,0 0,5.09 7.73,0 0,3.578 -12.097,0" /><path
-       inkscape:connector-curvature="0"
-       id="path56"
-       style="fill:#918f90;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 303.227,47.239102 0,-21.641 4,0 0,15.156 0.058,0 5.336,-15.156 4.969,0 0,21.641 -4,0 0,-14.821 -0.059,0 -5.277,14.821 -5.027,0" /><path
-       inkscape:connector-curvature="0"
-       id="path58"
-       style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 132.859,47.270102 1,0 0,-45.355 -1,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path60"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 41.984,47.266102 35.23,0 0,-5.246 -35.23,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path62"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 41.984,35.649102 35.23,0 0,-5.246 -35.23,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path64"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 41.984,24.031102 35.23,0 0,-5.246 -35.23,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path66"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 83.957,47.266102 35.227,0 0,-5.246 -35.227,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path68"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 83.957,35.649102 35.227,0 0,-5.246 -35.227,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path70"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 0.012,47.266102 35.227,0 0,-28.48 -35.227,0 z" /><path
-       inkscape:connector-curvature="0"
-       id="path72"
-       style="fill:#ef2f2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 0,9.254102 0,-7.359 4.215,0 0,1.218 -2.731,0 0,1.977 2.473,0 0,1.215 -2.473,0 0,1.734 2.629,0 0,1.215 z m 5.145,-7.359 1.359,0 0,1.609 -1.359,0 z m 2.214,2.14 c 0.051,-0.472 0.168,-0.875 0.34,-1.211 0.176,-0.335 0.43,-0.601 0.758,-0.789 0.328,-0.191 0.773,-0.285 1.328,-0.285 0.559,0 1,0.094 1.332,0.285 0.328,0.188 0.582,0.454 0.754,0.789 0.18,0.336 0.289,0.739 0.344,1.211 0.051,0.469 0.074,0.985 0.074,1.539 0,0.559 -0.023,1.071 -0.074,1.543 -0.055,0.469 -0.164,0.872 -0.344,1.211 -0.172,0.336 -0.426,0.598 -0.754,0.785 -0.332,0.192 -0.773,0.286 -1.332,0.286 -0.555,0 -1,-0.094 -1.328,-0.286 -0.328,-0.187 -0.582,-0.449 -0.758,-0.785 -0.172,-0.339 -0.289,-0.742 -0.34,-1.211 -0.05,-0.472 -0.078,-0.984 -0.078,-1.543 0,-0.554 0.028,-1.07 0.078,-1.539 m 1.442,2.797 c 0.027,0.344 0.074,0.625 0.144,0.844 0.075,0.219 0.176,0.379 0.313,0.48 0.133,0.098 0.308,0.149 0.527,0.149 0.223,0 0.399,-0.051 0.531,-0.149 0.137,-0.101 0.239,-0.261 0.313,-0.48 0.07,-0.219 0.117,-0.5 0.141,-0.844 0.027,-0.343 0.039,-0.761 0.039,-1.258 0,-0.496 -0.012,-0.914 -0.039,-1.261 -0.024,-0.348 -0.071,-0.629 -0.141,-0.844 -0.074,-0.219 -0.176,-0.375 -0.313,-0.477 -0.132,-0.097 -0.308,-0.148 -0.531,-0.148 -0.219,0 -0.394,0.051 -0.527,0.148 -0.137,0.102 -0.238,0.258 -0.313,0.477 -0.07,0.215 -0.117,0.496 -0.144,0.844 -0.024,0.347 -0.035,0.765 -0.035,1.261 0,0.497 0.011,0.915 0.035,1.258 m 4.398,2.422 0,-7.359 1.36,0 0,5.152 0.019,0 1.813,-5.152 1.691,0 0,7.359 -1.359,0 0,-5.039 -0.02,0 -1.797,5.039 z m 8.281,0 0,-7.359 4.215,0 0,1.218 -2.73,0 0,1.977 2.473,0 0,1.215 -2.473,0 0,1.734 2.629,0 0,1.215 z m 4.95,-7.359 1.422,0 0,3.679 c 0,0.61 0.253,0.918 0.753,0.918 0.211,0 0.368,-0.058 0.465,-0.171 0.094,-0.114 0.145,-0.313 0.145,-0.602 l 0,-3.824 1.422,0 0,4.113 c 0,0.555 -0.125,0.957 -0.367,1.207 -0.243,0.246 -0.594,0.371 -1.047,0.371 -0.309,0 -0.582,-0.066 -0.825,-0.191 -0.238,-0.129 -0.433,-0.328 -0.586,-0.606 l -0.023,0 0,0.649 -1.359,0 z m 9.226,2.558 0,0.317 c 0,0.426 -0.031,0.812 -0.086,1.16 -0.054,0.348 -0.156,0.644 -0.308,0.887 -0.153,0.242 -0.36,0.433 -0.621,0.566 -0.266,0.133 -0.606,0.203 -1.016,0.203 -0.48,0 -0.867,-0.082 -1.156,-0.238 -0.289,-0.16 -0.508,-0.371 -0.664,-0.641 -0.153,-0.265 -0.258,-0.574 -0.309,-0.918 -0.051,-0.34 -0.078,-0.699 -0.078,-1.07 0,-0.344 0.016,-0.691 0.047,-1.047 0.031,-0.351 0.117,-0.672 0.254,-0.957 0.136,-0.285 0.347,-0.516 0.636,-0.695 0.29,-0.18 0.692,-0.27 1.207,-0.27 0.68,0 1.176,0.176 1.493,0.52 0.316,0.347 0.488,0.843 0.515,1.492 l -1.277,0 c -0.039,-0.352 -0.117,-0.613 -0.227,-0.785 -0.109,-0.172 -0.285,-0.258 -0.527,-0.258 -0.129,0 -0.238,0.039 -0.328,0.109 -0.09,0.075 -0.16,0.168 -0.215,0.289 -0.055,0.122 -0.094,0.258 -0.117,0.411 -0.027,0.156 -0.039,0.316 -0.039,0.48 l 0,0.445 z m -2.816,0.844 0,0.215 c 0,0.133 0.012,0.262 0.039,0.394 0.023,0.129 0.062,0.247 0.117,0.352 0.055,0.109 0.129,0.195 0.223,0.258 0.09,0.066 0.211,0.101 0.351,0.101 0.149,0 0.266,-0.031 0.36,-0.089 0.09,-0.059 0.164,-0.145 0.215,-0.258 0.05,-0.114 0.085,-0.25 0.109,-0.41 0.019,-0.164 0.031,-0.352 0.039,-0.563 z m 3.594,-3.402 1.421,0 0,3.328 c 0,0.187 0.032,0.344 0.09,0.473 0.063,0.125 0.145,0.226 0.25,0.308 0.102,0.078 0.215,0.133 0.34,0.168 0.121,0.035 0.246,0.051 0.371,0.051 0.074,0 0.149,0 0.223,-0.004 0.07,-0.004 0.144,-0.008 0.219,-0.016 l 0,1.36 c -0.039,0.008 -0.082,0.011 -0.129,0.015 -0.043,0.004 -0.086,0.008 -0.129,0.008 -0.293,0 -0.543,-0.082 -0.75,-0.246 -0.207,-0.16 -0.383,-0.375 -0.528,-0.641 l -0.019,0 0,0.739 -1.359,0 z m 4.836,3.539 c 0.015,0.262 0.05,0.465 0.109,0.621 0.055,0.152 0.129,0.266 0.226,0.332 0.094,0.07 0.223,0.105 0.379,0.105 0.282,0 0.477,-0.14 0.582,-0.421 0.11,-0.282 0.161,-0.762 0.161,-1.434 0,-0.234 -0.012,-0.449 -0.036,-0.645 -0.023,-0.195 -0.066,-0.363 -0.125,-0.5 -0.058,-0.136 -0.136,-0.246 -0.234,-0.324 -0.102,-0.078 -0.227,-0.117 -0.379,-0.117 -0.148,0 -0.273,0.039 -0.363,0.117 -0.094,0.078 -0.164,0.184 -0.219,0.321 -0.051,0.132 -0.086,0.285 -0.101,0.457 -0.016,0.171 -0.028,0.355 -0.028,0.546 0,0.371 0.012,0.684 0.028,0.942 m 1.457,2.004 0,-0.617 -0.02,0 c -0.137,0.289 -0.312,0.488 -0.527,0.597 -0.211,0.11 -0.418,0.168 -0.618,0.168 -0.382,0 -0.691,-0.086 -0.921,-0.258 -0.231,-0.172 -0.407,-0.394 -0.528,-0.668 -0.117,-0.269 -0.199,-0.574 -0.234,-0.91 -0.039,-0.336 -0.059,-0.668 -0.059,-0.988 0,-1.012 0.145,-1.731 0.43,-2.16 0.285,-0.43 0.707,-0.645 1.273,-0.645 0.223,0 0.442,0.063 0.653,0.184 0.211,0.125 0.386,0.289 0.531,0.496 l 0.02,0 0,-0.731 c 0,-0.289 -0.059,-0.527 -0.176,-0.718 -0.117,-0.188 -0.317,-0.282 -0.606,-0.282 -0.09,0 -0.175,0.016 -0.254,0.043 -0.078,0.028 -0.152,0.063 -0.222,0.11 -0.141,0.105 -0.215,0.246 -0.215,0.426 l -1.359,0 c 0,-0.477 0.164,-0.84 0.488,-1.098 0.328,-0.258 0.793,-0.387 1.398,-0.387 0.828,0 1.422,0.176 1.778,0.531 0.351,0.352 0.531,0.899 0.531,1.641 l 0,5.266 z m 2.39,-7.356 0.578,0 c 0.332,0 0.602,0.024 0.821,0.071 0.214,0.05 0.398,0.152 0.554,0.304 0.157,0.156 0.309,0.43 0.465,0.824 0.153,0.395 0.25,0.723 0.293,0.985 l 1.34,5.172 -1.422,0 -0.719,-3.832 -0.023,0 -0.824,3.832 -1.485,0 1.559,-5.543 c -0.024,-0.246 -0.09,-0.438 -0.203,-0.574 -0.113,-0.141 -0.301,-0.208 -0.563,-0.208 -0.121,0 -0.246,0.008 -0.371,0.032 z m 6.985,1.813 1.484,0 0,3.113 0.785,0 c 0.305,0 0.524,-0.082 0.652,-0.246 0.129,-0.168 0.2,-0.395 0.215,-0.68 l 0.039,-1.414 c 0.008,-0.144 0.02,-0.281 0.043,-0.418 0.02,-0.133 0.067,-0.25 0.145,-0.355 l 1.625,0 0,0.062 c -0.137,0.074 -0.223,0.215 -0.262,0.422 -0.039,0.207 -0.058,0.504 -0.066,0.899 -0.008,0.39 -0.028,0.718 -0.055,0.988 -0.031,0.269 -0.09,0.488 -0.172,0.664 -0.082,0.176 -0.199,0.309 -0.351,0.402 -0.153,0.094 -0.352,0.157 -0.606,0.192 l 0,0.019 c 0.418,0.09 0.727,0.289 0.926,0.602 0.199,0.316 0.301,0.718 0.301,1.215 0,0.636 -0.172,1.113 -0.52,1.425 -0.34,0.313 -0.82,0.469 -1.441,0.469 l -2.742,0 z m 1.484,6.265 0.703,0 c 0.688,0 1.031,-0.339 1.031,-1.019 0,-0.399 -0.097,-0.68 -0.289,-0.852 -0.191,-0.168 -0.469,-0.25 -0.824,-0.25 l -0.621,0 z m 8.207,-3.707 0,0.317 c 0,0.426 -0.027,0.812 -0.082,1.16 -0.055,0.348 -0.156,0.644 -0.309,0.887 -0.152,0.242 -0.359,0.433 -0.625,0.566 -0.261,0.133 -0.601,0.203 -1.015,0.203 -0.481,0 -0.864,-0.082 -1.153,-0.238 -0.289,-0.16 -0.511,-0.371 -0.664,-0.641 -0.156,-0.265 -0.257,-0.574 -0.308,-0.918 -0.051,-0.34 -0.078,-0.699 -0.078,-1.07 0,-0.344 0.015,-0.691 0.046,-1.047 0.032,-0.351 0.114,-0.672 0.25,-0.957 0.137,-0.285 0.352,-0.516 0.641,-0.695 0.289,-0.18 0.692,-0.27 1.207,-0.27 0.68,0 1.176,0.176 1.492,0.52 0.317,0.347 0.489,0.843 0.516,1.492 l -1.277,0 c -0.043,-0.352 -0.118,-0.613 -0.227,-0.785 -0.109,-0.172 -0.285,-0.258 -0.527,-0.258 -0.129,0 -0.239,0.039 -0.328,0.109 -0.09,0.075 -0.161,0.168 -0.215,0.289 -0.055,0.122 -0.098,0.258 -0.121,0.411 -0.024,0.156 -0.036,0.316 -0.036,0.48 l 0,0.445 z m -2.813,0.844 0,0.215 c 0,0.133 0.012,0.262 0.036,0.394 0.023,0.129 0.066,0.247 0.121,0.352 0.054,0.109 0.125,0.195 0.218,0.258 0.094,0.066 0.211,0.101 0.356,0.101 0.144,0 0.262,-0.031 0.355,-0.089 0.094,-0.059 0.164,-0.145 0.219,-0.258 0.051,-0.114 0.086,-0.25 0.106,-0.41 0.019,-0.164 0.035,-0.352 0.043,-0.563 z m 3.36,-1.586 0,-0.199 c 0,-0.266 0.031,-0.508 0.094,-0.727 0.058,-0.214 0.168,-0.398 0.324,-0.554 0.152,-0.157 0.359,-0.274 0.621,-0.356 0.262,-0.082 0.598,-0.125 1,-0.125 0.297,0 0.57,0.039 0.824,0.11 0.254,0.07 0.473,0.179 0.656,0.324 0.18,0.144 0.325,0.328 0.426,0.547 0.106,0.218 0.156,0.472 0.156,0.761 0,0.418 -0.093,0.75 -0.277,0.997 -0.187,0.242 -0.504,0.441 -0.949,0.589 l -0.856,0.289 c -0.242,0.079 -0.402,0.168 -0.488,0.278 -0.086,0.113 -0.129,0.234 -0.129,0.371 0,0.199 0.067,0.351 0.199,0.449 0.137,0.102 0.289,0.152 0.469,0.152 0.235,0 0.399,-0.07 0.492,-0.203 0.09,-0.133 0.137,-0.343 0.137,-0.633 l 1.277,0 0,0.227 c 0,0.5 -0.152,0.887 -0.461,1.164 -0.312,0.274 -0.789,0.414 -1.433,0.414 -0.363,0 -0.676,-0.047 -0.934,-0.137 -0.258,-0.089 -0.468,-0.207 -0.633,-0.359 -0.164,-0.152 -0.285,-0.328 -0.363,-0.531 -0.074,-0.203 -0.109,-0.418 -0.109,-0.645 0,-0.39 0.097,-0.711 0.297,-0.961 0.199,-0.254 0.496,-0.445 0.886,-0.586 l 1,-0.359 c 0.137,-0.055 0.258,-0.129 0.36,-0.223 0.105,-0.089 0.156,-0.226 0.156,-0.406 0,-0.219 -0.066,-0.383 -0.195,-0.496 -0.133,-0.109 -0.309,-0.164 -0.528,-0.164 -0.242,0 -0.425,0.074 -0.55,0.223 -0.129,0.148 -0.192,0.343 -0.192,0.582 l 0,0.187 z m 8.887,0.742 0,0.317 c 0,0.426 -0.028,0.812 -0.082,1.16 -0.055,0.348 -0.161,0.644 -0.309,0.887 -0.152,0.242 -0.359,0.433 -0.625,0.566 -0.266,0.133 -0.602,0.203 -1.016,0.203 -0.48,0 -0.863,-0.082 -1.152,-0.238 -0.289,-0.16 -0.512,-0.371 -0.664,-0.641 -0.156,-0.265 -0.258,-0.574 -0.313,-0.918 -0.05,-0.34 -0.074,-0.699 -0.074,-1.07 0,-0.344 0.016,-0.691 0.043,-1.047 0.031,-0.351 0.117,-0.672 0.254,-0.957 0.137,-0.285 0.352,-0.516 0.641,-0.695 0.289,-0.18 0.687,-0.27 1.207,-0.27 0.679,0 1.175,0.176 1.492,0.52 0.316,0.347 0.488,0.843 0.516,1.492 l -1.278,0 c -0.043,-0.352 -0.117,-0.613 -0.226,-0.785 -0.11,-0.172 -0.286,-0.258 -0.528,-0.258 -0.129,0 -0.242,0.039 -0.328,0.109 -0.09,0.075 -0.164,0.168 -0.219,0.289 -0.054,0.122 -0.093,0.258 -0.117,0.411 -0.023,0.156 -0.035,0.316 -0.035,0.48 l 0,0.445 z m -2.813,0.844 0,0.215 c 0,0.133 0.012,0.262 0.035,0.394 0.024,0.129 0.063,0.247 0.117,0.352 0.055,0.109 0.129,0.195 0.223,0.258 0.094,0.066 0.211,0.101 0.356,0.101 0.144,0 0.261,-0.031 0.355,-0.089 0.094,-0.059 0.164,-0.145 0.219,-0.258 0.051,-0.114 0.086,-0.25 0.105,-0.41 0.024,-0.164 0.035,-0.352 0.043,-0.563 z m 4.816,0.442 0,0.156 c 0,0.218 0.055,0.394 0.168,0.523 0.11,0.133 0.274,0.199 0.493,0.199 0.242,0 0.41,-0.062 0.511,-0.183 0.098,-0.121 0.149,-0.285 0.149,-0.5 0,-0.184 -0.039,-0.324 -0.125,-0.422 -0.082,-0.094 -0.231,-0.172 -0.442,-0.227 l -0.804,-0.214 c -0.246,-0.071 -0.457,-0.149 -0.633,-0.239 -0.176,-0.09 -0.32,-0.199 -0.434,-0.336 -0.113,-0.133 -0.199,-0.293 -0.254,-0.484 -0.054,-0.188 -0.078,-0.414 -0.078,-0.672 0,-0.187 0.024,-0.375 0.071,-0.562 0.046,-0.192 0.125,-0.36 0.226,-0.512 0.102,-0.149 0.238,-0.274 0.41,-0.371 0.172,-0.094 0.383,-0.145 0.629,-0.145 0.344,0 0.625,0.051 0.84,0.145 0.219,0.097 0.41,0.289 0.574,0.578 l 0.02,0 c 0.019,-0.098 0.043,-0.195 0.066,-0.293 0.024,-0.102 0.063,-0.195 0.11,-0.285 l 1.359,0 c -0.066,0.164 -0.113,0.32 -0.141,0.465 -0.023,0.144 -0.035,0.347 -0.035,0.609 l 0,2.914 c 0,0.25 -0.023,0.477 -0.074,0.688 -0.055,0.207 -0.152,0.386 -0.297,0.539 -0.144,0.152 -0.348,0.269 -0.613,0.351 -0.262,0.082 -0.606,0.125 -1.024,0.125 -0.269,0 -0.519,-0.031 -0.757,-0.09 -0.239,-0.058 -0.442,-0.156 -0.618,-0.289 -0.175,-0.133 -0.316,-0.312 -0.418,-0.531 -0.101,-0.219 -0.156,-0.488 -0.156,-0.801 l 0,-0.136 z m 1.321,-2.165 c 0,-0.156 -0.028,-0.289 -0.082,-0.394 -0.055,-0.109 -0.125,-0.195 -0.211,-0.266 -0.086,-0.066 -0.18,-0.117 -0.285,-0.148 -0.102,-0.031 -0.203,-0.047 -0.297,-0.047 -0.192,0 -0.332,0.078 -0.414,0.227 -0.082,0.152 -0.121,0.335 -0.121,0.546 0,0.25 0.062,0.446 0.183,0.59 0.125,0.141 0.332,0.246 0.617,0.309 0.09,0.019 0.192,0.051 0.301,0.098 0.11,0.042 0.215,0.105 0.309,0.179 z m 2.347,-1.679 1.422,0 0,3.328 c 0,0.187 0.032,0.344 0.09,0.473 0.063,0.125 0.149,0.226 0.25,0.308 0.102,0.078 0.215,0.133 0.34,0.168 0.121,0.035 0.246,0.051 0.371,0.051 0.074,0 0.149,0 0.223,-0.004 0.07,-0.004 0.144,-0.008 0.218,-0.016 l 0,1.36 c -0.039,0.008 -0.082,0.011 -0.128,0.015 -0.043,0.004 -0.086,0.008 -0.129,0.008 -0.293,0 -0.543,-0.082 -0.75,-0.246 -0.207,-0.16 -0.383,-0.375 -0.528,-0.641 l -0.019,0 0,0.739 -1.36,0 z m 7.551,3.547 c 0,0.66 -0.168,1.179 -0.5,1.566 -0.332,0.383 -0.828,0.578 -1.488,0.578 -0.328,0 -0.633,-0.047 -0.906,-0.137 -0.274,-0.089 -0.512,-0.246 -0.711,-0.468 -0.199,-0.223 -0.356,-0.52 -0.465,-0.895 -0.109,-0.375 -0.164,-0.847 -0.164,-1.418 0,-0.555 0.043,-1.023 0.133,-1.398 0.09,-0.375 0.222,-0.672 0.398,-0.895 0.176,-0.222 0.395,-0.383 0.66,-0.48 0.262,-0.094 0.574,-0.145 0.93,-0.145 0.758,0 1.297,0.199 1.625,0.59 0.324,0.391 0.488,0.949 0.488,1.68 l -1.359,0 c 0,-0.453 -0.055,-0.785 -0.164,-0.989 -0.11,-0.207 -0.285,-0.312 -0.528,-0.312 -0.156,0 -0.285,0.039 -0.386,0.109 -0.098,0.075 -0.176,0.188 -0.231,0.344 -0.054,0.16 -0.093,0.359 -0.113,0.606 -0.02,0.242 -0.031,0.535 -0.031,0.878 0,0.317 0.011,0.594 0.031,0.836 0.02,0.243 0.059,0.438 0.113,0.594 0.055,0.153 0.137,0.27 0.242,0.348 0.106,0.078 0.25,0.121 0.43,0.121 0.129,0 0.235,-0.035 0.324,-0.098 0.082,-0.066 0.149,-0.152 0.196,-0.258 0.043,-0.109 0.074,-0.226 0.089,-0.363 0.02,-0.133 0.028,-0.265 0.028,-0.394 z m 0.766,-3.547 1.422,0 0,3.679 c 0,0.61 0.25,0.918 0.754,0.918 0.211,0 0.363,-0.058 0.461,-0.171 0.097,-0.114 0.144,-0.313 0.144,-0.602 l 0,-3.824 1.422,0 0,4.113 c 0,0.555 -0.121,0.957 -0.367,1.207 -0.242,0.246 -0.59,0.371 -1.043,0.371 -0.625,0 -1.074,-0.238 -1.352,-0.715 l -0.019,0 0,2.383 -1.422,0 z m 12.187,4.875 c 0,0.269 -0.019,0.554 -0.054,0.859 -0.039,0.309 -0.133,0.594 -0.286,0.856 -0.148,0.265 -0.378,0.484 -0.683,0.656 -0.305,0.172 -0.723,0.258 -1.25,0.258 -0.559,0 -1,-0.094 -1.332,-0.286 -0.332,-0.187 -0.582,-0.449 -0.758,-0.785 -0.176,-0.339 -0.289,-0.742 -0.34,-1.211 -0.051,-0.472 -0.078,-0.984 -0.078,-1.543 0,-0.554 0.027,-1.07 0.078,-1.539 0.051,-0.472 0.164,-0.875 0.34,-1.211 0.176,-0.335 0.426,-0.601 0.758,-0.789 0.332,-0.191 0.773,-0.285 1.332,-0.285 0.484,0 0.883,0.082 1.187,0.239 0.305,0.156 0.543,0.371 0.711,0.644 0.168,0.27 0.285,0.586 0.344,0.941 0.063,0.36 0.094,0.735 0.094,1.133 l -1.481,0 c 0,-0.398 -0.027,-0.718 -0.074,-0.961 -0.047,-0.246 -0.113,-0.433 -0.195,-0.566 -0.082,-0.137 -0.18,-0.223 -0.297,-0.27 -0.109,-0.043 -0.234,-0.066 -0.363,-0.066 -0.16,0 -0.297,0.031 -0.418,0.098 -0.121,0.066 -0.219,0.191 -0.301,0.382 -0.078,0.188 -0.137,0.454 -0.172,0.797 -0.039,0.344 -0.059,0.793 -0.059,1.352 0,0.519 0.016,0.961 0.043,1.324 0.028,0.359 0.075,0.652 0.145,0.875 0.066,0.223 0.16,0.383 0.281,0.484 0.121,0.098 0.274,0.149 0.461,0.149 0.336,0 0.567,-0.121 0.695,-0.367 0.129,-0.242 0.188,-0.633 0.188,-1.168 z m 4.953,-2.317 0,0.317 c 0,0.426 -0.031,0.812 -0.085,1.16 -0.055,0.348 -0.157,0.644 -0.309,0.887 -0.149,0.242 -0.359,0.433 -0.625,0.566 -0.262,0.133 -0.602,0.203 -1.012,0.203 -0.484,0 -0.867,-0.082 -1.156,-0.238 -0.289,-0.16 -0.508,-0.371 -0.664,-0.641 -0.152,-0.265 -0.258,-0.574 -0.309,-0.918 -0.05,-0.34 -0.078,-0.699 -0.078,-1.07 0,-0.344 0.016,-0.691 0.047,-1.047 0.031,-0.351 0.113,-0.672 0.254,-0.957 0.137,-0.285 0.348,-0.516 0.637,-0.695 0.289,-0.18 0.691,-0.27 1.207,-0.27 0.679,0 1.179,0.176 1.492,0.52 0.316,0.347 0.488,0.843 0.516,1.492 l -1.278,0 c -0.039,-0.352 -0.117,-0.613 -0.226,-0.785 -0.11,-0.172 -0.286,-0.258 -0.524,-0.258 -0.133,0 -0.242,0.039 -0.332,0.109 -0.09,0.075 -0.16,0.168 -0.215,0.289 -0.054,0.122 -0.093,0.258 -0.121,0.411 -0.023,0.156 -0.035,0.316 -0.035,0.48 l 0,0.445 z m -2.816,0.844 0,0.215 c 0,0.133 0.012,0.262 0.035,0.394 0.028,0.129 0.067,0.247 0.121,0.352 0.055,0.109 0.129,0.195 0.219,0.258 0.094,0.066 0.215,0.101 0.359,0.101 0.141,0 0.262,-0.031 0.356,-0.089 0.09,-0.059 0.164,-0.145 0.215,-0.258 0.051,-0.114 0.086,-0.25 0.109,-0.41 0.02,-0.164 0.031,-0.352 0.039,-0.563 z m 3.594,-3.402 1.422,0 0,3.679 c 0,0.61 0.25,0.918 0.75,0.918 0.215,0 0.367,-0.058 0.465,-0.171 0.097,-0.114 0.144,-0.313 0.144,-0.602 l 0,-3.824 1.422,0 0,4.113 c 0,0.555 -0.121,0.957 -0.367,1.207 -0.242,0.246 -0.59,0.371 -1.047,0.371 -0.309,0 -0.582,-0.066 -0.82,-0.191 -0.243,-0.129 -0.438,-0.328 -0.59,-0.606 l -0.02,0 0,0.649 -1.359,0 z m 5.5,5.543 -0.723,0 0,-0.965 0.723,0 0,-3.176 c 0,-0.281 0.019,-0.516 0.051,-0.699 0.035,-0.188 0.097,-0.336 0.191,-0.449 0.094,-0.114 0.227,-0.196 0.398,-0.243 0.172,-0.046 0.399,-0.074 0.68,-0.074 0.164,0 0.32,0.008 0.469,0.024 0.148,0.011 0.301,0.027 0.457,0.039 l 0,0.988 c -0.047,-0.004 -0.098,-0.012 -0.152,-0.012 -0.059,-0.004 -0.114,-0.008 -0.165,-0.008 -0.207,0 -0.343,0.047 -0.41,0.141 -0.066,0.094 -0.097,0.25 -0.097,0.469 l 0,3 0.824,0 0,0.965 -0.824,0 0,1.59 -1.422,0 z m 6.855,-2.985 0,0.317 c 0,0.426 -0.027,0.812 -0.082,1.16 -0.054,0.348 -0.156,0.644 -0.308,0.887 -0.149,0.242 -0.36,0.433 -0.621,0.566 -0.266,0.133 -0.606,0.203 -1.016,0.203 -0.481,0 -0.867,-0.082 -1.156,-0.238 -0.285,-0.16 -0.508,-0.371 -0.664,-0.641 -0.153,-0.265 -0.258,-0.574 -0.309,-0.918 -0.051,-0.34 -0.078,-0.699 -0.078,-1.07 0,-0.344 0.016,-0.691 0.047,-1.047 0.031,-0.351 0.113,-0.672 0.254,-0.957 0.136,-0.285 0.347,-0.516 0.636,-0.695 0.289,-0.18 0.692,-0.27 1.207,-0.27 0.68,0 1.18,0.176 1.497,0.52 0.312,0.347 0.484,0.843 0.511,1.492 l -1.277,0 c -0.039,-0.352 -0.117,-0.613 -0.227,-0.785 -0.109,-0.172 -0.285,-0.258 -0.523,-0.258 -0.133,0 -0.242,0.039 -0.332,0.109 -0.09,0.075 -0.16,0.168 -0.215,0.289 -0.055,0.122 -0.094,0.258 -0.121,0.411 -0.023,0.156 -0.035,0.316 -0.035,0.48 l 0,0.445 z m -2.812,0.844 0,0.215 c 0,0.133 0.012,0.262 0.035,0.394 0.027,0.129 0.066,0.247 0.121,0.352 0.055,0.109 0.129,0.195 0.219,0.258 0.094,0.066 0.215,0.101 0.359,0.101 0.141,0 0.262,-0.031 0.356,-0.089 0.093,-0.059 0.164,-0.145 0.214,-0.258 0.051,-0.114 0.086,-0.25 0.11,-0.41 0.019,-0.164 0.031,-0.352 0.039,-0.563 z m 3.594,-3.402 1.421,0 0,3.328 c 0,0.187 0.032,0.344 0.09,0.473 0.063,0.125 0.145,0.226 0.25,0.308 0.102,0.078 0.215,0.133 0.34,0.168 0.121,0.035 0.246,0.051 0.371,0.051 0.074,0 0.149,0 0.219,-0.004 0.074,-0.004 0.148,-0.008 0.223,-0.016 l 0,1.36 c -0.039,0.008 -0.082,0.011 -0.129,0.015 -0.043,0.004 -0.086,0.008 -0.129,0.008 -0.293,0 -0.547,-0.082 -0.75,-0.246 -0.207,-0.16 -0.383,-0.375 -0.528,-0.641 l -0.019,0 0,0.739 -1.359,0 0,-5.543" /></g></svg>
\ No newline at end of file
diff --git a/src/branding/villasweb/img/erigrid2.png b/src/branding/villasweb/img/erigrid2.png
deleted file mode 100644
index 0c19b4c5..00000000
Binary files a/src/branding/villasweb/img/erigrid2.png and /dev/null differ
diff --git a/src/branding/villasweb/img/european_commission.svg b/src/branding/villasweb/img/european_commission.svg
deleted file mode 100644
index 5bf48674..00000000
--- a/src/branding/villasweb/img/european_commission.svg
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="300"
-   height="207.72354"
-   id="svg15656">
-  <defs
-     id="defs15658" />
-  <metadata
-     id="metadata15661">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-206.87716,-301.85899)"
-     id="layer1">
-    <g
-       transform="matrix(4.5286013,0,0,4.5286013,-1067.5668,-2047.9402)"
-       id="g15525">
-      <path
-         d="m 281.42172,530.9313 c 0,0 19.6275,-2.54 20.18125,-2.63 0.85,-0.13875 1.60375,-0.30125 2.3075,-0.495 1.5875,-0.435 3.04875,-1.09875 4.3425,-1.97375 1.24125,-0.83125 2.395,-2.04125 3.53875,-3.36875 0.72625,-0.845 1.49,-1.94625 2.2025,-3.00875 l 0,-0.51375 c -0.845,1.25125 -1.6775,2.33 -2.53375,3.28125 -1.135,1.26375 -2.325,2.29625 -3.53875,3.07125 -1.2525,0.8075 -2.66125,1.40875 -4.19,1.79 -0.685,0.1725 -1.4175,0.3125 -2.2425,0.4275 -0.5425,0.0762 -1.1025,0.135 -1.64375,0.19125 -0.21625,0.0238 -18.42375,1.955 -18.42375,1.955 l 0,1.27375 z"
-         id="path5555"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 307.74272,527.64055 c -1.22875,0.70625 -2.6475,1.22375 -4.2175,1.53625 -0.67,0.13625 -1.40125,0.24625 -2.23375,0.33625 -0.49,0.0537 -0.9825,0.0962 -1.47625,0.13875 -0.26625,0.0225 -0.5325,0.0462 -0.79875,0.07 -6.015,0.54 -11.99875,1.11375 -17.595,1.65625 l 0,1.27375 c 5.64,-0.68 11.66625,-1.40125 17.67875,-2.08125 0.2675,-0.0312 0.535,-0.0612 0.8025,-0.09 0.4925,-0.0538 0.98625,-0.10875 1.48,-0.17375 0.85625,-0.11375 1.605,-0.245 2.28875,-0.4 1.63125,-0.365 3.10375,-0.94 4.3775,-1.71125 1.265,-0.75875 2.3825,-1.8225 3.585,-3.1225 0.74875,-0.80875 1.58125,-1.95125 2.36125,-3.02375 l 0,-0.4675 c -0.91875,1.245 -1.79,2.29125 -2.65125,3.18375 -1.17375,1.21625 -2.385,2.1825 -3.60125,2.875"
-         id="path5559"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 311.1776,527.32868 c -1.1975,1.09875 -2.4475,1.9625 -3.71625,2.5675 -1.24125,0.59875 -2.62875,1.01875 -4.245,1.28375 -0.66625,0.11125 -1.39125,0.20125 -2.215,0.27625 l -19.58,1.6075 0,1.27 17.405,-1.84625 2.25125,-0.23625 c 0.84875,-0.0987 1.58875,-0.20875 2.26125,-0.33625 1.67375,-0.31625 3.11,-0.7875 4.38875,-1.4425 1.3075,-0.66125 2.61375,-1.76125 3.82875,-2.92625 0.815,-0.78125 1.6,-1.79 2.43875,-2.8475 l 0,-0.42375 c -0.96875,1.205 -1.89375,2.2075 -2.8175,3.05375"
-         id="path5563"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 306.4431,533.92568 c -1.14,0.6375 -1.9925,1.005 -3.62,1.175 -0.98375,0.10625 -1.995,0.15625 -2.97375,0.205 -0.4725,0.0237 -0.94625,0.0475 -1.42,0.0775 -2.9575,0.16875 -5.8625,0.35625 -8.82625,0.54875 l -8.18125,0.55125 0,1.27 8.26375,-0.7575 c 2.67,-0.24 5.7725,-0.51625 8.80125,-0.76375 l 2.2025,-0.17 c 0.86,-0.0662 1.565,-0.13625 2.2175,-0.22125 1.675,-0.21625 3.10625,-0.555 4.37375,-1.03375 1.365,-0.51 2.6525,-1.3025 3.94125,-2.235 1.1625,-0.84 2.77125,-2.49625 2.7725,-2.5175 l 0,-0.44875 c -1.05125,1.025 -1.65625,1.60125 -2.8075,2.36 -1.37625,0.90625 -3.72125,1.38875 -4.74375,1.96"
-         id="path5567"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 306.85935,536.33993 c -1.235,0.3625 -2.625,0.6075 -4.25,0.74875 -0.65875,0.0575 -1.36875,0.10125 -2.17125,0.13375 l -2.19,0.0962 c -5.44125,0.2525 -10.8575,0.535 -16.82625,0.85125 l 0,1.26625 c 5.7025,-0.44125 11.29,-0.87 16.87625,-1.2675 l 2.1825,-0.14875 c 0.84375,-0.0563 1.5425,-0.11625 2.2,-0.19 1.665,-0.18625 3.09,-0.47375 4.355,-0.87875 1.40125,-0.44375 2.7675,-1.0875 4.06,-1.9125 0.95375,-0.6075 1.90875,-1.3325 2.89875,-2.19625 l 0,-0.0225 c -1.09125,0.93125 -2.13125,1.13875 -3.1675,1.76375 -1.27,0.77 -2.605,1.36 -3.9675,1.75625"
-         id="path5571"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 306.65735,538.44468 c -1.24375,0.29125 -2.5925,0.4775 -4.24375,0.58875 -0.63625,0.0425 -1.32125,0.0738 -2.155,0.1 l -2.16875,0.0775 c -5.465,0.20625 -11.00625,0.44375 -16.66875,0.69 l 0,1.26625 c 5.62625,-0.38375 11.145,-0.7575 16.71125,-1.105 l 2.16375,-0.13 c 0.84875,-0.0488 1.54,-0.0975 2.17625,-0.15625 1.68125,-0.155 3.0575,-0.38125 4.33,-0.71 1.4275,-0.3675 2.815,-0.9075 4.12375,-1.6025 1.0125,-0.53625 2.0225,-1.18125 3.06875,-1.95875 l 0,-0.54125 c -1.13125,0.81625 -2.21625,1.4825 -3.30125,2.025 -1.28625,0.64375 -2.64375,1.13375 -4.03625,1.45625"
-         id="path5575"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 306.4721,540.50831 c -1.24875,0.22875 -2.5925,0.375 -4.23125,0.45875 -0.61625,0.0325 -1.27625,0.055 -2.13875,0.075 l -18.68,0.505 0,1.26625 16.56375,-0.865 2.14625,-0.10875 c 0.8375,-0.04 1.5225,-0.08 2.15625,-0.12875 1.66125,-0.1275 3.0275,-0.31 4.3,-0.57625 1.445,-0.3 2.8475,-0.7375 4.1675,-1.3 1.06375,-0.45125 2.12875,-1.00125 3.23875,-1.67 l 0,-0.50875 c -1.185,0.69 -2.3125,1.2425 -3.4325,1.68625 -1.30125,0.5175 -2.6775,0.91 -4.09,1.16625"
-         id="path5579"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 306.32547,542.58081 c -2.2925,0.30625 -4.65125,0.34125 -6.93375,0.375 -0.5225,0.007 -1.04625,0.015 -1.56875,0.0263 l -16.40125,0.295 0,1.26375 16.43,-0.7075 c 0.52,-0.0237 1.0425,-0.045 1.565,-0.065 2.2975,-0.0925 4.67375,-0.1875 6.9975,-0.55625 1.47,-0.23125 2.885,-0.575 4.20625,-1.01875 1.09375,-0.36625 2.22625,-0.84 3.37375,-1.4 l 0,-0.485 c -1.20625,0.56125 -2.3925,1.02875 -3.53125,1.37875 -1.305,0.4025 -2.69625,0.70375 -4.1375,0.89375"
-         id="path5583"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 306.19522,544.6663 c -2.1475,0.1775 -4.345,0.1775 -6.47125,0.1775 -0.66125,0 -1.3225,0 -1.98375,0.005 -5.43375,0.0238 -10.82375,0.0688 -16.31875,0.11625 l 0,1.26375 c 5.23375,-0.1775 10.785,-0.3625 16.3375,-0.5275 0.65875,-0.0225 1.3175,-0.0387 1.9775,-0.0562 2.1375,-0.0537 4.3475,-0.10875 6.5175,-0.34375 1.515,-0.1625 2.895,-0.40125 4.21625,-0.7275 1.1525,-0.28375 2.33625,-0.66125 3.525,-1.115 l 0,-0.465 c -1.2275,0.44 -2.45,0.8 -3.64125,1.0625 -1.30875,0.28875 -2.66875,0.4875 -4.15875,0.61"
-         id="path5587"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 306.11223,546.72218 c -0.895,0.035 -1.86375,0.0525 -2.9625,0.0525 -0.415,0 -0.83125,-0.002 -1.245,-0.006 l -4.2275,-0.0512 c -2.88375,-0.0213 -5.7575,-0.0263 -8.45375,-0.0287 l -7.80125,0.007 0,1.2625 7.82,-0.20375 c 2.68625,-0.0662 5.5675,-0.135 8.44375,-0.18625 l 4.22375,-0.0563 c 1.15875,-0.0175 2.6875,-0.0525 4.23625,-0.15375 1.5175,-0.0987 2.89875,-0.25 4.2225,-0.46125 1.19125,-0.19 2.40875,-0.44625 3.62625,-0.7575 l 0,-0.4475 c -1.25125,0.2875 -2.495,0.51875 -3.70125,0.68 -1.31625,0.17625 -2.68375,0.29 -4.18125,0.35"
-         id="path5591"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 301.8556,548.7088 -4.2125,-0.045 c -5.375,-0.0763 -10.74375,-0.17375 -16.22125,-0.27625 l 0,1.26375 c 5.2275,-0.0337 10.765,-0.0738 16.225,-0.135 l 4.215,-0.0625 c 1.42,-0.025 2.81125,-0.0512 4.2175,-0.0975 2.89625,-0.0925 5.49125,-0.29625 7.915,-0.6175 l 0,-0.44 c -2.43375,0.2625 -5.03125,0.4 -7.93,0.41875 -1.40125,0.0125 -2.805,0.003 -4.20875,-0.009"
-         id="path5595"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 313.99473,550.94356 -32.5725,-0.82625 0,1.26375 32.5725,0 0,-0.4375 z"
-         id="path5599"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 311.06173,529.71581 c -1.2375,0.99375 -2.1925,1.7 -3.7075,2.30125 -1.31875,0.525 -2.735,0.73875 -4.35375,0.96 -1.04125,0.14625 -2.13,0.36125 -3.17,0.43125 -0.4275,0.0287 -0.855,0.0562 -1.28125,0.09 l -17.1275,1.24875 0,1.2675 17.19625,-1.6675 2.23,-0.20875 c 0.82625,-0.0788 1.56125,-0.16875 2.24375,-0.28 1.66625,-0.2675 3.1025,-0.675 4.39,-1.24875 1.335,-0.58875 2.68625,-1.55375 3.9425,-2.61 0.85375,-0.7175 1.67625,-1.62 2.57,-2.60625 l 0,-0.45375 c -1.08125,1.1175 -1.97875,2.01125 -2.9325,2.77625"
-         id="path5603"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 294.96035,563.49518 28.5325,0 0,-12.68875 -28.5325,0 0,12.68875 z"
-         id="path5605"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 323.49785,532.29018 -28.5375,0 0,19.09 28.5375,0 0,-19.09 z"
-         id="path5607"
-         style="fill:#254aa5;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 309.53872,535.00493 0.9925,0 -0.8,0.62375 0.31125,0.98875 -0.7975,-0.60875 -0.7975,0.60875 0.315,-0.98875 -0.8075,-0.62375 0.99,0 0.3,-0.965 0.29375,0.965 z"
-         id="path5611"
-         style="fill:#fff200;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 309.57373,547.73581 0.995,0 -0.80125,0.60125 0.31125,0.95 -0.7975,-0.585 -0.79625,0.585 0.31375,-0.95 -0.80875,-0.60125 0.99125,0 0.3,-0.9275 0.2925,0.9275 z"
-         id="path5615"
-         style="fill:#fff200;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 312.72285,546.8928 0.995,0 -0.80125,0.6 0.31125,0.95125 -0.7975,-0.5875 -0.79625,0.5875 0.31375,-0.95125 -0.80875,-0.6 0.99125,0 0.3,-0.92875 0.2925,0.92875 z"
-         id="path5619"
-         style="fill:#fff200;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 312.72285,535.85418 0.995,0 -0.80125,0.6 0.31125,0.95125 -0.7975,-0.58625 -0.79625,0.58625 0.31375,-0.95125 -0.80875,-0.6 0.99125,0 0.3,-0.9275 0.2925,0.9275 z"
-         id="path5623"
-         style="fill:#fff200;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 315.06097,538.19205 0.9925,0 -0.8,0.59875 0.31125,0.9525 -0.7975,-0.58625 -0.795,0.58625 0.31375,-0.9525 -0.80875,-0.59875 0.99,0 0.3,-0.92875 0.29375,0.92875 z"
-         id="path5627"
-         style="fill:#fff200;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 315.06097,544.58668 0.9925,0 -0.8,0.60125 0.31125,0.9525 -0.7975,-0.5875 -0.795,0.5875 0.31375,-0.9525 -0.80875,-0.60125 0.99,0 0.3,-0.92875 0.29375,0.92875 z"
-         id="path5631"
-         style="fill:#fff200;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 315.93698,541.34055 0.995,0 -0.80125,0.6 0.31125,0.9525 -0.7975,-0.5875 -0.79625,0.5875 0.31375,-0.9525 -0.80875,-0.6 0.99,0 0.30125,-0.9275 0.2925,0.9275 z"
-         id="path5635"
-         style="fill:#fff200;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 306.3281,535.86193 0.9925,0 -0.8,0.60125 0.31125,0.95125 -0.7975,-0.5875 -0.7975,0.5875 0.315,-0.95125 -0.8075,-0.60125 0.99,0 0.3,-0.9275 0.29375,0.9275 z"
-         id="path5639"
-         style="fill:#fff200;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 304.05485,538.1998 0.995,0 -0.80125,0.6 0.31,0.9525 -0.79625,-0.5875 -0.79625,0.5875 0.3125,-0.9525 -0.8075,-0.6 0.99125,0 0.3,-0.9275 0.2925,0.9275 z"
-         id="path5643"
-         style="fill:#fff200;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 303.2111,541.34843 0.99375,0 -0.8,0.6 0.31,0.9525 -0.79625,-0.58625 -0.7975,0.58625 0.31375,-0.9525 -0.80625,-0.6 0.99,0 0.3,-0.9275 0.2925,0.9275 z"
-         id="path5647"
-         style="fill:#fff200;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 304.05485,544.59456 0.995,0 -0.80125,0.60125 0.31,0.9525 -0.79625,-0.5875 -0.79625,0.5875 0.3125,-0.9525 -0.8075,-0.60125 0.99125,0 0.3,-0.92625 0.2925,0.92625 z"
-         id="path5651"
-         style="fill:#fff200;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 306.36122,546.90068 0.9925,0 -0.8,0.6 0.30875,0.95125 -0.795,-0.58625 -0.7975,0.58625 0.315,-0.95125 -0.8075,-0.6 0.99,0 0.3,-0.92875 0.29375,0.92875 z"
-         id="path5655"
-         style="fill:#fff200;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 294.96035,564.74893 28.54,0 0,-1.62875 -28.54,0 0,1.62875 z"
-         id="path5657"
-         style="fill:#254aa5;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 327.55922,518.87968 c 0,0 5.95,9.26625 7.03875,10.97 1.0875,1.7025 2.33125,3.05 6.73375,3.965 4.4025,0.915 6.31875,1.3475 6.31875,1.3475 l 0,0.33 c 0,0 -2.7975,-0.585 -6.3975,-1.3725 -3.59875,-0.7875 -5.07,-1.05375 -6.71125,-3.29125 -1.36625,-1.8625 -6.9825,-9.77875 -6.9825,-9.77875 l 0,-2.17 z"
-         id="path5661"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 327.55922,521.51443 c 0,0 6.14875,8.80875 6.965,9.88875 0.81625,1.08 1.915,2.82 6.775,3.8475 1.255,0.265 6.3675,1.27125 6.3675,1.27125 l 0,0.27875 c 0,0 -3.885,-0.74875 -6.3675,-1.27125 -2.48375,-0.5225 -5.0925,-0.99875 -6.7575,-3.09875 -1.5125,-1.9075 -6.99375,-8.9425 -6.99375,-8.9425 l 0.0112,-1.97375 z"
-         id="path5665"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 327.55922,524.16068 c 0,0 5.79375,7.48625 6.965,8.98375 1.17,1.49625 2.78375,2.7325 6.775,3.49875 2.30125,0.4425 6.35,1.18375 6.35,1.18375 l 0,0.27875 c 0,0 -3.5475,-0.66125 -6.35,-1.16625 -2.8025,-0.505 -5.11625,-0.99375 -6.775,-2.855 -1.455,-1.63375 -6.97625,-8.055 -6.97625,-8.055 l 0.0112,-1.86875 z"
-         id="path5669"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 327.54773,526.76056 c 0,0 5.86625,6.79125 6.99375,8.0025 1.75625,1.88625 2.6075,2.53625 6.7575,3.325 1.66,0.31625 6.35,1.1325 6.35,1.1325 l 0,0.295 c 0,0 -3.88375,-0.69625 -6.35,-1.13125 -2.465,-0.435 -4.55125,-0.5975 -6.775,-2.73375 -1.69375,-1.62625 -6.965,-7.1375 -6.965,-7.1375 l -0.0113,-1.7525 z"
-         id="path5673"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 327.55922,529.46493 c 0,0 5.41625,5.56375 6.9825,7.16125 1.66125,1.69375 3.79,2.32125 6.74,2.8375 2.81625,0.4925 6.3675,1.0625 6.3675,1.0625 l 0,0.3125 c 0,0 -3.335,-0.535 -6.3675,-1.04375 -2.97375,-0.5 -5.055,-0.7775 -6.7575,-2.31625 -1.525,-1.3775 -6.965,-6.3775 -6.965,-6.3775 l 0,-1.63625 z"
-         id="path5677"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 327.55922,531.9718 c 0,0 5.15125,4.68875 6.9825,6.29125 1.685,1.47375 3.05125,1.9325 6.7575,2.57625 3.7075,0.64375 6.35,1.04375 6.35,1.04375 l 0,0.33125 c 0,0 -3.3525,-0.54 -6.3675,-1.01 -3.015,-0.47 -4.93625,-0.655 -6.74,-2.08875 -2.08125,-1.655 -6.9825,-5.61125 -6.9825,-5.61125 l 0,-1.5325 z"
-         id="path5681"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 327.54748,534.65293 c 0,0 5.87625,4.5675 6.97625,5.3675 1.1,0.80125 2.55375,1.735 6.775,2.33375 4.18625,0.5925 6.3325,0.8875 6.3325,0.8875 l 0,0.34875 c 0,0 -3.795,-0.54125 -6.3325,-0.85375 -2.53625,-0.31375 -4.48125,-0.44625 -6.7575,-1.9325 -2.21625,-1.44625 -6.9825,-4.735 -6.9825,-4.735 l -0.0113,-1.41625 z"
-         id="path5685"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 327.54748,537.21793 c 0,0 5.89375,3.8475 7.01125,4.4575 1.11875,0.60875 2.43125,1.60125 6.74,2.14125 4.31,0.53875 6.3325,0.7825 6.3325,0.7825 l 0,0.33125 c 0,0 -3.565,-0.3825 -6.35,-0.67875 -2.785,-0.29625 -4.6825,-0.69625 -6.7575,-1.81125 -2.075,-1.11375 -6.965,-3.91125 -6.965,-3.91125 l -0.0113,-1.31125 z"
-         id="path5689"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 327.55922,539.78293 c 0,0 5.21625,2.78125 6.9825,3.65 1.96875,0.96875 3.67125,1.43375 6.7575,1.7925 3.03,0.355 6.35,0.6975 6.35,0.6975 l 0,0.31375 c 0,0 -3.07,-0.3225 -6.35,-0.6275 -3.25125,-0.30125 -4.41,-0.44125 -6.7575,-1.4625 -2.1,-0.9125 -6.99375,-3.145 -6.99375,-3.145 l 0.0112,-1.21875 z"
-         id="path5693"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 327.55922,542.39431 c 0,0 4.10375,1.7225 7,2.84875 2.85,1.10875 5.02625,1.2025 6.7575,1.39375 0.7625,0.0838 6.315,0.64375 6.315,0.64375 l 0,0.3125 c 0,0 -3.3175,-0.26 -6.3325,-0.52125 -3.015,-0.26125 -4.31625,-0.37125 -6.7575,-1.16625 -2.47125,-0.80375 -6.99375,-2.35 -6.99375,-2.35 l 0.0112,-1.16125 z"
-         id="path5697"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 327.55922,545.04056 c 0,0 4.1625,1.265 7,1.99625 2.8375,0.73125 5.445,1.0275 6.7575,1.11375 1.3125,0.0875 6.315,0.4875 6.315,0.4875 l 0,0.29625 c 0,0 -2.8375,-0.19 -6.3325,-0.435 -2.82625,-0.1975 -5.09625,-0.40625 -6.7575,-0.76625 -1.84125,-0.39875 -6.99375,-1.60125 -6.99375,-1.60125 l 0.0112,-1.09125 z"
-         id="path5701"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 327.54773,547.65218 c 0,0 3.415,0.57625 7.01125,1.16 2.69625,0.43875 6.35,0.715 6.74,0.73125 0.39,0.0175 6.35,0.41875 6.35,0.41875 l 0,0.3125 c 0,0 -3.81375,-0.1925 -6.35,-0.33 -2.64125,-0.14375 -5.26625,-0.3 -6.7575,-0.4525 -3.34,-0.3425 -6.99375,-0.795 -6.99375,-0.795 l 0,-1.045 z"
-         id="path5705"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 327.55922,550.35593 c 0,0 5.36875,0.1975 7,0.2325 1.63125,0.035 13.09,0.4875 13.09,0.4875 l 0,0.31375 -20.09,-0.0125 0,-1.02125 z"
-         id="path5709"
-         style="fill:#bdbcbc;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 296.6286,553.26193 c 0,-0.0588 0.0275,-0.09 0.09,-0.09 l 1.65625,0 c 0.0538,0 0.0863,0.0312 0.0863,0.085 l 0,0.28 c 0,0.0538 -0.0225,0.0813 -0.09,0.0813 l -1.22875,0 0,0.77375 1.08875,0 c 0.0587,0 0.09,0.0275 0.09,0.0812 l 0,0.27875 c 0,0.0538 -0.0225,0.0812 -0.09,0.0812 l -1.08875,0 0,0.88625 1.26,0 c 0.0537,0 0.0813,0.0275 0.0813,0.0863 l 0,0.27375 c 0,0.0588 -0.0225,0.0812 -0.0863,0.0812 l -1.67875,0 c -0.0625,0 -0.09,-0.0275 -0.09,-0.0812 l 0,-2.8175 z"
-         id="path5713"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 300.5711,556.16093 -0.32,0 c -0.0675,0 -0.085,-0.0312 -0.085,-0.085 l 0,-0.14 -0.009,-0.005 c -0.17625,0.1225 -0.4825,0.27 -0.75625,0.27 -0.6075,0 -0.66625,-0.36 -0.66625,-0.8325 l 0,-1.32375 c 0,-0.0537 0.0225,-0.0888 0.085,-0.0888 l 0.32875,0 c 0.0588,0 0.0813,0.0312 0.0813,0.0888 l 0,1.265 c 0,0.27125 0.0537,0.44125 0.32875,0.44125 0.19375,0 0.49,-0.14375 0.6075,-0.2025 l 0,-1.50375 c 0,-0.0537 0.0175,-0.0888 0.085,-0.0888 l 0.32,0 c 0.0625,0 0.085,0.0312 0.085,0.0888 l 0,2.03125 c 0,0.0575 -0.0225,0.085 -0.085,0.085"
-         id="path5717"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 301.5336,556.07543 c 0,0.0538 -0.0225,0.085 -0.085,0.085 l -0.325,0 c -0.0625,0 -0.085,-0.0263 -0.085,-0.085 l 0,-2.03 c 0,-0.0588 0.0225,-0.09 0.085,-0.09 l 0.32,0 c 0.0675,0 0.09,0.0362 0.09,0.09 l 0,0.1975 0.009,0.009 c 0.135,-0.125 0.455,-0.27875 0.66625,-0.31875 0.0588,-0.0138 0.0987,0 0.10875,0.0762 l 0.0312,0.30125 c 0.004,0.0638 0.009,0.09 -0.0862,0.10875 -0.25125,0.0488 -0.57125,0.13875 -0.72875,0.20625 l 0,1.45 z"
-         id="path5721"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 303.42835,554.3423 c -0.3825,0 -0.46875,0.24375 -0.46875,0.71125 0,0.4775 0.0862,0.71125 0.46375,0.71125 0.41,0 0.49125,-0.23 0.49125,-0.71125 0,-0.4775 -0.0763,-0.71125 -0.48625,-0.71125 m -0.005,1.855 c -0.90375,0 -0.9625,-0.6625 -0.9625,-1.175 0,-0.42375 0.0937,-1.1125 0.9625,-1.1125 0.87375,0 0.995,0.58125 0.995,1.1125 0,0.5125 -0.0625,1.175 -0.995,1.175"
-         id="path5725"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 305.76373,554.36943 c -0.185,0 -0.46875,0.13 -0.60375,0.2025 l 0,1.125 c 0.2025,0.0588 0.365,0.0763 0.51875,0.0763 0.32375,0 0.43625,-0.16625 0.43625,-0.7325 0,-0.5725 -0.1125,-0.67125 -0.35125,-0.67125 m -0.0362,1.8325 c -0.14875,0 -0.355,-0.0275 -0.5625,-0.1 l -0.005,0.005 0,0.7925 c 0,0.0487 -0.0125,0.09 -0.085,0.09 l -0.32,0 c -0.0712,0 -0.085,-0.0312 -0.085,-0.09 l 0,-2.85375 c 0,-0.0587 0.0225,-0.09 0.085,-0.09 l 0.32,0 c 0.0638,0 0.0813,0.035 0.0813,0.09 l 0,0.135 0.0138,0.009 c 0.16125,-0.1125 0.45,-0.27 0.71125,-0.27 0.58875,0 0.7425,0.445 0.7425,1.125 0,0.73375 -0.185,1.1575 -0.89625,1.1575"
-         id="path5729"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 307.4016,554.85555 0.89125,0 c 0,-0.275 -0.0725,-0.54 -0.445,-0.54 -0.33375,0 -0.42375,0.2025 -0.44625,0.54 m -0.005,0.3375 c 0.0138,0.455 0.17625,0.58125 0.545,0.58125 0.1625,0 0.41375,-0.0325 0.585,-0.05 0.0813,-0.009 0.10875,-0.009 0.1225,0.0763 l 0.0263,0.14875 c 0.0138,0.0675 0.005,0.10375 -0.0762,0.14 -0.17625,0.0675 -0.50375,0.1125 -0.725,0.1125 -0.86,0 -0.98625,-0.54875 -0.98625,-1.135 0,-0.43625 0.0813,-1.15625 0.96,-1.15625 0.805,0 0.94875,0.5225 0.9625,1.0075 0.005,0.1625 -0.04,0.275 -0.22,0.275 l -1.19375,0 z"
-         id="path5733"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 310.40323,555.15693 -0.54875,0 c -0.225,0 -0.37,0.0813 -0.37,0.37875 0,0.1975 0.0675,0.26125 0.28,0.26125 0.19375,0 0.4675,-0.11375 0.63875,-0.2125 l 0,-0.4275 z m 0.0275,0.7475 c -0.225,0.17125 -0.5275,0.2925 -0.82875,0.2925 -0.4775,0 -0.61625,-0.26125 -0.61625,-0.63875 -0.005,-0.5275 0.27875,-0.7525 0.84625,-0.7525 l 0.57625,0 0,-0.11625 c 0,-0.27 -0.1,-0.365 -0.46875,-0.365 -0.14875,0 -0.4325,0.0225 -0.6125,0.04 -0.09,0.0138 -0.1125,0.009 -0.125,-0.0537 l -0.0412,-0.16625 c -0.009,-0.0588 0.005,-0.095 0.10375,-0.135 0.19375,-0.0675 0.54875,-0.0987 0.76125,-0.0987 0.77875,0 0.8725,0.31875 0.8725,0.82375 l 0,0.86875 c 0,0.18375 0.0225,0.18875 0.1625,0.20625 0.0675,0.005 0.085,0.0187 0.085,0.0675 l 0,0.19 c 0,0.0488 -0.0312,0.08 -0.1075,0.0937 -0.0725,0.0138 -0.14375,0.0225 -0.21125,0.0225 -0.2125,0 -0.3425,-0.0625 -0.3875,-0.27375 l -0.009,-0.005 z"
-         id="path5737"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 313.10785,556.16093 -0.32375,0 c -0.0588,0 -0.0863,-0.0275 -0.0863,-0.085 l 0.005,-1.265 c 0,-0.26625 -0.0625,-0.44125 -0.32375,-0.44125 -0.18,0 -0.495,0.14375 -0.6175,0.2025 l 0,1.50375 c 0,0.0538 -0.0225,0.085 -0.085,0.085 l -0.32,0 c -0.0625,0 -0.085,-0.0275 -0.085,-0.085 l 0,-2.03125 c 0,-0.0575 0.0225,-0.0888 0.085,-0.0888 l 0.32,0 c 0.0625,0 0.085,0.0312 0.085,0.0888 l 0,0.13625 c 0.005,0 0.01,0.004 0.0138,0.004 0.16625,-0.11625 0.48125,-0.27 0.75625,-0.27 0.6075,0 0.6625,0.40125 0.6625,0.855 l 0,1.30625 c 0,0.0538 -0.0188,0.085 -0.0863,0.085"
-         id="path5741"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 297.80335,557.89043 c 0.22,0 0.585,0.0312 0.82375,0.13 0.0725,0.0325 0.0987,0.0688 0.085,0.14 l -0.04,0.185 c -0.0138,0.0538 -0.0362,0.0763 -0.1175,0.0675 -0.22,-0.0275 -0.49,-0.0587 -0.72375,-0.0587 -0.6125,0 -0.7025,0.495 -0.7025,1.08 0,0.59 0.1125,1.05375 0.7025,1.05375 0.26,0 0.48125,-0.0275 0.72375,-0.0588 0.0863,-0.009 0.10375,0.0138 0.1225,0.0725 l 0.035,0.17125 c 0.0187,0.0713 -0.004,0.1125 -0.0763,0.14375 -0.22,0.0937 -0.6125,0.135 -0.8325,0.135 -1.00375,0 -1.215,-0.7425 -1.215,-1.50875 0,-0.76875 0.18875,-1.5525 1.215,-1.5525"
-         id="path5745"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 299.73385,559.0923 c -0.3825,0 -0.46875,0.24375 -0.46875,0.71125 0,0.4775 0.0863,0.71125 0.46375,0.71125 0.41,0 0.49125,-0.23 0.49125,-0.71125 0,-0.4775 -0.0763,-0.71125 -0.48625,-0.71125 m -0.005,1.855 c -0.90375,0 -0.9625,-0.6625 -0.9625,-1.175 0,-0.42375 0.0937,-1.1125 0.9625,-1.1125 0.87375,0 0.995,0.58125 0.995,1.1125 0,0.5125 -0.0625,1.175 -0.995,1.175"
-         id="path5749"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 304.12648,560.91093 -0.32375,0 c -0.0637,0 -0.0863,-0.0275 -0.0863,-0.085 l 0,-1.27875 c 0,-0.33375 -0.08,-0.4275 -0.30625,-0.4275 -0.16625,0 -0.43625,0.13 -0.575,0.2025 0,0.045 0.004,0.12625 0.004,0.22875 l 0,1.275 c 0,0.0538 -0.0175,0.085 -0.085,0.085 l -0.32875,0 c -0.0587,0 -0.0763,-0.0275 -0.0763,-0.085 l 0,-1.30125 c 0,-0.275 -0.0725,-0.405 -0.2975,-0.405 -0.1575,0 -0.41,0.1125 -0.58125,0.2025 l 0,1.50375 c 0,0.0538 -0.0225,0.085 -0.085,0.085 l -0.32375,0 c -0.0588,0 -0.0813,-0.0275 -0.0813,-0.085 l 0,-2.03125 c 0,-0.0575 0.0225,-0.0888 0.0813,-0.0888 l 0.31875,0 c 0.0675,0 0.09,0.035 0.09,0.0888 l 0,0.13125 0.005,0.005 c 0.175,-0.1225 0.4225,-0.2575 0.67125,-0.26625 0.26,0 0.47625,0.0538 0.61625,0.315 0.225,-0.16625 0.50375,-0.315 0.7925,-0.315 0.59375,0 0.6525,0.3875 0.6525,0.8375 l 0,1.32375 c 0,0.0538 -0.0188,0.085 -0.0813,0.085"
-         id="path5753"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 307.65447,560.91093 -0.32375,0 c -0.0637,0 -0.0863,-0.0275 -0.0863,-0.085 l 0,-1.27875 c 0,-0.33375 -0.08,-0.4275 -0.30625,-0.4275 -0.16625,0 -0.43625,0.13 -0.575,0.2025 0,0.045 0.004,0.12625 0.004,0.22875 l 0,1.275 c 0,0.0538 -0.0175,0.085 -0.085,0.085 l -0.32875,0 c -0.0587,0 -0.0763,-0.0275 -0.0763,-0.085 l 0,-1.30125 c 0,-0.275 -0.0725,-0.405 -0.2975,-0.405 -0.1575,0 -0.41,0.1125 -0.58125,0.2025 l 0,1.50375 c 0,0.0538 -0.0225,0.085 -0.085,0.085 l -0.32375,0 c -0.0588,0 -0.0813,-0.0275 -0.0813,-0.085 l 0,-2.03125 c 0,-0.0575 0.0225,-0.0888 0.0813,-0.0888 l 0.31875,0 c 0.0675,0 0.09,0.035 0.09,0.0888 l 0,0.13125 0.005,0.005 c 0.175,-0.1225 0.4225,-0.2575 0.67125,-0.26625 0.26,0 0.47625,0.0538 0.61625,0.315 0.225,-0.16625 0.50375,-0.315 0.7925,-0.315 0.59375,0 0.6525,0.3875 0.6525,0.8375 l 0,1.32375 c 0,0.0538 -0.0188,0.085 -0.0813,0.085"
-         id="path5757"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 308.59422,560.82543 c 0,0.0488 -0.0175,0.085 -0.0813,0.085 l -0.32,0 c -0.0625,0 -0.09,-0.0263 -0.09,-0.085 l 0,-2.035 c 0,-0.0625 0.0275,-0.085 0.09,-0.085 l 0.32,0 c 0.0638,0 0.0813,0.0362 0.0813,0.085 l 0,2.035 z m -0.23875,-2.44375 c -0.23375,0 -0.265,-0.13125 -0.265,-0.26125 0,-0.14375 0.0488,-0.2575 0.265,-0.2575 0.22125,0 0.26625,0.10375 0.26625,0.2575 0,0.13875 -0.0412,0.26125 -0.26625,0.26125"
-         id="path5761"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 309.71023,560.94705 c -0.225,0 -0.52625,-0.0312 -0.6975,-0.0987 -0.09,-0.0362 -0.10875,-0.0775 -0.095,-0.14875 l 0.0312,-0.14875 c 0.0138,-0.0725 0.045,-0.0762 0.1175,-0.0675 0.1975,0.0312 0.48625,0.0538 0.63875,0.0538 0.28875,0 0.40625,-0.0763 0.40625,-0.25625 0,-0.2075 -0.0775,-0.2525 -0.36125,-0.2925 -0.44125,-0.0638 -0.8275,-0.1575 -0.8275,-0.64875 0,-0.445 0.34125,-0.67875 0.84625,-0.67875 0.18375,0 0.495,0.0263 0.68375,0.0987 0.0763,0.0312 0.10875,0.0675 0.095,0.135 l -0.0362,0.16125 c -0.0138,0.0638 -0.04,0.0725 -0.12125,0.0638 -0.19375,-0.0225 -0.44625,-0.05 -0.6125,-0.05 -0.2875,0 -0.355,0.0812 -0.355,0.2525 0,0.175 0.1075,0.1975 0.3825,0.2425 0.4275,0.0637 0.81375,0.14875 0.81375,0.685 0,0.52625 -0.445,0.6975 -0.90875,0.6975"
-         id="path5765"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 311.59573,560.94705 c -0.225,0 -0.52625,-0.0312 -0.6975,-0.0987 -0.09,-0.0362 -0.10875,-0.0775 -0.095,-0.14875 l 0.0312,-0.14875 c 0.0138,-0.0725 0.045,-0.0762 0.1175,-0.0675 0.1975,0.0312 0.48625,0.0538 0.63875,0.0538 0.28875,0 0.40625,-0.0763 0.40625,-0.25625 0,-0.2075 -0.0775,-0.2525 -0.36125,-0.2925 -0.44125,-0.0638 -0.8275,-0.1575 -0.8275,-0.64875 0,-0.445 0.34125,-0.67875 0.84625,-0.67875 0.18375,0 0.495,0.0263 0.68375,0.0987 0.0763,0.0312 0.10875,0.0675 0.095,0.135 l -0.0362,0.16125 c -0.0137,0.0638 -0.04,0.0725 -0.12125,0.0638 -0.19375,-0.0225 -0.44625,-0.05 -0.6125,-0.05 -0.2875,0 -0.355,0.0812 -0.355,0.2525 0,0.175 0.1075,0.1975 0.3825,0.2425 0.4275,0.0637 0.81375,0.14875 0.81375,0.685 0,0.52625 -0.445,0.6975 -0.90875,0.6975"
-         id="path5769"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 313.29685,560.82543 c 0,0.0488 -0.0175,0.085 -0.0813,0.085 l -0.32,0 c -0.0625,0 -0.09,-0.0263 -0.09,-0.085 l 0,-2.035 c 0,-0.0625 0.0275,-0.085 0.09,-0.085 l 0.32,0 c 0.0638,0 0.0813,0.0362 0.0813,0.085 l 0,2.035 z m -0.23875,-2.44375 c -0.23375,0 -0.265,-0.13125 -0.265,-0.26125 0,-0.14375 0.0488,-0.2575 0.265,-0.2575 0.22125,0 0.26625,0.10375 0.26625,0.2575 0,0.13875 -0.0412,0.26125 -0.26625,0.26125"
-         id="path5773"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 314.59735,559.0923 c -0.3825,0 -0.4675,0.24375 -0.4675,0.71125 0,0.4775 0.085,0.71125 0.4625,0.71125 0.41,0 0.49125,-0.23 0.49125,-0.71125 0,-0.4775 -0.0763,-0.71125 -0.48625,-0.71125 m -0.005,1.855 c -0.90375,0 -0.9625,-0.6625 -0.9625,-1.175 0,-0.42375 0.0937,-1.1125 0.9625,-1.1125 0.87375,0 0.995,0.58125 0.995,1.1125 0,0.5125 -0.0625,1.175 -0.995,1.175"
-         id="path5777"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-      <path
-         d="m 317.66673,560.91093 -0.32375,0 c -0.0588,0 -0.0863,-0.0275 -0.0863,-0.085 l 0.005,-1.265 c 0,-0.26625 -0.0625,-0.44125 -0.32375,-0.44125 -0.18,0 -0.495,0.14375 -0.6175,0.2025 l 0,1.50375 c 0,0.0538 -0.0225,0.085 -0.085,0.085 l -0.32,0 c -0.0625,0 -0.085,-0.0275 -0.085,-0.085 l 0,-2.03125 c 0,-0.0575 0.0225,-0.0888 0.085,-0.0888 l 0.32,0 c 0.0625,0 0.085,0.0312 0.085,0.0888 l 0,0.13625 c 0.005,0 0.009,0.004 0.0138,0.004 0.16625,-0.11625 0.4825,-0.27 0.75625,-0.27 0.6075,0 0.6625,0.40125 0.6625,0.855 l 0,1.30625 c 0,0.0538 -0.0187,0.085 -0.0863,0.085"
-         id="path5781"
-         style="fill:#5a5758;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    </g>
-  </g>
-</svg>
diff --git a/src/common/api/websocket-api.js b/src/common/api/websocket-api.js
index 210181af..6c33b642 100644
--- a/src/common/api/websocket-api.js
+++ b/src/common/api/websocket-api.js
@@ -24,14 +24,14 @@ class WebSocketManager {
   }
 
   connect(id, url, onMessage, onOpen, onClose) {
-    const existingSocket = this.sockets.find(s => s.id === id);
+    const existingSocket = this.sockets.find((s) => s.id === id);
     if (existingSocket && existingSocket.socket.readyState === WebSocket.OPEN) {
-      console.log('Already connected to:', url);
+      console.log("Already connected to:", url);
       return;
     }
 
-    const socket = new WebSocket(url, 'live');
-    socket.binaryType = 'arraybuffer';
+    const socket = new WebSocket(url, "live");
+    socket.binaryType = "arraybuffer";
 
     socket.onopen = onOpen;
     socket.onmessage = (event) => {
@@ -45,21 +45,21 @@ class WebSocketManager {
   }
 
   disconnect(id) {
-    const socket = this.sockets.find(s => s.id === id);
+    const socket = this.sockets.find((s) => s.id === id);
     if (socket) {
       socket.socket.close();
-      this.sockets = this.sockets.filter(s => s.id !== id);
-      console.log('WebSocket connection closed for id:', id);
+      this.sockets = this.sockets.filter((s) => s.id !== id);
+      console.log("WebSocket connection closed for id:", id);
     }
   }
 
   send(id, message) {
-    const socket = this.sockets.find(s => s.id === id);
+    const socket = this.sockets.find((s) => s.id === id);
     if (socket == null) {
       return false;
     }
-    console.log("Sending to IC", id, "message: ", message);
     const data = this.messageToBuffer(message);
+    console.log("📤 Sending binary buffer to server:", message.values);
     socket.socket.send(data);
 
     return true;
@@ -70,11 +70,11 @@ class WebSocketManager {
     const view = new DataView(buffer);
 
     let bits = 0;
-    bits |= (message.version & 0xF) << OFFSET_VERSION;
+    bits |= (message.version & 0xf) << OFFSET_VERSION;
     bits |= (message.type & 0x3) << OFFSET_TYPE;
 
     let source_index = 0;
-    source_index |= (message.source_index & 0xFF);
+    source_index |= message.source_index & 0xff;
 
     const sec = Math.floor(message.timestamp / 1e3);
     const nsec = (message.timestamp - sec * 1e3) * 1e6;
@@ -84,7 +84,7 @@ class WebSocketManager {
     view.setUint16(0x02, message.length, true);
     view.setUint32(0x04, message.sequence, true);
     view.setUint32(0x08, sec, true);
-    view.setUint32(0x0C, nsec, true);
+    view.setUint32(0x0c, nsec, true);
 
     const data = new Float32Array(buffer, 0x10, message.length);
     data.set(message.values);
@@ -119,19 +119,19 @@ class WebSocketManager {
     const bytes = length * 4 + 16;
 
     return {
-      version: (bits >> OFFSET_VERSION) & 0xF,
+      version: (bits >> OFFSET_VERSION) & 0xf,
       type: (bits >> OFFSET_TYPE) & 0x3,
       source_index: source_index,
       length: length,
       sequence: data.getUint32(0x04, 1),
-      timestamp: data.getUint32(0x08, 1) * 1e3 + data.getUint32(0x0C, 1) * 1e-6,
+      timestamp: data.getUint32(0x08, 1) * 1e3 + data.getUint32(0x0c, 1) * 1e-6,
       values: new Float32Array(data.buffer, data.byteOffset + 0x10, length),
       blob: new DataView(data.buffer, data.byteOffset + 0x00, bytes),
     };
   }
 
   getSocketById(id) {
-    const socketEntry = this.sockets.find(s => s.id === id);
+    const socketEntry = this.sockets.find((s) => s.id === id);
     return socketEntry ? socketEntry.socket : null;
   }
 
diff --git a/src/common/header.js b/src/common/header.js
index a01575e7..9ac4fb92 100644
--- a/src/common/header.js
+++ b/src/common/header.js
@@ -16,22 +16,13 @@
  ******************************************************************************/
 
 import React from 'react';
-import branding from '../branding/branding';
+import { villasweb_header } from '../branding/functions';
 
 class Header extends React.Component {
   render() {
-    let hasSubtitle = branding.getSubtitle();
     return (
-      <div>
-      { hasSubtitle ?
-        <header className="app-header">
-        <h1>{branding.getTitle()} - {branding.getSubtitle()}</h1>
-      </header>
-      :
-      <header className="app-header">
-        <h1>{branding.getTitle()} </h1>
-      </header>
-      }
+      <div id="brand-header">
+        {villasweb_header()}
       </div>
     );
   }
diff --git a/src/common/home.js b/src/common/home.js
index 1abc7bef..00b8b56f 100644
--- a/src/common/home.js
+++ b/src/common/home.js
@@ -16,10 +16,8 @@
  ******************************************************************************/
 
 import React from 'react';
-
+import { villasweb_home } from '../branding/functions';
 import { Redirect } from "react-router-dom";
-import branding from '../branding/branding';
-
 
 class Home extends React.Component {
 
@@ -39,8 +37,15 @@ class Home extends React.Component {
 
     return (
       <div>
-        {branding.getHome(currentUser.username, currentUser.id, currentUser.role)}
-      </div>);
+        <h1>Home</h1>
+        <p>
+          Welcome to <b>{document.title}</b>!
+        </p>
+        <div className='home-container' id="brand-home">
+          {villasweb_home(document.title,currentUser.username,currentUser.id,currentUser.role)}
+        </div>
+      </div>
+    );
   }
 }
 
diff --git a/src/common/menu.js b/src/common/menu.js
index b30eb1c5..f00711d0 100644
--- a/src/common/menu.js
+++ b/src/common/menu.js
@@ -18,13 +18,12 @@
 import React from 'react';
 import { useEffect, useState } from 'react';
 import { NavLink } from 'react-router-dom';
-import branding from '../branding/branding';
 import { useGetConfigQuery } from '../store/apiSlice';
 import { useSelector } from 'react-redux';
+import { villasweb_links, villasweb_logo } from '../branding/functions';
 
 const SideBarMenu = (props) => {
 
-  const values = branding.values;
   const [isExternalAuth, setIsExternalAuth] = useState(false);
   const [logoutLink, setLogoutLink] = useState('');
   
@@ -38,32 +37,18 @@ const SideBarMenu = (props) => {
     }
   }, [configRes]);
 
-  const getLinks = () => {
-    let links = [];
-
-    if (values.links) {
-      Object.keys(values.links).forEach(key => {
-        links.push(<li key={key}><a href={values.links[key]} title={key}>{key}</a></li>);
-      })
-    }
-
-    return links;
-  }
-
   return (
     <div className="menucontainer">
-      { branding.getLogo() ?
-        <div className="menulogo">
-          {branding.getLogo({ width: 110, margin: 'auto' })}
-        </div>
-        : ''
-      }
+    <div className="menulogo">
+      <img style={{ width: 110, margin: 'auto' }} id="brand-menu-logo" src={villasweb_logo()}/>
+    </div>
+        
       <div className="menu">
         <h2>Menu</h2>
 
         {isExternalAuth ?
           <ul>
-            <li hidden={!values.pages.home}>
+            <li>
               <NavLink
                 to="/home"
                 className={({isActive}) => (isActive ? "active" : "")}
@@ -71,7 +56,7 @@ const SideBarMenu = (props) => {
                 Home
               </NavLink>
             </li>
-            <li hidden={!values.pages.scenarios}>
+            <li>
               <NavLink
                 to="/scenarios"
                 className={({isActive}) => (isActive ? "active" : "")}
@@ -79,7 +64,7 @@ const SideBarMenu = (props) => {
                 Scenarios
               </NavLink>
             </li>
-            {currentUser.role === 'Admin' || values.pages.infrastructure ?
+            {currentUser.role === 'Admin'?
               <li>
                 <NavLink
                   to="/infrastructure"
@@ -99,7 +84,7 @@ const SideBarMenu = (props) => {
                 </NavLink>
               </li> : ''
             }
-            <li hidden={!values.pages.account}>
+            <li>
               <NavLink
                 to="/account"
                 title="Account">
@@ -111,7 +96,7 @@ const SideBarMenu = (props) => {
               href={''}>
               Logout
             </a>
-            <li hidden={!values.pages.api}>
+            <li>
               <NavLink
                 to="/api"
                 title="API Browser">
@@ -120,7 +105,7 @@ const SideBarMenu = (props) => {
             </li>
           </ul>
           : <ul>
-            <li hidden={!values.pages.home}>
+            <li>
               <NavLink
                 to="/home"
                 className={({isActive}) => (isActive ? "active" : "")}
@@ -128,7 +113,7 @@ const SideBarMenu = (props) => {
                 Home
               </NavLink>
             </li>
-            <li hidden={!values.pages.scenarios}>
+            <li>
               <NavLink
                 to="/scenarios"
                 className={({isActive}) => (isActive ? "active" : "")}
@@ -136,7 +121,7 @@ const SideBarMenu = (props) => {
                 Scenarios
               </NavLink>
             </li>
-            {currentUser.role === 'Admin' || values.pages.infrastructure ?
+            {currentUser.role === 'Admin'?
               <li>
                 <NavLink
                   to="/infrastructure"
@@ -156,7 +141,7 @@ const SideBarMenu = (props) => {
                 </NavLink>
               </li> : ''
             }
-            <li hidden={!values.pages.account}>
+            <li>
               <NavLink
                 to="/account"
                 title="Account">
@@ -170,7 +155,7 @@ const SideBarMenu = (props) => {
                 Logout
               </NavLink>
             </li>
-            {currentUser.role === 'Admin' || values.pages.api ?
+            {currentUser.role === 'Admin'?
               <li>
                 <NavLink
                   to="/api"
@@ -180,16 +165,13 @@ const SideBarMenu = (props) => {
               </li> : ''
             }
           </ul>}
-
-        {
-          getLinks().length > 0 ?
-            <div>
-              <br></br>
-              <h4> Links</h4>
-              <ul> {getLinks()} </ul>
-            </div>
-            : ''
-        }
+          <div>
+            <br></br>
+            <h4> Links</h4>
+            <ul id="brand-links">
+              {villasweb_links()}
+            </ul>
+          </div>
       </div>
 
 
diff --git a/src/index.js b/src/index.js
index 98db39e9..02f3aed1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -28,4 +28,4 @@ ReactDOM.render(
     <Router />
   </Provider>,
   document.getElementById("root")
-);
+);
\ No newline at end of file
diff --git a/src/pages/dashboards/dashboard-button-group.js b/src/pages/dashboards/dashboard-button-group.js
deleted file mode 100644
index 04a1500d..00000000
--- a/src/pages/dashboards/dashboard-button-group.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import IconButton from '../../common/buttons/icon-button';
-
-const buttonStyle = {
-  marginLeft: '12px',
-  height: '44px',
-  width: '35px',
-};
-
-const iconStyle = {
-  height: '25px',
-  width: '25px'
-};
-
-let buttonkey = 0;
-
-class DashboardButtonGroup extends React.Component {
-
-  getBtn(icon, tooltip, clickFn, locked = false) {
-    if (locked) {
-      return <IconButton
-        key={buttonkey++}
-        childKey={buttonkey}
-        icon={icon}
-        disabled={true}
-        hidetooltip={true}
-        tooltip={tooltip}
-        tipPlacement={'bottom'}
-        onClick={clickFn}
-        buttonStyle={buttonStyle}
-        iconStyle={iconStyle}
-      />
-    } else {
-      return <IconButton
-        key={buttonkey++}
-        childKey={buttonkey}
-        icon={icon}
-        tooltip={tooltip}
-        tipPlacement={'bottom'}
-        onClick={clickFn}
-        buttonStyle={buttonStyle}
-        iconStyle={iconStyle}
-      />
-    }
-  }
-
-  render() {
-    const buttons = [];
-    buttonkey = 0;
-
-    if (this.props.editing) {
-      buttons.push(this.getBtn("save", "Save changes", this.props.onSave));
-      buttons.push(this.getBtn("times", "Discard changes", this.props.onCancel));
-    } else {
-      if (this.props.fullscreen !== true) {
-        buttons.push(this.getBtn("expand", "Change to fullscreen view", this.props.onFullscreen));
-      } else {
-        buttons.push(this.getBtn("compress", "Back to normal view", this.props.onFullscreen));
-      }
-
-      if (this.props.paused) {
-        buttons.push(this.getBtn("play", "Continue simulation", this.props.onUnpause));
-      } else {
-        buttons.push(this.getBtn("pause", "Pause simulation", this.props.onPause));
-      }
-
-      if (this.props.fullscreen !== true) {
-        let tooltip = this.props.locked ? "View files of scenario" : "Add, edit or delete files of scenario";
-        buttons.push(this.getBtn("file", tooltip, this.props.onEditFiles));
-        buttons.push(this.getBtn("sign-in-alt", "Add, edit or delete input signals", this.props.onEditInputSignals, this.props.locked));
-        buttons.push(this.getBtn("sign-out-alt", "Add, edit or delete output signals", this.props.onEditOutputSignals, this.props.locked));
-        buttons.push(this.getBtn("pen", "Add widgets and edit layout", this.props.onEdit, this.props.locked));
-      }
-    }
-
-    return <div className='section-buttons-group-right'>
-      {buttons}
-    </div>;
-  }
-}
-
-DashboardButtonGroup.propTypes = {
-  editing: PropTypes.bool,
-  fullscreen: PropTypes.bool,
-  paused: PropTypes.bool,
-  onEdit: PropTypes.func,
-  onSave: PropTypes.func,
-  onCancel: PropTypes.func,
-  onFullscreen: PropTypes.func,
-  onPause: PropTypes.func,
-  onUnpause: PropTypes.func
-};
-
-export default DashboardButtonGroup;
diff --git a/src/pages/dashboards/dashboard-error-boundry.js b/src/pages/dashboards/dashboard-error-boundry.js
new file mode 100644
index 00000000..42e881ac
--- /dev/null
+++ b/src/pages/dashboards/dashboard-error-boundry.js
@@ -0,0 +1,30 @@
+import React from "react";
+
+class ErrorBoundary extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = { hasError: false };
+  }
+
+  static getDerivedStateFromError(error) {
+    return { hasError: true };
+  }
+
+  componentDidCatch(error, errorInfo) {
+    console.error("Error caught by Error Boundary:", error, errorInfo);
+  }
+
+  render() {
+    if (this.state.hasError) {
+      return (
+        <>
+          <h1>Something went wrong!</h1>
+        </>
+      );
+    }
+
+    return this.props.children;
+  }
+}
+
+export default ErrorBoundary;
diff --git a/src/pages/dashboards/dashboard-layout.js b/src/pages/dashboards/dashboard-layout.js
new file mode 100644
index 00000000..69e5a2c5
--- /dev/null
+++ b/src/pages/dashboards/dashboard-layout.js
@@ -0,0 +1,454 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import { useCallback, useEffect, useState } from "react";
+import { useParams } from "react-router-dom";
+import {
+  useGetDashboardQuery,
+  useGetICSQuery,
+  useGetWidgetsQuery,
+  useAddWidgetMutation,
+  useLazyGetSignalsQuery,
+  useLazyGetConfigsQuery,
+  useUpdateWidgetMutation,
+} from "../../store/apiSlice";
+import { sessionToken } from "../../localStorage";
+import Fullscreenable from "react-fullscreenable";
+import DashboardButtonGroup from "./grid/dashboard-button-group";
+import Widget from "./widget/widget";
+import WidgetContainer from "./widget/widget-container";
+import WidgetArea from "./grid/widget-area";
+import WidgetToolbox from "./widget/widget-toolbox";
+import IconToggleButton from "../../common/buttons/icon-toggle-button";
+import EditWidgetDialog from "./widget/edit-widget/edit-widget";
+import EditSignalMappingDialog from "../scenarios/dialogs/edit-signal-mapping";
+import classNames from "classnames";
+import { Spinner } from "react-bootstrap";
+
+//this component handles the UI of the dashboard
+const DashboardLayout = ({ isFullscreen, toggleFullscreen }) => {
+  const params = useParams();
+  const {
+    data: { dashboard } = {},
+    isFetching: isFetchingDashboard,
+    refetch: refetchDashboard,
+  } = useGetDashboardQuery(params.dashboard);
+  const {
+    data: { widgets } = [],
+    isFetching: isFetchingWidgets,
+    refetch: refetchWidgets,
+  } = useGetWidgetsQuery(params.dashboard);
+
+  const [updateWidget] = useUpdateWidgetMutation();
+
+  const [triggerGetSignals] = useLazyGetSignalsQuery();
+  const [triggerGetConfigs] = useLazyGetConfigsQuery();
+
+  const [signals, setSignals] = useState([]);
+  const [configs, setConfigs] = useState([]);
+
+  const [addWidget] = useAddWidgetMutation();
+
+  const { data: ics } = useGetICSQuery();
+
+  const [editing, setEditing] = useState(false);
+  const [paused, setPaused] = useState(false);
+  const [locked, setLocked] = useState(false);
+  const [editModal, setEditModal] = useState(false);
+  const [editModalData, setEditModalData] = useState(null);
+
+  const [editInputSignalsModal, setEditingInputSignalsModal] = useState(false);
+
+  //these are used to handle widget updates separately from RTK Query
+  const [localWidgets, setLocalWidgets] = useState([]);
+  const [widgetsToUpdate, setWidgetsToUpdate] = useState([]);
+
+  useEffect(() => {
+    if (widgets?.length > 0) {
+      setLocalWidgets(widgets);
+    }
+  }, [widgets]);
+
+  const fetchWidgetData = async (scenarioID) => {
+    try {
+      const configsRes = await triggerGetConfigs(scenarioID).unwrap();
+      if (configsRes.configs) {
+        setConfigs(configsRes.configs);
+        //load signals if there are any configs
+
+        if (configsRes.configs.length > 0) {
+          for (const config of configsRes.configs) {
+            const signalsInRes = await triggerGetSignals({
+              configID: config.id,
+              direction: "in",
+            }).unwrap();
+            const signalsOutRes = await triggerGetSignals({
+              configID: config.id,
+              direction: "out",
+            }).unwrap();
+            setSignals((prevState) => [
+              ...signalsInRes.signals,
+              ...signalsOutRes.signals,
+              ...prevState,
+            ]);
+          }
+        }
+      }
+    } catch (err) {
+      console.log("error fetching data", err);
+    }
+  };
+
+  const [gridParameters, setGridParameters] = useState({
+    height: 10,
+    grid: 50,
+  });
+
+  useEffect(() => {
+    if (!isFetchingDashboard) {
+      setGridParameters({ height: dashboard.height, grid: dashboard.grid });
+      fetchWidgetData(dashboard.scenarioID);
+    }
+  }, [isFetchingDashboard]);
+
+  const boxClasses = classNames("section", "box", {
+    "fullscreen-padding": isFullscreen,
+  });
+
+  const handleKeydown = useCallback(
+    (e) => {
+      const keyMap = {
+        " ": () => setPaused((prevPaused) => !prevPaused),
+        p: () => setPaused((prevPaused) => !prevPaused),
+        e: () => setEditing((prevEditing) => !prevEditing),
+        f: toggleFullscreen,
+      };
+      if (keyMap[e.key]) {
+        keyMap[e.key]();
+      }
+    },
+    [toggleFullscreen]
+  );
+
+  useEffect(() => {
+    window.addEventListener("keydown", handleKeydown);
+    return () => {
+      window.removeEventListener("keydown", handleKeydown);
+    };
+  }, [handleKeydown]);
+
+  const startEditing = () => {
+    let originalIDs = widgets.map((widget) => widget.id);
+    widgets.forEach(async (widget) => {
+      if (
+        widget.type === "Slider" ||
+        widget.type === "NumberInput" ||
+        widget.type === "Button"
+      ) {
+        try {
+          await updateWidget({
+            widgetID: widget.id,
+            updatedWidget: { widget },
+          }).unwrap();
+        } catch (err) {
+          console.log("error", err);
+        }
+      }
+    });
+    setEditing(true);
+  };
+
+  const handleSaveEdit = async () => {
+    if (
+      gridParameters.height !== dashboard?.height ||
+      gridParameters.grid !== dashboard?.grid
+    ) {
+      try {
+        const { height: oldHeight, grid: oldGrid, ...rest } = dashboard;
+        await updateDashboard({
+          dashboardID: dashboard?.id,
+          dashboard: {
+            height: gridParameters.height,
+            grid: gridParameters.grid,
+            ...rest,
+          },
+        }).unwrap();
+      } catch (err) {
+        console.log("error", err);
+      }
+    }
+
+    if (widgetsToUpdate.length > 0) {
+      try {
+        for (const index in widgetsToUpdate) {
+          await updateWidget({
+            widgetID: widgetsToUpdate[index],
+            updatedWidget: {
+              widget: {
+                ...widgets.find((w) => w.id == widgetsToUpdate[index]),
+              },
+            },
+          }).unwrap();
+        }
+        refetchWidgets(dashboard?.id);
+      } catch (err) {
+        console.log("error", err);
+      }
+    }
+
+    setEditing(false);
+    setWidgetChangeData([]);
+  };
+
+  const handleWidgetChange = async (widget) => {
+    setWidgetsToUpdate((prevWidgetsToUpdate) => [
+      ...prevWidgetsToUpdate,
+      widget.id,
+    ]);
+    setLocalWidgets((prevWidgets) =>
+      prevWidgets.map((w) => (w.id === widget.id ? { ...widget } : w))
+    );
+  };
+
+  const handleCloseEditModal = async (data) => {
+    if (!data) {
+      setEditModal(false);
+      setEditModalData(null);
+      return;
+    }
+
+    if (data.type === "Image") {
+      data.customProperties.update = true;
+    }
+
+    try {
+      await updateWidget({
+        widgetID: data.id,
+        updatedWidget: { widget: data },
+      }).unwrap();
+      refetchWidgets(dashboard?.id);
+    } catch (err) {
+      console.log("error", err);
+    }
+
+    setEditModal(false);
+    setEditModalData(null);
+  };
+
+  const handleCancelEdit = () => {
+    refetchWidgets();
+    setEditing(false);
+    setWidgetChangeData([]);
+    setGridParameters({ height: dashboard?.height, grid: dashboard?.grid });
+  };
+
+  const handleNewWidgetAdded = async (widget) => {
+    widget.dashboardID = dashboard?.id;
+
+    if (widget.type === "ICstatus") {
+      let allICids = ics.map((ic) => ic.id);
+      widget.customProperties.checkedIDs = allICids;
+    }
+
+    try {
+      const res = await addWidget(widget).unwrap();
+      if (res) {
+        refetchWidgets(dashboard?.id);
+      }
+    } catch (err) {
+      console.log("error", err);
+    }
+  };
+
+  const editWidget = (widget, index) => {
+    setEditModal(true);
+    setEditModalData({ ...widget });
+  };
+
+  const duplicateWidget = async (widget) => {
+    let widgetCopy = {
+      ...widget,
+      id: undefined,
+      x: widget.x + 50,
+      y: widget.y + 50,
+    };
+    try {
+      const res = await addWidget({ widget: widgetCopy }).unwrap();
+      if (res) {
+        refetchWidgets(dashboard?.id);
+      }
+    } catch (err) {
+      console.log("error", err);
+    }
+  };
+
+  const onChange = async (widget) => {
+    try {
+      await updateWidget({
+        widgetID: widget.id,
+        updatedWidget: { widget: widget },
+      }).unwrap();
+      refetchWidgets(dashboard?.id);
+    } catch (err) {
+      console.log("error", err);
+    }
+  };
+
+  const handleCloseEditSignalsModal = (direction) => {
+    if (direction === "in") {
+      setEditInputSignalsModal(false);
+    } else if (direction === "out") {
+      setEditOutputSignalsModal(false);
+    }
+  };
+
+  return !isFetchingWidgets && !isFetchingDashboard ? (
+    <div className={boxClasses}>
+      <div key={"header-box"} className="section-header box-header">
+        <div key={"title"} className="section-title">
+          <h2>
+            {dashboard?.name}
+            <span key={"toggle-lock-button"} className="icon-button">
+              <IconToggleButton
+                childKey={0}
+                checked={locked}
+                index={dashboard?.id}
+                checkedIcon="lock"
+                uncheckedIcon="lock-open"
+                tooltipChecked="Dashboard is locked, cannot be edited"
+                tooltipUnchecked="Dashboard is unlocked, can be edited"
+                disabled={true}
+                buttonStyle={{ marginLeft: "10px" }}
+                iconStyle={{ height: "25px", width: "25px" }}
+              />
+            </span>
+          </h2>
+        </div>
+
+        <DashboardButtonGroup
+          key={"dashboard-buttons"}
+          locked={locked}
+          editing={editing}
+          onEdit={startEditing}
+          fullscreen={isFullscreen}
+          paused={paused}
+          onSave={handleSaveEdit}
+          onCancel={handleCancelEdit}
+          onFullscreen={toggleFullscreen}
+          onPause={() => setPaused(true)}
+          onUnpause={() => setPaused(false)}
+          onEditFiles={() => {}}
+          onEditOutputSignals={() => setEditInputSignalsModal(true)}
+          onEditInputSignals={() => setEditInputSignalsModal(true)}
+        />
+      </div>
+
+      <div
+        key={"dashboard-area"}
+        className="box box-content"
+        onContextMenu={(e) => e.preventDefault()}
+      >
+        {editing && (
+          <WidgetToolbox
+            key={"widget-toolbox"}
+            grid={gridParameters.grid}
+            onGridChange={(val) =>
+              setGridParameters((prevState) => ({ ...prevState, grid: val }))
+            }
+            dashboard={dashboard}
+            onDashboardSizeChange={(val) =>
+              setGridParameters((prevState) => ({ ...prevState, height: val }))
+            }
+            widgets={localWidgets}
+          />
+        )}
+
+        <WidgetArea
+          key={"widget-area"}
+          widgets={localWidgets}
+          editing={editing}
+          dropZoneHeight={gridParameters.height}
+          grid={gridParameters.grid}
+          onWidgetAdded={handleNewWidgetAdded}
+        >
+          {localWidgets != null &&
+            Object.keys(localWidgets).map((widgetKey) => (
+              <div key={"widget-container-wrapper" + widgetKey}>
+                <WidgetContainer
+                  widget={JSON.parse(JSON.stringify(localWidgets[widgetKey]))}
+                  key={"widget-container" + widgetKey}
+                  index={parseInt(widgetKey, 10)}
+                  grid={gridParameters.grid}
+                  onWidgetChange={handleWidgetChange}
+                  editing={editing}
+                  paused={paused}
+                  onEdit={editWidget}
+                  onDuplicate={duplicateWidget}
+                  onDelete={(widget, index) => deleteWidget(widget.id)}
+                  onChange={editing ? handleWidgetChange : onChange}
+                >
+                  <Widget
+                    widget={JSON.parse(JSON.stringify(localWidgets[widgetKey]))}
+                    editing={editing}
+                    paused={paused}
+                    scenarioID={dashboard?.scenarioID}
+                  />
+                </WidgetContainer>
+              </div>
+            ))}
+        </WidgetArea>
+
+        <EditWidgetDialog
+          key={"edit-widget"}
+          sessionToken={sessionToken}
+          show={editModal}
+          onClose={handleCloseEditModal}
+          widget={editModalData}
+          scenarioID={dashboard?.scenarioID}
+          configs={configs}
+          signals={signals}
+        />
+
+        {/* <EditFilesDialog
+              key={"edit-files-dialog"}
+              sessionToken={this.state.sessionToken}
+              show={this.state.filesEditModal}
+              onClose={this.closeEditFiles.bind(this)}
+              signals={this.state.signals}
+              files={this.state.files}
+              scenarioID={this.state.dashboard?.scenarioID}
+              locked={this.state.locked}
+            /> */}
+
+        <EditSignalMappingDialog
+          key={"edit-signal-mapping-input-dialog"}
+          show={editInputSignalsModal}
+          onCloseEdit={handleCloseEditSignalsModal}
+          direction="Input"
+          configID={null}
+          sessionToken={sessionToken}
+          configs={configs}
+          signals={signals}
+        />
+      </div>
+    </div>
+  ) : (
+    <Spinner className="mt-2 ms-2" />
+  );
+};
+
+export default Fullscreenable()(DashboardLayout);
diff --git a/src/pages/dashboards/dashboard.js b/src/pages/dashboards/dashboard-old.js
similarity index 62%
rename from src/pages/dashboards/dashboard.js
rename to src/pages/dashboards/dashboard-old.js
index 1cb7efe6..50910304 100644
--- a/src/pages/dashboards/dashboard.js
+++ b/src/pages/dashboards/dashboard-old.js
@@ -15,44 +15,48 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import React, { useState, useEffect, useCallback, useRef, act } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { useParams } from 'react-router-dom';
-import Fullscreenable from 'react-fullscreenable';
-import classNames from 'classnames';
-import 'react-contexify/dist/ReactContexify.min.css';
-import EditWidget from './widget/edit-widget/edit-widget';
-import EditSignalMappingDialog from '../scenarios/dialogs/edit-signal-mapping'
-import WidgetToolbox from './widget/widget-toolbox';
-import WidgetArea from './widget-area';
-import DashboardButtonGroup from './dashboard-button-group';
-import IconToggleButton from '../../common/buttons/icon-toggle-button';
+import React, { useState, useEffect, useCallback, useRef, act } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { useParams } from "react-router-dom";
+import Fullscreenable from "react-fullscreenable";
+import classNames from "classnames";
+import "react-contexify/dist/ReactContexify.min.css";
+import EditWidget from "./widget/edit-widget/edit-widget";
+import EditSignalMappingDialog from "../scenarios/dialogs/edit-signal-mapping";
+import WidgetToolbox from "./widget/widget-toolbox";
+import WidgetArea from "./grid/widget-area";
+import DashboardButtonGroup from "./grid/dashboard-button-group";
+import IconToggleButton from "../../common/buttons/icon-toggle-button";
 import WidgetContainer from "./widget/widget-container";
-import Widget from "./widget/widget";
+import Widget from "./widget/widget-old";
 
-import { connectWebSocket, disconnect } from '../../store/websocketSlice';
+import { connectWebSocket, disconnect } from "../../store/websocketSlice";
 
-import { 
-  useGetDashboardQuery, 
-  useLazyGetWidgetsQuery, 
-  useLazyGetConfigsQuery, 
-  useAddWidgetMutation, 
-  useUpdateWidgetMutation, 
+import {
+  useGetDashboardQuery,
+  useLazyGetWidgetsQuery,
+  useLazyGetConfigsQuery,
+  useAddWidgetMutation,
+  useUpdateWidgetMutation,
   useDeleteWidgetMutation,
   useLazyGetFilesQuery,
   useUpdateDashboardMutation,
   useGetICSQuery,
-  useLazyGetSignalsQuery
-} from '../../store/apiSlice';
+  useLazyGetSignalsQuery,
+} from "../../store/apiSlice";
 
-const startUpdaterWidgets = new Set(['Slider', 'Button', 'NumberInput']);
+const startUpdaterWidgets = new Set(["Slider", "Button", "NumberInput"]);
 
 const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
   const dispatch = useDispatch();
   const params = useParams();
-  const { data: dashboardRes, error: dashboardError, isLoading: isDashboardLoading } = useGetDashboardQuery(params.dashboard);
+  const {
+    data: dashboardRes,
+    error: dashboardError,
+    isLoading: isDashboardLoading,
+  } = useGetDashboardQuery(params.dashboard);
   const dashboard = dashboardRes ? dashboardRes.dashboard : {};
-  const {data: icsRes} = useGetICSQuery();
+  const { data: icsRes } = useGetICSQuery();
   const ics = icsRes ? icsRes.ics : [];
 
   const [triggerGetWidgets] = useLazyGetWidgetsQuery();
@@ -68,7 +72,9 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
   const [widgetsToUpdate, setWidgetsToUpdate] = useState([]);
   const [configs, setConfigs] = useState([]);
   const [signals, setSignals] = useState([]);
-  const [sessionToken, setSessionToken] = useState(localStorage.getItem("token"));
+  const [sessionToken, setSessionToken] = useState(
+    localStorage.getItem("token")
+  );
   const [files, setFiles] = useState([]);
   const [editing, setEditing] = useState(false);
   const [paused, setPaused] = useState(false);
@@ -93,32 +99,32 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
 
   useEffect(() => {
     let usedICS = [];
-    for(const config of configs){
+    for (const config of configs) {
       usedICS.push(config.icID);
     }
     setActiveICS(ics.filter((i) => usedICS.includes(i.id)));
-  }, [configs])
+  }, [configs]);
 
-  const activeSocketURLs = useSelector((state) => state.websocket.activeSocketURLs);
+  const activeSocketURLs = useSelector(
+    (state) => state.websocket.activeSocketURLs
+  );
 
   //connect to websockets
   useEffect(() => {
     activeICS.forEach((i) => {
-      if(i.websocketurl){
-        if(!activeSocketURLs.includes(i.websocketurl)) 
+      if (i.websocketurl) {
+        if (!activeSocketURLs.includes(i.websocketurl))
           dispatch(connectWebSocket({ url: i.websocketurl, id: i.id }));
       }
-    })
+    });
 
     return () => {
       activeICS.forEach((i) => {
         dispatch(disconnect({ id: i.id }));
       });
     };
-
   }, [activeICS]);
 
-
   //as soon as dashboard is loaded, load widgets, configs, signals and files for this dashboard
   useEffect(() => {
     if (dashboard.id) {
@@ -126,8 +132,6 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
       fetchWidgetData(dashboard.scenarioID);
       setHeight(dashboard.height);
       setGrid(dashboard.grid);
-      
-      console.log('widgets', widgets);
     }
   }, [dashboard]);
 
@@ -138,9 +142,9 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
         setWidgets(widgetsRes.widgets);
       }
     } catch (err) {
-      console.log('error fetching data', err);
+      console.log("error fetching data", err);
     }
-  }
+  };
 
   const fetchWidgetData = async (scenarioID) => {
     try {
@@ -153,48 +157,60 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
         setConfigs(configsRes.configs);
         //load signals if there are any configs
 
-        if(configsRes.configs.length > 0){
-          for(const config of configsRes.configs){
-            const signalsInRes = await triggerGetSignals({configID: config.id, direction: "in"}).unwrap();
-            const signalsOutRes = await triggerGetSignals({configID: config.id, direction: "out"}).unwrap();
-            setSignals(prevState => ([...signalsInRes.signals, ...signalsOutRes.signals, ...prevState]));
+        if (configsRes.configs.length > 0) {
+          for (const config of configsRes.configs) {
+            const signalsInRes = await triggerGetSignals({
+              configID: config.id,
+              direction: "in",
+            }).unwrap();
+            const signalsOutRes = await triggerGetSignals({
+              configID: config.id,
+              direction: "out",
+            }).unwrap();
+            setSignals((prevState) => [
+              ...signalsInRes.signals,
+              ...signalsOutRes.signals,
+              ...prevState,
+            ]);
           }
         }
-        
       }
     } catch (err) {
-      console.log('error fetching data', err);
+      console.log("error fetching data", err);
     }
-  }
+  };
 
-  const handleKeydown = useCallback((e) => {
-    switch (e.key) {
-      case ' ':
-      case 'p':
-        setPaused(prevPaused => !prevPaused);
-        break;
-      case 'e':
-        setEditing(prevEditing => !prevEditing);
-        break;
-      case 'f':
-        toggleFullscreen();
-        break;
-      default:
-    }
-  }, [toggleFullscreen]);
+  const handleKeydown = useCallback(
+    (e) => {
+      switch (e.key) {
+        case " ":
+        case "p":
+          setPaused((prevPaused) => !prevPaused);
+          break;
+        case "e":
+          setEditing((prevEditing) => !prevEditing);
+          break;
+        case "f":
+          toggleFullscreen();
+          break;
+        default:
+      }
+    },
+    [toggleFullscreen]
+  );
 
   useEffect(() => {
-    window.addEventListener('keydown', handleKeydown);
+    window.addEventListener("keydown", handleKeydown);
     return () => {
-      window.removeEventListener('keydown', handleKeydown);
+      window.removeEventListener("keydown", handleKeydown);
     };
   }, [handleKeydown]);
 
   const handleDrop = async (widget) => {
     widget.dashboardID = dashboard.id;
 
-    if (widget.type === 'ICstatus') {
-      let allICids = ics.map(ic => ic.id);
+    if (widget.type === "ICstatus") {
+      let allICids = ics.map((ic) => ic.id);
       widget.customProperties.checkedIDs = allICids;
     }
 
@@ -204,13 +220,18 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
         fetchWidgets(dashboard.id);
       }
     } catch (err) {
-      console.log('error', err);
+      console.log("error", err);
     }
   };
 
   const widgetChange = async (widget) => {
-    setWidgetsToUpdate(prevWidgetsToUpdate => [...prevWidgetsToUpdate, widget.id]);
-    setWidgets(prevWidgets => prevWidgets.map(w => w.id === widget.id ? {...widget} : w));
+    setWidgetsToUpdate((prevWidgetsToUpdate) => [
+      ...prevWidgetsToUpdate,
+      widget.id,
+    ]);
+    setWidgets((prevWidgets) =>
+      prevWidgets.map((w) => (w.id === widget.id ? { ...widget } : w))
+    );
 
     // try {
     //   await updateWidget({ widgetID: widget.id, updatedWidget: { widget } }).unwrap();
@@ -222,10 +243,13 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
 
   const onChange = async (widget) => {
     try {
-      await updateWidget({ widgetID: widget.id, updatedWidget: { widget: widget } }).unwrap();
+      await updateWidget({
+        widgetID: widget.id,
+        updatedWidget: { widget: widget },
+      }).unwrap();
       fetchWidgets(dashboard.id);
     } catch (err) {
-      console.log('error', err);
+      console.log("error", err);
     }
   };
 
@@ -234,9 +258,12 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
       if (startUpdaterWidgets.has(widget.type)) {
         widget.customProperties.simStartedSendValue = true;
         try {
-          await updateWidget({ widgetID: widget.id, updatedWidget: { widget } }).unwrap();
+          await updateWidget({
+            widgetID: widget.id,
+            updatedWidget: { widget },
+          }).unwrap();
         } catch (err) {
-          console.log('error', err);
+          console.log("error", err);
         }
       }
     });
@@ -244,30 +271,35 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
 
   const editWidget = (widget, index) => {
     setEditModal(true);
-    setModalData({...widget});
+    setModalData({ ...widget });
     setModalIndex(index);
   };
 
   const duplicateWidget = async (widget) => {
-    let widgetCopy = { ...widget, id: undefined, x: widget.x + 50, y: widget.y + 50 };
+    let widgetCopy = {
+      ...widget,
+      id: undefined,
+      x: widget.x + 50,
+      y: widget.y + 50,
+    };
     try {
       const res = await addWidget({ widget: widgetCopy }).unwrap();
       if (res) {
         fetchWidgets(dashboard.id);
       }
     } catch (err) {
-      console.log('error', err);
+      console.log("error", err);
     }
   };
 
   const startEditFiles = () => {
-    let tempFiles = files.map(file => ({ id: file.id, name: file.name }));
+    let tempFiles = files.map((file) => ({ id: file.id, name: file.name }));
     setFilesEditModal(true);
     setFilesEditSaveState(tempFiles);
   };
 
   const closeEditFiles = () => {
-    widgets.forEach(widget => {
+    widgets.forEach((widget) => {
       if (widget.type === "Image") {
         //widget.customProperties.update = true;
       }
@@ -288,10 +320,13 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
     }
 
     try {
-      await updateWidget({ widgetID: data.id, updatedWidget: { widget: data } }).unwrap();
+      await updateWidget({
+        widgetID: data.id,
+        updatedWidget: { widget: data },
+      }).unwrap();
       fetchWidgets(dashboard.id);
     } catch (err) {
-      console.log('error', err);
+      console.log("error", err);
     }
 
     setEditModal(false);
@@ -304,20 +339,27 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
       await deleteWidgetMutation(widgetID).unwrap();
       fetchWidgets(dashboard.id);
     } catch (err) {
-      console.log('error', err);
+      console.log("error", err);
     }
   };
 
   const startEditing = () => {
-    let originalIDs = widgets.map(widget => widget.id);
+    let originalIDs = widgets.map((widget) => widget.id);
     widgets.forEach(async (widget) => {
-      if (widget.type === 'Slider' || widget.type === 'NumberInput' || widget.type === 'Button') {
+      if (
+        widget.type === "Slider" ||
+        widget.type === "NumberInput" ||
+        widget.type === "Button"
+      ) {
         try {
-          await updateWidget({ widgetID: widget.id, updatedWidget: { widget } }).unwrap();
+          await updateWidget({
+            widgetID: widget.id,
+            updatedWidget: { widget },
+          }).unwrap();
         } catch (err) {
-          console.log('error', err);
+          console.log("error", err);
         }
-      } else if (widget.type === 'Image') {
+      } else if (widget.type === "Image") {
         //widget.customProperties.update = true;
       }
     });
@@ -337,25 +379,33 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
     //   }
     // });
 
-
-    if(height !== dashboard.height || grid !== dashboard.grid) {
+    if (height !== dashboard.height || grid !== dashboard.grid) {
       try {
-        const {height: oldHeight, grid: oldGrid, ...rest} = dashboard;
-        await updateDashboard({dashboardID: dashboard.id, dashboard:{height: height, grid: grid, ...rest}}).unwrap();
+        const { height: oldHeight, grid: oldGrid, ...rest } = dashboard;
+        await updateDashboard({
+          dashboardID: dashboard.id,
+          dashboard: { height: height, grid: grid, ...rest },
+        }).unwrap();
       } catch (err) {
-        console.log('error', err);
+        console.log("error", err);
       }
     }
 
-
-    if(widgetsToUpdate.length > 0){
+    if (widgetsToUpdate.length > 0) {
       try {
-        for(const index in widgetsToUpdate){
-          await updateWidget({ widgetID: widgetsToUpdate[index], updatedWidget: { widget: {...widgets.find(w => w.id == widgetsToUpdate[index])} } }).unwrap();
+        for (const index in widgetsToUpdate) {
+          await updateWidget({
+            widgetID: widgetsToUpdate[index],
+            updatedWidget: {
+              widget: {
+                ...widgets.find((w) => w.id == widgetsToUpdate[index]),
+              },
+            },
+          }).unwrap();
         }
         fetchWidgets(dashboard.id);
       } catch (err) {
-        console.log('error', err);
+        console.log("error", err);
       }
     }
 
@@ -394,11 +444,11 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
     }, 0);
 
     if (value === -1) {
-      if (dashboard.height >= 450 && dashboard.height >= (maxHeight + 80)) {
-        setHeight(prevState => (prevState - 50));
+      if (dashboard.height >= 450 && dashboard.height >= maxHeight + 80) {
+        setHeight((prevState) => prevState - 50);
       }
     } else {
-      setHeight( prevState => ( prevState + 50));
+      setHeight((prevState) => prevState + 50);
     }
   };
 
@@ -415,9 +465,11 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
     }
   };
 
-  const buttonStyle = { marginLeft: '10px' };
-  const iconStyle = { height: '25px', width: '25px' };
-  const boxClasses = classNames('section', 'box', { 'fullscreen-padding': isFullscreen });
+  const buttonStyle = { marginLeft: "10px" };
+  const iconStyle = { height: "25px", width: "25px" };
+  const boxClasses = classNames("section", "box", {
+    "fullscreen-padding": isFullscreen,
+  });
 
   if (isDashboardLoading) {
     return <div>Loading...</div>;
@@ -429,19 +481,19 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
 
   return (
     <div className={boxClasses}>
-      <div key={"header-box"} className='section-header box-header'>
+      <div key={"header-box"} className="section-header box-header">
         <div key={"title"} className="section-title">
           <h2>
             {dashboard.name}
-            <span key={"toggle-lock-button"} className='icon-button'>
+            <span key={"toggle-lock-button"} className="icon-button">
               <IconToggleButton
                 childKey={0}
                 checked={locked}
                 index={dashboard.id}
-                checkedIcon='lock'
-                uncheckedIcon='lock-open'
-                tooltipChecked='Dashboard is locked, cannot be edited'
-                tooltipUnchecked='Dashboard is unlocked, can be edited'
+                checkedIcon="lock"
+                uncheckedIcon="lock-open"
+                tooltipChecked="Dashboard is locked, cannot be edited"
+                tooltipUnchecked="Dashboard is unlocked, can be edited"
                 disabled={true}
                 buttonStyle={buttonStyle}
                 iconStyle={iconStyle}
@@ -468,8 +520,12 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
         />
       </div>
 
-      <div key={"dashboard-area"} className="box box-content" onContextMenu={(e) => e.preventDefault()}>
-        {editing &&
+      <div
+        key={"dashboard-area"}
+        className="box box-content"
+        onContextMenu={(e) => e.preventDefault()}
+      >
+        {editing && (
           <WidgetToolbox
             key={"widget-toolbox"}
             grid={grid}
@@ -478,7 +534,7 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
             onDashboardSizeChange={updateHeight}
             widgets={widgets}
           />
-        }
+        )}
 
         <WidgetArea
           key={"widget-area"}
@@ -488,35 +544,36 @@ const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
           grid={grid}
           onWidgetAdded={handleDrop}
         >
-          {widgets != null && Object.keys(widgets).map(widgetKey => (
-            <div key={"widget-container-wrapper" + widgetKey}>
-              <WidgetContainer
-                widget={JSON.parse(JSON.stringify(widgets[widgetKey]))}
-                key={"widget-container" + widgetKey}
-                index={parseInt(widgetKey, 10)}
-                grid={grid}
-                onWidgetChange={widgetChange}
-                editing={editing}
-                paused={paused}
-                onEdit={editWidget}
-                onDuplicate={duplicateWidget}
-                onDelete={(widget, index) => deleteWidget(widget.id)}
-                onChange={editing ? widgetChange : onChange}
-              >
-                <Widget
+          {widgets != null &&
+            Object.keys(widgets).map((widgetKey) => (
+              <div key={"widget-container-wrapper" + widgetKey}>
+                <WidgetContainer
                   widget={JSON.parse(JSON.stringify(widgets[widgetKey]))}
+                  key={"widget-container" + widgetKey}
+                  index={parseInt(widgetKey, 10)}
+                  grid={grid}
+                  onWidgetChange={widgetChange}
                   editing={editing}
-                  files={files}
-                  configs={configs}
-                  signals={signals}
                   paused={paused}
-                  ics={activeICS}
-                  scenarioID={dashboard.scenarioID}
-                  onSimulationStarted={() => onSimulationStarted()}
-                />
-              </WidgetContainer>
-            </div>
-          ))}
+                  onEdit={editWidget}
+                  onDuplicate={duplicateWidget}
+                  onDelete={(widget, index) => deleteWidget(widget.id)}
+                  onChange={editing ? widgetChange : onChange}
+                >
+                  <Widget
+                    widget={JSON.parse(JSON.stringify(widgets[widgetKey]))}
+                    editing={editing}
+                    files={files}
+                    configs={configs}
+                    signals={signals}
+                    paused={paused}
+                    ics={activeICS}
+                    scenarioID={dashboard.scenarioID}
+                    onSimulationStarted={() => onSimulationStarted()}
+                  />
+                </WidgetContainer>
+              </div>
+            ))}
         </WidgetArea>
 
         <EditWidget
diff --git a/src/pages/dashboards/dashboard.jsx b/src/pages/dashboards/dashboard.jsx
new file mode 100644
index 00000000..8daafbf1
--- /dev/null
+++ b/src/pages/dashboards/dashboard.jsx
@@ -0,0 +1,612 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import React, { useState, useEffect, useCallback, useRef } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { useParams } from "react-router-dom";
+import Fullscreenable from "react-fullscreenable";
+import "react-contexify/dist/ReactContexify.min.css";
+import EditWidget from "./widget/edit-widget/edit-widget";
+import EditSignalMappingDialog from "./dialogs/edit-signal-mapping.jsx";
+import WidgetToolbox from "./widget/widget-toolbox";
+import WidgetArea from "./grid/widget-area";
+import DashboardButtonGroup from "./grid/dashboard-button-group";
+import IconToggleButton from "../../common/buttons/icon-toggle-button";
+import WidgetContainer from "./widget/widget-container";
+import Widget from "./widget/widget.jsx";
+import EditFilesDialog from "./dialogs/edit-files-dialog.jsx";
+
+import { disconnect } from "../../store/websocketSlice";
+import { useDashboardData } from "./hooks/use-dashboard-data.js";
+import useWebSocketConnection from "./hooks/use-websocket-connection.js";
+
+import {
+  useGetDashboardQuery,
+  useLazyGetWidgetsQuery,
+  useLazyGetFilesQuery,
+  useAddWidgetMutation,
+  useUpdateWidgetMutation,
+  useDeleteWidgetMutation,
+  useUpdateDashboardMutation,
+  useGetICSQuery,
+  useDeleteFileMutation,
+  useAddFileMutation,
+  useUpdateFileMutation,
+} from "../../store/apiSlice";
+import { Spinner } from "react-bootstrap";
+
+const startUpdaterWidgets = new Set(["Slider", "Button", "NumberInput"]);
+
+const Dashboard = ({ isFullscreen, toggleFullscreen }) => {
+  const dispatch = useDispatch();
+  const { token: sessionToken } = useSelector((state) => state.auth);
+  const params = useParams();
+
+  const {
+    data: { dashboard } = { dashboard: {} },
+    error: dashboardError,
+    isLoading: isDashboardLoading,
+  } = useGetDashboardQuery(params.dashboard);
+  const { data: { ics } = {} } = useGetICSQuery();
+
+  const [triggerGetWidgets] = useLazyGetWidgetsQuery();
+  const [triggerDeleteFile] = useDeleteFileMutation();
+  const [triggerUploadFile] = useAddFileMutation();
+  const [addWidget] = useAddWidgetMutation();
+  const [updateWidget] = useUpdateWidgetMutation();
+  const [deleteWidgetMutation] = useDeleteWidgetMutation();
+  const [updateDashboard] = useUpdateDashboardMutation();
+  const [triggerUpdateFile] = useUpdateFileMutation();
+  const [triggerGetFiles] = useLazyGetFilesQuery();
+
+  const [widgets, setWidgets] = useState([]);
+  const [widgetsToUpdate, setWidgetsToUpdate] = useState([]);
+  const [editing, setEditing] = useState(false);
+  const [paused, setPaused] = useState(false);
+  const [locked, setLocked] = useState(false);
+  const [editModal, setEditModal] = useState(false);
+  const [editOutputSignalsModal, setEditOutputSignalsModal] = useState(false);
+  const [editInputSignalsModal, setEditInputSignalsModal] = useState(false);
+  const [filesEditModal, setFilesEditModal] = useState(false);
+  const [modalData, setModalData] = useState(null);
+  const [widgetOrigIDs, setWidgetOrigIDs] = useState([]);
+  const [height, setHeight] = useState(10);
+  const [grid, setGrid] = useState(50);
+
+  const { files, configs, signals, activeICS, refetchDashboardData } =
+    useDashboardData(dashboard.scenarioID);
+
+  //as soon as dashboard is loaded, load widgets, configs, signals and files for this dashboard
+  useEffect(() => {
+    if (dashboard.id) {
+      fetchWidgets(dashboard.id);
+      setHeight(dashboard.height);
+      setGrid(dashboard.grid);
+    }
+  }, [dashboard]);
+
+  useWebSocketConnection(activeICS, signals, widgets);
+
+  //disconnect from the websocket on component unmount
+  useEffect(() => {
+    return () => {
+      activeICS.forEach((ic) => {
+        dispatch(disconnect({ id: ic.id }));
+      });
+    };
+  }, []);
+
+  const fetchWidgets = async (dashboardID) => {
+    try {
+      const widgetsRes = await triggerGetWidgets(dashboardID).unwrap();
+      if (widgetsRes.widgets) {
+        setWidgets(widgetsRes.widgets);
+      }
+    } catch (err) {
+      console.log("error fetching data", err);
+    }
+  };
+
+  const handleKeydown = useCallback(
+    ({ key }) => {
+      const actions = {
+        " ": () => setPaused((prev) => !prev),
+        p: () => setPaused((prev) => !prev),
+        e: () => setEditing((prev) => !prev),
+        f: toggleFullscreen,
+      };
+      if (actions[key]) actions[key]();
+    },
+    [toggleFullscreen]
+  );
+
+  useEffect(() => {
+    window.addEventListener("keydown", handleKeydown);
+    return () => {
+      window.removeEventListener("keydown", handleKeydown);
+    };
+  }, [handleKeydown]);
+
+  const handleDrop = async (widget) => {
+    widget.dashboardID = dashboard.id;
+
+    if (widget.type === "ICstatus") {
+      let allICids = ics.map((ic) => ic.id);
+      widget.customProperties.checkedIDs = allICids;
+    }
+
+    try {
+      const res = await addWidget(widget).unwrap();
+      if (res) {
+        fetchWidgets(dashboard.id);
+      }
+    } catch (err) {
+      console.log("error", err);
+    }
+  };
+
+  const widgetChange = async (widget) => {
+    setWidgetsToUpdate((prevWidgetsToUpdate) => [
+      ...prevWidgetsToUpdate,
+      widget.id,
+    ]);
+    setWidgets((prevWidgets) =>
+      prevWidgets.map((w) => (w.id === widget.id ? { ...widget } : w))
+    );
+
+    try {
+      await updateWidget({
+        widgetID: widget.id,
+        updatedWidget: { widget },
+      }).unwrap();
+      fetchWidgets(dashboard.id);
+    } catch (err) {
+      console.log("error", err);
+    }
+  };
+
+  const onChange = async (widget) => {
+    try {
+      await updateWidget({
+        widgetID: widget.id,
+        updatedWidget: { widget: widget },
+      }).unwrap();
+      fetchWidgets(dashboard.id);
+    } catch (err) {
+      console.log("error", err);
+    }
+  };
+
+  const onSimulationStarted = () => {
+    widgets.forEach(async (widget) => {
+      if (startUpdaterWidgets.has(widget.type)) {
+        const updatedWidget = {
+          ...widget,
+          customProperties: {
+            ...widget.customProperties,
+            simStartedSendValue: true,
+          },
+        };
+        try {
+          await updateWidget({
+            widgetID: widget.id,
+            updatedWidget: { widget: updatedWidget },
+          }).unwrap();
+        } catch (err) {
+          console.log("error", err);
+        }
+      }
+    });
+
+    fetchWidgets(dashboard.id);
+  };
+
+  const editWidget = (widget, index) => {
+    setEditModal(true);
+    setModalData({ ...widget });
+  };
+
+  const duplicateWidget = async (widget) => {
+    let widgetCopy = {
+      ...widget,
+      id: undefined,
+      x: widget.x + 50,
+      y: widget.y + 50,
+    };
+    try {
+      const res = await addWidget({ widget: widgetCopy }).unwrap();
+      if (res) {
+        fetchWidgets(dashboard.id);
+      }
+    } catch (err) {
+      console.log("error", err);
+    }
+  };
+
+  const closeEditFiles = () => {
+    widgets.forEach((widget) => {
+      if (widget.type === "Image") {
+        //widget.customProperties.update = true;
+      }
+    });
+    setFilesEditModal(false);
+  };
+
+  const closeEdit = async (data) => {
+    if (!data) {
+      setEditModal(false);
+      setModalData(null);
+      return;
+    }
+
+    if (data.type === "Image") {
+      data.customProperties.update = true;
+    }
+
+    console.log("UPDATING WIDGET", data);
+
+    try {
+      await updateWidget({
+        widgetID: data.id,
+        updatedWidget: { widget: data },
+      }).unwrap();
+      fetchWidgets(dashboard.id);
+    } catch (err) {
+      console.log("error", err);
+    }
+
+    setEditModal(false);
+    setModalData(null);
+  };
+
+  const deleteWidget = async (widgetID) => {
+    try {
+      await deleteWidgetMutation(widgetID).unwrap();
+      fetchWidgets(dashboard.id);
+    } catch (err) {
+      console.log("error", err);
+    }
+  };
+
+  const startEditing = () => {
+    let originalIDs = widgets.map((widget) => widget.id);
+    widgets.forEach(async (widget) => {
+      if (
+        widget.type === "Slider" ||
+        widget.type === "NumberInput" ||
+        widget.type === "Button"
+      ) {
+        try {
+          await updateWidget({
+            widgetID: widget.id,
+            updatedWidget: { widget },
+          }).unwrap();
+        } catch (err) {
+          console.log("error", err);
+        }
+      } else if (widget.type === "Image") {
+        //widget.customProperties.update = true;
+      }
+    });
+    setEditing(true);
+    setWidgetOrigIDs(originalIDs);
+  };
+
+  const saveEditing = async () => {
+    widgets.forEach(async (widget) => {
+      if (widget.type === "Image") {
+        widget.customProperties.update = true;
+      }
+      try {
+        await updateWidget({
+          widgetID: widget.id,
+          updatedWidget: { widget },
+        }).unwrap();
+      } catch (err) {
+        console.log("error", err);
+      }
+    });
+
+    if (height !== dashboard.height || grid !== dashboard.grid) {
+      try {
+        const { height: oldHeight, grid: oldGrid, ...rest } = dashboard;
+        await updateDashboard({
+          dashboardID: dashboard.id,
+          dashboard: { height: height, grid: grid, ...rest },
+        }).unwrap();
+      } catch (err) {
+        console.log("error", err);
+      }
+    }
+
+    if (widgetsToUpdate.length > 0) {
+      try {
+        for (const index in widgetsToUpdate) {
+          await updateWidget({
+            widgetID: widgetsToUpdate[index],
+            updatedWidget: {
+              widget: {
+                ...widgets.find((w) => w.id == widgetsToUpdate[index]),
+              },
+            },
+          }).unwrap();
+        }
+        fetchWidgets(dashboard.id);
+      } catch (err) {
+        console.log("error", err);
+      }
+    }
+
+    setEditing(false);
+  };
+
+  const cancelEditing = () => {
+    widgets.forEach(async (widget) => {
+      if (widget.type === "Image") {
+        widget.customProperties.update = true;
+      }
+      if (!widgetOrigIDs.includes(widget.id)) {
+        try {
+          await deleteWidget(widget.id).unwrap();
+        } catch (err) {
+          console.log("error", err);
+        }
+      }
+    });
+    fetchWidgets(dashboard.id);
+    setEditing(false);
+    setHeight(dashboard.height);
+    setGrid(dashboard.grid);
+  };
+
+  const uploadFile = async (file) => {
+    await triggerUploadFile({
+      scenarioID: dashboard.scenarioID,
+      file: file,
+    })
+      .then(async () => {
+        await triggerGetFiles(dashboard.scenarioID).then((fs) => {
+          setFiles(fs.data.files);
+        });
+      })
+      .catch((e) => {
+        console.log(`File upload failed: ${e}`);
+      });
+  };
+
+  const deleteFile = async (index) => {
+    let file = files[index];
+    if (file !== undefined) {
+      await triggerDeleteFile(file.id)
+        .then(async () => {
+          await triggerGetFiles(dashboard.scenarioID)
+            .then((fs) => {
+              setFiles(fs.data.files);
+            })
+            .catch((e) => {
+              console.log(`Error fetching files: ${e}`);
+            });
+        })
+        .catch((e) => {
+          console.log(`Error deleting: ${e}`);
+        });
+    }
+  };
+
+  const updateFile = async (fileId, file) => {
+    try {
+      await triggerUpdateFile({ fileID: fileId, file: file })
+        .then(async () => {
+          await triggerGetFiles(dashboard.scenarioID)
+            .then((fs) => {
+              setFiles(fs.data.files);
+            })
+            .catch((e) => {
+              console.log(`Error fetching files: ${e}`);
+            });
+        })
+        .catch((e) => {
+          console.log(`Error deleting: ${e}`);
+        });
+    } catch (error) {
+      console.error("Error updating file:", error);
+    }
+  };
+
+  const updateGrid = (value) => {
+    setGrid(value);
+  };
+
+  const updateHeight = (value) => {
+    const maxHeight = Object.values(widgets).reduce((currentHeight, widget) => {
+      const absolutHeight = widget.y + widget.height;
+      return absolutHeight > currentHeight ? absolutHeight : currentHeight;
+    }, 0);
+
+    if (value === -1) {
+      if (dashboard.height >= 450 && dashboard.height >= maxHeight + 80) {
+        setHeight((prevState) => prevState - 50);
+      }
+    } else {
+      setHeight((prevState) => prevState + 50);
+    }
+  };
+
+  if (isDashboardLoading) {
+    return <Spinner />;
+  }
+
+  if (dashboardError) {
+    return <div>Error. Dashboard not found!</div>;
+  }
+
+  return (
+    <div
+      className={`section box ${
+        isFullscreen ? "fullscreen-padding" : ""
+      }`.trim()}
+    >
+      <div key={"header-box"} className="section-header box-header">
+        <div key={"title"} className="section-title">
+          <h2>
+            {dashboard.name}
+            <span key={"toggle-lock-button"} className="icon-button">
+              <IconToggleButton
+                childKey={0}
+                checked={locked}
+                index={dashboard.id}
+                checkedIcon="lock"
+                uncheckedIcon="lock-open"
+                tooltipChecked="Dashboard is locked, cannot be edited"
+                tooltipUnchecked="Dashboard is unlocked, can be edited"
+                onChange={() => setLocked(!locked)}
+                buttonStyle={{ marginLeft: "10px" }}
+                iconStyle={{ height: "25px", width: "25px" }}
+              />
+            </span>
+          </h2>
+        </div>
+
+        <DashboardButtonGroup
+          key={"dashboard-buttons"}
+          locked={locked}
+          editing={editing}
+          onEdit={startEditing}
+          fullscreen={isFullscreen}
+          paused={paused}
+          onSave={saveEditing}
+          onCancel={cancelEditing}
+          onFullscreen={toggleFullscreen}
+          onPause={() => setPaused(true)}
+          onUnpause={() => setPaused(false)}
+          onEditFiles={() => setFilesEditModal(true)}
+          onEditOutputSignals={() => setEditOutputSignalsModal(true)}
+          onEditInputSignals={() => setEditInputSignalsModal(true)}
+        />
+      </div>
+
+      <div
+        key={"dashboard-area"}
+        className="box box-content"
+        onContextMenu={(e) => e.preventDefault()}
+      >
+        {editing && (
+          <WidgetToolbox
+            key={"widget-toolbox"}
+            grid={grid}
+            onGridChange={updateGrid}
+            dashboard={dashboard}
+            onDashboardSizeChange={updateHeight}
+            widgets={widgets}
+          />
+        )}
+
+        <WidgetArea
+          key={"widget-area"}
+          widgets={widgets}
+          editing={editing}
+          dropZoneHeight={height}
+          grid={grid}
+          onWidgetAdded={handleDrop}
+        >
+          {widgets != null &&
+            Object.keys(widgets).map((widgetKey) => (
+              <div key={"widget-container-wrapper" + widgetKey}>
+                <WidgetContainer
+                  widget={JSON.parse(JSON.stringify(widgets[widgetKey]))}
+                  key={"widget-container" + widgetKey}
+                  index={parseInt(widgetKey, 10)}
+                  grid={grid}
+                  onWidgetChange={widgetChange}
+                  editing={editing}
+                  paused={paused}
+                  onEdit={editWidget}
+                  onDuplicate={duplicateWidget}
+                  onDelete={(widget, index) => deleteWidget(widget.id)}
+                  onChange={editing ? widgetChange : onChange}
+                >
+                  <Widget
+                    widget={JSON.parse(JSON.stringify(widgets[widgetKey]))}
+                    editing={editing}
+                    files={files}
+                    configs={configs}
+                    signals={signals}
+                    paused={paused}
+                    ics={activeICS}
+                    scenarioID={dashboard.scenarioID}
+                    onSimulationStarted={() => onSimulationStarted()}
+                  />
+                </WidgetContainer>
+              </div>
+            ))}
+        </WidgetArea>
+
+        <EditWidget
+          key={"edit-widget"}
+          sessionToken={sessionToken}
+          show={editModal}
+          onClose={closeEdit}
+          widget={modalData}
+          signals={signals}
+          files={files}
+          ics={ics}
+          configs={configs}
+          scenarioID={dashboard.scenarioID}
+        />
+
+        <EditSignalMappingDialog
+          key={"edit-signal-mapping-input-dialog"}
+          show={editInputSignalsModal}
+          onClose={() => setEditInputSignalsModal(false)}
+          direction="in"
+          signals={[...signals].filter((s) => s.direction == "in")}
+          configID={null}
+          configs={configs}
+          sessionToken={sessionToken}
+          refetch={refetchDashboardData}
+        />
+
+        <EditSignalMappingDialog
+          key={"edit-signal-mapping-output-dialog"}
+          show={editOutputSignalsModal}
+          onClose={() => setEditOutputSignalsModal(false)}
+          direction="out"
+          signals={[...signals].filter((s) => s.direction == "out")}
+          configID={null}
+          configs={configs}
+          sessionToken={sessionToken}
+          refetch={refetchDashboardData}
+        />
+
+        <EditFilesDialog
+          key={"edit-files-dialog"}
+          sessionToken={sessionToken}
+          show={filesEditModal}
+          uploadFile={uploadFile}
+          updateFile={updateFile}
+          deleteFile={deleteFile}
+          onClose={closeEditFiles}
+          files={files}
+          scenarioID={dashboard.scenarioID}
+          locked={locked}
+        />
+      </div>
+    </div>
+  );
+};
+
+export default Fullscreenable()(Dashboard);
diff --git a/src/pages/dashboards/dialogs/edit-file-content.js b/src/pages/dashboards/dialogs/edit-file-content.js
deleted file mode 100644
index c14570da..00000000
--- a/src/pages/dashboards/dialogs/edit-file-content.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-import React from 'react';
-import { Form, Button, Col } from 'react-bootstrap';
-import Dialog from '../../../common/dialogs/dialog';
-
-class EditFileContent extends React.Component {
-  valid = true;
-
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      uploadFile: null,
-    };
-  }
-
-  selectUploadFile(event) {
-    this.setState({ uploadFile: event.target.files[0] });
-  };
-
-  startEditContent(){
-    const formData = new FormData();
-    formData.append("file", this.state.uploadFile);
-
-    AppDispatcher.dispatch({
-      type: 'files/start-edit',
-      data: formData,
-      token: this.props.sessionToken,
-      id: this.props.file.id
-    });
-
-    this.setState({ uploadFile: null });
-  };
-
-  onClose = () => {
-        this.props.onClose();
-  };
-
-  render() {
-    return <Dialog
-      show={this.props.show}
-      title='Edit File Content'
-      buttonTitle='Close'
-      onClose={() => this.onClose()}
-      blendOutCancel = {true}
-      valid={true}
-    >
-      <Form.Group as={Col} >
-        <Form.Control
-          disabled={false}
-          type='file'
-          onChange={(event) => this.selectUploadFile(event)} />
-      </Form.Group>
-
-      <Form.Group as={Col} >
-        <Button
-          disabled={this.state.uploadFile === null}
-          onClick={() => this.startEditContent()}>
-          Upload
-            </Button>
-      </Form.Group>
-    </Dialog>;
-  }
-}
-
-export default EditFileContent;
\ No newline at end of file
diff --git a/src/pages/dashboards/dialogs/edit-file-content.jsx b/src/pages/dashboards/dialogs/edit-file-content.jsx
new file mode 100644
index 00000000..d99857bb
--- /dev/null
+++ b/src/pages/dashboards/dialogs/edit-file-content.jsx
@@ -0,0 +1,57 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+import React, { useState } from "react";
+import { Form, Button, Col } from "react-bootstrap";
+import Dialog from "../../../common/dialogs/dialog";
+
+const EditFileContent = ({ show, onClose, file, updateFile }) => {
+  const [uploadFile, setUploadFile] = useState(null);
+
+  const selectUploadFile = (event) => {
+    const selectedFile = event.target.files[0];
+    setUploadFile(selectedFile);
+  };
+
+  const handleUploadFile = () => {
+    updateFile(file.id, uploadFile);
+    setUploadFile(null);
+    onClose();
+  };
+
+  return (
+    <Dialog
+      show={show}
+      title="Edit File Content"
+      buttonTitle="Close"
+      onClose={onClose}
+      blendOutCancel={true}
+      valid={true}
+    >
+      <Form.Group as={Col}>
+        <Form.Control type="file" onChange={selectUploadFile} />
+      </Form.Group>
+
+      <Form.Group as={Col}>
+        <Button disabled={!uploadFile} onClick={handleUploadFile}>
+          Upload
+        </Button>
+      </Form.Group>
+    </Dialog>
+  );
+};
+
+export default EditFileContent;
diff --git a/src/pages/dashboards/dialogs/edit-files-dialog.js b/src/pages/dashboards/dialogs/edit-files-dialog.js
deleted file mode 100644
index 3eacda4e..00000000
--- a/src/pages/dashboards/dialogs/edit-files-dialog.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-import React from 'react';
-import {Form, Button, Col, ProgressBar, Row} from 'react-bootstrap';
-import Dialog from '../../../common/dialogs/dialog';
-import { Table, ButtonColumn, DataColumn } from "../../../common/table";
-import EditFileContent from  "./edit-file-content";
-
-class EditFilesDialog extends React.Component {
-  valid = true;
-
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      uploadFile: null,
-      uploadProgress: 0,
-      editModal: false,
-      modalFile: {}
-    };
-  }
-
-  onClose() {
-    this.props.onClose();
-  }
-
-  selectUploadFile(event) {
-    this.setState({ uploadFile: event.target.files[0] });
-  };
-
-  startFileUpload(){
-    // upload file
-    const formData = new FormData();
-    formData.append("file", this.state.uploadFile);
-
-    AppDispatcher.dispatch({
-      type: 'files/start-upload',
-      data: formData,
-      token: this.props.sessionToken,
-      progressCallback: this.updateUploadProgress,
-      finishedCallback: this.clearProgress,
-      scenarioID: this.props.scenarioID,
-    });
-
-    this.setState({ uploadFile: null });
-  };
-
-  updateUploadProgress = (event) => {
-    if (event.hasOwnProperty("percent")){
-      this.setState({ uploadProgress: parseInt(event.percent.toFixed(), 10) });
-    } else {
-      this.setState({ uploadProgress: 0 });
-    }
-  };
-
-  clearProgress = (newFileID) => {
-    this.setState({ uploadProgress: 0 });
-  };
-
-  closeEditModal() {
-    this.setState({editModal: false});
-  }
-
-  deleteFile(index){
-    let file = this.props.files[index]
-    AppDispatcher.dispatch({
-      type: 'files/start-remove',
-      data: file,
-      token: this.props.sessionToken
-    });
-  }
-
-  render() {
-    let fileOptions = [];
-    if (this.props.files.length > 0){
-      fileOptions.push(
-        <option key = {0} default>Select image file</option>
-        )
-      fileOptions.push(this.props.files.map((file, index) => (
-        <option key={index+1} value={file.id}>{file.name}</option>
-      )))
-    } else {
-      fileOptions = <option disabled value style={{ display: 'none' }}>No files found, please upload one first.</option>
-    }
-
-    const progressBarStyle = {
-      marginLeft: '100px',
-      marginTop: '-40px'
-    };
-
-    let title = this.props.locked ? "View files of scenario" : "Edit Files of Scenario";
-
-    return (
-      <Dialog
-        show={this.props.show}
-        title={title}
-        buttonTitle="Close"
-        onClose={() => this.onClose()}
-        blendOutCancel = {true}
-        valid={true}
-      >
-        <Table breakWord={true} data={this.props.files}>
-          <DataColumn
-            title='ID'
-            dataKey='id'
-            width={50}
-          />
-          <DataColumn
-            title='Name'
-            dataKey='name'
-          />
-          <DataColumn
-            title='Size (bytes)'
-            dataKey='size'
-          />
-          <DataColumn
-            title='Type'
-            dataKey='type'
-          />
-          <ButtonColumn
-            align='right'
-            deleteButton
-            onDelete={(index) => this.deleteFile(index)}
-            editButton
-            onEdit={index => this.setState({ editModal: true, modalFile: this.props.files[index] })}
-            locked={this.props.locked}
-          />
-        </Table>
-
-        <div style={{ float: 'center' }}>
-          <h5>Add file</h5>
-          <Row>
-            <Col xs lg="4">
-              <Form.Control
-                type='file'
-                onChange={(event) => this.selectUploadFile(event)}
-                disabled={this.props.locked}
-                />
-            </Col>
-            <Col xs lg="2">
-          <span className='solid-button'>
-            <Button
-              variant='secondary'
-              disabled={this.state.uploadFile === null || this.props.locked}
-              onClick={() => this.startFileUpload()}>
-              Upload
-          </Button>
-          </span>
-            </Col>
-          </Row>
-        </div>
-
-        <br />
-
-        <Form.Group as={Col} >
-          <ProgressBar
-            striped={true}
-            animated={true}
-            now={this.state.uploadProgress}
-            label={this.state.uploadProgress + '%'}
-          />
-        </Form.Group>
-
-        <div style={{ clear: 'both' }} />
-
-        <EditFileContent
-          show={this.state.editModal}
-          onClose={(data) => this.closeEditModal(data)}
-          sessionToken={this.props.sessionToken}
-          file={this.state.modalFile}
-        />
-      </Dialog>
-    );
-  }
-}
-
-export default EditFilesDialog;
\ No newline at end of file
diff --git a/src/pages/dashboards/dialogs/edit-files-dialog.jsx b/src/pages/dashboards/dialogs/edit-files-dialog.jsx
new file mode 100644
index 00000000..d8fae870
--- /dev/null
+++ b/src/pages/dashboards/dialogs/edit-files-dialog.jsx
@@ -0,0 +1,111 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import React, { useState } from "react";
+import { Form, Button, Col, ProgressBar, Row } from "react-bootstrap";
+import Dialog from "../../../common/dialogs/dialog";
+import { Table, ButtonColumn, DataColumn } from "../../../common/table";
+import EditFileContent from "./edit-file-content.jsx";
+
+const EditFilesDialog = (props) => {
+  const [uploadFile, setUploadFile] = useState(null);
+  const [uploadProgress, setUploadProgress] = useState(0);
+  const [editModal, setEditModal] = useState(false);
+  const [modalFile, setModalFile] = useState({});
+
+  const onClose = () => {
+    props.onClose();
+  };
+
+  const selectUploadFile = (e) => {
+    console.log("SELECTED FILE", e.target.files[0]);
+    setUploadFile(e.target.files[0]);
+  };
+
+  let title = props.locked
+    ? "View files of scenario"
+    : "Edit Files of Scenario";
+
+  return (
+    <Dialog
+      show={props.show}
+      title={title}
+      buttonTitle="Close"
+      onClose={() => onClose()}
+      blendOutCancel={true}
+      valid={true}
+    >
+      <Table breakWord={true} data={props.files}>
+        <DataColumn title="ID" dataKey="id" width={50} />
+        <DataColumn title="Name" dataKey="name" />
+        <DataColumn title="Size (bytes)" dataKey="size" />
+        <DataColumn title="Type" dataKey="type" />
+        <ButtonColumn
+          align="right"
+          deleteButton
+          onDelete={props.deleteFile}
+          editButton
+          onEdit={(index) => {
+            setEditModal(true);
+            setModalFile(props.files[index]);
+          }}
+          locked={props.locked}
+        />
+      </Table>
+
+      <div style={{ float: "center" }}>
+        <h5>Add file</h5>
+        <Row>
+          <Col xs lg="4">
+            <Form.Control
+              type="file"
+              onChange={(event) => selectUploadFile(event)}
+              disabled={props.locked}
+            />
+          </Col>
+          <Col xs lg="2">
+            <span className="solid-button">
+              <Button
+                variant="secondary"
+                disabled={uploadFile === null || props.locked}
+                onClick={() => {
+                  props.uploadFile(uploadFile);
+                }}
+              >
+                Upload
+              </Button>
+            </span>
+          </Col>
+        </Row>
+      </div>
+
+      <br />
+
+      <div style={{ clear: "both" }} />
+
+      <EditFileContent
+        show={editModal}
+        onClose={() => setEditModal(false)}
+        sessionToken={props.sessionToken}
+        file={modalFile}
+        updateFile={props.updateFile}
+      />
+    </Dialog>
+  );
+};
+
+export default EditFilesDialog;
diff --git a/src/pages/dashboards/dialogs/edit-signal-mapping.jsx b/src/pages/dashboards/dialogs/edit-signal-mapping.jsx
new file mode 100644
index 00000000..ecc77d36
--- /dev/null
+++ b/src/pages/dashboards/dialogs/edit-signal-mapping.jsx
@@ -0,0 +1,273 @@
+import { useState, useEffect } from "react";
+import { Button, Form, OverlayTrigger, Tooltip } from "react-bootstrap";
+import {
+  Table,
+  ButtonColumn,
+  CheckboxColumn,
+  DataColumn,
+} from "../../../common/table";
+import {
+  dialogWarningLabel,
+  signalDialogCheckButton,
+  buttonStyle,
+} from "../styles";
+import Dialog from "../../../common/dialogs/dialog";
+import Icon from "../../../common/icon";
+import {
+  useDeleteSignalMutation,
+  useUpdateSignalMutation,
+} from "../../../store/apiSlice";
+import { Collapse } from "react-collapse";
+
+const EditSignalMappingDialog = ({
+  show,
+  direction,
+  onClose,
+  signals,
+  refetch,
+}) => {
+  const [isCollapseOpened, setCollapseOpened] = useState(false);
+  const [checkedSignalsIDs, setCheckedSignalsIDs] = useState([]);
+  const [deleteSignal] = useDeleteSignalMutation();
+  const [updateSignal] = useUpdateSignalMutation();
+
+  const [updatedSignals, setUpdatedSignals] = useState([]);
+  const [updatedSignalsIDs, setUpdatedSignalsIDs] = useState([]);
+
+  useEffect(() => {
+    if (signals.length > 0) {
+      setUpdatedSignals([...signals]);
+    }
+  }, [signals]);
+
+  const handleMappingChange = (e, row, column) => {
+    const signalToUpdate = { ...updatedSignals[row] };
+    switch (column) {
+      case 1:
+        signalToUpdate.index = e.target.value;
+        break;
+      case 2:
+        signalToUpdate.name = e.target.value;
+        break;
+      case 3:
+        signalToUpdate.unit = e.target.value;
+        break;
+      case 4:
+        signalToUpdate.scalingFactor = e.target.value;
+        break;
+      default:
+        break;
+    }
+
+    setUpdatedSignals((prevState) =>
+      prevState.map((signal, index) =>
+        index === row ? signalToUpdate : signal
+      )
+    );
+
+    setUpdatedSignalsIDs((prevState) => [signalToUpdate.id, ...prevState]);
+  };
+
+  const handleDelete = async (signalID) => {
+    try {
+      await deleteSignal(signalID).unwrap();
+    } catch (err) {
+      console.log(err);
+    }
+
+    refetch();
+  };
+
+  const handleUpdate = async () => {
+    try {
+      for (let id of updatedSignalsIDs) {
+        const signalToUpdate = updatedSignals.find(
+          (signal) => signal.id === id
+        );
+
+        if (signalToUpdate) {
+          await updateSignal({
+            signalID: id,
+            updatedSignal: signalToUpdate,
+          }).unwrap();
+        }
+      }
+
+      refetch();
+      setUpdatedSignalsIDs([]);
+    } catch (error) {
+      console.error("Error updating signals:", error);
+    }
+  };
+
+  const onSignalChecked = (signal, event) => {
+    if (!checkedSignalsIDs.includes(signal.id)) {
+      setCheckedSignalsIDs((prevState) => [...prevState, signal.id]);
+    } else {
+      const index = checkedSignalsIDs.indexOf(signal.id);
+      setCheckedSignalsIDs((prevState) =>
+        prevState.filter((_, i) => i !== index)
+      );
+    }
+  };
+
+  const isSignalChecked = (signal) => {
+    return checkedSignalsIDs.includes(signal.id);
+  };
+
+  const toggleCheckAll = () => {
+    //check if all signals are already checked
+    if (checkedSignalsIDs.length === signals.length) {
+      setCheckedSignalsIDs([]);
+    } else {
+      signals.forEach((signal) => {
+        if (!checkedSignalsIDs.includes(signal.id)) {
+          setCheckedSignalsIDs((prevState) => [...prevState, signal.id]);
+        }
+      });
+    }
+  };
+
+  const deleteCheckedSignals = async () => {
+    if (checkedSignalsIDs.length > 0) {
+      try {
+        const deletePromises = checkedSignalsIDs.map((signalID) =>
+          deleteSignal(signalID).unwrap()
+        );
+        await Promise.all(deletePromises);
+        refetchSignals();
+      } catch (err) {
+        console.log(err);
+      }
+    }
+  };
+
+  const DialogWindow = (
+    <Dialog
+      show={show}
+      title={"Edit Signal " + direction + " Mapping"}
+      buttonTitle="Close"
+      blendOutCancel={true}
+      onClose={(c) => {
+        handleUpdate();
+        onClose(c);
+      }}
+      onReset={() => {}}
+      valid={true}
+    >
+      <Form.Group>
+        <Form.Label style={dialogWarningLabel}>
+          IMPORTANT: Signal configurations that were created before January 2022
+          have to be fixed manually. Signal indices have to start at 0 and not
+          1.
+        </Form.Label>
+        <Form.Label>
+          {" "}
+          <i>Click in table cell to edit</i>
+        </Form.Label>
+        <Table
+          breakWord={true}
+          checkbox
+          onChecked={(signal) => onSignalChecked(signal)}
+          data={updatedSignals}
+        >
+          <CheckboxColumn
+            onChecked={(index, event) => onSignalChecked(index, event)}
+            checked={(signal) => isSignalChecked(signal)}
+            width="30"
+          />
+          <DataColumn
+            title="Index"
+            dataKey="index"
+            inlineEditable
+            inputType="number"
+            onInlineChange={(e, row, column) =>
+              handleMappingChange(e, row, column)
+            }
+          />
+          <DataColumn
+            title="Name"
+            dataKey="name"
+            inlineEditable
+            inputType="text"
+            onInlineChange={(e, row, column) =>
+              handleMappingChange(e, row, column)
+            }
+          />
+          <DataColumn
+            title="Unit"
+            dataKey="unit"
+            inlineEditable
+            inputType="text"
+            onInlineChange={(e, row, column) =>
+              handleMappingChange(e, row, column)
+            }
+          />
+          <DataColumn
+            title="Scaling Factor"
+            dataKey="scalingFactor"
+            inlineEditable
+            inputType="number"
+            onInlineChange={(e, row, column) =>
+              handleMappingChange(e, row, column)
+            }
+          />
+          <ButtonColumn
+            title="Remove"
+            deleteButton
+            onDelete={(index) => handleDelete(signals[index].id)}
+          />
+        </Table>
+
+        <div className="solid-button" style={signalDialogCheckButton}>
+          <OverlayTrigger
+            key={0}
+            placement="left"
+            overlay={
+              <Tooltip id={`tooltip-${"check"}`}> Check/Uncheck All </Tooltip>
+            }
+          >
+            <Button
+              variant="secondary"
+              key={50}
+              onClick={() => toggleCheckAll()}
+              style={buttonStyle}
+            >
+              <Icon icon="check" />
+            </Button>
+          </OverlayTrigger>
+          <Button
+            variant="secondary"
+            key={51}
+            onClick={() => deleteCheckedSignals()}
+            style={buttonStyle}
+          >
+            <Icon icon="minus" /> Remove
+          </Button>
+        </div>
+        <div>
+          <Collapse isOpened={isCollapseOpened}>
+            <h6>Choose a Component Configuration to add the signal to: </h6>
+            <div className="solid-button">
+              {typeof configs !== "undefined" &&
+                configs.map((config) => (
+                  <Button
+                    variant="secondary"
+                    key={config.id}
+                    onClick={() => handleAdd(config.id)}
+                    style={buttonStyle}
+                  >
+                    {config.name}
+                  </Button>
+                ))}
+            </div>
+          </Collapse>
+        </div>
+      </Form.Group>
+    </Dialog>
+  );
+
+  return show ? DialogWindow : <></>;
+};
+
+export default EditSignalMappingDialog;
diff --git a/src/pages/dashboards/grid/dashboard-button-group.js b/src/pages/dashboards/grid/dashboard-button-group.js
new file mode 100644
index 00000000..e97536ed
--- /dev/null
+++ b/src/pages/dashboards/grid/dashboard-button-group.js
@@ -0,0 +1,154 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import React from "react";
+import PropTypes from "prop-types";
+import IconButton from "../../../common/buttons/icon-button";
+
+const buttonStyle = {
+  marginLeft: "12px",
+  height: "44px",
+  width: "35px",
+};
+
+const iconStyle = {
+  height: "25px",
+  width: "25px",
+};
+
+let buttonkey = 0;
+
+class DashboardButtonGroup extends React.Component {
+  getBtn(icon, tooltip, clickFn, locked = false) {
+    if (locked) {
+      return (
+        <IconButton
+          key={buttonkey++}
+          childKey={buttonkey}
+          icon={icon}
+          disabled={true}
+          hidetooltip={true}
+          tooltip={tooltip}
+          tipPlacement={"bottom"}
+          onClick={clickFn}
+          buttonStyle={buttonStyle}
+          iconStyle={iconStyle}
+        />
+      );
+    } else {
+      return (
+        <IconButton
+          key={buttonkey++}
+          childKey={buttonkey}
+          icon={icon}
+          tooltip={tooltip}
+          tipPlacement={"bottom"}
+          onClick={clickFn}
+          buttonStyle={buttonStyle}
+          iconStyle={iconStyle}
+        />
+      );
+    }
+  }
+
+  render() {
+    const buttons = [];
+    buttonkey = 0;
+
+    if (this.props.editing) {
+      buttons.push(this.getBtn("save", "Save changes", this.props.onSave));
+      buttons.push(
+        this.getBtn("times", "Discard changes", this.props.onCancel)
+      );
+    } else {
+      if (this.props.fullscreen !== true) {
+        buttons.push(
+          this.getBtn(
+            "expand",
+            "Change to fullscreen view",
+            this.props.onFullscreen
+          )
+        );
+      } else {
+        buttons.push(
+          this.getBtn(
+            "compress",
+            "Back to normal view",
+            this.props.onFullscreen
+          )
+        );
+      }
+
+      if (this.props.paused) {
+        buttons.push(
+          this.getBtn("play", "Continue simulation", this.props.onUnpause)
+        );
+      } else {
+        buttons.push(
+          this.getBtn("pause", "Pause simulation", this.props.onPause)
+        );
+      }
+
+      if (this.props.fullscreen !== true) {
+        let tooltip = this.props.locked
+          ? "View files of scenario"
+          : "Add, edit or delete files of scenario";
+        buttons.push(this.getBtn("file", tooltip, this.props.onEditFiles));
+        buttons.push(
+          this.getBtn(
+            "sign-in-alt",
+            "Add, edit or delete input signals",
+            this.props.onEditInputSignals,
+            this.props.locked
+          )
+        );
+        buttons.push(
+          this.getBtn(
+            "sign-out-alt",
+            "Add, edit or delete output signals",
+            this.props.onEditOutputSignals,
+            this.props.locked
+          )
+        );
+        buttons.push(
+          this.getBtn(
+            "pen",
+            "Add widgets and edit layout",
+            this.props.onEdit,
+            this.props.locked
+          )
+        );
+      }
+    }
+
+    return <div className="section-buttons-group-right">{buttons}</div>;
+  }
+}
+
+DashboardButtonGroup.propTypes = {
+  editing: PropTypes.bool,
+  fullscreen: PropTypes.bool,
+  paused: PropTypes.bool,
+  onEdit: PropTypes.func,
+  onSave: PropTypes.func,
+  onCancel: PropTypes.func,
+  onFullscreen: PropTypes.func,
+  onPause: PropTypes.func,
+  onUnpause: PropTypes.func,
+};
+
+export default DashboardButtonGroup;
diff --git a/src/pages/dashboards/dropzone.js b/src/pages/dashboards/grid/dropzone.js
similarity index 100%
rename from src/pages/dashboards/dropzone.js
rename to src/pages/dashboards/grid/dropzone.js
diff --git a/src/pages/dashboards/grid.js b/src/pages/dashboards/grid/grid.js
similarity index 100%
rename from src/pages/dashboards/grid.js
rename to src/pages/dashboards/grid/grid.js
diff --git a/src/pages/dashboards/widget-area.js b/src/pages/dashboards/grid/widget-area.js
similarity index 71%
rename from src/pages/dashboards/widget-area.js
rename to src/pages/dashboards/grid/widget-area.js
index a70fd9c0..63a58910 100644
--- a/src/pages/dashboards/widget-area.js
+++ b/src/pages/dashboards/grid/widget-area.js
@@ -15,11 +15,11 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import React from 'react';
-import PropTypes from 'prop-types';
-import Dropzone from './dropzone';
-import Grid from './grid';
-import WidgetFactory from './widget/widget-factory';
+import React from "react";
+import PropTypes from "prop-types";
+import Dropzone from "./dropzone";
+import Grid from "./grid";
+import WidgetFactory from "../widget/widget-factory";
 
 class WidgetArea extends React.Component {
   snapToGrid(value) {
@@ -39,23 +39,24 @@ class WidgetArea extends React.Component {
     if (this.props.onWidgetAdded != null) {
       this.props.onWidgetAdded(widget);
     }
-  }
+  };
 
   render() {
+    return (
+      <Dropzone
+        height={this.props.dropZoneHeight}
+        onDrop={this.handleDrop}
+        editing={this.props.editing}
+        widgets={this.props.widgets}
+      >
+        {this.props.children}
 
-    return <Dropzone
-      height={this.props.dropZoneHeight}
-      onDrop={this.handleDrop}
-      editing={this.props.editing}
-      widgets={this.props.widgets}
-    >
-      {this.props.children}
-
-      <Grid
-        size={this.props.grid}
-        disabled={this.props.grid === 1 || this.props.editing !== true}
-      />
-    </Dropzone>;
+        <Grid
+          size={this.props.grid}
+          disabled={this.props.grid === 1 || this.props.editing !== true}
+        />
+      </Dropzone>
+    );
   }
 }
 
@@ -64,11 +65,11 @@ WidgetArea.propTypes = {
   editing: PropTypes.bool,
   grid: PropTypes.number,
   //widgets: PropTypes.array,
-  onWidgetAdded: PropTypes.func
+  onWidgetAdded: PropTypes.func,
 };
 
 WidgetArea.defaultProps = {
-  widgets: {}
+  widgets: {},
 };
 
 export default WidgetArea;
diff --git a/src/pages/dashboards/hooks/use-dashboard-data.js b/src/pages/dashboards/hooks/use-dashboard-data.js
new file mode 100644
index 00000000..6734dd0c
--- /dev/null
+++ b/src/pages/dashboards/hooks/use-dashboard-data.js
@@ -0,0 +1,102 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import { useState, useEffect, useMemo } from "react";
+import {
+  useLazyGetFilesQuery,
+  useLazyGetConfigsQuery,
+  useLazyGetSignalsQuery,
+  useGetICSQuery,
+} from "../../../store/apiSlice";
+
+// a custom hook designed to deliver data required for a dashboard and its widgets
+export const useDashboardData = (scenarioID) => {
+  const [files, setFiles] = useState([]);
+  const [configs, setConfigs] = useState([]);
+  const [signals, setSignals] = useState([]);
+  const [activeICS, setActiveICS] = useState([]);
+  const { data: { ics } = { ics: [] } } = useGetICSQuery();
+
+  const [triggerGetFiles] = useLazyGetFilesQuery();
+  const [triggerGetConfigs] = useLazyGetConfigsQuery();
+  const [triggerGetSignals] = useLazyGetSignalsQuery();
+
+  const fetchDashboardData = async () => {
+    if (!scenarioID) return;
+
+    //in case of refetching
+    setFiles([]);
+    setConfigs([]);
+    setSignals([]);
+
+    try {
+      // Fetch files
+      const filesRes = await triggerGetFiles(scenarioID).unwrap();
+      if (filesRes?.files) {
+        setFiles(filesRes.files);
+      }
+
+      // Fetch configs and signals
+      const configsRes = await triggerGetConfigs(scenarioID).unwrap();
+      if (configsRes?.configs) {
+        setConfigs(configsRes.configs);
+
+        for (const config of configsRes.configs) {
+          const signalsInRes = await triggerGetSignals({
+            configID: config.id,
+            direction: "in",
+          }).unwrap();
+          const signalsOutRes = await triggerGetSignals({
+            configID: config.id,
+            direction: "out",
+          }).unwrap();
+
+          setSignals((prev) => [
+            ...prev,
+            ...signalsInRes.signals,
+            ...signalsOutRes.signals,
+          ]);
+        }
+      }
+    } catch (err) {
+      console.error("Error fetching dashboard data:", err);
+    }
+  };
+
+  useEffect(() => {
+    if (scenarioID) {
+      fetchDashboardData();
+    }
+  }, [scenarioID]);
+
+  // Derive active ICS based on the fetched configs
+  useEffect(() => {
+    let usedICS = [];
+    for (const config of configs) {
+      usedICS.push(config.icID);
+    }
+    setActiveICS(ics.filter((i) => usedICS.includes(i.id)));
+  }, [configs]);
+
+  return {
+    files,
+    configs,
+    signals,
+    activeICS,
+    refetchDashboardData: fetchDashboardData,
+  };
+};
diff --git a/src/pages/dashboards/hooks/use-websocket-connection.js b/src/pages/dashboards/hooks/use-websocket-connection.js
new file mode 100644
index 00000000..30a9c357
--- /dev/null
+++ b/src/pages/dashboards/hooks/use-websocket-connection.js
@@ -0,0 +1,86 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import { useEffect, useRef } from "react";
+import { useDispatch } from "react-redux";
+import { connectWebSocket } from "../../../store/websocketSlice";
+
+//this hook is used to establish websocket connection in the dashboard
+const useWebSocketConnection = (activeICS, signals, widgets) => {
+  const dispatch = useDispatch();
+  const hasConnectedRef = useRef(false);
+  const startUpdaterWidgets = new Set(["Slider", "Button", "NumberInput"]);
+
+  useEffect(() => {
+    //we want to connect only once after widgets, signals and activeICs are loaded
+    if (
+      !hasConnectedRef.current &&
+      signals.length > 0 &&
+      activeICS.length > 0 &&
+      widgets.length > 0
+    ) {
+      activeICS.forEach((i) => {
+        if (i.websocketurl) {
+          console.log("CONNECTING TO A WEBSOCKET FROM", i);
+          let inputValues = [];
+          //read values of all the manipulation widgets and set their values to the corresponding input signals
+          const inputSignals = [...signals].filter((s) => s.direction == "in");
+          if (inputSignals.length > 0) {
+            //initialize values for input signals
+            inputValues = new Array(inputSignals.length).fill(0);
+            //go through all the widgets and check if they have a value for any of the input signals
+            //add this value to the inputValues array at the index
+            widgets.forEach((widget) => {
+              if (startUpdaterWidgets.has(widget.type)) {
+                const matchingSignal = inputSignals.find((signal) =>
+                  widget.signalIDs.includes(signal.id)
+                );
+                if (
+                  matchingSignal &&
+                  !isNaN(matchingSignal.index) &&
+                  matchingSignal.index < inputValues.length
+                ) {
+                  if (widget.type == "Button") {
+                    inputValues[matchingSignal.index] = widget.customProperties
+                      .pressed
+                      ? widget.customProperties.on_value
+                      : widget.customProperties.off_value;
+                  } else {
+                    inputValues[matchingSignal.index] =
+                      widget.customProperties.value;
+                  }
+                }
+              }
+            });
+          }
+
+          dispatch(
+            connectWebSocket({
+              url: i.websocketurl,
+              id: i.id,
+              inputValues: inputValues,
+            })
+          );
+        }
+      });
+
+      hasConnectedRef.current = true;
+    }
+  }, [activeICS, signals, widgets]);
+};
+
+export default useWebSocketConnection;
diff --git a/src/pages/dashboards/styles.js b/src/pages/dashboards/styles.js
new file mode 100644
index 00000000..98e69c78
--- /dev/null
+++ b/src/pages/dashboards/styles.js
@@ -0,0 +1,21 @@
+export const buttonStyle = {
+  marginLeft: "5px",
+};
+
+export const iconStyle = {
+  height: "25px",
+  width: "25px",
+};
+
+export const tableHeadingStyle = {
+  paddingTop: "30px",
+};
+
+export const dialogWarningLabel = {
+  background: "#eb4d2a",
+  color: "white",
+};
+
+export const signalDialogCheckButton = {
+  float: "right",
+};
diff --git a/src/pages/dashboards/widget/edit-widget/edit-widget.js b/src/pages/dashboards/widget/edit-widget/edit-widget.js
index 5d5a0ea1..c0635821 100644
--- a/src/pages/dashboards/widget/edit-widget/edit-widget.js
+++ b/src/pages/dashboards/widget/edit-widget/edit-widget.js
@@ -148,9 +148,6 @@ class EditWidgetDialog extends React.Component {
     } else {
       customProperty ? changeObject[parts[0]][parts[1]] = e.target.value : changeObject[e.target.id] = e.target.value ;
     }
-    
-    console.log(changeObject)
-
     this.setState({ temporal: changeObject});
   }
 
diff --git a/src/pages/dashboards/widget/websocket-store.js b/src/pages/dashboards/widget/websocket-store.js
deleted file mode 100644
index 0665cf9f..00000000
--- a/src/pages/dashboards/widget/websocket-store.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-import ArrayStore from '../common/array-store';
-
-class WebsocketStore extends ArrayStore {
-
-    updateSocketStatus(state, socket) {
-        let checkInclusion = false;
-        state.forEach((element) => {
-            if (element.url === socket.url) {
-                element.connected = socket.connected;
-                checkInclusion = true;
-            }
-        })
-        if (!checkInclusion) {
-            state.push(socket);
-        }
-        this.__emitChange();
-
-        return state;
-    }
-
-    reduce(state, action) {
-        let tempSocket = {};
-        switch (action.type) {
-
-            case 'websocket/connected':
-                tempSocket.url = action.data;
-                tempSocket.connected = true;
-                return this.updateSocketStatus(state, tempSocket);
-
-            case 'websocket/connection-error':
-                tempSocket.url = action.data;
-                tempSocket.connected = false;
-                return this.updateSocketStatus(state, tempSocket);
-
-
-            default:
-                return super.reduce(state, action);
-        }
-    }
-}
-
-export default new WebsocketStore();
diff --git a/src/pages/dashboards/widget/widget-container.js b/src/pages/dashboards/widget/widget-container.js
index ff336e14..61ea65e8 100644
--- a/src/pages/dashboards/widget/widget-container.js
+++ b/src/pages/dashboards/widget/widget-container.js
@@ -15,12 +15,12 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-import { Rnd } from 'react-rnd';
-import WidgetContextMenu from '../widget/widget-context-menu';
-import {contextMenu} from "react-contexify";
+import React from "react";
+import PropTypes from "prop-types";
+import classNames from "classnames";
+import { Rnd } from "react-rnd";
+import WidgetContextMenu from "../widget/widget-context-menu.jsx";
+import { contextMenu } from "react-contexify";
 
 class WidgetContainer extends React.Component {
   constructor(props) {
@@ -36,7 +36,7 @@ class WidgetContainer extends React.Component {
     return Math.round(value / this.props.grid) * this.props.grid;
   }
 
-  borderWasClicked = event => {
+  borderWasClicked = (event) => {
     if (event.button !== 2) {
       return;
     }
@@ -60,11 +60,19 @@ class WidgetContainer extends React.Component {
     const widget = this.props.widget;
 
     // resize depends on direction
-    if (direction === 'left' || direction === 'topLeft' || direction === 'bottomLeft') {
+    if (
+      direction === "left" ||
+      direction === "topLeft" ||
+      direction === "bottomLeft"
+    ) {
       widget.x -= delta.width;
     }
 
-    if (direction === 'top' || direction === 'topLeft' || direction === 'topRight') {
+    if (
+      direction === "top" ||
+      direction === "topLeft" ||
+      direction === "topRight"
+    ) {
       widget.y -= delta.height;
     }
 
@@ -87,16 +95,15 @@ class WidgetContainer extends React.Component {
     e.preventDefault();
     contextMenu.show({
       event: e,
-      id: 'widgetMenu' + index,
-    })
+      id: "widgetMenu" + index,
+    });
   }
 
   render() {
-
     const widget = this.props.widget;
     let contextMenu = (
       <WidgetContextMenu
-        key={"widget-context-menu"+this.props.index}
+        key={"widget-context-menu" + this.props.index}
         index={this.props.index}
         widget={this.props.widget}
         onEdit={this.props.onEdit}
@@ -105,26 +112,38 @@ class WidgetContainer extends React.Component {
         onChange={this.props.onChange}
         editing={this.props.editing}
         paused={this.props.paused}
-    />)
+      />
+    );
 
-    if ( !this.props.editing ){
+    if (!this.props.editing) {
       const containerStyle = {
         width: Number(widget.width),
         height: Number(widget.height),
         left: Number(widget.x),
         top: Number(widget.y),
         zIndex: Number(widget.z),
-        position: 'absolute'
+        position: "absolute",
       };
 
-      return <div className='widget' style={containerStyle}  onContextMenu={(e) => this.showMenu(e, this.props.index, this.props.editing)}>
-        {this.props.children}
-        {contextMenu}
-      </div>;
+      return (
+        <div
+          className="widget"
+          style={containerStyle}
+          onContextMenu={(e) =>
+            this.showMenu(e, this.props.index, this.props.editing)
+          }
+        >
+          {this.props.children}
+          {contextMenu}
+        </div>
+      );
     }
 
     let resizingRestricted = false;
-    if (widget.customProperties.resizeLeftRightLock || widget.customProperties.resizeTopBottomLock) {
+    if (
+      widget.customProperties.resizeLeftRightLock ||
+      widget.customProperties.resizeTopBottomLock
+    ) {
       resizingRestricted = true;
     }
 
@@ -136,40 +155,51 @@ class WidgetContainer extends React.Component {
       right: !(widget.customProperties.resizeLeftRightLock || widget.isLocked),
       top: !(widget.customProperties.resizeTopBottomLock || widget.isLocked),
       topLeft: !(resizingRestricted || widget.isLocked),
-      topRight: !(resizingRestricted || widget.isLocked)
+      topRight: !(resizingRestricted || widget.isLocked),
     };
 
     const gridArray = [this.props.grid, this.props.grid];
 
     const widgetClasses = classNames({
-      'editing-widget': true,
-      'locked': widget.isLocked
+      "editing-widget": true,
+      locked: widget.isLocked,
     });
 
-    return ( <div key={"widget-rnd-context" + this.props.index} className='widget' style={{zIndex: Number(widget.z), position: 'relative'}} onContextMenu={(e) => this.showMenu(e, this.props.index, this.props.editing)}>
-      <Rnd
-        key={"widget-rnd" + this.props.index}
-        ref={c => { this.rnd = c; }}
-        size={{width: Number(widget.width), height: Number(widget.height)}}
-        position={{x: Number(widget.x), y: Number(widget.y)}}
-        minWidth={widget.minWidth}
-        minHeight={widget.minHeight}
-        lockAspectRatio={Boolean(widget.customProperties.lockAspect)}
-        bounds={'.toolbox-dropzone'}
-        className={widgetClasses}
-        onResizeStart={this.borderWasClicked}
-        onResizeStop={this.resizeStop}
-        onDragStop={this.dragStop}
-        dragGrid={gridArray}
-        resizeGrid={gridArray}
-        enableResizing={resizing}
-        disableDragging={widget.isLocked}
+    return (
+      <div
+        key={"widget-rnd-context" + this.props.index}
+        className="widget"
+        style={{ zIndex: Number(widget.z), position: "relative" }}
+        onContextMenu={(e) =>
+          this.showMenu(e, this.props.index, this.props.editing)
+        }
       >
-        {this.props.children}
-      </Rnd>
+        <Rnd
+          key={"widget-rnd" + this.props.index}
+          ref={(c) => {
+            this.rnd = c;
+          }}
+          size={{ width: Number(widget.width), height: Number(widget.height) }}
+          position={{ x: Number(widget.x), y: Number(widget.y) }}
+          minWidth={widget.minWidth}
+          minHeight={widget.minHeight}
+          lockAspectRatio={Boolean(widget.customProperties.lockAspect)}
+          bounds={".toolbox-dropzone"}
+          className={widgetClasses}
+          onResizeStart={this.borderWasClicked}
+          onResizeStop={this.resizeStop}
+          onDragStop={this.dragStop}
+          dragGrid={gridArray}
+          resizeGrid={gridArray}
+          enableResizing={resizing}
+          disableDragging={widget.isLocked}
+        >
+          {this.props.children}
+        </Rnd>
 
-      {contextMenu}
-    </div>);
+        {contextMenu}
+      </div>
+    );
   }
 }
 
@@ -182,4 +212,4 @@ WidgetContainer.propTypes = {
   editing: PropTypes.bool.isRequired,
 };
 
-export default WidgetContainer
+export default WidgetContainer;
diff --git a/src/pages/dashboards/widget/widget-context-menu.js b/src/pages/dashboards/widget/widget-context-menu.js
deleted file mode 100644
index 51d96e85..00000000
--- a/src/pages/dashboards/widget/widget-context-menu.js
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-import React from 'react';
-import ReactDOM from 'react-dom';
-import PropTypes from 'prop-types';
-import { Menu, Item, Separator } from 'react-contexify';
-import "react-contexify/dist/ReactContexify.css";
-
-class WidgetContextMenu extends React.Component {
-
-  editWidget = event => {
-    if (this.props.onEdit != null) {
-      this.props.onEdit(this.props.widget, this.props.index);
-    }
-  };
-
-  duplicateWidget = event => {
-    if (this.props.onDuplicate != null) {
-      this.props.onDuplicate(this.props.widget);
-    }
-  };
-
-  deleteWidget = event => {
-    if (this.props.onDelete != null) {
-      this.props.onDelete(this.props.widget, this.props.index);
-    }
-  };
-
-  moveAbove = event => {
-    this.props.widget.z += 10;
-    if (this.props.widget.z > 100) {
-      this.props.widget.z = 100;
-    }
-
-    if (this.props.onChange != null) {
-      this.props.onChange(this.props.widget, this.props.index);
-    }
-  };
-
-  moveToFront = event => {
-    this.props.widget.z = 100;
-
-    if (this.props.onChange != null) {
-      this.props.onChange(this.props.widget, this.props.index);
-    }
-  };
-
-  moveUnderneath = event => {
-    this.props.widget.z -= 10;
-    if (this.props.widget.z < 0) {
-      this.props.widget.z = 0;
-    }
-
-    if (this.props.onChange != null) {
-      this.props.onChange(this.props.widget, this.props.index);
-    }
-  };
-
-  moveToBack = event => {
-    this.props.widget.z = 0;
-
-    if (this.props.onChange != null) {
-      this.props.onChange(this.props.widget, this.props.index);
-    }
-  };
-
-  lockWidget = event => {
-    this.props.widget.isLocked = true;
-
-    if (this.props.onChange != null) {
-      this.props.onChange(this.props.widget, this.props.index);
-    }
-  };
-
-  unlockWidget = event => {
-    this.props.widget.isLocked = false;
-
-    if (this.props.onChange != null) {
-      this.props.onChange(this.props.widget, this.props.index);
-    }
-  };
-
-
-  renderContextMenu() {
-    const isLocked = this.props.widget.locked;
-
-    let dim = {
-      width: '100%',
-      height: '100%'
-    };
-
-    return (
-      <div >
-        <Menu id={'widgetMenu' + this.props.index}>
-          <Item disabled={isLocked} onClick={this.editWidget}>Edit</Item>
-          <Item disabled={isLocked} onClick={this.duplicateWidget}>Duplicate</Item>
-          <Item disabled={isLocked} onClick={this.deleteWidget}>Delete</Item>
-
-          <Separator />
-
-          <Item disabled={isLocked} onClick={this.moveAbove}>Move above</Item>
-          <Item disabled={isLocked} onClick={this.moveToFront}>Move to front</Item>
-          <Item disabled={isLocked} onClick={this.moveUnderneath}>Move underneath</Item>
-          <Item disabled={isLocked} onClick={this.moveToBack}>Move to back</Item>
-
-          <Separator />
-
-          <Item disabled={isLocked} onClick={this.lockWidget}>Lock</Item>
-          <Item disabled={isLocked === false} onClick={this.unlockWidget}>Unlock</Item>
-        </Menu>
-      </div>
-    )
-  }
-
-
-  render() {
-
-    return ReactDOM.createPortal(
-      this.renderContextMenu(),
-      document.body
-    );
-  }
-}
-
-WidgetContextMenu.propTypes = {
-  index: PropTypes.number.isRequired,
-  widget: PropTypes.object.isRequired,
-  onEdit: PropTypes.func.isRequired,
-  onDelete: PropTypes.func.isRequired,
-  onChange: PropTypes.func.isRequired
-};
-
-export default WidgetContextMenu;
diff --git a/src/pages/dashboards/widget/widget-context-menu.jsx b/src/pages/dashboards/widget/widget-context-menu.jsx
new file mode 100644
index 00000000..88af3b57
--- /dev/null
+++ b/src/pages/dashboards/widget/widget-context-menu.jsx
@@ -0,0 +1,144 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import React from "react";
+import ReactDOM from "react-dom";
+import PropTypes from "prop-types";
+import { Menu, Item, Separator } from "react-contexify";
+import "react-contexify/dist/ReactContexify.css";
+
+const WidgetContextMenu = ({
+  index,
+  widget,
+  onEdit,
+  onDuplicate,
+  onDelete,
+  onChange,
+}) => {
+  const editWidget = () => {
+    if (onEdit) {
+      onEdit(widget, index);
+    }
+  };
+
+  const duplicateWidget = () => {
+    if (onDuplicate) {
+      onDuplicate(widget);
+    }
+  };
+
+  const deleteWidget = () => {
+    if (onDelete) {
+      onDelete(widget, index);
+    }
+  };
+
+  const moveAbove = () => {
+    const updatedWidget = { ...widget, z: Math.min(widget.z + 10, 100) };
+    if (onChange) {
+      onChange(updatedWidget, index);
+    }
+  };
+
+  const moveToFront = () => {
+    const updatedWidget = { ...widget, z: 100 };
+    if (onChange) {
+      onChange(updatedWidget, index);
+    }
+  };
+
+  const moveUnderneath = () => {
+    const updatedWidget = { ...widget, z: Math.max(widget.z - 10, 0) };
+    if (onChange) {
+      onChange(updatedWidget, index);
+    }
+  };
+
+  const moveToBack = () => {
+    const updatedWidget = { ...widget, z: 0 };
+    if (onChange) {
+      onChange(updatedWidget, index);
+    }
+  };
+
+  const lockWidget = () => {
+    const updatedWidget = { ...widget, isLocked: true };
+    if (onChange) {
+      onChange(updatedWidget, index);
+    }
+  };
+
+  const unlockWidget = () => {
+    const updatedWidget = { ...widget, isLocked: false };
+    if (onChange) {
+      onChange(updatedWidget, index);
+    }
+  };
+
+  const renderContextMenu = () => (
+    <div>
+      <Menu id={`widgetMenu${index}`}>
+        <Item disabled={widget.locked} onClick={editWidget}>
+          Edit
+        </Item>
+        <Item disabled={widget.locked} onClick={duplicateWidget}>
+          Duplicate
+        </Item>
+        <Item disabled={widget.locked} onClick={deleteWidget}>
+          Delete
+        </Item>
+
+        <Separator />
+
+        <Item disabled={widget.locked} onClick={moveAbove}>
+          Move above
+        </Item>
+        <Item disabled={widget.locked} onClick={moveToFront}>
+          Move to front
+        </Item>
+        <Item disabled={widget.locked} onClick={moveUnderneath}>
+          Move underneath
+        </Item>
+        <Item disabled={widget.locked} onClick={moveToBack}>
+          Move to back
+        </Item>
+
+        <Separator />
+
+        <Item disabled={widget.locked} onClick={lockWidget}>
+          Lock
+        </Item>
+        <Item disabled={!widget.locked} onClick={unlockWidget}>
+          Unlock
+        </Item>
+      </Menu>
+    </div>
+  );
+
+  return ReactDOM.createPortal(renderContextMenu(), document.body);
+};
+
+WidgetContextMenu.propTypes = {
+  index: PropTypes.number.isRequired,
+  widget: PropTypes.object.isRequired,
+  onEdit: PropTypes.func.isRequired,
+  onDuplicate: PropTypes.func,
+  onDelete: PropTypes.func,
+  onChange: PropTypes.func.isRequired,
+};
+
+export default WidgetContextMenu;
diff --git a/src/pages/dashboards/widget/widget-factory.js b/src/pages/dashboards/widget/widget-factory.js
deleted file mode 100644
index 213226ce..00000000
--- a/src/pages/dashboards/widget/widget-factory.js
+++ /dev/null
@@ -1,248 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-//import WidgetSlider from './widgets/slider';
-
-class WidgetFactory {
-
-    static createWidgetOfType(type, position) {
-
-        let widget = {
-            name: 'Name',
-            type: type,
-            width: 100,
-            height: 100,
-            x: position.x,
-            y: position.y,
-            z: position.z,
-            locked: false,
-            customProperties: {},
-            signalIDs: [],
-        };
-
-        // set type specific properties
-        switch(type) {
-            case 'CustomAction':
-                widget.customProperties.actions = [
-                  {
-                    action: 'stop'
-                  },
-                  {
-                    action: 'pause',
-                    model: {
-                      url: 'ftp://user:pass@example.com/projectA/model.zip'
-                    },
-                    parameters: {
-                      timestep: 50e-6
-                    }
-                  }
-                ];
-                widget.name = 'Action';
-                widget.customProperties.icon = 'star';
-                widget.width = 100;
-                widget.height = 50;
-                break;
-            case 'Action':
-                break;
-            case 'Lamp':
-                widget.minWidth = 5;
-                widget.minHeight = 5;
-                widget.width = 20;
-                widget.height = 20;
-                widget.customProperties.on_color = '#4287f5';
-                widget.customProperties.on_color_opacity = 1;
-                widget.customProperties.off_color = '#4287f5';
-                widget.customProperties.off_color_opacity = 1;
-                widget.customProperties.threshold = 0.5;
-                break;
-            case 'Value':
-                widget.minWidth = 70;
-                widget.minHeight = 20;
-                widget.width = 110;
-                widget.height = 30;
-                widget.customProperties.textSize = 16;
-                widget.name = 'Value';
-                widget.customProperties.showUnit = false;
-                widget.customProperties.resizeTopBottomLock = true;
-                widget.customProperties.showScalingFactor = true;
-                break;
-            case 'Plot':
-                widget.customProperties.ylabel = '';
-                widget.customProperties.time = 60;
-                widget.minWidth = 400;
-                widget.minHeight = 200;
-                widget.width = 400;
-                widget.height = 200;
-                widget.customProperties.yMin = 0;
-                widget.customProperties.yMax = 10;
-                widget.customProperties.yUseMinMax = false;
-                widget.customProperties.lineColors = [];
-                widget.customProperties.showUnit = false;
-                widget.customProperties.mode = 'auto time-scrolling';
-                widget.customProperties.nbrSamples = 100;
-                break;
-            case 'Table':
-                widget.minWidth = 200;
-                widget.width = 300;
-                widget.height = 200;
-                widget.customProperties.showUnit = false;
-                widget.customProperties.showScalingFactor = true;
-                break;
-          case 'Label':
-                widget.minWidth = 20;
-                widget.minHeight = 20;
-                widget.customProperties.maxWidth = 100; // TODO: this props is currently ignored!
-                widget.width = 100;
-                widget.height = 35;
-                widget.name = 'Label';
-                widget.customProperties.textSize = 32;
-                widget.customProperties.fontColor = '#4287f5';
-                widget.customProperties.fontColor_opacity = 1;
-                widget.customProperties.resizeTopBottomLock = true;
-                break;
-          case 'Image':
-                widget.minWidth = 20;
-                widget.minHeight = 20;
-                widget.width = 200;
-                widget.height = 200;
-                widget.customProperties.lockAspect = true;
-                widget.customProperties.file = -1; // ID of image file, -1 means non selected
-                widget.customProperties.update = false;
-                break;
-            case 'Button':
-                widget.minWidth = 100;
-                widget.minHeight = 50;
-                widget.width = 100;
-                widget.height = 100;
-                widget.customProperties.background_color = '#527984';
-                widget.customProperties.font_color = '#4287f5';
-                widget.customProperties.border_color = '#4287f5';
-                widget.customProperties.background_color_opacity = 1;
-                widget.customProperties.on_value = 1;
-                widget.customProperties.off_value = 0;
-                widget.customProperties.toggle = false;
-                widget.customProperties.pressed = false;
-                widget.customProperties.simStartedSendValue = false;
-                break;
-            case 'NumberInput':
-                widget.minWidth = 150;
-                widget.minHeight = 50;
-                widget.width = 200;
-                widget.height = 50;
-                widget.customProperties.showUnit = false;
-                widget.customProperties.resizeTopBottomLock = true;
-                widget.customProperties.value = '';
-                widget.customProperties.simStartedSendValue = false;
-                break;
-            // case 'Slider':
-            //     widget.minWidth = 380;
-            //     widget.minHeight = 30;
-            //     widget.width = 400;
-            //     widget.height = 50;
-            //     widget.customProperties.orientation = WidgetSlider.OrientationTypes.HORIZONTAL.value; // Assign default orientation
-            //     widget.customProperties.rangeMin = 0;
-            //     widget.customProperties.rangeMax = 200;
-            //     widget.customProperties.rangeUseMinMax = true;
-            //     widget.customProperties.showUnit = false;
-            //     widget.customProperties.continous_update = false;
-            //     widget.customProperties.value = '';
-            //     widget.customProperties.resizeLeftRightLock = false;
-            //     widget.customProperties.resizeTopBottomLock = true;
-            //     widget.customProperties.simStartedSendValue = false;
-
-            //     break;
-            case 'Gauge':
-                widget.minWidth = 100;
-                widget.minHeight = 150;
-                widget.width = 150;
-                widget.height = 150;
-                widget.customProperties.colorZones = false;
-                widget.customProperties.zones = [];
-                widget.customProperties.valueMin = 0;
-                widget.customProperties.valueMax = 1;
-                widget.customProperties.valueUseMinMax = false;
-                widget.customProperties.lockAspect = true;
-                widget.customProperties.showScalingFactor = true;
-                break;
-            case 'Box':
-                widget.minWidth = 50;
-                widget.minHeight = 50;
-                widget.width = 100;
-                widget.height = 100;
-                widget.customProperties.border_color = '#4287f5';
-                widget.customProperties.border_color_opacity = 1;
-                widget.customProperties.border_width = 2;
-                widget.customProperties.background_color = '#961520';
-                widget.customProperties.background_color_opacity = 1;
-                widget.z = 0;
-                break;
-            /*case 'HTML':
-                widget.customProperties.content = '<i>Hello World</i>';
-                break;*/
-            case 'Topology':
-                widget.width = 600;
-                widget.height = 400;
-                widget.customProperties.file = -1; // ID of file, -1 means non selected
-                break;
-            case 'Line':
-                widget.height = 26;
-                widget.width = 100;
-                widget.customProperties.border_color = '#4287f5';
-                widget.customProperties.border_color_opacity = 1;
-                widget.customProperties.border_width = 2;
-                widget.customProperties.rotation = 0;
-                widget.customProperties.lockAspect = false;
-                widget.customProperties.resizeLeftRightLock = false;
-                widget.customProperties.resizeTopBottomLock = true;
-                break;
-
-            case 'TimeOffset':
-                widget.minWidth = 200;
-                widget.minHeight = 80;
-                widget.width = 200;
-                widget.height = 80;
-                widget.customProperties.threshold_yellow = 1;
-                widget.customProperties.threshold_red = 2;
-                widget.customProperties.icID = -1;
-                widget.customProperties.horizontal = true;
-                widget.customProperties.showOffset = true;
-                widget.customProperties.lockAspect = true;
-                widget.customProperties.showName = true;
-                break;
-
-            case 'Player':
-                widget.minWidth = 144;
-                widget.minHeight = 226;
-                widget.width = 400;
-                widget.height = 606;
-                widget.customProperties.configIDs = [];
-                widget.customProperties.uploadResults = false;
-                break;
-
-            case 'ICstatus':
-              widget.customProperties.checkedIDs = []
-              break;
-
-            default:
-                widget.width = 100;
-                widget.height = 100;
-        }
-        return widget;
-    }
-}
-
-export default WidgetFactory;
diff --git a/src/pages/dashboards/widget/widget-factory.jsx b/src/pages/dashboards/widget/widget-factory.jsx
new file mode 100644
index 00000000..a3bb5947
--- /dev/null
+++ b/src/pages/dashboards/widget/widget-factory.jsx
@@ -0,0 +1,245 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+const widgetsMap = {
+  CustomAction: {
+    name: "Action",
+    width: 100,
+    height: 50,
+    customProperties: {
+      actions: [
+        { action: "stop" },
+        {
+          action: "pause",
+          model: { url: "ftp://user:pass@example.com/projectA/model.zip" },
+          parameters: { timestep: 50e-6 },
+        },
+      ],
+      icon: "star",
+    },
+  },
+  Lamp: {
+    minWidth: 5,
+    minHeight: 5,
+    width: 20,
+    height: 20,
+    customProperties: {
+      on_color: "#4287f5",
+      on_color_opacity: 1,
+      off_color: "#4287f5",
+      off_color_opacity: 1,
+      threshold: 0.5,
+    },
+  },
+  Value: {
+    name: "Value",
+    minWidth: 70,
+    minHeight: 20,
+    width: 110,
+    height: 30,
+    customProperties: {
+      textSize: 16,
+      showUnit: false,
+      resizeTopBottomLock: true,
+      showScalingFactor: true,
+    },
+  },
+  Plot: {
+    minWidth: 400,
+    minHeight: 200,
+    width: 400,
+    height: 200,
+    customProperties: {
+      ylabel: "",
+      time: 60,
+      yMin: 0,
+      yMax: 10,
+      yUseMinMax: false,
+      lineColors: [],
+      showUnit: false,
+      mode: "auto time-scrolling",
+      nbrSamples: 100,
+    },
+  },
+  Table: {
+    minWidth: 200,
+    width: 300,
+    height: 200,
+    customProperties: {
+      showUnit: false,
+      showScalingFactor: true,
+    },
+  },
+  Label: {
+    name: "Label",
+    minWidth: 20,
+    minHeight: 20,
+    width: 100,
+    height: 35,
+    customProperties: {
+      maxWidth: 100, // Currently ignored
+      textSize: 32,
+      fontColor: "#4287f5",
+      fontColor_opacity: 1,
+      resizeTopBottomLock: true,
+    },
+  },
+  Image: {
+    minWidth: 20,
+    minHeight: 20,
+    width: 200,
+    height: 200,
+    customProperties: {
+      lockAspect: true,
+      file: -1, // ID of image file, -1 means not selected
+      update: false,
+    },
+  },
+  Button: {
+    minWidth: 100,
+    minHeight: 50,
+    width: 100,
+    height: 100,
+    customProperties: {
+      background_color: "#527984",
+      font_color: "#4287f5",
+      border_color: "#4287f5",
+      background_color_opacity: 1,
+      on_value: 1,
+      off_value: 0,
+      toggle: false,
+      pressed: false,
+      simStartedSendValue: false,
+    },
+  },
+  NumberInput: {
+    minWidth: 150,
+    minHeight: 50,
+    width: 200,
+    height: 50,
+    customProperties: {
+      showUnit: false,
+      resizeTopBottomLock: true,
+      value: "",
+      simStartedSendValue: false,
+    },
+  },
+  Gauge: {
+    minWidth: 100,
+    minHeight: 150,
+    width: 150,
+    height: 150,
+    customProperties: {
+      colorZones: false,
+      zones: [],
+      valueMin: 0,
+      valueMax: 1,
+      valueUseMinMax: false,
+      lockAspect: true,
+      showScalingFactor: true,
+    },
+  },
+  Box: {
+    minWidth: 50,
+    minHeight: 50,
+    width: 100,
+    height: 100,
+    customProperties: {
+      border_color: "#4287f5",
+      border_color_opacity: 1,
+      border_width: 2,
+      background_color: "#961520",
+      background_color_opacity: 1,
+    },
+  },
+  Topology: {
+    width: 600,
+    height: 400,
+    customProperties: {
+      file: -1, // ID of file, -1 means not selected
+    },
+  },
+  Line: {
+    width: 100,
+    height: 26,
+    customProperties: {
+      border_color: "#4287f5",
+      border_color_opacity: 1,
+      border_width: 2,
+      rotation: 0,
+      lockAspect: false,
+      resizeLeftRightLock: false,
+      resizeTopBottomLock: true,
+    },
+  },
+  TimeOffset: {
+    minWidth: 200,
+    minHeight: 80,
+    width: 200,
+    height: 80,
+    customProperties: {
+      threshold_yellow: 1,
+      threshold_red: 2,
+      icID: -1,
+      horizontal: true,
+      showOffset: true,
+      lockAspect: true,
+      showName: true,
+    },
+  },
+  Player: {
+    minWidth: 144,
+    minHeight: 226,
+    width: 144,
+    height: 226,
+    customProperties: {
+      configIDs: [],
+      uploadResults: false,
+    },
+  },
+  ICstatus: {
+    customProperties: {
+      checkedIDs: [],
+    },
+  },
+};
+
+const defaultWidget = {
+  name: "Name",
+  width: 100,
+  height: 100,
+  x: 0,
+  y: 0,
+  z: 0,
+  locked: false,
+  customProperties: {},
+  signalIDs: [],
+};
+
+const WidgetFactory = {
+  createWidgetOfType: (type, position) => {
+    const widget = {
+      ...defaultWidget,
+      type: type,
+      ...widgetsMap[type],
+      ...position,
+    };
+    return widget;
+  },
+};
+
+export default WidgetFactory;
diff --git a/src/pages/dashboards/widget/widget-old.js b/src/pages/dashboards/widget/widget-old.js
new file mode 100644
index 00000000..f29fe830
--- /dev/null
+++ b/src/pages/dashboards/widget/widget-old.js
@@ -0,0 +1,290 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import React from "react";
+import { useState, useEffect } from "react";
+import { useSelector, useDispatch } from "react-redux";
+import WidgetLabel from "./widgets/label.jsx";
+import WidgetLine from "./widgets/line.jsx";
+import WidgetBox from "./widgets/box.jsx";
+import WidgetImage from "./widgets/image.jsx";
+import WidgetPlot from "./widgets/plot.jsx";
+import WidgetTable from "./widgets/table.jsx";
+import WidgetValue from "./widgets/value.jsx";
+import WidgetLamp from "./widgets/lamp.jsx";
+import WidgetGauge from "./widgets/gauge.jsx";
+import WidgetTimeOffset from "./widgets/time-offset.jsx";
+import WidgetICstatus from "./widgets/icstatus.jsx";
+// import WidgetCustomAction from './widgets/custom-action';
+// import WidgetAction from './widgets/action';
+import WidgetButton from "./widgets/button.jsx";
+import WidgetInput from "./widgets/input.jsx";
+import WidgetSlider from "./widgets/slider.jsx";
+// import WidgetTopology from './widgets/topology';
+import WidgetPlayer from "./widgets/player.jsx";
+//import WidgetHTML from './widgets/html';
+import "../../../styles/widgets.css";
+import { useUpdateWidgetMutation } from "../../../store/apiSlice.js";
+import { sendMessageToWebSocket } from "../../../store/websocketSlice.js";
+import { useGetResultsQuery } from "../../../store/apiSlice.js";
+
+const Widget = ({
+  widget,
+  editing,
+  files,
+  configs,
+  signals,
+  paused,
+  ics,
+  scenarioID,
+  onSimulationStarted,
+}) => {
+  const dispatch = useDispatch();
+  const { token: sessionToken } = useSelector((state) => state.auth);
+  const { data, refetch: refetchResults } = useGetResultsQuery(scenarioID);
+  const results = data ? data.results : [];
+  const [icIDs, setICIDs] = useState([]);
+
+  const icdata = useSelector((state) => state.websocket.icdata);
+
+  const [websockets, setWebsockets] = useState([]);
+  const activeSocketURLs = useSelector(
+    (state) => state.websocket.activeSocketURLs
+  );
+  const [update] = useUpdateWidgetMutation();
+
+  useEffect(() => {
+    if (activeSocketURLs.length > 0) {
+      activeSocketURLs.forEach((url) => {
+        setWebsockets((prevState) => [
+          ...prevState,
+          { url: url.replace(/^wss:\/\//, "https://"), connected: true },
+        ]);
+      });
+    }
+  }, [activeSocketURLs]);
+
+  useEffect(() => {
+    if (signals.length > 0) {
+      let ids = [];
+
+      for (let id of widget.signalIDs) {
+        let signal = signals.find((s) => s.id === id);
+        if (signal !== undefined) {
+          let config = configs.find((m) => m.id === signal.configID);
+          if (config !== undefined) {
+            ids[signal.id] = config.icID;
+          }
+        }
+      }
+
+      setICIDs(ids);
+    }
+  }, [signals]);
+
+  const inputDataChanged = (
+    widget,
+    data,
+    controlID,
+    controlValue,
+    isFinalChange
+  ) => {
+    if (controlID !== "" && isFinalChange) {
+      let updatedWidget = JSON.parse(JSON.stringify(widget));
+      updatedWidget.customProperties[controlID] = controlValue;
+
+      updateWidget(updatedWidget);
+    }
+
+    let signalID = widget.signalIDs[0];
+    let signal = signals.filter((s) => s.id === signalID);
+    if (signal.length === 0) {
+      console.warn(
+        "Unable to send signal for signal ID",
+        signalID,
+        ". Signal not found."
+      );
+      return;
+    }
+    // determine ID of infrastructure component related to signal[0]
+    // Remark: there is only one selected signal for an input type widget
+    let icID = icIDs[signal[0].id];
+    dispatch(
+      sendMessageToWebSocket({
+        message: {
+          ic: icID,
+          signalID: signal[0].id,
+          signalIndex: signal[0].index,
+          data: signal[0].scalingFactor * data,
+        },
+      })
+    );
+  };
+
+  const updateWidget = async (updatedWidget) => {
+    try {
+      await update({
+        widgetID: widget.id,
+        updatedWidget: { widget: updatedWidget },
+      }).unwrap();
+    } catch (err) {
+      console.log("error", err);
+    }
+  };
+
+  if (widget.type === "Line") {
+    return <WidgetLine widget={widget} editing={editing} />;
+  } else if (widget.type === "Box") {
+    return <WidgetBox widget={widget} editing={editing} />;
+  } else if (widget.type === "Label") {
+    return <WidgetLabel widget={widget} />;
+  } else if (widget.type === "Image") {
+    return <WidgetImage widget={widget} files={files} token={sessionToken} />;
+  } else if (widget.type === "Plot") {
+    return (
+      <WidgetPlot
+        widget={widget}
+        data={icdata}
+        signals={signals}
+        icIDs={icIDs}
+        paused={paused}
+      />
+    );
+  } else if (widget.type === "Table") {
+    return (
+      <WidgetTable
+        widget={widget}
+        data={icdata}
+        signals={signals}
+        icIDs={icIDs}
+      />
+    );
+  } else if (widget.type === "Value") {
+    return (
+      <WidgetValue
+        widget={widget}
+        data={icdata}
+        signals={signals}
+        icIDs={icIDs}
+      />
+    );
+  } else if (widget.type === "Lamp") {
+    return (
+      <WidgetLamp
+        widget={widget}
+        data={icdata}
+        signals={signals}
+        icIDs={icIDs}
+      />
+    );
+  } else if (widget.type === "Gauge") {
+    return (
+      <WidgetGauge
+        widget={widget}
+        data={icdata}
+        signals={signals}
+        icIDs={icIDs}
+        editing={editing}
+      />
+    );
+  } else if (widget.type === "TimeOffset") {
+    return (
+      <WidgetTimeOffset
+        widget={widget}
+        data={icdata}
+        signals={signals}
+        ics={ics}
+        editing={editing}
+        websockets={websockets}
+      />
+    );
+  } else if (widget.type === "ICstatus") {
+    return <WidgetICstatus widget={widget} ics={ics} />;
+  } else if (widget.type === "Button") {
+    return (
+      <WidgetButton
+        widget={widget}
+        editing={editing}
+        onInputChanged={(value, controlID, controlValue, isFinalChange) =>
+          inputDataChanged(
+            widget,
+            value,
+            controlID,
+            controlValue,
+            isFinalChange
+          )
+        }
+        signals={signals}
+        token={sessionToken}
+      />
+    );
+  } else if (widget.type === "NumberInput") {
+    return (
+      <WidgetInput
+        widget={widget}
+        editing={editing}
+        onInputChanged={(value, controlID, controlValue, isFinalChange) =>
+          inputDataChanged(
+            widget,
+            value,
+            controlID,
+            controlValue,
+            isFinalChange
+          )
+        }
+        signals={signals}
+        token={sessionToken}
+      />
+    );
+  } else if (widget.type === "Slider") {
+    return (
+      <WidgetSlider
+        widget={widget}
+        editing={editing}
+        onInputChanged={(value, controlID, controlValue, isFinalChange) =>
+          inputDataChanged(
+            widget,
+            value,
+            controlID,
+            controlValue,
+            isFinalChange
+          )
+        }
+        signals={signals}
+        token={sessionToken}
+      />
+    );
+  } else if (widget.type === "Player") {
+    return (
+      <WidgetPlayer
+        widget={widget}
+        editing={editing}
+        configs={configs}
+        onStarted={onSimulationStarted}
+        ics={ics}
+        results={results}
+        files={files}
+        scenarioID={scenarioID}
+      />
+    );
+  } else {
+    console.log("Unknown widget type", widget.type);
+    return <div>Error: Widget not found!</div>;
+  }
+};
+
+export default Widget;
diff --git a/src/pages/dashboards/widget/widget-store.js b/src/pages/dashboards/widget/widget-store.js
deleted file mode 100644
index d350691d..00000000
--- a/src/pages/dashboards/widget/widget-store.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-
-import ArrayStore from '../common/array-store';
-import WidgetsDataManager from './widgets-data-manager';
-
-class WidgetStore extends ArrayStore {
-  constructor() {
-    super('widgets', WidgetsDataManager);
-  }
-
-  reduce(state, action) {
-    switch (action.type) {
-
-      case 'widgets/loaded':
-
-        //WidgetsDataManager.loadFiles(action.token, action.data);
-        // TODO make sure files of scenario are loaded
-        return super.reduce(state, action);
-
-      case 'widgets/signal-value-changed':
-        // update all widgets in widget store that use the current signal
-
-        if (action.values.length === 0 || action.signalID === 0){
-          console.log("WARNING: attempt to update widget signal value(s) on loopback, " +
-            "but no value(s) or invalid signal ID provided");
-          return;
-        }
-
-        state.forEach(function (widget, index) {
-
-          if (!widget.hasOwnProperty("signalIDs")){
-            return;
-          }
-
-          for(let i = 0; i<widget.signalIDs.length; i++){
-            if(widget.signalIDs[i] === action.signalID){
-
-              if(widget.hasOwnProperty("customProperties")){
-                if (widget.customProperties.hasOwnProperty("value")){
-                  let currentValue = widget.customProperties.value
-                  let typeOfValue = typeof currentValue
-
-                  if ((typeOfValue === "number" || typeOfValue === "string") && widget.signalIDs.length === 1){
-                    // widget uses only one signal, save first value in widget
-                    widget.customProperties.value = action.values[0]
-                  } else if (typeOfValue === "array" && widget.signalIDs.length > 1){
-                    // widget uses array of signals, save complete array
-                    widget.customProperties.value = action.values
-                  } else {
-                    console.log("WARNING: attempt tp update widget signal value(s) on loopback, " +
-                      "but incompatible values (type or length of array) provided");
-                  }
-
-                } else {
-                  console.log("WARNING: attempt tp update widget signal value(s) on loopback, " +
-                    "but affected widget (ID=", widget.id, ") does not have customProperties.value field");
-                }
-              } else {
-                console.log("WARNING: attempt tp update widget signal value(s) on loopback, " +
-                  "but affected widget (ID=", widget.id, ") does not have customProperties field");
-              }
-            } // if signal found
-          } // for
-        })
-
-        // explicit call to prevent array copy
-        this.__emitChange();
-
-        return state;
-
-      default:
-        return super.reduce(state, action);
-
-    }
-  }
-
-}
-
-export default new WidgetStore();
diff --git a/src/pages/dashboards/widget/widget.js b/src/pages/dashboards/widget/widget.js
deleted file mode 100644
index 6f86f547..00000000
--- a/src/pages/dashboards/widget/widget.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-import React from 'react';
-import { useState, useEffect } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
-import WidgetLabel from './widgets/label';
-import WidgetLine from './widgets/line';
-import WidgetBox from './widgets/box';
-import WidgetImage from './widgets/image';
-import WidgetPlot from './widgets/plot';
-import WidgetTable from './widgets/table';
-import WidgetValue from './widgets/value';
-import WidgetLamp from './widgets/lamp';
-import WidgetGauge from './widgets/gauge';
-import WidgetTimeOffset from './widgets/time-offset';
-import WidgetICstatus from './widgets/icstatus';
-// import WidgetCustomAction from './widgets/custom-action';
-// import WidgetAction from './widgets/action';
-import WidgetButton from './widgets/button';
-import WidgetInput from './widgets/input';
-import WidgetSlider from './widgets/slider';
-// import WidgetTopology from './widgets/topology';
-import WidgetPlayer from './widgets/player';
-//import WidgetHTML from './widgets/html';
-import '../../../styles/widgets.css';
-import { useGetICSQuery, useGetSignalsQuery, useGetConfigsQuery } from '../../../store/apiSlice';
-import { sessionToken } from '../../../localStorage';
-import { useUpdateWidgetMutation } from '../../../store/apiSlice';
-import { sendMessageToWebSocket } from '../../../store/websocketSlice';
-import { useGetResultsQuery } from '../../../store/apiSlice';
-
-const Widget = ({widget, editing, files, configs, signals, paused, ics, scenarioID, onSimulationStarted}) => {
-  const dispatch = useDispatch();
-  const { token: sessionToken } = useSelector((state) => state.auth);
-  const {data, refetch: refetchResults } = useGetResultsQuery(scenarioID);
-  const results = data ? data.results : [];
-  const [icIDs, setICIDs] = useState([]);
-
-  const icdata = useSelector((state) => state.websocket.icdata);
-
-  const [websockets, setWebsockets] = useState([]);
-  const activeSocketURLs = useSelector((state) => state.websocket.activeSocketURLs);
-  const [update] = useUpdateWidgetMutation();
-
-  useEffect(() => {
-    if(activeSocketURLs.length > 0){
-      activeSocketURLs.forEach(url => {
-        setWebsockets(prevState=>([...prevState, { url: url.replace(/^wss:\/\//, "https://"), connected:true}]))
-      })
-    }
-  }, [activeSocketURLs])
-
-  useEffect(() => {
-    if(signals.length > 0){
-      let ids = [];
-
-      for (let id of widget.signalIDs){
-        let signal = signals.find(s => s.id === id);
-        if (signal !== undefined) {
-          let config = configs.find(m => m.id === signal.configID);
-          if (config !== undefined){
-            ids[signal.id] = config.icID;
-          }
-        }
-      }
-
-      setICIDs(ids);
-    }
-  }, [signals])
-
-  const inputDataChanged = (widget, data, controlID, controlValue, isFinalChange) => {
-    if (controlID !== '' && isFinalChange) {
-      let updatedWidget = JSON.parse(JSON.stringify(widget));
-      updatedWidget.customProperties[controlID] = controlValue;
-
-      updateWidget(updatedWidget);
-    }
-
-    let signalID = widget.signalIDs[0];
-    let signal = signals.filter(s => s.id === signalID)
-    if (signal.length === 0){
-      console.warn("Unable to send signal for signal ID", signalID, ". Signal not found.");
-      return;
-    }
-    // determine ID of infrastructure component related to signal[0]
-    // Remark: there is only one selected signal for an input type widget
-    let icID = icIDs[signal[0].id];
-    dispatch(sendMessageToWebSocket({message: {ic: icID, signalID: signal[0].id, signalIndex: signal[0].index, data: signal[0].scalingFactor * data}}));
-  }
-
-  const updateWidget = async (updatedWidget) => {
-    try {
-      await update({ widgetID: widget.id, updatedWidget: { widget: updatedWidget } }).unwrap();
-    } catch (err) {
-      console.log('error', err);
-    }
-  }
-
-
-  if (widget.type === 'Line') {
-    return <WidgetLine widget={widget} editing={editing} />;
-  } else if (widget.type === 'Box') {
-      return <WidgetBox widget={widget} editing={editing} />;
-  } else if (widget.type === 'Label') {
-      return <WidgetLabel widget={widget} />;
-  } else if (widget.type === 'Image') {
-      return <WidgetImage widget={widget} files={files} token={sessionToken} />;
-  } else if (widget.type === 'Plot') {
-      return <WidgetPlot widget={widget} data={icdata} signals={signals} icIDs={icIDs} paused={paused} />;
-  } else if (widget.type === 'Table') {
-      return <WidgetTable widget={widget} data={icdata} signals={signals} icIDs={icIDs} />;
-  } else if (widget.type === 'Value') {
-      return <WidgetValue widget={widget} data={icdata} signals={signals} icIDs={icIDs} />;
-  } else if (widget.type === 'Lamp') {
-      return <WidgetLamp widget={widget} data={icdata} signals={signals} icIDs={icIDs} />;
-  } else if (widget.type === 'Gauge') {
-      return <WidgetGauge widget={widget} data={icdata} signals={signals} icIDs={icIDs} editing={editing} />;
-  } else if (widget.type === 'TimeOffset') {
-      return <WidgetTimeOffset widget={widget} data={icdata} signals={signals} ics={ics} editing={editing} websockets={websockets} />;
-  } else if (widget.type === 'ICstatus') {
-      return <WidgetICstatus widget={widget} ics={ics} />;
-  } else if (widget.type === 'Button') {
-      return (
-          <WidgetButton 
-              widget={widget} 
-              editing={editing} 
-              onInputChanged={(value, controlID, controlValue, isFinalChange) => 
-                  inputDataChanged(widget, value, controlID, controlValue, isFinalChange)
-              }
-              signals={signals}
-              token={sessionToken}
-          />
-      );
-  } else if (widget.type === 'NumberInput') {
-      return (
-          <WidgetInput
-              widget={widget}
-              editing={editing}
-              onInputChanged={(value, controlID, controlValue, isFinalChange) => 
-                  inputDataChanged(widget, value, controlID, controlValue, isFinalChange)
-              }
-              signals={signals}
-              token={sessionToken}
-          />
-      );
-  } else if (widget.type === 'Slider') {
-      return (
-          <WidgetSlider
-              widget={widget}
-              editing={editing}
-              onInputChanged={(value, controlID, controlValue, isFinalChange) => 
-                  inputDataChanged(widget, value, controlID, controlValue, isFinalChange)
-              }
-              signals={signals}
-              token={sessionToken}
-          />
-      );
-  } else if (widget.type === 'Player') {
-    return (
-      <WidgetPlayer
-        widget={widget}
-        editing={editing}
-        configs={configs}
-        onStarted={onSimulationStarted}
-        ics={ics}
-        results={results}
-        files={files}
-        scenarioID={scenarioID}
-      />
-    );
-  } else {
-      console.log('Unknown widget type', widget.type);
-      return <div>Error: Widget not found!</div>;
-  }
-}
-
-export default Widget;
diff --git a/src/pages/dashboards/widget/widget.jsx b/src/pages/dashboards/widget/widget.jsx
new file mode 100644
index 00000000..2ea606d3
--- /dev/null
+++ b/src/pages/dashboards/widget/widget.jsx
@@ -0,0 +1,240 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import React from "react";
+import { useState, useEffect } from "react";
+import { useSelector, useDispatch } from "react-redux";
+import WidgetLabel from "./widgets/label.jsx";
+import WidgetLine from "./widgets/line.jsx";
+import WidgetBox from "./widgets/box.jsx";
+import WidgetImage from "./widgets/image.jsx";
+import WidgetPlot from "./widgets/plot.jsx";
+import WidgetTable from "./widgets/table.jsx";
+import WidgetValue from "./widgets/value.jsx";
+import WidgetLamp from "./widgets/lamp.jsx";
+import WidgetGauge from "./widgets/gauge.jsx";
+import WidgetTimeOffset from "./widgets/time-offset.jsx";
+import WidgetICstatus from "./widgets/icstatus.jsx";
+import WidgetButton from "./widgets/button.jsx";
+import WidgetInput from "./widgets/input.jsx";
+import WidgetSlider from "./widgets/slider.jsx";
+import WidgetPlayer from "./widgets/player.jsx";
+import "../../../styles/widgets.css";
+import { useUpdateWidgetMutation } from "../../../store/apiSlice.js";
+import { sendMessageToWebSocket } from "../../../store/websocketSlice.js";
+import { useGetResultsQuery } from "../../../store/apiSlice.js";
+
+const Widget = ({
+  widget,
+  editing,
+  files,
+  configs,
+  signals,
+  paused,
+  ics,
+  scenarioID,
+  onSimulationStarted,
+}) => {
+  const dispatch = useDispatch();
+  const { token: sessionToken } = useSelector((state) => state.auth);
+  const { data, refetch: refetchResults } = useGetResultsQuery(scenarioID);
+  const results = data ? data.results : [];
+  const [icIDs, setICIDs] = useState([]);
+
+  const icdata = useSelector((state) => state.websocket.icdata);
+
+  const [websockets, setWebsockets] = useState([]);
+  const activeSocketURLs = useSelector(
+    (state) => state.websocket.activeSocketURLs
+  );
+  const [update] = useUpdateWidgetMutation();
+
+  useEffect(() => {
+    if (activeSocketURLs.length > 0) {
+      activeSocketURLs.forEach((url) => {
+        setWebsockets((prevState) => [
+          ...prevState,
+          { url: url.replace(/^wss:\/\//, "https://"), connected: true },
+        ]);
+      });
+    }
+  }, [activeSocketURLs]);
+
+  useEffect(() => {
+    if (signals.length > 0) {
+      let ids = [];
+
+      for (let id of widget.signalIDs) {
+        let signal = signals.find((s) => s.id === id);
+        if (signal !== undefined) {
+          let config = configs.find((m) => m.id === signal.configID);
+          if (config !== undefined) {
+            ids[signal.id] = config.icID;
+          }
+        }
+      }
+
+      setICIDs(ids);
+    }
+  }, [signals]);
+
+  const inputDataChanged = (value, controlID, controlValue, isFinalChange) => {
+    if (controlID !== "" && isFinalChange) {
+      let updatedWidget = JSON.parse(JSON.stringify(widget));
+      updatedWidget.customProperties[controlID] = controlValue;
+
+      updateWidget(updatedWidget);
+    }
+
+    let signalID = widget.signalIDs[0];
+    let signal = signals.filter((s) => s.id === signalID);
+    if (signal.length === 0) {
+      console.warn(
+        "Unable to send signal for signal ID",
+        signalID,
+        ". Signal not found."
+      );
+      return;
+    }
+    // determine ID of infrastructure component related to signal[0]
+    // Remark: there is only one selected signal for an input type widget
+    let icID = icIDs[signal[0].id];
+    dispatch(
+      sendMessageToWebSocket({
+        message: {
+          ic: icID,
+          signalID: signal[0].id,
+          signalIndex: signal[0].index,
+          data: signal[0].scalingFactor * value,
+        },
+      })
+    );
+  };
+
+  const updateWidget = async (updatedWidget) => {
+    try {
+      await update({
+        widgetID: widget.id,
+        updatedWidget: { widget: updatedWidget },
+      }).unwrap();
+    } catch (err) {
+      console.log("error", err);
+    }
+  };
+
+  const widgetMap = {
+    Line: <WidgetLine widget={widget} editing={editing} />,
+    Box: <WidgetBox widget={widget} editing={editing} />,
+    Label: <WidgetLabel widget={widget} />,
+    Image: <WidgetImage widget={widget} files={files} token={sessionToken} />,
+    Plot: (
+      <WidgetPlot
+        widget={widget}
+        data={icdata}
+        signals={signals}
+        icIDs={icIDs}
+        paused={paused}
+      />
+    ),
+    Table: (
+      <WidgetTable
+        widget={widget}
+        data={icdata}
+        signals={signals}
+        icIDs={icIDs}
+      />
+    ),
+    Value: (
+      <WidgetValue
+        widget={widget}
+        data={icdata}
+        signals={signals}
+        icIDs={icIDs}
+      />
+    ),
+    Lamp: (
+      <WidgetLamp
+        widget={widget}
+        data={icdata}
+        signals={signals}
+        icIDs={icIDs}
+      />
+    ),
+    Gauge: (
+      <WidgetGauge
+        widget={widget}
+        data={icdata}
+        signals={signals}
+        icIDs={icIDs}
+        editing={editing}
+      />
+    ),
+    TimeOffset: (
+      <WidgetTimeOffset
+        widget={widget}
+        data={icdata}
+        signals={signals}
+        ics={ics}
+        editing={editing}
+        websockets={websockets}
+      />
+    ),
+    ICstatus: <WidgetICstatus widget={widget} ics={ics} />,
+    Button: (
+      <WidgetButton
+        widget={widget}
+        editing={editing}
+        onInputChanged={inputDataChanged}
+        signals={signals}
+        token={sessionToken}
+      />
+    ),
+    NumberInput: (
+      <WidgetInput
+        widget={widget}
+        editing={editing}
+        onInputChanged={inputDataChanged}
+        signals={signals}
+      />
+    ),
+    Slider: (
+      <WidgetSlider
+        widget={widget}
+        editing={editing}
+        onInputChanged={inputDataChanged}
+        signals={signals}
+        token={sessionToken}
+      />
+    ),
+    Player: (
+      <WidgetPlayer
+        widget={widget}
+        editing={editing}
+        configs={configs}
+        onStarted={onSimulationStarted}
+        ics={ics}
+        results={results}
+        files={files}
+        scenarioID={scenarioID}
+      />
+    ),
+  };
+
+  return widgetMap[widget.type] || <div>Error: Widget not found!</div>;
+};
+
+export default Widget;
diff --git a/src/pages/dashboards/widget/widgets/button.jsx b/src/pages/dashboards/widget/widgets/button.jsx
index 2c285f4d..bf822b77 100644
--- a/src/pages/dashboards/widget/widgets/button.jsx
+++ b/src/pages/dashboards/widget/widgets/button.jsx
@@ -15,76 +15,66 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import React, { useState, useEffect } from 'react';
-import { Button } from 'react-bootstrap';
+import React, { useState, useEffect, useRef } from "react";
+import { Button } from "react-bootstrap";
+import { useUpdateWidgetMutation } from "../../../../store/apiSlice";
+const WidgetButton = ({ widget, editing, onInputChanged }) => {
+  const [pressed, setPressed] = useState(widget.customProperties.pressed);
+  const [toggle, setToggle] = useState(widget.customProperties.toggle);
+  const [updateWidget] = useUpdateWidgetMutation();
 
-const WidgetButton = (props) => {
-  const [pressed, setPressed] = useState(props.widget.customProperties.pressed);
+  //this ref is used for capturing last value of pressed so that it can be saved and sent on unmount
+  const pressedRef = useRef(pressed);
 
   useEffect(() => {
-    let widget = props.widget;
-    widget.customProperties.simStartedSendValue = false;
-    widget.customProperties.pressed = false;
-
-    // AppDispatcher.dispatch({
-    //   type: 'widgets/start-edit',
-    //   token: props.token,
-    //   data: widget
-    // });
-
-    // Effect cleanup
     return () => {
-      // Clean up if needed
+      //if button is in toggle-mode, we want to save its pressed state for future reloads of dashboard
+      if (toggle) updateSimStartedAndPressedValues(false, pressedRef.current);
     };
-  }, [props.token, props.widget]);
-
-  useEffect(() => {
-    if (props.widget.customProperties.simStartedSendValue) {
-      let widget = props.widget;
-      widget.customProperties.simStartedSendValue = false;
-      widget.customProperties.pressed = false;
-      AppDispatcher.dispatch({
-        type: 'widgets/start-edit',
-        token: props.token,
-        data: widget
-      });
-
-      props.onInputChanged(widget.customProperties.off_value, '', false, false);
-    }
-  }, [props, setPressed]);
+  }, []);
 
   useEffect(() => {
-    setPressed(props.widget.customProperties.pressed);
-  }, [props.widget.customProperties.pressed]);
+    setToggle(widget.customProperties.toggle);
+  }, [widget]);
 
-  const onPress = (e) => {
-    if (e.button === 0 && !props.widget.customProperties.toggle) {
-      valueChanged(props.widget.customProperties.on_value, true);
+  const updateSimStartedAndPressedValues = async (isSimStarted, isPressed) => {
+    try {
+      await updateWidget({
+        widgetID: widget.id,
+        updatedWidget: {
+          widget: {
+            ...widget,
+            customProperties: {
+              ...widget.customProperties,
+              simStartedSendValue: isSimStarted,
+              pressed: isPressed,
+            },
+          },
+        },
+      }).unwrap();
+    } catch (err) {
+      console.log("error", err);
     }
   };
 
-  const onRelease = (e) => {
-    if (e.button === 0) {
-      let nextState = false;
-      if (props.widget.customProperties.toggle) {
-        nextState = !pressed;
-      }
-      valueChanged(nextState ? props.widget.customProperties.on_value : props.widget.customProperties.off_value, nextState);
-    }
-  };
+  useEffect(() => {
+    pressedRef.current = pressed;
 
-  const valueChanged = (newValue, newPressed) => {
-    if (props.onInputChanged) {
-      props.onInputChanged(newValue, 'pressed', newPressed, true);
-    }
-    setPressed(newPressed);
-  };
+    onInputChanged(
+      pressed
+        ? widget.customProperties.on_value
+        : widget.customProperties.off_value,
+      "",
+      false,
+      false
+    );
+  }, [pressed]);
 
-  let opacity = props.widget.customProperties.background_color_opacity;
+  let opacity = widget.customProperties.background_color_opacity;
   const buttonStyle = {
-    backgroundColor: props.widget.customProperties.background_color,
-    borderColor: props.widget.customProperties.border_color,
-    color: props.widget.customProperties.font_color,
+    backgroundColor: widget.customProperties.background_color,
+    borderColor: widget.customProperties.border_color,
+    color: widget.customProperties.font_color,
     opacity: pressed ? (opacity + 1) / 4 : opacity,
   };
 
@@ -94,11 +84,16 @@ const WidgetButton = (props) => {
         className="full"
         style={buttonStyle}
         active={pressed}
-        disabled={props.editing}
-        onMouseDown={(e) => onPress(e)}
-        onMouseUp={(e) => onRelease(e)}
+        disabled={editing}
+        onMouseDown={(e) => {
+          if (!toggle) setPressed(true);
+          else setPressed(!pressed);
+        }}
+        onMouseUp={(e) => {
+          if (!toggle) setPressed(false);
+        }}
       >
-        {props.widget.name}
+        {widget.name}
       </Button>
     </div>
   );
diff --git a/src/pages/dashboards/widget/widgets/icstatus.jsx b/src/pages/dashboards/widget/widgets/icstatus.jsx
index 943c4187..a1b3c336 100644
--- a/src/pages/dashboards/widget/widgets/icstatus.jsx
+++ b/src/pages/dashboards/widget/widgets/icstatus.jsx
@@ -16,40 +16,48 @@
  ******************************************************************************/
 
 import React, { useState, useEffect } from "react";
-import { Badge } from "react-bootstrap";
-import {stateLabelStyle} from "../../../infrastructure/styles";
+import { Badge, Spinner } from "react-bootstrap";
+import { stateLabelStyle } from "../../../infrastructure/styles";
+import { useDispatch } from "react-redux";
+import { useLazyGetICbyIdQuery } from "../../../../store/apiSlice";
 
+let timer = null;
 const WidgetICstatus = (props) => {
-  const [sessionToken, setSessionToken] = useState(
-    localStorage.getItem("token")
-  );
+  const dispatch = useDispatch();
+  const [ics, setIcs] = useState(props.ics);
+  const [triggerGetICbyId] = useLazyGetICbyIdQuery();
+  const refresh = async () => {
+    if (props.ics) {
+      try {
+        const requests = props.ics.map((ic) =>
+          triggerGetICbyId(ic.id).unwrap()
+        );
 
-  useEffect(() => {
-    // Function to refresh data
-    const refresh = () => {
-      if (props.ics) {
-        props.ics.forEach((ic) => {
-          let icID = parseInt(ic.id, 10);
-        });
+        const results = await Promise.all(requests);
+        setIcs(results);
+      } catch (error) {
+        console.error("Error loading ICs:", error);
       }
-    };
+    }
+  };
+  useEffect(() => {
+    window.clearInterval(timer);
+    timer = window.setInterval(refresh, 3000);
 
-    // Start timer for periodic refresh
-    const timer = window.setInterval(() => refresh(), 3000);
+    refresh();
 
-    // Cleanup function equivalent to componentWillUnmount
     return () => {
       window.clearInterval(timer);
     };
-  }, [props.ics, sessionToken]);
+  }, [props.ics]);
 
   let badges = [];
   let checkedICs = props.widget ? props.widget.customProperties.checkedIDs : [];
 
   if (props.ics && checkedICs) {
-    badges = props.ics
-      .filter((ic) => checkedICs.includes(ic.id))
-      .map((ic) => {
+    badges = ics
+      .filter(({ ic }) => checkedICs.includes(ic?.id))
+      .map(({ ic }) => {
         let badgeStyle = stateLabelStyle(ic.state, ic);
         return (
           <Badge key={ic.id} bg={badgeStyle[0]} className={badgeStyle[1]}>
@@ -59,7 +67,7 @@ const WidgetICstatus = (props) => {
       });
   }
 
-  return <div>{badges}</div>;
+  return badges.length > 0 ? <div>{badges}</div> : <Spinner />;
 };
 
 export default WidgetICstatus;
diff --git a/src/pages/dashboards/widget/widgets/input.jsx b/src/pages/dashboards/widget/widgets/input.jsx
index 938e2d75..d19fe776 100644
--- a/src/pages/dashboards/widget/widgets/input.jsx
+++ b/src/pages/dashboards/widget/widgets/input.jsx
@@ -16,79 +16,95 @@
  ******************************************************************************/
 import React, { useState, useEffect } from "react";
 import { Form, Col, InputGroup } from "react-bootstrap";
-
-function WidgetInput(props) {
-  const [value, setValue] = useState("");
+import { useUpdateWidgetMutation } from "../../../../store/apiSlice";
+
+const WidgetInput = ({ signals, widget, editing, onInputChanged }) => {
+  const initialValue =
+    widget.customProperties.value !== undefined
+      ? Number(widget.customProperties.value)
+      : widget.customProperties.default_value !== undefined
+      ? Number(widget.customProperties.default_value)
+      : "";
+  const [value, setValue] = useState(initialValue);
   const [unit, setUnit] = useState("");
 
-  useEffect(() => {
-    const widget = { ...props.widget };
-    widget.customProperties.simStartedSendValue = false;
-
-    // AppDispatcher.dispatch({
-    //   type: "widgets/start-edit",
-    //   token: props.token,
-    //   data: widget,
-    // });
-  }, [props.token, props.widget]);
+  const [updateWidget] = useUpdateWidgetMutation();
 
   useEffect(() => {
-    if (props.widget.customProperties.simStartedSendValue) {
-      const widget = { ...props.widget };
+    if (widget.customProperties.simStartedSendValue) {
       widget.customProperties.simStartedSendValue = false;
+      if(onInputChanged && signals && signals.length > 0){
+        onInputChanged(widget.customProperties.value, "", "", false);
+      }
+      updateWidgetSimStatus(false);
 
-      AppDispatcher.dispatch({
-        type: "widgets/start-edit",
-        token: props.token,
-        data: widget,
-      });
-
-      props.onInputChanged(Number(value), "", "", false);
+      onInputChanged(Number(value), "", false, false);
     }
-  }, [props, value]);
+  }, [value]);
+
+  //once widget is mounted, update status
+  useEffect(() => {
+    updateWidgetSimStatus(true);
+  }, [widget.id]);
 
   useEffect(() => {
-    let newValue = "";
-    let newUnit = "";
+    if (widget.customProperties.simStartedSendValue) {
+      updateWidgetSimStatus(false);
+      if (onInputChanged) {
+        onInputChanged(Number(value), "", false, false);
+      }
+    }
+  }, [value]);
 
+  useEffect(() => {
+    let newValue = widget.customProperties.value;
     if (
-      props.widget.customProperties.hasOwnProperty("value") &&
-      props.widget.customProperties.value !== value
+      newValue === undefined &&
+      widget.customProperties.default_value !== undefined
     ) {
-      newValue = Number(props.widget.customProperties.value);
-    } else if (
-      props.widget.customProperties.hasOwnProperty("default_value") &&
-      value === ""
-    ) {
-      newValue = Number(props.widget.customProperties.default_value);
+      newValue = widget.customProperties.default_value;
     }
-
-    if (props.widget.signalIDs.length > 0) {
-      const signalID = props.widget.signalIDs[0];
-      const signal = props.signals.find((sig) => sig.id === signalID);
-      if (signal !== undefined) {
-        newUnit = signal.unit;
-      }
+    if (newValue !== undefined && Number(newValue) !== Number(value)) {
+      setValue(Number(newValue));
     }
 
-    if (newUnit !== unit) {
-      setUnit(newUnit);
+    if (widget.signalIDs && widget.signalIDs.length > 0) {
+      const signalID = widget.signalIDs[0];
+      const signal = signals.find((sig) => sig.id === signalID);
+      if (signal && signal.unit !== unit) {
+        setUnit(signal.unit);
+      }
     }
-
-    if (newValue !== value) {
-      setValue(newValue);
+  }, [widget, signals]);
+
+  const updateWidgetSimStatus = async (isSimStarted) => {
+    try {
+      await updateWidget({
+        widgetID: widget.id,
+        updatedWidget: {
+          widget: {
+            ...widget,
+            customProperties: {
+              ...widget.customProperties,
+              simStartedSendValue: isSimStarted,
+            },
+          },
+        },
+      }).unwrap();
+    } catch (err) {
+      console.log("Error updating simulation status:", err);
     }
-  }, [props, value, unit]);
+  };
 
   const valueIsChanging = (newValue) => {
     const numericalValue = Number(newValue);
     setValue(numericalValue);
-    props.widget.customProperties.value = numericalValue;
+    widget.customProperties.value = numericalValue;
   };
 
   const valueChanged = (newValue) => {
-    if (props.onInputChanged) {
-      props.onInputChanged(Number(newValue), "value", Number(newValue), true);
+    if (onInputChanged) {
+      onInputChanged(Number(newValue), "value", Number(newValue), true);
     }
   };
 
@@ -103,15 +119,15 @@ function WidgetInput(props) {
       <Form>
         <Form.Group>
           <Col as={Form.Label}>
-            {props.widget.name}
-            {props.widget.customProperties.showUnit ? ` [${unit}]` : ""}
+            {widget.name}
+            {widget.customProperties.showUnit ? ` [${unit}]` : ""}
           </Col>
           <Col>
             <InputGroup>
               <Form.Control
                 type="number"
                 step="any"
-                disabled={props.editing}
+                disabled={editing}
                 onKeyPress={handleKeyPress}
                 onBlur={() => valueChanged(value)}
                 onChange={(e) => valueIsChanging(e.target.value)}
@@ -124,6 +140,6 @@ function WidgetInput(props) {
       </Form>
     </div>
   );
-}
+};
 
 export default WidgetInput;
diff --git a/src/pages/dashboards/widget/widgets/player.js b/src/pages/dashboards/widget/widgets/player.js
deleted file mode 100644
index 100bf1a8..00000000
--- a/src/pages/dashboards/widget/widgets/player.js
+++ /dev/null
@@ -1,325 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-import React, { Component } from 'react';
-import { Container, Row, Col } from 'react-bootstrap';
-import JSZip from 'jszip';
-import IconButton from '../../../../common/buttons/icon-button';
-import IconTextButton from '../../../../common/buttons/icon-text-button';
-import ParametersEditor from '../../../../common/parameters-editor';
-import ResultPythonDialog from '../../../scenarios/dialogs/result-python-dialog';
-import { playerMachine } from '../widget-player/player-machine';
-import { interpret } from 'xstate';
-
-const playerService = interpret(playerMachine);
-
-function transitionState(currentState, playerEvent) {
-  return playerMachine.transition(currentState, { type: playerEvent })
-}
-
-class WidgetPlayer extends Component {
-  constructor(props) {
-    super(props);
-
-    playerService.start();
-
-    this.state = {
-      showDialog: false,
-      configID: '',
-      config: null,
-      playerState: playerMachine.initialState,
-      showConfig: false,
-      startParameters: {},
-      icState: 'unknown',
-      ic: null,
-      configBtnText: 'Component Configuration',
-      uploadResults: false,
-      sessionToken: localStorage.getItem("token"),
-      pythonResultsModal: false,
-      resultArrayId: 0,
-      filesToDownload: [],
-      showWarning: true,
-      warningText: 'no config selected'
-    };
-  }
-
-  componentDidUpdate(prevProps) {
-    if (this.props.results && this.props.results.length - 1 !== this.state.resultArrayId) {
-      this.setState({ resultArrayId: this.props.results.length - 1 });
-    }
-    // zip download files
-    if (this.state.filesToDownload && this.state.filesToDownload.length > 0) {
-      if (this.props.files !== prevProps.files) {
-        let filesToDownload = this.props.files.filter(file => this.state.filesToDownload.includes(file.id) && file.data);
-
-        if (filesToDownload.length === this.state.filesToDownload.length) { // all requested files have been loaded
-          var zip = new JSZip();
-          filesToDownload.forEach(file => {
-            zip.file(file.name, file.data);
-          });
-          let zipname = "results_" + (new Date()).toISOString();
-          zip.generateAsync({ type: "blob" }).then(function (content) {
-            saveAs(content, zipname);
-          });
-          this.setState({ filesToDownload: [] });
-        }
-      }
-    }
-  }
-
-  componentWillUnmount() {
-    playerService.stop();
-  }
-
-  static getDerivedStateFromProps(props, state) {
-
-    // configID was changed via edit control
-    if (typeof props.widget.customProperties.configID !== "undefined"
-      && state.configID !== props.widget.customProperties.configID) {
-      let configID = props.widget.customProperties.configID
-      let config = props.configs.find(cfg => cfg.id === parseInt(configID, 10));
-      if (config) {
-        let playeric = props.ics.find(ic => ic.id === parseInt(config.icID, 10))
-        if (playeric) {
-          var afterCreateState = ''
-          if (playeric.state === 'idle') {
-            afterCreateState = transitionState(state.playerState, 'ICIDLE')
-          } else {
-            afterCreateState = transitionState(state.playerState, 'ICBUSY')
-          }
-          return {
-            configID: configID,
-            config: config,
-            startParameters: config.startParameters,
-            ic: playeric,
-            icState: playeric.state,
-            configBtnText: playeric.name,
-            uploadResults: props.widget.customProperties.uploadResults,
-            playerState: afterCreateState,
-            showWarning: false,
-            warningText: ''
-          };
-        }
-      }
-    }
-
-    // upload results was un-/checked via edit control
-    if (props.widget.customProperties.uploadResults !== state.uploadResults) {
-      return { uploadResults: props.widget.customProperties.uploadResults }
-    }
-
-    // IC state changed
-    if (state.ic && state.ic.state != state.icState) {
-      var newState;
-      switch (state.ic.state) {
-        case 'stopping': // if configured, show results
-          if (state.uploadResults) {
-            // AppDispatcher.dispatch({
-            //   type: 'results/start-load',
-            //   param: '?scenarioID=' + props.scenarioID,
-            //   token: state.sessionToken,
-            // })
-
-            // AppDispatcher.dispatch({
-            //   type: 'files/start-load',
-            //   token: state.sessionToken,
-            //   param: '?scenarioID=' + props.scenarioID,
-            // });
-          }
-          newState = transitionState(state.playerState, 'FINISH')
-          return { playerState: newState, icState: state.ic.state }
-        case 'idle':
-          newState = transitionState(state.playerState, 'ICIDLE')
-          return { playerState: newState, icState: state.ic.state }
-        default:
-          if (state.ic.state === 'running') {
-            props.onStarted()
-          }
-          newState = transitionState(state.playerState, 'ICBUSY')
-          return { playerState: newState, icState: state.ic.state }
-      }
-    }
-
-    return {};
-  }
-
-  clickStart() {
-    let config = this.state.config
-    config.startParameters = this.state.startParameters
-    // dispatch(sendActionToIC({token: sessionToken, id: id, actions: newAction}));
-
-    let newState = transitionState(this.state.playerState, 'START')
-    this.setState({ playerState: newState })
-  }
-
-  clickReset() {
-    //dispatch(sendActionToIC({token: sessionToken, id: id, actions: newAction}));
-  }
-
-  openPythonDialog() {
-    if (this.props.results.length <= this.state.resultArrayId) {
-      this.setState({ showWarning: true, warningText: 'no new result' });
-      return
-    }
-
-    this.setState({ pythonResultsModal: true })
-  }
-
-  downloadResultFiles() {
-    if (this.props.results.length <= this.state.resultArrayId) {
-      this.setState({ showWarning: true, warningText: 'no new result' });
-      return
-    }
-
-    let result = this.props.results[this.state.resultArrayId]
-    let toDownload = result.resultFileIDs;
-
-    if (toDownload.length <= 0) {
-      this.setState({ showWarning: true, warningText: 'no result files' });
-      return
-    }
-
-    toDownload.forEach(fileid => {
-      // AppDispatcher.dispatch({
-      //   type: 'files/start-download',
-      //   data: fileid,
-      //   token: this.state.sessionToken
-      // });
-    });
-
-    this.setState({ filesToDownload: toDownload });
-  }
-
-  render() {
-
-    const iconStyle = {
-      height: '20px',
-      width: '20px'
-    }
-
-    let configButton = {
-      height: '70px',
-      width: '120px',
-      fontSize: '13px'
-    }
-
-    return (
-      <div>
-        <div className="player">
-          <Container>
-            <Row className="justify-content-md-center">
-              <Col lg={{ span: 6 }}>
-                <span className='play-button'>
-                  <IconButton
-                    childKey={0}
-                    onClick={() => this.clickStart()}
-                    icon='play'
-                    disabled={(this.state.playerState && this.state.playerState.matches('startable')) ? false : true}
-                    iconStyle={iconStyle}
-                    tooltip='Start Component'
-                  />
-                </span>
-              </Col>
-              <Col lg={{ span: 6 }}>
-                <span className='play-button'>
-                  <IconButton
-                    childKey="0"
-                    onClick={() => this.clickReset()}
-                    icon='undo'
-                    iconStyle={iconStyle}
-                    tooltip='Reset Component'
-                  />
-                </span>
-              </Col>
-            </Row>
-
-            <Row className="justify-content-md-center">
-              <Col lg={12}>
-                <span className='config-button'>
-                  <IconTextButton
-                    className='play-button'
-                    onClick={() => this.setState(prevState => ({ showConfig: !prevState.showConfig }))}
-                    icon='cogs'
-                    text={this.state.configBtnText + ' '}
-                    buttonStyle={configButton}
-                    disabled={false}
-                    tooltip='Open/Close Component Configuration'
-                  />
-                </span>
-              </Col>
-            </Row>
-
-            {this.state.uploadResults ?
-              <div>
-                <p style={{ marginTop: '8px', marginBottom: '0px', textAlign: 'center' }}>Results</p>
-                <Row style={{ marginTop: '0px' }}>
-                  <Col lg={{ span: 6 }}>
-                    <span className='play-button'>
-                      <IconButton
-                        childKey={0}
-                        onClick={() => this.openPythonDialog()}
-                        icon={['fab', 'python']}
-                        disabled={(this.state.playerState && this.state.playerState.matches('finished')) ? false : true}
-                        iconStyle={iconStyle}
-                      />
-                    </span>
-                  </Col>
-                  <Col lg={{ span: 6 }}>
-                    <span className='play-button'>
-                      <IconButton
-                        childKey={1}
-                        onClick={() => this.downloadResultFiles()}
-                        icon='file-download'
-                        disabled={(this.state.playerState && this.state.playerState.matches('finished')) ? false : true}
-                        iconStyle={iconStyle}
-                      />
-                    </span>
-                  </Col>
-                </Row>
-              </div>
-              : <></>
-            }
-          </Container>
-
-
-        </div>
-        {this.state.showConfig && this.state.config ?
-          <div className="config-box">
-            <ParametersEditor
-              content={this.state.startParameters}
-              onChange={(data) => this.setState({ startParameters: data })}
-            /></div>
-          : <></>
-        }
-        {this.state.showWarning ?
-          <p>{this.state.warningText}</p> : <></>
-        }
-        {this.state.uploadResults ?
-          <ResultPythonDialog
-            show={this.state.pythonResultsModal}
-            files={this.props.files}
-            results={this.props.results}
-            resultId={this.state.resultArrayId}
-            onClose={() => this.setState({ pythonResultsModal: false })}
-          /> : <></>
-        }
-      </div>
-    );
-  }
-}
-
-export default WidgetPlayer;
diff --git a/src/pages/dashboards/widget/widgets/player.jsx b/src/pages/dashboards/widget/widgets/player.jsx
new file mode 100644
index 00000000..d257bb72
--- /dev/null
+++ b/src/pages/dashboards/widget/widgets/player.jsx
@@ -0,0 +1,445 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+import JSZip from "jszip";
+import React, { useState, useEffect } from "react";
+import { Container, Row, Col, Form } from "react-bootstrap";
+import { sendActionToIC, loadICbyId } from "../../../../store/icSlice";
+import { sessionToken } from "../../../../localStorage";
+import IconButton from "../../../../common/buttons/icon-button";
+import IconTextButton from "../../../../common/buttons/icon-text-button";
+import ParametersEditor from "../../../../common/parameters-editor";
+import ResultPythonDialog from "../../../scenarios/dialogs/result-python-dialog";
+import { playerMachine } from "../widget-player/player-machine";
+import { interpret } from "xstate";
+import {
+  useAddResultMutation,
+  useLazyDownloadFileQuery,
+  useGetResultsQuery,
+  useGetFilesQuery,
+  useUpdateComponentConfigMutation,
+} from "../../../../store/apiSlice";
+import notificationsDataManager from "../../../../common/data-managers/notifications-data-manager";
+import NotificationsFactory from "../../../../common/data-managers/notifications-factory";
+import { start } from "xstate/lib/actions";
+import FileSaver from "file-saver";
+import { useDispatch } from "react-redux";
+
+const WidgetPlayer = ({
+  widget,
+  editing,
+  configs,
+  onStarted,
+  ics,
+  results,
+  files,
+  scenarioID,
+}) => {
+  const dispatch = useDispatch();
+  const zip = new JSZip();
+  const [triggerDownloadFile] = useLazyDownloadFileQuery();
+  const { refetch: refetchResults } = useGetResultsQuery(scenarioID);
+  const [updateComponentConfig] = useUpdateComponentConfigMutation();
+  const { refetch: refetchFiles } = useGetFilesQuery(scenarioID);
+  const [addResult, { isError: isErrorAddingResult }] = useAddResultMutation();
+  const [playerState, setPlayerState] = useState(playerMachine.initialState);
+  const [configID, setConfigID] = useState(-1);
+  const [config, setConfig] = useState({});
+  const [icState, setICState] = useState("unknown");
+  const [startParameters, setStartParameters] = useState({});
+  const [playerIC, setPlayerIC] = useState({ name: "" });
+  const [showPythonModal, setShowPythonModal] = useState(false);
+  const [showConfig, setShowConfig] = useState(false);
+  const [isUploadResultsChecked, setIsUploadResultsChecked] = useState(
+    widget.customProperties.uploadResults
+  );
+  const [resultArrayId, setResultArrayId] = useState(0);
+  const [filesToDownload, setFilesToDownload] = useState([]);
+  const [showWarning, setShowWarning] = useState(false);
+  const [warningText, setWarningText] = useState("");
+  const [configBtnText, setConfigBtnText] = useState("Component Configuration");
+
+  const playerService = interpret(playerMachine);
+  playerService.start();
+  useEffect(() => {
+    setIsUploadResultsChecked(widget.customProperties.uploadResults);
+  }, [widget.customProperties.uploadResults]);
+
+  useEffect(() => {
+    if (playerIC.name.length !== 0) {
+      const refresh = async () => {
+        const res = await dispatch(
+          loadICbyId({ id: playerIC.id, token: sessionToken })
+        );
+        setICState(res.payload.state);
+      };
+      const timer = window.setInterval(() => refresh(), 1000);
+      return () => {
+        window.clearInterval(timer);
+      };
+    }
+  }, [playerIC]);
+
+  useEffect(() => {
+    if (
+      typeof widget.customProperties.configID !== "undefined" &&
+      configID !== widget.customProperties.configID
+    ) {
+      let configID = widget.customProperties.configID;
+      let config = configs.find((cfg) => cfg.id === parseInt(configID, 10));
+      if (config) {
+        let t_playeric = ics.find((ic) => ic.id === parseInt(config.icID, 10));
+        if (t_playeric) {
+          var afterCreateState = "";
+          if (t_playeric.state === "idle") {
+            afterCreateState = transitionState(playerState, "ICIDLE");
+          } else {
+            afterCreateState = transitionState(playerState, "ICBUSY");
+          }
+          setPlayerIC(t_playeric);
+          setConfigID(configID);
+          setPlayerState(afterCreateState);
+          setConfig(config);
+          setStartParameters(config.startParameters);
+        }
+      }
+    }
+  }, [configs, ics]);
+
+  useEffect(() => {
+    if (results && results.length != resultArrayId) {
+      setResultArrayId(results.length - 1);
+    }
+  }, [results]);
+
+  useEffect(() => {
+    var newState = "";
+    switch (icState) {
+      case "stopping": // if configured, show results
+        if (isUploadResultsChecked) {
+          refetchResults();
+          refetchFiles().then((v) => {
+            setFilesToDownload(v.data.files);
+          });
+        }
+        newState = transitionState(playerState, "FINISH");
+        setPlayerState(newState);
+        return { playerState: newState, icState: icState };
+      case "idle":
+        newState = transitionState(playerState, "ICIDLE");
+        setPlayerState(newState);
+        return { playerState: newState, icState: icState };
+      default:
+        if (icState === "running") {
+          onStarted();
+        }
+        newState = transitionState(playerState, "ICBUSY");
+        setPlayerState(newState);
+        return { playerState: newState, icState: icState };
+    }
+  }, [icState]);
+
+  const transitionState = (currentState, playerEvent) => {
+    return playerMachine.transition(currentState, { type: playerEvent });
+  };
+
+  const clickStart = async () => {
+    try {
+      setPlayerState(transitionState(playerState, "ICBUSY"));
+      let pld = {
+        action: "start",
+        when: Math.round(new Date().getTime() / 1000),
+        parameters: { ...startParameters },
+      };
+      if (isUploadResultsChecked) {
+        addResult({
+          result: {
+            scenarioID: scenarioID,
+          },
+        })
+          .then((v) => {
+            pld.results = {
+              url: `https://slew.k8s.eonerc.rwth-aachen.de/api/v2/results/${v.data.result.id}/file`,
+              type: "url",
+              token: sessionToken,
+            };
+            dispatch(
+              sendActionToIC({
+                token: sessionToken,
+                id: config.icID,
+                actions: [pld],
+              })
+            );
+          })
+          .catch((e) => {
+            notificationsDataManager.addNotification(
+              NotificationsFactory.LOAD_ERROR(e.toString())
+            );
+          });
+      } else {
+        dispatch(
+          sendActionToIC({
+            token: sessionToken,
+            id: config.icID,
+            actions: [pld],
+          })
+        );
+      }
+      //sendAction({ icid: startConfig.icID, action: "start", when: Math.round((new Date()).getTime() / 1000), parameters: {...startParameters } }).unwrap();
+    } catch (error) {
+      notificationsDataManager.addNotification(
+        NotificationsFactory.LOAD_ERROR(error?.data?.message)
+      );
+    }
+  };
+
+  const clickReset = async () => {
+    try {
+      dispatch(
+        sendActionToIC({
+          token: sessionToken,
+          id: config.icID,
+          actions: [
+            { action: "reset", when: Math.round(new Date().getTime() / 1000) },
+          ],
+        })
+      );
+      //sendAction({ icid: ic.id, action: "reset", when: Math.round((new Date()).getTime() / 1000), parameters: {...startParameters } }).unwrap();
+    } catch (error) {
+      notificationsDataManager.addNotification(
+        NotificationsFactory.LOAD_ERROR(error?.data?.message)
+      );
+      console.log(error);
+    }
+  };
+
+  const updateStartParameters = async (data) => {
+    let copy = structuredClone(config);
+    copy.startParameters = data;
+    if (copy.fileIDs === null) {
+      copy.fileIDs = [];
+    }
+
+    const newConf = { id: config.id, config: { config: copy } };
+    updateComponentConfig(newConf)
+      .then((v) => {
+        setStartParameters(data);
+        notificationsDataManager.addNotification(
+          NotificationsFactory.ACTION_INFO()
+        );
+      })
+      .catch((error) => {
+        notificationsDataManager.addNotification(
+          NotificationsFactory.UPDATE_ERROR(error?.data?.message)
+        );
+      });
+  };
+
+  const downloadResultFiles = () => {
+    if (results.length <= resultArrayId) {
+      setShowWarning(true);
+      setWarningText("no new result");
+      return;
+    }
+
+    const result = results[resultArrayId];
+    const toDownload = result.resultFileIDs;
+
+    if (toDownload.length <= 0) {
+      setShowWarning(true);
+      setWarningText("no result files");
+    } else {
+      toDownload.forEach((fileID) => handleDownloadFile(fileID));
+    }
+
+    setFilesToDownload(toDownload);
+  };
+
+  const handleDownloadFile = async (fileID) => {
+    triggerDownloadFile(fileID)
+      .then((v) => {
+        const file = filesToDownload.find((f) => f.id === fileID);
+        const blob = new Blob([v.data], { type: "application/octet-stream" });
+        zip.file(file.name, blob);
+        zip
+          .generateAsync({ type: "blob" })
+          .then((content) => {
+            FileSaver.saveAs(content, `result-${file.id}.zip`);
+          })
+          .catch((err) => {
+            notificationsDataManager.addNotification(
+              NotificationsFactory.UPDATE_ERROR("Failed to create ZIP archive")
+            );
+            console.error("Failed to create ZIP archive", err);
+          });
+      })
+      .catch((e) => {
+        notificationsDataManager.addNotification(
+          NotificationsFactory.UPDATE_ERROR(e)
+        );
+      });
+  };
+
+  const openPythonDialog = () => {
+    if (results.length <= resultArrayId) {
+      setShowWarning(true);
+      setWarningText("no new result");
+      return;
+    }
+
+    setShowPythonModal(true);
+  };
+
+  const iconStyle = {
+    height: "20px",
+    width: "20px",
+  };
+
+  const configButton = {
+    height: "70px",
+    width: "120px",
+    fontSize: "13px",
+  };
+
+  return (
+    <div>
+      <div className="player">
+        <Container>
+          <Row className="justify-content-md-center">
+            <Col lg={{ span: 6 }}>
+              <span className="play-button">
+                <IconButton
+                  childKey={0}
+                  onClick={() => clickStart()}
+                  icon="play"
+                  disabled={!(playerState && playerState.matches("startable"))}
+                  iconStyle={iconStyle}
+                  tooltip="Start Component"
+                />
+              </span>
+            </Col>
+            <Col lg={{ span: 6 }}>
+              <span className="play-button">
+                <IconButton
+                  childKey="0"
+                  onClick={() => clickReset()}
+                  icon="undo"
+                  iconStyle={iconStyle}
+                  tooltip="Reset Component"
+                />
+              </span>
+            </Col>
+          </Row>
+
+          <Row className="justify-content-md-center">
+            <Col lg={12}>
+              <span className="config-button">
+                <IconTextButton
+                  className="play-button"
+                  onClick={() => setShowConfig((prevState) => !prevState)}
+                  icon="cogs"
+                  text={configBtnText + " "}
+                  buttonStyle={configButton}
+                  disabled={false}
+                  tooltip="Open/Close Component Configuration"
+                />
+              </span>
+            </Col>
+          </Row>
+          <Row className="justify-content-md-center">
+            <Col lg="auto">
+              <Form.Group controlId="resultCheck">
+                <Form.Check
+                  type="checkbox"
+                  label="Results"
+                  checked={isUploadResultsChecked}
+                  onChange={() =>
+                    setIsUploadResultsChecked((prevState) => !prevState)
+                  }
+                />
+              </Form.Group>
+            </Col>
+          </Row>
+
+          {isUploadResultsChecked ? (
+            <div>
+              <Row style={{ marginTop: "0px" }}>
+                <Col lg={{ span: 6 }}>
+                  <span className="play-button">
+                    <IconButton
+                      childKey={0}
+                      onClick={() => openPythonDialog()}
+                      icon={["fab", "python"]}
+                      disabled={
+                        playerState &&
+                        playerState.matches("finished") &&
+                        isUploadResultsChecked
+                          ? false
+                          : true
+                      }
+                      iconStyle={iconStyle}
+                    />
+                  </span>
+                </Col>
+                <Col lg={{ span: 6 }}>
+                  <span className="play-button">
+                    <IconButton
+                      childKey={1}
+                      onClick={() => downloadResultFiles()}
+                      icon="file-download"
+                      disabled={
+                        playerState && playerState.matches("finished")
+                          ? false
+                          : true
+                      }
+                      iconStyle={iconStyle}
+                    />
+                  </span>
+                </Col>
+              </Row>
+            </div>
+          ) : (
+            <></>
+          )}
+        </Container>
+      </div>
+      {showConfig && config ? (
+        <div className="config-box">
+          <ParametersEditor
+            content={startParameters}
+            onChange={(data) => updateStartParameters(data)}
+          />
+        </div>
+      ) : (
+        <></>
+      )}
+      {showWarning ? <p>{warningText}</p> : <></>}
+      {isUploadResultsChecked ? (
+        <ResultPythonDialog
+          show={showPythonModal}
+          files={files}
+          results={results}
+          resultId={resultArrayId}
+          onClose={() => setShowPythonModal(false)}
+        />
+      ) : (
+        <></>
+      )}
+    </div>
+  );
+};
+
+export default WidgetPlayer;
diff --git a/src/pages/dashboards/widget/widgets/slider.jsx b/src/pages/dashboards/widget/widgets/slider.jsx
index 7c6a262f..1ef384fa 100644
--- a/src/pages/dashboards/widget/widgets/slider.jsx
+++ b/src/pages/dashboards/widget/widgets/slider.jsx
@@ -20,19 +20,18 @@ import { format } from "d3";
 import classNames from "classnames";
 import Slider from "rc-slider";
 import "rc-slider/assets/index.css";
+import { useUpdateWidgetMutation } from "../../../../store/apiSlice";
 
 const WidgetSlider = (props) => {
   const [value, setValue] = useState("");
   const [unit, setUnit] = useState("");
 
+  const [updateWidget] = useUpdateWidgetMutation();
+
   useEffect(() => {
     let widget = { ...props.widget };
     widget.customProperties.simStartedSendValue = false;
-    // AppDispatcher.dispatch({
-    //   type: "widgets/start-edit",
-    //   token: props.token,
-    //   data: widget,
-    // });
+    updateWidgetSimStatus(false);
   }, [props.token, props.widget]);
 
   useEffect(() => {
@@ -40,16 +39,31 @@ const WidgetSlider = (props) => {
     if (props.widget.customProperties.simStartedSendValue) {
       let widget = { ...props.widget };
       widget.customProperties.simStartedSendValue = false;
-      // AppDispatcher.dispatch({
-      //   type: "widgets/start-edit",
-      //   token: props.token,
-      //   data: widget,
-      // });
+      updateWidgetSimStatus(true);
 
       // Send value without changing widget
       props.onInputChanged(widget.customProperties.value, "", "", false);
     }
-  }, [props.token, props.widget, props.onInputChanged]);
+  }, [props.widget]);
+
+  const updateWidgetSimStatus = async (isSimStarted) => {
+    try {
+      await updateWidget({
+        widgetID: props.widget.id,
+        updatedWidget: {
+          widget: {
+            ...props.widget,
+            customProperties: {
+              ...props.widget.customProperties,
+              simStartedSendValue: isSimStarted,
+            },
+          },
+        },
+      }).unwrap();
+    } catch (err) {
+      console.log("error", err);
+    }
+  };
 
   useEffect(() => {
     let newValue = "";
@@ -109,7 +123,7 @@ const WidgetSlider = (props) => {
         disabled={props.editing}
         vertical={isVertical}
         onChange={valueIsChanging}
-        onAfterChange={(v) => valueChanged(v, true)}
+        onChangeComplete={(v) => valueChanged(v, true)}
       />
     ),
     value: (
diff --git a/src/pages/infrastructure/dialogs/new-ic-dialog.js b/src/pages/infrastructure/dialogs/new-ic-dialog.js
index a4380e74..fb9a5ebd 100644
--- a/src/pages/infrastructure/dialogs/new-ic-dialog.js
+++ b/src/pages/infrastructure/dialogs/new-ic-dialog.js
@@ -14,341 +14,461 @@
  * You should have received a copy of the GNU General Public License
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
-
-import React from 'react';
-import { Form as BForm, OverlayTrigger, Tooltip} from 'react-bootstrap';
-import Dialog from '../../../common/dialogs/dialog';
-import ParametersEditor from '../../../common/parameters-editor';
-import Form from "@rjsf/core";
-import $RefParser from '@apidevtools/json-schema-ref-parser';
-
-class NewICDialog extends React.Component {
-  valid = false;
-
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      name: '',
-      websocketurl: '',
-      apiurl: '',
-      uuid: '',
-      type: '',
-      category: '',
-      managedexternally: false,
-      description: '',
-      location: '',
-      manager: '',
-      properties: {},
-      schema: {},
-      formData: {},
-    };
-  }
-
-  onClose(canceled) {
-    if (canceled === false) {
-      if (this.valid) {
-        const parameters = {
-          name: this.state.name,
-          type: this.state.type,
-          category: this.state.category,
-          uuid: this.state.uuid,
-          location: this.state.location,
-          description: this.state.description,
-        }
-
-        const data = {
-          managedexternally: this.state.managedexternally,
-          manager: this.state.manager,
-          name: this.state.name,
-          type: this.state.type,
-          category: this.state.category,
-          uuid: this.state.uuid,
-          description: this.state.description,
-          location: this.state.location,
-          parameters: parameters
-        };
-
-        // Add custom properties
-        if (this.state.managedexternally)
-          Object.assign(parameters, this.state.properties);
-
-        if (this.state.websocketurl != null && this.state.websocketurl !== "") {
-          parameters.websocketurl = this.state.websocketurl;
-          data.websocketurl = this.state.websocketurl;
-        }
-
-        if (this.state.apiurl != null && this.state.apiurl !== "") {
-          parameters.apiurl = this.state.apiurl;
-          data.apiurl = this.state.apiurl;
-        }
-
-        this.props.onClose(data);
-        this.setState({managedexternally: false});
-      }
+import { useEffect, useState, useRef } from "react";
+import Dialog from "../../../common/dialogs/dialog";
+import { Form, OverlayTrigger, Dropdown, Tooltip } from "react-bootstrap";
+import timeAgo from "../../../utils/timeAgo";
+import uuidv4 from "../../../utils/uuidv4";
+import FormFromParameterSchema from "./new-ic-form-builder";
+
+/*
+  If user chooses to create new IC using manager, we a building a form from parameter schema 
+  provided by said manager. Otherwise, use the generic form.
+*/
+
+const NewICDiallog = ({ show, managers, onClose }) => {
+  const [isManagedExternally, setIsManagedExternally] = useState(false);
+  const [selectedManager, setSelectedManager] = useState(null);
+  //form data that is used by the non-manager form
+  const initialFormData = {
+    name: "",
+    location: "",
+    description: "",
+    uuid: uuidv4(),
+    location: "",
+    category: "",
+    type: "",
+    websocketURL: "",
+    apiURL: "",
+  };
+  const [formData, setFormData] = useState(initialFormData);
+  const [formErrors, setFormErrors] = useState({});
+
+  //each time use manager check is toggled we want to set a proper initial values
+  useEffect(() => {
+    if (isManagedExternally) {
+      setFormData((prevState) => ({
+        category: prevState.category,
+        type: prevState.type,
+      }));
+      setFormErrors({});
     } else {
-      this.props.onClose();
-      this.setState({managedexternally: false});
-    }
-  }
-
-  handleChange(e) {
-    if(e.target.id === "managedexternally"){
-      this.setState({ managedexternally : !this.state.managedexternally});
-    }
-    else{
-      this.setState({ [e.target.id]: e.target.value });
+      setFormData(initialFormData);
+      setSelectedManager(null);
+      setFormErrors({});
     }
-  }
-
-  setManager(e) {
-    this.setState({ [e.target.id]: e.target.value });
+  }, [isManagedExternally]);
+
+  const handleChange = ({ target }) => {
+    setFormData((prevState) => ({
+      ...prevState,
+      [target.id]: target.value,
+    }));
+    //clear errors when added new input
+    setFormErrors((prevErrors) => ({
+      ...prevErrors,
+      [target.id]: "",
+    }));
+  };
 
-    if (this.props.managers) {
-      let schema = this.props.managers.find(m => m.uuid === e.target.value).createparameterschema
-      if (schema) {
-        $RefParser.dereference(schema, (err, deref) => {
-          if (err) {
-            console.error(err)
-          }
-          else {
-            this.setState({schema: schema})
-          }
-        })
+  const handleClose = (c) => {
+    if (c) {
+      onClose(false);
+    } else {
+      if (validateForm()) {
+        const icData = {
+          data: { ...formData, ManagedExternally: isManagedExternally },
+          manager: selectedManager,
+        };
+        onClose(icData);
       }
     }
-  }
-
-  handlePropertiesChange = properties => {
-    this.setState({
-      properties: properties
-    });
   };
 
-  handleFormChange({formData}) {
-    this.setState({properties: formData, formData: formData})
-  }
-
-  resetState() {
-    this.setState({
-      name: '',
-      websocketurl: '',
-      apiurl: '',
-      uuid: this.uuidv4(),
-      type: '',
-      category: '',
-      managedexternally: false,
-      description: '',
-      location: '',
-      properties: {},
-    });
-  }
-
-  validateForm(target) {
-
-    if (this.state.managedexternally) {
-      this.valid = this.state.manager !== '';
-      return this.state.manager !== '' ? "success" : "error";
-    }
+  const onReset = () => {
+    setFormData(initialFormData);
+    setSelectedManager(null);
+  };
 
-    // check all controls
-    let name = true;
-    let uuid = true;
-    let type = true;
-    let category = true;
+  //ref for the form built by the manager's schema used to get its valdiation status
+  const managerFormRef = useRef();
 
-    if (this.state.name === '') {
-      name = false;
-    }
+  const validateForm = () => {
+    //we are validating type and category in both cases, but other validations will differ for generic and manager form
+    const errors = {};
 
-    if (this.state.uuid === '') {
-      uuid = false;
+    if (!formData.category.trim() || formData.category == "Select category") {
+      errors.category = "Category is required";
     }
-
-    if (this.state.type === '') {
-      type = false;
+    if (!formData.type.trim() || formData.category == "Select type") {
+      errors.type = "Type is required";
     }
 
-    if (this.state.category === '') {
-      category = false;
-    }
-
-    this.valid = name && uuid &&  type && category;
-
-    // return state to control
-    if (target === 'name') return name ? "success" : "error";
-    if (target === 'uuid') return uuid ? "success" : "error";
-    if (target === 'type') return type ? "success" : "error";
-    if (target === 'category') return category ? "success" : "error";
-
-    return this.valid;
-  }
-
-  uuidv4() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-      // eslint-disable-next-line
-      var r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8);
-      return v.toString(16);
-    });
-  }
+    if (isManagedExternally) {
+      //when no parameter schema is provided, there is nothing to verify
+      if (selectedManager.createparameterschema == null) {
+        return true;
+      }
+      const isManagerFormValid = managerFormRef.current.validateForm();
+      setFormErrors((prevState) => ({ ...errors, ...prevState }));
+      return Object.keys(errors).length === 0 && isManagerFormValid;
+    } else {
+      if (!formData.name.trim()) {
+        errors.name = "Name is required";
+      }
 
-  render() {
-    let typeOptions = [];
-    switch(this.state.category){
-      case "simulator":
-        typeOptions = ["dummy","generic","dpsim","rtlab","rscad","rtlab","kubernetes"];
-          break;
-      case "manager":
-        typeOptions = ["villas-node","villas-relay","generic","kubernetes"];
-        break;
-      case "gateway":
-        typeOptions = ["villas-node","villas-relay"];
-        break;
-      case "service":
-        typeOptions = ["ems","custom"];
-        break;
-      case "equipment":
-        typeOptions = ["chroma-emulator","chroma-loads","sma-sunnyboy","fleps","sonnenbatterie"];
-        break;
-      default:
-        typeOptions =[];
-    }
+      setFormErrors(errors);
 
-    let managerOptions = [];
-    managerOptions.push(<option key={-1} value={"Select manager"} defaultChecked={true}>Select manager</option>);
-    for (let m of this.props.managers) {
-      managerOptions.push (
-        <option key={m.id} value={m.uuid}>{m.name}</option>
-      );
+      return Object.keys(errors).length === 0;
     }
+  };
 
-    return (
-      <Dialog
-        show={this.props.show}
-        title="New Infrastructure Component"
-        buttonTitle="Add"
-        onClose={(c) => this.onClose(c)}
-        onReset={() => this.resetState()}
-        valid={this.validateForm()}
-      >
-        {this.props.managers.length > 0 ?
-          <BForm>
-            <BForm.Group controlId="managedexternally">
-              <OverlayTrigger key="-1" placement={'left'}
-                              overlay={<Tooltip id={`tooltip-${"me"}`}>An externally managed component is created and
-                                managed by an IC manager via AMQP</Tooltip>}>
-                <BForm.Check type={"checkbox"} label={"Use manager"} defaultChecked={this.state.managedexternally}
-                             onChange={e => this.handleChange(e)}>
-                </BForm.Check>
-              </OverlayTrigger>
-            </BForm.Group>
-          </BForm> : <></>
-        }
-        {this.state.managedexternally === true ?
-          <>
-
-          <BForm>
-            <BForm.Group controlId="manager" valid={this.validateForm('manager')}>
-              <OverlayTrigger key="0" placement={'right'} overlay={<Tooltip id={`tooltip-${"required"}`}> Required field </Tooltip>} >
-                <BForm.Label>Manager to create new IC *</BForm.Label>
-              </OverlayTrigger>
-              <BForm.Control as="select" value={this.state.manager} onChange={(e) => this.setManager(e)}>
-                {managerOptions}
-              </BForm.Control>
-            </BForm.Group>
-          </BForm>
-
-          {this.state.schema ?
-            <Form
-              schema={this.state.schema}
-              formData={this.state.properties}
-              id='jsonFormData'
-              onChange={({formData}) => this.handleFormChange({formData})}
-              children={true} // hides submit button
-            />
-          :
-            <BForm>
-              <BForm.Group controlId="properties">
-                <BForm.Label>Create Properties</BForm.Label>
-                  <ParametersEditor
-                    content={this.state.properties}
-                    onChange={(data) => this.handlePropertiesChange(data)}
+  return (
+    <Dialog
+      show={show}
+      title="New Infrastructure Component"
+      buttonTitle="Add"
+      onClose={(c) => handleClose(c)}
+      onReset={() => onReset()}
+      valid={
+        !Object.values(formErrors).some(
+          (error) => error && error.trim() !== ""
+        ) ||
+        (selectedManager && selectedManager.createparameterschema == null)
+      }
+    >
+      <Form>
+        <Form.Check
+          type={"checkbox"}
+          label={"Use manager"}
+          defaultChecked={false}
+          onChange={(e) => setIsManagedExternally((prevState) => !prevState)}
+        ></Form.Check>
+      </Form>
+
+      {
+        //if its managed externally, then select a manager and build a form according to the schema of the manager,
+        //use the generic form otherwise
+        isManagedExternally ? (
+          <div>
+            <Form.Group controlId="manager">
+              <Dropdown
+                onSelect={(eventKey) =>
+                  setSelectedManager(managers.find((m) => m.id == eventKey))
+                }
+              >
+                <Dropdown.Toggle
+                  variant="light"
+                  id="dropdown-basic"
+                  style={{ width: "100%", textAlign: "left" }}
+                >
+                  {selectedManager == null
+                    ? "Select a manager"
+                    : selectedManager.name + " " + selectedManager.id}
+                </Dropdown.Toggle>
+
+                <Dropdown.Menu style={{ width: "100%" }}>
+                  {managers.map((manager) => (
+                    <Dropdown.Item
+                      key={manager.id}
+                      eventKey={manager.id}
+                      as="div"
+                      style={{
+                        display: "flex",
+                        justifyContent: "space-between",
+                      }}
+                    >
+                      <span style={{ color: "black" }}>
+                        {manager.name + " " + manager.id}
+                      </span>
+                      <span style={{ color: "grey" }}>
+                        {"created " + timeAgo(manager.createdAt)}
+                      </span>
+                    </Dropdown.Item>
+                  ))}
+                </Dropdown.Menu>
+              </Dropdown>
+              {selectedManager == null ||
+              selectedManager?.createparameterschema == null ? (
+                <></>
+              ) : (
+                <>
+                  <FormFromParameterSchema
+                    ref={managerFormRef}
+                    createparameterschema={
+                      selectedManager.createparameterschema
+                    }
+                    setParentFormData={setFormData}
+                    setParentFormErrors={setFormErrors}
                   />
-              </BForm.Group>
-            </BForm>
-        }
-          </>
-        :
-          <BForm>
-            <BForm.Group controlId="name" valid={this.validateForm('name')}>
-              <OverlayTrigger key="1" placement={'right'} overlay={<Tooltip id={`tooltip-${"required"}`}> Required field </Tooltip>} >
-                <BForm.Label>Name *</BForm.Label>
+                  <Form.Group controlId="category" className="mt-2">
+                    <OverlayTrigger
+                      key="2"
+                      placement={"right"}
+                      overlay={
+                        <Tooltip id={`tooltip-${"required"}`}>
+                          {" "}
+                          Required field{" "}
+                        </Tooltip>
+                      }
+                    >
+                      <Form.Label>Category of component *</Form.Label>
+                    </OverlayTrigger>
+                    <Form.Control
+                      as="select"
+                      isInvalid={!!formErrors.category}
+                      value={formData.category}
+                      onChange={(e) => handleChange(e)}
+                    >
+                      {
+                        /*
+                      this is done for the case, when createparameterschema, like the one from generic manager (which this check is created for), has its own type and category property
+                      otherwise it would lead to a crash, since selects have predifined properties for the category and type, while manager's form utilizes textfileds which allows any input, which
+                      can be different from the pre-defined options
+                      */
+                        formData.category == "" ||
+                        typeOptionsMap[formData.category] ? (
+                          <>
+                            <option default>Select category</option>
+                            <option value="simulator">Simulator</option>
+                            <option value="service">Service</option>
+                            <option value="gateway">Gateway</option>
+                            <option value="equipment">Equipment</option>
+                            <option value="manager">Manager</option>
+                          </>
+                        ) : (
+                          <option default>{formData.category}</option>
+                        )
+                      }
+                    </Form.Control>
+                    <Form.Control.Feedback type="invalid">
+                      {formErrors.category}
+                    </Form.Control.Feedback>
+                  </Form.Group>
+
+                  <Form.Group controlId="type" className="mt-2">
+                    <OverlayTrigger
+                      key="3"
+                      placement={"right"}
+                      overlay={
+                        <Tooltip id={`tooltip-${"required"}`}>
+                          {" "}
+                          Required field{" "}
+                        </Tooltip>
+                      }
+                    >
+                      <Form.Label>Type of component *</Form.Label>
+                    </OverlayTrigger>
+                    <Form.Control
+                      as="select"
+                      isInvalid={!!formErrors.type}
+                      value={formData.type}
+                      disabled={formData.category == ""}
+                      onChange={(e) => handleChange(e)}
+                    >
+                      <option default>Select type</option>
+                      {
+                        /*
+                      this is done for the case, when createparameterschema, like the one from generic manager (which this check is created for), has its own type and category property
+                      otherwise it would lead to a crash, since selects have predifined properties for the category and type, while manager's form utilizes textfileds which allows any input, which
+                      can be different from the pre-defined options
+                      */
+                        formData.category == "" ? (
+                          <></>
+                        ) : formData.category == "" ||
+                          typeOptionsMap[formData.category] ? (
+                          typeOptionsMap[formData.category].map(
+                            (name, index) => <option key={index}>{name}</option>
+                          )
+                        ) : (
+                          <option key={formData.type}>{formData.type}</option>
+                        )
+                      }
+                    </Form.Control>
+                    <Form.Control.Feedback type="invalid">
+                      {formErrors.type}
+                    </Form.Control.Feedback>
+                  </Form.Group>
+                </>
+              )}
+            </Form.Group>
+          </div>
+        ) : (
+          //the generic form
+          <Form>
+            <Form.Group controlId="name">
+              <OverlayTrigger
+                key="1"
+                placement={"right"}
+                overlay={
+                  <Tooltip id={`tooltip-${"required"}`}>
+                    {" "}
+                    Required field{" "}
+                  </Tooltip>
+                }
+              >
+                <Form.Label>Name *</Form.Label>
               </OverlayTrigger>
-              <BForm.Control type="text" placeholder="Enter name" value={this.state.name} onChange={(e) => this.handleChange(e)} />
-              <BForm.Control.Feedback />
-            </BForm.Group>
-
-            <BForm.Group controlId="uuid" valid={this.validateForm('uuid')}>
-              <BForm.Label>UUID</BForm.Label>
-              <BForm.Control type="text" placeholder="Enter uuid" value={this.state.uuid}
-                onChange={(e) => this.handleChange(e)}/>
-              <BForm.Control.Feedback/>
-            </BForm.Group>
-
-            <BForm.Group controlId="location">
-              <BForm.Label>Location</BForm.Label>
-              <BForm.Control type="text" placeholder="Enter Location" value={this.state.location} onChange={(e) => this.handleChange(e)} />
-              <BForm.Control.Feedback />
-            </BForm.Group>
-
-            <BForm.Group controlId="description">
-              <BForm.Label>Description</BForm.Label>
-              <BForm.Control type="text" placeholder="Enter Description" value={this.state.description} onChange={(e) => this.handleChange(e)} />
-              <BForm.Control.Feedback />
-            </BForm.Group>
-
-            <BForm.Group controlId="category" valid={this.validateForm('category')}>
-              <OverlayTrigger key="2" placement={'right'} overlay={<Tooltip id={`tooltip-${"required"}`}> Required field </Tooltip>} >
-                <BForm.Label>Category of component *</BForm.Label>
+              <Form.Control
+                isInvalid={!!formErrors.name}
+                type="text"
+                placeholder="Enter name"
+                value={formData.name}
+                onChange={(e) => handleChange(e)}
+              />
+
+              <Form.Control.Feedback type="invalid">
+                {formErrors.name}
+              </Form.Control.Feedback>
+            </Form.Group>
+
+            <Form.Group controlId="uuid">
+              <Form.Label>UUID</Form.Label>
+              <Form.Control
+                type="text"
+                placeholder="Enter uuid"
+                value={formData.uuid}
+                onChange={(e) => handleChange(e)}
+              />
+              <Form.Control.Feedback />
+            </Form.Group>
+
+            <Form.Group controlId="location">
+              <Form.Label>Location</Form.Label>
+              <Form.Control
+                type="text"
+                placeholder="Enter Location"
+                value={formData.location}
+                onChange={(e) => handleChange(e)}
+              />
+              <Form.Control.Feedback />
+            </Form.Group>
+
+            <Form.Group controlId="description">
+              <Form.Label>Description</Form.Label>
+              <Form.Control
+                type="text"
+                placeholder="Enter Description"
+                value={formData.description}
+                onChange={(e) => handleChange(e)}
+              />
+              <Form.Control.Feedback />
+            </Form.Group>
+
+            <Form.Group controlId="category">
+              <OverlayTrigger
+                key="2"
+                placement={"right"}
+                overlay={
+                  <Tooltip id={`tooltip-${"required"}`}>
+                    {" "}
+                    Required field{" "}
+                  </Tooltip>
+                }
+              >
+                <Form.Label>Category of component *</Form.Label>
               </OverlayTrigger>
-              <BForm.Control as="select" value={this.state.category} onChange={(e) => this.handleChange(e)}>
+              <Form.Control
+                as="select"
+                value={formData.category}
+                onChange={(e) => handleChange(e)}
+                isInvalid={!!formErrors.category}
+              >
                 <option default>Select category</option>
                 <option value="simulator">Simulator</option>
                 <option value="service">Service</option>
                 <option value="gateway">Gateway</option>
                 <option value="equipment">Equipment</option>
                 <option value="manager">Manager</option>
-              </BForm.Control>
-            </BForm.Group>
-
-            <BForm.Group controlId="type" valid={this.validateForm('type')}>
-              <OverlayTrigger key="3" placement={'right'} overlay={<Tooltip id={`tooltip-${"required"}`}> Required field </Tooltip>} >
-                <BForm.Label>Type of component *</BForm.Label>
-             </OverlayTrigger>
-              <BForm.Control as="select" value={this.state.type} onChange={(e) => this.handleChange(e)}>
+              </Form.Control>
+              <Form.Control.Feedback type="invalid">
+                {formErrors.category}
+              </Form.Control.Feedback>
+            </Form.Group>
+
+            <Form.Group controlId="type">
+              <OverlayTrigger
+                key="3"
+                placement={"right"}
+                overlay={
+                  <Tooltip id={`tooltip-${"required"}`}>
+                    {" "}
+                    Required field{" "}
+                  </Tooltip>
+                }
+              >
+                <Form.Label>Type of component *</Form.Label>
+              </OverlayTrigger>
+              <Form.Control
+                as="select"
+                value={formData.type}
+                disabled={formData.category == ""}
+                onChange={(e) => handleChange(e)}
+                isInvalid={!!formErrors.type}
+              >
                 <option default>Select type</option>
-                  {typeOptions.map((name,index) => (
-                     <option key={index}>{name}</option>
-                  ))}
-              </BForm.Control>
-            </BForm.Group>
-
-            <BForm.Group controlId="websocketurl">
-              <BForm.Label>Websocket URL</BForm.Label>
-              <BForm.Control type="text" placeholder="https://" value={this.state.websocketurl} onChange={(e) => this.handleChange(e)} />
-              <BForm.Control.Feedback />
-            </BForm.Group>
-
-            <BForm.Group controlId="apiurl">
-              <BForm.Label>API URL</BForm.Label>
-              <BForm.Control type="text" placeholder="https://" value={this.state.apiurl} onChange={(e) => this.handleChange(e)} />
-              <BForm.Control.Feedback />
-            </BForm.Group>
-          </BForm>
-        }
-      </Dialog>
-    );
-  }
-}
-
-export default NewICDialog;
+                {formData.category == "" ? (
+                  <></>
+                ) : (
+                  typeOptionsMap[formData.category].map((name, index) => (
+                    <option key={index}>{name}</option>
+                  ))
+                )}
+              </Form.Control>
+              <Form.Control.Feedback type="invalid">
+                {formErrors.type}
+              </Form.Control.Feedback>
+            </Form.Group>
+
+            <Form.Group controlId="websocketURL">
+              <Form.Label>Websocket URL</Form.Label>
+              <Form.Control
+                type="text"
+                placeholder="https://"
+                value={formData.websocketURL}
+                onChange={(e) => handleChange(e)}
+              />
+              <Form.Control.Feedback />
+            </Form.Group>
+
+            <Form.Group controlId="apiURL">
+              <Form.Label>API URL</Form.Label>
+              <Form.Control
+                type="text"
+                placeholder="https://"
+                value={formData.apiURL}
+                onChange={(e) => handleChange(e)}
+              />
+              <Form.Control.Feedback />
+            </Form.Group>
+          </Form>
+        )
+      }
+    </Dialog>
+  );
+};
+
+//a map of available parameter types accoding to the picked category
+const typeOptionsMap = {
+  simulator: [
+    "dummy",
+    "generic",
+    "dpsim",
+    "rtlab",
+    "rscad",
+    "rtlab",
+    "kubernetes",
+  ],
+  manager: ["villas-node", "villas-relay", "generic", "kubernetes"],
+  gateway: ["villas-node", "villas-relay"],
+  service: ["ems", "custom"],
+  equipment: [
+    "chroma-emulator",
+    "chroma-loads",
+    "sma-sunnyboy",
+    "fleps",
+    "sonnenbatterie",
+  ],
+};
+
+export default NewICDiallog;
diff --git a/src/pages/infrastructure/dialogs/new-ic-form-builder.js b/src/pages/infrastructure/dialogs/new-ic-form-builder.js
new file mode 100644
index 00000000..7dade28a
--- /dev/null
+++ b/src/pages/infrastructure/dialogs/new-ic-form-builder.js
@@ -0,0 +1,148 @@
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import React, {
+  useEffect,
+  useState,
+  useImperativeHandle,
+  forwardRef,
+} from "react";
+import { Form, OverlayTrigger, Dropdown, Tooltip } from "react-bootstrap";
+
+//Builds a form using a schema from IC Manager
+//ref is for the new ic modal to validate the whole together
+const FormFromParameterSchema = forwardRef(
+  ({ createparameterschema, setParentFormData, setParentFormErrors }, ref) => {
+    if (!createparameterschema) return null;
+
+    const [formData, setFormData] = useState({});
+    const [formErrors, setFormErrors] = useState({});
+
+    //After initialization we want to set the initial values for the generated form
+    useEffect(() => {
+      if (createparameterschema !== null && createparameterschema.properties) {
+        Object.entries(createparameterschema.properties).forEach(
+          ([key, property]) => {
+            setFormData((prevState) => ({
+              ...prevState,
+              [key]: property?.default || "",
+            }));
+            setParentFormData((prevState) => ({
+              ...prevState,
+              [key]: property?.default || "",
+            }));
+          }
+        );
+      }
+    }, [createparameterschema]);
+
+    const handleChange = ({ target }) => {
+      const { id, value, type, checked } = target;
+      setFormData((prevState) => ({
+        ...prevState,
+        [id]: type === "checkbox" ? checked : value,
+      }));
+      setFormErrors((prevState) => ({
+        ...prevState,
+        [id]: "",
+      }));
+      setParentFormData((prevState) => ({
+        ...prevState,
+        [id]: type === "checkbox" ? checked : value,
+      }));
+      setParentFormErrors((prevState) => ({
+        ...prevState,
+        [id]: "",
+      }));
+    };
+
+    //schema has an array of required fields
+    const validateForm = () => {
+      const errors = {};
+      createparameterschema.required?.forEach((key) => {
+        if (!formData[key]) {
+          errors[key] = "This field is required";
+        }
+      });
+
+      setFormErrors(errors);
+      setParentFormErrors(errors);
+      return Object.keys(errors).length === 0;
+    };
+
+    //this is for new ic modal to call when handling submition
+    useImperativeHandle(ref, () => ({
+      validateForm,
+    }));
+
+    return (
+      <div>
+        <h2 className="mt-3">{createparameterschema.title || ""}</h2>
+        {Object.entries(createparameterschema.properties).map(
+          ([key, property]) => {
+            const isRequired = createparameterschema.required?.includes(key);
+            //filter the type and category fields as they are always in the parent form
+
+            console.log("ADDING FIELD WITH KEY", key);
+
+            if (key != "type" && key != "category") {
+              //right now only text field and checkbox are supported. Text field is default
+              return property.type != "boolean" ? (
+                <Form.Group key={key} controlId={key}>
+                  {isRequired ? (
+                    <OverlayTrigger
+                      placement="right"
+                      overlay={<Tooltip>Required field</Tooltip>}
+                    >
+                      <Form.Label>{property.title} *</Form.Label>
+                    </OverlayTrigger>
+                  ) : (
+                    <Form.Label>{property.title}</Form.Label>
+                  )}
+                  <Form.Control
+                    isInvalid={!!formErrors[key]}
+                    type={"text"}
+                    placeholder={"Enter " + property.title}
+                    value={formData[key] || ""}
+                    onChange={(e) => handleChange(e)}
+                  />
+                  {isRequired ? (
+                    <Form.Control.Feedback type="invalid">
+                      {formErrors[key]}
+                    </Form.Control.Feedback>
+                  ) : (
+                    <></>
+                  )}
+                </Form.Group>
+              ) : (
+                <Form.Check
+                  type={"checkbox"}
+                  label={property.title}
+                  defaultChecked={false}
+                  id={key}
+                  onChange={(e) => handleChange(e)}
+                ></Form.Check>
+              );
+            }
+          }
+        )}
+      </div>
+    );
+  }
+);
+
+export default FormFromParameterSchema;
diff --git a/src/pages/infrastructure/ic-action-board.js b/src/pages/infrastructure/ic-action-board.js
index 6e904645..446d2479 100644
--- a/src/pages/infrastructure/ic-action-board.js
+++ b/src/pages/infrastructure/ic-action-board.js
@@ -19,13 +19,13 @@ import { Form, Row, Col } from 'react-bootstrap';
 import DateTimePicker from 'react-datetime-picker';
 import ActionBoardButtonGroup from '../../common/buttons/action-board-button-group';
 import classNames from 'classnames';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { sessionToken } from '../../localStorage';
-import { clearCheckedICs, deleteIC, sendActionToIC } from '../../store/icSlice';
+import { clearCheckedICs, deleteIC, loadICbyId, sendActionToIC } from '../../store/icSlice';
 import { useGetICSQuery } from '../../store/apiSlice';
 
-const ICActionBoard = (props) => {
+const ICActionBoard = ({externalICs}) => {
   const dispatch = useDispatch();
   const {refetch: refetchICs} = useGetICSQuery();
   const checkedICsIds = useSelector(state => state.infrastructure.checkedICsIds);
@@ -45,14 +45,25 @@ const ICActionBoard = (props) => {
     });
   }
 
-  const onRecreate = () => {
+  const onRecreate =() => {
     let newAction = {};
     newAction['action'] = 'create';
     newAction['when'] = time;
-
-    checkedICsIds.forEach((id) => {
-      dispatch(sendActionToIC({token: sessionToken, id: id, actions: newAction}));
-    });
+    for (let checkedIC of checkedICsIds){
+      let IC = externalICs.find(e=>{
+        return e.id == checkedIC
+      })
+      if(IC){
+        let manager = externalICs.find(e=>{
+          return e.uuid == IC.manager
+        })
+        if(manager){
+          newAction['parameters'] = IC.properties ? IC.properties : IC.statusupdateraw.properties
+          dispatch(sendActionToIC({token:sessionToken,id:manager.id,actions:newAction}))
+        }
+        
+      }
+    }
   }
 
   const onDelete = () => {
@@ -90,7 +101,6 @@ const ICActionBoard = (props) => {
           <ActionBoardButtonGroup
             disabled={checkedICsIds.length == 0}
             onReset={() => onReset()}
-            onShutdown={() => onShutdown()}
             onDelete={() => onDelete()}
             onRecreate={() => onRecreate()}
             paused={false}
diff --git a/src/pages/infrastructure/ic-pages/kubernetes-ic-page.js b/src/pages/infrastructure/ic-pages/kubernetes-ic-page.js
index 96e7b1ea..0180755b 100644
--- a/src/pages/infrastructure/ic-pages/kubernetes-ic-page.js
+++ b/src/pages/infrastructure/ic-pages/kubernetes-ic-page.js
@@ -15,7 +15,7 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import { Col, Row } from "react-bootstrap";
+import { Col, Row, Table} from "react-bootstrap";
 import IconButton from "../../../common/buttons/icon-button";
 import RawDataTable from "../../../common/rawDataTable";
 import { useDispatch, useSelector } from "react-redux";
diff --git a/src/pages/infrastructure/infrastructure.js b/src/pages/infrastructure/infrastructure.js
index 0c221681..03ee44eb 100644
--- a/src/pages/infrastructure/infrastructure.js
+++ b/src/pages/infrastructure/infrastructure.js
@@ -15,175 +15,181 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import { useEffect, useState } from "react"
+import { useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { addIC, sendActionToIC, closeDeleteModal, closeEditModal, editIC, deleteIC } from "../../store/icSlice";
+import {
+  addIC,
+  sendActionToIC,
+  closeDeleteModal,
+  closeEditModal,
+  editIC,
+  deleteIC,
+} from "../../store/icSlice";
 import IconButton from "../../common/buttons/icon-button";
 import ICCategoryTable from "./ic-category-table";
 import ICActionBoard from "./ic-action-board";
 import { buttonStyle, iconStyle } from "./styles";
-import NewICDialog from "./dialogs/new-ic-dialog";
 import ImportICDialog from "./dialogs/import-ic-dialog";
 import EditICDialog from "./dialogs/edit-ic-dialog";
 import DeleteDialog from "../../common/dialogs/delete-dialog";
-import NotificationsDataManager from "../../common/data-managers/notifications-data-manager";
-import NotificationsFactory from "../../common/data-managers/notifications-factory";
-import {useGetICSQuery} from '../../store/apiSlice';
+import { useGetICSQuery } from "../../store/apiSlice";
+import NewICDiallog from "./dialogs/new-ic-dialog";
 
 const Infrastructure = () => {
-    const dispatch = useDispatch();
+  const dispatch = useDispatch();
 
-    const { user: currentUser, token: sessionToken } = useSelector((state) => state.auth);
+  const { user: currentUser, token: sessionToken } = useSelector(
+    (state) => state.auth
+  );
 
-    const {data: icsRes, isLoading, refetch: refetchICs} = useGetICSQuery();
-    const ics = icsRes ? icsRes.ics : [];
+  const { data: icsRes, isLoading, refetch: refetchICs } = useGetICSQuery();
+  const ics = icsRes ? icsRes.ics : [];
 
-    const externalICs = ics.filter(ic => ic.managedexternally === true);
+  const externalICs = ics.filter((ic) => ic.managedexternally === true);
 
-    //track status of the modals
-    const [isNewModalOpened, setIsNewModalOpened] = useState(false);
-    const [isImportModalOpened, setIsImportModalOpened] = useState(false);
-    const [isICModalOpened, setIsICModalOpened] = useState(false);
-    const [checkedICs, setCheckedICs] = useState([]);
-    
-    useEffect(() => {
-        //start a timer for periodic refresh
-        let timer = window.setInterval(() => refetchICs(), 10000);
+  //track status of the modals
+  const [isNewModalOpened, setIsNewModalOpened] = useState(false);
+  const [isImportModalOpened, setIsImportModalOpened] = useState(false);
+  const [isICModalOpened, setIsICModalOpened] = useState(false);
+  const [checkedICs, setCheckedICs] = useState([]);
 
-        return () => {
-            window.clearInterval(timer);
-        }
-    }, []);
-
-    //modal actions and selectors
-
-    const isEditModalOpened = useSelector(state => state.infrastructure.isEditModalOpened);
-    const isDeleteModalOpened = useSelector(state => state.infrastructure.isDeleteModalOpened);
-    const editModalIC = useSelector(state => state.infrastructure.editModalIC);
-    const deleteModalIC = useSelector(state => state.infrastructure.deleteModalIC);
-
-    const onNewModalClose = (data) => {
-        setIsNewModalOpened(false);
-
-        console.log("Adding ic. External: ", !data.managedexternally)
-
-        if(data){
-            if(!data.managedexternally){
-                dispatch(addIC({token: sessionToken, ic: data}))
-            }else {
-                // externally managed IC: dispatch create action to selected manager
-                let newAction = {};
-        
-                newAction["action"] = "create";
-                newAction["parameters"] = data.parameters;
-                newAction["when"] = new Date();
-        
-                // find the manager IC
-                const managerIC = ics.find(ic => ic.uuid === data.manager)
-                if (managerIC === null || managerIC === undefined) {
-                  NotificationsDataManager.addNotification(NotificationsFactory.ADD_ERROR("Could not find manager IC with UUID " + data.manager));
-                  return;
-                }
-
-                dispatch(sendActionToIC({token: sessionToken, id: managerIC.id, actions: newAction}))
-            }
-        }
-    }
+  useEffect(() => {
+    //start a timer for periodic refresh
+    let timer = window.setInterval(() => refetchICs(), 10000);
 
-    const onImportModalClose = (data) => {
-        setIsImportModalOpened(false);
+    return () => {
+      window.clearInterval(timer);
+    };
+  }, []);
 
-        dispatch(addIC({token: sessionToken, ic: data}))
-    }
+  //modal actions and selectors
+
+  const isEditModalOpened = useSelector(
+    (state) => state.infrastructure.isEditModalOpened
+  );
+  const isDeleteModalOpened = useSelector(
+    (state) => state.infrastructure.isDeleteModalOpened
+  );
+  const editModalIC = useSelector((state) => state.infrastructure.editModalIC);
+  const deleteModalIC = useSelector(
+    (state) => state.infrastructure.deleteModalIC
+  );
+
+  const onNewModalClose = (formInput) => {
+    setIsNewModalOpened(false);
+
+    if (formInput) {
+      const { data, manager } = formInput;
 
-    const onEditModalClose = (data) => {
-        if(data){
-            //some changes where done
-            dispatch(editIC({token: sessionToken, ic: data}))
+      let newAction = { action: "create", when: new Date() };
+
+      if (manager !== null) {
+        if (manager.createparameterschema) {
+          newAction.parameters = data;
         }
-        dispatch(closeEditModal(data));
+
+        dispatch(
+          sendActionToIC({
+            token: sessionToken,
+            id: manager.id,
+            actions: newAction,
+          })
+        );
+      } else {
+        dispatch(addIC({ token: sessionToken, ic: data }));
+      }
     }
 
-    const onCloseDeleteModal = (isDeleteConfirmed) => {
-        if(isDeleteConfirmed){
-            dispatch(deleteIC({token: sessionToken, id:deleteModalIC.id}))
-        }
-        dispatch(closeDeleteModal());
+    refetchICs();
+  };
+
+  const onImportModalClose = (data) => {
+    setIsImportModalOpened(false);
+
+    dispatch(addIC({ token: sessionToken, ic: data }));
+  };
+
+  const onEditModalClose = (data) => {
+    if (data) {
+      //some changes where done
+      dispatch(editIC({ token: sessionToken, ic: data }));
     }
+    dispatch(closeEditModal(data));
+  };
 
-    //getting list of managers for the new IC modal
-    const managers = ics.filter(ic => ic.category === "manager");
-    return (
-        <div>
-            <div className='section'>
-                <h1>Infrastructure
-                    {currentUser.role === "Admin" ?
-                        <span className='icon-button'>
-                            <IconButton
-                                childKey={1}
-                                tooltip='Add Infrastructure Component'
-                                onClick={() => setIsNewModalOpened(true)}
-                                icon='plus'
-                                buttonStyle={buttonStyle}
-                                iconStyle={iconStyle}
-                            />
-                            <IconButton
-                                childKey={1}
-                                tooltip='Import Infrastructure Component'
-                                onClick={() => setIsImportModalOpened(true)}
-                                icon='upload'
-                                buttonStyle={buttonStyle}
-                                iconStyle={iconStyle}
-                            />
-                        </span>
-                        : 
-                        <span />}
-                </h1>
-
-                <ICCategoryTable
-                    title={"IC Managers"}
-                    category={"manager"}
-                />
-
-                <ICCategoryTable
-                    title={"Simulators"}
-                    category={"simulator"} 
-                />
-
-                <ICCategoryTable 
-                    title={"Gateways"}
-                    category={"gateway"} 
-                />
-
-                <ICCategoryTable 
-                    title={"Services"}
-                    category={"service"} 
-                />
-
-                <ICCategoryTable 
-                    title={"Equipment"}
-                    category={"equipment"} 
-                />
-
-                {currentUser.role === "Admin" ? <ICActionBoard /> : null}
-
-            </div>
-
-            <NewICDialog show={isNewModalOpened} onClose={data => onNewModalClose(data)} managers={managers} />
-            <ImportICDialog show={isImportModalOpened} onClose={data => onImportModalClose(data)} />
-            <EditICDialog 
-                show={isEditModalOpened} 
-                onClose={data => onEditModalClose(data)} 
-                ic={editModalIC ? editModalIC : {}} 
-            />
-            <DeleteDialog 
-                title="infrastructure-component" 
-                name={deleteModalIC ? deleteModalIC.name : 'Unknown'} 
-                show={isDeleteModalOpened} 
-                onClose={(e) => onCloseDeleteModal(e)} 
-            />
-        </div>
-      );
-}
+  const onCloseDeleteModal = (isDeleteConfirmed) => {
+    if (isDeleteConfirmed) {
+      dispatch(deleteIC({ token: sessionToken, id: deleteModalIC.id }));
+    }
+    dispatch(closeDeleteModal());
+  };
+
+  //getting list of managers for the new IC modal
+  const managers = ics.filter((ic) => ic.category === "manager");
+
+  return (
+    <div>
+      <div className="section">
+        <h1>
+          Infrastructure
+          {currentUser.role === "Admin" ? (
+            <span className="icon-button">
+              <IconButton
+                childKey={1}
+                tooltip="Add Infrastructure Component"
+                onClick={() => setIsNewModalOpened(true)}
+                icon="plus"
+                buttonStyle={buttonStyle}
+                iconStyle={iconStyle}
+              />
+              <IconButton
+                childKey={1}
+                tooltip="Import Infrastructure Component"
+                onClick={() => setIsImportModalOpened(true)}
+                icon="upload"
+                buttonStyle={buttonStyle}
+                iconStyle={iconStyle}
+              />
+            </span>
+          ) : (
+            <span />
+          )}
+        </h1>
+
+        <ICCategoryTable title={"IC Managers"} category={"manager"} />
+
+        <ICCategoryTable title={"Simulators"} category={"simulator"} />
+
+        <ICCategoryTable title={"Gateways"} category={"gateway"} />
+
+        <ICCategoryTable title={"Services"} category={"service"} />
+
+        <ICCategoryTable title={"Equipment"} category={"equipment"} />
+
+        {currentUser.role === "Admin" ? <ICActionBoard externalICs={externalICs}/> : null}
+      </div>
+      <NewICDiallog
+        show={isNewModalOpened}
+        managers={managers}
+        onClose={(data) => onNewModalClose(data)}
+      />
+      <ImportICDialog
+        show={isImportModalOpened}
+        onClose={(data) => onImportModalClose(data)}
+      />
+      <EditICDialog
+        show={isEditModalOpened}
+        onClose={(data) => onEditModalClose(data)}
+        ic={editModalIC ? editModalIC : {}}
+      />
+      <DeleteDialog
+        title="infrastructure-component"
+        name={deleteModalIC ? deleteModalIC.name : "Unknown"}
+        show={isDeleteModalOpened}
+        onClose={(e) => onCloseDeleteModal(e)}
+      />
+    </div>
+  );
+};
 
 export default Infrastructure;
diff --git a/src/pages/login/login.js b/src/pages/login/login.js
index 115f50b8..3cf78190 100644
--- a/src/pages/login/login.js
+++ b/src/pages/login/login.js
@@ -23,8 +23,8 @@ import { useSelector } from 'react-redux';
 import LoginForm from './login-form';
 import Header from '../../common/header';
 import NotificationsDataManager from '../../common/data-managers/notifications-data-manager';
-import branding from '../../branding/branding';
 import { useGetConfigQuery } from '../../store/apiSlice';
+import { villasweb_footer, villasweb_welcome } from '../../branding/functions';
 
 const Login = (props) => {
 
@@ -45,8 +45,8 @@ const Login = (props) => {
     
         <Header />
         <div className="login-parent">
-          <div className="login-welcome">
-            {branding.getWelcome()}
+          <div className="login-welcome" id="brand-welcome">
+            {villasweb_welcome()}
           </div>
     
           <div className="login-container">
@@ -55,7 +55,9 @@ const Login = (props) => {
           </div>
         </div>
     
-        {branding.getFooter()}
+        <footer className="app-footer" id="brand-footer">
+          {villasweb_footer()}
+        </footer>
       </div>
     )
     :
diff --git a/src/pages/scenarios/dialogs/edit-signal-mapping.js b/src/pages/scenarios/dialogs/edit-signal-mapping.js
index 7ccaaee7..a2fa0f9d 100644
--- a/src/pages/scenarios/dialogs/edit-signal-mapping.js
+++ b/src/pages/scenarios/dialogs/edit-signal-mapping.js
@@ -1,260 +1,310 @@
 import { useState, useEffect } from "react";
 import { Button, Form, OverlayTrigger, Tooltip } from "react-bootstrap";
-import { Table, ButtonColumn, CheckboxColumn, DataColumn } from '../../../common/table';
-import { dialogWarningLabel, signalDialogCheckButton, buttonStyle } from "../styles";
+import {
+  Table,
+  ButtonColumn,
+  CheckboxColumn,
+  DataColumn,
+} from "../../../common/table";
+import {
+  dialogWarningLabel,
+  signalDialogCheckButton,
+  buttonStyle,
+} from "../styles";
 import Dialog from "../../../common/dialogs/dialog";
 import Icon from "../../../common/icon";
-import { useGetSignalsQuery, useAddSignalMutation, useDeleteSignalMutation, useUpdateSignalMutation } from "../../../store/apiSlice";
-import { Collapse } from 'react-collapse';
+import {
+  useGetSignalsQuery,
+  useAddSignalMutation,
+  useDeleteSignalMutation,
+  useUpdateSignalMutation,
+} from "../../../store/apiSlice";
+import { Collapse } from "react-collapse";
 
-const ExportSignalMappingDialog = ({isShown, direction, onClose, configID}) => {
+const EditSignalMappingDialog = ({ show, direction, onClose, configID }) => {
+  const [isCollapseOpened, setCollapseOpened] = useState(false);
+  const [checkedSignalsIDs, setCheckedSignalsIDs] = useState([]);
+  const { data, refetch: refetchSignals } = useGetSignalsQuery({
+    configID: configID,
+    direction: direction,
+  });
+  const [addSignalToConfig] = useAddSignalMutation();
+  const [deleteSignal] = useDeleteSignalMutation();
+  const [updateSignal] = useUpdateSignalMutation();
+  const signals = data ? data.signals : [];
 
-    const [isCollapseOpened, setCollapseOpened] = useState(false);
-    const [checkedSignalsIDs, setCheckedSignalsIDs] = useState([]);
-    const {data, refetch: refetchSignals } = useGetSignalsQuery({configID: configID, direction: direction});
-    const [addSignalToConfig] = useAddSignalMutation();
-    const [deleteSignal] = useDeleteSignalMutation();
-    const [updateSignal] = useUpdateSignalMutation();
-    const signals = data ? data.signals : [];
+  const [updatedSignals, setUpdatedSignals] = useState([]);
+  const [updatedSignalsIDs, setUpdatedSignalsIDs] = useState([]);
 
-    const [updatedSignals, setUpdatedSignals] = useState([]);
-    const [updatedSignalsIDs, setUpdatedSignalsIDs] = useState([]);
-
-    useEffect(() => {
-        if (signals.length > 0) {
-            setUpdatedSignals([...signals]);
-        }
-    }, [signals]);
-
-    const handleMappingChange = (e, row, column) => {
-        const signalToUpdate = {...updatedSignals[row]};
-        switch (column) {
-            case 1:
-                signalToUpdate.index = e.target.value;
-                break;
-            case 2:
-                signalToUpdate.name = e.target.value;
-                break;
-            case 3:
-                signalToUpdate.unit = e.target.value;
-                break;
-            case 4:
-                signalToUpdate.scalingFactor = e.target.value;
-                break;
-            default:
-                break;
-        }
-
-        setUpdatedSignals(prevState => 
-            prevState.map((signal, index) => 
-                index === row ? signalToUpdate : signal
-            )
-        );
+  useEffect(() => {
+    if (signals.length > 0) {
+      setUpdatedSignals([...signals]);
+    }
+  }, [signals]);
 
-        setUpdatedSignalsIDs(prevState => ([signalToUpdate.id, ...prevState]));
+  const handleMappingChange = (e, row, column) => {
+    const signalToUpdate = { ...updatedSignals[row] };
+    switch (column) {
+      case 1:
+        signalToUpdate.index = Number(e.target.value);
+        break;
+      case 2:
+        signalToUpdate.name = e.target.value;
+        break;
+      case 3:
+        signalToUpdate.unit = e.target.value;
+        break;
+      case 4:
+        signalToUpdate.scalingFactor = e.target.value;
+        break;
+      default:
+        break;
     }
 
-    const handleAdd = async () => {
+    setUpdatedSignals((prevState) =>
+      prevState.map((signal, index) =>
+        index === row ? signalToUpdate : signal
+      )
+    );
 
-        let largestIndex = -1;
-        signals.forEach(signal => {
-            if(signal.index > largestIndex){
-                largestIndex = signal.index;
-            }
-        })
+    setUpdatedSignalsIDs((prevState) => [signalToUpdate.id, ...prevState]);
+  };
 
-        const newSignal = {
-            configID: configID,
-            direction: direction,
-            name: "PlaceholderName",
-            unit: "PlaceholderUnit",
-            index: largestIndex + 1,
-            scalingFactor: 1.0
-        };
+  const handleAdd = async () => {
+    let largestIndex = -1;
+    signals.forEach((signal) => {
+      if (signal.index > largestIndex) {
+        largestIndex = signal.index;
+      }
+    });
 
-        try {
-            await addSignalToConfig(newSignal).unwrap();
-        } catch (err) {
-            console.log(err);
-        }
+    const newSignal = {
+      configID: configID,
+      direction: direction,
+      name: "PlaceholderName",
+      unit: "PlaceholderUnit",
+      index: largestIndex + 1,
+      scalingFactor: 1.0,
+    };
 
-        refetchSignals();
-        console.log(signals)
+    try {
+      await addSignalToConfig(newSignal).unwrap();
+    } catch (err) {
+      console.log(err);
     }
 
-    const handleDelete = async (signalID) => {
-        try {
-            await deleteSignal(signalID).unwrap();
-        } catch (err) {
-            console.log(err);
-        }
+    refetchSignals();
+  };
 
-        refetchSignals();
+  const handleDelete = async (signalID) => {
+    try {
+      await deleteSignal(signalID).unwrap();
+    } catch (err) {
+      console.log(err);
     }
 
-    const handleUpdate = async () => {
-        try {
-            for (let id of updatedSignalsIDs) {
-                
-                const signalToUpdate = updatedSignals.find(signal => signal.id === id);
-                
-                if (signalToUpdate) {
-                    await updateSignal({ signalID: id, updatedSignal: signalToUpdate }).unwrap();
-                }
-            }
+    refetchSignals();
+  };
 
-            refetchSignals();
-            setUpdatedSignalsIDs([]);
-        } catch (error) {
-            console.error("Error updating signals:", error);
-        }
-    }
+  const handleUpdate = async () => {
+    try {
+      for (let id of updatedSignalsIDs) {
+        const signalToUpdate = updatedSignals.find(
+          (signal) => signal.id === id
+        );
 
-    const onSignalChecked = (signal, event) => {
-        if(!checkedSignalsIDs.includes(signal.id)){
-            setCheckedSignalsIDs(prevState => ([...prevState, signal.id]));
-        } else {
-            const index = checkedSignalsIDs.indexOf(signal.id);
-            setCheckedSignalsIDs(prevState => prevState.filter((_, i) => i !== index));
+        if (signalToUpdate) {
+          console.log(signalToUpdate)
+          await updateSignal({
+            signalID: id,
+            updatedSignal: signalToUpdate,
+          }).unwrap();
         }
+      }
+
+      refetchSignals();
+      setUpdatedSignalsIDs([]);
+    } catch (error) {
+      console.error("Error updating signals:", error);
     }
+  };
 
-    const isSignalChecked = (signal) => {
-        return checkedSignalsIDs.includes(signal.id);
+  const onSignalChecked = (signal, event) => {
+    if (!checkedSignalsIDs.includes(signal.id)) {
+      setCheckedSignalsIDs((prevState) => [...prevState, signal.id]);
+    } else {
+      const index = checkedSignalsIDs.indexOf(signal.id);
+      setCheckedSignalsIDs((prevState) =>
+        prevState.filter((_, i) => i !== index)
+      );
     }
+  };
+
+  const isSignalChecked = (signal) => {
+    return checkedSignalsIDs.includes(signal.id);
+  };
 
-    const toggleCheckAll = () => {
-        //check if all signals are already checked
-        if(checkedSignalsIDs.length === signals.length){
-            setCheckedSignalsIDs([]);
-        } else {
-            signals.forEach(signal => {
-                if(!checkedSignalsIDs.includes(signal.id)){
-                    setCheckedSignalsIDs(prevState => ([...prevState, signal.id]));
-                }
-            })
+  const toggleCheckAll = () => {
+    //check if all signals are already checked
+    if (checkedSignalsIDs.length === signals.length) {
+      setCheckedSignalsIDs([]);
+    } else {
+      signals.forEach((signal) => {
+        if (!checkedSignalsIDs.includes(signal.id)) {
+          setCheckedSignalsIDs((prevState) => [...prevState, signal.id]);
         }
+      });
     }
+  };
 
-    const deleteCheckedSignals = async () => {
-        if(checkedSignalsIDs.length > 0){
-            try {
-                const deletePromises = checkedSignalsIDs.map(signalID => deleteSignal(signalID).unwrap());
-                await Promise.all(deletePromises);
-                refetchSignals();
-            } catch (err) {
-                console.log(err);
-            }
-        }
+  const deleteCheckedSignals = async () => {
+    if (checkedSignalsIDs.length > 0) {
+      try {
+        const deletePromises = checkedSignalsIDs.map((signalID) =>
+          deleteSignal(signalID).unwrap()
+        );
+        await Promise.all(deletePromises);
+        refetchSignals();
+      } catch (err) {
+        console.log(err);
+      }
     }
+  };
 
-    const DialogWindow = (
-        <Dialog
-            show={isShown}
-            title={"Edit Signal " + direction +" Mapping"}
-            buttonTitle="Close"
-            blendOutCancel = {true}
-            onClose={(c) => {
-                handleUpdate();
-                onClose(c)
-            }}
-            onReset={() => {}}
-            valid={true}
+  const DialogWindow = (
+    <Dialog
+      show={show}
+      title={"Edit Signal " + direction + " Mapping"}
+      buttonTitle="Close"
+      blendOutCancel={true}
+      onClose={(c) => {
+        handleUpdate();
+        onClose(c);
+      }}
+      onReset={() => {}}
+      valid={true}
+    >
+      <Form.Group>
+        <Form.Label style={dialogWarningLabel}>
+          IMPORTANT: Signal configurations that were created before January 2022
+          have to be fixed manually. Signal indices have to start at 0 and not
+          1.
+        </Form.Label>
+        <Form.Label>
+          {" "}
+          <i>Click in table cell to edit</i>
+        </Form.Label>
+        <Table
+          breakWord={true}
+          checkbox
+          onChecked={(signal) => onSignalChecked(signal)}
+          data={updatedSignals}
         >
-            <Form.Group>
-            <Form.Label style={dialogWarningLabel}>IMPORTANT: Signal configurations that were created before January 2022 have to be fixed manually. Signal indices have to start at 0 and not 1.</Form.Label>
-            <Form.Label> <i>Click in table cell to edit</i></Form.Label>
-            <Table breakWord={true} checkbox onChecked={(signal) => onSignalChecked(signal)} data={updatedSignals}>
-                <CheckboxColumn
-                    onChecked={(index, event) => onSignalChecked(index, event)}
-                    checked={(signal) => isSignalChecked(signal)}
-                    width='30'
-                />
-                <DataColumn
-                    title='Index'
-                    dataKey='index'
-                    inlineEditable
-                    inputType='number'
-                    onInlineChange={(e, row, column) => handleMappingChange(e, row, column)}
-                />
-                <DataColumn
-                    title='Name'
-                    dataKey='name'
-                    inlineEditable
-                    inputType='text'
-                    onInlineChange={(e, row, column) => handleMappingChange(e, row, column)}
-                />
-                <DataColumn
-                    title='Unit'
-                    dataKey='unit'
-                    inlineEditable
-                    inputType='text'
-                    onInlineChange={(e, row, column) => handleMappingChange(e, row, column)}
-                />
-                <DataColumn
-                    title='Scaling Factor'
-                    dataKey='scalingFactor'
-                    inlineEditable
-                    inputType='number'
-                    onInlineChange={(e, row, column) => handleMappingChange(e, row, column)}
-                />
-                <ButtonColumn
-                    title='Remove'
-                    deleteButton
-                    onDelete={(index) => handleDelete(signals[index].id)}
-                />
-            </Table>
+          <CheckboxColumn
+            onChecked={(index, event) => onSignalChecked(index, event)}
+            checked={(signal) => isSignalChecked(signal)}
+            width="30"
+          />
+          <DataColumn
+            title="Index"
+            dataKey="index"
+            inlineEditable
+            inputType="number"
+            onInlineChange={(e, row, column) =>
+              handleMappingChange(e, row, column)
+            }
+          />
+          <DataColumn
+            title="Name"
+            dataKey="name"
+            inlineEditable
+            inputType="text"
+            onInlineChange={(e, row, column) =>
+              handleMappingChange(e, row, column)
+            }
+          />
+          <DataColumn
+            title="Unit"
+            dataKey="unit"
+            inlineEditable
+            inputType="text"
+            onInlineChange={(e, row, column) =>
+              handleMappingChange(e, row, column)
+            }
+          />
+          <DataColumn
+            title="Scaling Factor"
+            dataKey="scalingFactor"
+            inlineEditable
+            inputType="number"
+            onInlineChange={(e, row, column) =>
+              handleMappingChange(e, row, column)
+            }
+          />
+          <ButtonColumn
+            title="Remove"
+            deleteButton
+            onDelete={(index) => handleDelete(signals[index].id)}
+          />
+        </Table>
 
-            <div className='solid-button' style={signalDialogCheckButton}>
-                <OverlayTrigger
-                key={0}
-                placement='left'
-                overlay={<Tooltip id={`tooltip-${"check"}`}> Check/Uncheck All </Tooltip>}
-                >
-                <Button
-                    variant='secondary'
-                    key={50}
-                    onClick={() => toggleCheckAll()}
+        <div className="solid-button" style={signalDialogCheckButton}>
+          <OverlayTrigger
+            key={0}
+            placement="left"
+            overlay={
+              <Tooltip id={`tooltip-${"check"}`}> Check/Uncheck All </Tooltip>
+            }
+          >
+            <Button
+              variant="secondary"
+              key={50}
+              onClick={() => toggleCheckAll()}
+              style={buttonStyle}
+            >
+              <Icon icon="check" />
+            </Button>
+          </OverlayTrigger>
+          <Button
+            variant="secondary"
+            key={51}
+            onClick={() => deleteCheckedSignals()}
+            style={buttonStyle}
+          >
+            <Icon icon="minus" /> Remove
+          </Button>
+          <Button
+            variant="secondary"
+            key={52}
+            onClick={() => handleAdd()}
+            style={buttonStyle}
+          >
+            <Icon icon="plus" /> Signal
+          </Button>
+        </div>
+        <div>
+          <Collapse isOpened={isCollapseOpened}>
+            <h6>Choose a Component Configuration to add the signal to: </h6>
+            <div className="solid-button">
+              {typeof configs !== "undefined" &&
+                configs.map((config) => (
+                  <Button
+                    variant="secondary"
+                    key={config.id}
+                    onClick={() => handleAdd(config.id)}
                     style={buttonStyle}
-                >
-                    <Icon icon="check" />
-                </Button>
-                </OverlayTrigger>
-                <Button
-                variant='secondary'
-                key={51}
-                onClick={() => deleteCheckedSignals()} style={buttonStyle}>
-                <Icon icon="minus" /> Remove
-                </Button>
-                <Button
-                variant='secondary'
-                key={52}
-                onClick={() => handleAdd()} style={buttonStyle}>
-                    <Icon icon="plus" /> Signal
-                </Button>
-            </div>
-            <div>
-                <Collapse isOpened={isCollapseOpened}>
-                <h6>Choose a Component Configuration to add the signal to: </h6>
-                <div className='solid-button'>
-                {typeof configs !== "undefined" && configs.map(config => (
-                    <Button
-                        variant='secondary'
-                        key={config.id}
-                        onClick={() => handleAdd(config.id)}
-                        style={buttonStyle}
-                    >
+                  >
                     {config.name}
-                    </Button>
+                  </Button>
                 ))}
-                </div>
-                </Collapse>
             </div>
-            </Form.Group>
-        </Dialog>
-    )
+          </Collapse>
+        </div>
+      </Form.Group>
+    </Dialog>
+  );
 
-    return isShown ? DialogWindow : <></>
-}
+  return show ? DialogWindow : <></>;
+};
 
-export default ExportSignalMappingDialog;
+export default EditSignalMappingDialog;
diff --git a/src/pages/scenarios/dialogs/result-python-dialog.js b/src/pages/scenarios/dialogs/result-python-dialog.js
index 3042ffd0..f86b53a0 100644
--- a/src/pages/scenarios/dialogs/result-python-dialog.js
+++ b/src/pages/scenarios/dialogs/result-python-dialog.js
@@ -105,7 +105,7 @@ class ResultPythonDialog extends React.Component {
     code_snippets.push(code_imports)
 
     /* Result object */
-    code_snippets.push(`r = Result(${result.id}, '${token}')`);
+    code_snippets.push(`r = Result(${result.id}, '${token}', endpoint='https://slew.k8s.eonerc.rwth-aachen.de')`);
 
     /* Examples */
     code_snippets.push(`# Get result metadata
diff --git a/src/pages/scenarios/scenarios.js b/src/pages/scenarios/scenarios.js
index 42e96fb7..fa8b4585 100644
--- a/src/pages/scenarios/scenarios.js
+++ b/src/pages/scenarios/scenarios.js
@@ -85,7 +85,6 @@ const Scenarios = (props) => {
     }
 
     const onEditScenario = async (data) => {
-      console.log("data: ", {scenario: data});
       if(data){
         try{
           await updateScenario({id: modalScenario.id, ...{scenario: data}}).unwrap();
diff --git a/src/pages/scenarios/tables/config-action-board.js b/src/pages/scenarios/tables/config-action-board.js
index 60379a80..38170a24 100644
--- a/src/pages/scenarios/tables/config-action-board.js
+++ b/src/pages/scenarios/tables/config-action-board.js
@@ -20,7 +20,6 @@ import DateTimePicker from 'react-datetime-picker';
 import ActionBoardButtonGroup from '../../../common/buttons/action-board-button-group';
 import classNames from 'classnames';
 import { useState } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
 import { sessionToken } from '../../../localStorage';
 import { useSendActionMutation, useAddResultMutation, useLazyGetSignalsQuery, useGetResultsQuery } from '../../../store/apiSlice';
 import NotificationsFactory from "../../../common/data-managers/notifications-factory";
@@ -33,7 +32,7 @@ const ConfigActionBoard = ({selectedConfigs, scenarioID}) => {
   const [triggerGetSignals] = useLazyGetSignalsQuery();
 
   const [sendAction] = useSendActionMutation();
-  const [addResult] = useAddResultMutation();
+  const [addResult, {isError: isErrorAddingResult}] = useAddResultMutation();
   //we only need to update results table in case new result being added
   const { refetch: refetchResults } = useGetResultsQuery(scenarioID);
 
@@ -43,8 +42,14 @@ const ConfigActionBoard = ({selectedConfigs, scenarioID}) => {
   const handleConfigStart = async () => {
     for(const config of selectedConfigs){
       try {
-        if(isResultRequested){
+        const action = {
+          icid: config.icID, 
+          action: "start", 
+          when: Math.round(new Date(time).getTime() / 1000), 
+          parameters: {...config.startParameters}
+        }
 
+        if(isResultRequested){
           const signalsInRes = await triggerGetSignals({configID: config.id, direction: "in"}, ).unwrap();
           const signalsOutRes = await triggerGetSignals({configID: config.id, direction: "out"}, ).unwrap();
 
@@ -73,10 +78,27 @@ const ConfigActionBoard = ({selectedConfigs, scenarioID}) => {
             }
           }
 
-          await addResult({result: newResult})
+          //get result id (if successfull) before sending an action
+          const res = await addResult({result: newResult}).unwrap();
+          
+          if(!isErrorAddingResult){
+            const url = window.location.origin;
+            action.results = {
+              url: `https://slew.k8s.eonerc.rwth-aachen.de/api/v2/results/${res.result.id}/file`,
+              type: "url",
+              token: sessionToken
+            }
+            await sendAction(action).unwrap();
+          } else {
+            notificationsDataManager.addNotification(NotificationsFactory.LOAD_ERROR("Error adding result"));
+          }
+
           refetchResults();
+        } else {
+          await sendAction(action).unwrap();
         }
-        await sendAction({ icid: config.icID, action: "start", when: Math.round(new Date(time).getTime() / 1000), parameters: {} }).unwrap();
+
+        notificationsDataManager.addNotification(NotificationsFactory.ACTION_INFO());
       } catch (err) {
         if(err.data){
           notificationsDataManager.addNotification(NotificationsFactory.LOAD_ERROR(err.data.message));
diff --git a/src/pages/scenarios/tables/configs-table.js b/src/pages/scenarios/tables/configs-table.js
index 7e9c63f1..e8699b39 100644
--- a/src/pages/scenarios/tables/configs-table.js
+++ b/src/pages/scenarios/tables/configs-table.js
@@ -470,7 +470,7 @@ const ConfigsTable = ({scenario, ics}) => {
         onClose={(c) => deleteConfig(c)}
       />
       <EditSignalMappingDialog
-        isShown={isEditSignalMappingModalOpened}
+        show={isEditSignalMappingModalOpened}
         direction={mappingModalDirection}
         onClose={() => setIsEditSignalMappingModalOpened(false)}
         configID={signalMappingConfigID}
diff --git a/src/pages/users/users.js b/src/pages/users/users.js
index b5890dea..6e9c5e90 100644
--- a/src/pages/users/users.js
+++ b/src/pages/users/users.js
@@ -1,6 +1,6 @@
 import { useState } from "react";
 import { useSelector } from "react-redux";
-import { Dropdown, DropdownButton } from 'react-bootstrap';
+import { Dropdown, DropdownButton, Spinner, Row, Col } from 'react-bootstrap';
 import { Table, ButtonColumn, CheckboxColumn, DataColumn } from "../../common/table";
 import Icon from "../../common/icon";
 import IconButton from "../../common/buttons/icon-button";
@@ -11,6 +11,7 @@ import DeleteDialog from "../../common/dialogs/delete-dialog";
 import { buttonStyle, iconStyle } from "./styles";
 import NotificationsFactory from "../../common/data-managers/notifications-factory";
 import notificationsDataManager from "../../common/data-managers/notifications-data-manager";
+import Usergroups from "../usergroups/usergroups";
 import { 
     useGetUsersQuery, 
     useAddUserMutation,
@@ -18,26 +19,31 @@ import {
     useDeleteUserMutation,
     useGetScenariosQuery,
     useAddUserToScenarioMutation,
+    useGetUsergroupsQuery,
+    useAddUserToUsergroupMutation
 } from "../../store/apiSlice";
 
-const Users = ({}) => {
+const Users = () => {
 
     const { user: currentUser, token: sessionToken } = useSelector((state) => state.auth);
 
     const {data: fetchedUsers, refetch: refetchUsers} = useGetUsersQuery();
     const users = fetchedUsers ? fetchedUsers.users : [];
-    const { data: fetchedScenarios } = useGetScenariosQuery();
-    const scenarios = fetchedScenarios ? fetchedScenarios.scenarios : [];
+    const { data: {scenarios} = [], isLoading: isLoadingScenarios } = useGetScenariosQuery();
+    const {data: {usergroups} = [], isLoading: isLoadingUsergroups } = useGetUsergroupsQuery();
     const [checkedUsersIDs, setCheckedUsersIDs] = useState([]);
     const [addUserMutation] = useAddUserMutation();
     const [updateUserMutation] = useUpdateUserMutation();
     const [deleteUserMutation] = useDeleteUserMutation();
     const [addUserToScenarioMutation] = useAddUserToScenarioMutation();
+    const [addUserToUsergroup] = useAddUserToUsergroupMutation();
     const [isNewModalOpened, setIsNewModalOpened] = useState(false);
     const [isEditModalOpened, setIsEditModalOpened] = useState(false);
     const [isDeleteModalOpened, setIsDeleteModalOpened] = useState(false);
     const [scenario, setScenario] = useState({name: ''});
+    const [usergroup, setUsergroup] = useState({name: ''});
     const [isUsersToScenarioModalOpened, setUsersToScenarioModalOpened] = useState(false);
+    const [isUsersToUsegroupModalOpened, setUsersToUsegroupModalOpened] = useState(false);
     const [userToEdit, setUserToEdit] = useState({});
     const [userToDelete, setUserToDelete] = useState({});
     const [areAllUsersChecked, setAreAllUsersChecked] = useState(false);
@@ -62,6 +68,10 @@ const Users = ({}) => {
         setIsNewModalOpened(false);
     }
 
+    const getIconForActiveColumn = (active) => {
+        return <Icon icon={active ? 'check' : 'times'} />
+    }
+
     const handleEditUser = async (data) => {
         if(data){
             try {
@@ -106,7 +116,6 @@ const Users = ({}) => {
                     await addUserToScenarioMutation({ scenarioID: scenario.id, username: users.find(u => u.id === checkedUsersIDs[i]).username }).unwrap();
                 }
             } catch (error) {
-                console.log('ERROR', error)
                 if(error.data){
                     notificationsDataManager.addNotification(NotificationsFactory.LOAD_ERROR(error.data.message));
                 } else {
@@ -121,6 +130,28 @@ const Users = ({}) => {
         setAreAllUsersChecked(false);
     }
 
+    const handleAddUsersToUsergroup = async (isCanceled) => {
+        if(!isCanceled){
+            try {
+                for(let i = 0; i < checkedUsersIDs.length; i++){
+                    await addUserToUsergroup({ usergroupID: usergroup.id, username: users.find(u => u.id === checkedUsersIDs[i]).username }).unwrap();
+                }
+            } catch (error) {
+                if(error.data){
+                    notificationsDataManager.addNotification(NotificationsFactory.LOAD_ERROR(error.data.message));
+                } else {
+                console.log("error", error)
+                  notificationsDataManager.addNotification(NotificationsFactory.LOAD_ERROR("Unknown error"));
+                }
+            }
+        }
+        
+        setUsersToUsegroupModalOpened(false);
+        setCheckedUsersIDs([]);
+        setUsergroup({name: ''});
+        setAreAllUsersChecked(false);
+    }
+
     const toggleCheckAllUsers = () => {
         if(checkedUsersIDs.length === users.length){
             setCheckedUsersIDs([]);
@@ -188,7 +219,7 @@ const Users = ({}) => {
                 <DataColumn title='Username' width='150' dataKey='username' />
                 <DataColumn title='E-mail' dataKey='mail'/>
                 <DataColumn title='Role' dataKey='role'/>
-                <DataColumn title='Active' dataKey='active' modifier={(active) => {}}/>
+                <DataColumn title='Active' dataKey='active' modifier={(active) => getIconForActiveColumn(active)}/>
                 <ButtonColumn
                     width='200'
                     align='right'
@@ -204,30 +235,69 @@ const Users = ({}) => {
                     }}
                 />
             </Table>
-            <span className='solid-button'>
-                <DropdownButton
-                    title='Add to Scenario'
-                    onSelect={(id) => {
-                        let scenario;
-                        if(scenarios.length > 0) {
-                            scenario = scenarios.find(s => s.id == id);
-                        }
-                        setScenario(scenario);
-                        setUsersToScenarioModalOpened(true);
-                    }}
-                >
-                {scenarios.map(scenario => (
-                    <Dropdown.Item key={scenario.id} eventKey={scenario.id}>{scenario.name}</Dropdown.Item>
-                ))}
-                </DropdownButton>
-            </span>
-
-            <UsersToScenarioDialog
-                show={isUsersToScenarioModalOpened}
-                users={users.filter(user => checkedUsersIDs.includes(user.id))}
-                scenario={scenario.name}
-                onClose={(canceled) => handleAddUserToScenario(canceled)}
-            />
+
+            <Row>
+                <Col md="auto">
+                    {isLoadingScenarios? <Spinner /> : <>
+                            <span className='solid-button'>
+                                <DropdownButton
+                                    title='Add to Scenario'
+                                    onSelect={(id) => {
+                                        let scenario;
+                                        if(scenarios.length > 0) {
+                                            scenario = scenarios.find(s => s.id == id);
+                                        }
+                                        setScenario(scenario);
+                                        setUsersToScenarioModalOpened(true);
+                                    }}
+                                >
+                                {scenarios.map(scenario => (
+                                    <Dropdown.Item key={scenario.id} eventKey={scenario.id}>{scenario.name}</Dropdown.Item>
+                                ))}
+                                </DropdownButton>
+                            </span>
+                            
+
+                            <UsersToScenarioDialog
+                                show={isUsersToScenarioModalOpened}
+                                users={users.filter(user => checkedUsersIDs.includes(user.id))}
+                                scenario={scenario.name}
+                                onClose={(canceled) => handleAddUserToScenario(canceled)}
+                            />
+                    </>}
+                </Col>
+
+                <Col md="auto">
+                {isLoadingUsergroups? <Spinner /> : <>
+                        <span className='solid-button'>
+                            <DropdownButton
+                                title='Add to Usegroup'
+                                onSelect={(id) => {
+                                    let usergroup;
+                                    if(usergroups.length > 0) {
+                                        usergroup = usergroups.find(s => s.id == id);
+                                    }
+                                    setUsergroup(usergroup);
+                                    setUsersToUsegroupModalOpened(true);
+                                }}
+                            >
+                            {usergroups.map(usergroup => (
+                                <Dropdown.Item key={usergroup.id} eventKey={usergroup.id}>{usergroup.name}</Dropdown.Item>
+                            ))}
+                            </DropdownButton>
+                        </span>
+
+                        {/* re-using same modal to implement adding suers to usergroup */}
+                        <UsersToScenarioDialog
+                            show={isUsersToUsegroupModalOpened}
+                            users={users.filter(user => checkedUsersIDs.includes(user.id))}
+                            scenario={usergroup.name}
+                            onClose={(canceled) => handleAddUsersToUsergroup(canceled)}
+                        />
+                    </>}
+                </Col>
+            </Row>
+
             <NewUserDialog 
                 show={isNewModalOpened} 
                 onClose={(data) => handleAddNewUser(data)} 
@@ -243,6 +313,10 @@ const Users = ({}) => {
                 show={isDeleteModalOpened} 
                 onClose={(e) => handleDeleteUser(e)} 
             />
+
+            <div className="mt-4">
+                <Usergroups />
+            </div>
         </div>
     )
 }
diff --git a/src/store/apiSlice.js b/src/store/apiSlice.js
index 3080f15d..afd56e1a 100644
--- a/src/store/apiSlice.js
+++ b/src/store/apiSlice.js
@@ -1,25 +1,43 @@
-import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
-import { sessionToken } from '../localStorage';
-import { widgetEndpoints } from './endpoints/widget-endpoints';
-import { scenarioEndpoints } from './endpoints/scenario-endpoints';
-import { dashboardEndpoints } from './endpoints/dashboard-endpoints';
-import { icEndpoints } from './endpoints/ic-endpoints';
-import { configEndpoints } from './endpoints/config-endpoints';
-import { userEndpoints } from './endpoints/user-endpoints';
-import { fileEndpoints } from './endpoints/file-endpoints';
-import { signalEndpoints } from './endpoints/signal-endpoints';
-import { resultEndpoints } from './endpoints/result-endpoints';
-import { authEndpoints } from './endpoints/auth-endpoints';
-import { websocketEndpoints } from './endpoints/websocket-endpoints';
+/**
+ * This file is part of VILLASweb.
+ *
+ * VILLASweb is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VILLASweb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+
+import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
+import { sessionToken } from "../localStorage";
+import { widgetEndpoints } from "./endpoints/widget-endpoints";
+import { scenarioEndpoints } from "./endpoints/scenario-endpoints";
+import { dashboardEndpoints } from "./endpoints/dashboard-endpoints";
+import { icEndpoints } from "./endpoints/ic-endpoints";
+import { configEndpoints } from "./endpoints/config-endpoints";
+import { userEndpoints } from "./endpoints/user-endpoints";
+import { fileEndpoints } from "./endpoints/file-endpoints";
+import { signalEndpoints } from "./endpoints/signal-endpoints";
+import { resultEndpoints } from "./endpoints/result-endpoints";
+import { authEndpoints } from "./endpoints/auth-endpoints";
+import { usergroupEndpoints } from "./endpoints/usergroup-endpoints";
+import { selectToken } from "./authSlice";
 
 export const apiSlice = createApi({
-  reducerPath: 'api',
+  reducerPath: "api",
   baseQuery: fetchBaseQuery({
-    baseUrl: '/api/v2',
-    prepareHeaders: (headers) => {
-      const token = sessionToken;
+    baseUrl: "/api/v2",
+    prepareHeaders: (headers, { getState }) => {
+      const token = selectToken(getState());
       if (token) {
-        headers.set('Authorization', `Bearer ${token}`);
+        headers.set("Authorization", `Bearer ${token}`);
       }
       return headers;
     },
@@ -35,18 +53,18 @@ export const apiSlice = createApi({
     ...resultEndpoints(builder),
     ...signalEndpoints(builder),
     ...authEndpoints(builder),
-    ...websocketEndpoints(builder),
+    ...usergroupEndpoints(builder),
   }),
 });
 
-export const { 
-  useGetScenariosQuery, 
-  useGetScenarioByIdQuery, 
-  useGetConfigsQuery, 
+export const {
+  useGetScenariosQuery,
+  useGetScenarioByIdQuery,
+  useGetConfigsQuery,
   useLazyGetConfigsQuery,
-  useGetDashboardsQuery, 
+  useGetDashboardsQuery,
   useGetICSQuery,
-  useAddScenarioMutation,   
+  useAddScenarioMutation,
   useDeleteScenarioMutation,
   useUpdateScenarioMutation,
   useGetUsersOfScenarioQuery,
@@ -86,5 +104,15 @@ export const {
   useUpdateSignalMutation,
   useGetIcDataQuery,
   useLazyDownloadImageQuery,
-  useUpdateComponentConfigMutation
+  useUpdateComponentConfigMutation,
+  useGetUsergroupsQuery,
+  useAddUsergroupMutation,
+  useDeleteUsergroupMutation,
+  useGetUsergroupByIdQuery,
+  useGetUsersByUsergroupIdQuery,
+  useAddUserToUsergroupMutation,
+  useDeleteUserFromUsergroupMutation,
+  useUpdateUsergroupMutation,
+  useGetWidgetsQuery,
+  useLazyGetICbyIdQuery,
 } = apiSlice;
diff --git a/src/store/authSlice.js b/src/store/authSlice.js
index b0cf1f1a..5e408394 100644
--- a/src/store/authSlice.js
+++ b/src/store/authSlice.js
@@ -66,6 +66,7 @@ const authSlice = createSlice({
     );
   },
 });
+export const selectToken = (state) => state.auth.token; 
 
 export const { setUser, deleteUser } = authSlice.actions;
 
diff --git a/src/store/configSlice.js b/src/store/configSlice.js
index 744fcd60..9f35b19c 100644
--- a/src/store/configSlice.js
+++ b/src/store/configSlice.js
@@ -32,7 +32,6 @@ const configSlice = createSlice({
            .addCase(loadConfig.fulfilled, (state, action) => {
                 state.isLoading = false
                 state.config = action.payload;
-                console.log("fetched config", action.payload)
            })
     }
 });
@@ -43,7 +42,6 @@ export const loadConfig = createAsyncThunk(
     async (data) => {
         try {
             const res = await RestAPI.get("/api/v2/config", null);
-            console.log("response:", res)
             return res;
         } catch (error) {
             console.log("Error loading config", error);
diff --git a/src/store/endpoints/file-endpoints.js b/src/store/endpoints/file-endpoints.js
index 765c03fd..40137f70 100644
--- a/src/store/endpoints/file-endpoints.js
+++ b/src/store/endpoints/file-endpoints.js
@@ -16,52 +16,52 @@
  ******************************************************************************/
 
 export const fileEndpoints = (builder) => ({
-    getFiles: builder.query({
-      query: (scenarioID) => ({
-        url: 'files',
-        params: { scenarioID },
-      }),
+  getFiles: builder.query({
+    query: (scenarioID) => ({
+      url: "files",
+      params: { scenarioID },
     }),
-    addFile: builder.mutation({
-      query: ({ scenarioID, file }) => {
-        const formData = new FormData();
-        formData.append('inputFile', file);
-        return {
-          url: `files?scenarioID=${scenarioID}`,
-          method: 'POST',
-          body: formData,
-        };
-      },
+  }),
+  addFile: builder.mutation({
+    query: ({ scenarioID, file }) => {
+      const formData = new FormData();
+      formData.append("file", file);
+      return {
+        url: `files?scenarioID=${scenarioID}`,
+        method: "POST",
+        body: formData,
+      };
+    },
+  }),
+  downloadFile: builder.query({
+    query: (fileID) => ({
+      url: `files/${fileID}`,
+      responseHandler: "blob",
+      responseType: "blob",
     }),
-    downloadFile: builder.query({
-      query: (fileID) => ({
-        url: `files/${fileID}`,
-        responseHandler: 'blob',
-        responseType: 'blob',
-      }),
-    }),
-    downloadImage: builder.query({
-      query: (fileID) => ({
-        url: `files/${fileID}`,
-        method: 'GET',
-        responseHandler: (response) => response.blob(),
-      }),
-    }),
-    updateFile: builder.mutation({
-      query: ({ fileID, file }) => {
-        const formData = new FormData();
-        formData.append('inputFile', file);
-        return {
-          url: `files/${fileID}`,
-          method: 'PUT',
-          body: formData,
-        };
-      },
+  }),
+  downloadImage: builder.query({
+    query: (fileID) => ({
+      url: `files/${fileID}`,
+      method: "GET",
+      responseHandler: (response) => response.blob(),
     }),
-    deleteFile: builder.mutation({
-      query: (fileID) => ({
+  }),
+  updateFile: builder.mutation({
+    query: ({ fileID, file }) => {
+      const formData = new FormData();
+      formData.append("file", file);
+      return {
         url: `files/${fileID}`,
-        method: 'DELETE',
-      }),
+        method: "PUT",
+        body: formData,
+      };
+    },
+  }),
+  deleteFile: builder.mutation({
+    query: (fileID) => ({
+      url: `files/${fileID}`,
+      method: "DELETE",
     }),
+  }),
 });
diff --git a/src/store/endpoints/ic-endpoints.js b/src/store/endpoints/ic-endpoints.js
index fdb2f0ae..bea8481b 100644
--- a/src/store/endpoints/ic-endpoints.js
+++ b/src/store/endpoints/ic-endpoints.js
@@ -16,14 +16,18 @@
  ******************************************************************************/
 
 export const icEndpoints = (builder) => ({
-    getICS: builder.query({
-      query: () => 'ic',
-    }),
-    sendAction: builder.mutation({
-      query: (params) => ({
-        url: `/ic/${params.icid}/action`,
-        method: 'POST',
-        body: [params],
-      }),
+  getICS: builder.query({
+    query: () => "ic",
+  }),
+  sendAction: builder.mutation({
+    query: (params) => ({
+      url: `/ic/${params.icid}/action`,
+      method: "POST",
+      body: [params],
     }),
+  }),
+
+  getICbyId: builder.query({
+    query: (icID) => `/ic/${icID}`,
+  }),
 });
diff --git a/src/store/endpoints/websocket-endpoints.js b/src/store/endpoints/websocket-endpoints.js
deleted file mode 100644
index cb191c52..00000000
--- a/src/store/endpoints/websocket-endpoints.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * This file is part of VILLASweb.
- *
- * VILLASweb is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * VILLASweb is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
- ******************************************************************************/
-
-
-function setupWebSocket(WS_URL, onMessage, protocol) {
-  const socket = new WebSocket(WS_URL, protocol); // Include the protocol here
-  socket.binaryType = 'arraybuffer'; // Set binary type
-  socket.onmessage = (event) => {
-    onMessage(event.data);
-  };
-  return socket;
-}
-
-const sendMessage = (message) => {
-  if (socket && socket.readyState === WebSocket.OPEN) {
-    socket.send(JSON.stringify(message));
-  }
-};
-
-export const websocketEndpoints = (builder) => ({
-  getIcData: builder.query({
-    query: () => ({data: []}),
-    async onCacheEntryAdded(
-      arg,
-      { updateCachedData, cacheDataLoaded, cacheEntryRemoved }
-    ) {
-      // create a websocket connection when the cache subscription starts
-      const socket = new WebSocket('wss://villas.k8s.eonerc.rwth-aachen.de/ws/ws_sig', 'live');
-      socket.binaryType = 'arraybuffer';
-      try {
-        // wait for the initial query to resolve before proceeding
-        await cacheDataLoaded;
-
-        // when data is received from the socket connection to the server,
-        // if it is a message and for the appropriate channel,
-        // update our query result with the received message
-        const listener = (event) => {
-          console.log(event.data)
-        }
-
-        socket.addEventListener('message', listener)
-      } catch {
-        // no-op in case `cacheEntryRemoved` resolves before `cacheDataLoaded`,
-        // in which case `cacheDataLoaded` will throw
-      }
-      // cacheEntryRemoved will resolve when the cache subscription is no longer active
-      await cacheEntryRemoved
-      // perform cleanup steps once the `cacheEntryRemoved` promise resolves
-      ws.close()
-    },
-  }),
-});
-
-function bufferToMessageArray(blob) {
-  let offset = 0;
-  const msgs = [];
-
-  while (offset < blob.byteLength) {
-    const msg = bufferToMessage(new DataView(blob, offset));
-    if (msg !== undefined) {
-      msgs.push(msg);
-      offset += msg.blob.byteLength;
-    }
-  }
-
-  return msgs;
-}
-
-function bufferToMessage(data) {
-  if (data.byteLength === 0) {
-    return null;
-  }
-
-  const source_index = data.getUint8(1);
-  const bits = data.getUint8(0);
-  const length = data.getUint16(0x02, 1);
-  const bytes = length * 4 + 16;
-
-  return {
-    version: (bits >> OFFSET_VERSION) & 0xF,
-    type: (bits >> OFFSET_TYPE) & 0x3,
-    source_index: source_index,
-    length: length,
-    sequence: data.getUint32(0x04, 1),
-    timestamp: data.getUint32(0x08, 1) * 1e3 + data.getUint32(0x0C, 1) * 1e-6,
-    values: new Float32Array(data.buffer, data.byteOffset + 0x10, length),
-    blob: new DataView(data.buffer, data.byteOffset + 0x00, bytes),
-  };
-}
\ No newline at end of file
diff --git a/src/store/icSlice.js b/src/store/icSlice.js
index 175b4852..defbc9c9 100644
--- a/src/store/icSlice.js
+++ b/src/store/icSlice.js
@@ -15,232 +15,257 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-import {createSlice, createAsyncThunk} from '@reduxjs/toolkit'
-import RestAPI from '../common/api/rest-api';
-import { sessionToken } from '../localStorage';
-import NotificationsDataManager from '../common/data-managers/notifications-data-manager';
-import NotificationsFactory from '../common/data-managers/notifications-factory';
-
+import { createSlice, createAsyncThunk } from "@reduxjs/toolkit";
+import RestAPI from "../common/api/rest-api";
+import { sessionToken } from "../localStorage";
+import NotificationsDataManager from "../common/data-managers/notifications-data-manager";
+import NotificationsFactory from "../common/data-managers/notifications-factory";
 
 const icSlice = createSlice({
-    name: 'infrastructure',
-    initialState: {
-        ICsArray: [],
-
-        checkedICsIds: [],
-        isLoading: false,
-        currentIC: {},
-        isCurrentICLoading: false,
-        //IC used for Edit and Delete Modals
-        editModalIC: null,
-        deleteModalIC: null,
-        isDeleteModalOpened: false,
-        isEditModalOpened: false
-    },
-    reducers: {
-        updateCheckedICs: (state, args) => {
-            // each table has an object that maps IDs of all its ICs to boolean values
-            // which indicates wether or note user picked it in checbox column
-            const checkboxValues = args.payload;
-            let checkedICsIds = [...state.checkedICsIds];
-
-            for(const id in checkboxValues){
-                if(checkedICsIds.includes(id)){
-                    if(!checkboxValues[id]){
-                        checkedICsIds = checkedICsIds.filter((checkedId) => checkedId != id);
-                    }
-                } else {
-                    if(checkboxValues[id]){
-                        checkedICsIds.push(id);
-                    }
-                }
-            }
-
-            state.checkedICsIds = checkedICsIds;
-        },
-        clearCheckedICs: (state, args) => {
-            state.checkedICsIds = [];
-        },
-        openEditModal: (state, args) => {
-            state.isEditModalOpened = true;
-            state.editModalIC = args.payload;
-            console.log(state.editModalIC)
-        },
-        closeEditModal: (state, args) => {
-            state.isEditModalOpened = false;
-            state.editModalIC = null;
-        },
-        openDeleteModal: (state, args) => {
-            state.deleteModalIC = args.payload;
-            state.isDeleteModalOpened = true;
-        },
-        closeDeleteModal: (state, args) => {
-            state.deleteModalIC = null;
-            state.isDeleteModalOpened = false;
+  name: "infrastructure",
+  initialState: {
+    ICsArray: [],
+
+    checkedICsIds: [],
+    isLoading: false,
+    currentIC: {},
+    isCurrentICLoading: false,
+    //IC used for Edit and Delete Modals
+    editModalIC: null,
+    deleteModalIC: null,
+    isDeleteModalOpened: false,
+    isEditModalOpened: false,
+  },
+  reducers: {
+    updateCheckedICs: (state, args) => {
+      // each table has an object that maps IDs of all its ICs to boolean values
+      // which indicates wether or note user picked it in checbox column
+      const checkboxValues = args.payload;
+      let checkedICsIds = [...state.checkedICsIds];
+
+      for (const id in checkboxValues) {
+        if (checkedICsIds.includes(id)) {
+          if (!checkboxValues[id]) {
+            checkedICsIds = checkedICsIds.filter(
+              (checkedId) => checkedId != id
+            );
+          }
+        } else {
+          if (checkboxValues[id]) {
+            checkedICsIds.push(id);
+          }
         }
+      }
+
+      state.checkedICsIds = checkedICsIds;
     },
-    extraReducers: builder => {
-        builder
-           .addCase(loadICbyId.pending, (state, action) => {
-                state.isCurrentICLoading = true
-            })
-
-           .addCase(loadICbyId.fulfilled, (state, action) => {
-                   state.isCurrentICLoading = false
-                   state.currentIC = action.payload;
-                   console.log("fetched IC", state.currentIC.name)
-           })
-           .addCase(addIC.rejected, (state, action) => {
-               NotificationsDataManager.addNotification(NotificationsFactory.ADD_ERROR("Error while adding infrastructural component: " + action.error.message));
-           })
-           .addCase(sendActionToIC.rejected, (state, action) => {
-               NotificationsDataManager.addNotification(NotificationsFactory.ADD_ERROR("Error while sending action to infrastructural component: " + action.error.message));
-           })
-           .addCase(editIC.rejected, (state, action) => {
-               NotificationsDataManager.addNotification(NotificationsFactory.ADD_ERROR("Error while trying to update an infrastructural component: " + action.error.message));
-           })
-           .addCase(deleteIC.rejected, (state, action) => {
-               NotificationsDataManager.addNotification(NotificationsFactory.ADD_ERROR("Error while trying to delete an infrastructural component: " + action.error.message));
-           })
-           //TODO
-           // .addCase(restartIC.fullfilled, (state, action) => {
-           //     console.log("restart fullfilled")
-           //     //loadAllICs({token: sessionToken})
-           // })
-           // .addCase(shutdownIC.fullfilled, (state, action) => {
-           //     console.log("shutdown fullfilled")
-           //     //loadAllICs({token: sessionToken})
-           // })
-    }
+    clearCheckedICs: (state, args) => {
+      state.checkedICsIds = [];
+    },
+    openEditModal: (state, args) => {
+      state.isEditModalOpened = true;
+      state.editModalIC = args.payload;
+      console.log(state.editModalIC);
+    },
+    closeEditModal: (state, args) => {
+      state.isEditModalOpened = false;
+      state.editModalIC = null;
+    },
+    openDeleteModal: (state, args) => {
+      state.deleteModalIC = args.payload;
+      state.isDeleteModalOpened = true;
+    },
+    closeDeleteModal: (state, args) => {
+      state.deleteModalIC = null;
+      state.isDeleteModalOpened = false;
+    },
+  },
+  extraReducers: (builder) => {
+    builder
+      .addCase(loadICbyId.pending, (state, action) => {
+        state.isCurrentICLoading = true;
+      })
+
+      .addCase(loadICbyId.fulfilled, (state, action) => {
+        state.isCurrentICLoading = false;
+        state.currentIC = action.payload;
+        console.log("fetched IC", state.currentIC.name);
+      })
+      .addCase(addIC.rejected, (state, action) => {
+        NotificationsDataManager.addNotification(
+          NotificationsFactory.ADD_ERROR(
+            "Error while adding infrastructural component: " +
+              action.error.message
+          )
+        );
+      })
+      .addCase(sendActionToIC.rejected, (state, action) => {
+        NotificationsDataManager.addNotification(
+          NotificationsFactory.ADD_ERROR(
+            "Error while sending action to infrastructural component: " +
+              action.error.message
+          )
+        );
+      })
+      .addCase(editIC.rejected, (state, action) => {
+        NotificationsDataManager.addNotification(
+          NotificationsFactory.ADD_ERROR(
+            "Error while trying to update an infrastructural component: " +
+              action.error.message
+          )
+        );
+      })
+      .addCase(deleteIC.rejected, (state, action) => {
+        NotificationsDataManager.addNotification(
+          NotificationsFactory.ADD_ERROR(
+            "Error while trying to delete an infrastructural component: " +
+              action.error.message
+          )
+        );
+      });
+    //TODO
+    // .addCase(restartIC.fullfilled, (state, action) => {
+    //     console.log("restart fullfilled")
+    //     //loadAllICs({token: sessionToken})
+    // })
+    // .addCase(shutdownIC.fullfilled, (state, action) => {
+    //     console.log("shutdown fullfilled")
+    //     //loadAllICs({token: sessionToken})
+    // })
+  },
 });
 
 //loads one IC by its id
 export const loadICbyId = createAsyncThunk(
-    'infrastructure/loadICbyId',
-    async (data) => {
-        try {
-            const res = await RestAPI.get('/api/v2/ic/' + data.id, data.token);
-            return res.ic;
-        } catch (error) {
-            console.log("Error loading IC (id=" + data.id + ") : ", error);
-        }
+  "infrastructure/loadICbyId",
+  async (data) => {
+    try {
+      const res = await RestAPI.get("/api/v2/ic/" + data.id, data.token);
+      return res.ic;
+    } catch (error) {
+      console.log("Error loading IC (id=" + data.id + ") : ", error);
     }
-)
+  }
+);
 
 //adds a new Infrastructural component. Data object must contain token and ic fields
 export const addIC = createAsyncThunk(
-    'infrastructure/addIC',
-    async (data, {rejectWithValue}) => {
-        try {
-            //post request body: ic object that is to be added
-            const ic = {ic: data.ic};
-            const res = await RestAPI.post('/api/v2/ic/', ic, data.token);
-            return res;
-        } catch (error) {
-            console.log("Error adding IC: ", error);
-            return rejectWithValue(error.response.data);
-        }
+  "infrastructure/addIC",
+  async (data, { rejectWithValue }) => {
+    try {
+      //post request body: ic object that is to be added
+      const ic = { ic: data.ic };
+      const res = await RestAPI.post("/api/v2/ic/", ic, data.token);
+      return res;
+    } catch (error) {
+      console.log("Error adding IC: ", error);
+      return rejectWithValue(error.response.data);
     }
-)
+  }
+);
 
 //sends an action to IC. Data object must contain a token, IC's id and actions string
 export const sendActionToIC = createAsyncThunk(
-    'infrastructure/sendActionToIC',
-    async (data, {rejectWithValue}) => {
-        try {
-            const token = data.token;
-            const id = data.id;
-            let actions = data.actions;
-
-            console.log("actions: ", actions)
-
-            if (!Array.isArray(actions))
-                actions = [ actions ]
-
-            for (let action of actions) {
-                if (action.when) {
-                  // Send timestamp as Unix Timestamp
-                  action.when = Math.round(new Date(action.when).getTime() / 1000);
-                }
-            }
-
-            const res = await RestAPI.post('/api/v2/ic/'+id+'/action', actions, token);
-            NotificationsDataManager.addNotification(NotificationsFactory.ACTION_INFO());
-            return res;
-         } catch (error) {
-            console.log("Error sending an action to IC: ", error);
-            return rejectWithValue(error.response.data);
-         }
+  "infrastructure/sendActionToIC",
+  async (data, { rejectWithValue }) => {
+    try {
+      const token = data.token;
+      const id = data.id;
+      let actions = data.actions;
+
+      if (!Array.isArray(actions)) actions = [actions];
+
+      for (let action of actions) {
+        if (action.when) {
+          // Send timestamp as Unix Timestamp
+          action.when = Math.round(new Date(action.when).getTime() / 1000);
+        }
+      }
+
+      const res = await RestAPI.post(
+        "/api/v2/ic/" + id + "/action",
+        actions,
+        token
+      );
+      NotificationsDataManager.addNotification(
+        NotificationsFactory.ACTION_INFO()
+      );
+      return res;
+    } catch (error) {
+      console.log("Error sending an action to IC: ", error);
+      return rejectWithValue(error.response.data);
     }
-)
+  }
+);
 
 //send a request to update IC's data. Data object must contain token, and updated ic object
 export const editIC = createAsyncThunk(
-    'infrastructure/editIC',
-    async (data, {rejectWithValue}) => {
-        try {
-            //post request body: ic object that is to be added
-            const {token, ic} = data;
-            const res = await RestAPI.put('/api/v2/ic/'+ic.id, {ic: ic}, token);
-            return res;
-        } catch (error) {
-            return rejectWithValue(error.response.data);
-        }
+  "infrastructure/editIC",
+  async (data, { rejectWithValue }) => {
+    try {
+      //post request body: ic object that is to be added
+      const { token, ic } = data;
+      const res = await RestAPI.put("/api/v2/ic/" + ic.id, { ic: ic }, token);
+      return res;
+    } catch (error) {
+      return rejectWithValue(error.response.data);
     }
-)
+  }
+);
 
 //send a request to delete IC. Data object must contain token, and id of the IC that is to be deleted
 export const deleteIC = createAsyncThunk(
-    'infrastructure/deleteIC',
-    async (data, {rejectWithValue}) => {
-        try {
-            //post request body: ic object that is to be added
-            const {token, id} = data;
-            const res = await RestAPI.delete('/api/v2/ic/'+id, token);
-            return res;
-        } catch (error) {
-            console.log("Error updating IC: ", error);
-            return rejectWithValue(error.response.data);
-        }
+  "infrastructure/deleteIC",
+  async (data, { rejectWithValue }) => {
+    try {
+      //post request body: ic object that is to be added
+      const { token, id } = data;
+      const res = await RestAPI.delete("/api/v2/ic/" + id, token);
+      return res;
+    } catch (error) {
+      console.log("Error updating IC: ", error);
+      return rejectWithValue(error.response.data);
     }
-)
-
+  }
+);
 
 //TODO
 
 //restarts ICs
 export const restartIC = createAsyncThunk(
-    'infrastructure/restartIC',
-    async (data) => {
-        try {
-            const url = data.apiurl + '/restart'
-            const res = await RestAPI.post(data.apiurl, null);
-            console.log(res)
-            return res;
-        } catch (error) {
-            console.log("Error restarting IC: ", error);
-        }
+  "infrastructure/restartIC",
+  async (data) => {
+    try {
+      const url = data.apiurl + "/restart";
+      const res = await RestAPI.post(data.apiurl, null);
+      return res;
+    } catch (error) {
+      console.log("Error restarting IC: ", error);
     }
-)
-
+  }
+);
 
 //shut ICs down
 export const shutdownIC = createAsyncThunk(
-    'infrastructure/shutdownIC',
-    async (data) => {
-        try {
-            const url = data.apiurl + '/shutdown'
-            const res = await RestAPI.post(data.apiurl, null);
-            console.log(res)
-            return res;
-        } catch (error) {
-            console.log("Error shutting IC down: ", error);
-        }
+  "infrastructure/shutdownIC",
+  async (data) => {
+    try {
+      const url = data.apiurl + "/shutdown";
+      const res = await RestAPI.post(data.apiurl, null);
+      return res;
+    } catch (error) {
+      console.log("Error shutting IC down: ", error);
     }
-)
-
+  }
+);
 
-export const {updateCheckedICs, clearCheckedICs, openEditModal, openDeleteModal, closeDeleteModal, closeEditModal} = icSlice.actions;
+export const {
+  updateCheckedICs,
+  clearCheckedICs,
+  openEditModal,
+  openDeleteModal,
+  closeDeleteModal,
+  closeEditModal,
+} = icSlice.actions;
 
 export default icSlice.reducer;
-
diff --git a/src/store/index.js b/src/store/index.js
index 71f8893b..9ac5b717 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -16,21 +16,21 @@
  ******************************************************************************/
 
 import { configureStore } from "@reduxjs/toolkit";
-import icReducer from './icSlice';
-import configReducer from './configSlice'
+import icReducer from "./icSlice";
+import configReducer from "./configSlice";
 import { apiSlice } from "./apiSlice";
-import authReducer from './authSlice';
-import websocketReducer from './websocketSlice';
+import authReducer from "./authSlice";
+import websocketReducer from "./websocketSlice";
 
 export const store = configureStore({
-    reducer: {
-        auth: authReducer,
-        infrastructure: icReducer,
-        config: configReducer,
-        websocket: websocketReducer,
-        [apiSlice.reducerPath]: apiSlice.reducer,
-    },
-    middleware: (getDefaultMiddleware) =>
+  reducer: {
+    auth: authReducer,
+    infrastructure: icReducer,
+    config: configReducer,
+    websocket: websocketReducer,
+    [apiSlice.reducerPath]: apiSlice.reducer,
+  },
+  middleware: (getDefaultMiddleware) =>
     getDefaultMiddleware().concat(apiSlice.middleware),
-    devTools: true,
-})
+  devTools: true,
+});
diff --git a/src/store/websocketSlice.js b/src/store/websocketSlice.js
index 240ddcbc..2312a093 100644
--- a/src/store/websocketSlice.js
+++ b/src/store/websocketSlice.js
@@ -20,168 +20,198 @@ import { wsManager } from "../common/api/websocket-api";
 import { current } from "@reduxjs/toolkit";
 
 export const connectWebSocket = createAsyncThunk(
-    'websocket/connect',
-    async ({ url, id, length }, { dispatch, getState }) => {
-
-      console.log('Want to connect to', url);
-
-      //check if we are already connected to this socket
-      if(getState().websocket.activeSocketURLs.includes(url)) return;  
-      
-      return new Promise((resolve, reject) => {
-        dispatch(addActiveSocket({parameters: {id: id, url: url, length: length}}));
-        wsManager.connect(
-          id,
-          url,
-          (msgs, id) => {
-            const icdata = {
-              input: {
-                sequence: -1,
-                length: length,
-                version: 2,
-                type: 0,
-                timestamp: Date.now(),
-                values: new Array(length).fill(0),
-              },
-              output: {
-                values: [],
-              },
-            };
-  
-            const MAX_VALUES = 10000;
-  
-            if (msgs.length > 0) {
-              for (let j = 0; j < msgs.length; j++) {
-                let smp = msgs[j];
-  
-                if (smp.source_index !== 0) {
-                  for (let i = 0; i < smp.length; i++) {
-                    while (icdata.input.values.length < i + 1) {
-                      icdata.input.values.push([]);
-                    }
-  
-                    icdata.input.values[i] = smp.values[i];
-  
-                    if (icdata.input.values[i].length > MAX_VALUES) {
-                      const pos = icdata.input.values[i].length - MAX_VALUES;
-                      icdata.input.values[i].splice(0, pos);
-                    }
-                  }
-  
-                  icdata.input.timestamp = smp.timestamp;
-                  icdata.input.sequence = smp.sequence;
-                } else {
-                  for (let i = 0; i < smp.length; i++) {
-                    while (icdata.output.values.length < i + 1) {
-                      icdata.output.values.push([]);
-                    }
-  
-                    icdata.output.values[i].push({ x: smp.timestamp, y: smp.values[i] });
-  
-                    if (icdata.output.values[i].length > MAX_VALUES) {
-                      const pos = icdata.output.values[i].length - MAX_VALUES;
-                      icdata.output.values[i].splice(0, pos);
-                    }
-                  }
-  
-                  icdata.output.timestamp = smp.timestamp;
-                  icdata.output.sequence = smp.sequence;
+  "websocket/connect",
+  async ({ url, id, inputValues }, { dispatch, getState }) => {
+    //check if we are already connected to this socket
+    if (getState().websocket.activeSocketURLs.includes(url)) return;
+
+    return new Promise((resolve, reject) => {
+      dispatch(
+        addActiveSocket({
+          parameters: { id: id, url: url, inputValues: inputValues },
+        })
+      );
+      wsManager.connect(
+        id,
+        url,
+        (msgs, id) => {
+          const icdata = {
+            input: {
+              version: 2,
+              type: 0,
+              sequence: -1,
+              length: inputValues.length,
+              timestamp: Date.now(),
+              values: inputValues,
+            },
+            output: {
+              values: [],
+            },
+          };
+
+          const MAX_VALUES = 10000;
+
+          if (msgs.length > 0) {
+            for (let j = 0; j < msgs.length; j++) {
+              let smp = msgs[j];
+
+              for (let i = 0; i < smp.length; i++) {
+                while (icdata.output.values.length < i + 1) {
+                  icdata.output.values.push([]);
                 }
+
+                icdata.output.values[i].push({
+                  x: smp.timestamp,
+                  y: smp.values[i],
+                });
+
+                if (icdata.output.values[i].length > MAX_VALUES) {
+                  const pos = icdata.output.values[i].length - MAX_VALUES;
+                  icdata.output.values[i].splice(0, pos);
+                }
+
+                icdata.output.timestamp = smp.timestamp;
+                icdata.output.sequence = smp.sequence;
               }
-              
-              // Dispatch the action to update the Redux state
-              dispatch(updateIcData({ id, newIcData: icdata }));
             }
-          },
-          () => {
-            console.log('WebSocket connected to:', url);
-            resolve(); // Resolve the promise on successful connection
-          },
-          () => {
-            console.log('WebSocket disconnected from:', url);
-            dispatch(disconnect());
-            reject(); // Reject the promise if the connection is closed
+
+            // Dispatch the action to update the Redux state
+            dispatch(updateIcData({ id, newIcData: icdata }));
           }
-        );
-      });
-    }
+        },
+        () => {
+          wsManager.send(id, {
+            version: 2,
+            type: 0,
+            sequence: 0,
+            timestamp: Date.now(),
+            source_index: 1,
+            length: inputValues.length,
+            values: inputValues,
+          });
+          resolve();
+        },
+        () => {
+          console.log("WebSocket disconnected from:", url);
+          dispatch(disconnect());
+          reject();
+        }
+      );
+    });
+  }
 );
 
 const websocketSlice = createSlice({
-  name: 'websocket',
+  name: "websocket",
   initialState: {
     icdata: {},
-    activeSocketURLs: []
+    activeSocketURLs: [],
   },
   reducers: {
     addActiveSocket: (state, action) => {
-        const {url, id, length} = action.payload.parameters;
-        const currentSockets = current(state.activeSocketURLs);
-        state.activeSocketURLs = [...currentSockets, url];
-        state.icdata[id] = {input: {
-            sequence: -1,
-            length: length,
-            version: 2,
-            type: 0,
-            timestamp: Date.now(),
-            values: new Array(length).fill(0)
-        }, output: {}};
+      const { url, id, inputValues } = action.payload.parameters;
+      const currentSockets = current(state.activeSocketURLs);
+      state.activeSocketURLs = [...currentSockets, url];
+      state.icdata[id] = {
+        input: {
+          sequence: -1,
+          length: inputValues.length,
+          version: 2,
+          type: 0,
+          timestamp: Date.now(),
+          values: inputValues,
+        },
+        output: {},
+      };
+    },
+    reportLength:(state,action)=>{
+      return {
+        ...state,
+        values:new Array(action.payload).fill(0)
+      }
+    },
+    initValue:(state,action)=>{
+      let {idx,initVal} = action.payload
+     state.values.splice(idx,1,initVal)
     },
     disconnect: (state, action) => {
-      wsManager.disconnect(action.payload.id); // Ensure the WebSocket is disconnected
+      if (action.payload) {
+        wsManager.disconnect(action.payload.id); // Ensure the WebSocket is disconnected
+      }
     },
     updateIcData: (state, action) => {
       const { id, newIcData } = action.payload;
       const currentICdata = current(state.icdata);
-      if(currentICdata[id].output.values){
-        const {values, ...rest} = newIcData.output;
+      if (currentICdata[id].output.values) {
+        const { values, ...rest } = newIcData.output;
         let oldValues = [...currentICdata[id].output.values];
-        for(let i = 0; i < newIcData.output.values.length; i++){
-            oldValues[i] = [...oldValues[i], ...values[i]]
+        for (let i = 0; i < newIcData.output.values.length; i++) {
+          oldValues[i] = [...oldValues[i], ...values[i]];
         }
-        state.icdata[id] = {
-            input: newIcData.input,
-            output: {
+        return {
+          ...state,
+          icdata:{
+            ...state.icdata,
+            [id]:{
+              ...state.icdata[id],
+              output:{
                 ...rest,
-                values: oldValues
+                values:oldValues
+              }
             }
+          }
         }
       } else {
-        state.icdata[id] = {
-          ...newIcData,
-        };
+        console.log(newIcData)
+        return {
+          ...state,
+          icdata:{
+            ...state.icdata,
+            [id]:{
+              ...newIcData
+            }
+          }
+        }
       }
     },
+    //widget changes a value in input values array and they are sent to the websocket
     sendMessageToWebSocket: (state, action) => {
-        const { ic, signalID, signalIndex, data} = action.payload.message;
-        const currentICdata = current(state.icdata);
-
-        if (!(ic == null || currentICdata[ic].input == null)) {
-            const inputAction = JSON.parse(JSON.stringify(currentICdata[ic].input));
-            // update message properties
-            inputAction.timestamp = Date.now();
-            inputAction.sequence++;
-            inputAction.values[signalIndex] = data;
-            inputAction.length = inputAction.values.length;
-            inputAction.source_index = signalID;
-            // The previous line sets the source_index field of the message to the ID of the signal
-            // so that upon loopback through VILLASrelay the value can be mapped to correct signal
-    
-            state.icdata[ic].input = inputAction;
-            let input = JSON.parse(JSON.stringify(inputAction));
-            wsManager.send(ic, input);
+      const { ic, signalID, signalIndex, data } = action.payload.message;
+
+      if (ic != null && state.icdata[ic] && state.icdata[ic].input) {
+        const inputMessage = state.icdata[ic].input;
+
+        inputMessage.timestamp = Date.now();
+        inputMessage.sequence++;
+
+        //replace only the value of the taget signal if rest of the payload is valid
+        if (
+          Array.isArray(inputMessage.values) &&
+          signalIndex >= 0 &&
+          signalIndex < inputMessage.values.length
+        ) {
+          inputMessage.values[signalIndex] = data;
         }
-    }
+
+        inputMessage.length = inputMessage.values.length;
+        inputMessage.source_index = signalID;
+
+        wsManager.send(ic, JSON.parse(JSON.stringify(inputMessage)));
+      }
+    },
   },
   extraReducers: (builder) => {
-    builder.addCase(connectWebSocket.fulfilled, (state, action) => {
-      // Handle the fulfilled state if needed
-    });
+    builder.addCase(connectWebSocket.fulfilled, (state, action) => {});
     builder.addCase(connectWebSocket.rejected, (state, action) => {
-      console.log('error', action);
+      console.log("error", action);
     });
   },
 });
 
-export const { disconnect, updateIcData, addActiveSocket, sendMessageToWebSocket } = websocketSlice.actions;
+export const {
+  disconnect,
+  updateIcData,
+  addActiveSocket,
+  sendMessageToWebSocket,
+} = websocketSlice.actions;
 export default websocketSlice.reducer;
diff --git a/src/branding/opalrt/opalrt-values.js b/src/utils/timeAgo.js
similarity index 50%
rename from src/branding/opalrt/opalrt-values.js
rename to src/utils/timeAgo.js
index 119b5d8d..1bc5599b 100644
--- a/src/branding/opalrt/opalrt-values.js
+++ b/src/utils/timeAgo.js
@@ -15,26 +15,29 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-const villasweb_values = {
-  title: 'OPAL-RT VILLASweb',
-  //  subtitle: 'OPAL-RT Web Dashboards',
-  logo: 'logo_opalrt_square.svg',
-  pages: {
-    home: true,
-    scenarios: true,
-    infrastructure: true,
-    account: true,
-    api: true,
-  },
-  style: {
-    background: '#f0f4f7',
-    backgroundText: '#000000',
-    highlights: '#1158a2',
-    main: '#092f56',
-    secondaryText: '#c4c4c4',
-    fontFamily: 'Open Sans',
-    // borderRadius: ''
+//returns a text that says how many seconds, minutes, .. , years has passed since the given date
+const timeAgo = (date) => {
+  const now = new Date();
+  const past = new Date(date);
+  const diffSec = Math.floor((now - past) / 1000);
+
+  const intervals = [
+    { label: "year", seconds: 31536000 },
+    { label: "month", seconds: 2592000 },
+    { label: "day", seconds: 86400 },
+    { label: "hour", seconds: 3600 },
+    { label: "minute", seconds: 60 },
+    { label: "second", seconds: 1 },
+  ];
+
+  for (const interval of intervals) {
+    const count = Math.floor(diffSec / interval.seconds);
+    if (count >= 1) {
+      return `${count} ${interval.label}${count !== 1 ? "s" : ""} ago`;
+    }
   }
-}
 
-export default villasweb_values;
+  return "just now";
+};
+
+export default timeAgo;
diff --git a/src/branding/villasweb/villasweb-values.js b/src/utils/uuidv4.js
similarity index 66%
rename from src/branding/villasweb/villasweb-values.js
rename to src/utils/uuidv4.js
index f1f368b2..ffe1a1d7 100644
--- a/src/branding/villasweb/villasweb-values.js
+++ b/src/utils/uuidv4.js
@@ -15,24 +15,13 @@
  * along with VILLASweb. If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
 
-const villasweb_values = {
-  title: 'VILLASweb',
-  subtitle: 'ACS',
-  logo: 'villas_web.svg',
-  pages: {
-    home: true,
-    scenarios: true,
-    infrastructure: true,
-    usergroups: true,
-    account: true,
-    api: true,
-  },
-  style: {
-    background: '#6EA2B0',
-    highlights: '#527984',
-    main: '#4d4d4d',
-    secondaryText: '#818181',
-  }
-}
+const uuidv4 = () => {
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
+    // eslint-disable-next-line
+    var r = (Math.random() * 16) | 0,
+      v = c === "x" ? r : (r & 0x3) | 0x8;
+    return v.toString(16);
+  });
+};
 
-export default villasweb_values;
+export default uuidv4;