diff --git a/README.md b/README.md
index 3cc988e1..f4dd7f57 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Open Source Games
 
-[Dynamic HTML table](https://trilarion.github.io/opensourcegames/) of the entries / Development [Blog](https://trilarion.blogspot.com/search/label/osgames)
+**[Dynamic HTML table](https://trilarion.github.io/opensourcegames/)** of the entries / Development **[Blog](https://trilarion.blogspot.com/search/label/osgames)** / **[Statistics](games/statistics.md)**
 
 [comment]: # (start of autogenerated content, do not edit)
 410 entries
@@ -21,8 +21,6 @@ relevant information is collected regarding code repositories, download possibil
 
 Similar collections: [Open Source Clones](https://github.com/opengaming/osgameclones)  of Popular Games, Popular games, add-ons, maps, etc.  [hosted on GitHub.](https://github.com/leereilly/games), [List of open-source video games](https://en.wikipedia.org/wiki/List_of_open-source_video_games) on Wikipedia
 
-See also the **[Statistics](games/statistics.md)** page.
-
 ## Contributing
 
 If you'd like to add or modify entries, please use the [Issue tracker](https://github.com/Trilarion/opensourcegames/issues),
diff --git a/docs/data.json b/docs/data.json
index 0bbe3b3a..c6f66d6b 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -43,7 +43,7 @@
    "Strategy",
    "beta / inactive since 2008",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/aplanetsrevenge.git\">Source</a> - Python - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/aplanetsrevenge.git\">Source</a> - Python - GPL-3.0"
   ],
   [
    "AI Wars (<a href=\"https://code.google.com/archive/p/aiwars/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/ai_wars.md\">entry</a>)",
@@ -142,7 +142,7 @@
    "Strategy",
    "mature / inactive since 2003",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/antichess.git\">Source</a> - Java - MIT"
+   "<a href=\"https://gitlab.com/osgames/antichess.git\">Source</a> - Java - MIT"
   ],
   [
    "Ardentryst (<a href=\"http://www.jordantrudgett.com/ardentryst/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/ardentryst.md\">entry</a>)",
@@ -178,7 +178,7 @@
    "Strategy",
    "mature / inactive since 2007",
    "",
-   "<a href=\"https://github.com/Trilarion/armies.git\">Source</a> - C++ - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/armies.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
    "Arx Libertatis (<a href=\"http://arx-libertatis.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/arx_libertatis.md\">entry</a>)",
@@ -241,7 +241,7 @@
    "Strategy",
    "mature / inactive since 2008",
    "TBS",
-   "<a href=\"https://gitlab.com/Trilarion/attal.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/attal.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "AutoREALM (<a href=\"https://sourceforge.net/projects/autorealm/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/misc/autorealm.md\">entry</a>)",
@@ -259,7 +259,7 @@
    "Role Playing",
    "beta / inactive since 2008",
    "roguelike",
-   "<a href=\"https://github.com/Trilarion/avanor.git\">Source</a> - C++, Lua - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/avanor.git\">Source</a> - C++, Lua - GPL-2.0"
   ],
   [
    "Battle for Wesnoth (<a href=\"http://www.wesnoth.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/wesnoth.md\">entry</a>)",
@@ -304,7 +304,7 @@
    "Role Playing",
    "beta / inactive since 2006",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/bmtactics.git\">Source</a> - JavaScript - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/bmtactics.git\">Source</a> - JavaScript - GPL-2.0"
   ],
   [
    "Birth of the Empires (<a href=\"http://bote2.square7.ch/en/wiki/Main_Page\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/birth_of_the_empires.md\">entry</a>)",
@@ -322,7 +322,7 @@
    "Strategy",
    "beta / inactive since 2012",
    "",
-   "<a href=\"https://github.com/Trilarion/blacknova.git\">Source</a> - PHP, JavaScript - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/blacknova.git\">Source</a> - PHP, JavaScript - GPL-2.0"
   ],
   [
    "Blender game engine (<a href=\"https://www.blender.org/features/game-creation/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/framework/blender_game_engine.md\">entry</a>)",
@@ -340,7 +340,7 @@
    "Strategy",
    "beta / inactive since 2012",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/blitzkrieg.git\">Source</a> - Java - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/blitzkrieg.git\">Source</a> - Java - GPL-3.0"
   ],
   [
    "Boost (C++ Libraries) (<a href=\"http://www.boost.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/library/boost.md\">entry</a>)",
@@ -367,7 +367,7 @@
    "Strategy",
    "beta / inactive since 2006",
    "",
-   "<a href=\"https://github.com/Trilarion/boson.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/boson.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "Boulder Dash (<a href=\"https://github.com/valeriansaliou/boulder-dash\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/action/boulder_dash.md\">entry</a>)",
@@ -502,7 +502,7 @@
    "Strategy",
    "beta / inactive since 2003",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/civil.git\">Source</a> - Python - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/civil.git\">Source</a> - Python - GPL-2.0"
   ],
   [
    "Classic Blades of Exile (<a href=\"http://www.spiderwebsoftware.com/blades/opensource.html\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/blades_of_exile.md\">entry</a>)",
@@ -538,7 +538,7 @@
    "Strategy",
    "beta / inactive since 2004",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/coltoo.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/coltoo.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "Colossal Cave Adventure (<a href=\"https://github.com/brandon-rhodes/python-adventure\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/adventure/colossal_cave.md\">entry</a>)",
@@ -565,7 +565,7 @@
    "Strategy",
    "mature / inactive since 2012",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/conquests.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/conquests.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "Corsix Theme Hospital (<a href=\"http://forums.corsixth.com/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/theme_hospital.md\">entry</a>)",
@@ -583,7 +583,7 @@
    "Strategy",
    "mature / inactive since 2010",
    "TBS",
-   "<a href=\"https://gitlab.com/Trilarion/crimson.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/crimson.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "Crossfire (<a href=\"http://crossfire.real-time.com/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/crossfire.md\">entry</a>)",
@@ -601,7 +601,7 @@
    "Strategy",
    "beta / inactive since 2009",
    "",
-   "<a href=\"https://github.com/Trilarion/crownandcutlass.git\">Source</a> - C++ - Custom"
+   "<a href=\"https://gitlab.com/osgames/crownandcutlass.git\">Source</a> - C++ - Custom"
   ],
   [
    "Crypto++ (<a href=\"https://cryptopp.com/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/library/crypto.md\">entry</a>)",
@@ -664,7 +664,7 @@
    "Strategy",
    "mature / inactive since 2009",
    "RTS",
-   "<a href=\"https://github.com/Trilarion/dark-oberon.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/dark-oberon.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "Dash Engine (<a href=\"https://dash.circularstudios.com/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/framework/dash.md\">entry</a>)",
@@ -700,7 +700,7 @@
    "Tools & Manuals",
    "mature / inactive since 2014",
    "tool",
-   "<a href=\"https://github.com/Trilarion/deity.git\">Source</a> - Python - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/deity.git\">Source</a> - Python - GPL-2.0"
   ],
   [
    "Deliantra (<a href=\"http://www.deliantra.net/index.html\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/deliantra.md\">entry</a>)",
@@ -736,7 +736,7 @@
    "Strategy",
    "beta / active",
    "browser",
-   "<a href=\"https://gitlab.com/Trilarion/devana.git\">Source</a> - PHP - zlib"
+   "<a href=\"https://gitlab.com/osgames/devana.git\">Source</a> - PHP - zlib"
   ],
   [
    "Digital: A Love Story (<a href=\"http://scoutshonour.com/digital/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/adventure/digital_a_love_story.md\">entry</a>)",
@@ -745,7 +745,7 @@
    "Adventure & Visual novels",
    "mature / active",
    "visual novel",
-   "<a href=\"https://gitlab.com/Trilarion/digitalalovestory.git\">Source</a> - Ren'py - CC-BY-NC-SA"
+   "<a href=\"https://gitlab.com/osgames/digitalalovestory.git\">Source</a> - Ren'py - CC-BY-NC-SA"
   ],
   [
    "Doxygen (<a href=\"http://www.stack.nl/~dimitri/doxygen/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/library/doxygen.md\">entry</a>)",
@@ -763,7 +763,7 @@
    "Adventure & Visual novels",
    "mature / inactive since 2010",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/dragon-history.git\">Source</a> - Pascal, Script - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/dragon-history.git\">Source</a> - Pascal, Script - GPL-2.0"
   ],
   [
    "Dragon Hunt (<a href=\"http://emhsoft.com/dh.html\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/dragon_hunt.md\">entry</a>)",
@@ -772,7 +772,7 @@
    "Role Playing",
    "mature / active",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/dragon-hunt.git\">Source</a> - Python - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/dragon-hunt.git\">Source</a> - Python - GPL-2.0"
   ],
   [
    "Drop Shock (<a href=\"http://www.tinywarz.com/index.php\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/drop_shock.md\">entry</a>)",
@@ -790,7 +790,7 @@
    "Strategy",
    "beta / inactive since 2009",
    "text-based",
-   "<a href=\"https://gitlab.com/Trilarion/duelcommander.git\">Source</a> - C - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/duelcommander.git\">Source</a> - C - GPL-3.0"
   ],
   [
    "Dune Dynasty (<a href=\"http://dunedynasty.sourceforge.net/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/dune_dynasty.md\">entry</a>)",
@@ -844,7 +844,7 @@
    "Tools & Manuals",
    "beta / inactive since 2013",
    "tool",
-   "<a href=\"https://github.com/Trilarion/dungeonmap.git\">Source</a> - C++ - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/dungeonmap.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
    "Dungeon Monkey Eternal (<a href=\"https://github.com/jwvhewitt/dmeternal\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/dungeon_monkey_eternal.md\">entry</a>)",
@@ -934,7 +934,7 @@
    "Role Playing",
    "beta / inactive since 2007",
    "",
-   "<a href=\"https://github.com/Trilarion/eos-game.git\">Source</a> - Python - MIT"
+   "<a href=\"https://gitlab.com/osgames/eos-game.git\">Source</a> - Python - MIT"
   ],
   [
    "Epiar (<a href=\"https://web.archive.org/web/20170123082605/http://epiar.net/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/action/epiar.md\">entry</a>)",
@@ -1159,7 +1159,7 @@
    "Simulation",
    "beta / inactive since 2009",
    "",
-   "<a href=\"https://github.com/Trilarion/freetrain.git\">Source</a> - C# - LGPL-2.1"
+   "<a href=\"https://gitlab.com/osgames/freetrain.git\">Source</a> - C# - LGPL-2.1"
   ],
   [
    "FreeType (<a href=\"https://www.freetype.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/library/freetype.md\">entry</a>)",
@@ -1258,7 +1258,7 @@
    "Tools & Manuals",
    "beta / inactive since 2004",
    "tool",
-   "<a href=\"https://gitlab.com/Trilarion/gm-tools.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/gm-tools.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "GalaxyMage Redux (<a href=\"https://code.google.com/archive/p/galaxymageredux/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/galaxymage_redux.md\">entry</a>)",
@@ -1276,7 +1276,7 @@
    "Strategy",
    "mature / inactive since 2005",
    "TBS",
-   "<a href=\"https://gitlab.com/Trilarion/galaxyng.git\">Source</a> - C - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/galaxyng.git\">Source</a> - C - GPL-2.0"
   ],
   [
    "GameLV (<a href=\"http://piepe.lv/game-lv/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/adventure/gamelv.md\">entry</a>)",
@@ -1303,7 +1303,7 @@
    "Role Playing",
    "beta / inactive since 2004",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/gwiz.git\">Source</a> - C - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/gwiz.git\">Source</a> - C - GPL-2.0"
   ],
   [
    "GemRB (<a href=\"http://www.gemrb.org/wiki/doku.php?id=start\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/framework/gemrb.md\">entry</a>)",
@@ -1330,7 +1330,7 @@
    "Strategy",
    "mature / inactive since 2009",
    "RTS",
-   "<a href=\"https://github.com/Trilarion/glest.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/glest.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "Globulation2 (<a href=\"https://globulation2.org/wiki/Main_Page\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/globulation2.md\">entry</a>)",
@@ -1375,7 +1375,7 @@
    "Strategy",
    "beta / inactive since 2001",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/civilwar.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/civilwar.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "H-World (<a href=\"https://sourceforge.net/projects/h-world/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/framework/h_world.md\">entry</a>)",
@@ -1384,7 +1384,7 @@
    "Engines & Frameworks",
    "beta / inactive since 2005",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/h-world.git\">Source</a> - C, Lua - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/h-world.git\">Source</a> - C, Lua - GPL-2.0"
   ],
   [
    "Hale (<a href=\"https://sourceforge.net/projects/hale/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/hale.md\">entry</a>)",
@@ -1456,7 +1456,7 @@
    "Strategy",
    "beta / inactive since 2014",
    "",
-   "<a href=\"https://github.com/Trilarion/howc.git\">Source</a> - Python - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/howc.git\">Source</a> - Python - GPL-3.0"
   ],
   [
    "Hex Game (<a href=\"https://sourceforge.net/projects/hexgamealpha/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/hexgame.md\">entry</a>)",
@@ -1483,7 +1483,7 @@
    "Role Playing",
    "beta / inactive since 2013",
    "action-rpg",
-   "<a href=\"https://gitlab.com/Trilarion/lechemindeladam.git\">Source</a> - C++ - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/lechemindeladam.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
    "Ilarion (<a href=\"http://illarion.org/general/de_startpage.php\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/ilarion.md\">entry</a>)",
@@ -1537,7 +1537,7 @@
    "Strategy",
    "beta / inactive since 2006",
    "",
-   "<a href=\"https://github.com/Trilarion/jquest.git\">Source</a> - Java - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/jquest.git\">Source</a> - Java - GPL-2.0"
   ],
   [
    "JSettlers (<a href=\"https://sourceforge.net/projects/jsettlers/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/jsettlers.md\">entry</a>)",
@@ -1555,7 +1555,7 @@
    "Tools & Manuals",
    "mature / inactive since 2011",
    "tool",
-   "<a href=\"https://gitlab.com/Trilarion/janag.git\">Source</a> - Java - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/janag.git\">Source</a> - Java - GPL-2.0"
   ],
   [
    "Jagged Alliance 2 Stracciatella (<a href=\"https://ja2-stracciatella.github.io/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/jagged_alliance2.md\">entry</a>)",
@@ -1618,7 +1618,7 @@
    "Role Playing",
    "beta / inactive since 2011",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/koboldsquest2.git\">Source</a> - Python - LGPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/koboldsquest2.git\">Source</a> - Python - LGPL-3.0"
   ],
   [
    "LGeneral (<a href=\"http://lgames.sourceforge.net/LGeneral/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/lgeneral.md\">entry</a>)",
@@ -1645,7 +1645,7 @@
    "Role Playing",
    "beta / inactive since 2010",
    "",
-   "<a href=\"https://github.com/Trilarion/low.git\">Source</a> - C++ - LGPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/low.git\">Source</a> - C++ - LGPL-3.0"
   ],
   [
    "Land of Fire (<a href=\"http://landoffire.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/land_of_fire.md\">entry</a>)",
@@ -1681,7 +1681,7 @@
    "Simulation",
    "mature / inactive since 2005",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/lincity.git\">Source</a> - C - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/lincity.git\">Source</a> - C - GPL-2.0"
   ],
   [
    "LinCity-NG (<a href=\"https://github.com/lincity-ng\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/simulation/lincity_ng.md\">entry</a>)",
@@ -1699,7 +1699,7 @@
    "Role Playing",
    "mature / inactive since 2006",
    "roguelike",
-   "<a href=\"https://gitlab.com/Trilarion/dungeoncrawl.git\">Source</a> - C - Custom"
+   "<a href=\"https://gitlab.com/osgames/dungeoncrawl.git\">Source</a> - C - Custom"
   ],
   [
    "Linwarrior 3D (<a href=\"http://www.hackcraft.de/games/linwarrior_3d/index.htm\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/action/linwarrior.md\">entry</a>)",
@@ -1771,7 +1771,7 @@
    "Strategy",
    "beta / inactive since 2003",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/machinations.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/machinations.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "Magarena (<a href=\"http://magarena.github.io/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/magarena.md\">entry</a>)",
@@ -1807,7 +1807,7 @@
    "Strategy",
    "beta / inactive since 2008",
    "TBS",
-   "<a href=\"https://github.com/Trilarion/mars.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/mars.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "MechCommander 2 Omnitech (<a href=\"https://github.com/Echelon9/mechcommander2-open\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/action/mechcommander2_omnitech.md\">entry</a>)",
@@ -1852,7 +1852,7 @@
    "Strategy",
    "beta / inactive since 2010",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/mercenarycommander.git\">Source</a> - Java - 3-clause BSD"
+   "<a href=\"https://gitlab.com/osgames/mercenarycommander.git\">Source</a> - Java - 3-clause BSD"
   ],
   [
    "Meridian 59 (<a href=\"http://meridian59.com/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/meridian59.md\">entry</a>)",
@@ -1879,7 +1879,7 @@
    "Strategy",
    "beta / inactive since 2006",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/metalmech.git\">Source</a> - PHP - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/metalmech.git\">Source</a> - PHP - GPL-2.0"
   ],
   [
    "Micropolis (<a href=\"http://micropolisonline.com/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/simulation/micropolis.md\">entry</a>)",
@@ -1915,7 +1915,7 @@
    "Role Playing",
    "mature / active",
    "",
-   "<a href=\"https://github.com/Trilarion/monstrosity.git\">Source</a> - Python - MIT"
+   "<a href=\"https://gitlab.com/osgames/monstrosity.git\">Source</a> - Python - MIT"
   ],
   [
    "Moria (<a href=\"https://umoria.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/moria.md\">entry</a>)",
@@ -1942,7 +1942,7 @@
    "Adventure & Visual novels",
    "mature / inactive since 2013",
    "visual novel",
-   "<a href=\"https://gitlab.com/Trilarion/murderpd.git\">Source</a> - C++ - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/murderpd.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
    "NLarn (<a href=\"https://nlarn.github.io/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/nlarn.md\">entry</a>)",
@@ -2005,7 +2005,7 @@
    "Role Playing",
    "mature / inactive since 2009",
    "educational",
-   "<a href=\"https://gitlab.com/Trilarion/orient.git\">Source</a> - C#, Java - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/orient.git\">Source</a> - C#, Java - GPL-2.0"
   ],
   [
    "Octaforge (<a href=\"https://octaforge.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/framework/octaforge.md\">entry</a>)",
@@ -2095,7 +2095,7 @@
    "Engines & Frameworks",
    "beta / inactive since 2014",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/openrpgmaker.git\">Source</a> - C++ - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/openrpgmaker.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
    "Open Rails (<a href=\"http://openrails.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/simulation/open_rails.md\">entry</a>)",
@@ -2293,7 +2293,7 @@
    "Strategy",
    "beta / inactive since 2000",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/kursk.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/kursk.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "Orx (<a href=\"http://orx-project.org/about\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/framework/orx.md\">entry</a>)",
@@ -2410,7 +2410,7 @@
    "Strategy",
    "mature / inactive since 2003",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/pizza-business.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/pizza-business.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "PlaneShift (<a href=\"http://www.planeshift.it/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/planeshift.md\">entry</a>)",
@@ -2428,7 +2428,7 @@
    "Strategy",
    "beta / inactive since 2003",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/planets.git\">Source</a> - Java - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/planets.git\">Source</a> - Java - GPL-2.0"
   ],
   [
    "Polis (<a href=\"https://code.google.com/archive/p/polisgame/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/polis.md\">entry</a>)",
@@ -2464,7 +2464,7 @@
    "Strategy",
    "mature / inactive since 2004",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/promisance-cvs.git\">Source</a> - PHP - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/promisance-cvs.git\">Source</a> - PHP - GPL-2.0"
   ],
   [
    "Pthreads-win32 (<a href=\"https://sourceware.org/pthreads-win32/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/library/pthreads_win32.md\">entry</a>)",
@@ -2482,7 +2482,7 @@
    "Tools & Manuals",
    "mature / active",
    "tool",
-   "<a href=\"https://gitlab.com/Trilarion/pymapper.git\">Source</a> - Python - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/pymapper.git\">Source</a> - Python - GPL-3.0"
   ],
   [
    "Qt (<a href=\"https://www.qt.io/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/framework/qt.md\">entry</a>)",
@@ -2518,7 +2518,7 @@
    "Tools & Manuals",
    "beta / inactive since 2006",
    "tool",
-   "<a href=\"https://github.com/Trilarion/rpdungeon.git\">Source</a> - Pascal - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/rpdungeon.git\">Source</a> - Pascal - GPL-2.0"
   ],
   [
    "Radakan (<a href=\"https://web.archive.org/web/20170915004555/http://radakan.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/radakan.md\">entry</a>)",
@@ -2527,7 +2527,7 @@
    "Role Playing",
    "beta / inactive since 2014",
    "SP",
-   "<a href=\"https://github.com/Trilarion/radakan.git\">Source</a> - Python - Custom"
+   "<a href=\"https://gitlab.com/osgames/radakan.git\">Source</a> - Python - Custom"
   ],
   [
    "Ragel (<a href=\"http://www.colm.net/open-source/ragel/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/library/ragel.md\">entry</a>)",
@@ -2572,7 +2572,7 @@
    "Role Playing",
    "mature / inactive since 2006",
    "remake, roguelike",
-   "<a href=\"https://gitlab.com/Trilarion/rogueclone.git\">Source</a> - C - 3-clause BSD"
+   "<a href=\"https://gitlab.com/osgames/rogueclone.git\">Source</a> - C - 3-clause BSD"
   ],
   [
    "Roguish (<a href=\"https://github.com/CamHenlin/Roguish\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/roguish.md\">entry</a>)",
@@ -2635,7 +2635,7 @@
    "Engines & Frameworks",
    "beta / inactive since 2014",
    "",
-   "<a href=\"https://github.com/Trilarion/sge2d.git\">Source</a> - C - MIT"
+   "<a href=\"https://gitlab.com/osgames/sge2d.git\">Source</a> - C - MIT"
   ],
   [
    "SWIG (<a href=\"http://swig.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/library/swig.md\">entry</a>)",
@@ -2698,7 +2698,7 @@
    "Adventure & Visual novels",
    "mature / active",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/sentient-storage.git\">Source</a> - Python - Public Domain"
+   "<a href=\"https://gitlab.com/osgames/sentient-storage.git\">Source</a> - Python - Public Domain"
   ],
   [
    "Settlers III remake (<a href=\"https://github.com/jsettlers/settlers-remake\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/settlers_iii_remake.md\">entry</a>)",
@@ -2716,7 +2716,7 @@
    "Strategy",
    "mature / inactive since 2007",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/sharpkonquest.git\">Source</a> - C# - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/sharpkonquest.git\">Source</a> - C# - GPL-2.0"
   ],
   [
    "Silvertree (<a href=\"https://code.google.com/archive/p/silvertree/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/silvertree.md\">entry</a>)",
@@ -2779,7 +2779,7 @@
    "Strategy",
    "mature / inactive since 2011",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/skrupel.git\">Source</a> - PHP, JavaScript - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/skrupel.git\">Source</a> - PHP, JavaScript - GPL-2.0"
   ],
   [
    "Slash'EM (<a href=\"http://slashem.sourceforge.net/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/slash_em.md\">entry</a>)",
@@ -2797,7 +2797,7 @@
    "Strategy",
    "beta / inactive since 2010",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/slaygame.git\">Source</a> - Java - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/slaygame.git\">Source</a> - Java - GPL-3.0"
   ],
   [
    "Smash (<a href=\"http://smash.gouchon.com/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/action/smash.md\">entry</a>)",
@@ -2860,7 +2860,7 @@
    "Strategy",
    "beta / inactive since 2008",
    "",
-   "<a href=\"https://github.com/Trilarion/spaceopera.git\">Source</a> - Java - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/spaceopera.git\">Source</a> - Java - GPL-2.0"
   ],
   [
    "Space Station 13 (<a href=\"https://spacestation13.com/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/space_station_13.md\">entry</a>)",
@@ -2914,7 +2914,7 @@
    "Role Playing",
    "mature / inactive since 2005",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/spicetrade.git\">Source</a> - Java - LGPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/spicetrade.git\">Source</a> - Java - LGPL-2.0"
   ],
   [
    "Spring RTS engine (<a href=\"https://springrts.com/wiki/Main_Page\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/spring.md\">entry</a>)",
@@ -3031,7 +3031,7 @@
    "Strategy",
    "beta / inactive since 2004",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/tbots.git\">Source</a> - C - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/tbots.git\">Source</a> - C - GPL-2.0"
   ],
   [
    "TVTower (<a href=\"http://www.tvgigant.de/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/tvtower.md\">entry</a>)",
@@ -3076,7 +3076,7 @@
    "Role Playing",
    "beta / inactive since 2003",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/theclans.git\">Source</a> - C - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/theclans.git\">Source</a> - C - GPL-2.0"
   ],
   [
    "The Endless Dungeons (<a href=\"https://sourceforge.net/projects/endlessdungeons/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/endless_dungeons.md\">entry</a>)",
@@ -3085,7 +3085,7 @@
    "Role Playing",
    "mature / inactive since 2015",
    "",
-   "<a href=\"https://github.com/Trilarion/endlessdungeons.git\">Source</a> - C - CC BY-NC-SA 2.0"
+   "<a href=\"https://gitlab.com/osgames/endlessdungeons.git\">Source</a> - C - CC BY-NC-SA 2.0"
   ],
   [
    "The Epic of Heroes (<a href=\"https://sourceforge.net/projects/epicheroes/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/epic_of_heroes.md\">entry</a>)",
@@ -3112,7 +3112,7 @@
    "Role Playing",
    "beta / active",
    "",
-   "<a href=\"https://github.com/Trilarion/jewelhunt.git\">Source</a> - Java - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/jewelhunt.git\">Source</a> - Java - GPL-2.0"
   ],
   [
    "Thousand Parsec (<a href=\"http://www.thousandparsec.net/tp/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/thousand_parsec.md\">entry</a>)",
@@ -3130,7 +3130,7 @@
    "Role Playing",
    "beta / inactive since 2013",
    "",
-   "<a href=\"https://github.com/Trilarion/ura-game.git\">Source</a> - C++ - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/ura-game.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
    "TripleA (<a href=\"http://triplea-game.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/triplea.md\">entry</a>)",
@@ -3166,7 +3166,7 @@
    "Action/Arcade",
    "beta / inactive since 2001",
    "racing",
-   "<a href=\"https://gitlab.com/Trilarion/tuxracer.git\">Source</a> - C - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/tuxracer.git\">Source</a> - C - GPL-2.0"
   ],
   [
    "Tuxemon (<a href=\"https://www.tuxemon.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/tuxemon.md\">entry</a>)",
@@ -3220,7 +3220,7 @@
    "Role Playing",
    "beta / inactive since 2002",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/umbra\">Source</a> - Python - Custom"
+   "<a href=\"https://gitlab.com/osgames/umbra\">Source</a> - Python - Custom"
   ],
   [
    "UnNetHack (<a href=\"https://unnethack.wordpress.com/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/unnethack.md\">entry</a>)",
@@ -3238,7 +3238,7 @@
    "Role Playing",
    "beta / inactive since 2007",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/uwadv.git\">Source</a> - C++, Lua - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/uwadv.git\">Source</a> - C++, Lua - GPL-2.0"
   ],
   [
    "Unknown Horizons (<a href=\"http://unknown-horizons.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/unknown_horizons.md\">entry</a>)",
@@ -3292,7 +3292,7 @@
    "Role Playing",
    "beta / inactive since 2013",
    "",
-   "<a href=\"https://github.com/Trilarion/vegatrek.git\">Source</a> - Python - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/vegatrek.git\">Source</a> - Python - GPL-2.0"
   ],
   [
    "WAtomic (<a href=\"https://sourceforge.net/projects/watomic/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/watomic.md\">entry</a>)",
@@ -3301,7 +3301,7 @@
    "Strategy",
    "mature / inactive since 2005",
    "remake",
-   "<a href=\"https://gitlab.com/Trilarion/watomic.git\">Source</a> - Pascal - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/watomic.git\">Source</a> - Pascal - GPL-2.0"
   ],
   [
    "War Of Kingdom (<a href=\"http://www.freeors.com/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/war_of_kingdom.md\">entry</a>)",
@@ -3319,7 +3319,7 @@
    "Strategy",
    "mature / inactive since 2003",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/wargamer.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/wargamer.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "Wargus (<a href=\"http://wargus.stratagus.com/index.shtml\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/wargus.md\">entry</a>)",
@@ -3391,7 +3391,7 @@
    "Strategy",
    "beta / inactive since 2009",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/worldofheroes.git\">Source</a> - Python - 3-clause BSD"
+   "<a href=\"https://gitlab.com/osgames/worldofheroes.git\">Source</a> - Python - 3-clause BSD"
   ],
   [
    "World of Phaos (<a href=\"http://worldofphaos.com/index.php?site=online_rpg\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/rpg/world_of_phaos.md\">entry</a>)",
@@ -3400,7 +3400,7 @@
    "Role Playing",
    "mature / inactive since 2011",
    "online",
-   "<a href=\"https://gitlab.com/Trilarion/phaosrpg.git\">Source</a> - PHP - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/phaosrpg.git\">Source</a> - PHP - GPL-2.0"
   ],
   [
    "WorldForge (<a href=\"https://www.worldforge.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/framework/worldforge.md\">entry</a>)",
@@ -3427,7 +3427,7 @@
    "Strategy",
    "beta / inactive since 2011",
    "TBS",
-   "<a href=\"https://github.com/Trilarion/xforceffd.git\">Source</a> - Pascal - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/xforceffd.git\">Source</a> - Pascal - GPL-2.0"
   ],
   [
    "XArchon (<a href=\"http://xarchon.seul.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/xarchon.md\">entry</a>)",
@@ -3436,7 +3436,7 @@
    "Strategy",
    "beta / inactive since 2003",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/xarchon.git\">Source</a> - C, C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/xarchon.git\">Source</a> - C, C++ - GPL-2.0"
   ],
   [
    "XSera (<a href=\"https://github.com/prophile/xsera\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/xsera.md\">entry</a>)",
@@ -3472,7 +3472,7 @@
    "Strategy",
    "mature / inactive since 2005",
    "",
-   "<a href=\"https://gitlab.com/Trilarion/xconq.git\">Source</a> - C++ - GPL-2.0"
+   "<a href=\"https://gitlab.com/osgames/xconq.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
    "Xenowar (<a href=\"http://xenowar.net\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/strategy/xenowar.md\">entry</a>)",
@@ -3499,7 +3499,7 @@
    "Role Playing",
    "mature / inactive since 2005",
    "roguelike",
-   "<a href=\"https://gitlab.com/Trilarion/zangband.git\">Source</a> - C - Custom"
+   "<a href=\"https://gitlab.com/osgames/zangband.git\">Source</a> - C - Custom"
   ],
   [
    "ZGameEditor (<a href=\"http://www.zgameeditor.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/framework/zgameeditor.md\">entry</a>)",
diff --git a/games/action/pingus.md b/games/action/pingus.md
index 0e2ca2d3..481ffb43 100644
--- a/games/action/pingus.md
+++ b/games/action/pingus.md
@@ -5,7 +5,7 @@ _Lemmings(tm)-like puzzle game._
 - Home: https://pingus.seul.org/index.html
 - State: mature
 - Download: https://pingus.seul.org/download.html
-- Platform: Linux, Mac, Windows
+- Platform: Windows, Linux, macOS
 - Keywords: puzzle
 - Code repository: https://gitlab.com/pingus/pingus.git
 - Code language: C++
diff --git a/games/action/tuxracer.md b/games/action/tuxracer.md
index e7125248..6a9334c0 100644
--- a/games/action/tuxracer.md
+++ b/games/action/tuxracer.md
@@ -7,7 +7,7 @@ _Racing game featuring Tux, the Linux Penguin._
 - State: beta, inactive since 2001
 - Download: https://sourceforge.net/projects/tuxracer/files/
 - Keywords: racing
-- Code repository: https://gitlab.com/Trilarion/tuxracer.git (backup of cvs), http://tuxracer.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/tuxracer.git (backup of cvs), http://tuxracer.cvs.sourceforge.net/ (cvs)
 - Code language: C
 - Code license: GPL-2.0
 
diff --git a/games/adventure/digital_a_love_story.md b/games/adventure/digital_a_love_story.md
index 662603c5..611992be 100644
--- a/games/adventure/digital_a_love_story.md
+++ b/games/adventure/digital_a_love_story.md
@@ -5,9 +5,9 @@ _A computer mystery/romance set five minutes into the future of 1988._
 - Home: http://scoutshonour.com/digital/, https://lgdb.org/game/digital_love_story
 - State: mature
 - Download: (see home)
-- Platform: Windows, Mac, Linux
+- Platform: Windows, Linux, macOS
 - Keywords: visual novel
-- Code repository: https://gitlab.com/Trilarion/digitalalovestory.git (copy of version 1.1)
+- Code repository: https://gitlab.com/osgames/digitalalovestory.git (copy of version 1.1)
 - Code language: Ren'py
 - Code license: CC-BY-NC-SA
 
diff --git a/games/adventure/dragon_history.md b/games/adventure/dragon_history.md
index 8a050438..280ab812 100644
--- a/games/adventure/dragon_history.md
+++ b/games/adventure/dragon_history.md
@@ -5,7 +5,7 @@ _Czech adventure game._
 - Home: http://www.ucw.cz/draci-historie/index-en.html
 - State: mature, inactive since 2010
 - Download: http://www.ucw.cz/draci-historie/index-en.html#download
-- Code repository: https://gitlab.com/Trilarion/dragon-history.git (snapshot of source releases)
+- Code repository: https://gitlab.com/osgames/dragon-history.git (snapshot of source releases)
 - Code language: Pascal (old engine), Script (runs on ScummVM)
 - Code license: GPL-2.0
 
diff --git a/games/adventure/murder_in_the_public_domain.md b/games/adventure/murder_in_the_public_domain.md
index 667dcda0..b61342d3 100644
--- a/games/adventure/murder_in_the_public_domain.md
+++ b/games/adventure/murder_in_the_public_domain.md
@@ -7,7 +7,7 @@ _A murder mystery game or visual novel built from public domain movies, sounds,
 - Download: https://sourceforge.net/projects/murderpd/files/
 - Platform: Windows, Linux
 - Keywords: visual novel
-- Code repository: https://gitlab.com/Trilarion/murderpd.git (copy of versions 1.0.0 - 1.3.1)
+- Code repository: https://gitlab.com/osgames/murderpd.git (copy of versions 1.0.0 - 1.3.1)
 - Code language: C++
 - Code license: GPL-3.0
 
diff --git a/games/adventure/sentient_storage.md b/games/adventure/sentient_storage.md
index bf04aa16..edaec69b 100644
--- a/games/adventure/sentient_storage.md
+++ b/games/adventure/sentient_storage.md
@@ -5,7 +5,7 @@ _Point & Click adventure!_
 - Home: https://pyweek.org/e/np8g/
 - State: mature
 - Download: (see home)
-- Code repository: https://gitlab.com/Trilarion/sentient-storage.git (copy of download)
+- Code repository: https://gitlab.com/osgames/sentient-storage.git (copy of download)
 - Code language: Python
 - Code license: Public Domain
 - Code dependencies: Pygame
diff --git a/games/framework/h_world.md b/games/framework/h_world.md
index 41fd4028..9addb482 100644
--- a/games/framework/h_world.md
+++ b/games/framework/h_world.md
@@ -5,7 +5,7 @@ _CRPG engine is a tile-based, turn-based, Lua scriptable engine that supports a
 - Home: https://sourceforge.net/projects/h-world/
 - State: beta, inactive since 2005
 - Download: https://sourceforge.net/projects/h-world/files/
-- Code repository: https://gitlab.com/Trilarion/h-world.git (backup of cvs), https://sourceforge.net/p/h-world/code (cvs)
+- Code repository: https://gitlab.com/osgames/h-world.git (backup of cvs), https://sourceforge.net/p/h-world/code (cvs)
 - Code language: C, Lua
 - Code license: GPL-2.0
 
diff --git a/games/framework/open_rpg_maker.md b/games/framework/open_rpg_maker.md
index 6c84f2d5..5eb96efe 100644
--- a/games/framework/open_rpg_maker.md
+++ b/games/framework/open_rpg_maker.md
@@ -5,7 +5,7 @@ _Open RPG Maker is a free and open source 2D RPG creation utility, similar to th
 - Home: http://openrpgmaker.sourceforge.net/, https://sourceforge.net/projects/openrpgmaker/
 - State: beta, inactive since 2014
 - Download: http://openrpgmaker.sourceforge.net/wiki/index.php/Download, https://sourceforge.net/projects/openrpgmaker/files/
-- Code repository: https://gitlab.com/Trilarion/openrpgmaker.git (snapshot of source releases)
+- Code repository: https://gitlab.com/osgames/openrpgmaker.git (snapshot of source releases)
 - Code language: C++
 - Code license: GPL-3.0
 
diff --git a/games/framework/sge2d.md b/games/framework/sge2d.md
index f5405649..dcb992a6 100644
--- a/games/framework/sge2d.md
+++ b/games/framework/sge2d.md
@@ -5,7 +5,7 @@ _2D game programming framework for c/c++ programmers with least possible depende
 - Home: https://sourceforge.net/projects/sge2d/, https://web.archive.org/web/20110526140520/http://agnosent.com:80/wolfcms/open-source/sge2d
 - State: beta, inactive since 2014
 - Download: https://sourceforge.net/projects/sge2d/files/sge2d/
-- Code repository: https://github.com/Trilarion/sge2d.git (backup of svn), https://sourceforge.net/p/sge2d/code/HEAD/tree/ (svn)
+- Code repository: https://gitlab.com/osgames/sge2d.git (backup of svn), https://sourceforge.net/p/sge2d/code/HEAD/tree/ (svn)
 - Code language: C
 - Code license: MIT
 
diff --git a/games/misc/deity.md b/games/misc/deity.md
index 095ad71a..dce09415 100644
--- a/games/misc/deity.md
+++ b/games/misc/deity.md
@@ -6,7 +6,7 @@ _GameMaster (i.e. role-playing) utility._
 - State: mature, inactive since 2014
 - Download: https://sourceforge.net/projects/deity/files
 - Keywords: tool
-- Code repository: https://github.com/Trilarion/deity.git (backup of svn), https://svn.code.sf.net/p/deity/code/ (svn)
+- Code repository: https://gitlab.com/osgames/deity.git (backup of svn), https://svn.code.sf.net/p/deity/code/ (svn)
 - Code language: Python
 - Code license: GPL-2.0
 
diff --git a/games/misc/dungeon_mapper.md b/games/misc/dungeon_mapper.md
index e17e628b..5fcee5b3 100644
--- a/games/misc/dungeon_mapper.md
+++ b/games/misc/dungeon_mapper.md
@@ -6,7 +6,7 @@ _Map your dungeons for your next role playing adventure._
 - State: beta, inactive since 2013
 - Download: https://sourceforge.net/projects/dungeonmap/files
 - Keywords: tool
-- Code repository: https://github.com/Trilarion/dungeonmap.git (backup of svn), https://svn.code.sf.net/p/dungeonmap/code/trunk (svn)
+- Code repository: https://gitlab.com/osgames/dungeonmap.git (backup of svn), https://svn.code.sf.net/p/dungeonmap/code/trunk (svn)
 - Code language: C++
 - Code license: GPL-3.0
 
diff --git a/games/misc/gm_tools.md b/games/misc/gm_tools.md
index 20da9564..23e42aa0 100644
--- a/games/misc/gm_tools.md
+++ b/games/misc/gm_tools.md
@@ -6,7 +6,7 @@ _Game/Dungeon Master aid for role playing._
 - State: beta, inactive since 2004
 - Download: https://sourceforge.net/projects/gm-tools/files
 - Keywords: tool
-- Code repository: https://gitlab.com/Trilarion/gm-tools.git (backup of cvs), http://gm-tools.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/gm-tools.git (backup of cvs), http://gm-tools.cvs.sourceforge.net/ (cvs)
 - Code language: C++
 - Code license: GPL-2.0
 
diff --git a/games/misc/java_ng.md b/games/misc/java_ng.md
index 2ff1c989..4f982a65 100644
--- a/games/misc/java_ng.md
+++ b/games/misc/java_ng.md
@@ -6,7 +6,7 @@ _Java random name generator for role-games, authors, and the like._
 - State: mature, inactive since 2011
 - Download: https://sourceforge.net/projects/janag.berlios/files
 - Keywords: tool
-- Code repository: https://gitlab.com/Trilarion/janag.git (copy of source download)
+- Code repository: https://gitlab.com/osgames/janag.git (copy of source download)
 - Code language: Java
 - Code license: GPL-2.0
 
diff --git a/games/misc/pymapper.md b/games/misc/pymapper.md
index 7bcd9b18..75fcbc80 100644
--- a/games/misc/pymapper.md
+++ b/games/misc/pymapper.md
@@ -6,7 +6,7 @@ _Map making utility used for role-playing games._
 - State: mature
 - Download: http://pymapper.com/downloads/, https://sourceforge.net/projects/pymapper/files/
 - Keywords: tool
-- Code repository: https://gitlab.com/Trilarion/pymapper.git (copy of source releases)
+- Code repository: https://gitlab.com/osgames/pymapper.git (copy of source releases)
 - Code language: Python
 - Code license: GPL-3.0
 
diff --git a/games/misc/rpdungeon.md b/games/misc/rpdungeon.md
index 22a60046..189a9d9e 100644
--- a/games/misc/rpdungeon.md
+++ b/games/misc/rpdungeon.md
@@ -6,7 +6,7 @@ _Collection of programs and libraries for pen and paper role playing._
 - State: beta, inactive since 2006
 - Download: https://sourceforge.net/projects/rpdungeon/files
 - Keywords: tool
-- Code repository: https://github.com/Trilarion/rpdungeon.git (backup of svn), https://sourceforge.net/p/rpdungeon/code/HEAD/tree/ (svn)
+- Code repository: https://gitlab.com/osgames/rpdungeon.git (backup of svn), https://sourceforge.net/p/rpdungeon/code/HEAD/tree/ (svn)
 - Code language: Pascal
 - Code license: GPL-2.0
 
diff --git a/games/rpg/avanor.md b/games/rpg/avanor.md
index 194a15d1..3387e76d 100644
--- a/games/rpg/avanor.md
+++ b/games/rpg/avanor.md
@@ -6,7 +6,7 @@ _Relatively easy to win but feature rich fantasy roguelike game with a highly in
 - State: beta, inactive since 2008
 - Download: https://sourceforge.net/projects/avanor/files
 - Keywords: roguelike
-- Code repository: https://github.com/Trilarion/avanor.git (backup of svn), https://svn.code.sf.net/p/avanor/code/ (svn)
+- Code repository: https://gitlab.com/osgames/avanor.git (backup of svn), https://svn.code.sf.net/p/avanor/code/ (svn)
 - Code language: C++, Lua
 - Code license: GPL-2.0
 
diff --git a/games/rpg/betrayer_moon_tactics.md b/games/rpg/betrayer_moon_tactics.md
index 7b27b7ec..8318a2a2 100644
--- a/games/rpg/betrayer_moon_tactics.md
+++ b/games/rpg/betrayer_moon_tactics.md
@@ -5,7 +5,7 @@ _Innovative, original strategy-action RPG developed in Sphere._
 - Home: https://sourceforge.net/projects/bm-game/
 - State: beta, inactive since 2006
 - Download: https://sourceforge.net/projects/bm-game/files
-- Code repository: https://gitlab.com/Trilarion/bmtactics.git (copy of source releases)
+- Code repository: https://gitlab.com/osgames/bmtactics.git (copy of source releases)
 - Code language: JavaScript
 - Code license: GPL-2.0
 
diff --git a/games/rpg/dragon_hunt.md b/games/rpg/dragon_hunt.md
index a696e5e8..bc258cfc 100644
--- a/games/rpg/dragon_hunt.md
+++ b/games/rpg/dragon_hunt.md
@@ -5,7 +5,7 @@ _Role-playing game designed to be flexible and fun._
 - Home: http://emhsoft.com/dh.html, http://savannah.nongnu.org/projects/dragon-hunt
 - State: mature
 - Download: (see home)
-- Code repository: https://gitlab.com/Trilarion/dragon-hunt.git (backup of cvs), http://savannah.nongnu.org/cvs/?group=dragon-hunt (cvs)
+- Code repository: https://gitlab.com/osgames/dragon-hunt.git (backup of cvs), http://savannah.nongnu.org/cvs/?group=dragon-hunt (cvs)
 - Code language: Python
 - Code license: GPL-2.0
 - Code dependencies: PyGame
diff --git a/games/rpg/endless_dungeons.md b/games/rpg/endless_dungeons.md
index 7702d121..8e28e199 100644
--- a/games/rpg/endless_dungeons.md
+++ b/games/rpg/endless_dungeons.md
@@ -6,7 +6,7 @@ _Free random dungeon game RPG (Roguelike)_
 - State: mature, inactive since 2015
 - Download: https://sourceforge.net/projects/endlessdungeons/files/
 - Platform: Windows
-- Code repository: https://github.com/Trilarion/endlessdungeons.git
+- Code repository: https://gitlab.com/osgames/endlessdungeons.git (archive of source releases)
 - Code language: C
 - Code license: CC BY-NC-SA 2.0
 - Code dependencies: Allegro
diff --git a/games/rpg/eos_dawn_of_light.md b/games/rpg/eos_dawn_of_light.md
index 2012058b..dd2b9fcb 100644
--- a/games/rpg/eos_dawn_of_light.md
+++ b/games/rpg/eos_dawn_of_light.md
@@ -5,7 +5,7 @@ _Space adventure game with elements of arcade and strategy._
 - Home: https://sourceforge.net/projects/eos-game/
 - State: beta, inactive since 2007
 - Download: https://sourceforge.net/projects/eos-game/files
-- Code repository: https://github.com/Trilarion/eos-game.git (backup of svn), https://svn.code.sf.net/p/eos-game/code/ (svn)
+- Code repository: https://gitlab.com/osgames/eos-game.git (backup of svn), https://svn.code.sf.net/p/eos-game/code/ (svn)
 - Code language: Python
 - Code license: MIT
 
diff --git a/games/rpg/geewhiz.md b/games/rpg/geewhiz.md
index 64859429..d23773fa 100644
--- a/games/rpg/geewhiz.md
+++ b/games/rpg/geewhiz.md
@@ -5,7 +5,7 @@ _Homage to the old style Wizardry(tm) games._
 - Home: http://icculus.org/gwiz/
 - State: beta, inactive since 2004
 - Download: http://icculus.org/gwiz/download.php
-- Code repository: https://gitlab.com/Trilarion/gwiz.git (snapshot of source releases)
+- Code repository: https://gitlab.com/osgames/gwiz.git (snapshot of source releases)
 - Code language: C
 - Code license: GPL-2.0
 
diff --git a/games/rpg/holy_spirit.md b/games/rpg/holy_spirit.md
index d31a11b2..f944b9ad 100644
--- a/games/rpg/holy_spirit.md
+++ b/games/rpg/holy_spirit.md
@@ -6,7 +6,7 @@ _2D isometric hack'n'slash game (action-rpg)._
 - State: beta, inactive since 2013
 - Download: https://sourceforge.net/projects/lechemindeladam/files
 - Keywords: action-rpg
-- Code repository: https://gitlab.com/Trilarion/lechemindeladam.git (custom conversion of svn), https://svn.code.sf.net/p/lechemindeladam/code/ (svn), https://sourceforge.net/p/lechemindeladam/cvs/ (cvs)
+- Code repository: https://gitlab.com/osgames/lechemindeladam.git (custom conversion of svn), https://svn.code.sf.net/p/lechemindeladam/code/ (svn), https://sourceforge.net/p/lechemindeladam/cvs/ (cvs)
 - Code language: C++
 - Code license: GPL-3.0
 - Code dependencies: SFML
diff --git a/games/rpg/jewelhunt.md b/games/rpg/jewelhunt.md
index c2113465..b3992f04 100644
--- a/games/rpg/jewelhunt.md
+++ b/games/rpg/jewelhunt.md
@@ -5,7 +5,7 @@ _The rainbow jewels have been abducted from the temple of the rainbow colors, an
 - Home: https://sourceforge.net/projects/jewelhunt/
 - State: beta
 - Download: https://sourceforge.net/projects/jewelhunt/files
-- Code repository: https://github.com/Trilarion/jewelhunt.git (backup of svn), https://svn.code.sf.net/p/jewelhunt/code/ (svn)
+- Code repository: https://gitlab.com/osgames/jewelhunt.git (backup of svn), https://svn.code.sf.net/p/jewelhunt/code/ (svn)
 - Code language: Java
 - Code license: GPL-2.0
 
diff --git a/games/rpg/kobolds_quest_2.md b/games/rpg/kobolds_quest_2.md
index c75cf32e..c6fae5c2 100644
--- a/games/rpg/kobolds_quest_2.md
+++ b/games/rpg/kobolds_quest_2.md
@@ -5,7 +5,7 @@ _Sequel to kobold's quest and features an octree for multi processing game mecha
 - Home: https://sourceforge.net/projects/koboldsquest2/
 - State: beta, inactive since 2011
 - Download: https://sourceforge.net/projects/koboldsquest2/files/
-- Code repository: https://gitlab.com/Trilarion/koboldsquest2.git (snapshot of source release)
+- Code repository: https://gitlab.com/osgames/koboldsquest2.git (snapshot of source release)
 - Code language: Python
 - Code license: LGPL-3.0
 
diff --git a/games/rpg/labyrinth_of_worlds.md b/games/rpg/labyrinth_of_worlds.md
index 6ffb16ac..05d6440d 100644
--- a/games/rpg/labyrinth_of_worlds.md
+++ b/games/rpg/labyrinth_of_worlds.md
@@ -5,7 +5,7 @@ _Rewrite for modern architectures of the incredibly good game Ultima Underworld
 - Home: http://low.sourceforge.net/index.php, https://sourceforge.net/projects/low/
 - State: beta, inactive since 2010
 - Download: https://sourceforge.net/projects/low/files
-- Code repository: https://github.com/Trilarion/low.git (cvs and svn to git conversion), https://svn.code.sf.net/p/low/code/ (svn), https://sourceforge.net/p/low/cvs/ (cvs)
+- Code repository: https://gitlab.com/osgames/low.git (cvs and svn to git conversion), https://svn.code.sf.net/p/low/code/ (svn), https://sourceforge.net/p/low/cvs/ (cvs)
 - Code language: C++
 - Code license: LGPL-3.0
 
diff --git a/games/rpg/linleys_dungeon_crawl.md b/games/rpg/linleys_dungeon_crawl.md
index 7842ce98..d1f037d6 100644
--- a/games/rpg/linleys_dungeon_crawl.md
+++ b/games/rpg/linleys_dungeon_crawl.md
@@ -7,7 +7,7 @@ _Roguelike molded in the tradition of the early greats of the genre: Rogue, Hack
 - State: mature, inactive since 2006
 - Download: http://www.dungeoncrawl.org/?d (ftp://ftp.dungeoncrawl.org/)
 - Keywords: roguelike
-- Code repository: https://gitlab.com/Trilarion/dungeoncrawl.git (snapshot of source releases)
+- Code repository: https://gitlab.com/osgames/dungeoncrawl.git (snapshot of source releases)
 - Code language: C
 - Code license: Custom (Crawl General Public License)
 
diff --git a/games/rpg/monstrosity.md b/games/rpg/monstrosity.md
index c9b7cf9d..ba8eb2dd 100644
--- a/games/rpg/monstrosity.md
+++ b/games/rpg/monstrosity.md
@@ -5,7 +5,7 @@ _Slay monsters, cast spells and collect keys to escape an 8-level dungeon in thi
 - Home: http://monstrosity.fireheadfred.com/
 - State: mature
 - Download: http://monstrosity.fireheadfred.com/
-- Code repository: https://github.com/Trilarion/monstrosity.git
+- Code repository: https://gitlab.com/osgames/monstrosity.git (sources from website plus license)
 - Code language: Python
 - Code license: MIT (repository)
 - Code dependencies: PyGame
diff --git a/games/rpg/orient.md b/games/rpg/orient.md
index 2b0da0c8..42c5b066 100644
--- a/games/rpg/orient.md
+++ b/games/rpg/orient.md
@@ -6,7 +6,7 @@ _Prototype for an educational role-playing game for intercultural education._
 - State: mature, inactive since 2009
 - Download: https://sourceforge.net/projects/orient-ecircus/files
 - Keywords: educational
-- Code repository: https://gitlab.com/Trilarion/orient.git (snapshot of sources in download)
+- Code repository: https://gitlab.com/osgames/orient.git (snapshot of sources in download)
 - Code language: C#, Java
 - Code license: GPL-2.0
 
diff --git a/games/rpg/radakan.md b/games/rpg/radakan.md
index b181c17e..a1865849 100644
--- a/games/rpg/radakan.md
+++ b/games/rpg/radakan.md
@@ -6,7 +6,7 @@ _Single player RPG game, set in a dark fantasy setting where four unique races s
 - State: beta, inactive since 2014
 - Download: https://sourceforge.net/projects/radakan/files/
 - Keywords: SP
-- Code repository: https://github.com/Trilarion/radakan.git (backup of svn), https://svn.code.sf.net/p/radakan/code/ (svn)
+- Code repository: https://gitlab.com/osgames/radakan.git (backup of svn), https://svn.code.sf.net/p/radakan/code/ (svn)
 - Code language: Python
 - Code license: Custom
 
diff --git a/games/rpg/rogue_clone_iv.md b/games/rpg/rogue_clone_iv.md
index bda6a28e..c93fab0e 100644
--- a/games/rpg/rogue_clone_iv.md
+++ b/games/rpg/rogue_clone_iv.md
@@ -6,7 +6,7 @@ _Reproduction of Rogue._
 - State: mature, inactive since 2006
 - Download: https://sourceforge.net/projects/rogueclone/files/rogue%20clone/
 - Keywords: remake, roguelike
-- Code repository: https://gitlab.com/Trilarion/rogueclone.git (backup of cvs), https://sourceforge.net/p/rogueclone/code/ (cvs)
+- Code repository: https://gitlab.com/osgames/rogueclone.git (backup of cvs), https://sourceforge.net/p/rogueclone/code/ (cvs)
 - Code language: C
 - Code license: 3-clause BSD
 
diff --git a/games/rpg/spice_trade.md b/games/rpg/spice_trade.md
index 48143a67..39541201 100644
--- a/games/rpg/spice_trade.md
+++ b/games/rpg/spice_trade.md
@@ -5,7 +5,7 @@ _Rpg/strategy/adventure game about a poor spice farmer in 12th century Baghdad a
 - Home: https://sourceforge.net/projects/spicetrade/, http://www.spicetrade.org/
 - State: mature, inactive since 2005
 - Download: https://sourceforge.net/projects/spicetrade/files/
-- Code repository: https://gitlab.com/Trilarion/spicetrade.git (copy of source downloads)
+- Code repository: https://gitlab.com/osgames/spicetrade.git (copy of source downloads)
 - Code language: Java
 - Code license: LGPL-2.0
 
diff --git a/games/rpg/the_clans.md b/games/rpg/the_clans.md
index a946dc4e..89e4e398 100644
--- a/games/rpg/the_clans.md
+++ b/games/rpg/the_clans.md
@@ -5,7 +5,7 @@ _The Clans was a popular game written for online BBSes back in the day of their
 - Home: http://theclans.sourceforge.net/, https://sourceforge.net/projects/theclans/
 - State: beta, inactive since 2003
 - Download: https://sourceforge.net/projects/theclans/files
-- Code repository: https://gitlab.com/Trilarion/theclans.git (backup of cvs), http://theclans.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/theclans.git (backup of cvs), http://theclans.cvs.sourceforge.net/ (cvs)
 - Code language: C
 - Code license: GPL-2.0
 
diff --git a/games/rpg/trinity_reign.md b/games/rpg/trinity_reign.md
index 60178349..8ceecc55 100644
--- a/games/rpg/trinity_reign.md
+++ b/games/rpg/trinity_reign.md
@@ -4,7 +4,7 @@ _Cross-platform, open source 3D IMOW (Immersive Multiplayer Online World)._
 
 - Home: <https://web.archive.org/web/20131209073248/http://trinity-reign.com/>, https://sourceforge.net/projects/ura-game/
 - State: beta, inactive since 2013
-- Code repository: https://github.com/Trilarion/ura-game.git (backup of svn), https://svn.code.sf.net/p/ura-game/code/ (svn)
+- Code repository: https://gitlab.com/osgames/ura-game.git (backup of svn), https://svn.code.sf.net/p/ura-game/code/ (svn)
 - Code language: C++
 - Code license: GPL-3.0
 
diff --git a/games/rpg/umbra.md b/games/rpg/umbra.md
index 52f2cef2..547ec9d0 100644
--- a/games/rpg/umbra.md
+++ b/games/rpg/umbra.md
@@ -5,7 +5,7 @@ _Computer role-playing game written in Python._
 - Home: http://markdamonhughes.com/Umbra/
 - State: beta, inactive since 2002
 - Download: http://markdamonhughes.com/Umbra/#download
-- Code repository: https://gitlab.com/Trilarion/umbra (snapshot of source release)
+- Code repository: https://gitlab.com/osgames/umbra (snapshot of source release)
 - Code language: Python
 - Code license: Custom (similar to BSD)
 
diff --git a/games/rpg/underworld_adventures.md b/games/rpg/underworld_adventures.md
index d0528a0f..627957a5 100644
--- a/games/rpg/underworld_adventures.md
+++ b/games/rpg/underworld_adventures.md
@@ -5,7 +5,7 @@ _Project to recreate Ultima Underworld 1 on modern operating systems (e.g. Win32
 - Home: http://uwadv.sourceforge.net/, https://sourceforge.net/projects/uwadv/
 - State: beta, inactive since 2007
 - Download: http://uwadv.sourceforge.net/index.php?page=download
-- Code repository: https://gitlab.com/Trilarion/uwadv.git (backup of cvs), http://uwadv.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/uwadv.git (backup of cvs), http://uwadv.cvs.sourceforge.net/ (cvs)
 - Code language: C++, Lua
 - Code license: GPL-2.0
 
diff --git a/games/rpg/vegatrek.md b/games/rpg/vegatrek.md
index 5b02b7f7..226620da 100644
--- a/games/rpg/vegatrek.md
+++ b/games/rpg/vegatrek.md
@@ -5,7 +5,7 @@ _Open source Star Trek based game (based on VegaStrike Engine) that lets you fig
 - Home: https://sourceforge.net/projects/vegatrek/
 - State: beta, inactive since 2013
 - Download: https://sourceforge.net/projects/vegatrek/files/vegatrek%200.6/
-- Code repository: https://github.com/Trilarion/vegatrek.git (backup of svn), https://svn.code.sf.net/p/vegatrek/code/ (svn)
+- Code repository: https://gitlab.com/osgames/vegatrek.git (backup of svn), https://svn.code.sf.net/p/vegatrek/code/ (svn)
 - Code language: Python
 - Code license: GPL-2.0
 
diff --git a/games/rpg/world_of_phaos.md b/games/rpg/world_of_phaos.md
index e90c0450..be4e71f9 100644
--- a/games/rpg/world_of_phaos.md
+++ b/games/rpg/world_of_phaos.md
@@ -6,7 +6,7 @@ _Online Roleplaying Game browser based, which takes place in the high fantasy wo
 - State: mature, inactive since 2011
 - Download: https://sourceforge.net/projects/phaosrpg/files/
 - Keywords: online
-- Code repository: https://gitlab.com/Trilarion/phaosrpg.git (snapshot of source releases)
+- Code repository: https://gitlab.com/osgames/phaosrpg.git (snapshot of source releases)
 - Code language: PHP
 - Code license: GPL-2.0
 - Assets license: Restricted (see license)
diff --git a/games/rpg/zangband.md b/games/rpg/zangband.md
index cfad75f0..bdd679cb 100644
--- a/games/rpg/zangband.md
+++ b/games/rpg/zangband.md
@@ -7,7 +7,7 @@ _Roguelike computer role playing game available for almost any computer and oper
 - State: mature, inactive since 2005
 - Download: https://sourceforge.net/projects/zangband/files/
 - Keywords: roguelike
-- Code repository: https://gitlab.com/Trilarion/zangband.git (backup of cvs), http://zangband.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/zangband.git (backup of cvs), http://zangband.cvs.sourceforge.net/ (cvs)
 - Code language: C
 - Code license: Custom (Modifications allowed?)
 
diff --git a/games/simulation/freetrain.md b/games/simulation/freetrain.md
index 310c8f86..0d431109 100644
--- a/games/simulation/freetrain.md
+++ b/games/simulation/freetrain.md
@@ -5,7 +5,7 @@ _Rail & business simulation._
 - Home: http://freetrain.sourceforge.net/, https://sourceforge.net/projects/freetrain/
 - State: beta, inactive since 2009
 - Download: https://sourceforge.net/projects/freetrain/files/
-- Code repository: https://github.com/Trilarion/freetrain.git (backup of svn), https://svn.code.sf.net/p/freetrain/code/ (svn)
+- Code repository: https://gitlab.com/osgames/freetrain.git (backup of svn), https://svn.code.sf.net/p/freetrain/code/ (svn)
 - Code language: C#
 - Code license: LGPL-2.1
 
diff --git a/games/simulation/lincity.md b/games/simulation/lincity.md
index c712041a..7aac4cb1 100644
--- a/games/simulation/lincity.md
+++ b/games/simulation/lincity.md
@@ -6,7 +6,7 @@ _Lincity is a city simulation game,_
 - Media: https://en.wikipedia.org/wiki/Lincity
 - State: mature, inactive since 2005
 - Download: (see home)
-- Code repository: https://gitlab.com/Trilarion/lincity.git (backup of cvs), http://lincity.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/lincity.git (backup of cvs), http://lincity.cvs.sourceforge.net/ (cvs)
 - Code language: C
 - Code license: GPL-2.0
 
diff --git a/games/statistics.md b/games/statistics.md
index 6df7aac7..ac6759ae 100644
--- a/games/statistics.md
+++ b/games/statistics.md
@@ -1,7 +1,7 @@
 [comment]: # (autogenerated content, do not edit)
 # Statistics
 
-analyzed 410 entries on 2018-09-06 10:09:44
+analyzed 410 entries on 2018-09-11 13:23:35
 
 ## State
 
@@ -165,3 +165,12 @@ Build systems information available for 18.3% of all projects
 
 Allegro, Annchienta, Arx Libertatis, Astromenace, Atrinik, Battle for Wesnoth, Blender game engine, COCOS2D-X, Caesar IA, Choria, Colobot, Corsix Theme Hospital, DNT, Doxygen, EasyRPG Player, Egoboo, Flare Engine, Free Orion, FreeRCT, FreeSynd, FreeType, Freeserf, HarfBuzz, LÖVE, Mana, Maratis, Mechanized Assault & eXploration Reloaded , MegaGlest, OGRE3D, Open AL Soft, Open Tibia, OpenRCT2, OpenXcom, Pingus, Polycode, Simple DirectMedia Layer, Simple and Fast Multimedia Library, Solarus, Speed Dreams, Spring RTS engine, Trinity Reign, Ufo: Alien Invasion, Urho3D, Valyria Tear, Warzone 2100, Widelands, XU4, mkxp, xoreos, yaml-cpp, zlib
 
+## Platform
+
+##### Platforms frequency
+
+- Android (33.3%)
+- Linux (26.7%)
+- Windows (23.3%)
+- macOS (16.7%)
+
diff --git a/games/strategy/a_planets_revenge.md b/games/strategy/a_planets_revenge.md
index a4a1cee8..cde1c2d8 100644
--- a/games/strategy/a_planets_revenge.md
+++ b/games/strategy/a_planets_revenge.md
@@ -5,7 +5,7 @@ _A text-based, turn-based strategy game set in space. It is similar to a 4X game
 - Home: https://sourceforge.net/projects/aplanetsrevenge/
 - State: beta, inactive since 2008
 - Download: https://sourceforge.net/projects/aplanetsrevenge/files/aplanetsrevenge/apr-1.0-alpha/
-- Code repository: https://gitlab.com/Trilarion/aplanetsrevenge.git (copy of last source release)
+- Code repository: https://gitlab.com/osgames/aplanetsrevenge.git (copy of last source release)
 - Code language: Python
 - Code license: GPL-3.0
 
diff --git a/games/strategy/alien_assault_traders.md b/games/strategy/alien_assault_traders.md
index 68801a5a..e0a6d13e 100644
--- a/games/strategy/alien_assault_traders.md
+++ b/games/strategy/alien_assault_traders.md
@@ -6,7 +6,7 @@ _Alien Assault Traders is an online, web-based, turn-based strategy space tradin
 - State: beta, inactive since 2009
 - Download: https://sourceforge.net/projects/aatrade/files/
 - Keywords: online
-- Code repository: https://github.com/tarnus/aatraders.git, https://gitlab.com/Trilarion/aatraders.git (+)
+- Code repository: https://github.com/tarnus/aatraders.git, https://gitlab.com/osgames/aatraders.git (+)
 - Code language: PHP
 - Code license: GPL-2.0
 
diff --git a/games/strategy/antichess.md b/games/strategy/antichess.md
index 59a819a3..7971b9cb 100644
--- a/games/strategy/antichess.md
+++ b/games/strategy/antichess.md
@@ -5,7 +5,7 @@ _AntiChess is an anti chess game. You have to take your opponents piece if you c
 - Home: https://sourceforge.net/projects/antichess/
 - State: mature, inactive since 2003
 - Download: https://sourceforge.net/projects/antichess/files/antichess/1.0/
-- Code repository: https://gitlab.com/Trilarion/antichess.git (backup of cvs), http://antichess.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/antichess.git (backup of cvs), http://antichess.cvs.sourceforge.net/ (cvs)
 - Code language: Java
 - Code license: MIT
 
diff --git a/games/strategy/armies.md b/games/strategy/armies.md
index 0fd63d1f..57c4520d 100644
--- a/games/strategy/armies.md
+++ b/games/strategy/armies.md
@@ -5,7 +5,7 @@ _Turn based strategy game. It has simple and well designed rules._
 - Home: https://sourceforge.net/projects/armies/
 - State: mature, inactive since 2007
 - Download: https://sourceforge.net/projects/armies/files/
-- Code repository: https://github.com/Trilarion/armies.git (backup of source release)
+- Code repository: https://gitlab.com/osgames/armies.git (backup of source release)
 - Code language: C++
 - Code license: GPL-3.0
 
diff --git a/games/strategy/attal.md b/games/strategy/attal.md
index 201a9fcb..6ada6954 100644
--- a/games/strategy/attal.md
+++ b/games/strategy/attal.md
@@ -6,7 +6,7 @@ _Themeable turn-based strategy game._
 - State: mature, inactive since 2008
 - Download: https://sourceforge.net/projects/attal/files/Attal/
 - Keywords: TBS
-- Code repository: https://gitlab.com/Trilarion/attal.git (backup of cvs), http://attal.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/attal.git (backup of cvs), http://attal.cvs.sourceforge.net/ (cvs)
 - Code language: C++
 - Code license: GPL-2.0
 
diff --git a/games/strategy/blacknova_traders.md b/games/strategy/blacknova_traders.md
index 2f4d8bf6..6eaf5883 100644
--- a/games/strategy/blacknova_traders.md
+++ b/games/strategy/blacknova_traders.md
@@ -5,7 +5,7 @@ _Web-based, multi-player space exploration game inspired by the popular BBS game
 - Home: https://sourceforge.net/projects/blacknova/, https://blacknova.net/
 - State: beta, inactive since 2012
 - Download: https://sourceforge.net/projects/blacknova/files
-- Code repository: https://github.com/Trilarion/blacknova.git (backup of svn), https://svn.code.sf.net/p/blacknova/code/ (svn)
+- Code repository: https://gitlab.com/osgames/blacknova.git (backup of svn), https://svn.code.sf.net/p/blacknova/code/ (svn)
 - Code language: PHP, JavaScript
 - Code license: GPL-2.0
 
diff --git a/games/strategy/blitzkrieg.md b/games/strategy/blitzkrieg.md
index 00618d84..e7a4d21b 100644
--- a/games/strategy/blitzkrieg.md
+++ b/games/strategy/blitzkrieg.md
@@ -5,7 +5,7 @@ _Little turn-based strategy game based on Pendulous shareware rules._
 - Home: https://sourceforge.net/projects/blitzkrieg/
 - State: beta, inactive since 2012
 - Download: https://sourceforge.net/projects/blitzkrieg/files/developpement/
-- Code repository: https://gitlab.com/Trilarion/blitzkrieg.git(backup of cvs), http://blitzkrieg.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/blitzkrieg.git(backup of cvs), http://blitzkrieg.cvs.sourceforge.net/ (cvs)
 - Code language: Java
 - Code license: GPL-3.0
 
diff --git a/games/strategy/boson.md b/games/strategy/boson.md
index 6864aa29..62a7af10 100644
--- a/games/strategy/boson.md
+++ b/games/strategy/boson.md
@@ -5,7 +5,7 @@ _OpenGL real-time strategy game._
 - Home: http://boson.sourceforge.net/index.php, https://sourceforge.net/projects/boson/
 - State: beta, inactive since 2006
 - Download: http://boson.sourceforge.net/download.php, https://sourceforge.net/projects/boson/files
-- Code repository: https://github.com/Trilarion/boson.git (backup of svn), https://svn.code.sf.net/p/boson/code/ (svn)
+- Code repository: https://gitlab.com/osgames/boson.git (backup of svn), https://svn.code.sf.net/p/boson/code/ (svn)
 - Code language: C++
 - Code license: GPL-2.0
 
diff --git a/games/strategy/caesar_ia.md b/games/strategy/caesar_ia.md
index f6d56681..addeff5f 100644
--- a/games/strategy/caesar_ia.md
+++ b/games/strategy/caesar_ia.md
@@ -5,7 +5,7 @@ _Remake of the popular citybuilder/economic strategy - Caesar III, videogame by
 - Home: https://bitbucket.org/dalerank/caesaria/overview, https://bitbucket.org/dalerank/caesaria/wiki/Home
 - State: beta
 - Download: https://bitbucket.org/dalerank/caesaria/wiki/Releases
-- Platform: Windows, Linux, MacOs
+- Platform: Windows, Linux, macOS
 - Code repository: https://bitbucket.org/dalerank/caesaria.git
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/strategy/civil.md b/games/strategy/civil.md
index 418a9ad2..14005c6e 100644
--- a/games/strategy/civil.md
+++ b/games/strategy/civil.md
@@ -5,10 +5,10 @@ _A cross-platform, turn-based, networked strategy game._
 - Home: http://civil.sourceforge.net/, https://sourceforge.net/projects/civil/
 - State: beta, inactive since 2003
 - Download: http://civil.sourceforge.net/download.html
-- Code repository: https://gitlab.com/Trilarion/civil.git (backup of cvs), http://civil.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/civil.git (backup of cvs), http://civil.cvs.sourceforge.net/ (cvs)
 - Code language: Python
 - Code license: GPL-2.0
 
-+ Follow-up: https://github.com/Trilarion/civil
++ Follow-up: https://gitlab.com/Trilarion/civil
 
 ## Building
diff --git a/games/strategy/colonization_too.md b/games/strategy/colonization_too.md
index a6ca08d9..05dddbdc 100644
--- a/games/strategy/colonization_too.md
+++ b/games/strategy/colonization_too.md
@@ -5,7 +5,7 @@ _Design and develop of a sequel to the original game._
 - Home: https://sourceforge.net/projects/coltoo/
 - State: beta, inactive since 2004
 - Download: https://sourceforge.net/projects/coltoo/files/
-- Code repository: https://gitlab.com/Trilarion/coltoo.git (backup of cvs), http://coltoo.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/coltoo.git (backup of cvs), http://coltoo.cvs.sourceforge.net/ (cvs)
 - Code language: C++
 - Code license: GPL-2.0
 
diff --git a/games/strategy/conquests.md b/games/strategy/conquests.md
index e4c891db..9e6d3d4d 100644
--- a/games/strategy/conquests.md
+++ b/games/strategy/conquests.md
@@ -5,7 +5,7 @@ _4X game, similar to the Civilization series of games._
 - Home: http://conquests.sourceforge.net/, https://sourceforge.net/projects/conquests
 - State: mature, inactive since 2012
 - Download: https://launchpad.net/conquests/+download
-- Code repository: https://gitlab.com/Trilarion/conquests.git
+- Code repository: https://gitlab.com/osgames/conquests.git (archive)
 - Code language: C++
 - Code license: GPL-2.0
 
diff --git a/games/strategy/crimson_fields.md b/games/strategy/crimson_fields.md
index 8aee66b1..c9032c2a 100644
--- a/games/strategy/crimson_fields.md
+++ b/games/strategy/crimson_fields.md
@@ -6,7 +6,7 @@ _Turn-based tactical war game._
 - State: mature, inactive since 2010
 - Download: http://crimson.seul.org/download.php
 - Keywords: TBS
-- Code repository: https://gitlab.com/Trilarion/crimson.git (import of cvs), http://crimson.seul.org/cvs.php (cvs)
+- Code repository: https://gitlab.com/osgames/crimson.git (import of cvs), http://crimson.seul.org/cvs.php (cvs)
 - Code language: C++
 - Code license: GPL-2.0
 
diff --git a/games/strategy/crown_and_cutlass.md b/games/strategy/crown_and_cutlass.md
index bf068b03..cf4eb098 100644
--- a/games/strategy/crown_and_cutlass.md
+++ b/games/strategy/crown_and_cutlass.md
@@ -5,7 +5,7 @@ _3d pirate action/adventure game in the spirit of the old Pirates! game._
 - Home: http://www.crownandcutlass.com/, https://sourceforge.net/projects/crownandcutlass/
 - State: beta, inactive since 2009
 - Download: https://sourceforge.net/projects/crownandcutlass/files/crownandcutlass/
-- Code repository: https://github.com/Trilarion/crownandcutlass.git (backup of svn), https://svn.code.sf.net/p/crownandcutlass/code/ (svn)
+- Code repository: https://gitlab.com/osgames/crownandcutlass.git (backup of svn), https://svn.code.sf.net/p/crownandcutlass/code/ (svn)
 - Code language: C++
 - Code license: Custom (similar to BSD)
 
diff --git a/games/strategy/dark_oberon.md b/games/strategy/dark_oberon.md
index 0688aeef..93555ddd 100644
--- a/games/strategy/dark_oberon.md
+++ b/games/strategy/dark_oberon.md
@@ -6,7 +6,7 @@ _Real-time strategy game similar to Warcraft II._
 - State: mature, inactive since 2009
 - Download: http://dark-oberon.sourceforge.net/?page=download
 - Keywords: RTS
-- Code repository: https://github.com/Trilarion/dark-oberon.git (backup of svn), https://svn.code.sf.net/p/dark-oberon/code/ (svn)
+- Code repository: https://gitlab.com/osgames/dark-oberon.git (backup of svn), https://svn.code.sf.net/p/dark-oberon/code/ (svn)
 - Code language: C++
 - Code license: GPL-2.0
 - Code dependencies: SDL
diff --git a/games/strategy/devana.md b/games/strategy/devana.md
index 01987c62..2c99d0f4 100644
--- a/games/strategy/devana.md
+++ b/games/strategy/devana.md
@@ -6,7 +6,7 @@ _Browser strategy game._
 - State: beta
 - Download: https://sourceforge.net/projects/devana/files
 - Keywords: browser
-- Code repository: https://gitlab.com/Trilarion/devana.git (snapshot of source releases)
+- Code repository: https://gitlab.com/osgames/devana.git (snapshot of source releases)
 - Code language: PHP
 - Code license: zlib
 
diff --git a/games/strategy/duel_commander.md b/games/strategy/duel_commander.md
index cd939c1f..ff5f8aca 100644
--- a/games/strategy/duel_commander.md
+++ b/games/strategy/duel_commander.md
@@ -6,7 +6,7 @@ _Turn based command line fighting game for Windows and Unix-like systems._
 - State: beta, inactive since 2009
 - Download: https://sourceforge.net/projects/duelcommander/files
 - Keywords: text-based
-- Code repository: https://gitlab.com/Trilarion/duelcommander.git (snapshot of source releases)
+- Code repository: https://gitlab.com/osgames/duelcommander.git (snapshot of source releases)
 - Code language: C
 - Code license: GPL-3.0
 
diff --git a/games/strategy/free_mars.md b/games/strategy/free_mars.md
index ea6879fa..7ac2044d 100644
--- a/games/strategy/free_mars.md
+++ b/games/strategy/free_mars.md
@@ -5,7 +5,7 @@ _Turn based free strategy game about colonizing Mars._
 - Home: https://sourceforge.net/projects/freemars
 - State: mature
 - Download: https://sourceforge.net/projects/freemars/files
-- Platform: Windows, Linux, MacOs
+- Platform: Windows, Linux, macOS
 - Keywords: TB
 - Code repository: https://svn.code.sf.net/p/freemars/code/ (svn)
 - Code language: Java
diff --git a/games/strategy/galaxyng.md b/games/strategy/galaxyng.md
index a266d515..78919435 100644
--- a/games/strategy/galaxyng.md
+++ b/games/strategy/galaxyng.md
@@ -6,7 +6,7 @@ _Play by email interstellar wargame for multiple players._
 - State: mature, inactive since 2005
 - Download: https://sourceforge.net/projects/galaxyng/files
 - Keywords: TBS
-- Code repository: https://gitlab.com/Trilarion/galaxyng.git(backup of cvs), http://galaxyng.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/galaxyng.git(backup of cvs), http://galaxyng.cvs.sourceforge.net/ (cvs)
 - Code language: C
 - Code license: GPL-2.0
 
diff --git a/games/strategy/glest.md b/games/strategy/glest.md
index d7c84c95..132b1809 100644
--- a/games/strategy/glest.md
+++ b/games/strategy/glest.md
@@ -7,7 +7,7 @@ _Glest is a free 3D real-time strategy game._
 - State: mature, inactive since 2009
 - Download: http://glest.org/en/downloads.php
 - Keywords: RTS 
-- Code repository: https://github.com/Trilarion/glest.git (backup of svn), https://svn.code.sf.net/p/glest/code/ (svn)
+- Code repository: https://gitlab.com/osgames/glest.git (backup of svn), https://svn.code.sf.net/p/glest/code/ (svn)
 - Code language: C++
 - Code license: GPL-2.0
 
diff --git a/games/strategy/greenius_civil_war.md b/games/strategy/greenius_civil_war.md
index 657c7355..1ff30e70 100644
--- a/games/strategy/greenius_civil_war.md
+++ b/games/strategy/greenius_civil_war.md
@@ -4,7 +4,7 @@ _Open Sourced version of American Civil War game for DOS, originally developed b
 
 - Home: http://civilwar.sourceforge.net/, https://sourceforge.net/projects/civilwar/, https://www.greenius.co.uk/personal/steven/civilwar.html
 - State: beta, inactive since 2001
-- Code repository: https://gitlab.com/Trilarion/civilwar.git (backup of cvs), https://sourceforge.net/p/civilwar/code/ (cvs)
+- Code repository: https://gitlab.com/osgames/civilwar.git (backup of cvs), https://sourceforge.net/p/civilwar/code/ (cvs)
 - Code language: C++
 - Code license: GPL-2.0
 
diff --git a/games/strategy/heroes_of_wing_commander.md b/games/strategy/heroes_of_wing_commander.md
index 3e01dda4..15a05aff 100644
--- a/games/strategy/heroes_of_wing_commander.md
+++ b/games/strategy/heroes_of_wing_commander.md
@@ -5,7 +5,7 @@ _A fan base strategy game based on the Origin's Wing Commander universe._
 - Home: https://sourceforge.net/projects/howc/
 - State: beta, inactive since 2014
 - Download: https://sourceforge.net/projects/howc/files
-- Code repository: https://github.com/Trilarion/howc.git (backup of svn), https://svn.code.sf.net/p/howc/code/ (svn)
+- Code repository: https://gitlab.com/osgames/howc.git (backup of svn), https://svn.code.sf.net/p/howc/code/ (svn)
 - Code language: Python
 - Code license: GPL-3.0
 
diff --git a/games/strategy/jquest.md b/games/strategy/jquest.md
index 4f0b2d58..aaf1f356 100644
--- a/games/strategy/jquest.md
+++ b/games/strategy/jquest.md
@@ -5,7 +5,7 @@ _Java-based clone of the turn-based strategy game Konquest (developed by Russ St
 - Home: https://sourceforge.net/projects/jquest
 - State: beta, inactive since 2006
 - Download: https://sourceforge.net/projects/jquest/files
-- Code repository: https://github.com/Trilarion/jquest.git (archive of source releases)
+- Code repository: https://gitlab.com/osgames/jquest.git (archive of source releases)
 - Code language: Java
 - Code license: GPL-2.0
 
diff --git a/games/strategy/machinations.md b/games/strategy/machinations.md
index 945a1ff7..aedb6f00 100644
--- a/games/strategy/machinations.md
+++ b/games/strategy/machinations.md
@@ -5,7 +5,7 @@ _3D RTS game similar to Starcraft and Total Annihilation._
 - Home: http://machinations.sourceforge.net/index.php, https://sourceforge.net/projects/machinations/
 - State: beta, inactive since 2003
 - Download: https://sourceforge.net/projects/machinations/
-- Code repository: https://gitlab.com/Trilarion/machinations.git(backup of cvs), http://machinations.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/machinations.git(backup of cvs), http://machinations.cvs.sourceforge.net/ (cvs)
 - Code language: C++
 - Code license: GPL-2.0
 
diff --git a/games/strategy/mars_land_of_no_mercy.md b/games/strategy/mars_land_of_no_mercy.md
index 7c99ba3e..a7a6933c 100644
--- a/games/strategy/mars_land_of_no_mercy.md
+++ b/games/strategy/mars_land_of_no_mercy.md
@@ -6,7 +6,7 @@ _Lead a mercenary team hired to go on Mars and fight with different factions usi
 - State: beta, inactive since 2008
 - Download: https://sourceforge.net/projects/mars/files
 - Keywords: TBS
-- Code repository: https://github.com/Trilarion/mars.git (backup of svn), https://svn.code.sf.net/p/mars/code/ (svn)
+- Code repository: https://gitlab.com/osgames/mars.git (backup of svn), https://svn.code.sf.net/p/mars/code/ (svn)
 - Code language: C++
 - Code license: GPL-2.0
 
diff --git a/games/strategy/mercenary_commander.md b/games/strategy/mercenary_commander.md
index 2f9e1740..123f92fd 100644
--- a/games/strategy/mercenary_commander.md
+++ b/games/strategy/mercenary_commander.md
@@ -5,7 +5,7 @@ _Turn based strategy, with simultaneous turns._
 - Home: https://code.google.com/archive/p/mercenarycommander/
 - State: beta, inactive since 2010
 - Platform: Android
-- Code repository: https://gitlab.com/Trilarion/mercenarycommander.git (snapshot svn)
+- Code repository: https://gitlab.com/osgames/mercenarycommander.git (snapshot svn)
 - Code language: Java
 - Code license: 3-clause BSD
 
diff --git a/games/strategy/metal_mech.md b/games/strategy/metal_mech.md
index d376e253..cd27444c 100644
--- a/games/strategy/metal_mech.md
+++ b/games/strategy/metal_mech.md
@@ -5,7 +5,7 @@ _Online multiplayer turn-based war game._
 - Home: https://sourceforge.net/projects/metalmech/
 - State: beta, inactive since 2006
 - Download: https://sourceforge.net/projects/metalmech/files
-- Code repository: https://gitlab.com/Trilarion/metalmech.git (backup of cvs), http://metalmech.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/metalmech.git (backup of cvs), http://metalmech.cvs.sourceforge.net/ (cvs)
 - Code language: PHP
 - Code license: GPL-2.0
 
diff --git a/games/strategy/operation_citadel.md b/games/strategy/operation_citadel.md
index 88b0b6fe..6a67f653 100644
--- a/games/strategy/operation_citadel.md
+++ b/games/strategy/operation_citadel.md
@@ -5,7 +5,7 @@ _A WWII, turn based platoon, company level war game on the Eastern Front._
 - Home: http://kursk.sourceforge.net/, https://sourceforge.net/projects/kursk
 - State: beta, inactive since 2000
 - Download: https://sourceforge.net/projects/kursk/files
-- Code repository: https://gitlab.com/Trilarion/kursk.git (snapshot of source releases)
+- Code repository: https://gitlab.com/osgames/kursk.git (snapshot of source releases)
 - Code language: C++
 - Code license: GPL-2.0
 
diff --git a/games/strategy/pizza_business.md b/games/strategy/pizza_business.md
index cdadfa5b..3db809fd 100644
--- a/games/strategy/pizza_business.md
+++ b/games/strategy/pizza_business.md
@@ -5,7 +5,7 @@ _Start and control a pizza business / pizza restaurants, limited to a budget._
 - Home: http://pizza-business.sourceforge.net/, https://sourceforge.net/projects/pizza-business/
 - State: mature, inactive since 2003
 - Download: https://sourceforge.net/projects/pizza-business/files
-- Code repository: https://gitlab.com/Trilarion/pizza-business.git (backup of cvs), http://pizza-business.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/pizza-business.git (backup of cvs), http://pizza-business.cvs.sourceforge.net/ (cvs)
 - Code language: C++
 - Code license: GPL-2.0
 - Code dependencies: wxWidgets
diff --git a/games/strategy/planetary_hoppers.md b/games/strategy/planetary_hoppers.md
index adc02063..4730d24c 100644
--- a/games/strategy/planetary_hoppers.md
+++ b/games/strategy/planetary_hoppers.md
@@ -5,7 +5,7 @@ _Multiplayer space strategy game._
 - Home: https://sourceforge.net/projects/planets/, http://planets.sourceforge.net/
 - State: beta, inactive since 2003
 - Download: https://sourceforge.net/projects/planets/files
-- Code repository: https://gitlab.com/Trilarion/planets.git (backup of cvs), http://planets.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/planets.git (backup of cvs), http://planets.cvs.sourceforge.net/ (cvs)
 - Code language: Java
 - Code license: GPL-2.0
 
diff --git a/games/strategy/promisance.md b/games/strategy/promisance.md
index a8b33500..8c8e5331 100644
--- a/games/strategy/promisance.md
+++ b/games/strategy/promisance.md
@@ -5,7 +5,7 @@ _Web-based turn-based strategy game._
 - Home: https://sourceforge.net/projects/promisance/, http://promisance.sourceforge.net/
 - State: mature, inactive since 2004
 - Download: https://sourceforge.net/projects/promisance/files
-- Code repository: https://gitlab.com/Trilarion/promisance-cvs.git (backup of cvs), http://promisance.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/promisance-cvs.git (backup of cvs), http://promisance.cvs.sourceforge.net/ (cvs)
 - Code language: PHP
 - Code license: GPL-2.0
 
diff --git a/games/strategy/sharpkonquest.md b/games/strategy/sharpkonquest.md
index b9075338..45524fd7 100644
--- a/games/strategy/sharpkonquest.md
+++ b/games/strategy/sharpkonquest.md
@@ -5,7 +5,7 @@ _C# implementation of the classic Linux game "Konquest"._
 - Home: https://sourceforge.net/projects/sharpkonquest/
 - State: mature, inactive since 2007
 - Download: https://sourceforge.net/projects/sharpkonquest/files/
-- Code repository: https://gitlab.com/Trilarion/sharpkonquest.git (snapshot of source releases)
+- Code repository: https://gitlab.com/osgames/sharpkonquest.git (snapshot of source releases)
 - Code language: C#
 - Code license: GPL-2.0
 
diff --git a/games/strategy/skrupel.md b/games/strategy/skrupel.md
index 24f148ee..a90746fb 100644
--- a/games/strategy/skrupel.md
+++ b/games/strategy/skrupel.md
@@ -5,7 +5,7 @@ _Web-based cross between amazing games like, VGAPlanets, Ascendancy an for examp
 - Home: https://sourceforge.net/projects/skrupel/, http://skrupel.paradyze.org/doku.php (german)
 - State: mature, inactive since 2011
 - Download: https://sourceforge.net/projects/skrupel/files
-- Code repository: https://gitlab.com/Trilarion/skrupel.git(backup of cvs), http://skrupel.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/skrupel.git(backup of cvs), http://skrupel.cvs.sourceforge.net/ (cvs)
 - Code language: PHP, JavaScript
 - Code license: GPL-2.0
 
diff --git a/games/strategy/slay.md b/games/strategy/slay.md
index 300fbedb..4aaad280 100644
--- a/games/strategy/slay.md
+++ b/games/strategy/slay.md
@@ -5,7 +5,7 @@ _Simple but addictive turn based strategy game._
 - Home: https://sourceforge.net/projects/slaygame/, http://slaygame.sourceforge.net/
 - State: beta, inactive since 2010
 - Download: https://sourceforge.net/projects/slaygame/files
-- Code repository: https://gitlab.com/Trilarion/slaygame.git (snapshot of source releases)
+- Code repository: https://gitlab.com/osgames/slaygame.git (snapshot of source releases)
 - Code language: Java
 - Code license: GPL-3.0
 
diff --git a/games/strategy/space_opera.md b/games/strategy/space_opera.md
index 11a7cf6e..23c6ec12 100644
--- a/games/strategy/space_opera.md
+++ b/games/strategy/space_opera.md
@@ -5,7 +5,7 @@ _Space colonization game similar to 'Master of Orion' or 'Galactic Civilizations
 - Home: https://sourceforge.net/projects/spaceopera/, http://spaceopera.sourceforge.net/
 - State: beta, inactive since 2008
 - Download: https://sourceforge.net/projects/spaceopera/files
-- Code repository: https://github.com/Trilarion/spaceopera.git (backup of svn), https://svn.code.sf.net/p/spaceopera/code/ (svn)
+- Code repository: https://gitlab.com/osgames/spaceopera.git (backup of svn), https://svn.code.sf.net/p/spaceopera/code/ (svn)
 - Code language: Java
 - Code license: GPL-2.0
 
diff --git a/games/strategy/stareater.md b/games/strategy/stareater.md
index 568c3b21..526ec4f5 100644
--- a/games/strategy/stareater.md
+++ b/games/strategy/stareater.md
@@ -5,7 +5,7 @@ _4X strategy game in space_
 - Home: http://stareater4x.blogspot.com/, https://sourceforge.net/projects/zvjezdojedac/
 - State: beta
 - Download: https://github.com/subchannel13/Stareater/releases
-- Platform: Windows, Linux, MacOS
+- Platform: Windows, Linux, macOS
 - Keywords: TBS
 - Code repository: https://github.com/subchannel13/Stareater.git
 - Code language: C#
diff --git a/games/strategy/t_bots.md b/games/strategy/t_bots.md
index 43681704..88978e1e 100644
--- a/games/strategy/t_bots.md
+++ b/games/strategy/t_bots.md
@@ -5,7 +5,7 @@ _Robot battle game simulator._
 - Home: https://sourceforge.net/projects/tbots/
 - State: beta, inactive since 2004
 - Download: https://sourceforge.net/projects/tbots/files
-- Code repository: https://gitlab.com/Trilarion/tbots.git (backup of cvs), https://sourceforge.net/p/tbots/code (cvs)
+- Code repository: https://gitlab.com/osgames/tbots.git (backup of cvs), https://sourceforge.net/p/tbots/code (cvs)
 - Code language: C
 - Code license: GPL-2.0
 
diff --git a/games/strategy/wargamer.md b/games/strategy/wargamer.md
index 522425d8..c84469c0 100644
--- a/games/strategy/wargamer.md
+++ b/games/strategy/wargamer.md
@@ -5,7 +5,7 @@ _Open source development of the game Wargamer:Napoleon 1813 originally developed
 - Home: https://sourceforge.net/projects/wargamer/, http://wargamer.sourceforge.net/
 - State: mature, inactive since 2003
 - Download: https://sourceforge.net/projects/wargamer/files/
-- Code repository: https://gitlab.com/Trilarion/wargamer.git (backup of cvs), http://wargamer.cvs.sourceforge.net/ (cvs)
+- Code repository: https://gitlab.com/osgames/wargamer.git (backup of cvs), http://wargamer.cvs.sourceforge.net/ (cvs)
 - Code language: C++
 - Code license: GPL-2.0
 
diff --git a/games/strategy/watomic.md b/games/strategy/watomic.md
index f4051e22..effbdf9e 100644
--- a/games/strategy/watomic.md
+++ b/games/strategy/watomic.md
@@ -6,7 +6,7 @@ _Windows clone of Linux KAtomic logic game._
 - State: mature, inactive since 2005
 - Download: https://sourceforge.net/projects/watomic/files/
 - Keywords: remake
-- Code repository: https://gitlab.com/Trilarion/watomic.git (snapshot of source releases)
+- Code repository: https://gitlab.com/osgames/watomic.git (snapshot of source releases)
 - Code language: Pascal
 - Code license: GPL-2.0
 
diff --git a/games/strategy/world_of_heroes.md b/games/strategy/world_of_heroes.md
index 0c302b71..0be9ccb8 100644
--- a/games/strategy/world_of_heroes.md
+++ b/games/strategy/world_of_heroes.md
@@ -5,7 +5,7 @@ _2D turn based strategy game, where the player commands an army in the explorati
 - Home: https://sourceforge.net/projects/worldofheroes/
 - State: beta, inactive since 2009
 - Download: https://sourceforge.net/projects/worldofheroes/files/WOH%20v0.4.2/
-- Code repository: https://gitlab.com/Trilarion/worldofheroes.git (snapshot of source releases)
+- Code repository: https://gitlab.com/osgames/worldofheroes.git (snapshot of source releases)
 - Code language: Python
 - Code license: 3-clause BSD
 
diff --git a/games/strategy/x-force.md b/games/strategy/x-force.md
index d2d822c8..2cb2f1bb 100644
--- a/games/strategy/x-force.md
+++ b/games/strategy/x-force.md
@@ -6,7 +6,7 @@ _Remake of the classic X-Com-Games._
 - State: beta, inactive since 2011
 - Download: https://sourceforge.net/projects/xforceffd/files
 - Keywords: TBS
-- Code repository: https://github.com/Trilarion/xforceffd.git (backup of svn), https://svn.code.sf.net/p/xforceffd/code/ (svn)
+- Code repository: https://gitlab.com/osgames/xforceffd.git (backup of svn), https://svn.code.sf.net/p/xforceffd/code/ (svn)
 - Code language: Pascal
 - Code license: GPL-2.0
 
diff --git a/games/strategy/xarchon.md b/games/strategy/xarchon.md
index 5a9a9712..6dc9d579 100644
--- a/games/strategy/xarchon.md
+++ b/games/strategy/xarchon.md
@@ -5,7 +5,7 @@ _Modelled after the golden oldie Archon game created by Freefall Associates and
 - Home: http://xarchon.seul.org/
 - State: beta, inactive since 2003
 - Download: http://xarchon.seul.org/download.html
-- Code repository: https://gitlab.com/Trilarion/xarchon.git (import of cvs), http://cvs.seul.org:/home/cvspsrv/cvsroot (cvs)
+- Code repository: https://gitlab.com/osgames/xarchon.git (import of cvs), http://cvs.seul.org:/home/cvspsrv/cvsroot (cvs)
 - Code language: C, C++
 - Code license: GPL-2.0
 - Code dependencies: GTK, QT
diff --git a/games/strategy/xconq.md b/games/strategy/xconq.md
index 853c3735..960384cf 100644
--- a/games/strategy/xconq.md
+++ b/games/strategy/xconq.md
@@ -6,7 +6,7 @@ _General strategy game system._
 - Media: https://en.wikipedia.org/wiki/Xconq
 - State: mature, inactive since 2005
 - Download: https://sourceforge.net/projects/xconq/files/, https://sourceware.org/xconq/ftp.html
-- Code repository: https://gitlab.com/Trilarion/xconq.git (backup of cvs), https://sourceforge.net/p/xconq/code/ (cvs)
+- Code repository: https://gitlab.com/osgames/xconq.git (backup of cvs), https://sourceforge.net/p/xconq/code/ (cvs)
 - Code language: C++
 - Code license: GPL-2.0
 
diff --git a/tools/archives.json b/tools/archives.json
index 658aa99a..2dea5225 100644
--- a/tools/archives.json
+++ b/tools/archives.json
@@ -115,33 +115,8 @@
   "https://github.com/SupSuper/OpenXcom.git",
   "https://github.com/TVTower/TVTower.git",
   "https://github.com/TobiasBielefeld/Simple-Solitaire.git",
-  "https://github.com/Trilarion/armies.git",
-  "https://github.com/Trilarion/avanor.git",
-  "https://github.com/Trilarion/blacknova.git",
-  "https://github.com/Trilarion/boson.git",
-  "https://github.com/Trilarion/crownandcutlass.git",
-  "https://github.com/Trilarion/dark-oberon.git",
-  "https://github.com/Trilarion/deity.git",
-  "https://github.com/Trilarion/dungeonmap.git",
-  "https://github.com/Trilarion/endlessdungeons.git",
-  "https://github.com/Trilarion/eos-game.git",
-  "https://github.com/Trilarion/freetrain.git",
-  "https://github.com/Trilarion/glest.git",
-  "https://github.com/Trilarion/howc.git",
-  "https://github.com/Trilarion/jewelhunt.git",
-  "https://github.com/Trilarion/jquest.git",
-  "https://github.com/Trilarion/low.git",
-  "https://github.com/Trilarion/mars.git",
-  "https://github.com/Trilarion/monstrosity.git",
   "https://github.com/Trilarion/mpango.git",
-  "https://github.com/Trilarion/radakan.git",
-  "https://github.com/Trilarion/rpdungeon.git",
-  "https://github.com/Trilarion/sge2d.git",
-  "https://github.com/Trilarion/spaceopera.git",
   "https://github.com/Trilarion/spacetraderjava.git",
-  "https://github.com/Trilarion/ura-game.git",
-  "https://github.com/Trilarion/vegatrek.git",
-  "https://github.com/Trilarion/xforceffd.git",
   "https://github.com/Tuxemon/Tuxemon.git",
   "https://github.com/Vakarias/farcolony.git",
   "https://github.com/ValyriaTear/ValyriaTear.git",
@@ -319,62 +294,87 @@
   "https://github.com/xesf/twin-e.git",
   "https://github.com/xoreos/xoreos.git",
   "https://github.com/zaki/irrlicht.git",
-  "https://gitlab.com/Trilarion/aatraders.git",
-  "https://gitlab.com/Trilarion/antichess.git",
-  "https://gitlab.com/Trilarion/aplanetsrevenge.git",
-  "https://gitlab.com/Trilarion/attal.git",
-  "https://gitlab.com/Trilarion/blitzkrieg.git",
-  "https://gitlab.com/Trilarion/bmtactics.git",
-  "https://gitlab.com/Trilarion/civil.git",
-  "https://gitlab.com/Trilarion/civilwar.git",
-  "https://gitlab.com/Trilarion/coltoo.git",
-  "https://gitlab.com/Trilarion/conquests.git",
-  "https://gitlab.com/Trilarion/crimson.git",
-  "https://gitlab.com/Trilarion/devana.git",
-  "https://gitlab.com/Trilarion/digitalalovestory.git",
-  "https://gitlab.com/Trilarion/dragon-history.git",
-  "https://gitlab.com/Trilarion/dragon-hunt.git",
-  "https://gitlab.com/Trilarion/duelcommander.git",
-  "https://gitlab.com/Trilarion/dungeoncrawl.git",
-  "https://gitlab.com/Trilarion/galaxyng.git",
-  "https://gitlab.com/Trilarion/gm-tools.git",
-  "https://gitlab.com/Trilarion/gwiz.git",
-  "https://gitlab.com/Trilarion/h-world.git",
-  "https://gitlab.com/Trilarion/janag.git",
-  "https://gitlab.com/Trilarion/koboldsquest2.git",
-  "https://gitlab.com/Trilarion/kursk.git",
-  "https://gitlab.com/Trilarion/lechemindeladam.git",
-  "https://gitlab.com/Trilarion/lincity.git",
-  "https://gitlab.com/Trilarion/machinations.git",
-  "https://gitlab.com/Trilarion/mercenarycommander.git",
-  "https://gitlab.com/Trilarion/metalmech.git",
-  "https://gitlab.com/Trilarion/murderpd.git",
-  "https://gitlab.com/Trilarion/openrpgmaker.git",
-  "https://gitlab.com/Trilarion/orient.git",
-  "https://gitlab.com/Trilarion/phaosrpg.git",
-  "https://gitlab.com/Trilarion/pizza-business.git",
-  "https://gitlab.com/Trilarion/planets.git",
-  "https://gitlab.com/Trilarion/promisance-cvs.git",
-  "https://gitlab.com/Trilarion/pymapper.git",
-  "https://gitlab.com/Trilarion/rogueclone.git",
-  "https://gitlab.com/Trilarion/sentient-storage.git",
-  "https://gitlab.com/Trilarion/sharpkonquest.git",
-  "https://gitlab.com/Trilarion/skrupel.git",
-  "https://gitlab.com/Trilarion/slaygame.git",
-  "https://gitlab.com/Trilarion/spicetrade.git",
-  "https://gitlab.com/Trilarion/tbots.git",
-  "https://gitlab.com/Trilarion/theclans.git",
-  "https://gitlab.com/Trilarion/tuxracer.git",
-  "https://gitlab.com/Trilarion/uwadv.git",
-  "https://gitlab.com/Trilarion/wargamer.git",
-  "https://gitlab.com/Trilarion/watomic.git",
-  "https://gitlab.com/Trilarion/worldofheroes.git",
-  "https://gitlab.com/Trilarion/xarchon.git",
-  "https://gitlab.com/Trilarion/xconq.git",
-  "https://gitlab.com/Trilarion/zangband.git",
   "https://gitlab.com/evol/evol-all.git",
   "https://gitlab.com/freedroid/freedroid-src.git",
   "https://gitlab.com/manaplus/manaplus.git",
+  "https://gitlab.com/osgames/aatraders.git",
+  "https://gitlab.com/osgames/antichess.git",
+  "https://gitlab.com/osgames/aplanetsrevenge.git",
+  "https://gitlab.com/osgames/armies.git",
+  "https://gitlab.com/osgames/attal.git",
+  "https://gitlab.com/osgames/avanor.git",
+  "https://gitlab.com/osgames/blacknova.git",
+  "https://gitlab.com/osgames/blitzkrieg.git",
+  "https://gitlab.com/osgames/bmtactics.git",
+  "https://gitlab.com/osgames/boson.git",
+  "https://gitlab.com/osgames/civil.git",
+  "https://gitlab.com/osgames/civilwar.git",
+  "https://gitlab.com/osgames/coltoo.git",
+  "https://gitlab.com/osgames/conquests.git",
+  "https://gitlab.com/osgames/crimson.git",
+  "https://gitlab.com/osgames/crownandcutlass.git",
+  "https://gitlab.com/osgames/dark-oberon.git",
+  "https://gitlab.com/osgames/deity.git",
+  "https://gitlab.com/osgames/devana.git",
+  "https://gitlab.com/osgames/digitalalovestory.git",
+  "https://gitlab.com/osgames/dragon-history.git",
+  "https://gitlab.com/osgames/dragon-hunt.git",
+  "https://gitlab.com/osgames/duelcommander.git",
+  "https://gitlab.com/osgames/dungeoncrawl.git",
+  "https://gitlab.com/osgames/dungeonmap.git",
+  "https://gitlab.com/osgames/endlessdungeons.git",
+  "https://gitlab.com/osgames/eos-game.git",
+  "https://gitlab.com/osgames/freetrain.git",
+  "https://gitlab.com/osgames/galaxyng.git",
+  "https://gitlab.com/osgames/glest.git",
+  "https://gitlab.com/osgames/gm-tools.git",
+  "https://gitlab.com/osgames/gwiz.git",
+  "https://gitlab.com/osgames/h-world.git",
+  "https://gitlab.com/osgames/howc.git",
+  "https://gitlab.com/osgames/janag.git",
+  "https://gitlab.com/osgames/jewelhunt.git",
+  "https://gitlab.com/osgames/jquest.git",
+  "https://gitlab.com/osgames/koboldsquest2.git",
+  "https://gitlab.com/osgames/kursk.git",
+  "https://gitlab.com/osgames/lechemindeladam.git",
+  "https://gitlab.com/osgames/lincity.git",
+  "https://gitlab.com/osgames/low.git",
+  "https://gitlab.com/osgames/machinations.git",
+  "https://gitlab.com/osgames/mars.git",
+  "https://gitlab.com/osgames/mercenarycommander.git",
+  "https://gitlab.com/osgames/metalmech.git",
+  "https://gitlab.com/osgames/monstrosity.git",
+  "https://gitlab.com/osgames/murderpd.git",
+  "https://gitlab.com/osgames/openrpgmaker.git",
+  "https://gitlab.com/osgames/orient.git",
+  "https://gitlab.com/osgames/phaosrpg.git",
+  "https://gitlab.com/osgames/pizza-business.git",
+  "https://gitlab.com/osgames/planets.git",
+  "https://gitlab.com/osgames/promisance-cvs.git",
+  "https://gitlab.com/osgames/pymapper.git",
+  "https://gitlab.com/osgames/radakan.git",
+  "https://gitlab.com/osgames/rogueclone.git",
+  "https://gitlab.com/osgames/rpdungeon.git",
+  "https://gitlab.com/osgames/sentient-storage.git",
+  "https://gitlab.com/osgames/sge2d.git",
+  "https://gitlab.com/osgames/sharpkonquest.git",
+  "https://gitlab.com/osgames/skrupel.git",
+  "https://gitlab.com/osgames/slaygame.git",
+  "https://gitlab.com/osgames/spaceopera.git",
+  "https://gitlab.com/osgames/spicetrade.git",
+  "https://gitlab.com/osgames/tbots.git",
+  "https://gitlab.com/osgames/theclans.git",
+  "https://gitlab.com/osgames/tuxracer.git",
+  "https://gitlab.com/osgames/ura-game.git",
+  "https://gitlab.com/osgames/uwadv.git",
+  "https://gitlab.com/osgames/vegatrek.git",
+  "https://gitlab.com/osgames/wargamer.git",
+  "https://gitlab.com/osgames/watomic.git",
+  "https://gitlab.com/osgames/worldofheroes.git",
+  "https://gitlab.com/osgames/xarchon.git",
+  "https://gitlab.com/osgames/xconq.git",
+  "https://gitlab.com/osgames/xforceffd.git",
+  "https://gitlab.com/osgames/zangband.git",
   "https://gitlab.com/pingus/pingus.git",
   "https://gitlab.com/solarus-games/zsdx.git",
   "https://gitlab.com/xonotic/xonotic.git",
diff --git a/tools/maintenance.py b/tools/maintenance.py
index 91f78456..809f5b9d 100644
--- a/tools/maintenance.py
+++ b/tools/maintenance.py
@@ -314,12 +314,23 @@ def parse_entry(content):
         # store in info
         info[field.lower()] = v
 
-    # state must contain either beta or mature but not both
+    # state (essential field) must contain either beta or mature but not both, but at least one
     v = info['state']
+    for t in v:
+        if t != 'beta' and t != 'mature' and not t.startswith('inactive since '):
+            print('Error: Unknown state tage "{}" in entry "{}"'.format(t, info['title']))
+            return info # so that the rest can run through
     if 'beta' in v != 'mature' in v:
-        print('State must be one of <"beta", "mature"> in entry "{}"'.format(info['title']))
+        print('Error: State must be one of <"beta", "mature"> in entry "{}"'.format(info['title']))
         return info # so that the rest can run through
 
+    # extract inactive year
+    phrase = 'inactive since '
+    inactive_year = [x[len(phrase):] for x in v if x.startswith(phrase)]
+    assert len(inactive_year) <= 1
+    if inactive_year:
+        info['inactive'] = inactive_year[0]
+
     # urls in home, download, play and code repositories must start with http or https (or git) and should not contain space
     for field in ['home', 'download', 'play', 'code repository']:
         if field in info:
@@ -335,12 +346,13 @@ def parse_entry(content):
             if repo.startswith('https://github.com/') and not repo.endswith('.git'):
                 print('Github repo {} in entry "{}" should end on .git.'.format(repo, info['title']))
 
-    # extract inactive
-    phrase = 'inactive since '
-    inactive_year = [x[len(phrase):] for x in info['state'] if x.startswith(phrase)]
-    assert len(inactive_year) <= 1
-    if inactive_year:
-        info['inactive'] = inactive_year[0]
+    # check valid platform tags
+    valid_platforms = ('Android', 'Windows', 'Linux', 'macOS', 'Browser')
+    if 'platform' in info:
+        for platform in info['platform']:
+            if platform not in valid_platforms:
+                print('Error: invalid platform tag "{}" in entry "{}"'.format(platform, info['title']))
+                return info  # so that the rest can run through
 
     return info
 
@@ -551,6 +563,23 @@ def generate_statistics():
     c_cpp_project_not_cmake.sort()
     statistics += '##### C and C++ projects with a build system different from CMake ({})\n\n'.format(len(c_cpp_project_not_cmake)) + ', '.join(c_cpp_project_not_cmake) + '\n\n'
 
+    # Platform
+    statistics += '## Platform\n\n'
+    field = 'platform'
+
+    # get all platforms together
+    platforms = []
+    for info in infois:
+        if field in info:
+            platforms.extend(info[field])
+
+    unique_platforms = set(platforms)
+    unique_platforms = [(l, platforms.count(l) / len(platforms)) for l in unique_platforms]
+    unique_platforms.sort(key=lambda x: x[0]) # first sort by name
+    unique_platforms.sort(key=lambda x: -x[1]) # then sort by occurrence (highest occurrence first)
+    unique_platforms = ['- {} ({:.1f}%)'.format(x[0], x[1]*100) for x in unique_platforms]
+    statistics += '##### Platforms frequency\n\n' + '\n'.join(unique_platforms) + '\n\n'
+
     with open(statistics_path, mode='w', encoding='utf-8') as f:
         f.write(statistics)