Add hakken dates for 2025

Reviewed-on: pub-solar/pub.solar#31
Reviewed-by: b12f <b12f@noreply.git.pub.solar>
Co-authored-by: janhaa <janhaa@noreply.git.pub.solar>
Co-committed-by: janhaa <janhaa@noreply.git.pub.solar>

.drone.yml

@@ -8,7 +8,7 @@ steps:
       event:
         - push
         - pull_request
-    image: denoland/deno:alpine-1.33.3
+    image: denoland/deno:alpine-1.43.6
     commands:
       - deno task build
 
@@ -20,7 +20,7 @@ steps:
         - main
     image: appleboy/drone-scp
     settings:
-      host: flora-6.pub.solar
+      host: 10.7.6.1 # nachtigall.pub.solar
       port: 22
       username:
         from_secret: ps_ssh_user

Dockerfile

@@ -1,4 +1,4 @@
-FROM denoland/deno:alpine-1.33.3
+FROM denoland/deno:alpine-1.43.6
 
 WORKDIR /site
 COPY . .

README.md

@@ -3,19 +3,32 @@
 This is the repository containing the code for https://pub.solar.
 
 It is built using [lume](https://lume.land/) with JSX. To get started, make sure
-you're loading all dependencies via `direnv`:
+you have the [nix package manager](https://nixos.org/download.html) installed.
+Then you can start developing with:
+
+### Quick start
 
 ```
-$ direnv allow
+nix develop
 ```
 
-This will use nix shell to create an environment that has deno and lume
+This will use a [nix devshell](https://nix.dev/tutorials/first-steps/ad-hoc-shell-environments#ad-hoc-envs)
+to create an environment that has [deno](https://deno.land/) and [lume](https://lume.land/)
 available.
 
+An alternative approach for loading all dependencies is [`direnv`](https://direnv.net).
+It basically runs `nix develop` for you, once you enter a directory which
+contains a `.envrc` file and allow it by running `direnv allow`. Once installed
+globally, run:
+
+```
+direnv allow
+```
+
 To get a live development server, run
 
 ```
-$ deno task serve
+deno task serve
 ```
 
 Unfortunately, hot module reloading is currently broken for JSX modules, so
@@ -27,3 +40,50 @@ To update the font files and CSS, run `google-font-downloader $FONT_CSS_URL`.
 As "documentation" `flake.nix` shows the internals, and
 `_includes/styles/typography.css` has a comment at the top that shows which
 command was used to generate it.
+
+### Deployment
+
+Our [Drone CI](https://ci.pub.solar/pub-solar/pub.solar) is configured to
+deploy the `main` branch to the production website. To integrate any changes,
+first create a pull request, which will be reviewed. After merging it, the new
+version will get deployed automatically.
+
+### Troubleshooting
+
+When running `deno task serve`, if you see an error message like:
+
+```
+NotFound: No such file or directory (os error 2): stat '/home/<user>/.../git.pub.solar/pub-solar/pub.solar/.direnv/flake-inputs/5acdh8xyry0kdvp6xla2hw7wf3zkphkl-source/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/pkgs/by-name/fo/foo/foo.nix'
+    at Object.statSync (ext:deno_fs/30_fs.js:362:7)
+    at FS.#walkLink (https://deno.land/x/lume@v2.0.1/core/fs.ts:143:23)
+    at FS.#walkFs (https://deno.land/x/lume@v2.0.1/core/fs.ts:117:23)
+    at FS.#walkFs (https://deno.land/x/lume@v2.0.1/core/fs.ts:136:21)
+    at FS.#walkFs (https://deno.land/x/lume@v2.0.1/core/fs.ts:136:21)
+    at FS.#walkFs (https://deno.land/x/lume@v2.0.1/core/fs.ts:136:21)
+    at FS.#walkFs (https://deno.land/x/lume@v2.0.1/core/fs.ts:136:21)
+    at FS.#walkFs (https://deno.land/x/lume@v2.0.1/core/fs.ts:136:21)
+    at FS.#walkFs (https://deno.land/x/lume@v2.0.1/core/fs.ts:136:21)
+    at FS.#walkFs (https://deno.land/x/lume@v2.0.1/core/fs.ts:136:21) {
+  name: "NotFound",
+  code: "ENOENT"
+}
+```
+
+try removing the .direnv directory:
+
+```
+rm -rf .direnv
+deno task serve
+```
+
+Another common error message after updating dependencies is:
+
+```
+22.31 error: The source code is invalid, as it does not match the expected hash in the lock file.
+```
+
+To recreate the deno lock file, run
+
+```
+deno cache --lock=deno.lock --lock-write _config.ts
+```

_config.ts

@@ -7,25 +7,56 @@ import postcss from "lume/plugins/postcss.ts";
 
 const site = lume();
 
+const languages = [
+  {
+    name: 'deutsch',
+    slug: 'de',
+    urlPrefix: 'de',
+  },
+  {
+    name: 'english',
+    slug: 'en',
+    urlPrefix: '',
+  },
+];
+site.data('languages', languages);
+
+site.preprocess([ '.yml' ], (pages) => {
+  for (const page of pages) {
+    const urlParts = (page.data.url || '').replace(/^\/|\/$/g, '').split('/');
+    const langPrefix = urlParts[0];
+    const currentLang = (() => {
+      if (langPrefix.length === 2) {
+        return languages.find(lang => lang.urlPrefix === langPrefix);
+      }
+
+      return languages.find(lang => lang.urlPrefix.length === 0);
+    })() || languages[0];
+
+    page.data.language = currentLang;
+    page.data.otherLang = languages.find(l => l.slug !== currentLang.slug);
+    page.data.baseURL = page.data.url.replace(new RegExp(`^\\/${currentLang.slug}`), '');
+  }
+});
+
 site.use(sass());
 site.use(date());
 site.use(jsx());
 site.use(terser());
 site.use(postcss());
 
-site.loadAssets([
+site.loadAssets([ ".js" ]);
-  ".png",
-  ".jpg",
-  ".svg",
-  ".pdf",
-  ".woff2",
-  ".woff",
-  ".ttf",
-  ".otf",
-  ".js",
-  ".txt",
-]);
 
-site.ignore("README.md", "CHANGELOG.md", "LICENSE.md", "docker-compose.yml");
+site.copy("assets");
+site.copy("fonts");
+
+site.ignore(
+  ".direnv",
+  "README.md",
+  "CHANGELOG.md",
+  "LICENSE.md",
+  "docker-compose.yml",
+);
 
 export default site;
+

_data/cacheBust.yml

@@ -1 +1 @@
-'?v=3'
+'?v=5'

_data/hakken.yml

@@ -0,0 +1,79 @@
+dates:
+  - name: Winter 2025
+    id: winter-2025
+    theme: Winter Hakken
+    location:
+      en: Cologne @ [MiOM space](https://miom.space)
+      de: Köln @ [MiOM Kreativraum](https://miom.space)
+
+  - name: Spring 2025
+    id: spring-2025
+    theme: Spring Hakken
+    location:
+      en: Cologne @ [MiOM space](https://miom.space)
+      de: Köln @ [MiOM Kreativraum](https://miom.space)
+
+  - name: Summer 2025
+    id: summer-2025
+    theme: Summer Hakken
+    location:
+      en: Cologne @ [MiOM space](https://miom.space)
+      de: Köln @ [MiOM Kreativraum](https://miom.space)
+
+  - name: Autumn 2025
+    id: autumn-2025
+    theme: Autumn Hakken
+    location:
+      en: Cologne @ [MiOM space](https://miom.space)
+      de: Köln @ [MiOM Kreativraum](https://miom.space)
+
+strings:
+  when:
+    en: 'When'
+    de: 'Wann'
+  where:
+    en: 'Where'
+    de: 'Wo'
+  comingDates:
+    en: 'Upcoming dates'
+    de: 'Kommende Termine'
+  friday:
+    en: 'friday'
+    de: 'Freitag'
+  saturday:
+    en: 'saturday'
+    de: 'Samstag'
+  sunday:
+    en: 'sunday'
+    de: 'Sonntag'
+  until:
+    en: 'until'
+    de: 'bis'
+  theme:
+    en: 'Theme'
+    de: 'Thema'
+  months:
+    - en: 'January'
+      de: 'Januar'
+    - en: 'February'
+      de: 'Februar'
+    - en: 'March'
+      de: 'März'
+    - en: 'April'
+      de: 'April'
+    - en: 'May'
+      de: 'Mai'
+    - en: 'June'
+      de: 'Juni'
+    - en: 'July'
+      de: 'Juli'
+    - en: 'August'
+      de: 'August'
+    - en: 'September'
+      de: 'September'
+    - en: 'October'
+      de: 'Oktober'
+    - en: 'November'
+      de: 'November'
+    - en: 'December'
+      de: 'Dezember'

_data/services.yml

@@ -0,0 +1,366 @@
+services:
+  - name: Nextcloud
+    id: nextcloud
+    description:
+      en: Store your files, calendar, contacts and many other things in the pub.solar cloud. Access from all your devices. An alternative to Google Cloud, Apple's iCloud or Microsoft Office.
+      de: Sichere deine Dateien, Kalender, Kontakte und vieles mehr in der pub.solar Cloud. Mit Zugriff von all deinen Geräten. Eine Alternative zur Google Cloud, Apples iCloud oder Microsoft Office.
+    link: https://cloud.pub.solar
+    wiki: https://wiki.pub.solar/index.php/Nextcloud
+    support:
+      status: yes # yes partial no
+    backups:
+      status: untested # fully-automated untested not-applicable no
+    anonymousUsage:
+      status: no # yes partial no
+    zeroKnowledge: # yes partial no
+      status: no
+      comment:
+        en: |
+          By default, no data in Nextcloud is encrypted and everything is readable and changeable by pub.solar administrators.
+
+          However, we have installed the [End-to-End Encryption app](https://apps.nextcloud.com/apps/end_to_end_encryption) which gives you the option to encrypt files before they are sent to the pub.solar cloud.
+
+          This application has horrible reviews, with lots of people saying they suffered dataloss. Though we offer this option, **there will be no support or help** if you use this app and lose data.
+        de: |
+          Standardmäßig sind keine Daten in Nextcloud verschlüsselt und alles ist für pub.solar-Administratoren lesbar und veränderbar.
+
+          Wir haben jedoch die [Ende-zu-Ende Verschlüsselungs-App] (https://apps.nextcloud.com/apps/end_to_end_encryption) installiert, die dir die Möglichkeit gibt Dateien zu verschlüsseln, bevor sie an die pub.solar-Cloud gesendet werden.
+
+          Diese Anwendung hat schreckliche Rezensionen, in denen viele Personen angeben Daten verloren zu haben. Obwohl wir diese Option anbieten, **wird es keine Unterstützung oder Hilfe unsererseits geben**, falls du diese App verwendest und Daten verloren gehen.
+    storageEncrypted: # yes no
+      status: yes
+    loggingMinimized: # yes partial no
+      status: no
+    decentralized: # yes partial no
+      status: yes
+
+  - name: Mastodon
+    id: mastodon
+    description:
+      en: Social networking and microblogging. A decentralized alternative to X (Twitter).
+      de: Soziales Netzwerken und Microblogging. Eine dezentrale Alternative zu X (Twitter).
+    link: https://mastodon.pub.solar
+    support:
+      status: yes # yes partial no
+    backups:
+      status: untested # fully-automated untested not-applicable no
+    anonymousUsage:
+      status: partial # yes partial no
+      comment:
+        en: You can use our [web interface](https://mastodon.pub.solar) to read posts, but if you want to post stuff yourself you will need a pub.solar ID.
+        de: Du kannst unser [Web Interface](https://mastodon.pub.solar) benutzen, um Beiträge zu lesen, aber wenn du selber einen Beitrag verfassen möchtest, benötigst du eine pub.solar ID.
+    zeroKnowledge: # yes partial no
+      status: no
+    storageEncrypted: # yes no
+      status: yes
+    loggingMinimized: # yes partial no
+      status: no
+    decentralized: # yes partial no
+      status: yes
+
+  - name: Matrix
+    id: matrix
+    description:
+      en: Matrix is a decentralized, encrypted chat service. It can be used as an alternative to tools like Discord, Slack, or IRC. In fact, Matrix can bridge into these other chat tools, allowing you to chat with everyone from one place.
+      de: Matrix ist ein dezentraler, verschlüsselter Chat Service. Es kann als Alternative zu Programmen wie Discord, Slack oder IRC benutzt werden. Matrix kann auch als Brücke zu diesen anderen Chat Programmen verwendet werden, was es dir erlaubt mit allen von einem Ort aus zu chatten.
+    link: https://chat.pub.solar
+    support:
+      status: yes # yes partial no
+    backups:
+      status: untested # fully-automated untested not-applicable no
+    anonymousUsage:
+      status: no # yes partial no
+    zeroKnowledge: # yes partial no
+      status: partial
+      comment:
+        en: |
+          By default pub.solar admins cannot read your messages, but there is metadata that is accessible:
+
+          * Who you are talking to
+          * When you are talking to them
+          * When you are online or offline
+
+          Also, some larger public rooms are unencrypted, and you have the option to turn off encryption on rooms you control.
+        de: |
+          Generell können pub.solar Administratoren eure Nachrichten nicht lesen, aber folgende Metadaten sind einsehbar:
+
+          * Mit wem du sprichst
+          * Wann du mit ihnen sprichst
+          * Wann du online oder offline bist
+
+          Manche größere öffentliche Räume sind unverschlüsselt und du hast die Option die Verschlüsselung für Räume auszuschalten, die du kontrollierst.
+    storageEncrypted: # yes no
+      status: yes
+    loggingMinimized: # yes partial no
+      status: no
+    decentralized: # yes partial no
+      status: yes
+
+  - name: Forgejo / git
+    id: forgejo
+    description:
+      en: git server
+      de: Git Server
+    link: https://git.pub.solar
+    support:
+      status: yes # yes partial no
+    backups:
+      status: untested # fully-automated untested nnot-applicable no
+    anonymousUsage:
+      status: no # yes partial no
+    zeroKnowledge: # yes partial no
+      status: no
+    storageEncrypted: # yes no
+      status: yes
+    loggingMinimized: # yes partial no
+      status: no
+    decentralized: # yes partial no
+      status: no
+
+  - name: Wiki
+    id: wiki
+    description:
+      en: Our wiki
+      de: Unser Wiki
+    link: https://wiki.pub.solar
+    support:
+      status: partial # yes partial no
+    backups:
+      status: untested # fully-automated untested not-applicable no
+      comment:
+        en: The database is backed up regularly, but not assets like images.
+        de: Für die Datenbank gibt es ein regelmäßiges Back-up, aber nicht für Bestandteile wie Bilder.
+    anonymousUsage:
+      status: partial # yes partial no
+    zeroKnowledge: # yes partial no
+      status: no
+    storageEncrypted: # yes no
+      status: yes
+    loggingMinimized: # yes partial no
+      status: no
+    decentralized: # yes partial no
+      status: no
+
+  - name: Mailman
+    id: mailman
+    description:
+      en: Mailing lists
+      de: Mailinglisten
+    link: https://list.pub.solar
+    support:
+      status: partial # yes partial no
+    backups:
+      status: untested # fully-automated untested not-applicable no
+    anonymousUsage:
+      status: no # yes partial no
+    zeroKnowledge: # yes partial no
+      status: no
+    storageEncrypted: # yes no
+      status: yes
+    loggingMinimized: # yes partial no
+      status: no
+    decentralized: # yes partial no
+      status: no
+
+  - name: OpenBikeSensor portal
+    id: obs-portal
+    description:
+      en: Portal for the OpenBikeSensor project. This portal currently only hosts the Cologne/Bonn region.
+      de: Portal für das OpenBikeSensor Projekt. Dieses Portal deckt zurzeit nur die Region Köln/Bonn ab.
+    link: https://obs-portal.pub.solar
+    support:
+      status: partial # yes partial no
+    backups:
+      status: untested # fully-automated untested not-applicable no
+    anonymousUsage:
+      status: no # yes partial no
+    zeroKnowledge: # yes partial no
+      status: no
+    storageEncrypted: # yes no
+      status: yes
+    loggingMinimized: # yes partial no
+      status: no
+    decentralized: # yes partial no
+      status: no
+
+  - name: Searx
+    id: searx
+    description:
+      en: Search engine
+      de: Suchmaschine
+    link: https://search.pub.solar
+    support:
+      status: no # yes partial no
+    backups:
+      status: not-applicable # fully-automated untested not-applicable no
+    anonymousUsage:
+      status: yes # yes partial no
+    zeroKnowledge: # yes partial no
+      status: yes
+    storageEncrypted: # yes no
+      status: yes
+    loggingMinimized: # yes partial no
+      status: no
+    decentralized: # yes partial no
+      status: not-applicable
+
+strings:
+  visit_service:
+    en: 'Visit service'
+    de: 'Zum Dienst'
+  wiki_help_page:
+    en: Wiki
+    de: Wiki
+  states:
+    yes:
+      en: Yes
+      de: Ja
+    partial:
+      en: Partial
+      de: Teilweise
+    no:
+      en: No
+      de: Nein
+    not-applicable:
+      en: Not applicable
+      de: Nicht zutreffend
+    fully-automated:
+      en: Fully automated
+      de: Komplett automatisiert
+    untested:
+      en: Yes, untested
+      de: Ja, nicht getestet
+  support:
+    name:
+      en: Support
+      de: Hilfe
+    description:
+      en: This badge describes how much love and support this service gets from the pub.solar community. Services with a higher level of support are less likely to suffer from outages or dataloss.
+      de: Dieses Schild beschreibt, wie viel Liebe und Unterstützung dieser Service von der pub.solar Gemeinschaft erhält. Services mit einem höheren Maß an Unterstützung sind weniger anfällig für Ausfälle oder Verlust von Daten.
+    states:
+      yes:
+        en: We consider this service to be part of our core. It is among our highest priority services to keep it online, up-to-date, and backed-up. This service will not be shut down without at least 3 months of prior notice.
+        de:  Wir betrachten diesen Service als wesentlichen Teil unserer Infrastruktur. Er gehört zu den Services mit der höchsten Priorität, die wir online, aktuell und gesichert halten. Dieser Service wird nicht ohne eine Vorankündigung von mindestens 3 Monaten abgeschaltet.
+      partial:
+        en: We have been running this service for a while, and it is probably going to be around to stay. However, it is not our highest priority. We could shut this service down with only a couple of days of prior notice.
+        de: Wir betreiben diesen Service schon seit einiger Zeit und er wird wahrscheinlich auch in Zukunft bestehen bleiben. Er hat jedoch nicht unsere höchste Priorität. Wir könnten diesen Service mit einer Vorankündigung von nur wenigen Tagen abschalten.
+      no:
+        en: This service started because someone thought it was fun to try out, as a test, or is very new. Expect changes, downtime, or even shutdown to happen at any time.
+        de: Dieser Service läuft weil jemand Spaß daran hatte, ihn auszuprobieren, als Test, oder er ist sehr neu. Rechne damit, dass es jederzeit zu Änderungen, Ausfallzeiten oder sogar zur Abschaltung kommen kann.
+  backups:
+    name:
+      en: Backups
+      de: Backups
+    description:
+      en: This badge shows whether the data in the service is automatically backed up every day.
+      de: Dieses Schild zeigt an, ob die Daten des Services täglich automatisch gesichert werden.
+    states:
+      yes:
+        en: Daily, encrypted backups are made automatically and are tested so we can also automatically restore the service.
+        de: Tägliche, verschlüsselte Backups werden automatisch erstellt und getestet, so dass wir den Service auch automatisch wiederherstellen können.
+      untested:
+        en: We run daily encrypted backups to an offsite location, but we do not have automated tests to see if recovery works. In a catastrophic event, recovery might take a long time.
+        de: Wir führen täglich verschlüsselte Sicherungen zu einem externen Standort durch, aber wir haben keine automatischen Tests, um festzustellen, ob die Wiederherstellung funktioniert. Im Katastrophenfall kann die Wiederherstellung sehr lange dauern.
+      not-applicable:
+        en: This service does not store any data to be backed up.
+        de: Bei diesem Service werden keine Daten gespeichert die gesichert werden müssen.
+      no:
+        en: Data from this service is not backed up. Expect dataloss any time.
+        de: Die Daten dieses Services werden nicht gesichert. Rechne jederzeit mit Datenverlusten.
+  anonymousUsage:
+    name:
+      en: Anonymous usage
+      de: Anonyme Benutzung
+    description:
+      en: This badge shows whether you can use the service without registering a pub.solar ID.
+      de: Dieses Schild zeigt an ob du den Service nutzen kannst ohne eine pub.solar ID zu registrieren.
+    states:
+      yes:
+        en: You can use all features of this service without logging in with a pub.solar ID.
+        de: Du kannst alle Funktionen dieses Services nutzen, ohne dich mit einer pub.solar ID anzumelden.
+      partial:
+        en: Some features of this service require you to log in with a pub.solar ID.
+        de: Für einige Funktionen dieses Services musst du dich mit einer pub.solar ID anmelden.
+      no:
+        en: You have to log in with a pub.solar ID to use this service.
+        de: Um diesen Service zu nutzen, musst du dich mit einer pub.solar ID anmelden.
+  zeroKnowledge:
+    name:
+      en: Zero knowledge
+      de: Zero knowledge
+    description:
+      en: This badge tells you how much access the pub.solar administrators have to your data in that service.
+      de: Dieses Schild zeigt dir, wie viel Zugriff die pub.solar Administratoren auf deine Daten in diesem Service haben.
+    states:
+      yes:
+        en: pub.solar administrators have no access to your data in this service.
+        de: Die Administratoren von pub.solar haben keinen Zugriff auf deine Daten in diesem Service.
+      partial:
+        en: Some of the data of this service is unreadable to pub.solar administrators, but not all.
+        de: Einige der Daten dieses Services sind für pub.solar Administratoren nicht einsehbar, aber nicht alle.
+      no:
+        en: All your data in this service is readable by pub.solar administrators.
+        de: Alle deine Daten in diesem Service sind für die Administratoren von pub.solar lesbar.
+  storageEncrypted:
+    name:
+      en: Storage encrypted
+      de: Verschlüsselter Speicher
+    description:
+      en: |
+        This badge tells you whether the service data is stored on encrypted drives. This protects against unwanted physical access to the servers, since only the pub.solar administrators can unlock the hard drive encryption.
+
+        ***Caveat***: Man-in-the-middle attacks that intercept the password in-transit when pub.solar administrators remotely unlock the disk can circumvent this. Do not rely on storage encryption to keep your data safe from highly-capable attackers like nation-states. Focus on the zero-knowledge badge if this is your threat-model.
+      de: |
+        Dieses Schild zeigt an, ob die Daten des Services auf verschlüsselten Laufwerken gespeichert sind. Dies schützt vor unerwünschtem physischen Zugriff auf die Server, da nur die pub.solar Administratoren die Festplatten entschlüsseln können.
+
+        ***Vorbehalt***: Man-in-the-middle Angriffe, die das Passwort beim Entsperren der Festplatte durch einen pub.solar Administrator aus der Ferne abfangen, könnten dies umgehen. Verlasse dich nicht auf die Speicherverschlüsselung, um Daten vor sehr gut ausgestatteten Angreifern wie Staaten zu schützen. Beachte bitte das Zero Knowledge Schild, wenn das dein Bedrohungsmodell ist.
+    states:
+      yes:
+        en: This service runs on a server with encrypted hard drives.
+        de: Dieser Service läuft auf einem Server mit verschlüsselten Festplatten.
+      no:
+        en: This service **does not** run on a server with encrypted hard drives.
+        de: Dieser Service läuft **nicht** auf einem Server mit verschlüsselten Festplatten.
+  loggingMinimized:
+    name:
+      en: Logging minimized
+      de: Minimiertes Logging
+    description:
+      en: This badge tells you whether we have configured the service and any related software so it logs as little data as possible.
+      de: Dieses Schild zeigt dir, ob wir den Service und die zugehörige Software so konfiguriert haben, dass so wenig Log-Dateien wie möglich aufgezeichnet werden.
+    states:
+      yes:
+        en: No logs are written at all.
+        de: Es werden keinerlei Logs erstellt.
+      partial:
+        en: We have reduced the amount of logging, but there is still some amount of activity logging going on.
+        de: Wir haben den Umfang des Logging reduziert, aber es wird immer noch ein gewisses Maß an Aktivitäten protokolliert.
+      no:
+        en: This service runs in its default logging configuration.
+        de: Dieser Service wird in seiner Standardkonfiguration für das Logging ausgeführt.
+  decentralized:
+    name:
+      en: Decentralized
+      de: Dezentralisiert
+    description:
+      en: |
+        This badge shows whether this service can interact and federate with services of similar types hosted by other people or organizations.
+
+        For example, you can send an email from your own provider to someone who has their address with some other provider. With facebook messages you cannot do this; all facebook messages have to go to other facebook users.
+      de: |
+        Dieses Schild zeigt an ob dieser Service mit Services ähnlicher Art, die von anderen Personen oder Organisationen betrieben werden, interagieren und föderieren kann.
+
+        Du kannst zum Beispiel eine E-Mail von deinem eigenen Anbieter an jemanden senden der seine E-Mail Adresse bei einem anderen Anbieter hat. Bei Facebook-Nachrichten ist dies nicht möglich; alle Facebook-Nachrichten können nur an andere Facebook-Nutzer gesendet werden.
+    states:
+      yes:
+        en: All relevant communication features of this service can interact and federate with other instances of similar services.
+        de: Alle relevanten Funktionen dieses Services können mit anderen Instanzen interagieren und föderieren.
+      partial:
+        en: Some features of this service can interact with other instances.
+        de: Einige Funktionen dieses Services können mit anderen Instanzen interagieren und föderieren.
+      not-applicable:
+        en: This service has no features that could be decentralized.
+        de: Dieser Service hat keine Funktionen, die dezentralisiert werden können.
+      no:
+        en: This service is centralized.
+        de: Dieser Service ist zentralisiert.

_includes/HakkenDates.tsx

@@ -1,4 +1,100 @@
-export default ({ lang, className }) => <div
+import { md, mdi } from '../filters.ts';
-  id={`dates-list-${lang}`}
+
+const days = {
+  'friday': 0,
+  'saturday': 1,
+  'sunday': 2,
+};
+
+const day = 24 * 60 * 60 * 1000;
+const week = 7 * day;
+const endOfWeekend = 2 * day;
+
+const getStartAndEnd = (date) => {
+  const [ version, year ] = date.name.split(' ');
+  const startingMonth = {
+    Winter: 1,
+    Spring: 4,
+    Summer: 7,
+    Autumn: 10,
+  }[version];
+
+  if (date.override_date) {
+    return {
+      start: new Date(date.override_date.start),
+      end: new Date(date.override_date.end)
+    };
+  }
+
+  // We start searching on the 20th of that specific month
+  const d = new Date();
+  d.setFullYear(parseInt(year, 10));
+  d.setMonth(startingMonth - 1);
+  d.setDate(20);
+
+  for (let i = 0; i < 14; i++) {
+    const dateToTry = new Date(d.valueOf() + (i * day));
+    if (dateToTry.getDay() !== 5) {
+      continue;
+    }
+
+    const oneWeekLater = new Date(dateToTry.valueOf() + week);
+    if (dateToTry.getMonth() === oneWeekLater.getMonth()) {
+      continue;
+    }
+
+    return {
+      start: dateToTry,
+      end: new Date(dateToTry.valueOf() + endOfWeekend),
+    };
+  }
+};
+
+export default ({ data, language, className = '', }) => {
+  const strings = data.strings;
+  const dates = data.dates;
+  const t = (o) => o?.[language.slug] || '';
+
+  return <section
+    id={`dates-list-${language.slug}`}
     className={`ps-hakken-dates ${className}`}
-></div>;
+  >
+    <h3>{t(strings.comingDates)}</h3>
+    <ul className="ps-hakken-dates--list">
+      {dates.map((date, i) => {
+        const { start, end } = getStartAndEnd(date);
+        const showStartMonth = start.getMonth() !== end.getMonth();
+        const untilString = [
+          t(strings.friday),
+          start.getDate() + '.',
+          showStartMonth ? t(strings.months[start.getMonth()]) : null,
+          t(strings.until),
+          t(strings.sunday),
+          end.getDate() + '.',
+          t(strings.months[end.getMonth()]),
+        ].filter(n => n !== null).join(' ');
+
+        return <li key={i} className="ps-hakken-dates--item">
+          <h4
+            id={date.id}
+            className="ps-hakken-dates--title"
+          >
+            {date.name} [{date.theme}]
+            <a
+              href={`#${date.id}`}
+              className="ps-hakken-dates--permalink"
+            >#</a>
+          </h4>
+          <div className="ps-hakken-dates--meta">
+            <p className="ps-hakken-dates--times">{t(strings.when)}: {untilString}.</p>
+            <p className="ps-hakken-dates--location">
+              {t(strings.where)}:{' '}
+              <span dangerouslySetInnerHTML={{ __html: mdi(t(date.location))}}></span>
+            </p>
+          </div>
+          <div dangerouslySetInnerHTML={{ __html: md(t(date.description)) }}></div>
+        </li>;
+      })}
+    </ul>
+  </section>;
+};

_includes/Head.tsx

@@ -3,11 +3,14 @@ import { title as titleFilter } from '../filters.ts';
 export default ({
   title,
   theme,
+  baseURL,
+  otherLang,
   extraStylesheets,
   extraScripts,
   cacheBust,
 }) => <head>
   <meta charSet="utf-8" />
+
   <title>{ titleFilter(title) }</title>
 
   <link rel="shortcut icon" href="/assets/pubsolar.svg" />
@@ -17,6 +20,8 @@ export default ({
 
   <meta id="viewport" name="viewport" content="width=device-width, initial-scale=1.0" />
 
+  <link rel="alternate" hrefLang={otherLang.slug} href={otherLang.urlPrefix ? `/${otherLang.urlPrefix}` : baseURL} />
+
   <link rel="stylesheet" type="text/css" href={`/styles.css${cacheBust}`} media="all" />
 
   <>

_includes/Langlink.tsx

@@ -0,0 +1,4 @@
+export default ({ otherLang, baseURL }) => <a
+  href={otherLang.urlPrefix ? `/${otherLang.urlPrefix }${baseURL}` : baseURL}
+  className="ps-homelink ps-homelink_lang"
+>{otherLang.slug}</a>

_includes/Services.tsx

@@ -0,0 +1,55 @@
+import { md, mdi } from '../filters.ts';
+
+const badges = [
+  "support",
+  "backups",
+  "anonymousUsage",
+  "zeroKnowledge",,
+  "loggingMinimized",
+  "decentralized",
+  "storageEncrypted",
+] as string[];
+
+export default ({ data, language, className = '', }) => {
+  const { services, strings } = data;
+  return <>
+    {services.map((service, i) => {
+      return <section key={i} className={`${className} ps-service`}>
+        <header className="ps-service--header">
+          <a href={service.link} className="ps-service--title-link" target="_blank">
+						<h2 className="ps-service--title" id={service.id}>{service.name} ↗</h2>
+					</a>
+
+          <div className="ps-service--links">
+            {service.wiki ? <a href={service.wiki} target="_blank">{ strings.wiki_help_page[language.slug] }</a> : null}
+          </div>
+        </header>
+
+        <div
+          className="ps-service--description"
+          dangerouslySetInnerHTML={{ __html: md(service.description[language.slug]) }}
+        ></div>
+        
+        <div className="ps-service--badges">
+          {badges.map((badge, i) => {
+            const { status, comment } = service[badge];
+
+            return <details key={i} className={`ps-service--badge ps-service--badge_${status}`}>
+              <summary className="ps-service--badge-header">
+                <div className="ps-service--badge-title">{strings[badge].name[language.slug]}</div> 
+                <div className="ps-service--badge-status">{strings.states[status][language.slug]}</div>
+              </summary>
+
+              <p dangerouslySetInnerHTML={{ __html: md(strings[badge].description[language.slug]) }}></p>
+              
+              <p dangerouslySetInnerHTML={{ __html: md(strings[badge].states[status][language.slug]) }}></p>
+
+              {comment ? <p dangerouslySetInnerHTML={{ __html: md(comment[language.slug]) }}></p> : null }
+            </details>;
+          })}
+        </div>
+
+      </section>;
+    })}
+  </>;
+};

_includes/layouts/default.tsx

@@ -2,23 +2,34 @@ import { md } from '../../filters.ts';
 import Head from '../Head.tsx';
 import Background from '../Background.tsx';
 import Homelink from '../Homelink.tsx';
+import Langlink from '../Langlink.tsx';
 import HakkenDates from '../HakkenDates.tsx';
+import Services from '../Services.tsx';
 
 export default ({
   title,
   content,
 
+  language,
+  otherLang,
+  baseURL,
   theme,
   extraStylesheets,
   extraScripts,
   cacheBust,
 
   showHakkenDates,
+  hakken,
+
+  showServices,
+  services,
 }) => <>
-  <html>
+  <html lang={language.slug}>
     <Head
       title={title}
       theme={theme}
+      otherLang={otherLang}
+      baseURL={baseURL}
       extraStylesheets={extraStylesheets}
       cacheBust={cacheBust}
       extraScripts={[...(extraScripts || []), '/scripts/copy-code.js']}
@@ -29,48 +40,15 @@ export default ({
 
       <Homelink />
 
+      <Langlink otherLang={otherLang} baseURL={baseURL} />
+
       <main className="ps-main--page ps-page">
-        <section
+        <div className="ps-page--contents">
-          lang="en"
+          <section dangerouslySetInnerHTML={{ __html: md(content) }}></section>
-          id="en"
+          {showServices ? <Services language={language} data={services} /> : null}
-          className="ps-page--section"
+          {showHakkenDates ? <HakkenDates language={language} data={hakken} /> : null}
-        >
+        </div>
-          <a
-            className="ps-page--section-link"
-            href="#de"
-          >
-            Deutsche übersetzung unten
-            <span className="ps-page--section-link-icon">▼</span>
-          </a>
 
-          <div
-            dangerouslySetInnerHTML={{ __html: md(content.en) }}
-            className="ps-page--section-contents"
-          ></div>
-
-          {showHakkenDates ? <HakkenDates lang="en" className="ps-page--section-contents" /> : null}
-        </section>
-
-        <section
-          lang="de"
-          id="de"
-          className="ps-page--section"
-        >
-          <a
-            className="ps-page--section-link"
-            href="#en"
-          >
-            English translation above 
-            <span className="ps-page--section-link-icon">▲</span>
-          </a>
-
-          <div
-            dangerouslySetInnerHTML={{ __html: md(content.de) }}
-            className="ps-page--section-contents"
-          ></div>
-
-          {showHakkenDates ? <HakkenDates lang="de" className="ps-page--section-contents" /> : null}
-        </section>
       </main>
     </body>
   </html>

_includes/layouts/error.tsx

@@ -0,0 +1,45 @@
+import { md } from '../../filters.ts';
+import Head from '../Head.tsx';
+import Background from '../Background.tsx';
+
+export default ({
+  title,
+  content,
+  code,
+
+  language,
+  otherLang,
+  baseURL,
+  theme,
+  extraStylesheets,
+  extraScripts,
+  cacheBust,
+}) => <>
+  <html lang={language.slug}>
+    <Head
+      title={title}
+      theme={theme}
+      otherLang={otherLang}
+      baseURL={baseURL}
+      extraStylesheets={extraStylesheets}
+      cacheBust={cacheBust}
+      extraScripts={extraScripts}
+    />
+    <body className="ps-main">
+      <Background />
+
+      <main className="ps-main--page ps-page ps-page_home">
+        <section
+          lang="en"
+          id="en"
+          className="ps-page--section"
+        >
+          <div
+            dangerouslySetInnerHTML={{ __html: md(content) }}
+            className="ps-page--section-contents"
+          ></div>
+        </section>
+      </main>
+    </body>
+  </html>
+</>;

_includes/layouts/homepage.tsx

@@ -1,29 +1,43 @@
+import { md } from '../../filters.ts';
 import Head from '../Head.tsx';
 import Background from '../Background.tsx';
+import Langlink from '../Langlink.tsx';
 
 export default ({
   title,
   content,
   links,
 
+  language,
+  otherLang,
+  baseURL,
   theme,
   extraStylesheets,
   extraScripts,
   cacheBust,
-
-  showHakkenDates,
 }) => <>
-  <html>
+  <html lang={language.slug}>
     <Head
       title={title}
       theme={theme}
+      otherLang={otherLang}
+      baseURL={baseURL}
       extraStylesheets={extraStylesheets}
       cacheBust={cacheBust}
       extraScripts={extraScripts}
     />
     <body className="ps-main">
       <Background />
+
+      <Langlink otherLang={otherLang} baseURL={baseURL} />
+
       <main className="ps-main--page ps-page ps-page_home">
+        <section
+          className="ps-page--contents"
+          dangerouslySetInnerHTML={{ __html: md(content) }}
+        ></section>
+
+        <section className="ps-page--links">
           {links.map(({ href, title, openInNewTab }) => 
             <a
               href={href}
@@ -32,12 +46,7 @@ export default ({
               key={href}
             >{title}</a>
           )}
-        <footer className="ps-footer">
+        </section>
-          <a
-            href="https://greenbaum.cloud"
-            className="ps-page--link ps-footer--link"
-          >climate-neutral hosting by Greenbaum Cloud</a>
-        </footer>
       </main>
     </body>
   </html>

_includes/layouts/services.tsx

@@ -0,0 +1,48 @@
+import { md } from '../../filters.ts';
+import Head from '../Head.tsx';
+import Background from '../Background.tsx';
+import Homelink from '../Homelink.tsx';
+import HakkenDates from '../HakkenDates.tsx';
+
+export default ({
+  title,
+  content,
+
+  language,
+  otherLang,
+  baseURL,
+  theme,
+  extraStylesheets,
+  extraScripts,
+  cacheBust,
+
+  showHakkenDates,
+  hakken,
+}) => <>
+  <html lang={language.slug}>
+    <Head
+      title={title}
+      theme={theme}
+      otherLang={otherLang}
+      baseURL={baseURL}
+      extraStylesheets={extraStylesheets}
+      cacheBust={cacheBust}
+      extraScripts={[...(extraScripts || []), '/scripts/copy-code.js']}
+    />
+    <body className="ps-main">
+
+      <Background />
+
+      <Homelink />
+
+      <main className="ps-main--page ps-page">
+        <div
+          dangerouslySetInnerHTML={{ __html: md(content) }}
+          className="ps-page--contents"
+        ></div>
+
+        {showHakkenDates ? <HakkenDates lang="en" className="ps-page--contents" data={hakken} /> : null}
+      </main>
+    </body>
+  </html>
+</>;

_includes/styles/hakken-dates.scss

@@ -1,4 +1,33 @@
 .ps-hakken-dates {
-  margin: 5vw;
+  &--list {
+    list-style: none;
+    padding: 0;
+  }
+
+  &--title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    &:target {
+      border-bottom: 4px solid var(--foreground);
+    }
+  }
+
+  &--permalink {
+    min-height: 2rem;
+  }
+
+  &--item {
+    border-left: 0.25rem solid var(--accent);
+    padding-left: 1rem;
+  }
+
+  &--times {
+    margin-bottom: 0;
+  }
+
+  &--location {
     margin-top: 0;
+  }
 }

_includes/styles/homelink.scss

@@ -10,21 +10,29 @@
   text-decoration: none;
   text-align: center;
   font-weight: 900;
-  font-size: 24px;
+  font-size: 1.5rem;
-  padding: 8px;
+  padding: 0.5rem;
   line-height: 1em;
-  text-shadow: 0.15vw 0px 0px white;
+  text-shadow: 0.1em 0px 0px white;
   transition: text-shadow 0.1s ease;
-  border: 12px solid black;
+  border: 1rem solid black;
   border-top: 0;
   border-left: 0;
 
   &:hover {
-    text-shadow: 0.3vw 0px 0px var(--accent);
+    text-shadow: 0.1em 0px 0px var(--accent);
   }
 
   @media screen and (min-width: 1200px) {
-    font-size: 32px;
+    font-size: 2rem;
-    padding: 12px;
+    padding: 1rem;
+  }
+
+  &_lang {
+    left: unset;
+    right: 0;
+    border: 1rem solid black;
+    border-top: 0;
+    border-right: 0;
   }
 }

_includes/styles/main.scss

@@ -6,8 +6,6 @@
   height: 100vh;
   width: 100vw;
   margin: 0;
-  padding-top: 10vw;
-  padding-bottom: 2vw;
   overflow: auto;
   position: relative;
 

_includes/styles/page.scss

@@ -2,33 +2,37 @@
   display: flex;
   width: 100vw;
   flex-direction: column;
-  align-items: center;
+  align-items: flex-start;
   justify-content: flex-start;
-  padding: 0;
+  padding: 1rem;
-
-  @media screen and (min-width: 1000px) {
   pointer-events: none;
-  }
 
   @media screen and (min-width: 1200px) {
-    padding: 1vw;
+    padding: 2rem;
-    flex-direction: row;
-    align-items: flex-start;
-  }
-
-  &_home {
     flex-direction: row;
     flex-wrap: wrap;
   }
 
-  &--section {
+  @media screen and (min-width: 1600px) {
+    padding: 4rem;
+  }
+
+  &_home {
+    flex-direction: column;
+    flex-wrap: nowrap;
+  }
+
+  &_home &--contents {
+    font-size: 1.25rem;
+  }
+
+  &--contents {
     border: 12px solid black;
-    margin-top: 10vh;
+    margin-top: 20rem;
-    margin-bottom: 10vh;
+    margin-bottom: 20rem;
     width: 100%;
-    max-width: 700px;
+    max-width: 800px;
     flex-basis: 100%;
-    font-size: 16px;
     flex-shrink: 1;
     pointer-events: all;
     color: var(--foreground);
@@ -36,13 +40,13 @@
     word-break: break-word;
     display: flex;
     flex-direction: column;
+    margin: 0;
+    font-weight: 500;
+    line-height: 1.75;
+    padding: 1.5rem;
 
     @media screen and (min-width: 1200px) {
-      margin: 1vw;
+      padding: 3rem;
-    }
-
-    &_home {
-      padding: 5vw;
     }
 
     a {
@@ -60,38 +64,6 @@
       width: 230px;
       margin-top: 1rem;
     }
-  }
-
-  &--section-link {
-    position: sticky;
-    top: 0;
-    background-color: var(--background);
-    padding: 1rem;
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
-    text-align: right;
-    padding-left: 132px;
-
-    @media screen and (min-width: 1200px) {
-      display: none;
-      border-bottom: 0;
-    }
-
-    &-icon {
-      margin-left: 8px;
-    }
-  }
-
-  &--section-contents {
-    margin: 5vw;
-    margin-bottom: 0;
-    font-weight: 500;
-    line-height: 1.4;
-
-    &:last-child {
-      margin-bottom: 5vw;
-    }
 
     pre,
     code {
@@ -111,15 +83,30 @@
 
     > * {
       margin-bottom: 0;
-      margin-top: 8px;
+      margin-top: 1.5rem;
     }
 
-    > h1, h2 {
+    > h1,
-      margin-top: 32px;
+    > h2 {
       line-height: 1.5;
     }
   }
 
+  &--links {
+    margin-top: 1rem;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+
+    @media screen and (min-width: 700px) {
+      margin-top: 1.5rem;
+    }
+
+    @media screen and (min-width: 1000px) {
+      margin-top: 2rem;
+    }
+  }
+
   &--link {
     pointer-events: all;
     color: var(--foreground);
@@ -127,24 +114,30 @@
     text-decoration: none;
     text-align: center;
     font-weight: 900;
-    font-size: 12rem;
+    font-size: 2rem;
     line-height: 1em;
-    padding: 0.2vw;
+    padding: 0.4rem;
-    margin: 2vw;
+    margin: 0;
-    text-shadow: 0.15vw 0px 0px white;
+    margin-right: 1rem;
+    margin-bottom: 1rem;
+    text-shadow: 0.01em 0px 0px white;
     transition: text-shadow 0.1s ease;
-    border: 12px solid black;
+    border: 0.75rem solid black;
 
     &:hover {
-      text-shadow: 0.3vw 0px 0px var(--accent);
+      text-shadow: 0.1em 0px 0px var(--accent);
     }
 
     @media screen and (min-width: 700px) {
-      font-size: 8rem;
+      font-size: 3rem;
+      margin-right: 1.5rem;
+      margin-bottom: 1.5rem;
     }
 
     @media screen and (min-width: 1000px) {
       font-size: 4rem;
+      margin-right: 2rem;
+      margin-bottom: 2rem;
     }
   }
 }

_includes/styles/service.scss

@@ -0,0 +1,124 @@
+.ps-service {
+  margin-top: 2rem;
+  margin-right: 1rem;
+
+  &--header {
+    margin: 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 0.25rem solid black;
+  };
+
+  & &--title-link {
+		border-bottom: 0;
+
+		&:hover {
+			border-bottom: 0;
+		}
+  }
+
+  &--title {
+    margin: 0;
+  }
+
+  &--links {
+    display: flex;
+    justify-content: flex-end;
+    flex-wrap: wrap;
+    flex-basis: 8rem;
+    flex-grow: 1;
+    max-width: 16rem;
+
+    > * {
+      margin-left: 2rem;
+    }
+  }
+
+  &--description {
+    margin: 0;
+
+    > * {
+      margin: 0;
+      margin-top: 1rem;
+    }
+  }
+
+  &--badges {
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+    margin-top: 1rem;
+
+    @media screen and (min-width: 700px) {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      grid-gap: 0.5rem 1rem;
+    }
+  }
+
+  &--badge {
+    display: flex;
+    justify-content: space-between;
+    border-left: 0.25rem solid var(--accent);
+    padding-left: 1rem;
+
+    @media screen and (min-width: 700px) {
+      flex-basis: 50%;
+    }
+
+    &_yes,
+    &_fully-automated {
+      border-left-color: #009d11;
+    }
+
+    &_partial,
+    &_untested {
+      border-left-color: #ff8f00;
+    }
+
+    &_not-applicable {
+      border-left-color: #555;
+    }
+
+    &_no {
+      border-left-color: var(--accent);
+    }
+  }
+
+  &--badge-header {
+    display: flex;
+    justify-content: space-between;
+    cursor: pointer;
+  }
+
+  &--badge-title {
+    font-weight: bold;
+  }
+
+  &--badge-status {
+    display: inline-flex;
+  }
+
+  $b: &;
+
+  &--badge {
+    &_yes #{$b}--badge-status,
+    &_fully-automated #{$b}--badge-status {
+      color: #007d0e;
+    }
+
+    &_partial #{$b}--badge-status,
+    &_untested #{$b}--badge-status {
+      color: #ac6100;
+    }
+
+    &_not-applicable #{$b}--badge-status {
+      color: #555;
+    }
+
+    &_no #{$b}--badge-status {
+      color: var(--accent);
+    }
+  }
+}

_includes/styles/style.scss

@@ -1,5 +1,10 @@
 * {
   box-sizing: border-box;
+  scroll-margin-top: 4rem;
+
+  @media screen and (min-width: 1200px) {
+    scroll-margin-top: 6rem;
+  }
 }
 
 html {
@@ -9,18 +14,40 @@ html {
   --background-alt: #f5f5f5;
 
   font-family: 'Open Sans', Arial, sans-serif;
-  font-weight: 800;
+  font-weight: 400;
-  background: var(--background);
-  color: var(--foreground);
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
+  font-optical-sizing: auto;
+  font-variation-settings: "wdth" 100;
+
+  background: var(--background);
+  color: var(--foreground);
   box-sizing: border-box;
   width: 100vw;
   height: 100vh;
   margin: 0;
-  font-size: 1vw;
+}
+
+h1 {
+  font-size: 2.25rem;
+  font-weight: 800;
+}
+
+h2 {
+  font-size: 1.5rem;
+  font-weight: 600;
+}
+
+h3 {
+  font-size: 1.25rem;
+  font-weight: 600;
+}
+
+h4 {
+  font-size: 1rem;
+  font-weight: 600;
 }
 
 @import './main';
@@ -31,4 +58,5 @@ html {
 @import './homelink';
 @import './copy-code-button.scss';
 @import './hakken-dates.scss';
+@import './service.scss';
 

_includes/styles/stypography.scss

@@ -1,2 +0,0 @@
-
-

_includes/styles/typography.scss

@@ -1,82 +1,202 @@
-/* To regenerate this file, run $ google-font-downloader 'https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,500;0,800;1,500;1,800&display=swap' */
+/* To regenerate this file, run $ google-font-downloader 'https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,400;0,600;0,800;1,400;1,600;1,800&display=swap' */
 /* cyrillic-ext */
 @font-face {
   font-family: 'Open Sans';
   font-style: italic;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtE6FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtE6FxZCJgvAQ.woff2) format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 /* cyrillic */
 @font-face {
   font-family: 'Open Sans';
   font-style: italic;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWvU6FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWvU6FxZCJgvAQ.woff2) format('woff2');
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 /* greek-ext */
 @font-face {
   font-family: 'Open Sans';
   font-style: italic;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtU6FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtU6FxZCJgvAQ.woff2) format('woff2');
   unicode-range: U+1F00-1FFF;
 }
 /* greek */
 @font-face {
   font-family: 'Open Sans';
   font-style: italic;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWuk6FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWuk6FxZCJgvAQ.woff2) format('woff2');
-  unicode-range: U+0370-03FF;
+  unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
 }
 /* hebrew */
 @font-face {
   font-family: 'Open Sans';
   font-style: italic;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWu06FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWu06FxZCJgvAQ.woff2) format('woff2');
   unicode-range: U+0590-05FF, U+200C-2010, U+20AA, U+25CC, U+FB1D-FB4F;
 }
+/* math */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 400;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWxU6FxZCJgvAQ.woff2) format('woff2');
+  unicode-range: U+0302-0303, U+0305, U+0307-0308, U+0330, U+0391-03A1, U+03A3-03A9, U+03B1-03C9, U+03D1, U+03D5-03D6, U+03F0-03F1, U+03F4-03F5, U+2034-2037, U+2057, U+20D0-20DC, U+20E1, U+20E5-20EF, U+2102, U+210A-210E, U+2110-2112, U+2115, U+2119-211D, U+2124, U+2128, U+212C-212D, U+212F-2131, U+2133-2138, U+213C-2140, U+2145-2149, U+2190, U+2192, U+2194-21AE, U+21B0-21E5, U+21F1-21F2, U+21F4-2211, U+2213-2214, U+2216-22FF, U+2308-230B, U+2310, U+2319, U+231C-2321, U+2336-237A, U+237C, U+2395, U+239B-23B6, U+23D0, U+23DC-23E1, U+2474-2475, U+25AF, U+25B3, U+25B7, U+25BD, U+25C1, U+25CA, U+25CC, U+25FB, U+266D-266F, U+27C0-27FF, U+2900-2AFF, U+2B0E-2B11, U+2B30-2B4C, U+2BFE, U+FF5B, U+FF5D, U+1D400-1D7FF, U+1EE00-1EEFF;
+}
+/* symbols */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 400;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqW106FxZCJgvAQ.woff2) format('woff2');
+  unicode-range: U+0001-000C, U+000E-001F, U+007F-009F, U+20DD-20E0, U+20E2-20E4, U+2150-218F, U+2190, U+2192, U+2194-2199, U+21AF, U+21E6-21F0, U+21F3, U+2218-2219, U+2299, U+22C4-22C6, U+2300-243F, U+2440-244A, U+2460-24FF, U+25A0-27BF, U+2800-28FF, U+2921-2922, U+2981, U+29BF, U+29EB, U+2B00-2BFF, U+4DC0-4DFF, U+FFF9-FFFB, U+10140-1018E, U+10190-1019C, U+101A0, U+101D0-101FD, U+102E0-102FB, U+10E60-10E7E, U+1D2C0-1D2D3, U+1D2E0-1D37F, U+1F000-1F0FF, U+1F100-1F1AD, U+1F1E6-1F1FF, U+1F30D-1F30F, U+1F315, U+1F31C, U+1F31E, U+1F320-1F32C, U+1F336, U+1F378, U+1F37D, U+1F382, U+1F393-1F39F, U+1F3A7-1F3A8, U+1F3AC-1F3AF, U+1F3C2, U+1F3C4-1F3C6, U+1F3CA-1F3CE, U+1F3D4-1F3E0, U+1F3ED, U+1F3F1-1F3F3, U+1F3F5-1F3F7, U+1F408, U+1F415, U+1F41F, U+1F426, U+1F43F, U+1F441-1F442, U+1F444, U+1F446-1F449, U+1F44C-1F44E, U+1F453, U+1F46A, U+1F47D, U+1F4A3, U+1F4B0, U+1F4B3, U+1F4B9, U+1F4BB, U+1F4BF, U+1F4C8-1F4CB, U+1F4D6, U+1F4DA, U+1F4DF, U+1F4E3-1F4E6, U+1F4EA-1F4ED, U+1F4F7, U+1F4F9-1F4FB, U+1F4FD-1F4FE, U+1F503, U+1F507-1F50B, U+1F50D, U+1F512-1F513, U+1F53E-1F54A, U+1F54F-1F5FA, U+1F610, U+1F650-1F67F, U+1F687, U+1F68D, U+1F691, U+1F694, U+1F698, U+1F6AD, U+1F6B2, U+1F6B9-1F6BA, U+1F6BC, U+1F6C6-1F6CF, U+1F6D3-1F6D7, U+1F6E0-1F6EA, U+1F6F0-1F6F3, U+1F6F7-1F6FC, U+1F700-1F7FF, U+1F800-1F80B, U+1F810-1F847, U+1F850-1F859, U+1F860-1F887, U+1F890-1F8AD, U+1F8B0-1F8B1, U+1F900-1F90B, U+1F93B, U+1F946, U+1F984, U+1F996, U+1F9E9, U+1FA00-1FA6F, U+1FA70-1FA7C, U+1FA80-1FA88, U+1FA90-1FABD, U+1FABF-1FAC5, U+1FACE-1FADB, U+1FAE0-1FAE8, U+1FAF0-1FAF8, U+1FB00-1FBFF;
+}
 /* vietnamese */
 @font-face {
   font-family: 'Open Sans';
   font-style: italic;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtk6FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtk6FxZCJgvAQ.woff2) format('woff2');
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
 }
 /* latin-ext */
 @font-face {
   font-family: 'Open Sans';
   font-style: italic;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWt06FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWt06FxZCJgvAQ.woff2) format('woff2');
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
 @font-face {
   font-family: 'Open Sans';
   font-style: italic;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWuU6FxZCJgg.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWuU6FxZCJgg.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtE6FxZCJgvAQ.woff2) format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWvU6FxZCJgvAQ.woff2) format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* greek-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtU6FxZCJgvAQ.woff2) format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+/* greek */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWuk6FxZCJgvAQ.woff2) format('woff2');
+  unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
+}
+/* hebrew */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWu06FxZCJgvAQ.woff2) format('woff2');
+  unicode-range: U+0590-05FF, U+200C-2010, U+20AA, U+25CC, U+FB1D-FB4F;
+}
+/* math */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWxU6FxZCJgvAQ.woff2) format('woff2');
+  unicode-range: U+0302-0303, U+0305, U+0307-0308, U+0330, U+0391-03A1, U+03A3-03A9, U+03B1-03C9, U+03D1, U+03D5-03D6, U+03F0-03F1, U+03F4-03F5, U+2034-2037, U+2057, U+20D0-20DC, U+20E1, U+20E5-20EF, U+2102, U+210A-210E, U+2110-2112, U+2115, U+2119-211D, U+2124, U+2128, U+212C-212D, U+212F-2131, U+2133-2138, U+213C-2140, U+2145-2149, U+2190, U+2192, U+2194-21AE, U+21B0-21E5, U+21F1-21F2, U+21F4-2211, U+2213-2214, U+2216-22FF, U+2308-230B, U+2310, U+2319, U+231C-2321, U+2336-237A, U+237C, U+2395, U+239B-23B6, U+23D0, U+23DC-23E1, U+2474-2475, U+25AF, U+25B3, U+25B7, U+25BD, U+25C1, U+25CA, U+25CC, U+25FB, U+266D-266F, U+27C0-27FF, U+2900-2AFF, U+2B0E-2B11, U+2B30-2B4C, U+2BFE, U+FF5B, U+FF5D, U+1D400-1D7FF, U+1EE00-1EEFF;
+}
+/* symbols */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqW106FxZCJgvAQ.woff2) format('woff2');
+  unicode-range: U+0001-000C, U+000E-001F, U+007F-009F, U+20DD-20E0, U+20E2-20E4, U+2150-218F, U+2190, U+2192, U+2194-2199, U+21AF, U+21E6-21F0, U+21F3, U+2218-2219, U+2299, U+22C4-22C6, U+2300-243F, U+2440-244A, U+2460-24FF, U+25A0-27BF, U+2800-28FF, U+2921-2922, U+2981, U+29BF, U+29EB, U+2B00-2BFF, U+4DC0-4DFF, U+FFF9-FFFB, U+10140-1018E, U+10190-1019C, U+101A0, U+101D0-101FD, U+102E0-102FB, U+10E60-10E7E, U+1D2C0-1D2D3, U+1D2E0-1D37F, U+1F000-1F0FF, U+1F100-1F1AD, U+1F1E6-1F1FF, U+1F30D-1F30F, U+1F315, U+1F31C, U+1F31E, U+1F320-1F32C, U+1F336, U+1F378, U+1F37D, U+1F382, U+1F393-1F39F, U+1F3A7-1F3A8, U+1F3AC-1F3AF, U+1F3C2, U+1F3C4-1F3C6, U+1F3CA-1F3CE, U+1F3D4-1F3E0, U+1F3ED, U+1F3F1-1F3F3, U+1F3F5-1F3F7, U+1F408, U+1F415, U+1F41F, U+1F426, U+1F43F, U+1F441-1F442, U+1F444, U+1F446-1F449, U+1F44C-1F44E, U+1F453, U+1F46A, U+1F47D, U+1F4A3, U+1F4B0, U+1F4B3, U+1F4B9, U+1F4BB, U+1F4BF, U+1F4C8-1F4CB, U+1F4D6, U+1F4DA, U+1F4DF, U+1F4E3-1F4E6, U+1F4EA-1F4ED, U+1F4F7, U+1F4F9-1F4FB, U+1F4FD-1F4FE, U+1F503, U+1F507-1F50B, U+1F50D, U+1F512-1F513, U+1F53E-1F54A, U+1F54F-1F5FA, U+1F610, U+1F650-1F67F, U+1F687, U+1F68D, U+1F691, U+1F694, U+1F698, U+1F6AD, U+1F6B2, U+1F6B9-1F6BA, U+1F6BC, U+1F6C6-1F6CF, U+1F6D3-1F6D7, U+1F6E0-1F6EA, U+1F6F0-1F6F3, U+1F6F7-1F6FC, U+1F700-1F7FF, U+1F800-1F80B, U+1F810-1F847, U+1F850-1F859, U+1F860-1F887, U+1F890-1F8AD, U+1F8B0-1F8B1, U+1F900-1F90B, U+1F93B, U+1F946, U+1F984, U+1F996, U+1F9E9, U+1FA00-1FA6F, U+1FA70-1FA7C, U+1FA80-1FA88, U+1FA90-1FABD, U+1FABF-1FAC5, U+1FACE-1FADB, U+1FAE0-1FAE8, U+1FAF0-1FAF8, U+1FB00-1FBFF;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtk6FxZCJgvAQ.woff2) format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWt06FxZCJgvAQ.woff2) format('woff2');
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWuU6FxZCJgg.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* cyrillic-ext */
@@ -86,7 +206,7 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtE6FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtE6FxZCJgvAQ.woff2) format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 /* cyrillic */
@@ -96,7 +216,7 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWvU6FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), local('Open Sans Extrabold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWvU6FxZCJgvAQ.woff2) format('woff2');
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 /* greek-ext */
@@ -106,7 +226,7 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtU6FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtU6FxZCJgvAQ.woff2) format('woff2');
   unicode-range: U+1F00-1FFF;
 }
 /* greek */
