diff --git a/packages/backend/src/apps/discord/actions/send-message-to-channel/index.ts b/packages/backend/src/apps/discord/actions/send-message-to-channel/index.ts
index 2aec322a..023ab17b 100644
--- a/packages/backend/src/apps/discord/actions/send-message-to-channel/index.ts
+++ b/packages/backend/src/apps/discord/actions/send-message-to-channel/index.ts
@@ -3,7 +3,7 @@ import defineAction from '../../../../helpers/define-action';
 export default defineAction({
   name: 'Send a message to channel',
   key: 'sendMessageToChannel',
-  description: 'Send a message to a specific channel you specify.',
+  description: 'Sends a message to a specific channel you specify.',
   arguments: [
     {
       label: 'Channel',
diff --git a/packages/backend/src/apps/flickr/triggers/new-albums/index.ts b/packages/backend/src/apps/flickr/triggers/new-albums/index.ts
index e7da8f43..e7bf9178 100644
--- a/packages/backend/src/apps/flickr/triggers/new-albums/index.ts
+++ b/packages/backend/src/apps/flickr/triggers/new-albums/index.ts
@@ -4,7 +4,7 @@ import newAlbums from './new-albums';
 export default defineTrigger({
   name: 'New albums',
   pollInterval: 15,
-  key: 'new-albums',
+  key: 'newAlbums',
   description: 'Triggers when you create a new album.',
 
   async run($) {
diff --git a/packages/backend/src/apps/github/actions/create-issue/index.ts b/packages/backend/src/apps/github/actions/create-issue/index.ts
index 0545499b..cc62924c 100644
--- a/packages/backend/src/apps/github/actions/create-issue/index.ts
+++ b/packages/backend/src/apps/github/actions/create-issue/index.ts
@@ -4,7 +4,7 @@ import getRepoOwnerAndRepo from '../../common/get-repo-owner-and-repo';
 export default defineAction({
   name: 'Create issue',
   key: 'createIssue',
-  description: 'Create a new issue.',
+  description: 'Creates a new issue.',
   arguments: [
     {
       label: 'Repo',
diff --git a/packages/backend/src/apps/github/triggers/new-issues/index.ts b/packages/backend/src/apps/github/triggers/new-issues/index.ts
index 4bc46068..81d4a8f8 100644
--- a/packages/backend/src/apps/github/triggers/new-issues/index.ts
+++ b/packages/backend/src/apps/github/triggers/new-issues/index.ts
@@ -2,7 +2,7 @@ import defineTrigger from '../../../../helpers/define-trigger';
 import newIssues from './new-issues';
 
 export default defineTrigger({
-  name: 'New issue',
+  name: 'New issues',
   key: 'newIssues',
   pollInterval: 15,
   description: 'Triggers when a new issue is created',
diff --git a/packages/backend/src/apps/rss/triggers/new-items-in-feed/index.ts b/packages/backend/src/apps/rss/triggers/new-items-in-feed/index.ts
index b31e1a98..7682cf8e 100644
--- a/packages/backend/src/apps/rss/triggers/new-items-in-feed/index.ts
+++ b/packages/backend/src/apps/rss/triggers/new-items-in-feed/index.ts
@@ -4,7 +4,7 @@ import newItemsInFeed from './new-items-in-feed';
 export default defineTrigger({
   name: 'New items in feed',
   key: 'newItemsInFeed',
-  description: 'Triggers on new RSS feed items.',
+  description: 'Triggers on new RSS feed item.',
   pollInterval: 15,
   arguments: [
     {
diff --git a/packages/backend/src/apps/scheduler/triggers/every-day/index.ts b/packages/backend/src/apps/scheduler/triggers/every-day/index.ts
index d155b752..5a6fc3de 100644
--- a/packages/backend/src/apps/scheduler/triggers/every-day/index.ts
+++ b/packages/backend/src/apps/scheduler/triggers/every-day/index.ts
@@ -1,5 +1,5 @@
 import { DateTime } from 'luxon';
-import { IGlobalVariable, IJSONValue } from '@automatisch/types';
+import { IGlobalVariable } from '@automatisch/types';
 import defineTrigger from '../../../../helpers/define-trigger';
 import cronTimes from '../../common/cron-times';
 import getNextCronDateTime from '../../common/get-next-cron-date-time';
diff --git a/packages/backend/src/apps/slack/actions/find-message/index.ts b/packages/backend/src/apps/slack/actions/find-message/index.ts
index 03963efb..ff8df853 100644
--- a/packages/backend/src/apps/slack/actions/find-message/index.ts
+++ b/packages/backend/src/apps/slack/actions/find-message/index.ts
@@ -2,9 +2,9 @@ import defineAction from '../../../../helpers/define-action';
 import findMessage from './find-message';
 
 export default defineAction({
-  name: 'Find message',
+  name: 'Find a message',
   key: 'findMessage',
-  description: 'Find a Slack message using the Slack Search feature.',
+  description: 'Finds a message using the Slack feature.',
   arguments: [
     {
       label: 'Search Query',
diff --git a/packages/backend/src/apps/slack/actions/send-a-message-to-channel/index.ts b/packages/backend/src/apps/slack/actions/send-a-message-to-channel/index.ts
index 33df770e..7983f4c7 100644
--- a/packages/backend/src/apps/slack/actions/send-a-message-to-channel/index.ts
+++ b/packages/backend/src/apps/slack/actions/send-a-message-to-channel/index.ts
@@ -4,7 +4,7 @@ import postMessage from './post-message';
 export default defineAction({
   name: 'Send a message to channel',
   key: 'sendMessageToChannel',
-  description: 'Send a message to a specific channel you specify.',
+  description: 'Sends a message to a channel you specify.',
   arguments: [
     {
       label: 'Channel',
diff --git a/packages/backend/src/apps/smtp/actions/send-email/index.ts b/packages/backend/src/apps/smtp/actions/send-email/index.ts
index c332f99e..68e525fa 100644
--- a/packages/backend/src/apps/smtp/actions/send-email/index.ts
+++ b/packages/backend/src/apps/smtp/actions/send-email/index.ts
@@ -3,9 +3,9 @@ import defineAction from '../../../../helpers/define-action';
 import transporter from '../../common/transporter';
 
 export default defineAction({
-  name: 'Send Email',
+  name: 'Send an email',
   key: 'sendEmail',
-  description: 'Send an email',
+  description: 'Sends an email',
   arguments: [
     {
       label: 'From name',
diff --git a/packages/backend/src/apps/twilio/actions/send-sms/index.ts b/packages/backend/src/apps/twilio/actions/send-sms/index.ts
index 037f14e4..36089727 100644
--- a/packages/backend/src/apps/twilio/actions/send-sms/index.ts
+++ b/packages/backend/src/apps/twilio/actions/send-sms/index.ts
@@ -1,9 +1,9 @@
 import defineAction from '../../../../helpers/define-action';
 
 export default defineAction({
-  name: 'Send SMS',
+  name: 'Send an SMS',
   key: 'sendSms',
-  description: 'Send an SMS',
+  description: 'Sends an SMS',
   arguments: [
     {
       label: 'From Number',
diff --git a/packages/backend/src/apps/twilio/triggers/receive-sms/index.ts b/packages/backend/src/apps/twilio/triggers/receive-sms/index.ts
index fe3ad6d1..f434247b 100644
--- a/packages/backend/src/apps/twilio/triggers/receive-sms/index.ts
+++ b/packages/backend/src/apps/twilio/triggers/receive-sms/index.ts
@@ -5,7 +5,7 @@ export default defineTrigger({
   name: 'Receive SMS',
   key: 'receiveSms',
   pollInterval: 15,
-  description: 'Will be triggered when a new SMS is received.',
+  description: 'Triggers when a new SMS is received.',
   arguments: [
     {
       label: 'To Number',
diff --git a/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts
index fd616b0d..56cb3d56 100644
--- a/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts
+++ b/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts
@@ -2,10 +2,10 @@ import defineTrigger from '../../../../helpers/define-trigger';
 import getUserTweets from '../../common/get-user-tweets';
 
 export default defineTrigger({
-  name: 'My Tweets',
+  name: 'My tweets',
   key: 'myTweets',
   pollInterval: 15,
-  description: 'Will be triggered when you tweet something new.',
+  description: 'Triggers when you tweet something new.',
 
   async run($) {
     await getUserTweets($, { currentUser: true });
diff --git a/packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts b/packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts
index 04d6eef6..f96afae4 100644
--- a/packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts
+++ b/packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts
@@ -3,9 +3,9 @@ import myFollowers from './my-followers';
 
 export default defineTrigger({
   name: 'New follower of me',
-  key: 'myFollowers',
+  key: 'newFollowerOfMe',
   pollInterval: 15,
-  description: 'Will be triggered when you have a new follower.',
+  description: 'Triggers when you have a new follower.',
 
   async run($) {
     await myFollowers($);
diff --git a/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts
index e89436cd..a3bbae6e 100644
--- a/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts
+++ b/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts
@@ -2,11 +2,11 @@ import defineTrigger from '../../../../helpers/define-trigger';
 import searchTweets from './search-tweets';
 
 export default defineTrigger({
-  name: 'Search Tweets',
+  name: 'Search tweets',
   key: 'searchTweets',
   pollInterval: 15,
   description:
-    'Will be triggered when any user tweet something containing a specific keyword, phrase, username or hashtag.',
+    'Triggers when there is a new tweet containing a specific keyword, phrase, username or hashtag.',
   arguments: [
     {
       label: 'Search Term',
diff --git a/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts
index 50ed3fce..1b6de95a 100644
--- a/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts
+++ b/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts
@@ -2,10 +2,10 @@ import defineTrigger from '../../../../helpers/define-trigger';
 import getUserTweets from '../../common/get-user-tweets';
 
 export default defineTrigger({
-  name: 'User Tweets',
+  name: 'User tweets',
   key: 'userTweets',
   pollInterval: 15,
-  description: 'Will be triggered when a specific user tweet something new.',
+  description: 'Triggers when a specific user tweet something new.',
   arguments: [
     {
       label: 'Username',
diff --git a/packages/docs/pages/.vitepress/config.js b/packages/docs/pages/.vitepress/config.js
index c8b91438..75d0a509 100644
--- a/packages/docs/pages/.vitepress/config.js
+++ b/packages/docs/pages/.vitepress/config.js
@@ -24,25 +24,86 @@ export default defineConfig({
         activeMatch: '^/$|^/guide/',
       },
       {
-        text: 'Connections',
-        link: '/connections/discord',
-        activeMatch: '/connections/',
+        text: 'Apps',
+        link: '/apps/discord/actions',
+        activeMatch: '/apps/',
       },
     ],
     sidebar: {
-      '/connections/': [
+      '/apps/': [
         {
-          text: 'Connections',
+          text: 'Discord',
           collapsible: true,
           items: [
-            { text: 'Discord', link: '/connections/discord' },
-            { text: 'Flickr', link: '/connections/flickr' },
-            { text: 'Github', link: '/connections/github' },
-            { text: 'Scheduler', link: '/connections/scheduler' },
-            { text: 'Slack', link: '/connections/slack' },
-            { text: 'SMTP', link: '/connections/smtp' },
-            { text: 'Twilio', link: '/connections/twilio' },
-            { text: 'Twitter', link: '/connections/twitter' },
+            { text: 'Actions', link: '/apps/discord/actions' },
+            { text: 'Connection', link: '/apps/discord/connection' },
+          ],
+        },
+        {
+          text: 'Flickr',
+          collapsible: true,
+          items: [
+            { text: 'Triggers', link: '/apps/flickr/triggers' },
+            { text: 'Connection', link: '/apps/flickr/connection' },
+          ],
+        },
+        {
+          text: 'Github',
+          collapsible: true,
+          items: [
+            { text: 'Triggers', link: '/apps/github/triggers' },
+            { text: 'Actions', link: '/apps/github/actions' },
+            { text: 'Connection', link: '/apps/github/connection' },
+          ],
+        },
+        {
+          text: 'RSS',
+          collapsible: true,
+          items: [
+            { text: 'Triggers', link: '/apps/rss/triggers' },
+            { text: 'Connection', link: '/apps/rss/connection' },
+          ],
+        },
+        {
+          text: 'Scheduler',
+          collapsible: true,
+          items: [
+            { text: 'Triggers', link: '/apps/scheduler/triggers' },
+            { text: 'Connection', link: '/apps/scheduler/connection' },
+          ],
+        },
+        {
+          text: 'Slack',
+          collapsible: true,
+          items: [
+            { text: 'Actions', link: '/apps/slack/actions' },
+            { text: 'Connection', link: '/apps/slack/connection' },
+          ],
+        },
+        {
+          text: 'SMTP',
+          collapsible: true,
+          items: [
+            { text: 'Actions', link: '/apps/smtp/actions' },
+            { text: 'Connection', link: '/apps/smtp/connection' },
+          ],
+        },
+        {
+          text: 'Twilio',
+          collapsible: true,
+          items: [
+            { text: 'Triggers', link: '/apps/twilio/triggers' },
+            { text: 'Actions', link: '/apps/twilio/actions' },
+            { text: 'Connection', link: '/apps/twilio/connection' },
+          ],
+        },
+        {
+          text: 'Twitter',
+          collapsible: true,
+          items: [
+            { text: 'Triggers', link: '/apps/twitter/triggers' },
+            { text: 'Actions', link: '/apps/twitter/actions' },
+            { text: 'Connection', link: '/apps/twitter/connection' },
           ],
         },
       ],
diff --git a/packages/docs/pages/apps/discord/actions.md b/packages/docs/pages/apps/discord/actions.md
new file mode 100644
index 00000000..cb6015f4
--- /dev/null
+++ b/packages/docs/pages/apps/discord/actions.md
@@ -0,0 +1,12 @@
+---
+items:
+  - name: Send a message to channel
+    desc: Sends a message to a specific channel you specify.
+    avatar: /favicons/discord.svg
+---
+
+<script setup>
+  import CustomListing from '../../components/CustomListing.vue'
+</script>
+
+<CustomListing />
diff --git a/packages/docs/pages/connections/discord.md b/packages/docs/pages/apps/discord/connection.md
similarity index 100%
rename from packages/docs/pages/connections/discord.md
rename to packages/docs/pages/apps/discord/connection.md
diff --git a/packages/docs/pages/connections/flickr.md b/packages/docs/pages/apps/flickr/connection.md
similarity index 100%
rename from packages/docs/pages/connections/flickr.md
rename to packages/docs/pages/apps/flickr/connection.md
diff --git a/packages/docs/pages/apps/flickr/triggers.md b/packages/docs/pages/apps/flickr/triggers.md
new file mode 100644
index 00000000..8adef87c
--- /dev/null
+++ b/packages/docs/pages/apps/flickr/triggers.md
@@ -0,0 +1,21 @@
+---
+items:
+  - name: New albums
+    desc: Triggers when you create a new album.
+    avatar: /favicons/flickr.svg
+  - name: New favorite photos
+    desc: Triggers when you favorite a photo.
+    avatar: /favicons/flickr.svg
+  - name: New photos
+    desc: Triggers when you add a new photo.
+    avatar: /favicons/flickr.svg
+  - name: New photos in album
+    desc: Triggers when you add a new photo in an album.
+    avatar: /favicons/flickr.svg
+---
+
+<script setup>
+  import CustomListing from '../../components/CustomListing.vue'
+</script>
+
+<CustomListing />
diff --git a/packages/docs/pages/apps/github/actions.md b/packages/docs/pages/apps/github/actions.md
new file mode 100644
index 00000000..cf523c35
--- /dev/null
+++ b/packages/docs/pages/apps/github/actions.md
@@ -0,0 +1,12 @@
+---
+items:
+  - name: Create issue
+    desc: Creates a new issue.
+    avatar: /favicons/github.svg
+---
+
+<script setup>
+  import CustomListing from '../../components/CustomListing.vue'
+</script>
+
+<CustomListing />
diff --git a/packages/docs/pages/connections/github.md b/packages/docs/pages/apps/github/connection.md
similarity index 100%
rename from packages/docs/pages/connections/github.md
rename to packages/docs/pages/apps/github/connection.md
diff --git a/packages/docs/pages/apps/github/triggers.md b/packages/docs/pages/apps/github/triggers.md
new file mode 100644
index 00000000..dd33f009
--- /dev/null
+++ b/packages/docs/pages/apps/github/triggers.md
@@ -0,0 +1,21 @@
+---
+items:
+  - name: New issues
+    desc: Triggers when a new issue is created
+    avatar: /favicons/github.svg
+  - name: New pull requests
+    desc: Triggers when a new pull request is created
+    avatar: /favicons/github.svg
+  - name: New stargazers
+    desc: Triggers when a user stars a repository
+    avatar: /favicons/github.svg
+  - name: New watchers
+    desc: Triggers when a user watches a repository
+    avatar: /favicons/github.svg
+---
+
+<script setup>
+  import CustomListing from '../../components/CustomListing.vue'
+</script>
+
+<CustomListing />
diff --git a/packages/docs/pages/connections/rss.md b/packages/docs/pages/apps/rss/connection.md
similarity index 100%
rename from packages/docs/pages/connections/rss.md
rename to packages/docs/pages/apps/rss/connection.md
diff --git a/packages/docs/pages/apps/rss/triggers.md b/packages/docs/pages/apps/rss/triggers.md
new file mode 100644
index 00000000..1071116f
--- /dev/null
+++ b/packages/docs/pages/apps/rss/triggers.md
@@ -0,0 +1,12 @@
+---
+items:
+  - name: New items in feed
+    desc: Triggers on new RSS feed item.
+    avatar: /favicons/rss.svg
+---
+
+<script setup>
+  import CustomListing from '../../components/CustomListing.vue'
+</script>
+
+<CustomListing />
diff --git a/packages/docs/pages/connections/scheduler.md b/packages/docs/pages/apps/scheduler/connection.md
similarity index 100%
rename from packages/docs/pages/connections/scheduler.md
rename to packages/docs/pages/apps/scheduler/connection.md
diff --git a/packages/docs/pages/apps/scheduler/triggers.md b/packages/docs/pages/apps/scheduler/triggers.md
new file mode 100644
index 00000000..cc161d3a
--- /dev/null
+++ b/packages/docs/pages/apps/scheduler/triggers.md
@@ -0,0 +1,21 @@
+---
+items:
+  - name: Every hour
+    desc: Triggers every hour.
+    avatar: /favicons/scheduler.svg
+  - name: Every day
+    desc: Triggers every day.
+    avatar: /favicons/scheduler.svg
+  - name: Every week
+    desc: Triggers every week.
+    avatar: /favicons/scheduler.svg
+  - name: Every month
+    desc: Triggers every month.
+    avatar: /favicons/scheduler.svg
+---
+
+<script setup>
+  import CustomListing from '../../components/CustomListing.vue'
+</script>
+
+<CustomListing />
diff --git a/packages/docs/pages/apps/slack/actions.md b/packages/docs/pages/apps/slack/actions.md
new file mode 100644
index 00000000..371e7588
--- /dev/null
+++ b/packages/docs/pages/apps/slack/actions.md
@@ -0,0 +1,15 @@
+---
+items:
+  - name: Find a message
+    desc: Finds a message using the Slack search feature.
+    avatar: /favicons/slack.svg
+  - name: Send a message to channel
+    desc: Sends a message to a channel you specify.
+    avatar: /favicons/slack.svg
+---
+
+<script setup>
+  import CustomListing from '../../components/CustomListing.vue'
+</script>
+
+<CustomListing />
diff --git a/packages/docs/pages/connections/slack.md b/packages/docs/pages/apps/slack/connection.md
similarity index 100%
rename from packages/docs/pages/connections/slack.md
rename to packages/docs/pages/apps/slack/connection.md
diff --git a/packages/docs/pages/apps/smtp/actions.md b/packages/docs/pages/apps/smtp/actions.md
new file mode 100644
index 00000000..ac215d78
--- /dev/null
+++ b/packages/docs/pages/apps/smtp/actions.md
@@ -0,0 +1,12 @@
+---
+items:
+  - name: Send an email
+    desc: Sends an email
+    avatar: /favicons/smtp.svg
+---
+
+<script setup>
+  import CustomListing from '../../components/CustomListing.vue'
+</script>
+
+<CustomListing />
diff --git a/packages/docs/pages/connections/smtp.md b/packages/docs/pages/apps/smtp/connection.md
similarity index 100%
rename from packages/docs/pages/connections/smtp.md
rename to packages/docs/pages/apps/smtp/connection.md
diff --git a/packages/docs/pages/apps/twilio/actions.md b/packages/docs/pages/apps/twilio/actions.md
new file mode 100644
index 00000000..cf4dbfdd
--- /dev/null
+++ b/packages/docs/pages/apps/twilio/actions.md
@@ -0,0 +1,12 @@
+---
+items:
+  - name: Send an SMS
+    desc: Sends an SMS
+    avatar: /favicons/twilio.svg
+---
+
+<script setup>
+  import CustomListing from '../../components/CustomListing.vue'
+</script>
+
+<CustomListing />
diff --git a/packages/docs/pages/connections/twilio.md b/packages/docs/pages/apps/twilio/connection.md
similarity index 100%
rename from packages/docs/pages/connections/twilio.md
rename to packages/docs/pages/apps/twilio/connection.md
diff --git a/packages/docs/pages/apps/twilio/triggers.md b/packages/docs/pages/apps/twilio/triggers.md
new file mode 100644
index 00000000..3e1f5e0e
--- /dev/null
+++ b/packages/docs/pages/apps/twilio/triggers.md
@@ -0,0 +1,12 @@
+---
+items:
+  - name: Receive SMS
+    desc: Triggers when a new SMS is received.
+    avatar: /favicons/twilio.svg
+---
+
+<script setup>
+  import CustomListing from '../../components/CustomListing.vue'
+</script>
+
+<CustomListing />
diff --git a/packages/docs/pages/apps/twitter/actions.md b/packages/docs/pages/apps/twitter/actions.md
new file mode 100644
index 00000000..2f4d938f
--- /dev/null
+++ b/packages/docs/pages/apps/twitter/actions.md
@@ -0,0 +1,12 @@
+---
+items:
+  - name: Create Tweet
+    desc: Create a tweet.
+    avatar: /favicons/twitter.svg
+---
+
+<script setup>
+  import CustomListing from '../../components/CustomListing.vue'
+</script>
+
+<CustomListing />
diff --git a/packages/docs/pages/connections/twitter.md b/packages/docs/pages/apps/twitter/connection.md
similarity index 100%
rename from packages/docs/pages/connections/twitter.md
rename to packages/docs/pages/apps/twitter/connection.md
diff --git a/packages/docs/pages/apps/twitter/triggers.md b/packages/docs/pages/apps/twitter/triggers.md
new file mode 100644
index 00000000..7e98a454
--- /dev/null
+++ b/packages/docs/pages/apps/twitter/triggers.md
@@ -0,0 +1,21 @@
+---
+items:
+  - name: My tweets
+    desc: Triggers when you tweet something new.
+    avatar: /favicons/twitter.svg
+  - name: New followers of me
+    desc: Triggers when you have a new follower.
+    avatar: /favicons/twitter.svg
+  - name: Search tweets
+    desc: Triggers when there is a new tweet containing a specific keyword, phrase, username or hashtag.
+    avatar: /favicons/twitter.svg
+  - name: User tweets
+    desc: Triggers when a specific user tweet something new.
+    avatar: /favicons/twitter.svg
+---
+
+<script setup>
+  import CustomListing from '../../components/CustomListing.vue'
+</script>
+
+<CustomListing />
diff --git a/packages/docs/pages/components/CustomListing.vue b/packages/docs/pages/components/CustomListing.vue
new file mode 100644
index 00000000..fdc4e42c
--- /dev/null
+++ b/packages/docs/pages/components/CustomListing.vue
@@ -0,0 +1,12 @@
+<script setup>
+import { useData } from 'vitepress';
+import { VPTeamMembers } from 'vitepress/theme';
+
+const props = defineProps(['favicon']);
+
+const { frontmatter: fm } = useData();
+</script>
+
+<template>
+  <VPTeamMembers size="small" :members="fm.items" />
+</template>
diff --git a/packages/docs/pages/guide/available-apps.md b/packages/docs/pages/guide/available-apps.md
index da209151..6fdb5239 100644
--- a/packages/docs/pages/guide/available-apps.md
+++ b/packages/docs/pages/guide/available-apps.md
@@ -6,9 +6,12 @@ We just have a few available integrations at the moment and we also know that wo
 
 Following integrations are currently supported by Automatisch.
 
-- [Flickr](/connections/flickr)
-- [Github](/connections/github)
-- [Scheduler](/connections/scheduler)
-- [Slack](/connections/slack)
-- [SMTP](/connections/smtp)
-- [Twitter](/connections/twitter)
+- [Discord](/apps/discord/actions)
+- [Flickr](/apps/flickr/triggers)
+- [Github](/apps/github/triggers)
+- [RSS](/apps/rss/triggers)
+- [Scheduler](/apps/scheduler/triggers)
+- [Slack](/apps/slack/actions)
+- [SMTP](/apps/smtp/actions)
+- [Twilio](/apps/twilio/triggers)
+- [Twitter](/apps/twitter/triggers)
diff --git a/packages/docs/pages/public/favicons/discord.svg b/packages/docs/pages/public/favicons/discord.svg
new file mode 100644
index 00000000..307c7703
--- /dev/null
+++ b/packages/docs/pages/public/favicons/discord.svg
@@ -0,0 +1,4 @@
+<svg fill="#5865f2" aria-label="Discord" role="img" version="1.1" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg">
+ <rect width="512" height="512" rx="15%" fill="#fff"/>
+ <path d="m386 137c-24-11-49.5-19-76.3-23.7c-.5 0-1 0-1.2.6c-3.3 5.9-7 13.5-9.5 19.5c-29-4.3-57.5-4.3-85.7 0c-2.6-6.2-6.3-13.7-10-19.5c-.3-.4-.7-.7-1.2-.6c-23 4.6-52.4 13-76 23.7c-.2 0-.4.2-.5.4c-49 73-62 143-55 213c0 .3.2.7.5 1c32 23.6 63 38 93.6 47.3c.5 0 1 0 1.3-.4c7.2-9.8 13.6-20.2 19.2-31.2c.3-.6 0-1.4-.7-1.6c-10-4-20-8.6-29.3-14c-.7-.4-.8-1.5 0-2c2-1.5 4-3 5.8-4.5c.3-.3.8-.3 1.2-.2c61.4 28 128 28 188 0c.4-.2.9-.1 1.2.1c1.9 1.6 3.8 3.1 5.8 4.6c.7.5.6 1.6 0 2c-9.3 5.5-19 10-29.3 14c-.7.3-1 1-.6 1.7c5.6 11 12.1 21.3 19 31c.3.4.8.6 1.3.4c30.6-9.5 61.7-23.8 93.8-47.3c.3-.2.5-.5.5-1c7.8-80.9-13.1-151-55.4-213c0-.2-.3-.4-.5-.4Zm-192 171c-19 0-34-17-34-38c0-21 15-38 34-38c19 0 34 17 34 38c0 21-15 38-34 38zm125 0c-19 0-34-17-34-38c0-21 15-38 34-38c19 0 34 17 34 38c0 21-15 38-34 38z" fill="#5865f2"/>
+</svg>
diff --git a/packages/docs/pages/public/favicons/flickr.svg b/packages/docs/pages/public/favicons/flickr.svg
new file mode 100644
index 00000000..f8499a7a
--- /dev/null
+++ b/packages/docs/pages/public/favicons/flickr.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-label="Flickr" role="img" viewBox="0 0 512 512">
+  <rect width="512" height="512" rx="15%" fill="#fff"/>
+  <circle cx="157" cy="256" fill="#0063dc" r="79"/>
+  <circle cx="355" cy="256" fill="#ff0084" r="79"/>
+</svg>
diff --git a/packages/docs/pages/public/favicons/github.svg b/packages/docs/pages/public/favicons/github.svg
new file mode 100644
index 00000000..b49b4e23
--- /dev/null
+++ b/packages/docs/pages/public/favicons/github.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+aria-label="GitHub" role="img"
+viewBox="0 0 512 512"><rect
+width="512" height="512"
+rx="15%"
+fill="#1B1817"/><path fill="#fff" d="M335 499c14 0 12 17 12 17H165s-2-17 12-17c13 0 16-6 16-12l-1-50c-71 16-86-28-86-28-12-30-28-37-28-37-24-16 1-16 1-16 26 2 40 26 40 26 22 39 59 28 74 22 2-17 9-28 16-35-57-6-116-28-116-126 0-28 10-51 26-69-3-6-11-32 3-67 0 0 21-7 70 26 42-12 86-12 128 0 49-33 70-26 70-26 14 35 6 61 3 67 16 18 26 41 26 69 0 98-60 120-117 126 10 8 18 24 18 48l-1 70c0 6 3 12 16 12z"/></svg>
diff --git a/packages/docs/pages/public/favicons/rss.svg b/packages/docs/pages/public/favicons/rss.svg
new file mode 100644
index 00000000..0c3e5023
--- /dev/null
+++ b/packages/docs/pages/public/favicons/rss.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+aria-label="RSS" role="img"
+viewBox="0 0 512 512"><rect
+width="512" height="512"
+rx="15%"
+fill="#f80"/><circle cx="145" cy="367" r="35" fill="#fff"/><path fill="none" stroke="#fff" stroke-width="60" d="M109 241c89 0 162 73 162 162m114 0c0-152-124-276-276-276"/></svg>
diff --git a/packages/docs/pages/public/favicons/scheduler.svg b/packages/docs/pages/public/favicons/scheduler.svg
new file mode 100644
index 00000000..d80c1010
--- /dev/null
+++ b/packages/docs/pages/public/favicons/scheduler.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" viewBox="0 0 24 24"><path fill="#1976d2" d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"></path><path fill="#1976d2" d="M12.5 7H11v6l5.25 3.15.75-1.23-4.5-2.67z"></path></svg>
diff --git a/packages/docs/pages/public/favicons/slack.svg b/packages/docs/pages/public/favicons/slack.svg
new file mode 100644
index 00000000..81629c7c
--- /dev/null
+++ b/packages/docs/pages/public/favicons/slack.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+aria-label="Slack" role="img"
+viewBox="0 0 512 512"><rect
+width="512" height="512"
+rx="15%"
+fill="#fff"/><g fill="#e01e5a"><path id="a" d="M149 305a39 39 0 01-78 0c0-22 17 -39 39 -39h39zM168 305a39 39 0 0178 0v97a39 39 0 01-78 0z"/></g><use xlink:href="#a" fill="#36c5f0" transform="rotate(90,256,256)"/><use xlink:href="#a" fill="#2eb67d" transform="rotate(180,256,256)"/><use xlink:href="#a" fill="#ecb22e" transform="rotate(270,256,256)"/></svg>
diff --git a/packages/docs/pages/public/favicons/smtp.svg b/packages/docs/pages/public/favicons/smtp.svg
new file mode 100644
index 00000000..57f0fa58
--- /dev/null
+++ b/packages/docs/pages/public/favicons/smtp.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-label="Mail" role="img" viewBox="0 0 512 512">
+  <rect width="512" height="512" rx="15%" fill="#328cff"/>
+  <path d="m250 186c-46 0-69 35-69 74 0 44 29 72 68 72 43 0 73-32 73-75 0-44-34-71-72-71zm-1-37c30 0 57 13 77 33 0-22 35-22 35 1v150c-1 10 10 16 16 9 25-25 54-128-14-187-64-56-149-47-195-15-48 33-79 107-49 175 33 76 126 99 182 76 28-12 41 26 12 39-45 19-168 17-225-82-38-68-36-185 67-248 78-46 182-33 244 32 66 69 62 197-2 246-28 23-71 1-71-32v-11c-20 20-47 32-77 32-57 0-108-51-108-108 0-58 51-110 108-110" fill="#fff"/>
+</svg>
diff --git a/packages/docs/pages/public/favicons/twilio.svg b/packages/docs/pages/public/favicons/twilio.svg
new file mode 100644
index 00000000..7c20e190
--- /dev/null
+++ b/packages/docs/pages/public/favicons/twilio.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-label="Twilio" role="img" viewBox="0 0 512 512">
+  <rect width="512" height="512" rx="15%" fill="#fff"/>
+  <g fill="#f22f46">
+    <circle cx="256" cy="256" r="256"/>
+    <circle cx="256" cy="256" fill="#fff" r="188"/>
+    <circle cx="193" cy="193" r="53" id="c"/>
+    <use xlink:href="#c" x="126"/>
+    <use xlink:href="#c" y="126"/>
+    <use xlink:href="#c" x="126" y="126"/>
+  </g>
+</svg>
diff --git a/packages/docs/pages/public/favicons/twitter.svg b/packages/docs/pages/public/favicons/twitter.svg
new file mode 100644
index 00000000..752cdc8d
--- /dev/null
+++ b/packages/docs/pages/public/favicons/twitter.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-label="Twitter" role="img" viewBox="0 0 512 512">
+  <rect width="512" height="512" rx="15%" fill="#1da1f2"/>
+  <path fill="#fff" d="M437 152a72 72 0 01-40 12a72 72 0 0032-40a72 72 0 01-45 17a72 72 0 00-122 65a200 200 0 01-145-74a72 72 0 0022 94a72 72 0 01-32-7a72 72 0 0056 69a72 72 0 01-32 1a72 72 0 0067 50a200 200 0 01-105 29a200 200 0 00309-179a200 200 0 0035-37"/>
+</svg>