diff --git a/_data/services.yml b/_data/services.yml
index c79eaaa..42f5dcc 100644
--- a/_data/services.yml
+++ b/_data/services.yml
@@ -209,8 +209,8 @@ strings:
     en: 'Visit service'
     de: 'Zum Dienst'
   wiki_help_page:
-    en: Wiki help page
-    de: Wikiseite
+    en: Wiki
+    de: Wiki
   states:
     yes:
       en: Yes
diff --git a/_includes/Services.tsx b/_includes/Services.tsx
index cd4d766..6c699d0 100644
--- a/_includes/Services.tsx
+++ b/_includes/Services.tsx
@@ -16,10 +16,11 @@ export default ({ data, language, className = '', }) => {
     {services.map((service, i) => {
       return <section key={i} className={`${className} ps-service`}>
         <header className="ps-service--header">
-          <h2 className="ps-service--title" id={service.id}>{service.name}</h2>
+          <a href={service.link} class="ps-service--title-link" target="_blank">
+						<h2 className="ps-service--title" id={service.id}>{service.name} ↗</h2>
+					</a>
 
           <div className="ps-service--links">
-            <a href={service.link} target="_blank">{ strings.visit_service[language.slug] }</a>
             {service.wiki ? <a href={service.wiki} target="_blank">{ strings.wiki_help_page[language.slug] }</a> : null}
           </div>
         </header>
diff --git a/_includes/styles/service.scss b/_includes/styles/service.scss
index 15480b6..12c01a6 100644
--- a/_includes/styles/service.scss
+++ b/_includes/styles/service.scss
@@ -10,6 +10,14 @@
     border-bottom: 0.25rem solid black;
   };
 
+  & &--title-link {
+		border-bottom: 0;
+
+		&:hover {
+			border-bottom: 0;
+		}
+  }
+
   &--title {
     margin: 0;
   }
diff --git a/de/index.yml b/de/index.yml
index 96e8e11..0f09142 100644
--- a/de/index.yml
+++ b/de/index.yml
@@ -12,8 +12,16 @@ content: |
   ***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: Unsere Services
+    title: Alle Services
   - href: https://auth.pub.solar/realms/pub.solar/account
     title: Deine pub.solar ID
   - href: ./hakken
diff --git a/index.yml b/index.yml
index 1a28c88..44b495f 100644
--- a/index.yml
+++ b/index.yml
@@ -12,8 +12,16 @@ content: |
   ***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: Our services
+    title: All services
   - 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