@@ -116,8 +236,8 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWuk6FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWuk6FxZCJgvAQ.woff2) format('woff2');
-  unicode-range: U+0370-03FF;
+  unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
 }
 /* hebrew */
 @font-face {
@@ -126,9 +246,29 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWu06FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWu06FxZCJgvAQ.woff2) format('woff2');
   unicode-range: U+0590-05FF, U+200C-2010, U+20AA, U+25CC, U+FB1D-FB4F;
 }
+/* math */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 800;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWxU6FxZCJgvAQ.woff2) format('woff2');
+  unicode-range: U+0302-0303, U+0305, U+0307-0308, U+0330, U+0391-03A1, U+03A3-03A9, U+03B1-03C9, U+03D1, U+03D5-03D6, U+03F0-03F1, U+03F4-03F5, U+2034-2037, U+2057, U+20D0-20DC, U+20E1, U+20E5-20EF, U+2102, U+210A-210E, U+2110-2112, U+2115, U+2119-211D, U+2124, U+2128, U+212C-212D, U+212F-2131, U+2133-2138, U+213C-2140, U+2145-2149, U+2190, U+2192, U+2194-21AE, U+21B0-21E5, U+21F1-21F2, U+21F4-2211, U+2213-2214, U+2216-22FF, U+2308-230B, U+2310, U+2319, U+231C-2321, U+2336-237A, U+237C, U+2395, U+239B-23B6, U+23D0, U+23DC-23E1, U+2474-2475, U+25AF, U+25B3, U+25B7, U+25BD, U+25C1, U+25CA, U+25CC, U+25FB, U+266D-266F, U+27C0-27FF, U+2900-2AFF, U+2B0E-2B11, U+2B30-2B4C, U+2BFE, U+FF5B, U+FF5D, U+1D400-1D7FF, U+1EE00-1EEFF;
+}
+/* symbols */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 800;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqW106FxZCJgvAQ.woff2) format('woff2');
+  unicode-range: U+0001-000C, U+000E-001F, U+007F-009F, U+20DD-20E0, U+20E2-20E4, U+2150-218F, U+2190, U+2192, U+2194-2199, U+21AF, U+21E6-21F0, U+21F3, U+2218-2219, U+2299, U+22C4-22C6, U+2300-243F, U+2440-244A, U+2460-24FF, U+25A0-27BF, U+2800-28FF, U+2921-2922, U+2981, U+29BF, U+29EB, U+2B00-2BFF, U+4DC0-4DFF, U+FFF9-FFFB, U+10140-1018E, U+10190-1019C, U+101A0, U+101D0-101FD, U+102E0-102FB, U+10E60-10E7E, U+1D2C0-1D2D3, U+1D2E0-1D37F, U+1F000-1F0FF, U+1F100-1F1AD, U+1F1E6-1F1FF, U+1F30D-1F30F, U+1F315, U+1F31C, U+1F31E, U+1F320-1F32C, U+1F336, U+1F378, U+1F37D, U+1F382, U+1F393-1F39F, U+1F3A7-1F3A8, U+1F3AC-1F3AF, U+1F3C2, U+1F3C4-1F3C6, U+1F3CA-1F3CE, U+1F3D4-1F3E0, U+1F3ED, U+1F3F1-1F3F3, U+1F3F5-1F3F7, U+1F408, U+1F415, U+1F41F, U+1F426, U+1F43F, U+1F441-1F442, U+1F444, U+1F446-1F449, U+1F44C-1F44E, U+1F453, U+1F46A, U+1F47D, U+1F4A3, U+1F4B0, U+1F4B3, U+1F4B9, U+1F4BB, U+1F4BF, U+1F4C8-1F4CB, U+1F4D6, U+1F4DA, U+1F4DF, U+1F4E3-1F4E6, U+1F4EA-1F4ED, U+1F4F7, U+1F4F9-1F4FB, U+1F4FD-1F4FE, U+1F503, U+1F507-1F50B, U+1F50D, U+1F512-1F513, U+1F53E-1F54A, U+1F54F-1F5FA, U+1F610, U+1F650-1F67F, U+1F687, U+1F68D, U+1F691, U+1F694, U+1F698, U+1F6AD, U+1F6B2, U+1F6B9-1F6BA, U+1F6BC, U+1F6C6-1F6CF, U+1F6D3-1F6D7, U+1F6E0-1F6EA, U+1F6F0-1F6F3, U+1F6F7-1F6FC, U+1F700-1F7FF, U+1F800-1F80B, U+1F810-1F847, U+1F850-1F859, U+1F860-1F887, U+1F890-1F8AD, U+1F8B0-1F8B1, U+1F900-1F90B, U+1F93B, U+1F946, U+1F984, U+1F996, U+1F9E9, U+1FA00-1FA6F, U+1FA70-1FA7C, U+1FA80-1FA88, U+1FA90-1FABD, U+1FABF-1FAC5, U+1FACE-1FADB, U+1FAE0-1FAE8, U+1FAF0-1FAF8, U+1FB00-1FBFF;
+}
 /* vietnamese */
 @font-face {
   font-family: 'Open Sans';
@@ -136,7 +276,7 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtk6FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWtk6FxZCJgvAQ.woff2) format('woff2');
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
 }
 /* latin-ext */
