4 files changed, 27 insertions, 25 deletions
diff --git a/README b/README
index 48e862171..b912473cd 100644
--- a/README
+++ b/README
@@ -4,13 +4,11 @@ THE MANA PLUS CLIENT
  Version: 1.9.3.23        Date: 2019-03-23
 
  Build status:
-  Gitlab CI: https://gitlab.com/manaplus/manaplus/badges/master/build.svg
-  Circle CI: https://circleci.com/gh/ManaPlus/ManaPlus/tree/master.svg?style=svg
-  Semaphore CI https://semaphoreci.com/4144/manaplus
-  Travis: https://travis-ci.org/ManaPlus/ManaPlus.svg?branch=master
-  Azure CI: windows: https://dev.azure.com/manaplus/ManaPlus/_build/latest?definitionId=1
-            macosx: https://dev.azure.com/manaplus/ManaPlus/_build/latest?definitionId=2
-  Coverage: http://stats.manaplus.org/gcov/gcc-6.html
+  ManaPlus CI: https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/pipeline.svg
+  Windows: https://gitlab.com/themanaworld/manaplus/docker-windows-builder/badges/master/pipeline.svg
+  AppImg: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg
+  deb: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg
+  Coverage: https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/coverage.svg
   Doxygen: http://stats.manaplus.org/docs/index.html
   Coverity: https://scan.coverity.com/projects/manaplus
 
