diff --git a/locale/de-DE.commands.json b/locale/de-DE.commands.json
index 8a93711ad095292d329529eb8df42d30312b8602..46f6fe31fc35e4445e6267091ca9498ac38f8d2c 100644
--- a/locale/de-DE.commands.json
+++ b/locale/de-DE.commands.json
@@ -36,6 +36,12 @@
             "Tag"
         ]
     },
+    "goodEvening": {
+        "commands": [
+            "guten Abend",
+            "Abend"
+        ]
+    },
     "goodMorning": {
         "commands": [
             "guten Morgen",
@@ -104,7 +110,26 @@
     "sternenrose": {
         "commands": ["sternenrose"]
     },
+    "thankYou": {
+        "commands": [
+            "Danke",
+            "Dankeschön",
+            "Dankesehr",
+            "Danke dir",
+            "Vielen Dank",
+            "Großen Dank"
+        ]
+    },
     "yes": {
         "commands": ["ja", "jap", "jawohl", "okay", "ok", "meinetwegen"]
+    },
+    "yourAreWelcome": {
+        "commands": [
+            "Bitte",
+            "Bittesehr",
+            "Bitte sehr",
+            "Bitteschön",
+            "Bitte schön"
+        ]
     }
 }
diff --git a/locale/de-DE.texts.json b/locale/de-DE.texts.json
index 3f9756851fa087770e14e0afead6679a6f1d2372..0401117030d05a5ec3bfacb84b6f0e8012e0ab10 100644
--- a/locale/de-DE.texts.json
+++ b/locale/de-DE.texts.json
@@ -14,6 +14,7 @@
     "deregistration": "Schade, {contact.nickname}! Ich hab dich vom Wichteln abgemeldet. Wenn du wieder mitmachen möchtest, schreibe „registrieren“.",
     "deregistrationCancelled": "Puh, nochmal Glück gehabt! Schön, dass du dabei bleibst!",
     "goodAfternoon": "Guten Tag, {contact.nickname}!",
+    "goodEvening": "Guten Abend, {contact.nickname}!",
     "goodMorning": "Guten Morgen, {contact.nickname}!",
     "goodNight": "Schlaf schön, {contact.nickname}!",
     "hello": "Hallööö, {contact.nickname}!",
@@ -52,5 +53,7 @@
     "registrationCancelled": "Schade! Wenn du es dir anders überlegen solltest, schreibe einfach „registrieren“, um den Anmeldevorgang erneut zu starten.",
     "registrationProfileOverview": "Hier noch einen Überblick über deinen aktuellen Steckbrief:",
     "sentComponentText": "Klicken! Du sollst klicken!",
-    "sternenrose": "Vielen Dank, Sterni! :)"
+    "sternenrose": "Vielen Dank, Sterni! :)",
+    "thankYouResponse": "Bitte!",
+    "yourAreWelcomeRespone": "🙂"
 }
diff --git a/scripts/utility/localisation.ts b/scripts/utility/localisation.ts
index 91dbd617dc6df081c023ec2b2ae4d88d50452c9f..6a5c812e0442ca062b82e58d27bce9064ad1f662 100644
--- a/scripts/utility/localisation.ts
+++ b/scripts/utility/localisation.ts
@@ -18,6 +18,7 @@ interface Commands
     contacting: CommandInfo;
     deregistration: CommandInfo;
     goodAfternoon: CommandInfo;
+    goodEvening: CommandInfo;
     goodMorning: CommandInfo;
     goodNight: CommandInfo;
     hello: CommandInfo;
@@ -30,7 +31,9 @@ interface Commands
     no: CommandInfo;
     registration: CommandInfo;
     sternenrose: CommandInfo;
+    thankYou: CommandInfo;
     yes: CommandInfo;
+    yourAreWelcome: CommandInfo;
 }
 
 // TODO: Documentation
@@ -51,6 +54,7 @@ interface Texts
     deregistration: TokenString;
     deregistrationCancelled: TokenString;
     goodAfternoon: TokenString;
+    goodEvening: TokenString;
     goodMorning: TokenString;
     goodNight: TokenString;
     hello: TokenString;
@@ -90,6 +94,8 @@ interface Texts
     registrationProfileOverview: TokenString;
     sentComponentText: TokenString;
     sternenrose: TokenString;
+    thankYouResponse: TokenString;
+    yourAreWelcomeRespone: TokenString;
 }
 
 interface Values
diff --git a/scripts/wichtelbot/message/handlingDefinition.ts b/scripts/wichtelbot/message/handlingDefinition.ts
index 173a149a0e1d066979d769bc5b4a7ba1cb643782..76b857e67bdbc3b743be6f9b5f5a2ae372aab509 100644
--- a/scripts/wichtelbot/message/handlingDefinition.ts
+++ b/scripts/wichtelbot/message/handlingDefinition.ts
@@ -75,13 +75,21 @@ export default class HandlingDefinition
                     result: Localisation.texts.modsCalled,
                 },
                 {
-                    command: Localisation.commands.goodAfternoon,
-                    result: Localisation.texts.goodAfternoon,
+                    command: Localisation.commands.sternenrose,
+                    result: Localisation.texts.sternenrose,
                 },
                 {
                     command: Localisation.commands.goodMorning,
                     result: Localisation.texts.goodMorning,
                 },
+                {
+                    command: Localisation.commands.goodAfternoon,
+                    result: Localisation.texts.goodAfternoon,
+                },
+                {
+                    command: Localisation.commands.goodEvening,
+                    result: Localisation.texts.goodEvening,
+                },
                 {
                     command: Localisation.commands.goodNight,
                     result: Localisation.texts.goodNight,
@@ -95,10 +103,13 @@ export default class HandlingDefinition
                     result: Localisation.texts.maybeResponse,
                 },
                 {
-                    command: Localisation.commands.sternenrose,
-                    result: Localisation.texts.sternenrose,
+                    command: Localisation.commands.thankYou,
+                    result: Localisation.texts.thankYouResponse,
+                },
+                {
+                    command: Localisation.commands.yourAreWelcome,
+                    result: Localisation.texts.yourAreWelcomeRespone,
                 }
-                // TODO: Response to "thank you".
             ],
             handlerFunction: async (message: Message, result: TokenString): Promise<void> =>
             {