@@ -146,8 +286,8 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWt06FxZCJgvAQ.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWt06FxZCJgvAQ.woff2) format('woff2');
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
 @font-face {
@@ -156,87 +296,207 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWuU6FxZCJgg.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memtYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWqWuU6FxZCJgg.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* cyrillic-ext */
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSKmu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSKmu0SC55K5gw.woff2) format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 /* cyrillic */
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSumu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSumu0SC55K5gw.woff2) format('woff2');
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 /* greek-ext */
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSOmu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSOmu0SC55K5gw.woff2) format('woff2');
   unicode-range: U+1F00-1FFF;
 }
 /* greek */
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSymu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSymu0SC55K5gw.woff2) format('woff2');
-  unicode-range: U+0370-03FF;
+  unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
 }
 /* hebrew */
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTS2mu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTS2mu0SC55K5gw.woff2) format('woff2');
   unicode-range: U+0590-05FF, U+200C-2010, U+20AA, U+25CC, U+FB1D-FB4F;
 }
+/* math */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTVOmu0SC55K5gw.woff2) format('woff2');
+  unicode-range: U+0302-0303, U+0305, U+0307-0308, U+0330, U+0391-03A1, U+03A3-03A9, U+03B1-03C9, U+03D1, U+03D5-03D6, U+03F0-03F1, U+03F4-03F5, U+2034-2037, U+2057, U+20D0-20DC, U+20E1, U+20E5-20EF, U+2102, U+210A-210E, U+2110-2112, U+2115, U+2119-211D, U+2124, U+2128, U+212C-212D, U+212F-2131, U+2133-2138, U+213C-2140, U+2145-2149, U+2190, U+2192, U+2194-21AE, U+21B0-21E5, U+21F1-21F2, U+21F4-2211, U+2213-2214, U+2216-22FF, U+2308-230B, U+2310, U+2319, U+231C-2321, U+2336-237A, U+237C, U+2395, U+239B-23B6, U+23D0, U+23DC-23E1, U+2474-2475, U+25AF, U+25B3, U+25B7, U+25BD, U+25C1, U+25CA, U+25CC, U+25FB, U+266D-266F, U+27C0-27FF, U+2900-2AFF, U+2B0E-2B11, U+2B30-2B4C, U+2BFE, U+FF5B, U+FF5D, U+1D400-1D7FF, U+1EE00-1EEFF;
+}
+/* symbols */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTUGmu0SC55K5gw.woff2) format('woff2');
+  unicode-range: U+0001-000C, U+000E-001F, U+007F-009F, U+20DD-20E0, U+20E2-20E4, U+2150-218F, U+2190, U+2192, U+2194-2199, U+21AF, U+21E6-21F0, U+21F3, U+2218-2219, U+2299, U+22C4-22C6, U+2300-243F, U+2440-244A, U+2460-24FF, U+25A0-27BF, U+2800-28FF, U+2921-2922, U+2981, U+29BF, U+29EB, U+2B00-2BFF, U+4DC0-4DFF, U+FFF9-FFFB, U+10140-1018E, U+10190-1019C, U+101A0, U+101D0-101FD, U+102E0-102FB, U+10E60-10E7E, U+1D2C0-1D2D3, U+1D2E0-1D37F, U+1F000-1F0FF, U+1F100-1F1AD, U+1F1E6-1F1FF, U+1F30D-1F30F, U+1F315, U+1F31C, U+1F31E, U+1F320-1F32C, U+1F336, U+1F378, U+1F37D, U+1F382, U+1F393-1F39F, U+1F3A7-1F3A8, U+1F3AC-1F3AF, U+1F3C2, U+1F3C4-1F3C6, U+1F3CA-1F3CE, U+1F3D4-1F3E0, U+1F3ED, U+1F3F1-1F3F3, U+1F3F5-1F3F7, U+1F408, U+1F415, U+1F41F, U+1F426, U+1F43F, U+1F441-1F442, U+1F444, U+1F446-1F449, U+1F44C-1F44E, U+1F453, U+1F46A, U+1F47D, U+1F4A3, U+1F4B0, U+1F4B3, U+1F4B9, U+1F4BB, U+1F4BF, U+1F4C8-1F4CB, U+1F4D6, U+1F4DA, U+1F4DF, U+1F4E3-1F4E6, U+1F4EA-1F4ED, U+1F4F7, U+1F4F9-1F4FB, U+1F4FD-1F4FE, U+1F503, U+1F507-1F50B, U+1F50D, U+1F512-1F513, U+1F53E-1F54A, U+1F54F-1F5FA, U+1F610, U+1F650-1F67F, U+1F687, U+1F68D, U+1F691, U+1F694, U+1F698, U+1F6AD, U+1F6B2, U+1F6B9-1F6BA, U+1F6BC, U+1F6C6-1F6CF, U+1F6D3-1F6D7, U+1F6E0-1F6EA, U+1F6F0-1F6F3, U+1F6F7-1F6FC, U+1F700-1F7FF, U+1F800-1F80B, U+1F810-1F847, U+1F850-1F859, U+1F860-1F887, U+1F890-1F8AD, U+1F8B0-1F8B1, U+1F900-1F90B, U+1F93B, U+1F946, U+1F984, U+1F996, U+1F9E9, U+1FA00-1FA6F, U+1FA70-1FA7C, U+1FA80-1FA88, U+1FA90-1FABD, U+1FABF-1FAC5, U+1FACE-1FADB, U+1FAE0-1FAE8, U+1FAF0-1FAF8, U+1FB00-1FBFF;
+}
 /* vietnamese */
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSCmu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSCmu0SC55K5gw.woff2) format('woff2');
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
 }
 /* latin-ext */
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSGmu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSGmu0SC55K5gw.woff2) format('woff2');
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
-  font-weight: 500;
+  font-weight: 400;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTS-mu0SC55I.woff2) format('woff2');
+  src: local('Open Sans'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTS-mu0SC55I.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSKmu0SC55K5gw.woff2) format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSumu0SC55K5gw.woff2) format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* greek-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSOmu0SC55K5gw.woff2) format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+/* greek */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSymu0SC55K5gw.woff2) format('woff2');
+  unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
+}
+/* hebrew */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTS2mu0SC55K5gw.woff2) format('woff2');
+  unicode-range: U+0590-05FF, U+200C-2010, U+20AA, U+25CC, U+FB1D-FB4F;
+}
+/* math */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTVOmu0SC55K5gw.woff2) format('woff2');
+  unicode-range: U+0302-0303, U+0305, U+0307-0308, U+0330, U+0391-03A1, U+03A3-03A9, U+03B1-03C9, U+03D1, U+03D5-03D6, U+03F0-03F1, U+03F4-03F5, U+2034-2037, U+2057, U+20D0-20DC, U+20E1, U+20E5-20EF, U+2102, U+210A-210E, U+2110-2112, U+2115, U+2119-211D, U+2124, U+2128, U+212C-212D, U+212F-2131, U+2133-2138, U+213C-2140, U+2145-2149, U+2190, U+2192, U+2194-21AE, U+21B0-21E5, U+21F1-21F2, U+21F4-2211, U+2213-2214, U+2216-22FF, U+2308-230B, U+2310, U+2319, U+231C-2321, U+2336-237A, U+237C, U+2395, U+239B-23B6, U+23D0, U+23DC-23E1, U+2474-2475, U+25AF, U+25B3, U+25B7, U+25BD, U+25C1, U+25CA, U+25CC, U+25FB, U+266D-266F, U+27C0-27FF, U+2900-2AFF, U+2B0E-2B11, U+2B30-2B4C, U+2BFE, U+FF5B, U+FF5D, U+1D400-1D7FF, U+1EE00-1EEFF;
+}
+/* symbols */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTUGmu0SC55K5gw.woff2) format('woff2');
+  unicode-range: U+0001-000C, U+000E-001F, U+007F-009F, U+20DD-20E0, U+20E2-20E4, U+2150-218F, U+2190, U+2192, U+2194-2199, U+21AF, U+21E6-21F0, U+21F3, U+2218-2219, U+2299, U+22C4-22C6, U+2300-243F, U+2440-244A, U+2460-24FF, U+25A0-27BF, U+2800-28FF, U+2921-2922, U+2981, U+29BF, U+29EB, U+2B00-2BFF, U+4DC0-4DFF, U+FFF9-FFFB, U+10140-1018E, U+10190-1019C, U+101A0, U+101D0-101FD, U+102E0-102FB, U+10E60-10E7E, U+1D2C0-1D2D3, U+1D2E0-1D37F, U+1F000-1F0FF, U+1F100-1F1AD, U+1F1E6-1F1FF, U+1F30D-1F30F, U+1F315, U+1F31C, U+1F31E, U+1F320-1F32C, U+1F336, U+1F378, U+1F37D, U+1F382, U+1F393-1F39F, U+1F3A7-1F3A8, U+1F3AC-1F3AF, U+1F3C2, U+1F3C4-1F3C6, U+1F3CA-1F3CE, U+1F3D4-1F3E0, U+1F3ED, U+1F3F1-1F3F3, U+1F3F5-1F3F7, U+1F408, U+1F415, U+1F41F, U+1F426, U+1F43F, U+1F441-1F442, U+1F444, U+1F446-1F449, U+1F44C-1F44E, U+1F453, U+1F46A, U+1F47D, U+1F4A3, U+1F4B0, U+1F4B3, U+1F4B9, U+1F4BB, U+1F4BF, U+1F4C8-1F4CB, U+1F4D6, U+1F4DA, U+1F4DF, U+1F4E3-1F4E6, U+1F4EA-1F4ED, U+1F4F7, U+1F4F9-1F4FB, U+1F4FD-1F4FE, U+1F503, U+1F507-1F50B, U+1F50D, U+1F512-1F513, U+1F53E-1F54A, U+1F54F-1F5FA, U+1F610, U+1F650-1F67F, U+1F687, U+1F68D, U+1F691, U+1F694, U+1F698, U+1F6AD, U+1F6B2, U+1F6B9-1F6BA, U+1F6BC, U+1F6C6-1F6CF, U+1F6D3-1F6D7, U+1F6E0-1F6EA, U+1F6F0-1F6F3, U+1F6F7-1F6FC, U+1F700-1F7FF, U+1F800-1F80B, U+1F810-1F847, U+1F850-1F859, U+1F860-1F887, U+1F890-1F8AD, U+1F8B0-1F8B1, U+1F900-1F90B, U+1F93B, U+1F946, U+1F984, U+1F996, U+1F9E9, U+1FA00-1FA6F, U+1FA70-1FA7C, U+1FA80-1FA88, U+1FA90-1FABD, U+1FABF-1FAC5, U+1FACE-1FADB, U+1FAE0-1FAE8, U+1FAF0-1FAF8, U+1FB00-1FBFF;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSCmu0SC55K5gw.woff2) format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSGmu0SC55K5gw.woff2) format('woff2');
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Semibold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTS-mu0SC55I.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* cyrillic-ext */
@@ -246,7 +506,7 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSKmu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSKmu0SC55K5gw.woff2) format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 /* cyrillic */
@@ -256,7 +516,7 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSumu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSumu0SC55K5gw.woff2) format('woff2');
   unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 /* greek-ext */
