diff --git a/.github/ISSUE_TEMPLATE/changed_field_template.md b/.github/ISSUE_TEMPLATE/changed_field_template.md
index 699cf3a1bd..0a06be7360 100644
--- a/.github/ISSUE_TEMPLATE/changed_field_template.md
+++ b/.github/ISSUE_TEMPLATE/changed_field_template.md
@@ -42,4 +42,4 @@ Updated in:
 - [ ] zh-TW
 
 Notification when new strings arrive:
-@OmarAglan @J0anJosep @tygrysek90 @LPSGizmo @Wuzzy2 @tellovishous @Davis-3450 @rmnvgr @ninjum @LucaRed @telk5093 @Gymnasiast @arekdurlik @Tupaschoal @andOlga @mrmagic2020 @daihakken
+@OmarAglan @J0anJosep @tygrysek90 @LPSGizmo @Wuzzy2 @tellovishous @dimateos @Davis-3450 @rmnvgr @ninjum @LucaRed @telk5093 @Gymnasiast @arekdurlik @Tupaschoal @andOlga @mrmagic2020 @daihakken
diff --git a/.github/ISSUE_TEMPLATE/new_and_changed_field_template.md b/.github/ISSUE_TEMPLATE/new_and_changed_field_template.md
index 2b2f524954..1a531200ae 100644
--- a/.github/ISSUE_TEMPLATE/new_and_changed_field_template.md
+++ b/.github/ISSUE_TEMPLATE/new_and_changed_field_template.md
@@ -48,4 +48,4 @@ Updated in:
 - [ ] zh-TW
 
 Notification when new strings arrive:
-@OmarAglan @J0anJosep @tygrysek90 @LPSGizmo @Wuzzy2 @tellovishous @Davis-3450 @rmnvgr @ninjum @LucaRed @telk5093 @Gymnasiast @arekdurlik @Tupaschoal @andOlga @mrmagic2020 @daihakken
+@OmarAglan @J0anJosep @tygrysek90 @LPSGizmo @Wuzzy2 @tellovishous @dimateos @Davis-3450 @rmnvgr @ninjum @LucaRed @telk5093 @Gymnasiast @arekdurlik @Tupaschoal @andOlga @mrmagic2020 @daihakken
diff --git a/.github/ISSUE_TEMPLATE/new_field_template.md b/.github/ISSUE_TEMPLATE/new_field_template.md
index 2a0bd43f72..6f8327e8fa 100644
--- a/.github/ISSUE_TEMPLATE/new_field_template.md
+++ b/.github/ISSUE_TEMPLATE/new_field_template.md
@@ -42,4 +42,4 @@ Updated in:
 - [ ] zh-TW
 
 Notification when new strings arrive:
-@OmarAglan @J0anJosep @tygrysek90 @LPSGizmo @Wuzzy2 @tellovishous @Davis-3450 @rmnvgr @ninjum @LucaRed @telk5093 @Gymnasiast @arekdurlik @Tupaschoal @andOlga @mrmagic2020 @daihakken
+@OmarAglan @J0anJosep @tygrysek90 @LPSGizmo @Wuzzy2 @tellovishous @dimateos @Davis-3450 @rmnvgr @ninjum @LucaRed @telk5093 @Gymnasiast @arekdurlik @Tupaschoal @andOlga @mrmagic2020 @daihakken
diff --git a/README.md b/README.md
index 4d7b5d2e78..f94b15cdad 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ To do this, go to the directory where OpenRCT2 resides (not to be confused with
 | [![](https://img.shields.io/badge/de--DE-maintained-green.svg)](https://github.com/OpenRCT2/Localisation/blob/master/data/language/de-DE.txt) |   | [Wuzzy2](https://github.com/Wuzzy2)                 |
 | [![](https://img.shields.io/badge/en--GB-maintained-green.svg)](https://github.com/OpenRCT2/OpenRCT2/blob/develop/data/language/en-GB.txt   ) |   | -Anyone-                                                                                     |
 | [![](https://img.shields.io/badge/eo--ZZ-maintained-green.svg)](https://github.com/OpenRCT2/Localisation/blob/master/data/language/eo-ZZ.txt) |   | [tellovishous](https://github.com/tellovishous)                                              |
-| [![](https://img.shields.io/badge/es--ES-maintained-green.svg)](https://github.com/OpenRCT2/Localisation/blob/master/data/language/es-ES.txt) |   | [Davis-3450](https://github.com/Davis-3450) 		                                                   |
+| [![](https://img.shields.io/badge/es--ES-maintained-green.svg)](https://github.com/OpenRCT2/Localisation/blob/master/data/language/es-ES.txt) |   | [dimateos](https://github.com/dimateos), [Davis-3450](https://github.com/Davis-3450) 		                                                   |
 | [![](https://img.shields.io/badge/fr--CA-maintained-green.svg)](https://github.com/OpenRCT2/Localisation/blob/master/data/language/fr-FR.txt) |   | [TheClaudeQC](https://github.com/TheClaudeQC)                                                     |
 | [![](https://img.shields.io/badge/fr--FR-maintained-green.svg)](https://github.com/OpenRCT2/Localisation/blob/master/data/language/fr-FR.txt) |   | [rmnvgr](https://github.com/rmnvgr)                                                          |
 | [![](https://img.shields.io/badge/gl--ES-maintained-green.svg)](https://github.com/OpenRCT2/Localisation/blob/master/data/language/gl-ES.txt)  |   | [ninjum](https://github.com/ninjum)                                                          |
@@ -79,7 +79,7 @@ Anyone can still contribute to the languages.
 
 These languages only need strings if they differ from the one they are inheriting from
 
-| Language | Inherits from | Maintainer |          
+| Language | Inherits from | Maintainer |
 | -------- | ------------- | ---------- |
 | [![](https://img.shields.io/badge/en--US-maintained-green.svg)](https://github.com/OpenRCT2/Localisation/blob/master/data/language/en-US.txt) | en-GB |  |
 | [![](https://img.shields.io/badge/fr--CA-maintained-green.svg)](https://github.com/OpenRCT2/Localisation/blob/master/data/language/fr-CA.txt) | fr-FR | [TheClaudeQC](https://github.com/TheClaudeQC) |