@@ -159,7 +157,7 @@ Other:
 
 If you're having issues with this client, feel free to report them to us.
 You can report on forum (http://forums.themanaworld.org/viewforum.php?f=12),
-bugtracker (https://gitlab.com/manaplus/manaplus/issues/) or IRC on irc.freenode.net in the #manaplus channel.
+bugtracker (https://gitlab.com/themanaworld/manaplus/manaplus/issues/) or IRC on irc.freenode.net in the #germantmw channel.
 
 If you have feedback about a specific game that uses the ManaPlus client, be sure
 to contact the developers of the game instead.
diff --git a/README-SWITCH.md b/README-SWITCH.md
index b5a211f8c..f2f23f290 100644
--- a/README-SWITCH.md
+++ b/README-SWITCH.md
@@ -38,7 +38,7 @@ Building
 ```
 git clone https://github.com/Cpasjuste/ManaPlus.git
 cd ManaPlus
-cp CMakeLists.txt.switch CMakeLists.txt
+cp packaging/switch/CMakeLists.txt.switch CMakeLists.txt
 mkdir cmake-build-release && cd cmake-build-release
 cmake -DPLATFORM_SWITCH=ON -DCMAKE_BUILD_TYPE=Release ../
 make ManaPlus.nro
diff --git a/README.md b/README.md
index c7a4e7805..17787bbc8 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,13 @@ Version: 1.9.3.23        Date: 2019-03-23
 
 ### Build status
 
-Gitlab CI: [![gitlab build status](https://gitlab.com/manaplus/manaplus/badges/master/build.svg)](https://gitlab.com/manaplus/manaplus/commits/master)
+ - ManaPlus CI: [![gitlab build status](https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/pipeline.svg?key_text=master)](https://gitlab.com/themanaworld/manaplus/manaplus/commits/master)
 
+ - Downloads: [![gitlab windows build](https://gitlab.com/themanaworld/manaplus/docker-windows-builder/badges/master/pipeline.svg?key_text=Windows+Build&key_width=150px)](https://gitlab.com/themanaworld/manaplus/docker-windows-builder/commits/master),
+ [![gitlab appimg build](https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg?key_text=AppImg+Build&key_width=150px)](https://gitlab.com/themanaworld/manaplus/appimg-builder/commits/master),
+ [![gitlab .deb build](https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg?key_text=.deb+Build&key_width=150px)](https://gitlab.com/themanaworld/manaplus/appimg-builder/commits/master)
+
+<!--
 Cicle CI: [![CircleCI](https://circleci.com/gh/ManaPlus/ManaPlus/tree/master.svg?style=svg)](https://circleci.com/gh/ManaPlus/ManaPlus/tree/master)
 
 Semaphore CI: [![Build Status](https://semaphoreci.com/api/v1/4144/manaplus/branches/master/badge.svg)](https://semaphoreci.com/4144/manaplus)
@@ -16,12 +21,14 @@ Travis CI: [![travis build status](https://travis-ci.org/ManaPlus/ManaPlus.svg?b
 
 Azure CI: [![Build Status macosx](https://dev.azure.com/manaplus/ManaPlus/_apis/build/status/ManaPlus%20macosx)](https://dev.azure.com/manaplus/ManaPlus/_build/latest?definitionId=2)
           [![Build Status windows](https://dev.azure.com/manaplus/ManaPlus/_apis/build/status/ManaPlus%20main)](https://dev.azure.com/manaplus/ManaPlus/_build/latest?definitionId=1)
+-->
+
+ - Coverage: ![coverage report](https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/coverage.svg) <!-- no pipeline rn -->
 
-Coverage: [![coverage report](https://gitlab.com/manaplus/manaplus/badges/master/coverage.svg)](http://stats.manaplus.org/gcov/gcc-6.html)
+ - Doxygen: ![doxygen](https://img.shields.io/badge/Docs-Doxygen-blue.svg) <!-- no pipeline rn -->
 
-Doxygen: [![doxygen](https://img.shields.io/badge/Docs-Doxygen/manaplus-blue.svg)](http://stats.manaplus.org/docs/index.html)
+ - Coverity: ![coverity](https://scan.coverity.com/projects/318/badge.svg) <!-- no pipeline rn -->
 
-Coverity: [![coverity](https://scan.coverity.com/projects/318/badge.svg)](https://scan.coverity.com/projects/manaplus)
 
 ### Development team:
  - See [AUTHORS](AUTHORS) file for a list
@@ -164,9 +171,9 @@ Whispers:
 
 If you're having issues with this client, feel free to report them to us.
 You can report on [![forum](https://img.shields.io/badge/forum-forums.themanaworld.org-yellow.svg)](http://forums.themanaworld.org/viewforum.php?f=12),
-[bugtracker](https://gitlab.com/manaplus/manaplus/issues/) or
-[![IRC](https://img.shields.io/badge/IRC-FreeNode/manaplus-yellow.svg)](webchat.freenode.net/?channels=manaplus)
-on irc.freenode.net in the #manaplus channel.
+[![Issues](https://badgen.net/gitlab/open-issues/themanaworld%2fmanaplus/manaplus?label=Issues)](https://gitlab.com/themanaworld/manaplus/manaplus/issues/),
+[![IRC](https://img.shields.io/badge/IRC-FreeNode/germantmw-yellow.svg)](webchat.freenode.net/?channels=germantmw) or
+![discord](https://shields.io/discord/775612630836445206.svg?label=Discord)
 
 If you have feedback about a specific game that uses the ManaPlus client, be sure
 to contact the developers of the game instead.
diff --git a/README.txt b/README.txt
index 12e0fb14e..0bdf856c5 100644
--- a/README.txt
+++ b/README.txt
@@ -7,13 +7,11 @@ THE MANA PLUS CLIENT
   - See AUTHORS file for a list
 
  Build status:
-  Gitlab CI: https://gitlab.com/manaplus/manaplus/badges/master/build.svg
-  Circle CI: https://circleci.com/gh/ManaPlus/ManaPlus/tree/master.svg?style=svg
-  Semaphore CI https://semaphoreci.com/4144/manaplus
-  Travis: https://travis-ci.org/ManaPlus/ManaPlus.svg?branch=master
-  Azure CI: windows: https://dev.azure.com/manaplus/ManaPlus/_build/latest?definitionId=1
-            macosx: https://dev.azure.com/manaplus/ManaPlus/_build/latest?definitionId=2
-  Coverage: http://stats.manaplus.org/gcov/gcc-6.html
+  ManaPlus CI: https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/pipeline.svg
+  Windows: https://gitlab.com/themanaworld/manaplus/docker-windows-builder/badges/master/pipeline.svg
+  AppImg: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg
+  deb: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg
+  Coverage: https://gitlab.com/themanaworld/manaplus/manaplus/badges/master/coverage.svg
   Doxygen: http://stats.manaplus.org/docs/index.html
   Coverity: https://scan.coverity.com/projects/manaplus
 
@@ -159,7 +157,7 @@ Other:
 
 If you're having issues with this client, feel free to report them to us.
 You can report on forum (http://forums.themanaworld.org/viewforum.php?f=12),
-bugtracker (https://gitlab.com/manaplus/manaplus/issues/) or IRC on irc.freenode.net in the #manaplus channel.
+bugtracker (https://gitlab.com/themanaworld/manaplus/manaplus/issues/) or IRC on irc.freenode.net in the #germantmw channel.
 
 If you have feedback about a specific game that uses the ManaPlus client, be sure
 to contact the developers of the game instead.
@@ -175,4 +173,3 @@ they not have any rights to do so.
 This hostings have rights to remove ManaPlus repositories if they want violate given licenses.
 
 ManaPlus main repository hosted on https://gitlab.com/manaplus/manaplus/
-