@@ -266,7 +526,7 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSOmu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSOmu0SC55K5gw.woff2) format('woff2');
   unicode-range: U+1F00-1FFF;
 }
 /* greek */
@@ -276,8 +536,8 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSymu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSymu0SC55K5gw.woff2) format('woff2');
-  unicode-range: U+0370-03FF;
+  unicode-range: U+0370-0377, U+037A-037F, U+0384-038A, U+038C, U+038E-03A1, U+03A3-03FF;
 }
 /* hebrew */
 @font-face {
@@ -286,9 +546,29 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTS2mu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTS2mu0SC55K5gw.woff2) format('woff2');
   unicode-range: U+0590-05FF, U+200C-2010, U+20AA, U+25CC, U+FB1D-FB4F;
 }
+/* math */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 800;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTVOmu0SC55K5gw.woff2) format('woff2');
+  unicode-range: U+0302-0303, U+0305, U+0307-0308, U+0330, U+0391-03A1, U+03A3-03A9, U+03B1-03C9, U+03D1, U+03D5-03D6, U+03F0-03F1, U+03F4-03F5, U+2034-2037, U+2057, U+20D0-20DC, U+20E1, U+20E5-20EF, U+2102, U+210A-210E, U+2110-2112, U+2115, U+2119-211D, U+2124, U+2128, U+212C-212D, U+212F-2131, U+2133-2138, U+213C-2140, U+2145-2149, U+2190, U+2192, U+2194-21AE, U+21B0-21E5, U+21F1-21F2, U+21F4-2211, U+2213-2214, U+2216-22FF, U+2308-230B, U+2310, U+2319, U+231C-2321, U+2336-237A, U+237C, U+2395, U+239B-23B6, U+23D0, U+23DC-23E1, U+2474-2475, U+25AF, U+25B3, U+25B7, U+25BD, U+25C1, U+25CA, U+25CC, U+25FB, U+266D-266F, U+27C0-27FF, U+2900-2AFF, U+2B0E-2B11, U+2B30-2B4C, U+2BFE, U+FF5B, U+FF5D, U+1D400-1D7FF, U+1EE00-1EEFF;
+}
+/* symbols */
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 800;
+  font-stretch: 100%;
+  font-display: swap;
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTUGmu0SC55K5gw.woff2) format('woff2');
+  unicode-range: U+0001-000C, U+000E-001F, U+007F-009F, U+20DD-20E0, U+20E2-20E4, U+2150-218F, U+2190, U+2192, U+2194-2199, U+21AF, U+21E6-21F0, U+21F3, U+2218-2219, U+2299, U+22C4-22C6, U+2300-243F, U+2440-244A, U+2460-24FF, U+25A0-27BF, U+2800-28FF, U+2921-2922, U+2981, U+29BF, U+29EB, U+2B00-2BFF, U+4DC0-4DFF, U+FFF9-FFFB, U+10140-1018E, U+10190-1019C, U+101A0, U+101D0-101FD, U+102E0-102FB, U+10E60-10E7E, U+1D2C0-1D2D3, U+1D2E0-1D37F, U+1F000-1F0FF, U+1F100-1F1AD, U+1F1E6-1F1FF, U+1F30D-1F30F, U+1F315, U+1F31C, U+1F31E, U+1F320-1F32C, U+1F336, U+1F378, U+1F37D, U+1F382, U+1F393-1F39F, U+1F3A7-1F3A8, U+1F3AC-1F3AF, U+1F3C2, U+1F3C4-1F3C6, U+1F3CA-1F3CE, U+1F3D4-1F3E0, U+1F3ED, U+1F3F1-1F3F3, U+1F3F5-1F3F7, U+1F408, U+1F415, U+1F41F, U+1F426, U+1F43F, U+1F441-1F442, U+1F444, U+1F446-1F449, U+1F44C-1F44E, U+1F453, U+1F46A, U+1F47D, U+1F4A3, U+1F4B0, U+1F4B3, U+1F4B9, U+1F4BB, U+1F4BF, U+1F4C8-1F4CB, U+1F4D6, U+1F4DA, U+1F4DF, U+1F4E3-1F4E6, U+1F4EA-1F4ED, U+1F4F7, U+1F4F9-1F4FB, U+1F4FD-1F4FE, U+1F503, U+1F507-1F50B, U+1F50D, U+1F512-1F513, U+1F53E-1F54A, U+1F54F-1F5FA, U+1F610, U+1F650-1F67F, U+1F687, U+1F68D, U+1F691, U+1F694, U+1F698, U+1F6AD, U+1F6B2, U+1F6B9-1F6BA, U+1F6BC, U+1F6C6-1F6CF, U+1F6D3-1F6D7, U+1F6E0-1F6EA, U+1F6F0-1F6F3, U+1F6F7-1F6FC, U+1F700-1F7FF, U+1F800-1F80B, U+1F810-1F847, U+1F850-1F859, U+1F860-1F887, U+1F890-1F8AD, U+1F8B0-1F8B1, U+1F900-1F90B, U+1F93B, U+1F946, U+1F984, U+1F996, U+1F9E9, U+1FA00-1FA6F, U+1FA70-1FA7C, U+1FA80-1FA88, U+1FA90-1FABD, U+1FABF-1FAC5, U+1FACE-1FADB, U+1FAE0-1FAE8, U+1FAF0-1FAF8, U+1FB00-1FBFF;
+}
 /* vietnamese */
 @font-face {
   font-family: 'Open Sans';
@@ -296,7 +576,7 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSCmu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSCmu0SC55K5gw.woff2) format('woff2');
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
 }
 /* latin-ext */
