diff --git a/hafas-operators.csv b/hafas-operators.csv
index 660b105..63f78dd 100644
--- a/hafas-operators.csv
+++ b/hafas-operators.csv
@@ -190,8 +190,8 @@ funiculaire-neuchatel-universite-neuchatel-gare,Funiculaire Neuchâtel-Universit
 funiculaire-saint-imier-mont-soleil-sa,Funiculaire Saint-Imier-Mont-Soleil SA
 gatwick-express-service,Gatwick Express Service
 glaris-rinerhorn,Glaris-Rinerhorn
-go-ahead-baden-wurttemberg-gmbh,Go-Ahead Baden-Württemberg GmbH
-go-ahead-bayern-gmbh,Go-Ahead Bayern GmbH
+goahead-arverio-baden-wurttemberg,GoAhead - Arverio Baden-Württemberg
+goahead-arverio-bayern,GoAhead - Arverio Bayern
 go-ahead-norge,Go Ahead Norge
 gondelbahn-kandersteg-oeschinensee,Gondelbahn Kandersteg-Oeschinensee
 gornergratbahn,Gornergratbahn
diff --git a/line-colors.csv b/line-colors.csv
index 9a658a0..41607ab 100644
--- a/line-colors.csv
+++ b/line-colors.csv
@@ -17,20 +17,20 @@ agilis,RE 18,agilis,3-a9-re18,#006428,#ffffff,,rectangle
 alex-dlb,RE 23,alex-die-landerbahn-gmbh-dlb,3-a8n-re23,#ffffff,#006666,#006666,rectangle
 alex-dlb,RE 25,alex-die-landerbahn-gmbh-dlb,3-a8n-re25,#006666,#ffffff,,rectangle
 ams,S7,abellio-rail-mitteldeutschland-gmbh,4-ams-7,#0a579b,#ffffff,,pill
-arverio-bw,IRE 1,goahead-baden-wurttemberg-arverio-baden-wurttemberg,3-gaire-1,#88c946,#ffffff,,rectangle
-arverio-bw,MEX 13,goahead-baden-wurttemberg-arverio-baden-wurttemberg,3-gamex-13,#00b9f2,#ffffff,,rectangle
-arverio-bw,MEX 16,goahead-baden-wurttemberg-arverio-baden-wurttemberg,3-gamex-16,#0073c0,#ffffff,,rectangle
-arverio-bw,RE 8,goahead-baden-wurttemberg-arverio-baden-wurttemberg,3-gare-8,#b350a8,#ffffff,,rectangle
-arverio-bw,RE 90,goahead-baden-wurttemberg-arverio-baden-wurttemberg,3-gare-90,#fd3083,#ffffff,,rectangle
-arverio-by,RB86,goahead-bayern-arverio-bayern,3-gyrb-86,#77aed2,#ffffff,,rectangle
-arverio-by,RB87,goahead-bayern-arverio-bayern,3-gyrb-87,#77aed2,#ffffff,,rectangle
-arverio-by,RB89,goahead-bayern-arverio-bayern,3-gyrb-89,#006da7,#ffffff,,rectangle
-arverio-by,RB92,goahead-bayern-arverio-bayern,3-gyrb-92,#f28f8e,#ffffff,,rectangle
-arverio-by,RE72,goahead-bayern-arverio-bayern,3-gyre-72,#ef7c00,#ffffff,,rectangle
-arverio-by,RE80,goahead-bayern-arverio-bayern,3-gyre-80,#006da7,#ffffff,,rectangle
-arverio-by,RE89,goahead-bayern-arverio-bayern,3-gyre-89,#006da7,#ffffff,,rectangle
-arverio-by,RE9,goahead-bayern-arverio-bayern,3-gyre-9,#006da7,#ffffff,,rectangle
-arverio-by,RE96,goahead-bayern-arverio-bayern,3-gyre-96,#f9b000,#ffffff,,rectangle
+arverio-bw,IRE 1,goahead-arverio-baden-wurttemberg,3-gaire-1,#88c946,#ffffff,,rectangle
+arverio-bw,MEX 13,goahead-arverio-baden-wurttemberg,3-gamex-13,#00b9f2,#ffffff,,rectangle
+arverio-bw,MEX 16,goahead-arverio-baden-wurttemberg,3-gamex-16,#0073c0,#ffffff,,rectangle
+arverio-bw,RE 8,goahead-arverio-baden-wurttemberg,3-gare-8,#b350a8,#ffffff,,rectangle
+arverio-bw,RE 90,goahead-arverio-baden-wurttemberg,3-gare-90,#fd3083,#ffffff,,rectangle
+arverio-by,RB86,goahead-arverio-bayern,3-gyrb-86,#77aed2,#ffffff,,rectangle
+arverio-by,RB87,goahead-arverio-bayern,3-gyrb-87,#77aed2,#ffffff,,rectangle
+arverio-by,RB89,goahead-arverio-bayern,3-gyrb-89,#006da7,#ffffff,,rectangle
+arverio-by,RB92,goahead-arverio-bayern,3-gyrb-92,#f28f8e,#ffffff,,rectangle
+arverio-by,RE72,goahead-arverio-bayern,3-gyre-72,#ef7c00,#ffffff,,rectangle
+arverio-by,RE80,goahead-arverio-bayern,3-gyre-80,#006da7,#ffffff,,rectangle
+arverio-by,RE89,goahead-arverio-bayern,3-gyre-89,#006da7,#ffffff,,rectangle
+arverio-by,RE9,goahead-arverio-bayern,3-gyre-9,#006da7,#ffffff,,rectangle
+arverio-by,RE96,goahead-arverio-bayern,3-gyre-96,#f9b000,#ffffff,,rectangle
 bayerische-zugspitzbahn,RB 64,bayerische-zugspitzbahn,3-z8-rb64,#6cc3d9,#ffffff,,rectangle
 brb,RB 13,bayerische-regiobahn,3-y8-rb13,#ffb200,#ffffff,,rectangle
 brb,RB 14,bayerische-regiobahn,3-y8-rb14,#ffb200,#ffffff,,rectangle
diff --git a/sources.json b/sources.json
index 03023a5..1cc3c14 100644
--- a/sources.json
+++ b/sources.json
@@ -385,6 +385,9 @@
             },
             {
                 "github": "Nagiphaaa"
+            },
+            {
+                "github": "oneiricbotcelot"
             }
         ],
         "sources": [