@@ -306,8 +586,8 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSGmu0SC55K5gw.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTSGmu0SC55K5gw.woff2) format('woff2');
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
 @font-face {
@@ -316,6 +596,6 @@
   font-weight: 800;
   font-stretch: 100%;
   font-display: swap;
-  src: url(fonts/opensans/v35/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTS-mu0SC55I.woff2) format('woff2');
+  src: local('Open Sans Extrabold'), url(fonts/opensans/v40/memvYaGs126MiZpBA-UvWbX2vVnXBbObj2OVTS-mu0SC55I.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }

about.yml

@@ -2,20 +2,29 @@ layout: layouts/default.tsx
 
 title: About & Imprint
 
-content:
+content: |
-  en: |
   # Hi! We're pub.solar
 
-    We are a non-registered association seated in Cologne, Germany. Our goal is to enable more people to use free software, have secure digital communications, and to take control over their private data. We offer free software for you and all the people you love. We do this transparently and democratically.
+  We are a non-registered association seated in Cologne, Germany. Our goal is to enable more people to use free software, have secure digital communications, and to take control over their private data.
 
-    We currently have four larger projects:
+  We host free software for you and all the people you love. We do this transparently and democratically.
 
-    * [Matrix](https://chat.pub.solar): a decentralized, end-to-end encrypted chat, similar to Slack or Discord.
+  We currently offer these services:
-    * [Mastodon](https://mastodon.pub.solar): a decentralized microblogging platform, similar to Twitter.
-    * [Nextcloud](https://cloud.pub.solar): a cloud with office capabilities, similar to the Google Suite and Microsoft Office 365.
-    * [PubSolarOS](https://pub.solar/os/): a GNU+Linux Distribution that is based on NixOS.
 
-    Our Mastodon and Matrix instances are publicly open for registration. If you (or your non profit, or your family) would like to use our Nextcloud, send us a message.
+  * [Matrix](https://chat.pub.solar): a decentralized, end-to-end encrypted chat, similar to Slack or Discord,
+  * [Mastodon](https://mastodon.pub.solar): a decentralized microblogging platform, similar to Twitter,
+  * [Nextcloud](https://cloud.pub.solar): a cloud with office capabilities, similar to the Google Suite and Microsoft Office 365,
+  * [Forgejo](https://git.pub.solar/): a git server, comparable to GitHub or Gitlab,
+
+  Additionally, the following services which might change or dissappear any time.
+
+  * [Searx](https://search.pub.solar/): a metasearch engine, similar to Google or Bing,
+  * [Mailman](https://lists.pub.solar/): a software for mailing lists,
+  * [OBS Portal](https://obs-portal.pub.solar/): a server for saving [OpenBikeSensor](https://www.openbikesensor.org/) data which is currently limited to the Cologne/Bonn region,
+
+  For some of these Services, you'll need to register an account, which we call a [pub.solar ID](https://auth.pub.solar). All services are publicly open for registration. Nextcloud accounts are severely limited in their storage amount. If you want more storage, please contact the crew.
+
+  ## Contact and getting help
 
   You can reach us via [#General in Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) and [@crew on Mastodon](https://mastodon.pub.solar/@crew), or send a mail to [crew@pub.solar](mailto:crew@pub.solar).
 
@@ -25,6 +34,8 @@ content:
   8A89 87AD E373 6C8C A2EB  315A 9B80 9EBB DD62 BAE3
   ```
 
+  Check out our [wiki](https://wiki.pub.solar) or contact us via one of the methods above. In the Matrix [#General room](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) there's always someone around for answering your questions.
+
   ## Being a member or helping hand
 
   Are you interested in becoming a member of the pub.solar organisation? Do you want to support the organisation with labour, money, or just your name?
@@ -37,23 +48,17 @@ content:
 
   ## Financing
 
-    Most of the cloud space is offered to us free of charge by greenbaum.cloud. We currently pay for the rest of the infrastructure out of our own pockets (like the domain name). 
+  We currently pay for the infrastructure out of our own pockets (like the server and domain name).
 
   This situation is not long-term sustainable, and we're currently working on founding an e.V. and having solid financing. We'd of course welcome anyone wanting to help and participate!
 
   ### Donate via IBAN
 
   Jhonas Wernery
-    DE97430609674093197700
+  DE70430609674093197701
   GLS Bank
 
-    ### Donate via Liberapay
+  ![QR GiroCode](/assets/donation-qr.png)
-    
-    [Right here](https://liberapay.com/pub.solar/)
-
-    ### Donate via PayPal
-    
-    [Right here](https://www.paypal.com/paypalme/pubsolar)
 
   ## Imprint
 
@@ -61,20 +66,20 @@ content:
   <script>
     document.write(
       '<p>' +
-        (['Benjamin Bädorf', 'Jhonas Wernery', 'Hendrik Sokolowki']
+      (['Benjamin Bädorf', 'Jhonas Wernery', 'Hendrik Sokolowki', 'Akshay Mankar']
         .sort(() => Math.random() - 0.5)
         .join(', ')) +
       '</p>'
     );
   </script>
-    c/o MiOM 202,
+  c/o MiOM Kreativraum e.V.,
   Wilhelm-Mauser-Straße 47 Halle 5,
   D-50827 Köln,
   [crew@pub.solar](mailto:crew@pub.solar)
 
   ## Our Statutes
 
-    Are over [here](https://pub.solar/satzung).
+  Are over [here](https://pub.solar/satzung). They are only available in German for now.
 
   ## Our Privacy Policy
 
@@ -82,87 +87,6 @@ content:
 
   ## Our hosting
 
-    Our friends at Greenbaum Cloud (Jhonas works there) are kindly providing us their infrastructure for [green hosting](https://www.thegreenwebfoundation.org/green-web-check/?url=https%3A%2F%2Fpub.solar) without charging us. Give them a visit.
+  We use a dedicated server from Hetzner GmbH hosted in Germany.
-    [![Greenbaum Cloud Logo](/assets/greenbaum-cloud-logo.svg)](https://greenbaum.cloud)
-
-  de: |
-    # Hi! Wir sind pub.solar
-
-    Wir sind ein nicht eingetragener Verein mit Sitz in Köln. Unser Ziel ist es mehr Menschen zu ermöglichen, Freie Software zu benutzen, sicher digital zu kommunizieren, und datensparsamer zu leben. Wir stellen für Dich und alle Menschen die Du lieb hast auf transparente und demokratische Weise Freie Software zur Verfügung.
-
-    Momentan haben wir vier größere Projekte:
-
-    * [Matrix](https://chat.pub.solar): dezentraler, Ende-zu-Ende verschlüsselter Chat, ähnlich wie Slack oder Discord
-    * [Mastodon](https://mastodon.pub.solar): dezentrale Mikrobloggingplattform, ähnlich wie Twitter
-    * [Nextcloud](https://cloud.pub.solar): Cloud mit Office Möglichkeiten, ähnlich wie Teile der Google Suite und Microsoft Office 365
-    * [PubSolarOS](https://pub.solar/os/), eine Linux Distribution die auf NixOS basiert
-
-    Auf unseren Mastodon und Matrix Instanzen ist die Registrierung für alle offen. Wenn Du (oder dein Verein, oder deine Familie) gerne unsere Nextcloud benutzen möchten, schreib uns gerne an.
-
-    Du kannst uns via [#General in Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) und [@crew auf Mastodon](https://mastodon.pub.solar/@crew) erreichen, oder eine Mail an [crew@pub.solar](mailto:crew@pub.solar) schicken.
-
-    Unseren PGP Schlüssel findest du [hier](https://keys.openpgp.org/vks/v1/by-fingerprint/8A8987ADE3736C8CA2EB315A9B809EBBDD62BAE3). Er hat folgenden Fingerabdruck:
-
-    ```
-    8A89 87AD E373 6C8C A2EB  315A 9B80 9EBB DD62 BAE3
-    ```
-
-    ## Mitglied oder Helfer*in werden
-    
-    Bist du daran interessiert ein Mitglied von pub.solar n.e.V. zu werden? Du würdest die Organisation gerne mit Arbeit, Geld, oder einfach nur deinen Namen unterstützen?
-    
-    Momentan sind wir ein nicht eingetragener Verein. Das bedeutet das wir juristisch eine Gruppe einzelner Personen sind (wie eine GbR) und der Verein nicht haften oder als juristische Person existiert. Unser Ziel ist es einen eingetragener Verein (e.V.) zu gründen.
-
-    Wir suchen immer nach Hilfe und Unterstützung. Eine Mitgliedschaft ist momentan weder mit Kosten noch Vorteile verbunden, und sollte eher ein Zeichen der Unterstützung sein. Wir ermutigen jede*n ein Mitglied zu werden, sogar (oder, vor allem) wenn du nicht sehr technisch bewandert bist. Unser Ziel ist es pub.solar zu einer Organisation zu machen die _allen_ hilft, vor allem Menschen die selbständig nicht in der Lage wären IT-Infrastruktur zu verwalten. Wir wollen dir eine Stimme in den Entscheidungen bezüglich deiner IT-Services geben. Wir wollen, dass die Community gemeinsam entscheidet wie IT die mit Solidarität, Freiheit, Privacy, und gegenseite Unterstützung gebaut wird aussieht.
-
-    Klingt nach deinem Ding? Schon ne Ahnung was du machen willst? Keine Ahnung was du machen willst? Schick die Crew ne Nachricht, wir freuen uns von dir zu hören!
-
-    ## Finanzierung
-    
-    Der größte Teil unserer RZ-Ausstattung wird umsonst von greenbaum.cloud gespendet. Die anderen kosten zahlen wir momentan aus eigener Tasche (wie der Domainname).
-
-    Diese Situation ist nicht nachhaltig, also arbeiten wir aktuell daran einen e.V. zu gründen und die Finanzierung zu sichern.
-
-    ### Per IBAN spenden
-
-    Jhonas Wernery
-    DE97430609674093197700
-    GLS Bank
-
-    ### Per Liberapay spenden
-    
-    [Hier geht's lang](https://liberapay.com/pub.solar/)
-
-    ### Per PayPal spenden
-    
-    [Hier geht's lang](https://www.paypal.com/paypalme/pubsolar)
-
-    ## Impressum
-
-    pub.solar n.e.V.
-    <script>
-      document.write(
-        '<p>' +
-        (['Benjamin Bädorf', 'Jhonas Wernery', 'Hendrik Sokolowki']
-          .sort(() => Math.random() - 0.5)
-          .join(', ')) +
-        '</p>'
-      );
-    </script>
-    c/o MiOM 202,
-    Wilhelm-Mauser-Straße 47 Halle 5,
-    D-50827 Köln,
-    [crew@pub.solar](mailto:crew@pub.solar)
-
-    ### Unsere Satzung
-
-    Findest Du [hier](https://pub.solar/satzung).
-
-    ## Unsere Datenschutzerklärung
-    Findest Du [hier](/privacy).
-
-    ## Unser Hosting
-
-    Unsere Freunde bei der Firma Greenbaum Cloud (Jhonas arbeitet dort auch) sind so cool uns ihre Infrastruktur für [grünes Hosting](https://www.thegreenwebfoundation.org/green-web-check/?url=https%3A%2F%2Fpub.solar) momentan gratis zur Verfügung zu stellen. Klickt gerne mal rein.
-    [![Greenbaum Cloud Logo](/assets/greenbaum-cloud-logo.svg)](https://greenbaum.cloud)
 
+  The code for the infrastructure can be found [in this git repository](https://git.pub.solar/pub-solar/infra).

assets/greenbaum-cloud-logo.svg

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="2496px" height="224px" viewBox="0 0 2496 224" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>gbv-logo</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="gbv-logo" fill-rule="nonzero">
-            <g id="GREENBAUM" transform="translate(310.708844, 30.000000)" fill="#ABAFAF">
-                <path d="M83.536,30.872 C67.0406667,30.872 55.1231667,35.4498333 47.7835,44.6055 C40.4438333,53.7611667 36.774,66.284 36.774,82.174 C36.774,89.892 37.682,96.8911667 39.498,103.1715 C41.314,109.451833 44.038,114.862 47.67,119.402 C51.302,123.942 55.842,127.4605 61.29,129.9575 C66.738,132.4545 73.094,133.703 80.358,133.703 C84.2926667,133.703 87.6598333,133.627333 90.4595,133.476 C93.2591667,133.324667 95.7183333,133.022 97.837,132.568 L97.837,77.861 L133.249,77.861 L133.249,155.722 C129.011667,157.386667 122.201667,159.164833 112.819,161.0565 C103.436333,162.948167 91.8593333,163.894 78.088,163.894 C66.284,163.894 55.5771667,162.078 45.9675,158.446 C36.3578333,154.814 28.148,149.517333 21.338,142.556 C14.528,135.594667 9.26916667,127.044333 5.5615,116.905 C1.85383333,106.765667 1.13686838e-13,95.1886667 1.13686838e-13,82.174 C1.13686838e-13,69.008 2.043,57.3553333 6.129,47.216 C10.215,37.0766667 15.8143333,28.4885 22.927,21.4515 C30.0396667,14.4145 38.4008333,9.08 48.0105,5.448 C57.6201667,1.816 67.873,0 78.769,0 C86.1843333,0 92.8808333,0.491833333 98.8585,1.4755 C104.836167,2.45916667 109.9815,3.59416667 114.2945,4.8805 C118.6075,6.16683333 122.163833,7.491 124.9635,8.853 C127.763167,10.215 129.768333,11.2743333 130.979,12.031 L120.764,40.406 C115.921333,37.8333333 110.359833,35.6011667 104.0795,33.7095 C97.7991667,31.8178333 90.9513333,30.872 83.536,30.872 Z" id="Path"></path>
-                <path d="M212.164289,1.816 C235.772289,1.816 253.856622,6.0155 266.417289,14.4145 C278.977956,22.8135 285.258289,35.866 285.258289,53.572 C285.258289,64.6193333 282.723456,73.5858333 277.653789,80.4715 C272.584122,87.3571667 265.282289,92.7673333 255.748289,96.702 C258.926289,100.636667 262.255622,105.138833 265.736289,110.2085 C269.216956,115.278167 272.659789,120.574833 276.064789,126.0985 C279.469789,131.622167 282.761289,137.372833 285.939289,143.3505 C289.117289,149.328167 292.068289,155.192333 294.792289,160.943 L255.067289,160.943 C252.191956,155.797667 249.278789,150.576667 246.327789,145.28 C243.376789,139.983333 240.350122,134.838 237.247789,129.844 C234.145456,124.85 231.080956,120.120833 228.054289,115.6565 C225.027622,111.192167 222.000956,107.144 218.974289,103.512 L201.495289,103.512 L201.495289,160.943 L166.083289,160.943 L166.083289,5.902 C173.801289,4.38866667 181.784122,3.32933333 190.031789,2.724 C198.279456,2.11866667 205.656956,1.816 212.164289,1.816 Z M214.207289,32.007 C211.634622,32.007 209.326789,32.0826667 207.283789,32.234 C205.240789,32.3853333 203.311289,32.5366667 201.495289,32.688 L201.495289,75.364 L211.483289,75.364 C224.800622,75.364 234.334622,73.6993333 240.085289,70.37 C245.835956,67.0406667 248.711289,61.3656667 248.711289,53.345 C248.711289,45.627 245.798122,40.1411667 239.971789,36.8875 C234.145456,33.6338333 225.557289,32.007 214.207289,32.007 Z" id="Shape"></path>
-                <polygon id="Path" points="317.411578 160.943 317.411578 3.632 423.647578 3.632 423.647578 33.369 352.823578 33.369 352.823578 64.241 415.702578 64.241 415.702578 93.297 352.823578 93.297 352.823578 131.206 428.868578 131.206 428.868578 160.943"></polygon>
-                <polygon id="Path" points="454.892867 160.943 454.892867 3.632 561.128867 3.632 561.128867 33.369 490.304867 33.369 490.304867 64.241 553.183867 64.241 553.183867 93.297 490.304867 93.297 490.304867 131.206 566.349867 131.206 566.349867 160.943"></polygon>
-                <path d="M697.929156,160.943 C687.789822,142.934333 676.818156,125.152667 665.014156,107.598 C653.210156,90.0433333 640.649489,73.4723333 627.332156,57.885 L627.332156,160.943 L592.374156,160.943 L592.374156,3.632 L621.203156,3.632 C626.197156,8.626 631.720822,14.755 637.774156,22.019 C643.827489,29.283 649.994322,37.0388333 656.274656,45.2865 C662.554989,53.5341667 668.797489,62.0845 675.002156,70.9375 C681.206822,79.7905 687.033156,88.303 692.481156,96.475 L692.481156,3.632 L727.666156,3.632 L727.666156,160.943 L697.929156,160.943 Z" id="Path"></path>
-                <path d="M816.342444,162.986 C807.716444,162.986 799.128278,162.721167 790.577944,162.1915 C782.027611,161.661833 773.136778,160.413333 763.905444,158.446 L763.905444,5.902 C771.169444,4.54 779.114444,3.5185 787.740444,2.8375 C796.366444,2.1565 804.387111,1.816 811.802444,1.816 C821.790444,1.816 830.983944,2.53483333 839.382944,3.9725 C847.781944,5.41016667 855.008111,7.86933333 861.061444,11.35 C867.114778,14.8306667 871.843944,19.4085 875.248944,25.0835 C878.653944,30.7585 880.356444,37.7576667 880.356444,46.081 C880.356444,58.6416667 874.303111,68.554 862.196444,75.818 C872.184444,79.6013333 878.994444,84.7466667 882.626444,91.254 C886.258444,97.7613333 888.074444,105.101 888.074444,113.273 C888.074444,129.768333 882.058944,142.177667 870.027944,150.501 C857.996944,158.824333 840.101778,162.986 816.342444,162.986 Z M798.409444,92.389 L798.409444,133.022 C800.982111,133.324667 803.781778,133.551667 806.808444,133.703 C809.835111,133.854333 813.164444,133.93 816.796444,133.93 C827.389778,133.93 835.940111,132.416667 842.447444,129.39 C848.954778,126.363333 852.208444,120.764 852.208444,112.592 C852.208444,105.328 849.484444,100.144833 844.036444,97.0425 C838.588444,93.9401667 830.794778,92.389 820.655444,92.389 L798.409444,92.389 Z M798.409444,65.376 L815.661444,65.376 C826.557444,65.376 834.351111,63.9761667 839.042444,61.1765 C843.733778,58.3768333 846.079444,53.8746667 846.079444,47.67 C846.079444,41.314 843.658111,36.8496667 838.815444,34.277 C833.972778,31.7043333 826.860111,30.418 817.477444,30.418 C814.450778,30.418 811.197111,30.4558333 807.716444,30.5315 C804.235778,30.6071667 801.133444,30.7963333 798.409444,31.099 L798.409444,65.376 Z" id="Shape"></path>
-                <path d="M1017.15673,160.943 C1015.49207,155.495 1013.63823,149.895667 1011.59523,144.145 C1009.55223,138.394333 1007.54707,132.643667 1005.57973,126.893 L944.289733,126.893 C942.3224,132.643667 940.317233,138.394333 938.274233,144.145 C936.231233,149.895667 934.3774,155.495 932.712733,160.943 L895.938733,160.943 C901.840733,143.993667 907.440067,128.330667 912.736733,113.954 C918.0334,99.5773333 923.216567,86.033 928.286233,73.321 C933.3559,60.609 938.3499,48.5401667 943.268233,37.1145 C948.186567,25.6888333 953.294067,14.528 958.590733,3.632 L992.413733,3.632 C997.559067,14.528 1002.62873,25.6888333 1007.62273,37.1145 C1012.61673,48.5401667 1017.64857,60.609 1022.71823,73.321 C1027.7879,86.033 1032.97107,99.5773333 1038.26773,113.954 C1043.5644,128.330667 1049.16373,143.993667 1055.06573,160.943 L1017.15673,160.943 Z M974.707733,39.271 C973.951067,41.541 972.816067,44.6433333 971.302733,48.578 C969.7894,52.5126667 968.049067,57.0526667 966.081733,62.198 C964.1144,67.3433333 961.9579,73.0183333 959.612233,79.223 C957.266567,85.4276667 954.883067,91.935 952.461733,98.745 L997.180733,98.745 C994.7594,91.935 992.413733,85.4276667 990.143733,79.223 C987.873733,73.0183333 985.717233,67.3433333 983.674233,62.198 C981.631233,57.0526667 979.853067,52.5126667 978.339733,48.578 C976.8264,44.6433333 975.615733,41.541 974.707733,39.271 Z" id="Shape"></path>
-                <path d="M1127.85202,164.121 C1116.80469,164.121 1107.27069,162.569833 1099.25002,159.4675 C1091.22936,156.365167 1084.60852,152.052167 1079.38752,146.5285 C1074.16652,141.004833 1070.30752,134.421833 1067.81052,126.7795 C1065.31352,119.137167 1064.06502,110.700333 1064.06502,101.469 L1064.06502,3.632 L1099.47702,3.632 L1099.47702,98.518 C1099.47702,104.874 1100.19586,110.284167 1101.63352,114.7485 C1103.07119,119.212833 1105.03852,122.844833 1107.53552,125.6445 C1110.03252,128.444167 1113.05919,130.449333 1116.61552,131.66 C1120.17186,132.870667 1124.06869,133.476 1128.30602,133.476 C1136.93202,133.476 1143.93119,130.827667 1149.30352,125.531 C1154.67586,120.234333 1157.36202,111.23 1157.36202,98.518 L1157.36202,3.632 L1192.77402,3.632 L1192.77402,101.469 C1192.77402,110.700333 1191.48769,119.175 1188.91502,126.893 C1186.34236,134.611 1182.40769,141.231833 1177.11102,146.7555 C1171.81436,152.279167 1165.08002,156.554333 1156.90802,159.581 C1148.73602,162.607667 1139.05069,164.121 1127.85202,164.121 Z" id="Path"></path>
-                <path d="M1268.51131,3.632 C1271.23531,8.626 1274.37548,14.7928333 1277.93181,22.1325 C1281.48814,29.4721667 1285.19581,37.4171667 1289.05481,45.9675 C1292.91381,54.5178333 1296.73498,63.2573333 1300.51831,72.186 C1304.30164,81.1146667 1307.85798,89.5136667 1311.18731,97.383 C1314.51664,89.5136667 1318.07298,81.1146667 1321.85631,72.186 C1325.63964,63.2573333 1329.46081,54.5178333 1333.31981,45.9675 C1337.17881,37.4171667 1340.88648,29.4721667 1344.44281,22.1325 C1347.99914,14.7928333 1351.13931,8.626 1353.86331,3.632 L1386.09731,3.632 C1387.61064,14.074 1389.01048,25.7645 1390.29681,38.7035 C1391.58314,51.6425 1392.71814,65.1111667 1393.70181,79.1095 C1394.68548,93.1078333 1395.59348,107.144 1396.42581,121.218 C1397.25814,135.292 1397.97698,148.533667 1398.58231,160.943 L1364.07831,160.943 C1363.62431,145.658333 1363.01898,129.011667 1362.26231,111.003 C1361.50564,92.9943333 1360.37064,74.8343333 1358.85731,56.523 C1356.13331,62.879 1353.10664,69.916 1349.77731,77.634 C1346.44798,85.352 1343.15648,93.07 1339.90281,100.788 C1336.64914,108.506 1333.50898,115.8835 1330.48231,122.9205 C1327.45564,129.9575 1324.88298,135.973 1322.76431,140.967 L1298.02131,140.967 C1295.90264,135.973 1293.32998,129.9575 1290.30331,122.9205 C1287.27664,115.8835 1284.13648,108.506 1280.88281,100.788 C1277.62914,93.07 1274.33764,85.352 1271.00831,77.634 C1267.67898,69.916 1264.65231,62.879 1261.92831,56.523 C1260.41498,74.8343333 1259.27998,92.9943333 1258.52331,111.003 C1257.76664,129.011667 1257.16131,145.658333 1256.70731,160.943 L1222.20331,160.943 C1222.80864,148.533667 1223.52748,135.292 1224.35981,121.218 C1225.19214,107.144 1226.10014,93.1078333 1227.08381,79.1095 C1228.06748,65.1111667 1229.20248,51.6425 1230.48881,38.7035 C1231.77514,25.7645 1233.17498,14.074 1234.68831,3.632 L1268.51131,3.632 Z" id="Path"></path>
-            </g>
-            <g id="CLOUD" transform="translate(1782.000000, 30.000000)" fill="#47B04B">
-                <path d="M71.732,164.121 C61.5926667,164.121 52.1721667,162.305 43.4705,158.673 C34.7688333,155.041 27.2021667,149.744333 20.7705,142.783 C14.3388333,135.821667 9.26916667,127.2335 5.5615,117.0185 C1.85383333,106.8035 -2.27373675e-13,95.113 -2.27373675e-13,81.947 C-2.27373675e-13,68.781 2.00516667,57.0905 6.0155,46.8755 C10.0258333,36.6605 15.3603333,28.0723333 22.019,21.111 C28.6776667,14.1496667 36.3956667,8.89083333 45.173,5.3345 C53.9503333,1.77816667 63.106,2.27373675e-13 72.64,2.27373675e-13 C78.542,2.27373675e-13 83.9143333,0.378333333 88.757,1.135 C93.5996667,1.89166667 97.837,2.8375 101.469,3.9725 C105.101,5.1075 108.203333,6.2425 110.776,7.3775 C113.348667,8.5125 115.316,9.534 116.678,10.442 L111.684,23.835 C107.900667,21.565 103.095833,19.3328333 97.2695,17.1385 C91.4431667,14.9441667 84.217,13.847 75.591,13.847 C65.7543333,13.847 57.1661667,15.5116667 49.8265,18.841 C42.4868333,22.1703333 36.32,26.8616667 31.326,32.915 C26.332,38.9683333 22.5865,46.1566667 20.0895,54.48 C17.5925,62.8033333 16.344,72.0346667 16.344,82.174 C16.344,92.616 17.5925,102.0365 20.0895,110.4355 C22.5865,118.8345 26.2563333,125.985 31.099,131.887 C35.9416667,137.789 41.8815,142.329 48.9185,145.507 C55.9555,148.685 64.014,150.274 73.094,150.274 C83.082,150.274 91.4431667,149.328167 98.1775,147.4365 C104.911833,145.544833 110.019333,143.615333 113.5,141.648 L117.813,154.814 C116.753667,155.570667 114.937667,156.440833 112.365,157.4245 C109.792333,158.408167 106.538667,159.429667 102.604,160.489 C98.6693333,161.548333 94.1293333,162.4185 88.984,163.0995 C83.8386667,163.7805 78.088,164.121 71.732,164.121 Z" id="Path"></path>
-                <polygon id="Path" points="234.037 147.323 234.037 160.716 144.599 160.716 144.599 3.405 160.035 3.405 160.035 147.323"></polygon>
-                <path d="M399.747,81.947 C399.747,95.4156667 397.779667,107.295333 393.845,117.586 C389.910333,127.876667 384.575833,136.464833 377.8415,143.3505 C371.107167,150.236167 363.275667,155.419333 354.347,158.9 C345.418333,162.380667 335.96,164.121 325.972,164.121 C315.984,164.121 306.525667,162.380667 297.597,158.9 C288.668333,155.419333 280.836833,150.236167 274.1025,143.3505 C267.368167,136.464833 262.033667,127.876667 258.099,117.586 C254.164333,107.295333 252.197,95.4156667 252.197,81.947 C252.197,68.4783333 254.164333,56.6365 258.099,46.4215 C262.033667,36.2065 267.368167,27.6561667 274.1025,20.7705 C280.836833,13.8848333 288.668333,8.70166667 297.597,5.221 C306.525667,1.74033333 315.984,2.27373675e-13 325.972,2.27373675e-13 C335.96,2.27373675e-13 345.418333,1.74033333 354.347,5.221 C363.275667,8.70166667 371.107167,13.8848333 377.8415,20.7705 C384.575833,27.6561667 389.910333,36.2065 393.845,46.4215 C397.779667,56.6365 399.747,68.4783333 399.747,81.947 Z M383.403,81.947 C383.403,71.3536667 382.041,61.8575 379.317,53.4585 C376.593,45.0595 372.734,37.909 367.74,32.007 C362.746,26.105 356.7305,21.6028333 349.6935,18.5005 C342.6565,15.3981667 334.749333,13.847 325.972,13.847 C317.194667,13.847 309.2875,15.3981667 302.2505,18.5005 C295.2135,21.6028333 289.198,26.105 284.204,32.007 C279.21,37.909 275.351,45.0595 272.627,53.4585 C269.903,61.8575 268.541,71.3536667 268.541,81.947 C268.541,92.5403333 269.903,102.0365 272.627,110.4355 C275.351,118.8345 279.21,125.985 284.204,131.887 C289.198,137.789 295.2135,142.329 302.2505,145.507 C309.2875,148.685 317.194667,150.274 325.972,150.274 C334.749333,150.274 342.6565,148.685 349.6935,145.507 C356.7305,142.329 362.746,137.789 367.74,131.887 C372.734,125.985 376.593,118.8345 379.317,110.4355 C382.041,102.0365 383.403,92.5403333 383.403,81.947 Z" id="Shape"></path>
-                <path d="M491.001,164.121 C480.559,164.121 471.668167,162.532 464.3285,159.354 C456.988833,156.176 451.049,151.787333 446.509,146.188 C441.969,140.588667 438.6775,134.0435 436.6345,126.5525 C434.5915,119.0615 433.57,111.003 433.57,102.377 L433.57,3.405 L449.006,3.405 L449.006,100.334 C449.006,108.96 450.0275,116.413167 452.0705,122.6935 C454.1135,128.973833 456.951,134.157 460.583,138.243 C464.215,142.329 468.603667,145.355667 473.749,147.323 C478.894333,149.290333 484.645,150.274 491.001,150.274 C497.357,150.274 503.107667,149.290333 508.253,147.323 C513.398333,145.355667 517.787,142.329 521.419,138.243 C525.051,134.157 527.8885,128.973833 529.9315,122.6935 C531.9745,116.413167 532.996,108.96 532.996,100.334 L532.996,3.405 L548.432,3.405 L548.432,102.377 C548.432,111.003 547.4105,119.0615 545.3675,126.5525 C543.3245,134.0435 540.033,140.588667 535.493,146.188 C530.953,151.787333 525.013167,156.176 517.6735,159.354 C510.333833,162.532 501.443,164.121 491.001,164.121 Z" id="Path"></path>
-                <path d="M713.461,81.947 C713.461,95.4156667 711.342333,107.144 707.105,117.132 C702.867667,127.12 696.927833,135.443333 689.2855,142.102 C681.643167,148.760667 672.525333,153.754667 661.932,157.084 C651.338667,160.413333 639.686,162.078 626.974,162.078 C620.618,162.078 613.959333,161.7375 606.998,161.0565 C600.036667,160.3755 593.907667,159.354 588.611,157.992 L588.611,6.356 C593.907667,4.84266667 600.036667,3.7455 606.998,3.0645 C613.959333,2.3835 620.618,2.043 626.974,2.043 C639.686,2.043 651.338667,3.70766667 661.932,7.037 C672.525333,10.3663333 681.643167,15.3603333 689.2855,22.019 C696.927833,28.6776667 702.867667,37.001 707.105,46.989 C711.342333,56.977 713.461,68.6296667 713.461,81.947 Z M604.047,147.096 C604.955,147.247333 607.262833,147.55 610.9705,148.004 C614.678167,148.458 620.618,148.685 628.79,148.685 C640.14,148.685 650.052333,147.133833 658.527,144.0315 C667.001667,140.929167 674.114333,136.502667 679.865,130.752 C685.615667,125.001333 689.928667,118.002167 692.804,109.7545 C695.679333,101.506833 697.117,92.2376667 697.117,81.947 C697.117,71.6563333 695.679333,62.425 692.804,54.253 C689.928667,46.081 685.615667,39.1196667 679.865,33.369 C674.114333,27.6183333 667.001667,23.1918333 658.527,20.0895 C650.052333,16.9871667 640.14,15.436 628.79,15.436 C620.618,15.436 614.678167,15.663 610.9705,16.117 C607.262833,16.571 604.955,16.8736667 604.047,17.025 L604.047,147.096 Z" id="Shape"></path>
-            </g>
-            <g id="Group-Copy">
-                <g id="Path" fill="#ABAFAF">
-                    <path d="M187.994932,133.21189 L140.549624,133.21189 L140.549624,90.6287065 L187.994932,90.6287065 L187.994932,90.5048934 L236.337666,90.6287065 L236.337666,208.706214 C236.337666,208.70627 236.337666,208.706326 236.337666,208.706382 C236.337666,217.152896 229.03106,224 220.0181,224 L195.727208,224 L51.2910441,224 L32.6390675,224 C32.638984,224 32.6389004,224 32.638817,224 C14.6128961,224 0,210.305476 0,193.412448 L0,30.5875332 C0,13.6945051 14.6131467,0 32.6390675,0 L51.2910441,0 L141.685281,0 L141.685281,45.8181025 L56.501544,45.8181025 C51.9950638,45.8181025 48.3418398,49.2417288 48.3418398,53.4649858 L48.3341239,170.534626 C48.3341239,170.537037 48.3341252,170.539449 48.3341276,170.54186 C48.3383909,174.765115 51.9950692,178.185501 56.5015477,178.181506 L187.994932,178.057696 L187.994932,133.21189 Z"></path>
-                </g>
-                <g id="Path" transform="translate(190.129735, 0.000000)" fill="#47B04B">
-                    <polygon points="0 44.8617153 47.8702648 44.8617153 47.8702648 0 0 0"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

de/about.yml

@@ -0,0 +1,91 @@
+layout: layouts/default.tsx
+
+title: Über uns & Impressum
+
+content: |
+  # Hi! Wir sind pub.solar
+
+  Wir sind ein nicht eingetragener Verein mit Sitz in Köln. Unser Ziel ist es mehr Menschen zu ermöglichen, Freie Software zu benutzen, sicher digital zu kommunizieren, und datensparsamer zu leben.
+
+  Wir stellen für Dich und alle Menschen die Du lieb hast auf transparente und demokratische Weise freie Software zur Verfügung.
+
+  Momentan bieten wir diese Services an:
+
+  * [Matrix](https://chat.pub.solar): dezentraler, Ende-zu-Ende verschlüsselter Chat, ähnlich wie Slack oder Discord,
+  * [Mastodon](https://mastodon.pub.solar): dezentrale Mikrobloggingplattform, ähnlich wie Twitter,
+  * [Nextcloud](https://cloud.pub.solar): Cloud mit Office Möglichkeiten, ähnlich wie Teile der Google Suite und Microsoft Office 365,
+  * [Forgejo](https://git.pub.solar/): ein git Server, ähnlich wie GitHub oder Gitlab.
+
+  Ausserdem bieten wir folgende Services an, die jederzeit geändert werden oder verschwinden könnten:
+
+  * [Searx](https://search.pub.solar/): eine Meta-Suchmachine, ähnlich wie Google oder Bing,
+  * [Mailman](https://lists.pub.solar/): eine Software für Mailing-Listen,
+  * [OBS Portal](https://obs-portal.pub.solar/): ein Server um [OpenBikeSensor](https://www.openbikesensor.org/)-Daten zu speichern, begrenzt auf die Region Köln/Bonn.
+
+  Für manche dieser Services musst du einen Account registrieren, bei uns heißt der [pub.solar ID](https://auth.pub.solar). Die Registrierung ist für alle offen. Bei der Nextcloud ist der Speicherplatz allerdings stark begrenzt. Falls du Speicherplatz in der Nextcloud haben willst, kontaktiere die Crew.
+
+  ## Kontakt und Hilfe
+
+  Du kannst uns via [#General in Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) und [@crew auf Mastodon](https://mastodon.pub.solar/@crew) erreichen, oder eine Mail an [crew@pub.solar](mailto:crew@pub.solar) schicken.
+
+  Unseren PGP Schlüssel findest du [hier](https://keys.openpgp.org/vks/v1/by-fingerprint/8A8987ADE3736C8CA2EB315A9B809EBBDD62BAE3). Er hat folgenden Fingerabdruck:
+
+  ```
+  8A89 87AD E373 6C8C A2EB  315A 9B80 9EBB DD62 BAE3
+  ```
+
+  Schau dir bei Fragen gerne unser [wiki](https://wiki.pub.solar) an oder kontaktiere uns über einen der oben genannten Kanäle. Im Matrix [#General Raum](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) gibt es immer Menschen, die gerne deine Fragen beantworten.
+
+  ## Mitglied oder Helfer*in werden
+
+  Bist du daran interessiert ein Mitglied von pub.solar n.e.V. zu werden? Du würdest die Organisation gerne mit Arbeit, Geld, oder einfach nur deinen Namen unterstützen?
+
+  Momentan sind wir ein nicht eingetragener Verein. Das bedeutet das wir juristisch eine Gruppe einzelner Personen sind (wie eine GbR) und der Verein nicht haften oder als juristische Person existiert. Unser Ziel ist es einen eingetragener Verein (e.V.) zu gründen.
+
+  Wir suchen immer nach Hilfe und Unterstützung. Eine Mitgliedschaft ist momentan weder mit Kosten noch Vorteile verbunden, und sollte eher ein Zeichen der Unterstützung sein. Wir ermutigen jede*n ein Mitglied zu werden, sogar (oder, vor allem) wenn du nicht sehr technisch bewandert bist. Unser Ziel ist es pub.solar zu einer Organisation zu machen die _allen_ hilft, vor allem Menschen die selbständig nicht in der Lage wären IT-Infrastruktur zu verwalten. Wir wollen dir eine Stimme in den Entscheidungen bezüglich deiner IT-Services geben. Wir wollen, dass die Community gemeinsam entscheidet wie IT die mit Solidarität, Freiheit, Privacy, und gegenseite Unterstützung gebaut wird aussieht.
+
+  Klingt nach deinem Ding? Schon ne Ahnung was du machen willst? Keine Ahnung was du machen willst? Schick die Crew ne Nachricht, wir freuen uns von dir zu hören!
+
+  ## Finanzierung
+
+  Die laufenden Kosten zahlen wir momentan aus eigener Tasche (wie der Server + die Domain).
+
+  Diese Situation ist nicht nachhaltig, also arbeiten wir aktuell daran einen e.V. zu gründen und die Finanzierung zu sichern. Wir freuen uns über alle, die sich einbringen oder helfen möchten.
+
+  ### Per IBAN spenden
+
+  Jhonas Wernery
+  DE70430609674093197701
+  GLS Bank
+
+  ![QR GiroCode](/assets/donation-qr.png)
+
+  ## Impressum
+
+  pub.solar n.e.V.
+  <script>
+    document.write(
+      '<p>' +
+      (['Benjamin Bädorf', 'Jhonas Wernery', 'Hendrik Sokolowki', 'Akshay Mankar']
+        .sort(() => Math.random() - 0.5)
+        .join(', ')) +
+      '</p>'
+    );
+  </script>
+  c/o MiOM Kreativraum e.V.,
+  Wilhelm-Mauser-Straße 47 Halle 5,
+  D-50827 Köln,
+  [crew@pub.solar](mailto:crew@pub.solar)
+
+  ### Unsere Satzung
+
+  Findest Du [hier](https://pub.solar/satzung).
+
+  ## Unsere Datenschutzerklärung
+  Findest Du [hier](/privacy).
+
+  ## Unser Hosting
+
+  Wir benutzen einen dedicated Server der Hetzner GmbH, der in einem deutschen Rechenzentrum steht.
+
+  Den Quellcode der Infrastruktur kannst du [in diesem git Repo](https://git.pub.solar/pub-solar/infra) einsehen.

de/hakken.yml

@@ -0,0 +1,49 @@
+layout: layouts/default.tsx
+
+title: hakken.irl
+showHakkenDates: true
+
+content: |
+  # hakken.irl
+
+  Du bist eingeladen!
+
+  Wir treffen uns (fast) alle drei Monate zum hakken.irl, ein kleiner 3-Tägiger (Freitag bis Sonntag) Hackathon bei dem es nur darum geht Spaß zu haben und abzunerden.
+
+  ## Was machen wir denn so?
+
+  Es gibt nur einen festen Programmpunkt: bei der Critical Mass mitradeln. Tendenziell hakken wir danach an pub.solar Sachen, wie [unserer Infrastruktur](https://git.pub.solar/pub-solar/infra "pub.solar infra repo").
+
+  Ein paar Beispiele:
+
+  * [die Infrastruktur auf NixOS 23.11 aktualisieren](https://git.pub.solar/pub-solar/infra/pulls/74),
+  * [unsere Website auf einen neuen Server migrieren](https://git.pub.solar/pub-solar/infra/pulls/20),
+  * [die Standardinhalte des Nextcloud Verzeichnis für neue User definieren](https://git.pub.solar/pub-solar/infra/pulls/73),
+  * [Matrix vhosts in nginx konfigurieren](https://git.pub.solar/pub-solar/infra/pulls/33),
+  * digitale Animationen kreieren,
+  * Fotos bearbeiten und Musik machen,
+  * Wizard, Karten, und Brettspiele zocken,
+  * kochen, bestellen, und gemeinsam essen,
+  * und über die FDP herziehen.
+
+  ## Ist das also nur für über-nerds?
+
+  Es geht schon ziemlich nerdy zu, und du solltest auf jeden Fall deinen Laptop dabei haben. Allerdings ist es uns eigentlich egal, wie du deine Zeit verbringst. Im besten Falle kannst du dich auch allein mit einem eigenen Projekt beschäftigen. Wir benutzen den Raum zum gemeinsamen Arbeiten und Austauschen, aber wenn der Vibe passt, kannst du dich auch gerne dazu setzen und nur Spiele zocken.
+
+  ## Was kostet das?
+
+  Die Teilnahme kostet nichts, aber wenn wir mal Essen bestellen oder beim Kiosk was holen wärs cool wenn du etwas dazu gibst. Eine kleine Spende an den Verein ist auch immer gerne gesehen.
+
+  ## Wo schlafe ich?
+
+  Falls du keine (bezahlbare, coole, sichere) Übernachtungsmöglichkeit finden kannst, dann rede mit uns. Wir kriegen garantiert einen Schlafplatz organisiert.
+
+  ## Wo melde ich mich an?
+
+  Schreib uns kurz eine Nachricht. Du kannst uns via [Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) und [Mastodon](https://mastodon.pub.solar/@crew) erreichen, oder schick uns eine Mail an [crew@pub.solar](mailto:crew@pub.solar).
+
+  ## Und wann findet das statt?
+
+  hakken.irl startet am letzten Freitag im Monat um 13:12 und geht bis Sonntag 16:20.
+
+  Wir treffen uns alle drei Monate, üblicherweise im Januar, April, Juli und Oktober.

de/index.yml

@@ -0,0 +1,32 @@
+layout: layouts/homepage.tsx
+
+content: |
+  # Willkommen bei pub.solar
+  
+  Wir sind eine freundliche Gemeinschaft, die an einem digitalen Pub an der Ecke werkelt.
+
+  Unser Ziel ist es mehr Menschen zu ermöglichen, Freie Software zu benutzen, sicher digital zu kommunizieren, und datensparsamer zu leben.
+
+  Wir stellen freie Software für Dich und alle Menschen, die Du lieb hast, auf transparente und demokratische Weise zur Verfügung.
+
+  ***Fucking free***
+
+links:
+  - href: https://cloud.pub.solar
+    title: Nextcloud
+  - href: https://mastodon.pub.solar
+    title: Mastodon
+  - href: https://chat.pub.solar
+    title: Matrix
+  - href: https://git.pub.solar
+    title: Git
+  - href: ./services
+    title: Alle Services
+  - href: https://auth.pub.solar/realms/pub.solar/account
+    title: Deine pub.solar ID
+  - href: ./hakken
+    title: hakken.irl
+  - href: ./about
+    title: Über uns
+  - href: ./privacy
+    title: Datenschutz

de/maintenance.yml

@@ -0,0 +1,16 @@
+layout: layouts/error.tsx
+
+title: Scheduled maintenance
+
+content: |
+  # Scheduled maintenance 
+  
+  This service is currently undergoing scheduled maintenance.
+
+  Sorry for the inconvenience :)
+
+  Check our [status page](https://stats.uptimerobot.com/G28ByiBg8j) for more information.
+
+  Love, 
+
+  the pub.solar crew

de/privacy.yml

@@ -0,0 +1,8 @@
+layout: layouts/default.tsx
+
+title: Privacy Policy
+
+content: |
+  **Es gibt momentan leider keine Deutsche Version unserer Datenschutzerklärung.**
+
+  Falls Du unbedingt eine sehen willst, dann kontaktiere die Crew damit wir das Thema höher priorisieren können.

de/services.yml

@@ -0,0 +1,17 @@
+layout: layouts/default.tsx
+
+title: Unsere Dienste
+showServices: true
+
+content: |
+  # Unsere Dienste
+
+  Diese Seite gibt einen Überblick über die Dienste, die wir hosten. Wir geben einige Informationen über den Support-Status und den Datenschutz für jeden Dienst.
+
+  * [Nextcloud](#nextcloud)
+  * [Mastodon](#mastodon)
+  * [Matrix](#matrix)
+  * [Forgejo / git](#forgejo)
+  * [Mailman](#mailman)
+  * [Wiki](#wiki)
+  * [Searx](#searx)

deno.json

@@ -1,14 +1,17 @@
 {
   "importMap": "import_map.json",
   "tasks": {
-    "lume:fresh": "echo \"import 'lume/cli.ts'\" | deno run --lock-write --lock=deno.lock --unstable -A -",
+    "lume:fresh": "echo \"import 'lume/cli.ts'\" | deno run --lock-write --lock=deno.lock -A -",
-    "lume": "echo \"import 'lume/cli.ts'\" | deno run --unstable -A -",
+    "lume": "echo \"import 'lume/cli.ts'\" | deno run -A -",
     "build": "deno task lume",
     "build:fresh": "deno task lume:fresh",
     "serve": "deno task lume -s"
   },
   "compilerOptions": {
     "jsx": "react-jsx",
-    "jsxImportSource": "npm:react"
+    "jsxImportSource": "npm:react",
+    "types": [
+      "lume/types.ts"
+    ]
   }
 }

filters.ts

@@ -1,4 +1,4 @@
-import MarkdownIt from "https://jspm.dev/markdown-it";
+import MarkdownIt from "markdown-it";
 
 const mdIt = new MarkdownIt({
   html:         true,        // Enable HTML tags in source
@@ -27,5 +27,6 @@ const mdIt = new MarkdownIt({
 });
 
 export const md = (string) => mdIt.render(string);
+export const mdi = (string) => mdIt.renderInline(string);
 
 export const title = (value = '') => value + (value ? " | " : "") + "pub.solar";

flake.lock

@@ -1,51 +1,30 @@
 {
   "nodes": {
-    "devshell": {
+    "flake-parts": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs-lib": "nixpkgs-lib"
-          "nixpkgs"
-        ],
-        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1683635384,
+        "lastModified": 1717285511,
-        "narHash": "sha256-9goJTd05yOyD/McaMqZ4BUB8JW+mZMnZQJZ7VQ6C/Lw=",
+        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
-        "owner": "numtide",
+        "owner": "hercules-ci",
-        "repo": "devshell",
+        "repo": "flake-parts",
-        "rev": "5143ea68647c4cf5227e4ad2100db6671fc4c369",
+        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "hercules-ci",
-        "repo": "devshell",
+        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1684385584,
+        "lastModified": 1717602782,
-        "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=",
+        "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a",
+        "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
         "type": "github"
       },
       "original": {
@@ -55,69 +34,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1717284937,
+        "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
+      }
+    },
     "root": {
       "inputs": {
-        "devshell": "devshell",
+        "flake-parts": "flake-parts",
-        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
-        "nixpkgs": "nixpkgs",
-        "tritonshell-module": "tritonshell-module"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "tritonshell-module": {
-      "inputs": {
-        "devshell": [
-          "devshell"
-        ],
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1684242426,
-        "narHash": "sha256-kvFD6WP6I1fK9DMCPpuRDZxsAGKpzXMMd2G5MYP42kU=",
-        "ref": "main",
-        "rev": "d227038987158fa894872868f25bbf911c9cb8d1",
-        "revCount": 61,
-        "type": "git",
-        "url": "https://git.greenbaum.cloud/dev/tritonshell"
-      },
-      "original": {
-        "ref": "main",
-        "type": "git",
-        "url": "https://git.greenbaum.cloud/dev/tritonshell"
       }
     }
   },

flake.nix

@@ -1,59 +1,41 @@
 {
-  description = "devs & ops environment for nix'ing with triton";
+  description = "pub.solar website";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-
+    flake-parts.url = "github:hercules-ci/flake-parts";
-    flake-utils.url = "github:numtide/flake-utils";
-
-    devshell.url = "github:numtide/devshell";
-    devshell.inputs.flake-utils.follows = "flake-utils";
-    devshell.inputs.nixpkgs.follows = "nixpkgs";
-
-    tritonshell-module.url = "git+https://git.greenbaum.cloud/dev/tritonshell?ref=main";
-    tritonshell-module.inputs.devshell.follows = "devshell";
-    tritonshell-module.inputs.flake-utils.follows = "flake-utils";
-    tritonshell-module.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, flake-utils, devshell, tritonshell-module, nixpkgs }:
+  outputs = inputs@{ self, ... }:
-    flake-utils.lib.simpleFlake {
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
-      inherit self nixpkgs;
+      systems = [ "x86_64-linux" "aarch64-linux" ];
-      name = "infra-project";
+
-      preOverlays = [ devshell.overlays.default ];
+      perSystem = { system, pkgs, config, ... }: {
-      shell = { pkgs }:
+        _module.args = {
-      let
+          inherit inputs;
+          pkgs = import inputs.nixpkgs { inherit system; };
+        };
+
+        devShells.default = let
           google-font-downloader = pkgs.writeShellScriptBin "google-font-downloader" ''
             echo "Attempting to fetch $1"
             ${pkgs.nodejs}/bin/npx google-font-downloader -- $1
             rm ./_includes/styles/typography.scss || true
             echo "/* To regenerate this file, run $ google-font-downloader '$1' */" >> ./_includes/styles/typography.scss 
-          echo "" >> ./_includes/styles/stypography.scss 
+            echo "" >> ./_includes/styles/typography.scss 
             cat ./google-fonts-*.css >> ./_includes/styles/typography.scss
             rm ./google-fonts-*.css || true
           '';
-      in
+        in pkgs.mkShell {
-        pkgs.devshell.mkShell {
+          buildInputs = with pkgs; [
-          imports = [ tritonshell-module.devshellModules.x86_64-linux.tritonshell ];
-          # Now the tritonshell environment nix module options are available
-          environment = {
-            enable = true;
-            # CUSTOMIZE if desired, default options are:
-            #cnsBaseDomain = "greenbaum.zone";
-            #dataCenters = [ "cgn-1" "lev-1" ];
-            #mantaDomain = "eu-central.manta.greenbaum.cloud";
-            #tritonApiDomain = "api.greenbaum.cloud";
-          };
-
-          # Add additional packages you'd like to be available in your devshell
-          # PATH here
-          devshell.packages = with pkgs; [
             deno
             google-font-downloader
           ];
-          bash.extra = ''
+
+          shellHook = ''
             export NVIM_USE_DENOLS=1
           '';
         };
       };
+    };
 }

hakken.yml

@@ -3,31 +3,26 @@ layout: layouts/default.tsx
 title: hakken.irl
 showHakkenDates: true
 
-extraScripts:
+content: |
-  - /scripts/hakken-dates.js
+  # You're invited!
 
-content:
+  We meet (almost) every three months for hakken.irl, a small three-day (Friday to Sunday) hackathon that's just about having fun and nerding around.
-  en: |
-    # hakken.irl
-
-    You're invited!
-
-    We meet (almost) every three months in Cologne for hakken.irl, a small three-day (Friday to Sunday) hackathon that's just about having fun and nerding around.
 
   ## What will we be doing?
 
-    There is only one set agenda point: riding with Critical Mass. In general, we'll be hakking on pub.solar related stuff like [PubSolarOS](/os "PubSolarOS git repo") or [our Infra](https://git.b12f.io/pub-solar/infra "pub.solar infra repo").
+  There is only one set agenda point: riding with Critical Mass. In general, we'll be hakking on pub.solar related stuff like [our Infrastructure](https://git.pub.solar/pub-solar/infra "pub.solar infra repo").
 
-    Stuff we've done so far:
+  Examples include:
 
-    * [configured Matrix monitoring with Prometheus](https://git.b12f.io/pub-solar/infra/commit/c682a97746770121b419a9ad2c8c94688e5fa0f8),
+  * [updating the pub.solar infrastructure servers to NixOS 23.11](https://git.pub.solar/pub-solar/infra/pulls/74),
-    * [refactored the core module of PubSolarOS](https://git.b12f.io/pub-solar/os/pulls/115),
+  * [migrating our website to a new server](https://git.pub.solar/pub-solar/infra/pulls/20),
-    * [started sway as a systemd service](https://git.b12f.io/pub-solar/os/commit/159ae86722bc706ff42d4d3e4b0f49ede2f253de),
+  * [defining the default directory contents for new Nextcloud users](https://git.pub.solar/pub-solar/infra/pulls/73),
-    * [added a "paranoid" option that always uses encrypted hibernation instead of sleep](https://git.b12f.io/pub-solar/os/pulls/74),
+  * [configuring nginx to serve Matrix vhosts](https://git.pub.solar/pub-solar/infra/pulls/33),
-    * [removed nonfree software from PubSolarOS](https://git.b12f.io/pub-solar/os/pulls/113),
+  * creating digital animations,
-    * played Wizard, cards and board games,
+  * touching up photographs and making music,
-    * cooked, ordered, and ate together,
+  * playing Wizard, cards and board games,
-    * and made fun of neoliberals.
+  * cooking, ordering, and eating together,
+  * and making fun of neoliberals.
 
   ## So is it just for über-nerds?
 
@@ -39,7 +34,7 @@ content:
 
   ## Where do I sleep?
 
-    If you cannot find an (affordable, cool, safe) place to stay in Cologne, then talk to us. We'll surely be able to set you up with a place to stay somewhere.
+  If you cannot find an (affordable, cool, safe) place to stay, then talk to us. We'll surely be able to set you up with a place to stay somewhere.
 
   ## Where do I sign up?
 
@@ -47,50 +42,6 @@ content:
 
   ## When will this happen?
 
-    hakken.irl always starts on the last Friday of the month at 13:12 and ends on Sunday 16:20.
+  hakken.irl starts on the last Friday of the month at 13:12 and ends on Sunday 16:20.
 
-    We're meeting up every three months, typically on January, April, July and October.
+  We're meeting up every three months, typically in January, April, July and October.
-
-  de: |
-    # hakken.irl
-
-    Du bist eingeladen!
-
-    Wir treffen uns (fast) alle drei Monate in Köln zum hakken.irl, ein kleiner 3-Tägiger (Freitag bis Sonntag) Hackathon bei dem es nur darum geht Spaß zu haben und ab zu nerden.
-
-    ## Was machen wir denn so?
-
-    Es gibt nur einen festen Programmpunkt: bei der Critical Mass mitradeln. Tendenziell hakken wir danach an pub.solar relatierten sachen wie z.B. [PubSolarOS](/os "PubSolarOS git repo") oder [unsere Infra](https://git.b12f.io/pub-solar/infra "pub.solar infra repo").
-
-    Was wir bisher so gemacht haben:
-
-    * [Matrix monitoring per Prometheus konfiguriert](https://git.b12f.io/pub-solar/infra/commit/c682a97746770121b419a9ad2c8c94688e5fa0f8),
-    * [das core module in PubSolarOS gerefactored](https://git.b12f.io/pub-solar/os/pulls/115),
-    * [sway als systemd service starten](https://git.b12f.io/pub-solar/os/commit/159ae86722bc706ff42d4d3e4b0f49ede2f253de),
-    * [eine "paranoid" Option für PubSolarOS hinzugefügt, bei dem der PC immer in encrypted hibernation locked](https://git.b12f.io/pub-solar/os/pulls/74),
-    * [nonfree software aus PubSolarOS entfernt](https://git.b12f.io/pub-solar/os/pulls/113),
-    * Wizard, Karten und Brettspiele gespielt,
-    * zusammen gekocht, bestellt, und gegessen,
-    * und über die FDP her gezogen.
-
-    ## Ist das also nur für über-nerds?
-
-    Es geht schon ziemlich nerdy zu, und du solltest auf jeden Fall deinen Laptop dabei haben. Allerdings ist es uns eigentlich egal, wie du deine Zeit vertreibst. Im besten Falle kannst du dich auch allein an einem eigenen Projekt vergnügen. Wir benutzen den Raum zum gemeinsamen Arbeiten und Austauschen, aber wenn der vibe passt kannst du dich auch dazu setzen und nur Zocken.
-
-    ## Was kostet das?
-
-    Es kostet nichts, aber wenn wir mal Essen bestellen oder beim Kiosk was holen wärs cool wenn du was rein gibst. Auch ist ne kleine Spende an den Verein immer gerne gesehen.
-
-    ## Wo schlafe ich?
-
-    Falls du keine (bezahlbare, coole, sichere) Übernachtungsmöglichkeit in Köln finden kannst, dann rede mit uns. Wir kriegen garantiert einen Schlafplatz organisiert.
-
-    ## Wo melde ich mich an?
-
-    Schreib uns kurz ne Nachricht. Du kannst uns via [Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) und [Mastodon](https://mastodon.pub.solar/@crew) erreichen, oder eine Mail an [crew@pub.solar](mailto:crew@pub.solar) schicken.
-
-    ## Und wann soll das sein?
-
-    hakken.irl startet immer am letzten Freitag der Monats um 13:12 und geht bis Sonntag 16:20.
-
-    Wir treffen uns alle drei monate, üblicherweise im Januar, April, Juli und Oktober.

import_map.json

@@ -1,7 +1,8 @@
 {
   "imports": {
-    "lume/": "https://deno.land/x/lume@v1.17.3/",
+    "lume/": "https://deno.land/x/lume@v2.2.1/",
-    "react/jsx-runtime": "https://deno.land/x/lume@v1.17.3/deps/react_runtime.ts",
+    "react/jsx-runtime": "https://deno.land/x/lume@v2.2.1/deps/react_runtime.ts",
-    "react": "https://deno.land/x/lume@v1.17.3/deps/react.ts"
+    "react": "https://deno.land/x/lume@v2.2.1/deps/react.ts",
+    "markdown-it": "https://jspm.dev/markdown-it@13.0.2"
   }
 }

index.yml

@@ -1,28 +1,32 @@
 layout: layouts/homepage.tsx
 
+content: |
+  # Welcome to pub.solar
+  
+  We're a friendly community creating a digital corner pub. 
+
+  Our goal is to enable more people to use free software, have secure digital communications, and to take control over their private data.
+
+  We host online services for you and all the people you love. We do this transparently and democratically.
+
+  ***Fucking free***
+
 links:
-  - href: https://en.wikipedia.org/wiki/Free_software
+  - href: https://cloud.pub.solar
-    title: Fucking Free
-    openInNewTab: true
-  - href: https://auth.pub.solar/realms/pub.solar/account
-    title: Your pub.solar ID
-  - href: https://cloud.pub.solar/
     title: Nextcloud
-    openInNewTab: true
+  - href: https://mastodon.pub.solar
-  - href: https://chat.pub.solar/
-    title: Matrix
-    openInNewTab: true
-  - href: https://mastodon.pub.solar/
     title: Mastodon
-    openInNewTab: true
+  - href: https://chat.pub.solar
-  - href: https://git.pub.solar/
+    title: Matrix
+  - href: https://git.pub.solar
     title: Git
-    openInNewTab: true
+  - href: ./services
-  - href: /os
+    title: All services
-    title: PubSolarOS
+  - href: https://auth.pub.solar/realms/pub.solar/protocol/openid-connect/auth?client_id=account-console&redirect_uri=https%3A%2F%2Fauth.pub.solar%2Frealms%2Fpub.solar%2Faccount%2F%23%2F&response_mode=fragment&response_type=code&scope=openid
+    title: Your pub.solar ID
   - href: ./hakken
     title: hakken.irl
   - href: ./about
-    title: About & Imprint
+    title: About us
   - href: ./privacy
     title: Privacy policy

maintenance.yml

@@ -0,0 +1,16 @@
+layout: layouts/error.tsx
+
+title: Scheduled maintenance
+
+content: |
+  # Scheduled maintenance 
+  
+  This service is currently undergoing scheduled maintenance.
+
+  Sorry for the inconvenience :)
+
+  Check our [status page](https://stats.uptimerobot.com/G28ByiBg8j) for more information.
+
+  Love, 
+
+  the pub.solar crew

os.yml

@@ -1,38 +0,0 @@
-layout: layouts/default.tsx
-
-title: PubSolarOS
-
-content:
-  en: |
-    # PubSolarOS is an Operating System
-   
-    More specifically, it is a GNU/Linux distro based on NixOS. 
-
-    The nerdy part of the pub.solar community is creating it for their personal use. If you're into IT and especially Linux, it might be a fun thing to check out.
-
-    If you're interested in finding out what exactly makes PubSolarOS special and/or reading the code, check out [the Git repository on our gitea instance](https://git.b12f.io/pub-solar/os).
-
-    Since PubSolarOS is still in it's infancy the setup can be quite involved and documentation out of date (lol). Reach out to us via [#hakken in Matrix](https://matrix.to/#/#hakken:pub.solar?via=chat.pub.solar).
-
-    ## Latest version
-
-    **Download the latest ISO build: [PubSolarOS-latest.iso](https://pub.solar/os/download/PubSolarOS-latest.iso)**
-
-    To verify the checksum download the [sha256 signature file](https://pub.solar/os/download/PubSolarOS-latest.iso.sha256), place it next to the iso, and run a check:
-    
-    ```
-    $ sha256sum --check < ./PubSolarOS-latest.iso.sha256
-    ```
-
-    ## Other downloads
-    
-    The full list of ISOs and their signatures can be found on our download page.
-
-    [View all ISO downloads](https://pub.solar/os/download/)
-
-  de: |
-    # PubSolarOS ist ein Betriebssystem
-  
-    Alles in und um PubSolarOS ist momentan in der Englischen Sprache. Falls du den Englischen Text auf dieser Seite nicht verstehst, macht es wahrscheinlich nicht viel Spaß PubSolarOS zu benutzen.
-
-    Falls du dich trotzdem interessierst, rede gerne mit uns in [#hakken](https://matrix.to/#/#hakken:pub.solar?via=chat.pub.solar).

privacy.yml

@@ -2,8 +2,7 @@ layout: layouts/default.tsx
 
 title: Privacy Policy
 
-content:
+content: |
-  en: |
   # Privacy Policy
  
   Information on data privacy and protection for the services operated by pub.solar n.e.V. as required by article 13 DSGVO.
@@ -31,10 +30,6 @@ content:
   
   If you have any questions regarding data protection, please contact us at [crew@pub.solar](mailto:crew@pub.solar) or at the postal address given above.
 
-    ## What is the purpose of the data processing?
-
-    "Matrix" is an open, decentralized communication service for real-time communication. It enables members of pub.solar n.e.V., as well as other interested parties, to communicate with other users of this server as well as other Matrix users of federated Matrix servers via chat and audio/video telephony by means of a Matrix account.
-
   ## What personal data is processed?
   
   If a user chooses to use any of the services provided by us, the following data will be required and therefore collected by pub.solar in the authentication service:
@@ -55,7 +50,7 @@ content:
 
   ## Where is the personal data stored?
   
-    We run our all of our services on servers of the company [Greenbaum Cloud](https://greenbaum.cloud/).
+  We run our all of our services on servers of the company [Hetzner Online GmbH](https://hetzner.com/).
 
   ## Data subject rights
   
@@ -112,7 +107,7 @@ content:
 
   Server logs, which store information such as, but not limited to, your IP address, your username, error messages and User Agent, are stored for a period of 24 hours after which they are deleted from the server. No backup of log files is created. Logs are kept to prevent brute-force attacks on accounts and to provide quick insight when debugging issues.
 
-    All git data such as, but not limited to, usernames, email addresses, messages, code, files, versions, pull requests, etc., are stored on the server in the database as is (plain-text).
+  "Matrix" is an open, decentralized communication service for real-time communication. It enables members of pub.solar n.e.V., as well as other interested parties, to communicate with other users of this server as well as other Matrix users of federated Matrix servers via chat and audio/video telephony by means of a Matrix account.
 
   ### Mastodon
 
@@ -129,8 +124,3 @@ content:
   ## References/License
   
   We have created the basic structure of this data protection information with the help of [DS-GVO.clever-Tools](https://www.baden-wuerttemberg.datenschutz.de/ds-gvo.clever/) and adapted it to our needs. We have also used parts of [Datenschutzerklärung der TU-Dresden](https://doc.matrix.tu-dresden.de/privacy/) and adjusted them accordingly. Text is licensed [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/deed.de).
-
-  de: |
-      **Es gibt momentan leider keine Deutsche Version unserer Datenschutzerklärung.**
-
-      Falls Du unbedingt eine sehen willst, dann kontaktiere die Crew damit wir das Thema höher priorisieren können.

scripts/hakken-dates.js

@@ -1,119 +0,0 @@
-const skippedMonths = [
-  { m: 8, y: 2022 },
-  { m: 12, y: 2022 },
-  { m: 4, y: 2023 },
-  { m: 5, y: 2023, repeat: true },
-  { m: 6, y: 2023, repeat: true },
-  { m: 8, y: 2023, repeat: true },
-  { m: 9, y: 2023, repeat: true },
-  { m: 11, y: 2023, repeat: true },
-  { m: 12, y: 2023, repeat: true },
-  { m: 2, y: 2024, repeat: true },
-  { m: 3, y: 2024, repeat: true },
-];
-
-const i18n = {
-  en: {
-    comingDates: 'The following dates are scheduled:',
-    friday: 'friday',
-    sunday: 'sunday',
-    until: 'until',
-    months: [
-      'Jan.',
-      'Feb.',
-      'Mar.',
-      'Apr.',
-      'May',
-      'Jun.',
-      'Jul.',
-      'Aug.',
-      'Sep.',
-      'Oct.',
-      'Nov.',
-      'Dec.',
-    ],
-  },
-  de: {
-    comingDates: 'Folgende Termine stehen an:',
-    friday: 'Freitag',
-    sunday: 'Sonntag',
-    until: 'bis',
-    months: [
-      'Jan.',
-      'Feb.',
-      'Mär.',
-      'Apr.',
-      'Mai',
-      'Jun.',
-      'Jul.',
-      'Aug.',
-      'Sep.',
-      'Okt.',
-      'Nov.',
-      'Dez.',
-    ],
-  },
-};
-
-const datesLists = {
-  en: document.getElementById('dates-list-en'),
-  de: document.getElementById('dates-list-de'),
-};
-
-const day = 24 * 60 * 60 * 1000;
-const week = 7 * day;
-const endOfWeekend = 2 * day;
-const start = new Date();
-const hakkens = [];
-// We'll be looking about a year into the future
-for (let i = 0; i < 366; i++) {
-  const dateToTry = new Date(start.valueOf() + (i * day));
-  if (dateToTry.getDay() !== 5) {
-    continue;
-  }
-
-  const oneWeekLater = new Date(dateToTry.valueOf() + week);
-  if (dateToTry.getMonth() === oneWeekLater.getMonth()) {
-    continue;
-  }
-
-  const m = dateToTry.getMonth() + 1;
-  const y = dateToTry.getFullYear();
-  if (skippedMonths.find((s) => s.m === m && s.y === y)) {
-    continue;
-  }
-  if (skippedMonths.find((s) => s.repeat && s.m === m && s.y <= y)) {
-    continue;
-  }
-  hakkens.push(dateToTry);
-}
-
-// Helper function to add leading zeros to dates
-const d = (num) => ('0' + num).slice(-2);
-
-const writeText = (lang) => {
-  const p = document.createElement('p');
-  p.innerHTML = i18n[lang].comingDates;
-  datesLists[lang].appendChild(p);
-}
-
-const writeDateList = (lang) => {
-  const ul = document.createElement('ul');
-  hakkens.forEach(hakken => {
-    hakkend = new Date(hakken.valueOf() + endOfWeekend);
-    const showFirstMonth = hakken.getMonth() !== hakkend.getMonth();
-    const li = document.createElement('li');
-    li.innerHTML = `
-      ${i18n[lang].friday} ${d(hakken.getDate())}. ${showFirstMonth ? i18n[lang].months[hakken.getMonth()] : ''}
-      ${i18n[lang].until}
-      ${d(hakkend.getDate())}. ${i18n[lang].months[hakkend.getMonth()]}
-    `;
-    ul.appendChild(li);
-  });
-  datesLists[lang].appendChild(ul);
-}
-
-writeText('de');
-writeText('en');
-writeDateList('de');
-writeDateList('en');

services.yml

@@ -0,0 +1,17 @@
+layout: layouts/default.tsx
+
+title: Our services
+showServices: true
+
+content: |
+  # Our services
+
+  This page gives an overview of the services we host. We give some information regarding the support status and privacy of each service.
+
+  * [Nextcloud](#nextcloud)
+  * [Mastodon](#mastodon)
+  * [Matrix](#matrix)
+  * [Forgejo / git](#forgejo)
+  * [Mailman](#mailman)
+  * [Wiki](#wiki)
+  * [Searx](#searx)