diff --git a/README.md b/README.md
index 6c990e9b..bbeb26d8 100644
--- a/README.md
+++ b/README.md
@@ -3,17 +3,17 @@
 **[Dynamic HTML table](https://trilarion.github.io/opensourcegames/)** of the entries / Development **[Blog](https://trilarion.blogspot.com/search/label/osgames)** / **[Statistics](statistics.md#statistics)**
 
 [comment]: # (start of autogenerated content, do not edit)
-- **[All](games/_all.md#All)** (519)
+- **[All](games/_all.md#All)** (518)
 - **[Action](games/_action.md#action)** (70)
 - **[Arcade](games/_arcade.md#arcade)** (10)
 - **[Adventure](games/_adventure.md#adventure)** (14)
 - **[Visual novel](games/_visual-novel.md#visual-novel)** (4)
 - **[Sports](games/_sports.md#sports)** (8)
-- **[Platform](games/_platform.md#platform)** (2)
+- **[Platform](games/_platform.md#platform)** (3)
 - **[Puzzle](games/_puzzle.md#puzzle)** (19)
 - **[Role playing](games/_role-playing.md#role-playing)** (118)
 - **[Simulation](games/_simulation.md#simulation)** (33)
-- **[Strategy](games/_strategy.md#strategy)** (168)
+- **[Strategy](games/_strategy.md#strategy)** (167)
 - **[Card game](games/_card-game.md#card-game)** (1)
 - **[Board game](games/_board-game.md#board-game)** (9)
 - **[Music](games/_music.md#music)** (3)
diff --git a/docs/data.json b/docs/data.json
index ac5c2207..fd0728c0 100644
--- a/docs/data.json
+++ b/docs/data.json
@@ -13,7 +13,7 @@
    "0 A.D. is a free, open-source, cross-platform real-time..",
    "<a href=\"https://play0ad.com/download/\">Link</a>",
    "beta / active",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://github.com/0ad/0ad.git\">Source</a> - C, C++ - GPL-2.0"
   ],
   [
@@ -85,7 +85,7 @@
    "Alien Assault Traders is an online, web-based, turn-based..",
    "<a href=\"https://sourceforge.net/projects/aatrade/files/\">Link</a>",
    "beta / inactive since 2009",
-   "online, strategy",
+   "strategy, online",
    "<a href=\"https://github.com/tarnus/aatraders.git\">Source</a> - PHP - GPL-2.0"
   ],
   [
@@ -117,7 +117,7 @@
    "Single-player dungeon exploration game.",
    "<a href=\"http://rephial.org/release/\">Link</a>",
    "mature / active",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/angband/angband.git\">Source</a> - C - GPL-2.0"
   ],
   [
@@ -133,7 +133,7 @@
    "Port of the original Ares code base that was open sourced..",
    "",
    "beta / active",
-   "real time, shooter, strategy",
+   "strategy, real time, shooter",
    "<a href=\"https://github.com/arescentral/antares.git\">Source</a> - C++ - LGPL-3.0"
   ],
   [
@@ -157,7 +157,7 @@
    "Open Source FREE 2D MMORPG.",
    "<a href=\"http://www.comunidadargentum.com/descargas/\">Link</a>",
    "beta / inactive since 2014",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://github.com/Argentum-Online/Argentum-Online.git\">Source</a> - Visual Basic - GPL-2.0"
   ],
   [
@@ -165,7 +165,7 @@
    "An open source multiplayer online framework.",
    "<a href=\"https://arianne-project.org/engine/marauroa.html\">Link</a>",
    "mature / active",
-   "2D, framework, multiplayer",
+   "framework, 2D, multiplayer",
    "<a href=\"https://git.code.sf.net/p/arianne/marauroa\">Source</a> - Java - GPL-2.0"
   ],
   [
@@ -222,7 +222,7 @@
    "<a href=\"https://sourceforge.net/projects/atomiks/files\">Link</a>",
    "mature / inactive since 2015",
    "puzzle",
-   "<a href=\"https://svn.code.sf.net/p/atomiks/code/\">Source</a> - C - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/atomiks.git\">Source</a> - C - GPL-3.0"
   ],
   [
    "Atomix (<a href=\"https://github.com/GNOME/atomix\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/atomix.md\">entry</a>)",
@@ -261,7 +261,7 @@
    "Relatively easy to win but feature rich fantasy roguelike..",
    "<a href=\"https://sourceforge.net/projects/avanor/files\">Link</a>",
    "beta / inactive since 2008",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://gitlab.com/osgames/avanor.git\">Source</a> - C++, Lua - GPL-2.0"
   ],
   [
@@ -293,7 +293,7 @@
    "The Battle for Wesnoth is an open source, turn-based..",
    "<a href=\"http://www.wesnoth.org/#download\">Link</a>",
    "mature / active",
-   "multiplayer, strategy, turn-based",
+   "strategy, multiplayer, turn-based",
    "<a href=\"https://github.com/wesnoth/wesnoth.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -389,7 +389,7 @@
    "A match-3 game inspired by \"Tetris Attack\" but more PC..",
    "<a href=\"https://blockattack.net/download/\">Link</a>",
    "mature / active",
-   "match 3, puzzle, sliding blocks, tetris attack",
+   "puzzle, match 3, sliding blocks, tetris attack",
    "<a href=\"https://github.com/blockattack/blockattack-game.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -421,7 +421,7 @@
    "Futuristic real time strategy game (RTS).",
    "<a href=\"https://www.boswars.org/download.shtml\">Link</a>",
    "mature / inactive since 2013",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://github.com/OneSleepyDev/boswars_osd.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -445,7 +445,7 @@
    "Dual n-back brain training exercise.",
    "<a href=\"http://brainworkshop.sourceforge.net/download.html\">Link</a>",
    "mature / inactive since 2011",
-   "brain exercise, puzzle",
+   "puzzle, brain exercise",
    "<a href=\"https://gitlab.com/osgames/brain-workshop.git\">Source</a> - Python - GPL"
   ],
   [
@@ -453,7 +453,7 @@
    "A Massively Multiplayer Adventure.",
    "",
    "mature / active",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://github.com/mozilla/BrowserQuest.git\">Source</a> - JavaScript - MPL-2.0"
   ],
   [
@@ -461,7 +461,7 @@
    "Inspired by the once popular \"Battle Chess\" released by..",
    "<a href=\"https://sourceforge.net/projects/brutalchess/files/\">Link</a>",
    "beta / inactive since 2007",
-   "chess, strategy",
+   "strategy, chess",
    "<a href=\"https://gitlab.com/osgames/brutalchess.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -525,7 +525,7 @@
    "Online text-based role-playing game featuring ASCII art.",
    "",
    "mature / inactive since 2013",
-   "asciiart, role playing, text-based",
+   "role playing, asciiart, text-based",
    "<a href=\"https://github.com/candybox2/candybox2.github.io.git\">Source</a> - Typescript, Javascript - GPL-3.0"
   ],
   [
@@ -541,7 +541,7 @@
    "3D and 2D game engine using modern Object Pascal.",
    "",
    "mature / active",
-   "framework, game engine",
+   "game engine, framework",
    "<a href=\"https://github.com/castle-engine/castle-engine.git\">Source</a> - Pascal - LGPL-2.0"
   ],
   [
@@ -549,7 +549,7 @@
    "Castle of the Winds remake.",
    "",
    "beta / active",
-   "remake, role playing",
+   "role playing, remake",
    "<a href=\"https://github.com/mordrax/cotwmtor.git\">Source</a> - JavaScript - MIT"
   ],
   [
@@ -565,7 +565,7 @@
    "Post-apocalyptic roguelike.",
    "",
    "beta / inactive since 2012",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/Whales/Cataclysm.git\">Source</a> - C++ - CC-BY-SA-3"
   ],
   [
@@ -573,7 +573,7 @@
    "Turn-based survival game set in a post-apocalyptic world.",
    "<a href=\"https://cataclysmdda.org/releases/\">Link</a>",
    "mature / active",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/CleverRaven/Cataclysm-DDA.git\">Source</a> - C++ - CC-BY-SA-3.0"
   ],
   [
@@ -653,7 +653,7 @@
    "Remake of the 1986 game They Stole a Million.",
    "<a href=\"https://sourceforge.net/projects/cosp/files/\">Link</a>",
    "beta / active",
-   "action/adventure, adventure",
+   "adventure, action/adventure",
    "<a href=\"https://github.com/vcosta/derclou.git\">Source</a> - C - Custom"
   ],
   [
@@ -661,7 +661,7 @@
    "Real-time strategy game, where you can program your units..",
    "<a href=\"https://colobot.info/download-colobot-gold/\">Link</a>",
    "mature / active",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://github.com/colobot/colobot.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
@@ -701,7 +701,7 @@
    "Two or more battle programs (called \"warriors\") compete..",
    "",
    "mature / active",
-   "programming, simulation",
+   "simulation, programming",
    "<a href=\"https://gitlab.com/osgames/corewar.git\">Source</a> - C, Java - GPL-2.0"
   ],
   [
@@ -709,7 +709,7 @@
    "Reimplementation of the 1997 Bullfrog business sim Theme..",
    "<a href=\"https://github.com/CorsixTH/CorsixTH/releases\">Link</a>",
    "mature / active",
-   "remake, requires original content, strategy",
+   "strategy, remake, requires original content",
    "<a href=\"https://github.com/CorsixTH/CorsixTH.git\">Source</a> - Lua, C++ - MIT"
   ],
   [
@@ -725,7 +725,7 @@
    "Cooperative multiplayer graphical RPG and adventure game.",
    "<a href=\"http://crossfire.real-time.com/download/index.html\">Link</a>",
    "mature / active",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://svn.code.sf.net/p/crossfire/code/\">Source</a> - C, Java - GPL-2.0"
   ],
   [
@@ -749,7 +749,7 @@
    "Graphical environment for DOSBox.",
    "<a href=\"http://dfendreloaded.sourceforge.net/Download.html\">Link</a>",
    "mature / inactive since 2015",
-   "frontend, tool",
+   "tool, frontend",
    "Pascal - GPL"
   ],
   [
@@ -765,7 +765,7 @@
    "Fast and furious coffee-break Roguelike game that is..",
    "<a href=\"https://drl.chaosforge.org/downloads\">Link</a>",
    "mature / active",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/ChaosForge/doomrl.git\">Source</a> - Lua, Pascal - GPL-2.0"
   ],
   [
@@ -773,7 +773,7 @@
    "Massively Multiplayer On-line Role-playing Game (MMORPG).",
    "<a href=\"https://www.daimonin.org/downloads/\">Link</a>",
    "mature / active",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://svn.code.sf.net/p/daimonin/code/\">Source</a> - C - GPL-2.0"
   ],
   [
@@ -789,7 +789,7 @@
    "Turn-based online space strategy game playable in internet..",
    "",
    "mature / inactive since 2016",
-   "massive multiplayer online, strategy",
+   "strategy, massive multiplayer online",
    "<a href=\"https://gitlab.com/osgames/darkdestiny.git\">Source</a> - Java, Javascript - GPL"
   ],
   [
@@ -797,7 +797,7 @@
    "Real-time strategy game similar to Warcraft II.",
    "<a href=\"http://dark-oberon.sourceforge.net/?page=download\">Link</a>",
    "mature / inactive since 2009",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://gitlab.com/osgames/dark-oberon.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -806,7 +806,7 @@
    "<a href=\"https://sourceforge.net/projects/darkcity/files/\">Link</a>",
    "mature / inactive since 2012",
    "role playing, text-based",
-   "<a href=\"https://svn.code.sf.net/p/darkcity/code/\">Source</a> - PHP - GPL-3.0"
+   "<a href=\"https://gitlab.com/osgames/darkcity.git\">Source</a> - PHP - GPL-3.0"
   ],
   [
    "Dash Engine (<a href=\"https://dash.circularstudios.com/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/dash.md\">entry</a>)",
@@ -829,7 +829,7 @@
    "Nintendo DS emulator.",
    "<a href=\"http://desmume.org/download/\">Link</a>",
    "mature / inactive since 2015",
-   "emulator, framework",
+   "framework, emulator",
    "<a href=\"https://github.com/TASVideos/desmume.git\">Source</a> - C, C++ - GPL-2.0"
   ],
   [
@@ -853,7 +853,7 @@
    "A cooperative multiplayer RPG and adventure game set in a..",
    "<a href=\"http://www.deliantra.net/play.html\">Link</a>",
    "mature / active",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"http://cvs.schmorp.de/deliantra/\">Source</a> - C - GPL-2.0"
   ],
   [
@@ -893,7 +893,7 @@
    "Is a bit like the well known board game of Risk or RisiKo.",
    "<a href=\"http://domination.sourceforge.net/download.shtml\">Link</a>",
    "mature / active",
-   "board game, risklike, strategy",
+   "strategy, board game, risklike",
    "<a href=\"https://svn.code.sf.net/p/domination/code/Domination\">Source</a> - Java - GPL-3.0"
   ],
   [
@@ -901,7 +901,7 @@
    "Tool for generating documentation from annotated C++..",
    "<a href=\"http://www.doxygen.nl/download.html\">Link</a>",
    "mature / active",
-   "library, source documentation generator, tool",
+   "tool, library, source documentation generator",
    "<a href=\"https://github.com/doxygen/doxygen.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -925,7 +925,7 @@
    "3D chess game.",
    "<a href=\"https://www.dreamchess.org/downloads\">Link</a>",
    "beta / active",
-   "board game, chess, strategy",
+   "strategy, board game, chess",
    "<a href=\"https://github.com/dreamchess/dreamchess.git\">Source</a> - C - GPL-3.0"
   ],
   [
@@ -941,7 +941,7 @@
    "Continuation of the classic real-time strategy game Dune..",
    "<a href=\"https://sourceforge.net/projects/dunedynasty\">Link</a>",
    "mature / inactive since 2014",
-   "requires original content, strategy",
+   "strategy, requires original content",
    "<a href=\"https://git.code.sf.net/p/dunedynasty/dunedynasty\">Source</a> - C - GPL-2.0"
   ],
   [
@@ -949,7 +949,7 @@
    "Clone of the good old Dune II by Westwood Studios.",
    "<a href=\"http://dune2themaker.fundynamic.com/?page_id=11\">Link</a>",
    "beta / active",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://github.com/Fundynamic/dune2themaker4j.git\">Source</a> - Java - MIT"
   ],
   [
@@ -957,7 +957,7 @@
    "Updated clone of Westwood Studios' Dune2 which uses data..",
    "<a href=\"http://dunelegacy.sourceforge.net/website/downloads.html\">Link</a>",
    "mature / active",
-   "requires original content, strategy",
+   "strategy, requires original content",
    "<a href=\"https://git.code.sf.net/p/dunelegacy/code\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -973,7 +973,7 @@
    "Roguelike adventure through dungeons filled with dangerous..",
    "<a href=\"http://crawl.develz.org/download.htm\">Link</a>",
    "mature / active",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/crawl/crawl.git\">Source</a> - C++, Lua - GPL-2.0"
   ],
   [
@@ -1013,7 +1013,7 @@
    "ENIGMA is a free development environment geared towards..",
    "<a href=\"https://enigma-dev.org/download.htm\">Link</a>",
    "mature / active",
-   "3D, framework",
+   "framework, 3D",
    "<a href=\"https://github.com/enigma-dev/enigma-dev.git\">Source</a> - C++, C - GPL-3.0"
   ],
   [
@@ -1021,7 +1021,7 @@
    "Multiplayer turn-based browser strategy game.",
    "",
    "beta / active",
-   "online, strategy",
+   "strategy, online",
    "<a href=\"https://github.com/tautvilas/epoh.git\">Source</a> - JavaScript - MIT"
   ],
   [
@@ -1037,7 +1037,7 @@
    "Football simulation game",
    "<a href=\"https://sourceforge.net/projects/etw/files/\">Link</a>",
    "mature / inactive since 2017",
-   "football, simulation",
+   "simulation, football",
    "<a href=\"https://svn.code.sf.net/p/etw/code/\">Source</a> - C - ?"
   ],
   [
@@ -1053,7 +1053,7 @@
    "A simulation of a true AI",
    "",
    "beta / active",
-   "singleplayer, strategy",
+   "strategy, singleplayer",
    "<a href=\"https://github.com/singularity/singularity.git\">Source</a> - Python - GPL-2.0"
   ],
   [
@@ -1061,7 +1061,7 @@
    "2D space trading and combat game similar to the classic..",
    "<a href=\"https://github.com/endless-sky/endless-sky/releases\">Link</a>",
    "mature / active",
-   "popular, role playing",
+   "role playing, popular",
    "<a href=\"https://github.com/endless-sky/endless-sky.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
@@ -1101,7 +1101,7 @@
    "Multiplayer, online role-playing game (MMORPG).",
    "<a href=\"http://www.eternal-lands.com/page/download.php\">Link</a>",
    "mature / active",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://github.com/raduprv/Eternal-Lands.git\">Source</a> - C, C++ - Custom"
   ],
   [
@@ -1125,7 +1125,7 @@
    "A homely MMORPG.",
    "<a href=\"http://evolonline.org/manaplus\">Link</a>",
    "mature / active",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://gitlab.com/evol/evol-all.git\">Source</a> - C - GPL-3.0"
   ],
   [
@@ -1181,7 +1181,7 @@
    "Port of the wonderful puzzle game Fish Fillets from ALTAR..",
    "<a href=\"http://fillets.sourceforge.net/download.php\">Link</a>",
    "mature / inactive since 2011",
-   "port, puzzle",
+   "puzzle, port",
    "<a href=\"https://git.code.sf.net/p/fillets/code-fillets-ng\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -1253,7 +1253,7 @@
    "FreeCol is a turn-based strategy game based on the old..",
    "<a href=\"http://www.freecol.org/download.html\">Link</a>",
    "mature / active",
-   "multiplayer, strategy, turn-based",
+   "strategy, multiplayer, turn-based",
    "<a href=\"https://git.code.sf.net/p/freecol/git\">Source</a> - Java - GPL-2.0"
   ],
   [
@@ -1269,7 +1269,7 @@
    "Game which captures the look, feel and gameplay of the..",
    "",
    "beta / inactive since 2016",
-   "inspired, strategy",
+   "strategy, inspired",
    "<a href=\"https://github.com/FreeRCT/FreeRCT.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -1277,7 +1277,7 @@
    "Real time MP strategy game where players compete to build..",
    "<a href=\"https://sourceforge.net/projects/freerails/files/jfreerails/\">Link</a>",
    "beta / active",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://sourceforge.net/p/freerails/code/\">Source</a> - Java - GPL-2.0"
   ],
   [
@@ -1285,7 +1285,7 @@
    "Reimplementation of the classic Bullfrog game, Syndicate.",
    "<a href=\"https://sourceforge.net/projects/freesynd/files/\">Link</a>",
    "beta / active",
-   "requires original content, strategy",
+   "strategy, requires original content",
    "<a href=\"https://svn.code.sf.net/p/freesynd/code/\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -1309,7 +1309,7 @@
    "Freeciv is a Free and Open Source empire-building strategy..",
    "<a href=\"http://www.freeciv.org/download.html\">Link</a>",
    "mature / active",
-   "multiplayer, strategy, turn-based",
+   "strategy, multiplayer, turn-based",
    "<a href=\"https://github.com/freeciv/freeciv.git\">Source</a> - C - GPL-2.0"
   ],
   [
@@ -1317,7 +1317,7 @@
    "Freeciv-web is a version of Freeciv playable online in any..",
    "",
    "mature / active",
-   "online, strategy, turn-based",
+   "strategy, online, turn-based",
    "<a href=\"https://github.com/freeciv/freeciv-web.git\">Source</a> - JavaScript, Java - AGPL-3.0"
   ],
   [
@@ -1325,7 +1325,7 @@
    "Dink Smallwood is an adventure/role-playing game, similar..",
    "<a href=\"https://www.gnu.org/software/freedink/get\">Link</a>",
    "mature / active",
-   "remake, role playing",
+   "role playing, remake",
    "<a href=\"https://git.savannah.gnu.org/git/freedink.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
@@ -1341,7 +1341,7 @@
    "Open source role playing game.",
    "<a href=\"http://www.freedroid.org/download/\">Link</a>",
    "mature / active",
-   "isometric, role playing, singleplayer",
+   "role playing, isometric, singleplayer",
    "<a href=\"https://gitlab.com/freedroid/freedroid-src.git\">Source</a> - C - GPL-2.0"
   ],
   [
@@ -1357,7 +1357,7 @@
    "Clone of the brilliant simulation game The Settlers 1 aka..",
    "<a href=\"https://github.com/freeserf/freeserf/releases\">Link</a>",
    "beta / active",
-   "remake, requires original content, strategy",
+   "strategy, remake, requires original content",
    "<a href=\"https://github.com/freeserf/freeserf.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
@@ -1461,7 +1461,7 @@
    "Roguelike mecha RPG series.",
    "<a href=\"http://www.gearheadrpg.com/downloads/\">Link</a>",
    "mature / active",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/jwvhewitt/gearhead-1.git\">Source</a> - Pascal - LGPL-2.1"
   ],
   [
@@ -1477,7 +1477,7 @@
    "GemRB is a portable open-source implementation of..",
    "<a href=\"http://www.gemrb.org/wiki/doku.php?id=download\">Link</a>",
    "mature / active",
-   "2D, framework, isometric",
+   "framework, 2D, isometric",
    "<a href=\"https://github.com/gemrb/gemrb.git\">Source</a> - C++, Python - GPL-2.0"
   ],
   [
@@ -1485,7 +1485,7 @@
    "A 2D real time strategy Mega-Lo-Mania-like god game.",
    "",
    "mature / active",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://git.code.sf.net/p/gigalomania/code\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -1493,7 +1493,7 @@
    "Glest is a free 3D real-time strategy game.",
    "<a href=\"http://glest.org/en/downloads.php\">Link</a>",
    "mature / inactive since 2009",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://gitlab.com/osgames/glest.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -1501,7 +1501,7 @@
    "Real-Time Strategy (RTS) game which reduces micro-..",
    "<a href=\"https://globulation2.org/wiki/Download_and_Install\">Link</a>",
    "mature / active",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://bitbucket.org/giszmo/glob2\">Source</a> - C++ - GPL-3.0"
   ],
   [
@@ -1517,7 +1517,7 @@
    "A roguelike OpenGL-based smooth-scrolling ASCII graphics..",
    "<a href=\"https://sourceforge.net/projects/goblinhack/files/\">Link</a>",
    "beta / inactive since 2009",
-   "roguelike, role playing, singleplayer",
+   "role playing, roguelike, singleplayer",
    "<a href=\"https://github.com/goblinhack/goblinhack.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -1533,7 +1533,7 @@
    "Conway's Game of Life and many other types of cellular..",
    "<a href=\"https://sourceforge.net/projects/golly/files/\">Link</a>",
    "mature / active",
-   "game of life, simulation",
+   "simulation, game of life",
    "<a href=\"https://git.code.sf.net/p/golly/code\">Source</a> - C++, Java - GPL-2.0"
   ],
   [
@@ -1557,7 +1557,7 @@
    "A real-time strategy programming game, in which you..",
    "",
    "mature / inactive since 2014",
-   "programming, simulation",
+   "simulation, programming",
    "<a href=\"http://hg.code.sf.net/p/grobots/trunk\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -1613,7 +1613,7 @@
    "Hero of Allacrost is a 2D role-playing game inspired by..",
    "<a href=\"https://bitbucket.org/allacrost/allacrost/downloads/\">Link</a>",
    "mature / active",
-   "2D, role playing, singleplayer",
+   "role playing, 2D, singleplayer",
    "<a href=\"https://bitbucket.org/allacrost/allacrost/src\">Source</a> - C++, Lua - GPL-2.0"
   ],
   [
@@ -1645,7 +1645,7 @@
    "Simple turn based, hexagon map, strategy game in the..",
    "",
    "beta / inactive since 2012",
-   "online, strategy, turn-based",
+   "strategy, online, turn-based",
    "<a href=\"https://github.com/mgfreshour/hexwar.git\">Source</a> - Ruby, JavaScript - MIT"
   ],
   [
@@ -1661,7 +1661,7 @@
    "2D isometric hack'n'slash game (action-rpg).",
    "<a href=\"https://sourceforge.net/projects/lechemindeladam/files\">Link</a>",
    "beta / inactive since 2013",
-   "action-rpg, role playing",
+   "role playing, action-rpg",
    "<a href=\"https://gitlab.com/osgames/lechemindeladam.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
@@ -1669,7 +1669,7 @@
    "Roguelike inspired by the puzzle game Deadly Rooms of..",
    "<a href=\"http://roguetemple.com/z/hyper/download.php\">Link</a>",
    "mature / active",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/zenorogue/hyperrogue.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -1677,7 +1677,7 @@
    "Free Open Source-MMORPG, with emphasis on real roleplay.",
    "<a href=\"http://illarion.org/illarion/de_java_download.php\">Link</a>",
    "mature / active",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://github.com/Illarion-eV/Illarion-Java.git\">Source</a> - C++, Java, Lua - GPL-3.0"
   ],
   [
@@ -1685,7 +1685,7 @@
    "A game of intergalactic exploration, warfare, and economics.",
    "<a href=\"https://empiredirectory.net/index.php/new-downloads\">Link</a>",
    "mature / active",
-   "console, role playing",
+   "role playing, console",
    "? - ?"
   ],
   [
@@ -1693,7 +1693,7 @@
    "Multi-player block-based sandbox building and digging game.",
    "<a href=\"https://code.google.com/archive/p/infiniminer/source/default/source\">Link</a>",
    "mature / inactive since 2016",
-   "blocks, sandbox, simulation",
+   "simulation, blocks, sandbox",
    "C# - MIT"
   ],
   [
@@ -1701,7 +1701,7 @@
    "The Irrlicht Engine is an open source high performance..",
    "<a href=\"http://irrlicht.sourceforge.net/?page_id=10\">Link</a>",
    "mature / active",
-   "3D, framework",
+   "framework, 3D",
    "<a href=\"https://github.com/zaki/irrlicht.git\">Source</a> - C++, C - zlib"
   ],
   [
@@ -1717,7 +1717,7 @@
    "Graphical roguelike game with advanced bodypart and..",
    "<a href=\"https://attnam.com/projects\">Link</a>",
    "beta / active",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/Attnam/ivan.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -1733,7 +1733,7 @@
    "Web-based version of the board game Settlers of Catan..",
    "<a href=\"https://sourceforge.net/projects/jsettlers/files/\">Link</a>",
    "mature / active",
-   "board game, strategy",
+   "strategy, board game",
    "<a href=\"https://github.com/jdmonin/JSettlers2.git\">Source</a> - Java - GPL-3.0"
   ],
   [
@@ -1749,7 +1749,7 @@
    "An improved, cross-platform, stable Jagged Alliance 2..",
    "",
    "mature / active",
-   "requires original content, strategy",
+   "strategy, requires original content",
    "<a href=\"https://github.com/ja2-stracciatella/ja2-stracciatella.git\">Source</a> - C++ - Custom"
   ],
   [
@@ -1789,7 +1789,7 @@
    "An unofficial fan-made mod for the game Knights and..",
    "<a href=\"http://www.kamremake.com/download/\">Link</a>",
    "mature / active",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://github.com/Kromster80/kam_remake.git\">Source</a> - Pascal - AGPL-3.0"
   ],
   [
@@ -1877,7 +1877,7 @@
    "Roguelike molded in the tradition of the early greats of..",
    "<a href=\"http://www.dungeoncrawl.org/?d\">Link</a>",
    "mature / inactive since 2006",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://gitlab.com/osgames/dungeoncrawl.git\">Source</a> - C - Custom"
   ],
   [
@@ -1933,7 +1933,7 @@
    "3D Game Engine",
    "<a href=\"https://github.com/nem0/LumixEngine/releases\">Link</a>",
    "beta / active",
-   "3D, framework",
+   "framework, 3D",
    "<a href=\"https://github.com/nem0/lumixengine.git\">Source</a> - C++ - MIT"
   ],
   [
@@ -1949,7 +1949,7 @@
    "Remake of the classic multiplayer economic strategy game..",
    "",
    "beta / inactive since 2015",
-   "remake, strategy",
+   "strategy, remake",
    "<a href=\"https://github.com/LionsPhil/mewl.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -1973,7 +1973,7 @@
    "Single-player fantasy card game played against a computer..",
    "<a href=\"https://github.com/magarena/magarena/releases/\">Link</a>",
    "mature / active",
-   "cards, role playing",
+   "role playing, cards",
    "<a href=\"https://github.com/magarena/magarena.git\">Source</a> - Java, Groovy - GPL-3.0"
   ],
   [
@@ -2021,7 +2021,7 @@
    "A remake of the old M.A.X. by Interplay from 1996.",
    "<a href=\"https://www.maxr.org/docs.php?id=3\">Link</a>",
    "beta / inactive since 2016",
-   "requires original content, strategy",
+   "strategy, requires original content",
    "<a href=\"http://git.maxr.org/maxr/maxr.git\">Source</a> - C++, C - GPL-2.0"
   ],
   [
@@ -2037,7 +2037,7 @@
    "MegaGlest is an entertaining free (freeware and free..",
    "<a href=\"https://megaglest.org/download\">Link</a>",
    "mature / active",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://github.com/MegaGlest/megaglest-source.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -2061,7 +2061,7 @@
    "A classic MMO.",
    "<a href=\"http://meridian59.com/play-now.php\">Link</a>",
    "mature / active",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://github.com/Meridian59/Meridian59.git\">Source</a> - C++, C - GPL-2.0"
   ],
   [
@@ -2093,7 +2093,7 @@
    "Micropolis is the open source version of SimCity Classic..",
    "",
    "mature / active",
-   "online, simulation",
+   "simulation, online",
    "<a href=\"https://github.com/simhacker/micropolis.git\">Source</a> - C++, Java, Python - GPL-3.0"
   ],
   [
@@ -2133,7 +2133,7 @@
    "Roguelike computer game inspired by J. R. R. Tolkien's..",
    "<a href=\"https://umoria.org/download/\">Link</a>",
    "mature / active",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/dungeons-of-moria/umoria.git\">Source</a> - C - GPL-3.0"
   ],
   [
@@ -2157,7 +2157,7 @@
    "Rewrite of Noah Morgan's classic roguelike game Larn from..",
    "<a href=\"https://github.com/nlarn/nlarn/releases\">Link</a>",
    "mature / active",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/nlarn/nlarn.git\">Source</a> - C, Lua - GPL-3.0"
   ],
   [
@@ -2173,7 +2173,7 @@
    "Single player dungeon exploration game that runs on a wide..",
    "<a href=\"https://www.nethack.org/common/index.html\">Link</a>",
    "mature / active",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/NetHack/NetHack.git\">Source</a> - C - Custom"
   ],
   [
@@ -2181,7 +2181,7 @@
    "An online multiplayer tactical warfare game.",
    "<a href=\"http://www.netpanzer.info/Download/\">Link</a>",
    "beta / active",
-   "multiplayer, online, real time, strategy",
+   "strategy, multiplayer, online, real time",
    "<a href=\"https://github.com/BackupTheBerlios/netpanzer-svn.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -2189,7 +2189,7 @@
    "Major League Baseball Simulation.",
    "<a href=\"https://sourceforge.net/projects/nsbb/files/\">Link</a>",
    "mature / active",
-   "simulation, sports",
+   "sports, simulation",
    "<a href=\"http://nsbb.cvs.sourceforge.net\">Source</a> - C - ?"
   ],
   [
@@ -2229,7 +2229,7 @@
    "Scene-oriented, flexible 3D engine written in C++.",
    "<a href=\"https://www.ogre3d.org/download/sdk\">Link</a>",
    "mature / active",
-   "3D, framework",
+   "framework, 3D",
    "<a href=\"https://github.com/OGRECave/ogre.git\">Source</a> - C++ - MIT"
   ],
   [
@@ -2237,7 +2237,7 @@
    "Prototype for an educational role-playing game for..",
    "<a href=\"https://sourceforge.net/projects/orient-ecircus/files\">Link</a>",
    "mature / inactive since 2009",
-   "educational, role playing",
+   "role playing, educational",
    "<a href=\"https://gitlab.com/osgames/orient.git\">Source</a> - C#, Java - GPL-2.0"
   ],
   [
@@ -2277,7 +2277,7 @@
    "Rebuild of the XCOM Apocalypse Engine.",
    "<a href=\"https://ci.appveyor.com/project/openapoc/openapoc\">Link</a>",
    "mature / active",
-   "requires original content, strategy",
+   "strategy, requires original content",
    "<a href=\"https://github.com/OpenApoc/OpenApoc.git\">Source</a> - C++ - MIT"
   ],
   [
@@ -2285,7 +2285,7 @@
    "Re-creation of the popular game \"Dune II\".",
    "<a href=\"https://github.com/OpenDUNE/OpenDUNE/releases\">Link</a>",
    "mature / active",
-   "remake, requires original content, strategy",
+   "strategy, remake, requires original content",
    "<a href=\"https://github.com/OpenDUNE/OpenDUNE.git\">Source</a> - C - GPL-2.0"
   ],
   [
@@ -2293,7 +2293,7 @@
    "Game engine and editor.",
    "<a href=\"https://sourceforge.net/projects/oge/files/\">Link</a>",
    "beta / inactive since 2008",
-   "framework, game editor, game engine",
+   "game engine, framework, game editor",
    "<a href=\"https://git.code.sf.net/p/oge/git\">Source</a> - C++ - LGPL-2.1"
   ],
   [
@@ -2309,7 +2309,7 @@
    "A tabletop roleplaying game (or RPG) in which the players..",
    "",
    "mature / active",
-   "board game, role playing, ruleset",
+   "role playing, board game, ruleset",
    "<a href=\"https://github.com/openlegend/core-rules.git\">Source</a> - Text - Custom"
   ],
   [
@@ -2317,7 +2317,7 @@
    "Meridian 59 is a long-running medieval fantasy combat and..",
    "<a href=\"http://openmeridian.org/create-account/\">Link</a>",
    "mature / active",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://github.com/OpenMeridian/Meridian59.git\">Source</a> - C, C++ - GPL-2.0"
   ],
   [
@@ -2325,7 +2325,7 @@
    "Hex and turn based strategy game, a remake of good old..",
    "",
    "mature / active",
-   "online, strategy",
+   "strategy, online",
    "<a href=\"https://github.com/nicupavel/openpanzer.git\">Source</a> - JavaScript - GPL-2.0"
   ],
   [
@@ -2341,7 +2341,7 @@
    "As close of a replica Runescape game experience as possible.",
    "",
    "mature / active",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://gitlab.openrsc.com/open-rsc/Game.git\">Source</a> - Java - GPL-3.0"
   ],
   [
@@ -2357,16 +2357,16 @@
    "Soccer manager game in which you are not the manager or..",
    "",
    "beta / active",
-   "online, sports, strategy",
+   "sports, online, strategy",
    "<a href=\"https://github.com/dmecke/OpenSoccerStar.git\">Source</a> - PHP - GPL-3.0"
   ],
   [
-   "Open Sonic (<a href=\"http://opensnc.sourceforge.net/home/index.php\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/open_sonic.md\">entry</a>)",
-   "Game based on the \"Sonic the Hedgehog\" universe.",
-   "<a href=\"http://opensnc.sourceforge.net/home/download.php\">Link</a>",
+   "Open Surge (<a href=\"http://opensurge2d.org/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/open_surge.md\">entry</a>)",
+   "Inspired by the \"Sonic the Hedgehog\" universe.",
+   "<a href=\"http://opensnc.sourceforge.net/forum/viewtopic.php?id=1931\">Link</a>",
    "beta / active",
-   "action",
-   "<a href=\"https://svn.code.sf.net/p/opensnc/code/\">Source</a> - C - GPL-2.0"
+   "action, 2D, platform",
+   "<a href=\"https://github.com/alemart/opensurge.git\">Source</a> - C - GPL-3.0"
   ],
   [
    "Open Tibia (<a href=\"https://github.com/opentibia\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/open_tibia.md\">entry</a>)",
@@ -2381,7 +2381,7 @@
    "Open-source version of the classic dice game Yahtzee.",
    "<a href=\"http://www.openyahtzee.org/wiki/download/\">Link</a>",
    "mature / inactive since 2016",
-   "dice game, strategy",
+   "strategy, dice game",
    "<a href=\"https://git.code.sf.net/p/openyahtzee/code\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -2405,7 +2405,7 @@
    "Make games with a built-in physics engine, Lego-like..",
    "<a href=\"https://sourceforge.net/projects/openblox/files/\">Link</a>",
    "beta / inactive since 2011",
-   "game maker, simulation",
+   "simulation, game maker",
    "<a href=\"http://hg.code.sf.net/p/openblox/openblox\">Source</a> - Python, Lua - GPL-3.0"
   ],
   [
@@ -2453,7 +2453,7 @@
    "Clone of Microprose game \"Master of Orion II: Battle at..",
    "<a href=\"http://openmoo2.org/en/download\">Link</a>",
    "beta / inactive since 2011",
-   "requires original content, strategy, turn-based",
+   "strategy, requires original content, turn-based",
    "<a href=\"https://github.com/pjotrligthart/openmoo2-hg-mirror.git\">Source</a> - Python - GPL-2.0"
   ],
   [
@@ -2461,23 +2461,15 @@
    "Unofficial open source engine reimplementation of the game..",
    "<a href=\"https://openmw.org/downloads/\">Link</a>",
    "mature / active",
-   "game engine, remake, requires original content, role playing",
+   "role playing, game engine, remake, requires original content",
    "<a href=\"https://github.com/OpenMW/openmw.git\">Source</a> - C++ - GPL-3.0"
   ],
-  [
-   "OpenPop (<a href=\"http://openpopulous.sourceforge.net/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/open_pop.md\">entry</a>)",
-   "A clone of Populous: The Beginning.",
-   "<a href=\"https://sourceforge.net/projects/openpopulous/files\">Link</a>",
-   "beta / inactive since 2009",
-   "strategy",
-   "<a href=\"https://svn.code.sf.net/p/openpopulous/code/\">Source</a> - C++ - GPL-3.0"
-  ],
   [
    "OpenRA (<a href=\"http://www.openra.net/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/open_ra.md\">entry</a>)",
    "Recreates and modernizes the classic Command & Conquer..",
    "<a href=\"http://www.openra.net/download/\">Link</a>",
    "mature / active",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://github.com/OpenRA/OpenRA.git\">Source</a> - C# - GPL-3.0"
   ],
   [
@@ -2485,7 +2477,7 @@
    "Re-implementation of RollerCoaster Tycoon 2 (RCT2),..",
    "<a href=\"https://openrct2.org/downloads\">Link</a>",
    "beta / active",
-   "remake, requires original content, simulation",
+   "simulation, remake, requires original content",
    "<a href=\"https://github.com/OpenRCT2/OpenRCT2.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
@@ -2509,7 +2501,7 @@
    "Tower simulation game inspired by SimTower.",
    "",
    "beta / active",
-   "remake, simulation",
+   "simulation, remake",
    "<a href=\"https://github.com/fabianschuiki/OpenSkyscraper.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -2517,7 +2509,7 @@
    "Online Soccer Manager",
    "",
    "beta / active",
-   "online, sports, strategy",
+   "sports, online, strategy",
    "<a href=\"https://github.com/delight-im/OpenSoccer.git\">Source</a> - PHP - GPL-3.0"
   ],
   [
@@ -2533,7 +2525,7 @@
    "Manage a virtual fantasy football (soccer) team and play..",
    "<a href=\"https://github.com/ihofmann/open-websoccer/releases\">Link</a>",
    "mature / active",
-   "online, sports, strategy",
+   "sports, online, strategy",
    "<a href=\"https://github.com/ihofmann/open-websoccer.git\">Source</a> - PHP - LGPL-3.0"
   ],
   [
@@ -2549,7 +2541,7 @@
    "An SDL port of an old DOS game called Gladiator.",
    "<a href=\"http://snowstorm.sourceforge.net/cgi-bin/site.cgi?page=download\">Link</a>",
    "mature / inactive since 2004",
-   "remake, role playing",
+   "role playing, remake",
    "<a href=\"https://git.code.sf.net/p/snowstorm/git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -2573,7 +2565,7 @@
    "A community based game that allows you to affect the..",
    "<a href=\"http://www.other-life.com/downloads.php\">Link</a>",
    "beta / active",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://github.com/jp8900308/other-life.git\">Source</a> - C, C++ - Custom"
   ],
   [
@@ -2581,7 +2573,7 @@
    "Simulation game where you play as a colonist on a new..",
    "",
    "mature / active",
-   "simulation, visual novel",
+   "visual novel, simulation",
    "<a href=\"https://github.com/qirien/personal-space.git\">Source</a> - Ren'py - GPL-3.0"
   ],
   [
@@ -2613,7 +2605,7 @@
    "2D side scrolling beatem-up engine.",
    "<a href=\"http://paintown.org/#/downloads\">Link</a>",
    "mature / active",
-   "2D, action, arcade, beat'em up, game engine",
+   "action, 2D, arcade, beat'em up, game engine",
    "<a href=\"https://github.com/kazzmir/paintown.git\">Source</a> - C++, Java, Python - 3-clause BSD"
   ],
   [
@@ -2621,7 +2613,7 @@
    "Panda3D is a game engine, a framework for 3D rendering and..",
    "<a href=\"http://www.panda3d.org/download.php\">Link</a>",
    "mature / active",
-   "3D, framework",
+   "framework, 3D",
    "<a href=\"https://github.com/panda3d/panda3d.git\">Source</a> - C++, C - 3-clause BSD"
   ],
   [
@@ -2637,7 +2629,7 @@
    "Traditional two-player board game of Brunei.",
    "<a href=\"http://pasang-emas.sourceforge.net/download.xhtml\">Link</a>",
    "mature / active",
-   "board game, strategy",
+   "strategy, board game",
    "<a href=\"https://git.code.sf.net/p/pasang-emas/code\">Source</a> - Vala - GPL-3.0"
   ],
   [
@@ -2645,7 +2637,7 @@
    "One-button real-time strategy game.",
    "",
    "mature / active",
-   "multiplayer, real time, strategy",
+   "strategy, multiplayer, real time",
    "<a href=\"https://github.com/henkboom/pax-britannica.git\">Source</a> - Lua, C - MIT"
   ],
   [
@@ -2677,7 +2669,7 @@
    "Emulation of the board game The Settlers of Catan, which..",
    "<a href=\"https://sourceforge.net/projects/pio/files\">Link</a>",
    "mature / active",
-   "board game, strategy",
+   "strategy, board game",
    "<a href=\"https://svn.code.sf.net/p/pio/code/\">Source</a> - C - GPL-2.0"
   ],
   [
@@ -2693,7 +2685,7 @@
    "Role Playing Game immersed into a 3D virtual fantasy world.",
    "<a href=\"http://www.planeshift.it/Download\">Link</a>",
    "mature / active",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://svn.code.sf.net/p/planeshift/code/\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -2709,7 +2701,7 @@
    "Texas Hold'em poker game playable against up to nine..",
    "<a href=\"https://www.pokerth.net/download\">Link</a>",
    "mature / inactive since 2017",
-   "online, poker, strategy",
+   "strategy, online, poker",
    "<a href=\"https://github.com/pokerth/pokerth.git\">Source</a> - C++ - AGPL-3.0"
   ],
   [
@@ -2749,7 +2741,7 @@
    "Karaoke player.",
    "<a href=\"http://www.kibosh.org/pykaraoke/downloads.php\">Link</a>",
    "beta / inactive since 2011",
-   "karaoke, music, social",
+   "music, karaoke, social",
    "<a href=\"https://gitlab.com/osgames/pykaraoke.git\">Source</a> - Python - LGPL-2.1"
   ],
   [
@@ -2757,7 +2749,7 @@
    "1,000 solitaire games.",
    "<a href=\"http://www.pysol.org/#download\">Link</a>",
    "mature / inactive since 2004",
-   "cards, strategy",
+   "strategy, cards",
    "Python - GPL-2.0"
   ],
   [
@@ -2789,7 +2781,7 @@
    "Reimplementation of the zEngine, used by the game \"Gothic\"..",
    "<a href=\"https://github.com/REGoth-project/REGoth/releases\">Link</a>",
    "beta / active",
-   "remake, requires original content, role playing",
+   "role playing, remake, requires original content",
    "<a href=\"https://github.com/REGoth-project/REGoth.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
@@ -2845,7 +2837,7 @@
    "Renew the original The Settlers 2.",
    "<a href=\"https://www.siedler25.org/index.php?com=dynamic&mod=2\">Link</a>",
    "mature / active",
-   "remake, requires original content, strategy",
+   "strategy, remake, requires original content",
    "<a href=\"https://launchpad.net/s25rttr\">Source</a> - C++ - GPL-3.0"
   ],
   [
@@ -2853,7 +2845,7 @@
    "3D simulator game where you can drive, fly and sail..",
    "",
    "mature / active",
-   "cars, simulation",
+   "simulation, cars",
    "<a href=\"https://github.com/RigsOfRods/rigs-of-rods.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
@@ -2869,7 +2861,7 @@
    "Reproduction of Rogue.",
    "<a href=\"https://sourceforge.net/projects/rogueclone/files/rogue%20clone/\">Link</a>",
    "mature / inactive since 2006",
-   "remake, roguelike, role playing",
+   "role playing, remake, roguelike",
    "<a href=\"https://gitlab.com/osgames/rogueclone.git\">Source</a> - C - 3-clause BSD"
   ],
   [
@@ -2877,7 +2869,7 @@
    "Multiplayer, extensible rogue-like.",
    "",
    "beta / inactive since 2015",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/CamHenlin/Roguish.git\">Source</a> - JavaScript - 3-clause BSD"
   ],
   [
@@ -2909,7 +2901,7 @@
    "MMORPG with open world play.",
    "",
    "mature / active",
-   "mmorpg, role playing",
+   "role playing, mmorpg",
    "<a href=\"https://bitbucket.org/ryzom/ryzomcore\">Source</a> - C++ - AGPL-3.0"
   ],
   [
@@ -2917,7 +2909,7 @@
    "Roguelike game with a 3D user interface.",
    "<a href=\"https://sourceforge.net/projects/scourge/files\">Link</a>",
    "beta / inactive since 2008",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/q4a/scourge.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -2949,7 +2941,7 @@
    "Software development tool that connects programs written..",
    "<a href=\"http://www.swig.org/download.html\">Link</a>",
    "mature / active",
-   "interface generator, language binding, library",
+   "library, interface generator, language binding",
    "<a href=\"https://github.com/swig/swig.git\">Source</a> - C++ - SWIG license"
   ],
   [
@@ -2957,7 +2949,7 @@
    "Lively, fully destructible 3D landscapes in a turn-based..",
    "<a href=\"http://www.scorched3d.co.uk/#download\">Link</a>",
    "mature / inactive since 2014",
-   "3D, action, artillery",
+   "action, 3D, artillery",
    "<a href=\"https://git.code.sf.net/p/scorched3d/git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -2973,7 +2965,7 @@
    "Board game with the goal to place letters on the board..",
    "",
    "mature / inactive since 2015",
-   "board game, strategy",
+   "strategy, board game",
    "<a href=\"https://svn.code.sf.net/p/scrabble/code/\">Source</a> - Pascal - GPL-3.0"
   ],
   [
@@ -2989,7 +2981,7 @@
    "Allows you to run certain classic graphical point-and-..",
    "<a href=\"http://www.scummvm.org/downloads/\">Link</a>",
    "mature / active",
-   "framework, game engine",
+   "game engine, framework",
    "<a href=\"https://github.com/scummvm/scummvm.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -3021,7 +3013,7 @@
    "Remake of \"The Settlers III\" for Windows, Linux, Mac and..",
    "<a href=\"https://github.com/jsettlers/settlers-remake/releases\">Link</a>",
    "beta / active",
-   "remake, requires original content, strategy",
+   "strategy, remake, requires original content",
    "<a href=\"https://github.com/jsettlers/settlers-remake.git\">Source</a> - Java - MIT"
   ],
   [
@@ -3029,7 +3021,7 @@
    "Fan continuation of Seven Kingdoms: Ancient Adversaries by..",
    "<a href=\"https://www.7kfans.com/wiki/index.php/Download\">Link</a>",
    "mature / active",
-   "continuation of commercial project, strategy",
+   "strategy, continuation of commercial project",
    "<a href=\"https://github.com/the3dfxdude/7kaa.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -3053,7 +3045,7 @@
    "Simple DirectMedia Layer is a cross-platform development..",
    "<a href=\"https://www.libsdl.org/download-2.0.php\">Link</a>",
    "mature / active",
-   "3D, library",
+   "library, 3D",
    "<a href=\"http://hg.libsdl.org/SDL\">Source</a> - C - zlib"
   ],
   [
@@ -3069,7 +3061,7 @@
    "Solitaire game collection with 14 games.",
    "",
    "mature / active",
-   "cards, strategy",
+   "strategy, cards",
    "<a href=\"https://github.com/TobiasBielefeld/Simple-Solitaire.git\">Source</a> - Java - GPL-3.0"
   ],
   [
@@ -3101,7 +3093,7 @@
    "Variant of the roguelike game NetHack that offers extra..",
    "<a href=\"http://slashem.sourceforge.net/stable.html\">Link</a>",
    "beta / inactive since 2007",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/farmboy0/slashem.git\">Source</a> - C - Custom"
   ],
   [
@@ -3125,7 +3117,7 @@
    "Old skool, 2D, platform, shoot\u2018em up action.",
    "<a href=\"https://smashbattle.demontpx.com/downloads/\">Link</a>",
    "beta / inactive since 2011",
-   "2D, action, platform, shoot'em up",
+   "action, 2D, platform, shoot'em up",
    "C++ - ?"
   ],
   [
@@ -3133,7 +3125,7 @@
    "High-level real-time 3d engine.",
    "<a href=\"http://softpixelengine.sourceforge.net/downloads.html\">Link</a>",
    "mature / inactive since 2013",
-   "3D, framework",
+   "framework, 3D",
    "<a href=\"https://gitlab.com/osgames/softpixelengine.git\">Source</a> - C++ - zlib"
   ],
   [
@@ -3157,7 +3149,7 @@
    "A massive multiplayer online roleplaying game.",
    "",
    "mature / inactive since 2013",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://github.com/tales/sourceoftales.git\">Source</a> - Lua - GPL-3.0"
   ],
   [
@@ -3181,7 +3173,7 @@
    "A community developed, multiplayer round-based role..",
    "",
    "mature / active",
-   "online, role playing",
+   "role playing, online",
    "DM - AGPL-3.0"
   ],
   [
@@ -3212,8 +3204,8 @@
    "SpaceZero (<a href=\"http://spacezero.sourceforge.net/\">home</a>, <a href=\"https://github.com/Trilarion/opensourcegames/blob/master/games/spacezero.md\">entry</a>)",
    "Real Time Strategy 2D space combat game for two players..",
    "<a href=\"http://spacezero.sourceforge.net/index.html#download\">Link</a>",
-   "beta / inactive since 2013",
-   "real time, space, strategy",
+   "beta / active",
+   "strategy, real time, space",
    "<a href=\"https://svn.code.sf.net/p/spacezero/code/\">Source</a> - C - GPL-3.0"
   ],
   [
@@ -3237,7 +3229,7 @@
    "Game engine for real-time strategy (RTS) video games.",
    "<a href=\"https://springrts.com/wiki/Download\">Link</a>",
    "mature / active",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://github.com/spring/spring.git\">Source</a> - C++, C, Lua - GPL-2.0"
   ],
   [
@@ -3261,7 +3253,7 @@
    "4X/RTS set in space.",
    "",
    "mature / active",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://github.com/BlindMindStudios/StarRuler2-Source.git\">Source</a> - C, C++ - MIT"
   ],
   [
@@ -3269,7 +3261,7 @@
    "Side scrolling shoot'em up game.",
    "<a href=\"https://sourceforge.net/projects/starblastrix/files/\">Link</a>",
    "beta / inactive since 2006",
-   "2D, action, shoot'em up",
+   "action, 2D, shoot'em up",
    "C++ - GPL-2.0"
   ],
   [
@@ -3293,7 +3285,7 @@
    "Multiplayer online adventure game with an old school feel.",
    "",
    "mature / active",
-   "multiplayer, online, role playing",
+   "role playing, multiplayer, online",
    "<a href=\"https://git.code.sf.net/p/arianne/stendhal\">Source</a> - Java - GPL-2.0"
   ],
   [
@@ -3325,7 +3317,7 @@
    "Role-playing game, featuring both a single-player and a..",
    "<a href=\"https://web.archive.org/web/20160704003202/http://sumwars.org:80/wiki/Download\">Link</a>",
    "beta / inactive since 2014",
-   "multiplayer, role playing, singleplayer",
+   "role playing, multiplayer, singleplayer",
    "<a href=\"https://bitbucket.org/sumwars/sumwars-code/src\">Source</a> - C++ - GPL-3.0"
   ],
   [
@@ -3365,7 +3357,7 @@
    "Car racing simulation.",
    "<a href=\"http://torcs.sourceforge.net/index.php?name=Sections&op=viewarticle&artid=3\">Link</a>",
    "mature / inactive since 2016",
-   "racing, simulation",
+   "simulation, racing",
    "<a href=\"https://git.code.sf.net/p/torcs/code\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -3373,8 +3365,8 @@
    "Car racing game with features such as shooting at other..",
    "<a href=\"http://trophy.sourceforge.net/index.php?body=download\">Link</a>",
    "mature / inactive since 2012",
-   "2D, cars, racing, simulation",
-   "<a href=\"https://svn.code.sf.net/p/trophy/code/\">Source</a> - C++ - GPL-2.0"
+   "simulation, 2D, cars, racing",
+   "<a href=\"https://gitlab.com/osgames/trophy.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/tvtower.md\">entry</a>)",
@@ -3389,7 +3381,7 @@
    "Roguelike RPG, featuring tactical turn-based combat and..",
    "<a href=\"https://te4.org/download\">Link</a>",
    "mature / active",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://git.net-core.org/tome/t-engine4.git\">Source</a> - C, Lua - GPL-3.0"
   ],
   [
@@ -3405,7 +3397,7 @@
    "Clone of 'Plan Tactico y Estrategico de la Guerra', which..",
    "",
    "beta / inactive since 2015",
-   "risklike, strategy",
+   "strategy, risklike",
    "<a href=\"https://github.com/wfx/teg.git\">Source</a> - C, Javascript, Perl - GPL-2.0"
   ],
   [
@@ -3413,7 +3405,7 @@
    "Stable platform for various types of gameplay settings in..",
    "",
    "mature / active",
-   "3D, framework",
+   "framework, 3D",
    "<a href=\"https://github.com/MovingBlocks/Terasology.git\">Source</a> - Java - Apache-2.0"
   ],
   [
@@ -3421,7 +3413,7 @@
    "A port of TetraVex for macOS.",
    "<a href=\"https://github.com/Lisergishnu/TetraVex/releases\">Link</a>",
    "beta / active",
-   "port, puzzle",
+   "puzzle, port",
    "<a href=\"https://github.com/Lisergishnu/TetraVex.git\">Source</a> - Swift - GPL-3.0"
   ],
   [
@@ -3437,7 +3429,7 @@
    "Realistic physics simulations.",
    "<a href=\"http://the-butterfly-effect.org/#download\">Link</a>",
    "beta / active",
-   "physics, simulation",
+   "simulation, physics",
    "<a href=\"https://github.com/the-butterfly-effect/tbe.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -3469,7 +3461,7 @@
    "2D platform game.",
    "<a href=\"https://www.parallelrealities.co.uk/games/edgar/#downloads-/-releases\">Link</a>",
    "mature / active",
-   "2D, action, platform",
+   "action, 2D, platform",
    "<a href=\"https://github.com/riksweeney/edgar.git\">Source</a> - C - GPL-2.0"
   ],
   [
@@ -3477,7 +3469,7 @@
    "2D open source MMORPG.",
    "<a href=\"https://www.themanaworld.org/index.php/Downloads\">Link</a>",
    "mature / active",
-   "massive multiplayer online, role playing",
+   "role playing, massive multiplayer online",
    "<a href=\"https://github.com/themanaworld/tmwa.git\">Source</a> - PHP - GPL-2.0"
   ],
   [
@@ -3501,7 +3493,7 @@
    "MUD client.",
    "<a href=\"https://tintin.sourceforge.io/download.php\">Link</a>",
    "mature / active",
-   "MUD, client, role playing",
+   "role playing, client, MUD",
    "C - GPL-3.0"
   ],
   [
@@ -3565,7 +3557,7 @@
    "Arcade-style 2D football game reminiscent of Sensible..",
    "<a href=\"http://tuxfootball.sourceforge.net/index.php?plugin=EnticorePluginStaticContent&config=idx%3A3\">Link</a>",
    "beta / inactive since 2012",
-   "2D, arcade, simulation, sports",
+   "arcade, 2D, simulation, sports",
    "<a href=\"https://git.code.sf.net/p/tuxfootball/code\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -3621,7 +3613,7 @@
    "Ultimate Dungeon Adventure (UlDunAd) - the extremely..",
    "",
    "beta / inactive since 2011",
-   "console, role playing, text-based",
+   "role playing, console, text-based",
    "<a href=\"https://github.com/nhydock/UlDunAd.git\">Source</a> - Python - GPL-3.0"
   ],
   [
@@ -3637,7 +3629,7 @@
    "Karaoke game.",
    "<a href=\"https://usdx.eu/downloads/\">Link</a>",
    "mature / active",
-   "karaoke, music",
+   "music, karaoke",
    "<a href=\"https://github.com/UltraStar-Deluxe/USDX.git\">Source</a> - Pascal - GPL-2.0"
   ],
   [
@@ -3653,7 +3645,7 @@
    "Roguelike, single-player role-playing game where the hero..",
    "<a href=\"https://sourceforge.net/projects/unnethack/files/unnethack/\">Link</a>",
    "mature / active",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/unnethack/unnethack.git\">Source</a> - C - Custom"
   ],
   [
@@ -3669,7 +3661,7 @@
    "A 2D real time strategy simulation with an emphasis on..",
    "<a href=\"http://unknown-horizons.org/downloads/\">Link</a>",
    "beta / active",
-   "singleplayer, strategy, turn-based",
+   "strategy, singleplayer, turn-based",
    "<a href=\"https://github.com/unknown-horizons/unknown-horizons.git\">Source</a> - Python - GPL-2.0"
   ],
   [
@@ -3709,7 +3701,7 @@
    "Driving simulation made with drift racing in mind.",
    "",
    "mature / inactive since 2014",
-   "cars, racing, simulation",
+   "simulation, cars, racing",
    "<a href=\"https://github.com/VDrift/vdrift.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
@@ -3717,7 +3709,7 @@
    "J-RPG (Based on the Hero of Allacrost engine).",
    "<a href=\"https://valyriatear.blogspot.de/p/downloads.html\">Link</a>",
    "mature / active",
-   "JRPG, popular, role playing",
+   "role playing, JRPG, popular",
    "<a href=\"https://github.com/ValyriaTear/ValyriaTear.git\">Source</a> - Lua, C++, C - GPL"
   ],
   [
@@ -3741,7 +3733,7 @@
    "Windows clone of Linux KAtomic logic game.",
    "<a href=\"https://sourceforge.net/projects/watomic/files/\">Link</a>",
    "mature / inactive since 2005",
-   "remake, strategy",
+   "strategy, remake",
    "<a href=\"https://gitlab.com/osgames/watomic.git\">Source</a> - Pascal - GPL-2.0"
   ],
   [
@@ -3765,7 +3757,7 @@
    "Warcraft2 Mod that allows you to play Warcraft2 with the..",
    "<a href=\"http://wargus.stratagus.com/download.shtml\">Link</a>",
    "mature / active",
-   "requires original content, strategy",
+   "strategy, requires original content",
    "<a href=\"https://github.com/Wargus/wargus.git\">Source</a> - C++, Lua - GPL-2.0"
   ],
   [
@@ -3773,7 +3765,7 @@
    "Full campaign with optional (but strongly recommended!),..",
    "<a href=\"https://sourceforge.net/projects/warzone2100/files/releases/\">Link</a>",
    "mature / active",
-   "popular, real time, strategy",
+   "strategy, popular, real time",
    "<a href=\"https://github.com/Warzone2100/warzone2100.git\">Source</a> - C++ - GPL-2.0"
   ],
   [
@@ -3789,7 +3781,7 @@
    "Widelands is a free, open source real-time strategy game..",
    "<a href=\"https://wl.widelands.org/wiki/Download/\">Link</a>",
    "mature / active",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://github.com/widelands/widelands.git\">Source</a> - C++, Lua - GPL-2.0"
   ],
   [
@@ -3797,7 +3789,7 @@
    "Roguelike dungeon crawl shooter heavily inspired from..",
    "<a href=\"https://github.com/Cirrus-Minor/witchblast/releases\">Link</a>",
    "beta / inactive since 2015",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/Cirrus-Minor/witchblast.git\">Source</a> - C++ - GPL-3.0"
   ],
   [
@@ -3805,7 +3797,7 @@
    "Simple card strategy, based on Magic: The Gathering rules.",
    "<a href=\"https://code.google.com/archive/p/wizards-magic/downloads\">Link</a>",
    "mature / inactive since 2012",
-   "cards, remake, strategy",
+   "strategy, cards, remake",
    "<a href=\"https://github.com/chubakur/wizards-magic.git\">Source</a> - Python - GPL-2.0"
   ],
   [
@@ -3813,7 +3805,7 @@
    "Real time, multiplayer, Internet-based game, featuring..",
    "<a href=\"https://sourceforge.net/projects/empserver/files/\">Link</a>",
    "mature / active",
-   "online, strategy",
+   "strategy, online",
    "<a href=\"http://git.pond.sub.org/empserver\">Source</a> - C - GPL-3.0"
   ],
   [
@@ -3837,7 +3829,7 @@
    "Online Roleplaying Game browser based, which takes place..",
    "<a href=\"https://sourceforge.net/projects/phaosrpg/files/\">Link</a>",
    "mature / inactive since 2011",
-   "online, role playing",
+   "role playing, online",
    "<a href=\"https://gitlab.com/osgames/phaosrpg.git\">Source</a> - PHP - GPL-2.0"
   ],
   [
@@ -3853,7 +3845,7 @@
    "Strategy game which features elements of mythology,..",
    "<a href=\"https://store.steampowered.com/app/370070/Wyrmsun/\">Link</a>",
    "mature / active",
-   "real time, strategy",
+   "strategy, real time",
    "<a href=\"https://github.com/andrettin/wyrmsun.git\">Source</a> - Lua, C++ - GPL-2.0"
   ],
   [
@@ -3893,7 +3885,7 @@
    "Top-down shooter / real-time strategy hybrid game based on..",
    "",
    "beta / inactive since 2010",
-   "real time, shooter, strategy",
+   "strategy, real time, shooter",
    "<a href=\"https://github.com/prophile/xsera.git\">Source</a> - C, Lua - MIT"
   ],
   [
@@ -3941,7 +3933,7 @@
    "Soccer game; continuation to Sensible World of Soccer.",
    "<a href=\"http://ysoccer.sourceforge.net/dloads.htm\">Link</a>",
    "mature / inactive since 2017",
-   "simulation, soccer, sports",
+   "sports, simulation, soccer",
    "<a href=\"https://git.code.sf.net/p/ysoccer/code\">Source</a> - Java - ?"
   ],
   [
@@ -3957,7 +3949,7 @@
    "Roguelike computer role playing game available for almost..",
    "<a href=\"https://sourceforge.net/projects/zangband/files/\">Link</a>",
    "mature / inactive since 2005",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://gitlab.com/osgames/zangband.git\">Source</a> - C - Custom"
   ],
   [
@@ -3965,7 +3957,7 @@
    "Rapid development solution with a tiny footprint.",
    "<a href=\"http://www.zgameeditor.org/index.php/Main/Download\">Link</a>",
    "mature / active",
-   "editor, framework",
+   "framework, editor",
    "<a href=\"https://github.com/VilleKrumlinde/zgameeditor.git\">Source</a> - Pascal - MIT"
   ],
   [
@@ -3989,7 +3981,7 @@
    "A free multi-platform open source real-time strategy video..",
    "<a href=\"http://zero-k.info/Wiki/Download\">Link</a>",
    "mature / active",
-   "popular, real time, strategy",
+   "strategy, popular, real time",
    "<a href=\"https://github.com/ZeroK-RTS/Zero-K.git\">Source</a> - Lua - GPL-2.0"
   ],
   [
@@ -4077,7 +4069,7 @@
    "Tool used when compiling applications and libraries.",
    "<a href=\"https://pkg-config.freedesktop.org/releases/\">Link</a>",
    "mature / active",
-   "library, tool",
+   "tool, library",
    "<a href=\"https://anongit.freedesktop.org/git/pkg-config.git\">Source</a> - C - GPL-2.0"
   ],
   [
@@ -4101,7 +4093,7 @@
    "Python based roguelike.",
    "",
    "mature / inactive since 2016",
-   "roguelike, role playing",
+   "role playing, roguelike",
    "<a href=\"https://github.com/dsallen7/ransack-python.git\">Source</a> - Python - MIT"
   ],
   [
@@ -4125,7 +4117,7 @@
    "C++ library that lets developers create applications for..",
    "<a href=\"http://wxwidgets.org/downloads/\">Link</a>",
    "mature / active",
-   "gui toolkit, library",
+   "library, gui toolkit",
    "<a href=\"https://github.com/wxWidgets/wxWidgets.git\">Source</a> - C++, Objective-C - Custom"
   ],
   [
diff --git a/games/0ad.md b/games/0ad.md
index 9efa3fe9..64e3fe01 100644
--- a/games/0ad.md
+++ b/games/0ad.md
@@ -6,11 +6,11 @@ _0 A.D. is a free, open-source, cross-platform real-time strategy game._
 - Media: <https://en.wikipedia.org/wiki/0_A.D._(video_game)>
 - State: beta
 - Download: https://play0ad.com/download/
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://github.com/0ad/0ad.git (mirror), https://svn.wildfiregames.com/public/ps/trunk/ (svn)
 - Code language: C, C++
 - Code license: GPL-2.0
-- Code dependencies: SDL2, OpenAL, libvorbis, libogg, libxml2, zlib
+- Code dependencies: libogg, libvorbis, libxml2, OpenAL, SDL2, zlib
 - Assets license: CC-BY-SA-3.0
 
 ## Building
diff --git a/games/_action.md b/games/_action.md
index 587a2a20..212f8c9e 100644
--- a/games/_action.md
+++ b/games/_action.md
@@ -39,7 +39,7 @@
 - **[Netrek](netrek.md)** (?, ?, mature, inactive since 2009)
 - **[Neverball](neverball.md)** (C, GPL-2.0, mature)
 - **[Nexiuz](nexiuz.md)** (C++, GPL-2.0, mature)
-- **[Open Sonic](open_sonic.md)** (C, GPL-2.0, beta)
+- **[Open Surge](open_surge.md)** (C, GPL-3.0, beta)
 - **[Open Zelda](open_zelda.md)** (C++, zlib, beta)
 - **[OpenArena](openarena.md)** (C, GPL-2.0, mature, inactive since 2012)
 - **[OpenClonk](openclonk.md)** (C, C++, ISC, mature)
diff --git a/games/_all.md b/games/_all.md
index 786682f6..5eac9bea 100644
--- a/games/_all.md
+++ b/games/_all.md
@@ -295,7 +295,7 @@
 - **[Open RSC](open_rsc.md)** (Java, GPL-3.0, mature)
 - **[Open Rails](open_rails.md)** (C#, GPL-3.0, mature)
 - **[Open Soccer Star](open_soccer_star.md)** (PHP, GPL-3.0, beta)
-- **[Open Sonic](open_sonic.md)** (C, GPL-2.0, beta)
+- **[Open Surge](open_surge.md)** (C, GPL-3.0, beta)
 - **[Open Tibia](open_tibia.md)** (C++, GPL-2.0, beta, inactive since 2014)
 - **[Open Yahtzee](open_yahtzee.md)** (C++, GPL-2.0, mature, inactive since 2016)
 - **[Open Zelda](open_zelda.md)** (C++, zlib, beta)
@@ -308,7 +308,6 @@
 - **[OpenLieroX](openlierox.md)** (C++, LGPL, mature)
 - **[OpenMOO2](openmoo2.md)** (Python, GPL-2.0, beta, inactive since 2011)
 - **[OpenMW](open_mw.md)** (C++, GPL-3.0, mature)
-- **[OpenPop](open_pop.md)** (C++, GPL-3.0, beta, inactive since 2009)
 - **[OpenRA](open_ra.md)** (C#, GPL-3.0, mature)
 - **[OpenRCT2](open_rct2.md)** (C++, GPL-3.0, beta)
 - **[OpenRPG](openrpg.md)** (Python, GPL-2.0, mature, inactive since 2013)
@@ -401,7 +400,7 @@
 - **[Space Trader for Windows](space_trader_for_windows.md)** (C#, GPL-2.0, mature, inactive since 2009)
 - **[Space War](space_war.md)** (Java, Apache-2.0, mature)
 - **[SpaceTrader for Java](space_trader_for_java.md)** (Java, GPL-2.0, mature, inactive since 2010)
-- **[SpaceZero](spacezero.md)** (C, GPL-3.0, beta, inactive since 2013)
+- **[SpaceZero](spacezero.md)** (C, GPL-3.0, beta)
 - **[Speed Dreams](speed_dreams.md)** (C++, GPL-2.0, mature)
 - **[Spice Trade](spice_trade.md)** (Java, LGPL-2.0, mature, inactive since 2005)
 - **[Spring RTS engine](spring_rts_engine.md)** (C++, C, Lua, GPL-2.0, mature)
diff --git a/games/_platform.md b/games/_platform.md
index 275cf0aa..dc2ad8e2 100644
--- a/games/_platform.md
+++ b/games/_platform.md
@@ -1,5 +1,6 @@
 [comment]: # (autogenerated content, do not edit)
 # Platform
 
+- **[Open Surge](open_surge.md)** (C, GPL-3.0, beta)
 - **[Smash Battle](smash_battle.md)** (C++, ?, beta, inactive since 2011)
 - **[The Legend of Edgar](the_legend_of_edgar.md)** (C, GPL-2.0, mature)
\ No newline at end of file
diff --git a/games/_strategy.md b/games/_strategy.md
index d50e9cd9..5e018b23 100644
--- a/games/_strategy.md
+++ b/games/_strategy.md
@@ -97,7 +97,6 @@
 - **[Open Yahtzee](open_yahtzee.md)** (C++, GPL-2.0, mature, inactive since 2016)
 - **[OpenHoMM](open_homm.md)** (C++, GPL-3.0, beta, inactive since 2010)
 - **[OpenMOO2](openmoo2.md)** (Python, GPL-2.0, beta, inactive since 2011)
-- **[OpenPop](open_pop.md)** (C++, GPL-3.0, beta, inactive since 2009)
 - **[OpenRA](open_ra.md)** (C#, GPL-3.0, mature)
 - **[OpenSoccer](open_soccer.md)** (PHP, GPL-3.0, beta)
 - **[OpenWebSoccer-Sim](open_web_soccer.md)** (PHP, LGPL-3.0, mature)
@@ -130,7 +129,7 @@
 - **[Space Trader for Windows](space_trader_for_windows.md)** (C#, GPL-2.0, mature, inactive since 2009)
 - **[Space War](space_war.md)** (Java, Apache-2.0, mature)
 - **[SpaceTrader for Java](space_trader_for_java.md)** (Java, GPL-2.0, mature, inactive since 2010)
-- **[SpaceZero](spacezero.md)** (C, GPL-3.0, beta, inactive since 2013)
+- **[SpaceZero](spacezero.md)** (C, GPL-3.0, beta)
 - **[Spring RTS engine](spring_rts_engine.md)** (C++, C, Lua, GPL-2.0, mature)
 - **[Star Control II: The Ur-Quan Masters](star_control_2.md)** (C, GPL-2.0, mature, inactive since 2011)
 - **[Star Ruler 2](star_ruler_2.md)** (C, C++, MIT, mature)
diff --git a/games/ai_wars.md b/games/ai_wars.md
index f281aa07..65031246 100644
--- a/games/ai_wars.md
+++ b/games/ai_wars.md
@@ -8,7 +8,7 @@ _Turn-based strategy game, an AI client development testbed._
 - Code repository: https://github.com/suprafun/aiwars.git, https://code.google.com/archive/p/aiwars/source
 - Code language: Python
 - Code license: MIT
-- Code dependencies: pygame, pillow
+- Code dependencies: pillow, pygame
 
 ## Building
 
diff --git a/games/alien_assault_traders.md b/games/alien_assault_traders.md
index 0a3b03fa..11e5a203 100644
--- a/games/alien_assault_traders.md
+++ b/games/alien_assault_traders.md
@@ -5,7 +5,7 @@ _Alien Assault Traders is an online, web-based, turn-based strategy space tradin
 - Home: http://www.aatraders.com/, https://sourceforge.net/projects/aatrade/
 - State: beta, inactive since 2009
 - Download: https://sourceforge.net/projects/aatrade/files/
-- Keywords: online, strategy
+- Keywords: strategy, online
 - 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/angband.md b/games/angband.md
index 48f284fe..c6d82c00 100644
--- a/games/angband.md
+++ b/games/angband.md
@@ -6,7 +6,7 @@ _Single-player dungeon exploration game._
 - Media: <https://en.wikipedia.org/wiki/Angband_(video_game)>
 - State: mature
 - Download: http://rephial.org/release/
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/angband/angband.git
 - Code language: C
 - Code license: GPL-2.0
diff --git a/games/antares.md b/games/antares.md
index 704b99cd..dd73c37b 100644
--- a/games/antares.md
+++ b/games/antares.md
@@ -5,7 +5,7 @@ _Port of the original Ares code base that was open sourced in 2008._
 - Home: https://arescentral.org/antares/
 - State: beta
 - Download: (see home)
-- Keywords: real time, shooter, strategy
+- Keywords: strategy, real time, shooter
 - Code repository: https://github.com/arescentral/antares.git
 - Code language: C++
 - Code license: LGPL-3.0
diff --git a/games/argentum_online.md b/games/argentum_online.md
index f9fd2cdf..2f9b25e9 100644
--- a/games/argentum_online.md
+++ b/games/argentum_online.md
@@ -5,7 +5,7 @@ _Open Source FREE 2D MMORPG._
 - Home: http://www.comunidadargentum.com/ (Spanish)
 - State: beta, inactive since 2014
 - Download: http://www.comunidadargentum.com/descargas/
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://github.com/Argentum-Online/Argentum-Online.git, http://morgoao.cvs.sourceforge.net/ (cvs)
 - Code language: Visual Basic
 - Code license: GPL-2.0
diff --git a/games/arianne.md b/games/arianne.md
index b56b1bed..7286bf12 100644
--- a/games/arianne.md
+++ b/games/arianne.md
@@ -5,7 +5,7 @@ _An open source multiplayer online framework._
 - Home: https://arianne-project.org/, https://arianne-project.org/engine/marauroa.html, https://sourceforge.net/projects/arianne/
 - State: mature
 - Download: https://arianne-project.org/engine/marauroa.html
-- Keywords: 2D, framework, multiplayer
+- Keywords: framework, 2D, multiplayer
 - Code repository: https://git.code.sf.net/p/arianne/marauroa, http://arianne.cvs.sourceforge.net (cvs)
 - Code language: Java
 - Code license: GPL-2.0
diff --git a/games/atomiks.md b/games/atomiks.md
index 2ca40937..49a53944 100644
--- a/games/atomiks.md
+++ b/games/atomiks.md
@@ -6,7 +6,7 @@ _Faithful remake of, and a tribute to, Atomix, a classic puzzle game created by
 - State: mature, inactive since 2015
 - Download: https://sourceforge.net/projects/atomiks/files
 - Keywords: puzzle
-- Code repository: https://svn.code.sf.net/p/atomiks/code/ (svn)
+- Code repository: https://gitlab.com/osgames/atomiks.git (backup of svn), https://svn.code.sf.net/p/atomiks/code/ (svn)
 - Code language: C
 - Code license: GPL-3.0
 - Assets license: Custom (level design, see Readme)
diff --git a/games/avanor.md b/games/avanor.md
index 78e40021..44de754d 100644
--- a/games/avanor.md
+++ b/games/avanor.md
@@ -5,7 +5,7 @@ _Relatively easy to win but feature rich fantasy roguelike game with a highly in
 - Home: http://avanor.sourceforge.net/, https://sourceforge.net/projects/avanor/
 - State: beta, inactive since 2008
 - Download: https://sourceforge.net/projects/avanor/files
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - 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/battle_for_wesnoth.md b/games/battle_for_wesnoth.md
index 9c2c85e3..6c1e2e46 100644
--- a/games/battle_for_wesnoth.md
+++ b/games/battle_for_wesnoth.md
@@ -6,7 +6,7 @@ _The Battle for Wesnoth is an open source, turn-based strategy game with a high
 - Media: https://en.wikipedia.org/wiki/The_Battle_for_Wesnoth
 - State: mature
 - Download: http://www.wesnoth.org/#download
-- Keywords: multiplayer, strategy, turn-based
+- Keywords: strategy, multiplayer, turn-based
 - Code repository: https://github.com/wesnoth/wesnoth.git
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/battleround.md b/games/battleround.md
index 335c67db..86121cf3 100644
--- a/games/battleround.md
+++ b/games/battleround.md
@@ -9,7 +9,7 @@ _Round based RPG._
 - Code repository: https://github.com/Leejjon/Battleround.git
 - Code language: Java
 - Code license: Apache-2.0
-- Code dependencies: Libgdx
+- Code dependencies: libGDX
 
 May be more like alpha.
 
diff --git a/games/blockattack.md b/games/blockattack.md
index 9d86a5c2..e7c1bf2f 100644
--- a/games/blockattack.md
+++ b/games/blockattack.md
@@ -6,11 +6,11 @@ _A match-3 game inspired by "Tetris Attack" but more PC friendly._
 - State: mature
 - Download: https://blockattack.net/download/
 - Platform: Windows, Linux
-- Keywords: match 3, puzzle, sliding blocks, tetris attack
+- Keywords: puzzle, match 3, sliding blocks, tetris attack
 - Code repository: https://github.com/blockattack/blockattack-game.git
 - Code language: C++
 - Code license: GPL-2.0
-- Code dependencies: C++11 compiler, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, physfs, boost, boost-program-options, utfcpp, gettext
+- Code dependencies: boost, boost-program-options, C++11 compiler, gettext, physfs, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, utfcpp
 - Assets license: GPLv2, GPLv2 or later, CC-BY-SA, Public Domain
 
 First version released to the public was version 1.0.5 released May 6th, 2005.
diff --git a/games/bos_wars.md b/games/bos_wars.md
index af155695..15f919f1 100644
--- a/games/bos_wars.md
+++ b/games/bos_wars.md
@@ -5,7 +5,7 @@ _Futuristic real time strategy game (RTS)._
 - Home: https://www.boswars.org/
 - State: mature, inactive since 2013
 - Download: https://www.boswars.org/download.shtml
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://github.com/OneSleepyDev/boswars_osd.git, https://github.com/OneSleepyDev/boswars_osd_archive.git (+)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/brain_workshop.md b/games/brain_workshop.md
index 33b3cc10..7d5a901a 100644
--- a/games/brain_workshop.md
+++ b/games/brain_workshop.md
@@ -6,7 +6,7 @@ _Dual n-back brain training exercise._
 - State: mature, inactive since 2011
 - Download: http://brainworkshop.sourceforge.net/download.html, https://sourceforge.net/projects/brainworkshop/files/brainworkshop/
 - Platform: Windows, Linux, macOS
-- Keywords: brain exercise, puzzle
+- Keywords: puzzle, brain exercise
 - Code repository: https://gitlab.com/osgames/brain-workshop.git (import of svn), https://svn.code.sf.net/p/brainworkshop/code/ (svn)
 - Code language: Python
 - Code license: GPL
diff --git a/games/browserquest.md b/games/browserquest.md
index b372d70e..bdeed251 100644
--- a/games/browserquest.md
+++ b/games/browserquest.md
@@ -5,7 +5,7 @@ _A Massively Multiplayer Adventure._
 - Home: http://browserquest.mozilla.org/
 - Media: https://en.wikipedia.org/wiki/BrowserQuest
 - State: mature
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://github.com/mozilla/BrowserQuest.git
 - Code language: JavaScript
 - Code license: MPL-2.0
diff --git a/games/brutal_chess.md b/games/brutal_chess.md
index 5f004bd7..b97852db 100644
--- a/games/brutal_chess.md
+++ b/games/brutal_chess.md
@@ -6,7 +6,7 @@ _Inspired by the once popular "Battle Chess" released by Interplay circa 1988._
 - State: beta, inactive since 2007
 - Download: https://sourceforge.net/projects/brutalchess/files/
 - Platform: Windows, Linux
-- Keywords: chess, strategy
+- Keywords: strategy, chess
 - Code repository: https://gitlab.com/osgames/brutalchess.git (import of svn), https://svn.code.sf.net/p/brutalchess/code/ (svn)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/candy_box2.md b/games/candy_box2.md
index 98d6fef0..637f4b24 100644
--- a/games/candy_box2.md
+++ b/games/candy_box2.md
@@ -7,7 +7,7 @@ _Online text-based role-playing game featuring ASCII art._
 - State: mature, inactive since 2013
 - Play: https://candybox2.github.io/
 - Platform: Browser
-- Keywords: asciiart, role playing, text-based
+- Keywords: role playing, asciiart, text-based
 - Code repository: https://github.com/candybox2/candybox2.github.io.git
 - Code language: Typescript, Javascript
 - Code license: GPL-3.0
diff --git a/games/castle_game_engine.md b/games/castle_game_engine.md
index 6e8b15f2..e5ac05b1 100644
--- a/games/castle_game_engine.md
+++ b/games/castle_game_engine.md
@@ -5,7 +5,7 @@ _3D and 2D game engine using modern Object Pascal._
 - Home: https://castle-engine.io/
 - State: mature 
 - Download: (see home)
-- Keywords: framework, game engine
+- Keywords: game engine, framework
 - Code repository: https://github.com/castle-engine/castle-engine.git
 - Code language: Pascal
 - Code license: LGPL-2.0 (visual editor and some other assets GPL-2.0)
diff --git a/games/castle_of_the_winds.md b/games/castle_of_the_winds.md
index ffc7b086..fc790d7a 100644
--- a/games/castle_of_the_winds.md
+++ b/games/castle_of_the_winds.md
@@ -5,7 +5,7 @@ _Castle of the Winds remake._
 - Home: http://game.castleofthewinds.com/, http://mordrax.github.io/cotwmtor/
 - State: beta
 - Play: http://game.castleofthewinds.com/
-- Keywords: remake, role playing
+- Keywords: role playing, remake
 - Code repository: https://github.com/mordrax/cotwmtor.git
 - Code language: JavaScript
 - Code license: MIT
diff --git a/games/cataclysm.md b/games/cataclysm.md
index 88c9ccf2..7aed495e 100644
--- a/games/cataclysm.md
+++ b/games/cataclysm.md
@@ -4,7 +4,7 @@ _Post-apocalyptic roguelike._
 
 - Home: http://cataclysmrl.blogspot.com/
 - State: beta, inactive since 2012
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/Whales/Cataclysm.git
 - Code language: C++
 - Code license: CC-BY-SA-3
diff --git a/games/cataclysm_dark_days_ahead.md b/games/cataclysm_dark_days_ahead.md
index 6b20763d..8f2ad953 100644
--- a/games/cataclysm_dark_days_ahead.md
+++ b/games/cataclysm_dark_days_ahead.md
@@ -6,7 +6,7 @@ _Turn-based survival game set in a post-apocalyptic world._
 - State: mature 
 - Download: https://cataclysmdda.org/releases/
 - Platform: Windows, Linux, macOS
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/CleverRaven/Cataclysm-DDA.git
 - Code language: C++
 - Code license: CC-BY-SA-3.0
diff --git a/games/celestron.md b/games/celestron.md
index 65bfb773..24349c27 100644
--- a/games/celestron.md
+++ b/games/celestron.md
@@ -9,7 +9,7 @@ _Top-down space shooter in the legacy of Chromium BSU._
 - Code repository: https://git.code.sf.net/p/celestron/code, https://gitlab.com/osgames/celestron.git (+)
 - Code language: Python
 - Code license: GPL-3.0
-- Code dependencies: pygame, numpy
+- Code dependencies: numpy, pygame
 
 ## Building
 
diff --git a/games/childsplay.md b/games/childsplay.md
index ecd5763f..3f1e35da 100644
--- a/games/childsplay.md
+++ b/games/childsplay.md
@@ -10,7 +10,7 @@ _Collection of educational activities for young children._
 - Code repository: https://git.code.sf.net/p/childsplay/git, https://svn.code.sf.net/p/childsplay/code/ (svn), http://childsplay.cvs.sourceforge.net (cvs), https://git.code.sf.net/p/schoolsplay/code, https://svn.code.sf.net/p/schoolsplay/code-0/ (svn)
 - Code language: Python
 - Code license: GPL-3.0
-- Code dependencies: pygame, numpy
+- Code dependencies: numpy, pygame
 
 ## Building
 
diff --git a/games/choria.md b/games/choria.md
index 1e94ae0a..dfdf44ee 100644
--- a/games/choria.md
+++ b/games/choria.md
@@ -8,7 +8,7 @@ _An MMORPG that's all about grinding and doing chores._
 - Code repository: https://github.com/jazztickets/choria.git
 - Code language: C++, C, Lua
 - Code license: GPL-3.0
-- Code dependencies: SDL, Lua
+- Code dependencies: Lua, SDL
 
 ## Building
 
diff --git a/games/clou.md b/games/clou.md
index c6b1685d..5eb40693 100644
--- a/games/clou.md
+++ b/games/clou.md
@@ -6,7 +6,7 @@ _Remake of the 1986 game They Stole a Million._
 - Media: https://en.wikipedia.org/wiki/The_Clue!
 - State: beta
 - Download: https://sourceforge.net/projects/cosp/files/
-- Keywords: action/adventure, adventure
+- Keywords: adventure, action/adventure
 - Code repository: https://github.com/vcosta/derclou.git, https://sourceforge.net/p/cosp/code/ (cvs)
 - Code language: C
 - Code license: Custom (Der Clou! Public License)
diff --git a/games/colobot.md b/games/colobot.md
index af8915e1..168828d9 100644
--- a/games/colobot.md
+++ b/games/colobot.md
@@ -5,7 +5,7 @@ _Real-time strategy game, where you can program your units (bots) in a language
 - Home: https://colobot.info/
 - State: mature
 - Download: https://colobot.info/download-colobot-gold/
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://github.com/colobot/colobot.git
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/core_war.md b/games/core_war.md
index 9b41d4a0..230ca6b4 100644
--- a/games/core_war.md
+++ b/games/core_war.md
@@ -5,7 +5,7 @@ _Two or more battle programs (called "warriors") compete for control of a virtua
 - Home: https://corewar.co.uk/, http://www.corewar.info/, http://vyznev.net/corewar/guide.html, https://sourceforge.net/projects/corewar/, https://corewar.co.uk/standards/icws94.htm, http://www.corewar.info/emulator.htm
 - Media: https://en.wikipedia.org/wiki/Core_War
 - State: mature
-- Keywords: programming, simulation
+- Keywords: simulation, programming
 - Code repository: https://gitlab.com/osgames/corewar.git (conversion from cvs), http://corewar.cvs.sourceforge.net (cvs)
 - Code language: C, Java
 - Code license: GPL-2.0 (C part), 2-clause BSD (Java part)
diff --git a/games/crossfire.md b/games/crossfire.md
index 0622c291..446c0309 100644
--- a/games/crossfire.md
+++ b/games/crossfire.md
@@ -6,7 +6,7 @@ _Cooperative multiplayer graphical RPG and adventure game._
 - Media: https://en.wikipedia.org/wiki/Crossfire_(1992_video_game)
 - State: mature
 - Download: http://crossfire.real-time.com/download/index.html, https://sourceforge.net/projects/crossfire/files/
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://svn.code.sf.net/p/crossfire/code/ (svn)
 - Code language: C, Java
 - Code license: GPL-2.0
diff --git a/games/daimonin.md b/games/daimonin.md
index 74c302e8..6dff759f 100644
--- a/games/daimonin.md
+++ b/games/daimonin.md
@@ -6,7 +6,7 @@ _Massively Multiplayer On-line Role-playing Game (MMORPG)._
 - Media: <https://en.wikipedia.org/wiki/Crossfire_(1992_video_game)#Influence_on_other_online_games>
 - State: mature
 - Download: https://www.daimonin.org/downloads/
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://svn.code.sf.net/p/daimonin/code/ (svn)
 - Code language: C
 - Code license: GPL-2.0
diff --git a/games/dark_destiny.md b/games/dark_destiny.md
index 82493f91..45926272 100644
--- a/games/dark_destiny.md
+++ b/games/dark_destiny.md
@@ -4,7 +4,7 @@ _Turn-based online space strategy game playable in internet browsers._
 
 - Home: http://www.darkdestiny.at/, http://www.thedarkdestiny.at/portalApp/#/, https://sourceforge.net/projects/darkdestiny/
 - State: mature, inactive since 2016
-- Keywords: massive multiplayer online, strategy
+- Keywords: strategy, massive multiplayer online
 - Code repository: https://gitlab.com/osgames/darkdestiny.git (import of svn), https://svn.code.sf.net/p/darkdestiny/code/ (svn)
 - Code language: Java, Javascript
 - Code license: GPL
diff --git a/games/dark_oberon.md b/games/dark_oberon.md
index a8858cd3..e72aea67 100644
--- a/games/dark_oberon.md
+++ b/games/dark_oberon.md
@@ -5,7 +5,7 @@ _Real-time strategy game similar to Warcraft II._
 - Home: http://dark-oberon.sourceforge.net/, https://sourceforge.net/projects/dark-oberon/
 - State: mature, inactive since 2009
 - Download: http://dark-oberon.sourceforge.net/?page=download
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - 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
diff --git a/games/darkcity.md b/games/darkcity.md
index 0895d999..48fda81b 100644
--- a/games/darkcity.md
+++ b/games/darkcity.md
@@ -6,7 +6,7 @@ _DarkCity is a MMORPG game, in text mode on the Internet._
 - State: mature, inactive since 2012
 - Download: https://sourceforge.net/projects/darkcity/files/
 - Keywords: role playing, text-based
-- Code repository: https://svn.code.sf.net/p/darkcity/code/ (svn)
+- Code repository: https://gitlab.com/osgames/darkcity.git (backup of svn), https://svn.code.sf.net/p/darkcity/code/ (svn)
 - Code language: PHP
 - Code license: GPL-3.0
 
diff --git a/games/deliantra.md b/games/deliantra.md
index f822aefe..8ad70624 100644
--- a/games/deliantra.md
+++ b/games/deliantra.md
@@ -5,7 +5,7 @@ _A cooperative multiplayer RPG and adventure game set in a classical medieval en
 - Home: http://www.deliantra.net/index.html
 - State: mature
 - Download: http://www.deliantra.net/play.html
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: http://cvs.schmorp.de/deliantra/ (cvs)
 - Code language: C
 - Code license: GPL-2.0
diff --git a/games/desmume.md b/games/desmume.md
index 149e8d46..f24a25ef 100644
--- a/games/desmume.md
+++ b/games/desmume.md
@@ -6,7 +6,7 @@ _Nintendo DS emulator._
 - State: mature, inactive since 2015
 - Download: http://desmume.org/download/, https://sourceforge.net/projects/desmume/files/
 - Platform: Windows, Linux, macOS
-- Keywords: emulator, framework
+- Keywords: framework, emulator
 - Code repository: https://github.com/TASVideos/desmume.git
 - Code language: C, C++
 - Code license: GPL-2.0
diff --git a/games/dfend_reloaded.md b/games/dfend_reloaded.md
index bbe403ef..80e7a25b 100644
--- a/games/dfend_reloaded.md
+++ b/games/dfend_reloaded.md
@@ -6,7 +6,7 @@ _Graphical environment for DOSBox._
 - State: mature, inactive since 2015
 - Download: http://dfendreloaded.sourceforge.net/Download.html, https://sourceforge.net/projects/dfendreloaded/files/D-Fend%20Reloaded/
 - Platform: Windows
-- Keywords: frontend, tool
+- Keywords: tool, frontend
 - Code repository: (see download)
 - Code language: Pascal
 - Code license: GPL
diff --git a/games/domination.md b/games/domination.md
index 3c5239dc..f3351481 100644
--- a/games/domination.md
+++ b/games/domination.md
@@ -6,7 +6,7 @@ _Is a bit like the well known board game of Risk or RisiKo._
 - State: mature
 - Download: http://domination.sourceforge.net/download.shtml, https://sourceforge.net/projects/domination/files/
 - Platform: Windows, Linux, macOS, Android
-- Keywords: board game, risklike, strategy
+- Keywords: strategy, board game, risklike
 - Code repository: https://svn.code.sf.net/p/domination/code/Domination (svn)
 - Code language: Java
 - Code license: GPL-3.0
diff --git a/games/doxygen.md b/games/doxygen.md
index a1285b6f..9464b11f 100644
--- a/games/doxygen.md
+++ b/games/doxygen.md
@@ -6,7 +6,7 @@ _Tool for generating documentation from annotated C++ sources._
 - Media: https://en.wikipedia.org/wiki/Doxygen
 - State: mature
 - Download: http://www.doxygen.nl/download.html
-- Keywords: library, source documentation generator, tool
+- Keywords: tool, library, source documentation generator
 - Code repository: https://github.com/doxygen/doxygen.git
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/dreamchess.md b/games/dreamchess.md
index ee10fb70..6433925f 100644
--- a/games/dreamchess.md
+++ b/games/dreamchess.md
@@ -6,7 +6,7 @@ _3D chess game._
 - State: beta
 - Download: https://www.dreamchess.org/downloads, https://sourceforge.net/projects/dreamchess/files/
 - Platform: Windows, Linux, macOS
-- Keywords: board game, chess, strategy
+- Keywords: strategy, board game, chess
 - Code repository: https://github.com/dreamchess/dreamchess.git
 - Code language: C
 - Code license: GPL-3.0
diff --git a/games/drl.md b/games/drl.md
index 1a874340..914eb9a3 100644
--- a/games/drl.md
+++ b/games/drl.md
@@ -7,7 +7,7 @@ _Fast and furious coffee-break Roguelike game that is heavily inspired by Doom._
 - State: mature
 - Download: https://drl.chaosforge.org/downloads
 - Platform: Windows, Linux, macOS
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/ChaosForge/doomrl.git
 - Code language: Lua, Pascal
 - Code license: GPL-2.0
diff --git a/games/dune_dynasty.md b/games/dune_dynasty.md
index ce608454..a511a985 100644
--- a/games/dune_dynasty.md
+++ b/games/dune_dynasty.md
@@ -5,7 +5,7 @@ _Continuation of the classic real-time strategy game Dune II by Westwood Studios
 - Home: http://dunedynasty.sourceforge.net/, https://sourceforge.net/projects/dunedynasty/
 - State: mature, inactive since 2014
 - Download: https://sourceforge.net/projects/dunedynasty
-- Keywords: requires original content (Dune 2), strategy
+- Keywords: strategy, requires original content (Dune 2)
 - Code repository: https://git.code.sf.net/p/dunedynasty/dunedynasty, https://gitlab.com/osgames/dunedynasty.git (+)
 - Code language: C
 - Code license: GPL-2.0
diff --git a/games/dune_ii_the_maker.md b/games/dune_ii_the_maker.md
index 5150f97c..62f92b08 100644
--- a/games/dune_ii_the_maker.md
+++ b/games/dune_ii_the_maker.md
@@ -5,7 +5,7 @@ _Clone of the good old Dune II by Westwood Studios._
 - Home: http://dune2themaker.fundynamic.com/
 - State: beta
 - Download: http://dune2themaker.fundynamic.com/?page_id=11
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://github.com/Fundynamic/dune2themaker4j.git
 - Code language: Java
 - Code license: MIT
diff --git a/games/dune_legacy.md b/games/dune_legacy.md
index 47a4d881..e504fc36 100644
--- a/games/dune_legacy.md
+++ b/games/dune_legacy.md
@@ -5,7 +5,7 @@ _Updated clone of Westwood Studios' Dune2 which uses data files from the origina
 - Home: http://dunelegacy.sourceforge.net/website/, https://sourceforge.net/projects/dunelegacy
 - State: mature
 - Download: http://dunelegacy.sourceforge.net/website/downloads.html, https://sourceforge.net/projects/dunelegacy/files
-- Keywords: requires original content, strategy
+- Keywords: strategy, requires original content
 - Code repository: https://git.code.sf.net/p/dunelegacy/code
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/dungeon_crawl_stone_soup.md b/games/dungeon_crawl_stone_soup.md
index c6740b6f..d4f796a5 100644
--- a/games/dungeon_crawl_stone_soup.md
+++ b/games/dungeon_crawl_stone_soup.md
@@ -5,7 +5,7 @@ _Roguelike adventure through dungeons filled with dangerous monsters in a quest
 - Home: http://crawl.develz.org/
 - State: mature
 - Download: http://crawl.develz.org/download.htm
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/crawl/crawl.git
 - Code language: C++, Lua
 - Code license: GPL-2.0
diff --git a/games/easyrpgplayer.md b/games/easyrpgplayer.md
index 3e52cbb6..a3c9d1ff 100644
--- a/games/easyrpgplayer.md
+++ b/games/easyrpgplayer.md
@@ -12,5 +12,5 @@ _EasyRPG Player is a program that allows to play games created with RPG Maker 20
 
 ## Building
 
-- Build system: CMake, Autoconf
+- Build system: Autoconf, CMake
 
diff --git a/games/eat_the_whistle.md b/games/eat_the_whistle.md
index 344478f2..85432cda 100644
--- a/games/eat_the_whistle.md
+++ b/games/eat_the_whistle.md
@@ -6,7 +6,7 @@ _Football simulation game_
 - State: mature, inactive since 2017
 - Download: https://sourceforge.net/projects/etw/files/
 - Platform: Windows, Linux, macOS
-- Keywords: football, simulation
+- Keywords: simulation, football
 - Code repository: https://svn.code.sf.net/p/etw/code/ (svn), http://etw.cvs.sourceforge.net/viewvc/ (cvs)
 - Code language: C
 - Code license: ?
diff --git a/games/endgame_singularity.md b/games/endgame_singularity.md
index 701ab19d..63e8e2ef 100644
--- a/games/endgame_singularity.md
+++ b/games/endgame_singularity.md
@@ -5,7 +5,7 @@ _A simulation of a true AI_
 - Home: http://www.emhsoft.com/singularity/
 - State: beta
 - Download: (see home)
-- Keywords: singleplayer, strategy
+- Keywords: strategy, singleplayer
 - Code repository: https://github.com/singularity/singularity.git
 - Code language: Python
 - Code license: GPL-2.0
diff --git a/games/endless_sky.md b/games/endless_sky.md
index 7dca7f78..bf5e04a9 100644
--- a/games/endless_sky.md
+++ b/games/endless_sky.md
@@ -6,7 +6,7 @@ _2D space trading and combat game similar to the classic Escape Velocity series.
 - Media: https://en.wikipedia.org/wiki/Escape_Velocity_(video_game)#Legacy
 - State: mature
 - Download: https://github.com/endless-sky/endless-sky/releases
-- Keywords: popular, role playing
+- Keywords: role playing, popular
 - Code repository: https://github.com/endless-sky/endless-sky.git
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/enigma_engine.md b/games/enigma_engine.md
index 7efa1199..09e2b5e2 100644
--- a/games/enigma_engine.md
+++ b/games/enigma_engine.md
@@ -6,7 +6,7 @@ _ENIGMA is a free development environment geared towards game development._
 - Media: https://en.wikipedia.org/wiki/Enigma_Engine
 - State: mature
 - Download: https://enigma-dev.org/download.htm
-- Keywords: 3D, framework
+- Keywords: framework, 3D
 - Code repository: https://github.com/enigma-dev/enigma-dev.git
 - Code language: C++, C
 - Code license: GPL-3.0
diff --git a/games/epoh.md b/games/epoh.md
index 9ff704fd..faa1b8a9 100644
--- a/games/epoh.md
+++ b/games/epoh.md
@@ -4,7 +4,7 @@ _Multiplayer turn-based browser strategy game._
 
 - Home: https://github.com/tautvilas/epoh
 - State: beta
-- Keywords: online, strategy
+- Keywords: strategy, online
 - Code repository: https://github.com/tautvilas/epoh.git
 - Code language: JavaScript
 - Code license: MIT
diff --git a/games/eternal_lands.md b/games/eternal_lands.md
index a6642565..d9abb200 100644
--- a/games/eternal_lands.md
+++ b/games/eternal_lands.md
@@ -6,7 +6,7 @@ _Multiplayer, online role-playing game (MMORPG)._
 - Media: https://en.wikipedia.org/wiki/Eternal_Lands
 - State: mature
 - Download: http://www.eternal-lands.com/page/download.php
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://github.com/raduprv/Eternal-Lands.git
 - Code language: C, C++
 - Code license: Custom (modified QTPL: https://raw.githubusercontent.com/raduprv/Eternal-Lands/master/eternal_lands_license.txt)
diff --git a/games/evol_online.md b/games/evol_online.md
index fb6ae8f7..d4180121 100644
--- a/games/evol_online.md
+++ b/games/evol_online.md
@@ -5,7 +5,7 @@ _A homely MMORPG._
 - Home: http://evolonline.org/
 - State: mature
 - Download: http://evolonline.org/manaplus
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://gitlab.com/evol/evol-all.git
 - Code language: C
 - Code license: GPL-3.0
diff --git a/games/fall_of_imiryn.md b/games/fall_of_imiryn.md
index 59fab843..d1fc4886 100644
--- a/games/fall_of_imiryn.md
+++ b/games/fall_of_imiryn.md
@@ -9,7 +9,7 @@ _The first serious game using the Annchienta engine._
 - Code repository: https://github.com/sago007/annchienta.git, https://svn.code.sf.net/p/annchienta/code/ (svn)
 - Code language: C++, Python
 - Code license: GPL-3.0
-- Code dependencies: PyQt4, pygtk
+- Code dependencies: pygtk, PyQt4
 
 See also entry fo Annchienta.
 
diff --git a/games/fallen_spire.md b/games/fallen_spire.md
index d345457e..f206f361 100644
--- a/games/fallen_spire.md
+++ b/games/fallen_spire.md
@@ -8,7 +8,7 @@ _RPG adventure game written in PyGame._
 - Code repository: https://github.com/BGCX067/fallenspire-svn-to-git.git, https://code.google.com/archive/p/fallenspire/source/default/source
 - Code language: Python
 - Code license: GPL-3.0
-- Code dependencies: pygame, pillow, cairo, numpy, Blender, pgu (https://code.google.com/archive/p/pgu/)
+- Code dependencies: Blender game engine, cairo, numpy, pgu (https://code.google.com/archive/p/pgu/), pillow, pygame
 
 ## Building
 
diff --git a/games/fish_fillets_ng.md b/games/fish_fillets_ng.md
index ed39e70f..59c3cc87 100644
--- a/games/fish_fillets_ng.md
+++ b/games/fish_fillets_ng.md
@@ -7,7 +7,7 @@ _Port of the wonderful puzzle game Fish Fillets from ALTAR interactive._
 - State: mature, inactive since 2011
 - Download: http://fillets.sourceforge.net/download.php
 - Platform: Windows, Linux, macOS
-- Keywords: port, puzzle
+- Keywords: puzzle, port
 - Code repository: https://git.code.sf.net/p/fillets/code-fillets-ng, http://fillets.cvs.sourceforge.net (cvs)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/free_orion.md b/games/free_orion.md
index 5a4f28c6..a932acc3 100644
--- a/games/free_orion.md
+++ b/games/free_orion.md
@@ -10,7 +10,7 @@ _Turn-based space empire and galactic conquest (4X) computer game._
 - Code repository: https://github.com/freeorion/freeorion.git, https://svn.code.sf.net/p/freeorion/code/ (svn)
 - Code language: C++, Python
 - Code license: GPL-2.0
-- Code dependencies: PyLab, SDL, zlib, OpenAL, Ogg, Vorbis, Freetype, OpenGL, Boost
+- Code dependencies: Boost, Freetype, Ogg, OpenAL, OpenGL, PyLab, SDL, Vorbis, zlib
 
 ## Building
 
diff --git a/games/free_synd.md b/games/free_synd.md
index 07ba8b14..1ae0cb51 100644
--- a/games/free_synd.md
+++ b/games/free_synd.md
@@ -5,7 +5,7 @@ _Reimplementation of the classic Bullfrog game, Syndicate._
 - Home: http://freesynd.sourceforge.net/, https://sourceforge.net/projects/freesynd/
 - State: beta
 - Download: https://sourceforge.net/projects/freesynd/files/
-- Keywords: requires original content (Syndicate), strategy
+- Keywords: strategy, requires original content (Syndicate)
 - Code repository: https://svn.code.sf.net/p/freesynd/code/ (svn)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/freeciv.md b/games/freeciv.md
index b2172e93..8a8954b8 100644
--- a/games/freeciv.md
+++ b/games/freeciv.md
@@ -6,7 +6,7 @@ _Freeciv is a Free and Open Source empire-building strategy game inspired by the
 - Media: https://en.wikipedia.org/wiki/Freeciv
 - State: mature
 - Download: http://www.freeciv.org/download.html
-- Keywords: multiplayer, strategy, turn-based
+- Keywords: strategy, multiplayer, turn-based
 - Code repository: https://github.com/freeciv/freeciv.git
 - Code language: C
 - Code license: GPL-2.0
diff --git a/games/freeciv_web.md b/games/freeciv_web.md
index c6d2b367..aaca471b 100644
--- a/games/freeciv_web.md
+++ b/games/freeciv_web.md
@@ -5,7 +5,7 @@ _Freeciv-web is a version of Freeciv playable online in any modern web browser._
 - Home: https://web.archive.org/web/20180102150750/https://play.freeciv.org/
 - Media: https://en.wikipedia.org/wiki/Freeciv#Freeciv_WebGL_3D_and_Freeciv-web
 - State: mature
-- Keywords: online, strategy, turn-based
+- Keywords: strategy, online, turn-based
 - Code repository: https://github.com/freeciv/freeciv-web.git
 - Code language: JavaScript, Java
 - Code license: AGPL-3.0
diff --git a/games/freecol.md b/games/freecol.md
index 9b52a3b9..1e6743af 100644
--- a/games/freecol.md
+++ b/games/freecol.md
@@ -6,7 +6,7 @@ _FreeCol is a turn-based strategy game based on the old game Colonization, and s
 - Media: https://en.wikipedia.org/wiki/FreeCol
 - State: mature
 - Download: http://www.freecol.org/download.html
-- Keywords: multiplayer, strategy, turn-based
+- Keywords: strategy, multiplayer, turn-based
 - Code repository: https://git.code.sf.net/p/freecol/git
 - Code language: Java
 - Code license: GPL-2.0
diff --git a/games/freedink.md b/games/freedink.md
index 84ad216d..2329cd04 100644
--- a/games/freedink.md
+++ b/games/freedink.md
@@ -6,7 +6,7 @@ _Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view
 - Media: https://en.wikipedia.org/wiki/Dink_Smallwood#GNU_FreeDink
 - State: mature
 - Download: https://www.gnu.org/software/freedink/get
-- Keywords: remake, role playing
+- Keywords: role playing, remake
 - Code repository: https://git.savannah.gnu.org/git/freedink.git
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/freedroid.md b/games/freedroid.md
index 1c9a98ce..991142de 100644
--- a/games/freedroid.md
+++ b/games/freedroid.md
@@ -6,7 +6,7 @@ _Open source role playing game._
 - Media: https://de.wikipedia.org/wiki/FreedroidRPG (German)
 - State: mature
 - Download: http://www.freedroid.org/download/
-- Keywords: isometric, role playing, singleplayer
+- Keywords: role playing, isometric, singleplayer
 - Code repository: https://gitlab.com/freedroid/freedroid-src.git, https://git.code.sf.net/p/freedroid/code
 - Code language: C
 - Code license: GPL-2.0
diff --git a/games/freerails.md b/games/freerails.md
index b8e52ecb..cbd9af32 100644
--- a/games/freerails.md
+++ b/games/freerails.md
@@ -5,7 +5,7 @@ _Real time MP strategy game where players compete to build the most powerful rai
 - Home: http://freerails.sourceforge.net/
 - State: beta
 - Download: https://sourceforge.net/projects/freerails/files/jfreerails/
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://sourceforge.net/p/freerails/code/ (cvs)
 - Code language: Java
 - Code license: GPL-2.0
diff --git a/games/freerct.md b/games/freerct.md
index c6e45baf..37548eba 100644
--- a/games/freerct.md
+++ b/games/freerct.md
@@ -4,7 +4,7 @@ _Game which captures the look, feel and gameplay of the popular games RollerCoas
 
 - Home: https://web.archive.org/web/*/http://www.freerct.org/, http://freerct.blogspot.com/
 - State: beta, inactive since 2016
-- Keywords: inspired (by RCT 1 and 2), strategy
+- Keywords: strategy, inspired (by RCT 1 and 2)
 - Code repository: https://github.com/FreeRCT/FreeRCT.git
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/freeserf.md b/games/freeserf.md
index d9fa9814..2df14bea 100644
--- a/games/freeserf.md
+++ b/games/freeserf.md
@@ -5,7 +5,7 @@ _Clone of the brilliant simulation game The Settlers 1 aka Serf City._
 - Home: http://jonls.dk/freeserf/
 - State: beta
 - Download: https://github.com/freeserf/freeserf/releases
-- Keywords: remake, requires original content (Settlers 1), strategy
+- Keywords: strategy, remake, requires original content (Settlers 1)
 - Code repository: https://github.com/freeserf/freeserf.git
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/fujo.md b/games/fujo.md
index 641202fd..e60fc1b2 100644
--- a/games/fujo.md
+++ b/games/fujo.md
@@ -14,4 +14,4 @@ _Fairly classical roguelike, but with animated graphics._
 
 ## Building
 
-- Build system: setup.py, py2exe
+- Build system: py2exe, setup.py
diff --git a/games/galaxymage_redux.md b/games/galaxymage_redux.md
index baf819b3..f50a0b20 100644
--- a/games/galaxymage_redux.md
+++ b/games/galaxymage_redux.md
@@ -8,7 +8,7 @@ _Attempt to revitalize the open source game, GalaxyMage with a fresh codebase._
 - Code repository: https://github.com/LibreGamesArchive/galaxymageredux.git, https://code.google.com/archive/p/galaxymageredux/source
 - Code language: Python
 - Code license: GPL-2.0
-- Code dependencies: pygame, numpy, PyOpenGL, Twisted, Zope
+- Code dependencies: numpy, pygame, PyOpenGL, Twisted, Zope
 
 ## Building
 
diff --git a/games/gearhead.md b/games/gearhead.md
index 292ba29c..40db573b 100644
--- a/games/gearhead.md
+++ b/games/gearhead.md
@@ -5,7 +5,7 @@ _Roguelike mecha RPG series._
 - Home: http://www.gearheadrpg.com/
 - State: mature
 - Download: http://www.gearheadrpg.com/downloads/
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/jwvhewitt/gearhead-1.git, https://github.com/jwvhewitt/gearhead-2.git (+), https://github.com/jwvhewitt/gearhead-caramel.git (+), https://github.com/jwvhewitt/dmeternal.git (+)
 - Code language: Pascal
 - Code license: LGPL-2.1, Apache-2.0
diff --git a/games/gemrb.md b/games/gemrb.md
index 5d57d02b..549556fd 100644
--- a/games/gemrb.md
+++ b/games/gemrb.md
@@ -5,11 +5,11 @@ _GemRB is a portable open-source implementation of Bioware's Infinity Engine._
 - Home: http://www.gemrb.org/wiki/doku.php?id=start
 - State: mature
 - Download: http://www.gemrb.org/wiki/doku.php?id=download
-- Keywords: 2D, framework, isometric
+- Keywords: framework, 2D, isometric
 - Code repository: https://github.com/gemrb/gemrb.git
 - Code language: C++, Python
 - Code license: GPL-2.0
-- Code dependencies: SDL2, zlib, OpenAL, Twisted
+- Code dependencies: OpenAL, SDL2, Twisted, zlib
 
 Requires original game content.
 
diff --git a/games/gigalomania.md b/games/gigalomania.md
index 1743a72b..8b1b2638 100644
--- a/games/gigalomania.md
+++ b/games/gigalomania.md
@@ -4,7 +4,7 @@ _A 2D real time strategy Mega-Lo-Mania-like god game._
 
 - Home: http://gigalomania.sourceforge.net/, https://sourceforge.net/p/gigalomania/
 - State: mature
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://git.code.sf.net/p/gigalomania/code
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/glest.md b/games/glest.md
index 9725414d..9b9e2149 100644
--- a/games/glest.md
+++ b/games/glest.md
@@ -6,7 +6,7 @@ _Glest is a free 3D real-time strategy game._
 - Media: https://en.wikipedia.org/wiki/Glest
 - State: mature, inactive since 2009
 - Download: http://glest.org/en/downloads.php
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - 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/globulation2.md b/games/globulation2.md
index c1462617..fcc9f072 100644
--- a/games/globulation2.md
+++ b/games/globulation2.md
@@ -6,7 +6,7 @@ _Real-Time Strategy (RTS) game which reduces micro-management by automatically a
 - Media: https://en.wikipedia.org/wiki/Globulation_2
 - State: mature
 - Download: https://globulation2.org/wiki/Download_and_Install
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://bitbucket.org/giszmo/glob2 (hg)
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/goblin_hack.md b/games/goblin_hack.md
index ebddd650..7416abcf 100644
--- a/games/goblin_hack.md
+++ b/games/goblin_hack.md
@@ -5,7 +5,7 @@ _A roguelike OpenGL-based smooth-scrolling ASCII graphics game._
 - Home: https://sourceforge.net/projects/goblinhack/
 - State: beta, inactive since 2009
 - Download: https://sourceforge.net/projects/goblinhack/files/
-- Keywords: roguelike, role playing, singleplayer
+- Keywords: role playing, roguelike, singleplayer
 - Code repository: https://github.com/goblinhack/goblinhack.git, https://sourceforge.net/p/goblinhack/code/HEAD/tree/ (svn)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/golly.md b/games/golly.md
index cf4d269b..8abf4289 100644
--- a/games/golly.md
+++ b/games/golly.md
@@ -6,7 +6,7 @@ _Conway's Game of Life and many other types of cellular automata._
 - State: mature 
 - Download: https://sourceforge.net/projects/golly/files/, https://play.google.com/store/apps/details?id=net.sf.golly
 - Platform: Windows, Linux, macOS, Android
-- Keywords: game of life, simulation
+- Keywords: simulation, game of life
 - Code repository: https://git.code.sf.net/p/golly/code
 - Code language: C++, Java
 - Code license: GPL-2.0
diff --git a/games/grobots.md b/games/grobots.md
index fbded957..10a84bc3 100644
--- a/games/grobots.md
+++ b/games/grobots.md
@@ -6,7 +6,7 @@ _A real-time strategy programming game, in which you control teams of robots as
 - State: mature, inactive since 2014 
 - Download: (see home)
 - Platform: Windows, Linux, macOS
-- Keywords: programming, simulation
+- Keywords: simulation, programming
 - Code repository: http://hg.code.sf.net/p/grobots/trunk (hg), https://gitlab.com/osgames/grobots.git (+)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/harris.md b/games/harris.md
index 4dac2668..f844ed96 100644
--- a/games/harris.md
+++ b/games/harris.md
@@ -8,7 +8,7 @@ _Based around the actions of RAF Bomber Command in the Second World War._
 - Code repository: https://github.com/ec429/harris.git
 - Code language: C, Python
 - Code license: GPL-3.0
-- Code dependencies: SDL, zlib, libpng, libtiff, Freetype, numpy, Matplotlib
+- Code dependencies: Freetype, libpng, libtiff, Matplotlib, numpy, SDL, zlib
 
 ## Building
 
diff --git a/games/hero_of_allacrost.md b/games/hero_of_allacrost.md
index 26d6c4aa..ce6e2be8 100644
--- a/games/hero_of_allacrost.md
+++ b/games/hero_of_allacrost.md
@@ -5,7 +5,7 @@ _Hero of Allacrost is a 2D role-playing game inspired by classic console RPGs._
 - Home: http://allacrost.org
 - State: mature
 - Download: https://bitbucket.org/allacrost/allacrost/downloads/
-- Keywords: 2D, role playing, singleplayer
+- Keywords: role playing, 2D, singleplayer
 - Code repository: https://bitbucket.org/allacrost/allacrost/src (hg)
 - Code language: C++, Lua
 - Code license: GPL-2.0
diff --git a/games/heroes_of_wing_commander.md b/games/heroes_of_wing_commander.md
index 6aa29f51..62b75f83 100644
--- a/games/heroes_of_wing_commander.md
+++ b/games/heroes_of_wing_commander.md
@@ -9,7 +9,7 @@ _A fan base strategy game based on the Origin's Wing Commander universe._
 - 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
-- Code dependencies: pygame, NetworkX
+- Code dependencies: NetworkX, pygame
 
 ## Building
 
diff --git a/games/hexwar.md b/games/hexwar.md
index 2d1184fc..75dc5d9c 100644
--- a/games/hexwar.md
+++ b/games/hexwar.md
@@ -4,7 +4,7 @@ _Simple turn based, hexagon map, strategy game in the tradition of Panzer Genera
 
 - Home: https://github.com/mgfreshour/hexwar
 - State: beta, inactive since 2012
-- Keywords: online, strategy, turn-based
+- Keywords: strategy, online, turn-based
 - Code repository: https://github.com/mgfreshour/hexwar.git
 - Code language: Ruby, JavaScript
 - Code license: MIT
diff --git a/games/holyspirit.md b/games/holyspirit.md
index 8c33eeb1..949f9fe4 100644
--- a/games/holyspirit.md
+++ b/games/holyspirit.md
@@ -5,7 +5,7 @@ _2D isometric hack'n'slash game (action-rpg)._
 - Home: https://sourceforge.net/projects/lechemindeladam/
 - State: beta, inactive since 2013
 - Download: https://sourceforge.net/projects/lechemindeladam/files
-- Keywords: action-rpg, role playing
+- Keywords: role playing, action-rpg
 - 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
diff --git a/games/hyperrogue.md b/games/hyperrogue.md
index 4de7f9e7..ed84f81f 100644
--- a/games/hyperrogue.md
+++ b/games/hyperrogue.md
@@ -7,7 +7,7 @@ _Roguelike inspired by the puzzle game Deadly Rooms of Death and the art of M. C
 - State: mature
 - Download: http://roguetemple.com/z/hyper/download.php
 - Platform: Windows, Linux, macOS, Android (some versions)
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/zenorogue/hyperrogue.git
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/ilarion.md b/games/ilarion.md
index 7139ee64..4a68271e 100644
--- a/games/ilarion.md
+++ b/games/ilarion.md
@@ -5,7 +5,7 @@ _Free Open Source-MMORPG, with emphasis on real roleplay._
 - Home: http://illarion.org/general/de_startpage.php (German)
 - State: mature
 - Download: http://illarion.org/illarion/de_java_download.php
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://github.com/Illarion-eV/Illarion-Java.git (https://github.com/Illarion-eV), https://github.com/Illarion-eV/Illarion-Server.git (+), https://github.com/Illarion-eV/Illarion-Content.git (+)
 - Code language: C++, Java, Lua
 - Code license: GPL-3.0
diff --git a/games/imperium.md b/games/imperium.md
index 6e9ca801..0f4c391f 100644
--- a/games/imperium.md
+++ b/games/imperium.md
@@ -5,7 +5,7 @@ _A game of intergalactic exploration, warfare, and economics._
 - Home: https://empiredirectory.net/index.php
 - State: mature
 - Download: https://empiredirectory.net/index.php/new-downloads
-- Keywords: console, role playing
+- Keywords: role playing, console
 - Code repository: (see download)
 - Code language: ?
 - Code license: ?
diff --git a/games/infiniminer.md b/games/infiniminer.md
index d6c53288..a1a9fc8a 100644
--- a/games/infiniminer.md
+++ b/games/infiniminer.md
@@ -6,7 +6,7 @@ _Multi-player block-based sandbox building and digging game._
 - Media: https://en.wikipedia.org/wiki/Zachtronics#Infiniminer
 - State: mature, inactive since 2016
 - Download: https://code.google.com/archive/p/infiniminer/source/default/source
-- Keywords: blocks, sandbox, simulation
+- Keywords: simulation, blocks, sandbox
 - Code repository: (see download)
 - Code language: C#
 - Code license: MIT
diff --git a/games/irrlicht.md b/games/irrlicht.md
index c332a5de..2089f95d 100644
--- a/games/irrlicht.md
+++ b/games/irrlicht.md
@@ -6,7 +6,7 @@ _The Irrlicht Engine is an open source high performance real time 3D engine._
 - Media: https://en.wikipedia.org/wiki/Irrlicht_Engine
 - State: mature
 - Download: http://irrlicht.sourceforge.net/?page_id=10
-- Keywords: 3D, framework
+- Keywords: framework, 3D
 - Code repository: https://github.com/zaki/irrlicht.git (mirror), https://sourceforge.net/p/irrlicht/code/HEAD/tree/ (svn)
 - Code language: C++, C
 - Code license: zlib
diff --git a/games/iter_vehemens_ad_necem.md b/games/iter_vehemens_ad_necem.md
index 78961332..1448b8b2 100644
--- a/games/iter_vehemens_ad_necem.md
+++ b/games/iter_vehemens_ad_necem.md
@@ -5,7 +5,7 @@ _Graphical roguelike game with advanced bodypart and material handling, multi-co
 - Home: https://attnam.com/, https://sourceforge.net/projects/ivan/
 - State: beta
 - Download: https://attnam.com/projects
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/Attnam/ivan.git, https://sourceforge.net/p/ivan/code/ (cvs)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/jagged_alliance2.md b/games/jagged_alliance2.md
index 655b0b55..293c0811 100644
--- a/games/jagged_alliance2.md
+++ b/games/jagged_alliance2.md
@@ -4,7 +4,7 @@ _An improved, cross-platform, stable Jagged Alliance 2 runtime._
 
 - Home: https://ja2-stracciatella.github.io/
 - State: mature
-- Keywords: requires original content, strategy
+- Keywords: strategy, requires original content
 - Code repository: https://github.com/ja2-stracciatella/ja2-stracciatella.git
 - Code language: C++
 - Code license: Custom (various)
diff --git a/games/jsettlers.md b/games/jsettlers.md
index 6c85f105..76a77f76 100644
--- a/games/jsettlers.md
+++ b/games/jsettlers.md
@@ -5,7 +5,7 @@ _Web-based version of the board game Settlers of Catan written in Java._
 - Home: https://sourceforge.net/projects/jsettlers/, https://sourceforge.net/projects/jsettlers2/
 - State: mature
 - Download: https://sourceforge.net/projects/jsettlers/files/, https://sourceforge.net/projects/jsettlers2/files/
-- Keywords: board game, strategy
+- Keywords: strategy, board game
 - Code repository: https://github.com/jdmonin/JSettlers2.git, https://sourceforge.net/p/jsettlers/code (cvs), https://sourceforge.net/p/jsettlers2/code/ (cvs)
 - Code language: Java
 - Code license: GPL-3.0
diff --git a/games/kingdoms.md b/games/kingdoms.md
index cbe4a791..97b86739 100644
--- a/games/kingdoms.md
+++ b/games/kingdoms.md
@@ -10,7 +10,7 @@ _Strategy game where you lead a nation throughout history.._
 - Code repository: https://github.com/anttisalonen/kingdoms.git
 - Code language: C++
 - Code license: GPL-3.0
-- Code dependencies: Boost, SDL, zlib, libpng 
+- Code dependencies: Boost, libpng, SDL, zlib
 
 ## Building
 
diff --git a/games/knights_and_merchants_remake.md b/games/knights_and_merchants_remake.md
index 1db3edfd..eaef3d75 100644
--- a/games/knights_and_merchants_remake.md
+++ b/games/knights_and_merchants_remake.md
@@ -5,7 +5,7 @@ _An unofficial fan-made mod for the game Knights and Merchants._
 - Home: http://www.kamremake.com/
 - State: mature
 - Download: http://www.kamremake.com/download/
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://github.com/Kromster80/kam_remake.git
 - Code language: Pascal
 - Code license: AGPL-3.0
diff --git a/games/linleys_dungeon_crawl.md b/games/linleys_dungeon_crawl.md
index 4c565380..e9979ace 100644
--- a/games/linleys_dungeon_crawl.md
+++ b/games/linleys_dungeon_crawl.md
@@ -6,7 +6,7 @@ _Roguelike molded in the tradition of the early greats of the genre: Rogue, Hack
 - Media: https://en.wikipedia.org/wiki/Linley%27s_Dungeon_Crawl, http://nethack.wikia.com/wiki/Linley%27s_Dungeon_Crawl
 - State: mature, inactive since 2006
 - Download: http://www.dungeoncrawl.org/?d (ftp://ftp.dungeoncrawl.org/)
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - 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/lugaru.md b/games/lugaru.md
index d948bf55..fcbc4fd9 100644
--- a/games/lugaru.md
+++ b/games/lugaru.md
@@ -11,7 +11,7 @@ _Cross-platform third-person action game with an anthropomorphic rebel bunny rab
 - Code repository: https://gitlab.com/osslugaru/lugaru.git
 - Code language: C++
 - Code license: GPL-2.0
-- Code dependencies: SDL2, OpenAL
+- Code dependencies: OpenAL, SDL2
 - Assets license: CC-BY-SA-3.0
 
 ## Building
diff --git a/games/lumix.md b/games/lumix.md
index 2a7ac358..30cac522 100644
--- a/games/lumix.md
+++ b/games/lumix.md
@@ -5,7 +5,7 @@ _3D Game Engine_
 - Home: https://github.com/nem0/lumixengine
 - State: beta
 - Download: https://github.com/nem0/LumixEngine/releases
-- Keywords: 3D, framework
+- Keywords: framework, 3D
 - Code repository: https://github.com/nem0/lumixengine.git, https://github.com/nem0/lumixengine_data.git (related)
 - Code language: C++
 - Code license: MIT
diff --git a/games/magarena.md b/games/magarena.md
index d1626744..3a279c66 100644
--- a/games/magarena.md
+++ b/games/magarena.md
@@ -5,7 +5,7 @@ _Single-player fantasy card game played against a computer opponent._
 - Home: http://magarena.github.io/
 - State: mature
 - Download: https://github.com/magarena/magarena/releases/
-- Keywords: cards, role playing
+- Keywords: role playing, cards
 - Code repository: https://github.com/magarena/magarena.git
 - Code language: Java, Groovy
 - Code license: GPL-3.0
diff --git a/games/mana_world.md b/games/mana_world.md
index e4d35859..80835d69 100644
--- a/games/mana_world.md
+++ b/games/mana_world.md
@@ -5,7 +5,7 @@ _2D open source MMORPG._
 - Home: https://www.themanaworld.org/
 - State: mature
 - Download: https://www.themanaworld.org/index.php/Downloads
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://github.com/themanaworld/tmwa.git (https://github.com/themanaworld), https://gitlab.com/manaplus/manaplus.git (+)
 - Code language: PHP
 - Code license: GPL-2.0
diff --git a/games/maxr.md b/games/maxr.md
index e6cfd5a9..d29fe90e 100644
--- a/games/maxr.md
+++ b/games/maxr.md
@@ -5,7 +5,7 @@ _A remake of the old M.A.X. by Interplay from 1996._
 - Home: https://www.maxr.org/
 - State: beta, inactive since 2016
 - Download: https://www.maxr.org/docs.php?id=3
-- Keywords: requires original content (some versions), strategy
+- Keywords: strategy, requires original content (some versions)
 - Code repository: http://git.maxr.org/maxr/maxr.git
 - Code language: C++, C
 - Code license: GPL-2.0
diff --git a/games/megaglest.md b/games/megaglest.md
index 16c175d5..dbbd43e1 100644
--- a/games/megaglest.md
+++ b/games/megaglest.md
@@ -6,7 +6,7 @@ _MegaGlest is an entertaining free (freeware and free software) and open source
 - Media: https://en.wikipedia.org/wiki/MegaGlest
 - State: mature
 - Download: https://megaglest.org/download
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://github.com/MegaGlest/megaglest-source.git
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/meridian59.md b/games/meridian59.md
index 911b1cdc..b0357928 100644
--- a/games/meridian59.md
+++ b/games/meridian59.md
@@ -6,7 +6,7 @@ _A classic MMO._
 - Media: https://en.wikipedia.org/wiki/Meridian_59
 - State: mature
 - Download: http://meridian59.com/play-now.php
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://github.com/Meridian59/Meridian59.git
 - Code language: C++, C
 - Code license: GPL-2.0
diff --git a/games/mewl.md b/games/mewl.md
index f5c41baf..5e230be9 100644
--- a/games/mewl.md
+++ b/games/mewl.md
@@ -4,7 +4,7 @@ _Remake of the classic multiplayer economic strategy game M.U.L.E.._
 
 - Home: https://github.com/LionsPhil/mewl
 - State: beta (more like alpha), inactive since 2015
-- Keywords: remake, strategy
+- Keywords: strategy, remake
 - Code repository: https://github.com/LionsPhil/mewl.git
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/micropolis.md b/games/micropolis.md
index 215dd6ab..4ccd934e 100644
--- a/games/micropolis.md
+++ b/games/micropolis.md
@@ -5,11 +5,11 @@ _Micropolis is the open source version of SimCity Classic from Maxis._
 - Home: http://micropolisonline.com/
 - Media: <https://en.wikipedia.org/wiki/SimCity_(1989_video_game)#Micropolis>
 - State: mature
-- Keywords: online, simulation
+- Keywords: simulation, online
 - Code repository: https://github.com/simhacker/micropolis.git
 - Code language: C++, Java, Python
 - Code license: GPL-3.0
-- Code dependencies: pygobject, pycairo, pygtk, PyAMF, TurboGears, SQLAlchemy
+- Code dependencies: PyAMF, pycairo, pygobject, pygtk, SQLAlchemy, TurboGears
 
 ## Building
 
diff --git a/games/moria.md b/games/moria.md
index cca59541..532e83f5 100644
--- a/games/moria.md
+++ b/games/moria.md
@@ -6,7 +6,7 @@ _Roguelike computer game inspired by J. R. R. Tolkien's novel The Lord of the Ri
 - Media: https://en.wikipedia.org/wiki/Moria_(video_game)
 - State: mature (inactive between 2008-2016)
 - Download: https://umoria.org/download/, http://beej.us/moria/files/
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/dungeons-of-moria/umoria.git (since 2016), https://github.com/acahir/moria.git (copy of 5.6 plus a few commits)
 - Code language: C
 - Code license: GPL-3.0
diff --git a/games/nethack.md b/games/nethack.md
index cf189f87..8609f779 100644
--- a/games/nethack.md
+++ b/games/nethack.md
@@ -6,7 +6,7 @@ _Single player dungeon exploration game that runs on a wide variety of computer
 - Media: https://en.wikipedia.org/wiki/NetHack
 - State: mature
 - Download: https://www.nethack.org/common/index.html
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/NetHack/NetHack.git, https://github.com/Vanilla-NetHack/NetHack.git (+), https://git.code.sf.net/p/nethack/NetHack
 - Code language: C
 - Code license: Custom (Nethack General Public License)
diff --git a/games/netpanzer.md b/games/netpanzer.md
index 6b0ec543..50f64e36 100644
--- a/games/netpanzer.md
+++ b/games/netpanzer.md
@@ -5,7 +5,7 @@ _An online multiplayer tactical warfare game._
 - Home: http://www.netpanzer.info/
 - State: beta
 - Download: http://www.netpanzer.info/Download/
-- Keywords: multiplayer, online, real time, strategy
+- Keywords: strategy, multiplayer, online, real time
 - Code repository: https://github.com/BackupTheBerlios/netpanzer-svn.git (not up to date?), https://svn.code.sf.net/p/netpanzerfp/code/ (svn)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/netstatsbaseball.md b/games/netstatsbaseball.md
index 79996392..64b15e3b 100644
--- a/games/netstatsbaseball.md
+++ b/games/netstatsbaseball.md
@@ -5,7 +5,7 @@ _Major League Baseball Simulation._
 - Home: https://sourceforge.net/projects/nsbb/
 - State: mature
 - Download: https://sourceforge.net/projects/nsbb/files/
-- Keywords: simulation, sports
+- Keywords: sports, simulation
 - Code repository: http://nsbb.cvs.sourceforge.net (cvs)
 - Code language: C
 - Code license: ?
diff --git a/games/nlarn.md b/games/nlarn.md
index cf8479f7..11dc591c 100644
--- a/games/nlarn.md
+++ b/games/nlarn.md
@@ -6,7 +6,7 @@ _Rewrite of Noah Morgan's classic roguelike game Larn from 1986._
 - Media: https://en.wikipedia.org/wiki/Larn_(video_game)#External_links
 - State: mature
 - Download: https://github.com/nlarn/nlarn/releases, https://sourceforge.net/projects/nlarn/files/nlarn/
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/nlarn/nlarn.git
 - Code language: C, Lua
 - Code license: GPL-3.0
diff --git a/games/ogre3d.md b/games/ogre3d.md
index 5fb6ce1f..98b767b1 100644
--- a/games/ogre3d.md
+++ b/games/ogre3d.md
@@ -6,7 +6,7 @@ _Scene-oriented, flexible 3D engine written in C++._
 - Media: https://en.wikipedia.org/wiki/OGRE
 - State: mature
 - Download: https://www.ogre3d.org/download/sdk
-- Keywords: 3D, framework
+- Keywords: framework, 3D
 - Code repository: https://github.com/OGRECave/ogre.git (mirror), https://bitbucket.org/sinbad/ogre/src (hg), https://svn.code.sf.net/p/ogre/code/ (svn)
 - Code language: C++
 - Code license: MIT
diff --git a/games/oolite.md b/games/oolite.md
index c5c1ec0c..2f326399 100644
--- a/games/oolite.md
+++ b/games/oolite.md
@@ -11,7 +11,7 @@ _3D space trading and combat simulator in the spirit of Elite._
 - Code repository: https://github.com/OoliteProject/oolite.git
 - Code language: Objective-C, C, Javascript
 - Code license: GPL-2.0
-- Code dependencies: SDL, Cocoa
+- Code dependencies: Cocoa, SDL
 - Assets license: CC-BY-NC-SA
 
 ## Building
diff --git a/games/open_apocalypse.md b/games/open_apocalypse.md
index e206ce55..e1bf3b84 100644
--- a/games/open_apocalypse.md
+++ b/games/open_apocalypse.md
@@ -5,7 +5,7 @@ _Rebuild of the XCOM Apocalypse Engine._
 - Home: http://openapoc.org/
 - State: mature
 - Download: https://ci.appveyor.com/project/openapoc/openapoc
-- Keywords: requires original content (X-Com Apocalypse), strategy
+- Keywords: strategy, requires original content (X-Com Apocalypse)
 - Code repository: https://github.com/OpenApoc/OpenApoc.git
 - Code language: C++
 - Code license: MIT
diff --git a/games/open_dune.md b/games/open_dune.md
index b1919d23..4a82d6bf 100644
--- a/games/open_dune.md
+++ b/games/open_dune.md
@@ -5,7 +5,7 @@ _Re-creation of the popular game "Dune II"._
 - Home: https://github.com/OpenDUNE/OpenDUNE
 - State: mature
 - Download: https://github.com/OpenDUNE/OpenDUNE/releases
-- Keywords: remake, requires original content (Dune 2 game files), strategy
+- Keywords: strategy, remake, requires original content (Dune 2 game files)
 - Code repository: https://github.com/OpenDUNE/OpenDUNE.git
 - Code language: C
 - Code license: GPL-2.0
diff --git a/games/open_game_engine.md b/games/open_game_engine.md
index 9b5b4c45..17cf8e64 100644
--- a/games/open_game_engine.md
+++ b/games/open_game_engine.md
@@ -6,7 +6,7 @@ _Game engine and editor._
 - State: beta, inactive since 2008 
 - Download: https://sourceforge.net/projects/oge/files/
 - Platform: Windows
-- Keywords: framework, game editor, game engine
+- Keywords: game engine, framework, game editor
 - Code repository: https://git.code.sf.net/p/oge/git, https://svn.code.sf.net/p/oge/svn/ (svn), http://oge.cvs.sourceforge.net (cvs)
 - Code language: C++
 - Code license: LGPL-2.1
diff --git a/games/open_legend_rpg.md b/games/open_legend_rpg.md
index 9aa1229c..cba2c3e4 100644
--- a/games/open_legend_rpg.md
+++ b/games/open_legend_rpg.md
@@ -4,7 +4,7 @@ _A tabletop roleplaying game (or RPG) in which the players play the part of migh
 
 - Home: http://www.openlegendrpg.com/
 - State: mature
-- Keywords: board game, role playing, ruleset
+- Keywords: role playing, board game, ruleset
 - Code repository: https://github.com/openlegend/core-rules.git
 - Code language: Text
 - Code license: Custom (Open Legend Community License: https://github.com/openlegend/core-rules/blob/master/LICENSE.md)
diff --git a/games/open_meridian.md b/games/open_meridian.md
index f09b4e3c..3a05e6c1 100644
--- a/games/open_meridian.md
+++ b/games/open_meridian.md
@@ -5,7 +5,7 @@ _Meridian 59 is a long-running medieval fantasy combat and adventure MMO._
 - Home: http://openmeridian.org/
 - State: mature
 - Download: http://openmeridian.org/create-account/
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://github.com/OpenMeridian/Meridian59.git
 - Code language: C, C++
 - Code license: GPL-2.0
diff --git a/games/open_mw.md b/games/open_mw.md
index aca24a7f..3e4575ab 100644
--- a/games/open_mw.md
+++ b/games/open_mw.md
@@ -6,7 +6,7 @@ _Unofficial open source engine reimplementation of the game Morrowind._
 - Media: https://en.wikipedia.org/wiki/OpenMW
 - State: mature
 - Download: https://openmw.org/downloads/
-- Keywords: game engine, remake, requires original content (Morrowind), role playing
+- Keywords: role playing, game engine, remake, requires original content (Morrowind)
 - Code repository: https://github.com/OpenMW/openmw.git
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/open_panzer.md b/games/open_panzer.md
index ee968fdd..c67cde64 100644
--- a/games/open_panzer.md
+++ b/games/open_panzer.md
@@ -4,7 +4,7 @@ _Hex and turn based strategy game, a remake of good old Panzer General 2._
 
 - Home: http://www.linuxconsulting.ro/openpanzer/
 - State: mature
-- Keywords: online, strategy
+- Keywords: strategy, online
 - Code repository: https://github.com/nicupavel/openpanzer.git
 - Code language: JavaScript
 - Code license: GPL-2.0
diff --git a/games/open_pop.md b/games/open_pop.md
deleted file mode 100644
index 288d99c9..00000000
--- a/games/open_pop.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# OpenPop
-
-_A clone of Populous: The Beginning._
-
-- Home: http://openpopulous.sourceforge.net/, https://sourceforge.net/projects/openpopulous/
-- State: beta, inactive since 2009
-- Download: https://sourceforge.net/projects/openpopulous/files
-- Keywords: strategy
-- Code repository: https://svn.code.sf.net/p/openpopulous/code/ (svn)
-- Code language: C++
-- Code license: GPL-3.0
-
-## Building
-
diff --git a/games/open_ra.md b/games/open_ra.md
index b281b45e..f6b7fd89 100644
--- a/games/open_ra.md
+++ b/games/open_ra.md
@@ -6,7 +6,7 @@ _Recreates and modernizes the classic Command & Conquer real time strategy games
 - Media: <https://en.wikipedia.org/wiki/Command_%26_Conquer:_Red_Alert#Open_source_remake>
 - State: mature
 - Download: http://www.openra.net/download/
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://github.com/OpenRA/OpenRA.git
 - Code language: C#
 - Code license: GPL-3.0
diff --git a/games/open_rct2.md b/games/open_rct2.md
index 89d7f94a..77ec05da 100644
--- a/games/open_rct2.md
+++ b/games/open_rct2.md
@@ -7,7 +7,7 @@ _Re-implementation of RollerCoaster Tycoon 2 (RCT2), expanding the game with new
 - State: beta
 - Download: https://openrct2.org/downloads
 - Platform: Windows, Linux, macOS
-- Keywords: remake, requires original content (from RCT2), simulation
+- Keywords: simulation, remake, requires original content (from RCT2)
 - Code repository: https://github.com/OpenRCT2/OpenRCT2.git
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/open_rsc.md b/games/open_rsc.md
index dc2df4be..71d7c2c1 100644
--- a/games/open_rsc.md
+++ b/games/open_rsc.md
@@ -6,7 +6,7 @@ _As close of a replica Runescape game experience as possible._
 - State: mature 
 - Download: (see home)
 - Platform: Windows, Linux, macOS, Android
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://gitlab.openrsc.com/open-rsc/Game.git, https://github.com/Open-RSC/Game.git (mirror)
 - Code language: Java
 - Code license: GPL-3.0
diff --git a/games/open_soccer.md b/games/open_soccer.md
index e96f4b94..79970900 100644
--- a/games/open_soccer.md
+++ b/games/open_soccer.md
@@ -4,7 +4,7 @@ _Online Soccer Manager_
 
 - Home: https://github.com/delight-im/OpenSoccer
 - State: beta
-- Keywords: online, sports, strategy
+- Keywords: sports, online, strategy
 - Code repository: https://github.com/delight-im/OpenSoccer.git
 - Code language: PHP
 - Code license: GPL-3.0
diff --git a/games/open_soccer_star.md b/games/open_soccer_star.md
index 5e7fc600..4858dd52 100644
--- a/games/open_soccer_star.md
+++ b/games/open_soccer_star.md
@@ -4,7 +4,7 @@ _Soccer manager game in which you are not the manager or trainer, but the player
 
 - Home: https://opensoccerstar.com/
 - State: beta
-- Keywords: online, sports, strategy
+- Keywords: sports, online, strategy
 - Code repository: https://github.com/dmecke/OpenSoccerStar.git
 - Code language: PHP
 - Code license: GPL-3.0
diff --git a/games/open_sonic.md b/games/open_sonic.md
deleted file mode 100644
index b32c3d21..00000000
--- a/games/open_sonic.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Open Sonic
-
-_Game based on the "Sonic the Hedgehog" universe._
-
-- Home: http://opensnc.sourceforge.net/home/index.php, http://opensnc.sourceforge.net/forum/index.php
-- State: beta
-- Download: http://opensnc.sourceforge.net/home/download.php
-- Keywords: action
-- Code repository: https://svn.code.sf.net/p/opensnc/code/ (svn)
-- Code language: C
-- Code license: GPL-2.0
-
-Renamed to Open Surge.
-
-## Building
-
diff --git a/games/open_surge.md b/games/open_surge.md
new file mode 100644
index 00000000..428a8b2d
--- /dev/null
+++ b/games/open_surge.md
@@ -0,0 +1,18 @@
+# Open Surge
+
+_Inspired by the "Sonic the Hedgehog" universe._
+
+- Home: http://opensurge2d.org/, http://opensnc.sourceforge.net/home/index.php, http://opensnc.sourceforge.net/forum/index.php, https://sourceforge.net/projects/opensnc/
+- State: beta
+- Download: http://opensnc.sourceforge.net/forum/viewtopic.php?id=1931, http://opensnc.sourceforge.net/home/download.php
+- Keywords: action, 2D, platform
+- Code repository: https://github.com/alemart/opensurge.git, https://svn.code.sf.net/p/opensnc/code/ (svn)
+- Code language: C
+- Code license: GPL-3.0 (was GPL-2.0)
+- Code dependencies: Allegro
+
+Renamed from Open Sonic to Open Surge in 2011.
+
+## Building
+
+- Build system: CMake
diff --git a/games/open_web_soccer.md b/games/open_web_soccer.md
index 0d3bd74b..9775ff69 100644
--- a/games/open_web_soccer.md
+++ b/games/open_web_soccer.md
@@ -5,7 +5,7 @@ _Manage a virtual fantasy football (soccer) team and play with it against other
 - Home: https://github.com/ihofmann/open-websoccer
 - State: mature
 - Download: https://github.com/ihofmann/open-websoccer/releases
-- Keywords: online, sports, strategy
+- Keywords: sports, online, strategy
 - Code repository: https://github.com/ihofmann/open-websoccer.git
 - Code language: PHP
 - Code license: LGPL-3.0
diff --git a/games/open_yahtzee.md b/games/open_yahtzee.md
index 65dac69e..8f01d9d6 100644
--- a/games/open_yahtzee.md
+++ b/games/open_yahtzee.md
@@ -6,7 +6,7 @@ _Open-source version of the classic dice game Yahtzee._
 - State: mature, inactive since 2016 
 - Download: http://www.openyahtzee.org/wiki/download/, https://sourceforge.net/projects/openyahtzee/files/
 - Platform: Windows, Linux
-- Keywords: dice game, strategy
+- Keywords: strategy, dice game
 - Code repository: https://git.code.sf.net/p/openyahtzee/code, https://gitlab.com/osgames/openyahtzee.git (+)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/openblox.md b/games/openblox.md
index bb32a3fb..4f82875b 100644
--- a/games/openblox.md
+++ b/games/openblox.md
@@ -6,11 +6,11 @@ _Make games with a built-in physics engine, Lego-like building blocks, and a scr
 - State: beta, inactive since 2011
 - Download: https://sourceforge.net/projects/openblox/files/
 - Platform: Windows, Linux
-- Keywords: game maker, simulation
+- Keywords: simulation, game maker
 - Code repository: http://hg.code.sf.net/p/openblox/openblox (hg), https://gitlab.com/osgames/openblox.git (+), http://hg.code.sf.net/p/openblox/bloxstaller (hg)
 - Code language: Python, Lua
 - Code license: GPL-3.0
-- Code dependencies: wxPython, Panda3D
+- Code dependencies: Panda3D, wxPython
 - Assets license: CC-BY-SA-3.0
 
 ## Building
diff --git a/games/openglad.md b/games/openglad.md
index d4f36682..63693ddd 100644
--- a/games/openglad.md
+++ b/games/openglad.md
@@ -5,7 +5,7 @@ _An SDL port of an old DOS game called Gladiator._
 - Home: http://snowstorm.sourceforge.net/cgi-bin/site.cgi?page=home, https://sourceforge.net/projects/snowstorm/
 - State: mature, inactive since 2004
 - Download: http://snowstorm.sourceforge.net/cgi-bin/site.cgi?page=download
-- Keywords: remake, role playing
+- Keywords: role playing, remake
 - Code repository: https://git.code.sf.net/p/snowstorm/git, https://gitlab.com/osgames/snowstorm.git (+)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/openmoo2.md b/games/openmoo2.md
index 7b572034..f91d1a93 100644
--- a/games/openmoo2.md
+++ b/games/openmoo2.md
@@ -5,7 +5,7 @@ _Clone of Microprose game "Master of Orion II: Battle at Antares"._
 - Home: http://openmoo2.org/en/
 - State: beta, inactive since 2011
 - Download: http://openmoo2.org/en/download
-- Keywords: requires original content (MOO2 version 1.31 game data LBX files), strategy, turn-based
+- Keywords: strategy, requires original content (MOO2 version 1.31 game data LBX files), turn-based
 - Code repository: https://github.com/pjotrligthart/openmoo2-hg-mirror.git
 - Code language: Python
 - Code license: GPL-2.0
diff --git a/games/openrpg.md b/games/openrpg.md
index 57aa203b..daa21350 100644
--- a/games/openrpg.md
+++ b/games/openrpg.md
@@ -9,7 +9,7 @@ _OpenRPG is an Internet application that allows people to play Role Playing Game
 - Code repository: https://gitlab.com/osgames/openrpg.git (conversion), https://sourceforge.net/p/openrpg/svn/HEAD/tree/ (svn), https://sourceforge.net/p/openrpg/cvs/ (cvs)
 - Code language: Python
 - Code license: GPL-2.0
-- Code dependencies: pillow, CherryPy, wxPython
+- Code dependencies: CherryPy, pillow, wxPython
 
 ## Building
 
diff --git a/games/openskyscraper.md b/games/openskyscraper.md
index a9b81096..6607dbf6 100644
--- a/games/openskyscraper.md
+++ b/games/openskyscraper.md
@@ -4,7 +4,7 @@ _Tower simulation game inspired by SimTower._
 
 - Home: https://github.com/fabianschuiki/OpenSkyscraper
 - State: beta
-- Keywords: remake, simulation
+- Keywords: simulation, remake
 - Code repository: https://github.com/fabianschuiki/OpenSkyscraper.git
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/orient.md b/games/orient.md
index f010a9dd..c7aba5bc 100644
--- a/games/orient.md
+++ b/games/orient.md
@@ -5,7 +5,7 @@ _Prototype for an educational role-playing game for intercultural education._
 - Home: https://web.archive.org/web/20131114051805/http://www.e-circus.org/, https://sourceforge.net/projects/orient-ecircus/
 - State: mature, inactive since 2009
 - Download: https://sourceforge.net/projects/orient-ecircus/files
-- Keywords: educational, role playing
+- Keywords: role playing, educational
 - 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/other_life.md b/games/other_life.md
index 5fd81b3d..bcf06ba9 100644
--- a/games/other_life.md
+++ b/games/other_life.md
@@ -6,7 +6,7 @@ _A community based game that allows you to affect the future of the game._
 - Media: https://en.wikipedia.org/wiki/Eternal_Lands#Spin-offs
 - State: beta
 - Download: http://www.other-life.com/downloads.php
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://github.com/jp8900308/other-life.git, https://github.com/gregoryfenton/other-life.git (+)
 - Code language: C, C++
 - Code license: Custom (Eternal Lands license, modified QTPL)
diff --git a/games/our_personal_space.md b/games/our_personal_space.md
index 33bb6a59..9ddf365b 100644
--- a/games/our_personal_space.md
+++ b/games/our_personal_space.md
@@ -5,7 +5,7 @@ _Simulation game where you play as a colonist on a new planet with your new husb
 - Home: http://metasepia.icecavern.net/OurPersonalSpace/index.html
 - State: mature
 - Download: (see home)
-- Keywords: simulation, visual novel
+- Keywords: visual novel, simulation
 - Code repository: https://github.com/qirien/personal-space.git
 - Code language: Ren'py
 - Code license: GPL-3.0
diff --git a/games/paintown.md b/games/paintown.md
index e6aa1903..6c8b907e 100644
--- a/games/paintown.md
+++ b/games/paintown.md
@@ -6,11 +6,11 @@ _2D side scrolling beatem-up engine._
 - State: mature 
 - Download: http://paintown.org/#/downloads, https://sourceforge.net/projects/paintown/files/
 - Platform: Windows, Linux, macOS, Android
-- Keywords: 2D, action, arcade, beat'em up, game engine
+- Keywords: action, 2D, arcade, beat'em up, game engine
 - Code repository: https://github.com/kazzmir/paintown.git, https://svn.code.sf.net/p/paintown/code/ (svn)
 - Code language: C++, Java, Python
 - Code license: 3-clause BSD
-- Code dependencies: PyQt4, Allegro, libpng, Freetype
+- Code dependencies: Allegro, Freetype, libpng, PyQt4
 
 Android port is written in Java.
 
diff --git a/games/panda3d.md b/games/panda3d.md
index a3ecf32b..ad823da9 100644
--- a/games/panda3d.md
+++ b/games/panda3d.md
@@ -6,7 +6,7 @@ _Panda3D is a game engine, a framework for 3D rendering and game development for
 - Media: https://en.wikipedia.org/wiki/Panda3D
 - State: mature
 - Download: http://www.panda3d.org/download.php
-- Keywords: 3D, framework
+- Keywords: framework, 3D
 - Code repository: https://github.com/panda3d/panda3d.git
 - Code language: C++, C
 - Code license: 3-clause BSD
diff --git a/games/parpg.md b/games/parpg.md
index 838bac5b..93113d85 100644
--- a/games/parpg.md
+++ b/games/parpg.md
@@ -9,7 +9,7 @@ _Post-Apocalyptic RPG._
 - Code repository: http://hg.assembla.com/parpg-core (hg), https://gitlab.com/osgames/parpg-core.git (+), http://subversion.assembla.com/svn/parpg-assets/ (svn), http://parpg-trac.cvsdude.com/parpg/browser (svn)
 - Code language: Python
 - Code license: GPL-3.0
-- Code dependencies: PyQt, PySide, Blender, fife, pygame, psyco
+- Code dependencies: Blender game engine, fife, psyco, pygame, PyQt, PySide
 
 See also: https://github.com/arikel/PPARPG, https://github.com/mvbarracuda/parpg_mvbarracuda, https://github.com/parpg/parpg
 
diff --git a/games/pasang_emas.md b/games/pasang_emas.md
index beab3fbe..d9e67cb8 100644
--- a/games/pasang_emas.md
+++ b/games/pasang_emas.md
@@ -6,7 +6,7 @@ _Traditional two-player board game of Brunei._
 - State: mature
 - Download: http://pasang-emas.sourceforge.net/download.xhtml, https://sourceforge.net/projects/pasang-emas/files/
 - Platform: Linux
-- Keywords: board game, strategy
+- Keywords: strategy, board game
 - Code repository: https://git.code.sf.net/p/pasang-emas/code
 - Code language: Vala
 - Code license: GPL-3.0
diff --git a/games/pax_britannica.md b/games/pax_britannica.md
index c730d027..821a9511 100644
--- a/games/pax_britannica.md
+++ b/games/pax_britannica.md
@@ -4,7 +4,7 @@ _One-button real-time strategy game._
 
 - Home: https://web.archive.org/web/20180807110800/http://paxbritannica.henk.ca/
 - State: mature
-- Keywords: multiplayer, real time, strategy
+- Keywords: strategy, multiplayer, real time
 - Code repository: https://github.com/henkboom/pax-britannica.git
 - Code language: Lua, C
 - Code license: MIT
diff --git a/games/pioneers.md b/games/pioneers.md
index 26f7209f..5e1fdf44 100644
--- a/games/pioneers.md
+++ b/games/pioneers.md
@@ -5,7 +5,7 @@ _Emulation of the board game The Settlers of Catan, which can be played over the
 - Home: https://sourceforge.net/projects/pio/, http://pio.sourceforge.net/
 - State: mature
 - Download: https://sourceforge.net/projects/pio/files
-- Keywords: board game, strategy
+- Keywords: strategy, board game
 - Code repository: https://svn.code.sf.net/p/pio/code/ (svn)
 - Code language: C
 - Code license: GPL-2.0
diff --git a/games/pkgconfig.md b/games/pkgconfig.md
index 06cd8350..a77e3b47 100644
--- a/games/pkgconfig.md
+++ b/games/pkgconfig.md
@@ -6,7 +6,7 @@ _Tool used when compiling applications and libraries._
 - Media: https://en.wikipedia.org/wiki/Pkg-config
 - State: mature
 - Download: https://pkg-config.freedesktop.org/releases/
-- Keywords: library, tool
+- Keywords: tool, library
 - Code repository: https://anongit.freedesktop.org/git/pkg-config.git (https://cgit.freedesktop.org/pkg-config)
 - Code language: C
 - Code license: GPL-2.0
diff --git a/games/planeshift.md b/games/planeshift.md
index ce2e41c7..ceb036b9 100644
--- a/games/planeshift.md
+++ b/games/planeshift.md
@@ -6,7 +6,7 @@ _Role Playing Game immersed into a 3D virtual fantasy world._
 - Media: <https://en.wikipedia.org/wiki/PlaneShift_(video_game)>
 - State: mature
 - Download: http://www.planeshift.it/Download
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://svn.code.sf.net/p/planeshift/code/ (svn)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/pokerth.md b/games/pokerth.md
index 4edae9fb..8cbd930f 100644
--- a/games/pokerth.md
+++ b/games/pokerth.md
@@ -7,7 +7,7 @@ _Texas Hold'em poker game playable against up to nine computer-opponents or with
 - State: mature, inactive since 2017
 - Download: https://www.pokerth.net/download
 - Platform: Windows, Linux, macOS, Android
-- Keywords: online, poker, strategy
+- Keywords: strategy, online, poker
 - Code repository: https://github.com/pokerth/pokerth.git, https://svn.code.sf.net/p/pokerth/code/ (svn)
 - Code language: C++
 - Code license: AGPL-3.0
diff --git a/games/pykaraoke.md b/games/pykaraoke.md
index 3220cf6e..90883f1d 100644
--- a/games/pykaraoke.md
+++ b/games/pykaraoke.md
@@ -6,7 +6,7 @@ _Karaoke player._
 - State: beta, inactive since 2011
 - Download: http://www.kibosh.org/pykaraoke/downloads.php, https://sourceforge.net/projects/pykaraoke/files/
 - Platform: Windows, Linux, macOS
-- Keywords: karaoke, music, social
+- Keywords: music, karaoke, social
 - Code repository: https://gitlab.com/osgames/pykaraoke.git (conversion of cvs), http://pykaraoke.cvs.sourceforge.net (cvs)
 - Code language: Python
 - Code license: LGPL-2.1
diff --git a/games/pyorpg.md b/games/pyorpg.md
index e937d0ce..1b716a5c 100644
--- a/games/pyorpg.md
+++ b/games/pyorpg.md
@@ -8,7 +8,7 @@ _ORPG (online role-playing-game) engine that allows everyone to create their own
 - Code repository: https://github.com/marcusmoller/pyorpg-client.git, https://github.com/marcusmoller/pyorpg-server.git (+)
 - Code language: Python
 - Code license: MIT
-- Code dependencies: pygame, pgu, Twisted
+- Code dependencies: pgu, pygame, Twisted
 
 Is this an engine or a game?
 
diff --git a/games/pysol.md b/games/pysol.md
index df7ff778..ddc38201 100644
--- a/games/pysol.md
+++ b/games/pysol.md
@@ -7,7 +7,7 @@ _1,000 solitaire games._
 - State: mature, inactive since 2004
 - Download: http://www.pysol.org/#download
 - Platform: Windows, Linux, macOS
-- Keywords: cards, strategy
+- Keywords: strategy, cards
 - Code repository: (see download)
 - Code language: Python
 - Code license: GPL-2.0
diff --git a/games/ransack.md b/games/ransack.md
index b7ab3279..b4074934 100644
--- a/games/ransack.md
+++ b/games/ransack.md
@@ -4,7 +4,7 @@ _Python based roguelike._
 
 - Home: https://github.com/dsallen7/ransack-python
 - State: mature, inactive since 2016
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/dsallen7/ransack-python.git
 - Code language: Python
 - Code license: MIT
diff --git a/games/regoth.md b/games/regoth.md
index aa21c6b2..5c8677e0 100644
--- a/games/regoth.md
+++ b/games/regoth.md
@@ -5,7 +5,7 @@ _Reimplementation of the zEngine, used by the game "Gothic" and "Gothic II"._
 - Home: https://github.com/REGoth-project/REGoth, https://github.com/REGoth-project/REGoth/wiki
 - State: beta
 - Download: https://github.com/REGoth-project/REGoth/releases
-- Keywords: remake, requires original content (Gothic 1 and Gothic 2), role playing
+- Keywords: role playing, remake, requires original content (Gothic 1 and Gothic 2)
 - Code repository: https://github.com/REGoth-project/REGoth.git
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/return_to_the_roots.md b/games/return_to_the_roots.md
index 153d0aab..2dd6a5c8 100644
--- a/games/return_to_the_roots.md
+++ b/games/return_to_the_roots.md
@@ -5,7 +5,7 @@ _Renew the original The Settlers 2._
 - Home: https://www.siedler25.org/index.php
 - State: mature
 - Download: https://www.siedler25.org/index.php?com=dynamic&mod=2
-- Keywords: remake, requires original content (Settlers II Gold), strategy
+- Keywords: strategy, remake, requires original content (Settlers II Gold)
 - Code repository: https://launchpad.net/s25rttr, https://github.com/Return-To-The-Roots/s25client.git (+)
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/rigs_of_rods.md b/games/rigs_of_rods.md
index 4d4faa52..b1df908d 100644
--- a/games/rigs_of_rods.md
+++ b/games/rigs_of_rods.md
@@ -6,7 +6,7 @@ _3D simulator game where you can drive, fly and sail various vehicles._
 - State: mature 
 - Download: (see homepage)
 - Platform: Windows
-- Keywords: cars, simulation
+- Keywords: simulation, cars
 - Code repository: https://github.com/RigsOfRods/rigs-of-rods.git
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/rogue_clone_iv.md b/games/rogue_clone_iv.md
index 29f3160f..f7877de5 100644
--- a/games/rogue_clone_iv.md
+++ b/games/rogue_clone_iv.md
@@ -5,7 +5,7 @@ _Reproduction of Rogue._
 - Home: http://rogueclone.sourceforge.net/, https://sourceforge.net/projects/rogueclone/
 - State: mature, inactive since 2006
 - Download: https://sourceforge.net/projects/rogueclone/files/rogue%20clone/
-- Keywords: remake, roguelike, role playing
+- Keywords: role playing, remake, roguelike
 - 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/roguish.md b/games/roguish.md
index d53dff4e..295d31c6 100644
--- a/games/roguish.md
+++ b/games/roguish.md
@@ -4,7 +4,7 @@ _Multiplayer, extensible rogue-like._
 
 - Home: https://github.com/CamHenlin/Roguish
 - State: beta, inactive since 2015
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/CamHenlin/Roguish.git
 - Code language: JavaScript
 - Code license: 3-clause BSD
diff --git a/games/ryzom_core.md b/games/ryzom_core.md
index 779f6a6b..3628ac0e 100644
--- a/games/ryzom_core.md
+++ b/games/ryzom_core.md
@@ -6,7 +6,7 @@ _MMORPG with open world play._
 - Media: https://en.wikipedia.org/wiki/Ryzom
 - State: mature
 - Play: http://www.ryzom.com/ (commercial)
-- Keywords: mmorpg, role playing
+- Keywords: role playing, mmorpg
 - Code repository: https://bitbucket.org/ryzom/ryzomcore (hg)
 - Code language: C++
 - Code license: AGPL-3.0
diff --git a/games/scorched_3d.md b/games/scorched_3d.md
index 2ba43a5a..8c8d657a 100644
--- a/games/scorched_3d.md
+++ b/games/scorched_3d.md
@@ -6,7 +6,7 @@ _Lively, fully destructible 3D landscapes in a turn-based artillery game._
 - State: mature, inactive since 2014
 - Download: http://www.scorched3d.co.uk/#download, https://sourceforge.net/projects/scorched3d/files/
 - Platform: Windows, Linux
-- Keywords: 3D, action, artillery
+- Keywords: action, 3D, artillery
 - Code repository: https://git.code.sf.net/p/scorched3d/git, https://svn.code.sf.net/p/scorched3d/code/ (svn)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/scorched_moon.md b/games/scorched_moon.md
index f1c092d7..e12743b6 100644
--- a/games/scorched_moon.md
+++ b/games/scorched_moon.md
@@ -8,7 +8,7 @@ _Open source version of Moonbase Commander._
 - Code repository: https://github.com/Scorched-Moon/server.git, https://github.com/Scorched-Moon/client.git (+)
 - Code language: Python
 - Code license: GPL-3.0
-- Code dependencies: pygame, pgu
+- Code dependencies: pgu, pygame
 
 Old [Googlecode project](https://code.google.com/archive/p/tether/)
 
diff --git a/games/scourge.md b/games/scourge.md
index 0d14eb18..e696cbfa 100644
--- a/games/scourge.md
+++ b/games/scourge.md
@@ -5,7 +5,7 @@ _Roguelike game with a 3D user interface._
 - Home: https://sourceforge.net/projects/scourge/, <https://web.archive.org/web/20090105165051/http://scourgeweb.org/>
 - State: beta, inactive since 2008
 - Download: https://sourceforge.net/projects/scourge/files
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/q4a/scourge.git (may not be up to date), https://svn.code.sf.net/p/scourge/code/ (svn)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/scrabble3d.md b/games/scrabble3d.md
index 76eb4c18..b7a7ae2c 100644
--- a/games/scrabble3d.md
+++ b/games/scrabble3d.md
@@ -6,7 +6,7 @@ _Board game with the goal to place letters on the board like in crosswords._
 - State: mature, inactive since 2015 
 - Download: (see home)
 - Platform: Windows, Linux, macOS
-- Keywords: board game, strategy
+- Keywords: strategy, board game
 - Code repository: https://svn.code.sf.net/p/scrabble/code/ (svn)
 - Code language: Pascal
 - Code license: GPL-3.0
diff --git a/games/scummvm.md b/games/scummvm.md
index b62268f4..be8dc08b 100644
--- a/games/scummvm.md
+++ b/games/scummvm.md
@@ -6,7 +6,7 @@ _Allows you to run certain classic graphical point-and-click adventure games, pr
 - Media: https://en.wikipedia.org/wiki/ScummVM
 - State: mature
 - Download: http://www.scummvm.org/downloads/
-- Keywords: framework, game engine
+- Keywords: game engine, framework
 - Code repository: https://github.com/scummvm/scummvm.git
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/sdl_2.md b/games/sdl_2.md
index 76d8e1ef..bde88120 100644
--- a/games/sdl_2.md
+++ b/games/sdl_2.md
@@ -6,7 +6,7 @@ _Simple DirectMedia Layer is a cross-platform development library designed to pr
 - Media: https://en.wikipedia.org/wiki/Simple_DirectMedia_Layer
 - State: mature
 - Download: https://www.libsdl.org/download-2.0.php
-- Keywords: 3D, library
+- Keywords: library, 3D
 - Code repository: http://hg.libsdl.org/SDL (hg)
 - Code language: C
 - Code license: zlib
diff --git a/games/settlers_iii_remake.md b/games/settlers_iii_remake.md
index 751f9960..d9a91bd8 100644
--- a/games/settlers_iii_remake.md
+++ b/games/settlers_iii_remake.md
@@ -5,7 +5,7 @@ _Remake of "The Settlers III" for Windows, Linux, Mac and Android._
 - Home: https://github.com/jsettlers/settlers-remake
 - State: beta
 - Download: https://github.com/jsettlers/settlers-remake/releases
-- Keywords: remake, requires original content, strategy
+- Keywords: strategy, remake, requires original content
 - Code repository: https://github.com/jsettlers/settlers-remake.git
 - Code language: Java
 - Code license: MIT
diff --git a/games/seven_kingdoms_ancient_adversaries.md b/games/seven_kingdoms_ancient_adversaries.md
index 2a68efb8..8e5e2829 100644
--- a/games/seven_kingdoms_ancient_adversaries.md
+++ b/games/seven_kingdoms_ancient_adversaries.md
@@ -6,7 +6,7 @@ _Fan continuation of Seven Kingdoms: Ancient Adversaries by Enlight Software._
 - State: mature 
 - Download: https://www.7kfans.com/wiki/index.php/Download, https://sourceforge.net/projects/skfans/files/, https://github.com/the3dfxdude/7kaa/releases
 - Platform: Windows, Linux
-- Keywords: continuation of commercial project, strategy
+- Keywords: strategy, continuation of commercial project
 - Code repository: https://github.com/the3dfxdude/7kaa.git
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/simple_solitaire.md b/games/simple_solitaire.md
index ad2056d4..25664b98 100644
--- a/games/simple_solitaire.md
+++ b/games/simple_solitaire.md
@@ -5,7 +5,7 @@ _Solitaire game collection with 14 games._
 - Home: https://play.google.com/store/apps/details?id=de.tobiasbielefeld.solitaire, https://f-droid.org/packages/de.tobiasbielefeld.solitaire/
 - State: mature
 - Platform: Android
-- Keywords: cards, strategy
+- Keywords: strategy, cards
 - Code repository: https://github.com/TobiasBielefeld/Simple-Solitaire.git
 - Code language: Java
 - Code license: GPL-3.0
diff --git a/games/slash_em.md b/games/slash_em.md
index 41ff60fd..d1a629bc 100644
--- a/games/slash_em.md
+++ b/games/slash_em.md
@@ -6,7 +6,7 @@ _Variant of the roguelike game NetHack that offers extra features, monsters, and
 - Media: https://en.wikipedia.org/wiki/Slash'EM
 - State: beta, inactive since 2007
 - Download: http://slashem.sourceforge.net/stable.html, https://sourceforge.net/projects/slashem/files/
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/farmboy0/slashem.git, https://sourceforge.net/p/slashem/code (cvs)
 - Code language: C
 - Code license: Custom (NetHack license)
diff --git a/games/smash_battle.md b/games/smash_battle.md
index a8e2ee6e..2fdc709a 100644
--- a/games/smash_battle.md
+++ b/games/smash_battle.md
@@ -6,7 +6,7 @@ _Old skool, 2D, platform, shoot‘em up action._
 - State: beta, inactive since 2011
 - Download: https://smashbattle.demontpx.com/downloads/, https://sourceforge.net/projects/smashbattle/files/
 - Platform: Windows, Linux
-- Keywords: 2D, action, platform, shoot'em up
+- Keywords: action, 2D, platform, shoot'em up
 - Code repository: (see download)
 - Code language: C++
 - Code license: ?
diff --git a/games/softpixel_engine.md b/games/softpixel_engine.md
index 720511f7..33b93ba6 100644
--- a/games/softpixel_engine.md
+++ b/games/softpixel_engine.md
@@ -6,7 +6,7 @@ _High-level real-time 3d engine._
 - State: mature, inactive since 2013 
 - Download: http://softpixelengine.sourceforge.net/downloads.html
 - Platform: Windows, Linux
-- Keywords: 3D, framework
+- Keywords: framework, 3D
 - Code repository: https://gitlab.com/osgames/softpixelengine.git (import of svn), https://svn.code.sf.net/p/softpixelengine/code/trunk (svn)
 - Code language: C++
 - Code license: zlib
diff --git a/games/source_of_tales.md b/games/source_of_tales.md
index a70607c4..e010945f 100644
--- a/games/source_of_tales.md
+++ b/games/source_of_tales.md
@@ -4,7 +4,7 @@ _A massive multiplayer online roleplaying game._
 
 - Home: http://www.sourceoftales.org/
 - State: mature, inactive since 2013
-- Keywords: massive multiplayer online, role playing
+- Keywords: role playing, massive multiplayer online
 - Code repository: https://github.com/tales/sourceoftales.git
 - Code language: Lua
 - Code license: GPL-3.0
diff --git a/games/space_station_13.md b/games/space_station_13.md
index 04e144fa..c37cba82 100644
--- a/games/space_station_13.md
+++ b/games/space_station_13.md
@@ -5,7 +5,7 @@ _A community developed, multiplayer round-based role playing game, where players
 - Home: https://spacestation13.com/
 - Media: https://en.wikipedia.org/wiki/Space_Station_13
 - State: mature
-- Keywords: online, role playing
+- Keywords: role playing, online
 - Code repository: (many different versions, see below)
 - Code language: DM
 - Code license: AGPL-3.0
diff --git a/games/spacezero.md b/games/spacezero.md
index dfa41ee0..cd306017 100644
--- a/games/spacezero.md
+++ b/games/spacezero.md
@@ -3,10 +3,10 @@
 _Real Time Strategy 2D space combat game for two players over a network._
 
 - Home: http://spacezero.sourceforge.net/, https://sourceforge.net/projects/spacezero/
-- State: beta, inactive since 2013
+- State: beta
 - Download: http://spacezero.sourceforge.net/index.html#download, https://sourceforge.net/projects/spacezero/files/
 - Platform: Linux
-- Keywords: real time, space, strategy
+- Keywords: strategy, real time, space
 - Code repository: https://svn.code.sf.net/p/spacezero/code/ (svn)
 - Code language: C
 - Code license: GPL-3.0
diff --git a/games/spring_rts_engine.md b/games/spring_rts_engine.md
index 84af98d4..8d149429 100644
--- a/games/spring_rts_engine.md
+++ b/games/spring_rts_engine.md
@@ -6,7 +6,7 @@ _Game engine for real-time strategy (RTS) video games._
 - Media: https://en.wikipedia.org/wiki/Spring_Engine
 - State: mature
 - Download: https://springrts.com/wiki/Download
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://github.com/spring/spring.git, https://git.code.sf.net/p/springrts/code
 - Code language: C++, C, Lua
 - Code license: GPL-2.0
diff --git a/games/star_maiden_rio.md b/games/star_maiden_rio.md
index c4fa4574..d66bb802 100644
--- a/games/star_maiden_rio.md
+++ b/games/star_maiden_rio.md
@@ -9,7 +9,7 @@ _Visual Novel._
 - Code repository: (see download)
 - Code language: Ren'py
 - Code license: CC-BY-NC
-- Code dependencies: Ren'py
+- Code dependencies: Ren'Py
 - Assets license: CC-BY-NC
 
 ## Building
diff --git a/games/star_ruler_2.md b/games/star_ruler_2.md
index afa3eef6..f1105a0f 100644
--- a/games/star_ruler_2.md
+++ b/games/star_ruler_2.md
@@ -4,7 +4,7 @@ _4X/RTS set in space._
 
 - Home: http://starruler2.com/
 - State: mature
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://github.com/BlindMindStudios/StarRuler2-Source.git
 - Code language: C, C++
 - Code license: MIT
diff --git a/games/starblastrix.md b/games/starblastrix.md
index 5f6a0151..1f3a1e64 100644
--- a/games/starblastrix.md
+++ b/games/starblastrix.md
@@ -6,7 +6,7 @@ _Side scrolling shoot'em up game._
 - State: beta, inactive since 2006 
 - Download: https://sourceforge.net/projects/starblastrix/files/
 - Platform: Windows
-- Keywords: 2D, action, shoot'em up
+- Keywords: action, 2D, shoot'em up
 - Code repository: (see download)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/stendhal.md b/games/stendhal.md
index a9cc0b69..d1a110b2 100644
--- a/games/stendhal.md
+++ b/games/stendhal.md
@@ -5,7 +5,7 @@ _Multiplayer online adventure game with an old school feel._
 - Home: https://stendhalgame.org/, https://sourceforge.net/p/arianne/
 - State: mature
 - Download: (see home)
-- Keywords: multiplayer, online, role playing
+- Keywords: role playing, multiplayer, online
 - Code repository: https://git.code.sf.net/p/arianne/stendhal
 - Code language: Java
 - Code license: GPL-2.0
diff --git a/games/stunt_rally.md b/games/stunt_rally.md
index b8d4504b..3abe5fbc 100644
--- a/games/stunt_rally.md
+++ b/games/stunt_rally.md
@@ -10,7 +10,7 @@ _Racing game with rally style of driving._
 - Code repository: https://github.com/stuntrally/stuntrally.git
 - Code language: C++
 - Code license: GPL-3.0
-- Code dependencies: Ogre, SDL 2
+- Code dependencies: Ogre, SDL2
 
 ## Building
 
diff --git a/games/summoming_wars.md b/games/summoming_wars.md
index ebaaa61e..ed732c9f 100644
--- a/games/summoming_wars.md
+++ b/games/summoming_wars.md
@@ -5,7 +5,7 @@ _Role-playing game, featuring both a single-player and a multiplayer mode for ab
 - Home: <https://web.archive.org/web/20161221150109/http://sumwars.org:80/wiki/Main_Page>
 - State: beta, inactive since 2014
 - Download: <https://web.archive.org/web/20160704003202/http://sumwars.org:80/wiki/Download>
-- Keywords: multiplayer, role playing, singleplayer
+- Keywords: role playing, multiplayer, singleplayer
 - Code repository: https://bitbucket.org/sumwars/sumwars-code/src (hg), https://gitlab.com/osgames/sumwars.git (+)
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/swig.md b/games/swig.md
index 29a190ff..5a1cf95e 100644
--- a/games/swig.md
+++ b/games/swig.md
@@ -6,7 +6,7 @@ _Software development tool that connects programs written in C and C++ with a va
 - Media: https://en.wikipedia.org/wiki/SWIG
 - State: mature
 - Download: http://www.swig.org/download.html
-- Keywords: interface generator, language binding, library
+- Keywords: library, interface generator, language binding
 - Code repository: https://github.com/swig/swig.git
 - Code language: C++
 - Code license: SWIG license (https://raw.githubusercontent.com/swig/swig/master/LICENSE)
diff --git a/games/tales_of_maj_eyal.md b/games/tales_of_maj_eyal.md
index cd153c65..84ac48af 100644
--- a/games/tales_of_maj_eyal.md
+++ b/games/tales_of_maj_eyal.md
@@ -6,7 +6,7 @@ _Roguelike RPG, featuring tactical turn-based combat and advanced character buil
 - Media: https://en.wikipedia.org/wiki/Tales_of_Maj%27Eyal
 - State: mature
 - Download: https://te4.org/download
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://git.net-core.org/tome/t-engine4.git
 - Code language: C, Lua
 - Code license: GPL-3.0
diff --git a/games/tenes_empanadas_graciela.md b/games/tenes_empanadas_graciela.md
index 12ee3324..a8040359 100644
--- a/games/tenes_empanadas_graciela.md
+++ b/games/tenes_empanadas_graciela.md
@@ -5,7 +5,7 @@ _Clone of 'Plan Tactico y Estrategico de la Guerra', which is a pseudo-clone of
 - Home: https://github.com/wfx/teg, https://sourceforge.net/projects/teg/
 - State: beta, inactive since 2015
 - Platform: Linux
-- Keywords: risklike, strategy
+- Keywords: strategy, risklike
 - Code repository: https://github.com/wfx/teg.git
 - Code language: C, Javascript, Perl
 - Code license: GPL-2.0
diff --git a/games/terasology.md b/games/terasology.md
index e382762c..11eeac2f 100644
--- a/games/terasology.md
+++ b/games/terasology.md
@@ -4,7 +4,7 @@ _Stable platform for various types of gameplay settings in a voxel world._
 
 - Home: http://terasology.org/index.html
 - State: mature
-- Keywords: 3D, framework
+- Keywords: framework, 3D
 - Code repository: https://github.com/MovingBlocks/Terasology.git
 - Code language: Java
 - Code license: Apache-2.0
diff --git a/games/tetravex.md b/games/tetravex.md
index 80870ca2..8f7df5f6 100644
--- a/games/tetravex.md
+++ b/games/tetravex.md
@@ -6,7 +6,7 @@ _A port of TetraVex for macOS._
 - State: beta
 - Download: https://github.com/Lisergishnu/TetraVex/releases
 - Platform: macOS
-- Keywords: port, puzzle
+- Keywords: puzzle, port
 - Code repository: https://github.com/Lisergishnu/TetraVex.git
 - Code language: Swift
 - Code license: GPL-3.0
diff --git a/games/the_butterfly_effect.md b/games/the_butterfly_effect.md
index 7bbca7d1..99aaf3bb 100644
--- a/games/the_butterfly_effect.md
+++ b/games/the_butterfly_effect.md
@@ -6,11 +6,11 @@ _Realistic physics simulations._
 - State: beta 
 - Download: http://the-butterfly-effect.org/#download, https://github.com/the-butterfly-effect/tbe/releases
 - Platform: Windows, Linux, macOS
-- Keywords: physics, simulation
+- Keywords: simulation, physics
 - Code repository: https://github.com/the-butterfly-effect/tbe.git
 - Code language: C++
 - Code license: GPL-2.0
-- Code dependencies: Qt, Box2D
+- Code dependencies: Box2D, Qt
 
 ## Building
 
diff --git a/games/the_legend_of_edgar.md b/games/the_legend_of_edgar.md
index 1b90a268..9099d173 100644
--- a/games/the_legend_of_edgar.md
+++ b/games/the_legend_of_edgar.md
@@ -6,7 +6,7 @@ _2D platform game._
 - State: mature
 - Download: https://www.parallelrealities.co.uk/games/edgar/#downloads-/-releases, https://github.com/riksweeney/edgar/releases
 - Platform: Windows, Linux
-- Keywords: 2D, action, platform
+- Keywords: action, 2D, platform
 - Code repository: https://github.com/riksweeney/edgar.git
 - Code language: C
 - Code license: GPL-2.0
diff --git a/games/theme_hospital.md b/games/theme_hospital.md
index be735cef..fd1e5da8 100644
--- a/games/theme_hospital.md
+++ b/games/theme_hospital.md
@@ -5,7 +5,7 @@ _Reimplementation of the 1997 Bullfrog business sim Theme Hospital._
 - Home: http://forums.corsixth.com/
 - State: mature
 - Download: https://github.com/CorsixTH/CorsixTH/releases
-- Keywords: remake, requires original content, strategy
+- Keywords: strategy, remake, requires original content
 - Code repository: https://github.com/CorsixTH/CorsixTH.git
 - Code language: Lua, C++
 - Code license: MIT
diff --git a/games/thousand_parsec.md b/games/thousand_parsec.md
index cc609732..9fdeb651 100644
--- a/games/thousand_parsec.md
+++ b/games/thousand_parsec.md
@@ -9,7 +9,7 @@ _A framework for turn based 4 X's game (eXplore, eXpand, eXploit, eXterminate).
 - Code repository: https://github.com/thousandparsec/tpserver-cpp.git, https://github.com/thousandparsec/tpclient-pywx.git (+), (http://git.thousandparsec.net/ not available right now)
 - Code language: C++, Python
 - Code license: GPL-2.0
-- Code dependencies: wxPython, pygame, psyco, numpy, py2app, py2exe, pyOpenSSL
+- Code dependencies: numpy, psyco, py2app, py2exe, pygame, pyOpenSSL, wxPython
 
 Should this be a game engine instead? Server is written in C++. Client is written in Python.
 
diff --git a/games/tintinpp.md b/games/tintinpp.md
index a828ec99..f7dc64b8 100644
--- a/games/tintinpp.md
+++ b/games/tintinpp.md
@@ -6,7 +6,7 @@ _MUD client._
 - State: mature
 - Download: https://tintin.sourceforge.io/download.php, https://sourceforge.net/projects/tintin/files/
 - Platform: Windows, Linux, macOS, Android
-- Keywords: MUD, client, role playing
+- Keywords: role playing, client, MUD
 - Code repository: (see download)
 - Code language: C
 - Code license: GPL-3.0
diff --git a/games/torcs.md b/games/torcs.md
index ef69304f..f12a29c6 100644
--- a/games/torcs.md
+++ b/games/torcs.md
@@ -6,7 +6,7 @@ _Car racing simulation._
 - State: mature, inactive since 2016 
 - Download: http://torcs.sourceforge.net/index.php?name=Sections&op=viewarticle&artid=3, https://sourceforge.net/projects/torcs/files/
 - Platform: Windows, Linux
-- Keywords: racing, simulation
+- Keywords: simulation, racing
 - Code repository: https://git.code.sf.net/p/torcs/code, https://gitlab.com/osgames/torcs.git (+)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/trophy.md b/games/trophy.md
index be3a6172..3362a0c1 100644
--- a/games/trophy.md
+++ b/games/trophy.md
@@ -6,8 +6,8 @@ _Car racing game with features such as shooting at other players, buying new car
 - State: mature, inactive since 2012 
 - Download: http://trophy.sourceforge.net/index.php?body=download, https://sourceforge.net/projects/trophy/files/
 - Platform: Windows, Linux
-- Keywords: 2D, cars, racing, simulation
-- Code repository: https://svn.code.sf.net/p/trophy/code/ (svn)
+- Keywords: simulation, 2D, cars, racing
+- Code repository: https://gitlab.com/osgames/trophy.git (backup of svn), https://svn.code.sf.net/p/trophy/code/ (svn)
 - Code language: C++
 - Code license: GPL-2.0
 - Code dependencies: Clanlib
diff --git a/games/tux_football.md b/games/tux_football.md
index 19cf0119..4732a12b 100644
--- a/games/tux_football.md
+++ b/games/tux_football.md
@@ -6,7 +6,7 @@ _Arcade-style 2D football game reminiscent of Sensible Soccer and Kick Off._
 - State: beta, inactive since 2012
 - Download: http://tuxfootball.sourceforge.net/index.php?plugin=EnticorePluginStaticContent&config=idx%3A3, https://sourceforge.net/projects/tuxfootball/files/
 - Platform: Windows, Linux
-- Keywords: 2D, arcade, simulation, sports
+- Keywords: arcade, 2D, simulation, sports
 - Code repository: https://git.code.sf.net/p/tuxfootball/code, https://gitlab.com/osgames/tuxfootball.git (+)
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/tuxemon.md b/games/tuxemon.md
index 3c5b99bb..eaf47573 100644
--- a/games/tuxemon.md
+++ b/games/tuxemon.md
@@ -9,7 +9,7 @@ _Turn-based monster fighting RPG._
 - Code repository: https://github.com/Tuxemon/Tuxemon.git
 - Code language: Python
 - Code license: GPL-3.0
-- Code dependencies: pillow, cx_Freeze, neteria, pygame, PyTMX
+- Code dependencies: cx_Freeze, neteria, pillow, pygame, PyTMX
 
 ## Building
 
diff --git a/games/uidunad.md b/games/uidunad.md
index 6d2650d5..198f6b10 100644
--- a/games/uidunad.md
+++ b/games/uidunad.md
@@ -4,11 +4,11 @@ _Ultimate Dungeon Adventure (UlDunAd) - the extremely flexible, fun, text/graphi
 
 - Home: https://www.pygame.org/project-UlDunAd-1140-.html
 - State: beta, inactive since 2011
-- Keywords: console, role playing, text-based
+- Keywords: role playing, console, text-based
 - Code repository: https://github.com/nhydock/UlDunAd.git
 - Code language: Python
 - Code license: GPL-3.0
-- Code dependencies: pygame, numpy, pillow, OpenGL, wxPython
+- Code dependencies: numpy, OpenGL, pillow, pygame, wxPython
 
 ## Building
 
diff --git a/games/ultrastar_deluxe.md b/games/ultrastar_deluxe.md
index 82e91e86..93c213d1 100644
--- a/games/ultrastar_deluxe.md
+++ b/games/ultrastar_deluxe.md
@@ -6,11 +6,11 @@ _Karaoke game._
 - State: mature
 - Download: https://usdx.eu/downloads/
 - Platform: Windows, Linux, macOS
-- Keywords: karaoke, music
+- Keywords: music, karaoke
 - Code repository: https://github.com/UltraStar-Deluxe/USDX.git, https://github.com/UltraStar-Deluxe/legacy-sourceforge-svn-mirror.git (+), https://svn.code.sf.net/p/ultrastardx/svn/trunk (svn)
 - Code language: Pascal
 - Code license: GPL-2.0
-- Code dependencies: SDL2, Lua
+- Code dependencies: Lua, SDL2
 
 ## Building
 
diff --git a/games/unknown_horizons.md b/games/unknown_horizons.md
index b4f8828b..6097fa7d 100644
--- a/games/unknown_horizons.md
+++ b/games/unknown_horizons.md
@@ -6,7 +6,7 @@ _A 2D real time strategy simulation with an emphasis on economy and city buildin
 - Media: https://en.wikipedia.org/wiki/Unknown_Horizons
 - State: beta
 - Download: http://unknown-horizons.org/downloads/
-- Keywords: singleplayer, strategy, turn-based
+- Keywords: strategy, singleplayer, turn-based
 - Code repository: https://github.com/unknown-horizons/unknown-horizons.git
 - Code language: Python
 - Code license: GPL-2.0
diff --git a/games/unnethack.md b/games/unnethack.md
index 2cc51ea6..d5d5e7ad 100644
--- a/games/unnethack.md
+++ b/games/unnethack.md
@@ -6,7 +6,7 @@ _Roguelike, single-player role-playing game where the hero must venture through
 - Media: https://en.wikipedia.org/wiki/NetHack#Ports_and_forks
 - State: mature
 - Download: https://sourceforge.net/projects/unnethack/files/unnethack/
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/unnethack/unnethack.git, https://sourceforge.net/p/unnethack/code/HEAD/tree/ (svn), https://sourceforge.net/p/unnethack/git/ci/master/tree/
 - Code language: C
 - Code license: Custom (NetHack license)
diff --git a/games/valyria_tear.md b/games/valyria_tear.md
index 14cc969b..ce7cc46e 100644
--- a/games/valyria_tear.md
+++ b/games/valyria_tear.md
@@ -5,7 +5,7 @@ _J-RPG (Based on the Hero of Allacrost engine)._
 - Home: https://valyriatear.blogspot.de/
 - State: mature
 - Download: https://valyriatear.blogspot.de/p/downloads.html
-- Keywords: JRPG, popular, role playing
+- Keywords: role playing, JRPG, popular
 - Code repository: https://github.com/ValyriaTear/ValyriaTear.git
 - Code language: Lua, C++, C
 - Code license: GPL
diff --git a/games/vdrift.md b/games/vdrift.md
index 7bf33962..572313b4 100644
--- a/games/vdrift.md
+++ b/games/vdrift.md
@@ -6,7 +6,7 @@ _Driving simulation made with drift racing in mind._
 - State: mature, inactive since 2014 
 - Download: (see home)
 - Platform: Windows, Linux, macOS
-- Keywords: cars, racing, simulation
+- Keywords: simulation, cars, racing
 - Code repository: https://github.com/VDrift/vdrift.git, https://svn.code.sf.net/p/vdrift/code/ (svn)
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/wargus.md b/games/wargus.md
index c1835b0b..284d524c 100644
--- a/games/wargus.md
+++ b/games/wargus.md
@@ -5,7 +5,7 @@ _Warcraft2 Mod that allows you to play Warcraft2 with the Stratagus engine._
 - Home: http://wargus.stratagus.com/index.shtml
 - State: mature (?)
 - Download: http://wargus.stratagus.com/download.shtml
-- Keywords: requires original content (?), strategy
+- Keywords: strategy, requires original content (?)
 - Code repository: https://github.com/Wargus/wargus.git, https://code.launchpad.net/wargus (bzr)
 - Code language: C++, Lua
 - Code license: GPL-2.0
diff --git a/games/warzone_2100.md b/games/warzone_2100.md
index 415e3332..bc5c689b 100644
--- a/games/warzone_2100.md
+++ b/games/warzone_2100.md
@@ -5,7 +5,7 @@ _Full campaign with optional (but strongly recommended!), videos, battle against
 - Home: http://wz2100.net/, https://sourceforge.net/projects/warzone2100/
 - State: mature
 - Download: https://sourceforge.net/projects/warzone2100/files/releases/
-- Keywords: popular, real time, strategy
+- Keywords: strategy, popular, real time
 - Code repository: https://github.com/Warzone2100/warzone2100.git
 - Code language: C++
 - Code license: GPL-2.0
diff --git a/games/watomic.md b/games/watomic.md
index 590e366b..a867f42f 100644
--- a/games/watomic.md
+++ b/games/watomic.md
@@ -5,7 +5,7 @@ _Windows clone of Linux KAtomic logic game._
 - Home: https://sourceforge.net/projects/watomic/
 - State: mature, inactive since 2005
 - Download: https://sourceforge.net/projects/watomic/files/
-- Keywords: remake, strategy
+- Keywords: strategy, remake
 - Code repository: https://gitlab.com/osgames/watomic.git (snapshot of source releases)
 - Code language: Pascal
 - Code license: GPL-2.0
diff --git a/games/widelands.md b/games/widelands.md
index 05eae789..b9734dc2 100644
--- a/games/widelands.md
+++ b/games/widelands.md
@@ -6,7 +6,7 @@ _Widelands is a free, open source real-time strategy game with singleplayer camp
 - Media: https://en.wikipedia.org/wiki/Widelands
 - State: mature
 - Download: https://wl.widelands.org/wiki/Download/
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://github.com/widelands/widelands.git (mirror), https://launchpad.net/widelands (bzr)
 - Code language: C++, Lua
 - Code license: GPL-2.0
diff --git a/games/witch_blast.md b/games/witch_blast.md
index 1e97c18e..131f751a 100644
--- a/games/witch_blast.md
+++ b/games/witch_blast.md
@@ -5,7 +5,7 @@ _Roguelike dungeon crawl shooter heavily inspired from Binding Of Isaac._
 - Home: https://github.com/Cirrus-Minor/witchblast
 - State: beta, inactive since 2015
 - Download: https://github.com/Cirrus-Minor/witchblast/releases
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - Code repository: https://github.com/Cirrus-Minor/witchblast.git
 - Code language: C++
 - Code license: GPL-3.0
diff --git a/games/wizards_magic.md b/games/wizards_magic.md
index fc491de6..5bbe9832 100644
--- a/games/wizards_magic.md
+++ b/games/wizards_magic.md
@@ -6,7 +6,7 @@ _Simple card strategy, based on Magic: The Gathering rules._
 - Media: https://web.archive.org/web/20160407053043/https://lgdb.org/game/wizards_magic
 - State: mature, inactive since 2012
 - Download: https://code.google.com/archive/p/wizards-magic/downloads
-- Keywords: cards, remake, strategy
+- Keywords: strategy, cards, remake
 - Code repository: https://github.com/chubakur/wizards-magic.git, https://github.com/chubakur/wizards-magic2.git (+), https://code.google.com/archive/p/wizards-magic/source
 - Code language: Python
 - Code license: GPL-2.0
diff --git a/games/wolfpack_empire.md b/games/wolfpack_empire.md
index 368831ff..f8442556 100644
--- a/games/wolfpack_empire.md
+++ b/games/wolfpack_empire.md
@@ -5,7 +5,7 @@ _Real time, multiplayer, Internet-based game, featuring military, diplomatic, an
 - Home: http://www.wolfpackempire.com/, https://sourceforge.net/projects/empserver/
 - State: mature
 - Download: https://sourceforge.net/projects/empserver/files/
-- Keywords: online, strategy
+- Keywords: strategy, online
 - Code repository: http://git.pond.sub.org/empserver (http://git.pond.sub.org/?p=empserver;a=summary)
 - Code language: C
 - Code license: GPL-3.0
diff --git a/games/world_of_phaos.md b/games/world_of_phaos.md
index 7d72e7ac..23b52d96 100644
--- a/games/world_of_phaos.md
+++ b/games/world_of_phaos.md
@@ -5,7 +5,7 @@ _Online Roleplaying Game browser based, which takes place in the high fantasy wo
 - Home: http://worldofphaos.com/index.php?site=online_rpg, https://sourceforge.net/projects/phaosrpg/
 - State: mature, inactive since 2011
 - Download: https://sourceforge.net/projects/phaosrpg/files/
-- Keywords: online, role playing
+- Keywords: role playing, online
 - Code repository: https://gitlab.com/osgames/phaosrpg.git (snapshot of source releases)
 - Code language: PHP
 - Code license: GPL-2.0
diff --git a/games/wxwidgets.md b/games/wxwidgets.md
index 1930f795..45ac8122 100644
--- a/games/wxwidgets.md
+++ b/games/wxwidgets.md
@@ -6,7 +6,7 @@ _C++ library that lets developers create applications for Windows, Mac OS X, Lin
 - Media: https://en.wikipedia.org/wiki/WxWidgets
 - State: mature
 - Download: http://wxwidgets.org/downloads/
-- Keywords: gui toolkit, library
+- Keywords: library, gui toolkit
 - Code repository: https://github.com/wxWidgets/wxWidgets.git
 - Code language: C++, Objective-C
 - Code license: Custom
diff --git a/games/wyrmsun.md b/games/wyrmsun.md
index d608be8c..8d6b4eba 100644
--- a/games/wyrmsun.md
+++ b/games/wyrmsun.md
@@ -5,7 +5,7 @@ _Strategy game which features elements of mythology, history and fiction._
 - Home: http://andrettin.github.io/
 - State: mature
 - Download: https://store.steampowered.com/app/370070/Wyrmsun/
-- Keywords: real time, strategy
+- Keywords: strategy, real time
 - Code repository: https://github.com/andrettin/wyrmsun.git, https://github.com/Andrettin/Wyrmgus.git (+)
 - Code language: Lua, C++
 - Code license: GPL-2.0
diff --git a/games/xoreos.md b/games/xoreos.md
index 430451f2..2bd35d4b 100644
--- a/games/xoreos.md
+++ b/games/xoreos.md
@@ -14,4 +14,4 @@ Requires original game data.
 
 ## Building
 
-- Build system: CMake, Autoconf
+- Build system: Autoconf, CMake
diff --git a/games/xsera.md b/games/xsera.md
index a743a179..856a2893 100644
--- a/games/xsera.md
+++ b/games/xsera.md
@@ -4,7 +4,7 @@ _Top-down shooter / real-time strategy hybrid game based on an old RTS game name
 
 - Home: https://github.com/prophile/xsera, https://web.archive.org/web/20131206221639/http://www.xsera.org/
 - State: beta, inactive since 2010
-- Keywords: real time, shooter, strategy
+- Keywords: strategy, real time, shooter
 - Code repository: https://github.com/prophile/xsera.git
 - Code language: C, Lua
 - Code license: MIT
diff --git a/games/ysoccer.md b/games/ysoccer.md
index a066cb8e..06aede78 100644
--- a/games/ysoccer.md
+++ b/games/ysoccer.md
@@ -6,7 +6,7 @@ _Soccer game; continuation to Sensible World of Soccer._
 - State: mature, inactive since 2017 
 - Download: http://ysoccer.sourceforge.net/dloads.htm, https://sourceforge.net/projects/ysoccer/files/
 - Platform: Windows, Linux, macOS
-- Keywords: simulation, soccer, sports
+- Keywords: sports, simulation, soccer
 - Code repository: https://git.code.sf.net/p/ysoccer/code
 - Code language: Java
 - Code license: ?
diff --git a/games/zangband.md b/games/zangband.md
index f686c4ae..cd654327 100644
--- a/games/zangband.md
+++ b/games/zangband.md
@@ -6,7 +6,7 @@ _Roguelike computer role playing game available for almost any computer and oper
 - Media: https://en.wikipedia.org/wiki/Angband_(video_game)#Derivative_works
 - State: mature, inactive since 2005
 - Download: https://sourceforge.net/projects/zangband/files/
-- Keywords: roguelike, role playing
+- Keywords: role playing, roguelike
 - 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/zero_k.md b/games/zero_k.md
index f2563fa2..b9e68811 100644
--- a/games/zero_k.md
+++ b/games/zero_k.md
@@ -6,7 +6,7 @@ _A free multi-platform open source real-time strategy video game._
 - Media: https://en.wikipedia.org/wiki/Zero-K
 - State: mature
 - Download: http://zero-k.info/Wiki/Download
-- Keywords: popular, real time, strategy
+- Keywords: strategy, popular, real time
 - Code repository: https://github.com/ZeroK-RTS/Zero-K.git
 - Code language: Lua
 - Code license: GPL-2.0
diff --git a/games/zgameeditor.md b/games/zgameeditor.md
index dafc4713..8012137e 100644
--- a/games/zgameeditor.md
+++ b/games/zgameeditor.md
@@ -5,7 +5,7 @@ _Rapid development solution with a tiny footprint._
 - Home: http://www.zgameeditor.org/
 - State: mature
 - Download: http://www.zgameeditor.org/index.php/Main/Download
-- Keywords: editor, framework
+- Keywords: framework, editor
 - Code repository: https://github.com/VilleKrumlinde/zgameeditor.git
 - Code language: Pascal
 - Code license: MIT
diff --git a/statistics.md b/statistics.md
index 911b6fc0..65a21b26 100644
--- a/statistics.md
+++ b/statistics.md
@@ -1,23 +1,23 @@
 [comment]: # (autogenerated content, do not edit)
 # Statistics
 
-analyzed 519 entries on 2019-07-16 18:01:48
+analyzed 518 entries on 2019-08-05 17:03:54
 
 ## State
 
-- mature: 338 (65.1%)
-- beta: 181 (34.9%)
-- inactive: 231 (44.5%)
+- mature: 338 (65.3%)
+- beta: 180 (34.7%)
+- inactive: 229 (44.2%)
 
 ##### Inactive State
 
-Blobby Volley 2 (2017), Eat The Whistle (2017), PokerTH (2017), Scrolling Game Development Kit 2 (2017), Tressette (2017), YSoccer (2017), Zone of Control (2017), 3d.city (2016), Atlantis (2016), Atomic Tanks (2016), Atrinik (2016), Birth of the Empires (2016), DNT (2016), Dark Destiny (2016), Dungeon Monkey Eternal (2016), FreeRCT (2016), GLtron (2016), Infiniminer (2016), JaNaG - Java Name Generator (2016), Mechanized Assault & eXploration Reloaded  (2016), Open Yahtzee (2016), Polis (2016), TORCS, The Open Racing Car Simulator (2016), Tremulous (2016), ransack (2016), Aleph One: Marathon (2015), Atomiks (2015), Battleround (2015), Blobwars: Metal Blob Solid (2015), Boulder Dash (2015), D-Fend Reloaded (2015), Dash Engine (2015), DeSmuME (2015), Delta Engine (2015), Egoboo (2015), Free heroes2 engine (2015), Liquid War (2015), M.E.W.L. (2015), Roguish (2015), Scrabble3D (2015), Tenes Empanadas Graciela (2015), The Endless Dungeons (2015), The Epic of Heroes (2015), TwinEngine (2015), Witch Blast (2015), pyORPG (2015), Argentum Online (2014), Battles of Antargis (2014), BlockOut II (2014), Cart Life (2014), Deity (2014), Dune Dynasty (2014), EternalWinterWars (2014), FAR Colony (2014), Fujo (2014), Grobots (2014), Hale (2014), Heroes of Wing Commander (2014), Kingdoms (2014), Lips of Suna (2014), Open RPG Maker (2014), Open Tibia (2014), Radakan (2014), SDL Game Engine 2D (2014), SDL Sopwith (2014), Scorched 3D (2014), Sintel The Game (2014), Summoning Wars (2014), Supremacy (2014), Turious (2014), VDrift (2014), X-Moto (2014), Xenowar (2014), rpge (2014), sandbox Game Maker (2014), Bos Wars (2013), C-evo (2013), Candy Box 2 (2013), Decker (2013), DemiGod (2013), Dungeon Mapper (2013), HoDoKu (2013), HolySpirit (2013), MechCommander 2 Omnitech (2013), Mpango (2013), Murder In The Public Domain (2013), OpenRPG (2013), Phantasy Star Rebirth (2013), Room for Change (2013), SoftPixel Engine (2013), Source of Tales (2013), SpaceZero (2013), The Bub's Brothers (2013), Trinity Reign (2013), Zero Ballistics (2013), Biniax (2012), BlackNova Traders (2012), Blitzkrieg (2012), Cataclysm (2012), Celestron (2012), CommandoJS (2012), Conquests (2012), DarkCity (2012), Frozen Bubble (2012), Goblin Camp (2012), Hexwar (2012), Mega Mario (2012), OpenArena (2012), PARPG (2012), TROPHY (2012), Thousand Parsec (2012), Tux Football (2012), UFO2000 (2012), Wizards Magic (2012), Aeron (2011), Battlefield Java (2011), Brain Workshop (2011), Danger from the Deep (2011), Dawn (2011), Fish Fillets - Next Generation (2011), GalaxyMage Redux (2011), KQ Lives (2011), Kobold's Quest 2 (2011), OpenBlox (2011), OpenMOO2 (2011), PyKaraoke (2011), Skrupel - Tribute Compilation (2011), Smash Battle (2011), Song of Albion (2011), Star Control II: The Ur-Quan Masters (2011), Tux of Math Command (2011), UlDunAd (2011), World of Phaos (2011), X-Force: Fight For Destiny (2011), AI Wars (2010), Bombermaaan (2010), Crimson Fields (2010), Dragon History - Dračí Historie (2010), Heroes of Wesnoth (2010), Labyrinth of Worlds (2010), Linwarrior 3D (2010), Mercenary Commander (2010), OpenHoMM (2010), Slay (2010), SpaceTrader for Java (2010), UltraStar (2010), XPilot (2010), XSera (2010), nXtank (2010), Alien Assault Traders (2009), Annchienta (2009), Ardentryst (2009), Battle Tanks (2009), Crown and Cutlass (2009), Dark Oberon (2009), Duel Commander (2009), Fall of Imyrin (2009), Fallen Spire (2009), FreeTrain (2009), Glest (2009), Goblin Hack (2009), MicroWar 2.0 (2009), Netrek (2009), ORIENT (2009), OpenPop (2009), SDL Asylum (2009), Secret Mario Chronicles (2009), Space Trader for Windows (2009), World of Heroes (2009), Yo Frankie! (2009), A Planet's Revenge (2008), Attal: Lords of doom (2008), Avanor (2008), Freestars (2008), Mars, Land of No Mercy (2008), Meritous (2008), Open Game Engine (2008), S.C.O.U.R.G.E. (2008), Sengoku: Warring States of Japan (2008), Space Opera (2008), Armies (2007), Brutal Chess (2007), Eos, Dawn of Light: A Space Opera (2007), Pang Zero (2007), SharpKonquest (2007), Silvertree (2007), Slash'EM (2007), Underworld Adventures (2007), World Builder (2007), kiki the nano bot (2007), Betrayer's Moon Tactics (2006), Boson (2006), GPL Arcade Volleyball (2006), GUSANOS (2006), Grabble (2006), JQuest (2006), Linley's Dungeon Crawl (2006), Metal Mech (2006), RPDungeon - computer aided role playing (2006), Rogue Clone IV (2006), StarBlastrix  (2006), GalaxyNG (2005), H-World (2005), Lincity (2005), Spice Trade (2005), Tumiki Fighters (2005), WAtomic (2005), Xconq (2005), ZAngband (2005), Colonization too (2004), GM Tools (2004), Gee Whiz (2004), Openglad (2004), PySol (2004), T-Bots (2004), AntiChess (2003), Cat Mother Dead Justice (2003), Civil (2003), Machinations (2003), Pizza Business (2003), Planetary Hoppers (2003), The Clans (2003), Wargamer (2003), XArchon (2003), Maelstrom (2002), Umbra (2002), Greenius' Civil War (2001), Tux Racer (2001), Operation Citadel (2000), xdigger (1999), Ballerburg (1987)
+Blobby Volley 2 (2017), Eat The Whistle (2017), PokerTH (2017), Scrolling Game Development Kit 2 (2017), Tressette (2017), YSoccer (2017), Zone of Control (2017), 3d.city (2016), Atlantis (2016), Atomic Tanks (2016), Atrinik (2016), Birth of the Empires (2016), DNT (2016), Dark Destiny (2016), Dungeon Monkey Eternal (2016), FreeRCT (2016), GLtron (2016), Infiniminer (2016), JaNaG - Java Name Generator (2016), Mechanized Assault & eXploration Reloaded  (2016), Open Yahtzee (2016), Polis (2016), TORCS, The Open Racing Car Simulator (2016), Tremulous (2016), ransack (2016), Aleph One: Marathon (2015), Atomiks (2015), Battleround (2015), Blobwars: Metal Blob Solid (2015), Boulder Dash (2015), D-Fend Reloaded (2015), Dash Engine (2015), DeSmuME (2015), Delta Engine (2015), Egoboo (2015), Free heroes2 engine (2015), Liquid War (2015), M.E.W.L. (2015), Roguish (2015), Scrabble3D (2015), Tenes Empanadas Graciela (2015), The Endless Dungeons (2015), The Epic of Heroes (2015), TwinEngine (2015), Witch Blast (2015), pyORPG (2015), Argentum Online (2014), Battles of Antargis (2014), BlockOut II (2014), Cart Life (2014), Deity (2014), Dune Dynasty (2014), EternalWinterWars (2014), FAR Colony (2014), Fujo (2014), Grobots (2014), Hale (2014), Heroes of Wing Commander (2014), Kingdoms (2014), Lips of Suna (2014), Open RPG Maker (2014), Open Tibia (2014), Radakan (2014), SDL Game Engine 2D (2014), SDL Sopwith (2014), Scorched 3D (2014), Sintel The Game (2014), Summoning Wars (2014), Supremacy (2014), Turious (2014), VDrift (2014), X-Moto (2014), Xenowar (2014), rpge (2014), sandbox Game Maker (2014), Bos Wars (2013), C-evo (2013), Candy Box 2 (2013), Decker (2013), DemiGod (2013), Dungeon Mapper (2013), HoDoKu (2013), HolySpirit (2013), MechCommander 2 Omnitech (2013), Mpango (2013), Murder In The Public Domain (2013), OpenRPG (2013), Phantasy Star Rebirth (2013), Room for Change (2013), SoftPixel Engine (2013), Source of Tales (2013), The Bub's Brothers (2013), Trinity Reign (2013), Zero Ballistics (2013), Biniax (2012), BlackNova Traders (2012), Blitzkrieg (2012), Cataclysm (2012), Celestron (2012), CommandoJS (2012), Conquests (2012), DarkCity (2012), Frozen Bubble (2012), Goblin Camp (2012), Hexwar (2012), Mega Mario (2012), OpenArena (2012), PARPG (2012), TROPHY (2012), Thousand Parsec (2012), Tux Football (2012), UFO2000 (2012), Wizards Magic (2012), Aeron (2011), Battlefield Java (2011), Brain Workshop (2011), Danger from the Deep (2011), Dawn (2011), Fish Fillets - Next Generation (2011), GalaxyMage Redux (2011), KQ Lives (2011), Kobold's Quest 2 (2011), OpenBlox (2011), OpenMOO2 (2011), PyKaraoke (2011), Skrupel - Tribute Compilation (2011), Smash Battle (2011), Song of Albion (2011), Star Control II: The Ur-Quan Masters (2011), Tux of Math Command (2011), UlDunAd (2011), World of Phaos (2011), X-Force: Fight For Destiny (2011), AI Wars (2010), Bombermaaan (2010), Crimson Fields (2010), Dragon History - Dračí Historie (2010), Heroes of Wesnoth (2010), Labyrinth of Worlds (2010), Linwarrior 3D (2010), Mercenary Commander (2010), OpenHoMM (2010), Slay (2010), SpaceTrader for Java (2010), UltraStar (2010), XPilot (2010), XSera (2010), nXtank (2010), Alien Assault Traders (2009), Annchienta (2009), Ardentryst (2009), Battle Tanks (2009), Crown and Cutlass (2009), Dark Oberon (2009), Duel Commander (2009), Fall of Imyrin (2009), Fallen Spire (2009), FreeTrain (2009), Glest (2009), Goblin Hack (2009), MicroWar 2.0 (2009), Netrek (2009), ORIENT (2009), SDL Asylum (2009), Secret Mario Chronicles (2009), Space Trader for Windows (2009), World of Heroes (2009), Yo Frankie! (2009), A Planet's Revenge (2008), Attal: Lords of doom (2008), Avanor (2008), Freestars (2008), Mars, Land of No Mercy (2008), Meritous (2008), Open Game Engine (2008), S.C.O.U.R.G.E. (2008), Sengoku: Warring States of Japan (2008), Space Opera (2008), Armies (2007), Brutal Chess (2007), Eos, Dawn of Light: A Space Opera (2007), Pang Zero (2007), SharpKonquest (2007), Silvertree (2007), Slash'EM (2007), Underworld Adventures (2007), World Builder (2007), kiki the nano bot (2007), Betrayer's Moon Tactics (2006), Boson (2006), GPL Arcade Volleyball (2006), GUSANOS (2006), Grabble (2006), JQuest (2006), Linley's Dungeon Crawl (2006), Metal Mech (2006), RPDungeon - computer aided role playing (2006), Rogue Clone IV (2006), StarBlastrix  (2006), GalaxyNG (2005), H-World (2005), Lincity (2005), Spice Trade (2005), Tumiki Fighters (2005), WAtomic (2005), Xconq (2005), ZAngband (2005), Colonization too (2004), GM Tools (2004), Gee Whiz (2004), Openglad (2004), PySol (2004), T-Bots (2004), AntiChess (2003), Cat Mother Dead Justice (2003), Civil (2003), Machinations (2003), Pizza Business (2003), Planetary Hoppers (2003), The Clans (2003), Wargamer (2003), XArchon (2003), Maelstrom (2002), Umbra (2002), Greenius' Civil War (2001), Tux Racer (2001), Operation Citadel (2000), xdigger (1999), Ballerburg (1987)
 
 ## Code Languages
 
 ##### Language frequency
 
-- C++ (37.1%)
+- C++ (37.0%)
 - C (20.2%)
 - Java (10.9%)
 - Python (9.1%)
@@ -61,9 +61,9 @@ Blobby Volley 2 (2017), Eat The Whistle (2017), PokerTH (2017), Scrolling Game D
 
 ##### Licenses frequency
 
-- GPL-2.0 (38.6%)
-- GPL-3.0 (24.9%)
-- MIT (10.8%)
+- GPL-2.0 (38.5%)
+- GPL-3.0 (25.0%)
+- MIT (10.9%)
 - Custom (4.4%)
 - ? (2.7%)
 - Apache-2.0 (2.5%)
@@ -98,11 +98,11 @@ Blobby Volley 2 (2017), Eat The Whistle (2017), PokerTH (2017), Scrolling Game D
 
 ##### Keywords frequency
 
-- strategy (19.1%)
+- strategy (19.0%)
 - role playing (13.4%)
-- action (8.0%)
+- action (7.9%)
 - framework (6.7%)
-- simulation (3.8%)
+- simulation (3.7%)
 - turn-based (3.5%)
 - real time (2.6%)
 - roguelike (2.6%)
@@ -116,9 +116,9 @@ Blobby Volley 2 (2017), Eat The Whistle (2017), PokerTH (2017), Scrolling Game D
 - tool (1.7%)
 - adventure (1.6%)
 - singleplayer (1.4%)
+- 2D (1.1%)
 - arcade (1.1%)
 - multiplayer (1.1%)
-- 2D (1.0%)
 - 3D (1.0%)
 - board game (1.0%)
 - game engine (0.9%)
@@ -134,13 +134,13 @@ Blobby Volley 2 (2017), Eat The Whistle (2017), PokerTH (2017), Scrolling Game D
 - educational (0.3%)
 - karaoke (0.3%)
 - music (0.3%)
+- platform (0.3%)
 - port (0.3%)
 - space (0.3%)
 - wormslike (0.3%)
 - chess (0.2%)
 - isometric (0.2%)
 - kids (0.2%)
-- platform (0.2%)
 - programming (0.2%)
 - risklike (0.2%)
 - shoot'em up (0.2%)
@@ -201,17 +201,110 @@ Blobby Volley 2 (2017), Eat The Whistle (2017), PokerTH (2017), Scrolling Game D
 
 27: Advanced Strategic Command, Blender game engine, Deliantra, Fanwor, FreeRails, FreeType, Freedink, GUSANOS, KAtomic, Libxml2, LordsAWar!, Mechanized Assault & eXploration Reloaded , NetStatsBaseball, Netrek, Nexiuz, Open AL Soft, Open Rails, Ragel, Rocks'n'Diamonds , Simple DirectMedia Layer, Tales of Maj'Eyal, Turious, Waste's Edge, Wolfpack Empire, XZ Utils, kiki the nano bot, pkg-config
 
+## Code dependencies
+
+With code dependency field 104 (20.1%)
+
+##### Code dependencies frequency
+
+- pygame (15.0%)
+- SDL (12.5%)
+- numpy (3.5%)
+- pillow (3.5%)
+- wxPython (3.5%)
+- SDL2 (3.0%)
+- zlib (2.5%)
+- Allegro (2.0%)
+- Blender game engine (2.0%)
+- OpenAL (2.0%)
+- Freetype (1.5%)
+- Lua (1.5%)
+- Ogre (1.5%)
+- OpenGL (1.5%)
+- Twisted (1.5%)
+- libpng (1.5%)
+- pgu (1.5%)
+- Boost (1.0%)
+- Cocoa (1.0%)
+- GTK (1.0%)
+- Panda3D (1.0%)
+- PyQt4 (1.0%)
+- Qt (1.0%)
+- Ren'Py (1.0%)
+- psyco (1.0%)
+- pyglet (1.0%)
+- pygtk (1.0%)
+- wxWidgets (1.0%)
+- Adonthell game engine (0.5%)
+- Adventure Game Studio (0.5%)
+- Box2D (0.5%)
+- C++11 compiler (0.5%)
+- CherryPy (0.5%)
+- Clanlib (0.5%)
+- DarkPlaces (0.5%)
+- DirectPython (0.5%)
+- Doom engine (0.5%)
+- FIFE (0.5%)
+- Game Maker (0.5%)
+- Irrlicht (0.5%)
+- Matplotlib (0.5%)
+- Modified Stratagus-Engine (0.5%)
+- Mono (0.5%)
+- NetworkX (0.5%)
+- Ogg (0.5%)
+- PyAMF (0.5%)
+- PyLab (0.5%)
+- PyOpenGL (0.5%)
+- PyQt (0.5%)
+- PySide (0.5%)
+- PyTMX (0.5%)
+- QT (0.5%)
+- Rose (0.5%)
+- SDL2_image (0.5%)
+- SDL2_mixer (0.5%)
+- SDL2_ttf (0.5%)
+- SFML (0.5%)
+- SQLAlchemy (0.5%)
+- Solarus engine (0.5%)
+- Stratagus (0.5%)
+- Tk (0.5%)
+- TurboGears (0.5%)
+- Vorbis (0.5%)
+- Zope (0.5%)
+- boost (0.5%)
+- boost-program-options (0.5%)
+- cairo (0.5%)
+- curses (0.5%)
+- cx_Freeze (0.5%)
+- fife (0.5%)
+- gettext (0.5%)
+- libGDX (0.5%)
+- libogg (0.5%)
+- libtiff (0.5%)
+- libvorbis (0.5%)
+- libxml2 (0.5%)
+- neteria (0.5%)
+- physfs (0.5%)
+- py2app (0.5%)
+- py2exe (0.5%)
+- pyOpenSSL (0.5%)
+- pycairo (0.5%)
+- pygobject (0.5%)
+- simplejson (0.5%)
+- utfcpp (0.5%)
+- yaml (0.5%)
+
 ## Build systems
 
-Build systems information available for 24.3% of all projects.
+Build systems information available for 24.5% of all projects.
 
-##### Build systems frequency (126)
+##### Build systems frequency (127)
 
-- CMake (61.1%)
-- Autoconf (15.9%)
-- Make (4.8%)
-- Scons (4.0%)
-- setup.py (3.2%)
+- CMake (61.4%)
+- Autoconf (15.7%)
+- Make (4.7%)
+- Scons (3.9%)
+- setup.py (3.1%)
 - Custom (2.4%)
 - Gradle (2.4%)
 - Ant (1.6%)
@@ -221,17 +314,17 @@ Build systems information available for 24.3% of all projects.
 - Xcode project (0.8%)
 - py2exe (0.8%)
 
-##### C and C++ projects without build system information (213)
+##### C and C++ projects without build system information (211)
 
-Aeron, Aleph One: Marathon, Angband, Antares, Armagetron Advanced, Armies, Atlantis, Atomic Tanks, Atomiks, Atomix, Attal: Lords of doom, AutoREALM, Avanor, Ballerburg, Battle Tanks, Battles of Antargis, Biniax, Birth of the Empires, Blobby Volley 2, Blobwars: Metal Blob Solid, BlockOut II, Bombermaaan, Boost (C++ Libraries), Bos Wars, Boson, Brutal Chess, Call to Power 2, Cat Mother Dead Justice, Cataclysm, Catch Challenger, Classic Blades of Exile, Clou!, Colonization too, Conquests, Core War, Crossfire, Crown and Cutlass, Crypto++, Daimonin, Danger from the Deep, Dark Oberon, Dawn, DeSmuME, Deliantra, Duel Commander, Dune Dynasty, Dune Legacy, Dungeon Craft, Dungeon Crawl Stone Soup, Dungeon Mapper, ENIGMA, Endless Sky, Epiar, Erebus, Eternal Lands, Evol Online, Exult, Fall of Imyrin, Fanwor, Free Space Colonization, Free heroes2 engine, Free in the Dark (engine), Freedink, Freeminer, Freestars, GDash, GLtron, GM Tools, GPL Arcade Volleyball, GalaxyNG, GameLV, Gee Whiz, Gigalomania, Globulation2, Goblin Camp, Goblin Hack, Golly , Greenius' Civil War, Grobots, H-World, Harris, Haxima, Heroes of Wesnoth, Hex Game, HolySpirit, Irrlicht Engine, Iter Vehemens ad Necem, Jagged Alliance 2 Stracciatella, KAtomic, KQ Lives, LGames, LGeneral, LZMA SDK, Labyrinth of Worlds, Libxml2, Lightweight Java Game Library, LinCity-NG, Lincity, Linley's Dungeon Crawl, Linwarrior 3D, Lips of Suna, Lua, Lumix Engine, M.E.W.L., Machinations, Mars, Land of No Mercy, MechCommander 2 Omnitech, Mega Mario, Meridian 59, Meritous, Moria, NLarn, Naev, NetHack, NetPanzer, NetStatsBaseball, Neverball, Nexiuz, Oolite, Open AL, Open Apocalypse, Open Dune, Open Meridian, Open RPG Maker, Open Sonic, Open Yahtzee, Open Zelda, OpenArena, OpenCity, OpenHoMM, OpenMW, OpenPop, OpenSSL, Openglad, Operation Citadel, Orx, Other-Life, Panda 3D, Pax Britannica, Phantasy Star Rebirth, Pioneers, Pizza Business, PlaneShift, PokerTH, Pthreads-win32, Qt, REGoth, Ragel, Red Eclipse, Return to the Roots, Rocks'n'Diamonds , Rogue Clone IV, Rolisteam, S.C.O.U.R.G.E., SDL Asylum, SDL Game Engine 2D, SDL Sopwith, SWIG, Scorched 3D, Secret Mario Chronicles, Sengoku: Warring States of Japan, Seven Kingdoms: Ancient Adversaries, SimuTrans, Slash'EM, Smash Battle, Song of Albion, SpaceZero, Star Ruler 2, StarBlastrix , Summoning Wars, SuperTuxKart, T-Bots, TORCS, The Open Racing Car Simulator, Tales of Maj'Eyal, Tenes Empanadas Graciela, The Clans, The Endless Dungeons, The Epic of Heroes, The Legend of Edgar, Thousand Parsec, TinTin++, Tremulous, Turious, Tux Racer, TwinEngine, UFO2000, UnNetHack, Underworld Adventures, VCMI Project, Vega Strike, War Of Kingdom, Wargamer, Wargus, Witch Blast, Wolfpack Empire, WorldForge, Wyrmsun, X-Moto, XArchon, XPilot, XSera, XZ Utils, Xconq, Xenowar, Xonotic, ZAngband, libGDX, libpng, pkg-config, pygame, sandbox Game Maker, wxWidgets, xdigger
+Aeron, Aleph One: Marathon, Angband, Antares, Armagetron Advanced, Armies, Atlantis, Atomic Tanks, Atomiks, Atomix, Attal: Lords of doom, AutoREALM, Avanor, Ballerburg, Battle Tanks, Battles of Antargis, Biniax, Birth of the Empires, Blobby Volley 2, Blobwars: Metal Blob Solid, BlockOut II, Bombermaaan, Boost (C++ Libraries), Bos Wars, Boson, Brutal Chess, Call to Power 2, Cat Mother Dead Justice, Cataclysm, Catch Challenger, Classic Blades of Exile, Clou!, Colonization too, Conquests, Core War, Crossfire, Crown and Cutlass, Crypto++, Daimonin, Danger from the Deep, Dark Oberon, Dawn, DeSmuME, Deliantra, Duel Commander, Dune Dynasty, Dune Legacy, Dungeon Craft, Dungeon Crawl Stone Soup, Dungeon Mapper, ENIGMA, Endless Sky, Epiar, Erebus, Eternal Lands, Evol Online, Exult, Fall of Imyrin, Fanwor, Free Space Colonization, Free heroes2 engine, Free in the Dark (engine), Freedink, Freeminer, Freestars, GDash, GLtron, GM Tools, GPL Arcade Volleyball, GalaxyNG, GameLV, Gee Whiz, Gigalomania, Globulation2, Goblin Camp, Goblin Hack, Golly , Greenius' Civil War, Grobots, H-World, Harris, Haxima, Heroes of Wesnoth, Hex Game, HolySpirit, Irrlicht Engine, Iter Vehemens ad Necem, Jagged Alliance 2 Stracciatella, KAtomic, KQ Lives, LGames, LGeneral, LZMA SDK, Labyrinth of Worlds, Libxml2, Lightweight Java Game Library, LinCity-NG, Lincity, Linley's Dungeon Crawl, Linwarrior 3D, Lips of Suna, Lua, Lumix Engine, M.E.W.L., Machinations, Mars, Land of No Mercy, MechCommander 2 Omnitech, Mega Mario, Meridian 59, Meritous, Moria, NLarn, Naev, NetHack, NetPanzer, NetStatsBaseball, Neverball, Nexiuz, Oolite, Open AL, Open Apocalypse, Open Dune, Open Meridian, Open RPG Maker, Open Yahtzee, Open Zelda, OpenArena, OpenCity, OpenHoMM, OpenMW, OpenSSL, Openglad, Operation Citadel, Orx, Other-Life, Panda 3D, Pax Britannica, Phantasy Star Rebirth, Pioneers, Pizza Business, PlaneShift, PokerTH, Pthreads-win32, Qt, REGoth, Ragel, Red Eclipse, Return to the Roots, Rocks'n'Diamonds , Rogue Clone IV, Rolisteam, S.C.O.U.R.G.E., SDL Asylum, SDL Game Engine 2D, SDL Sopwith, SWIG, Scorched 3D, Secret Mario Chronicles, Sengoku: Warring States of Japan, Seven Kingdoms: Ancient Adversaries, SimuTrans, Slash'EM, Smash Battle, Song of Albion, SpaceZero, Star Ruler 2, StarBlastrix , Summoning Wars, SuperTuxKart, T-Bots, TORCS, The Open Racing Car Simulator, Tales of Maj'Eyal, Tenes Empanadas Graciela, The Clans, The Endless Dungeons, The Epic of Heroes, The Legend of Edgar, Thousand Parsec, TinTin++, Tremulous, Turious, Tux Racer, TwinEngine, UFO2000, UnNetHack, Underworld Adventures, VCMI Project, Vega Strike, War Of Kingdom, Wargamer, Wargus, Witch Blast, Wolfpack Empire, WorldForge, Wyrmsun, X-Moto, XArchon, XPilot, XSera, XZ Utils, Xconq, Xenowar, Xonotic, ZAngband, libGDX, libpng, pkg-config, pygame, sandbox Game Maker, wxWidgets, xdigger
 
-##### C and C++ projects with a build system different from CMake (76)
+##### C and C++ projects with a build system different from CMake (77)
 
-Allegro, Annchienta, Arx Libertatis, Astromenace, Atrinik, Battle for Wesnoth, Blender game engine, Block Attack - Rise of the Blocks, C-Dogs, COCOS2D-X, Caesar IA, Chocolate Doom, Choria, Colobot, Corsix Theme Hospital, DNT, Doxygen, DreamChess, EasyRPG Player, Eat The Whistle, Egoboo, Flare Engine, FlightGear, Free Orion, FreeRCT, FreeSynd, FreeType, Freeserf, GemRB, HarfBuzz, Lugaru, LÖVE, Mana, Maratis, Me and My Shadow, Mechanized Assault & eXploration Reloaded , MegaGlest, Minetest, OGRE3D, Open AL Soft, Open Game Engine, Open Tibia, OpenClonk, OpenLieroX, OpenRCT2, OpenSkyscraper, OpenXcom, PainTown, Pingus, Polycode, Rigs of Rods, Ryzom Core, Simple DirectMedia Layer, Simple and Fast Multimedia Library, SoftPixel Engine, Solarus, Speed Dreams, Spring RTS engine, StepMania, Stunt Rally, The Butterfly Effect, Trinity Reign, Tux Football, Tux of Math Command, Ufo: Alien Invasion, Unvanquished, Urho3D, Valyria Tear, Warzone 2100, Widelands, XU4, Zero Ballistics, mkxp, xoreos, yaml-cpp, zlib
+Allegro, Annchienta, Arx Libertatis, Astromenace, Atrinik, Battle for Wesnoth, Blender game engine, Block Attack - Rise of the Blocks, C-Dogs, COCOS2D-X, Caesar IA, Chocolate Doom, Choria, Colobot, Corsix Theme Hospital, DNT, Doxygen, DreamChess, EasyRPG Player, Eat The Whistle, Egoboo, Flare Engine, FlightGear, Free Orion, FreeRCT, FreeSynd, FreeType, Freeserf, GemRB, HarfBuzz, Lugaru, LÖVE, Mana, Maratis, Me and My Shadow, Mechanized Assault & eXploration Reloaded , MegaGlest, Minetest, OGRE3D, Open AL Soft, Open Game Engine, Open Surge, Open Tibia, OpenClonk, OpenLieroX, OpenRCT2, OpenSkyscraper, OpenXcom, PainTown, Pingus, Polycode, Rigs of Rods, Ryzom Core, Simple DirectMedia Layer, Simple and Fast Multimedia Library, SoftPixel Engine, Solarus, Speed Dreams, Spring RTS engine, StepMania, Stunt Rally, The Butterfly Effect, Trinity Reign, Tux Football, Tux of Math Command, Ufo: Alien Invasion, Unvanquished, Urho3D, Valyria Tear, Warzone 2100, Widelands, XU4, Zero Ballistics, mkxp, xoreos, yaml-cpp, zlib
 
 ## Platform
 
-Platform information available for 51.8% of all projects.
+Platform information available for 51.9% of all projects.
 
 ##### Platforms frequency
 
diff --git a/tools/archives.json b/tools/archives.json
index e46da7d3..66efdbab 100644
--- a/tools/archives.json
+++ b/tools/archives.json
@@ -163,6 +163,7 @@
   "https://github.com/aburch/simutrans.git",
   "https://github.com/acmepjz/meandmyshadow.git",
   "https://github.com/akarnokd/open-ig.git",
+  "https://github.com/alemart/opensurge.git",
   "https://github.com/alphaonex86/CatchChallenger.git",
   "https://github.com/anael-seghezzi/Maratis-4.git",
   "https://github.com/andrettin/wyrmsun.git",
@@ -361,6 +362,7 @@
   "https://gitlab.com/osgames/aplanetsrevenge.git",
   "https://gitlab.com/osgames/armies.git",
   "https://gitlab.com/osgames/atanks.git",
+  "https://gitlab.com/osgames/atomiks.git",
   "https://gitlab.com/osgames/attal.git",
   "https://gitlab.com/osgames/avanor.git",
   "https://gitlab.com/osgames/ballerburg.git",
@@ -384,6 +386,7 @@
   "https://gitlab.com/osgames/crimson.git",
   "https://gitlab.com/osgames/crownandcutlass.git",
   "https://gitlab.com/osgames/dark-oberon.git",
+  "https://gitlab.com/osgames/darkcity.git",
   "https://gitlab.com/osgames/darkdestiny.git",
   "https://gitlab.com/osgames/deity.git",
   "https://gitlab.com/osgames/devana.git",
@@ -461,6 +464,7 @@
   "https://gitlab.com/osgames/the-bubs-brothers.git",
   "https://gitlab.com/osgames/theclans.git",
   "https://gitlab.com/osgames/torcs.git",
+  "https://gitlab.com/osgames/trophy.git",
   "https://gitlab.com/osgames/tuxfootball.git",
   "https://gitlab.com/osgames/tuxracer.git",
   "https://gitlab.com/osgames/uaf.git",
@@ -491,26 +495,21 @@
   "http://svn.uktrainsim.com/svn/openrails/trunk",
   "https://svn.code.sf.net/p/aeron/code/",
   "https://svn.code.sf.net/p/armagetronad/code/",
-  "https://svn.code.sf.net/p/atomiks/code/",
   "https://svn.code.sf.net/p/blobby/code/",
   "https://svn.code.sf.net/p/crossfire/code/",
   "https://svn.code.sf.net/p/daimonin/code/",
-  "https://svn.code.sf.net/p/darkcity/code/",
   "https://svn.code.sf.net/p/etw/code/",
   "https://svn.code.sf.net/p/freemars/code/",
   "https://svn.code.sf.net/p/freesynd/code/",
   "https://svn.code.sf.net/p/fsc/code/",
   "https://svn.code.sf.net/p/lgames/code/",
   "https://svn.code.sf.net/p/opencity/code/",
-  "https://svn.code.sf.net/p/openpopulous/code/",
-  "https://svn.code.sf.net/p/opensnc/code/",
   "https://svn.code.sf.net/p/pio/code/",
   "https://svn.code.sf.net/p/planeshift/code/",
   "https://svn.code.sf.net/p/scrabble/code/",
   "https://svn.code.sf.net/p/space-faring/code/",
   "https://svn.code.sf.net/p/spacezero/code/",
   "https://svn.code.sf.net/p/speed-dreams/code/",
-  "https://svn.code.sf.net/p/trophy/code/",
   "https://svn.code.sf.net/p/ultrastar/code/",
   "https://svn.code.sf.net/p/xu4/code/"
  ],
diff --git a/tools/git_statistics.py b/tools/git_statistics.py
new file mode 100644
index 00000000..fbfd41f8
--- /dev/null
+++ b/tools/git_statistics.py
@@ -0,0 +1,9 @@
+"""
+takes all gits that we have in the list and checks the master branch out, then collects some statistics:
+- number of distinct comitters
+- list of commit dates
+- number of commits
+- language detection and lines of code counting on final state
+
+uses git log --format="%an, %at, %cn, %ct" --all ti get commits, committers and times (as unix time stamp)
+"""
diff --git a/tools/maintenance.py b/tools/maintenance.py
index 20ab5412..eb2db341 100644
--- a/tools/maintenance.py
+++ b/tools/maintenance.py
@@ -196,18 +196,15 @@ def check_template_leftovers():
                 raise RuntimeError('{}: found {}'.format(os.path.basename(entry_path), check_string))
 
 
-def fix_keywords():
+def fix_entries():
     """
-    Fixes the keywords.
+    Fixes the keywords, code dependencies, build systems, .. entries, mostly by automatically sorting them.
     """
 
-    print('fix keywords')
+    print('fix entries')
 
-    regex = re.compile(r"(.*)(- Keywords:.*)(- Code repository: .*)",  re.DOTALL)
-
-    # get all entries (ignore everything starting with underscore)
-    entries = os.listdir(games_path)
-    entries = (x for x in entries if not x.startswith('_'))
+    # keywords
+    regex = re.compile(r"(.*)- Keywords:([^\n]*)(.*)", re.DOTALL)
 
     # iterate over all entries
     for entry, entry_path, content in entry_iterator():
@@ -219,30 +216,39 @@ def fix_keywords():
 
         match = matches[0]
 
-        # get keywords out, split, strip, delete duplicates
-        keywords = match[1][11:]
-        keywords = keywords.split(',')
-        keywords = [x.strip() for x in keywords]
-        keywords = list(set(keywords))
+        # get elements out, split, strip, delete duplicates
+        elements = match[1].split(',')
+        elements = [x.strip() for x in elements]
+        elements = list(set(elements))
+
+        # get category out
+        for keyword in recommended_keywords:
+            if keyword in elements:
+                elements.remove(keyword)
+                category = keyword
+                break
 
         # special treatments here
-        keywords = [x if x != 'TBS' and x != 'TB' else 'turn based' for x in keywords]
-        keywords = [x if x != 'RTS' else 'real time' for x in keywords]
-        keywords = [x if x != 'MMO' else 'massive multiplayer online' for x in keywords]
-        keywords = [x if x != 'MMO' else 'multiplayer online' for x in keywords]
-        keywords = [x if x != 'SP' else 'singleplayer' for x in keywords]
-        keywords = [x if x != 'MP' else 'multiplayer' for x in keywords]
-        keywords = [x if x != 'engine' else 'game engine' for x in keywords]
-        keywords = [x if x != 'rpg' else 'role playing' for x in keywords]
-        keywords = [x if x != 'turn based' else 'turn-based' for x in keywords]
+        elements = [x if x != 'TBS' and x != 'TB' else 'turn based' for x in elements]
+        elements = [x if x != 'RTS' else 'real time' for x in elements]
+        elements = [x if x != 'MMO' else 'massive multiplayer online' for x in elements]
+        elements = [x if x != 'MMO' else 'multiplayer online' for x in elements]
+        elements = [x if x != 'SP' else 'singleplayer' for x in elements]
+        elements = [x if x != 'MP' else 'multiplayer' for x in elements]
+        elements = [x if x != 'engine' else 'game engine' for x in elements]
+        elements = [x if x != 'rpg' else 'role playing' for x in elements]
+        elements = [x if x != 'turn based' else 'turn-based' for x in elements]
         for keyword in ('browser', 'misc', 'tools'):
-            if keyword in keywords:
-                keywords.remove(keyword)
+            if keyword in elements:
+                elements.remove(keyword)
 
         # sort
-        keywords.sort()
+        elements.sort(key=str.casefold)
 
-        keywords = '- Keywords: {}\n'.format(', '.join(keywords))
+        # add category
+        elements.insert(0, category)
+
+        keywords = '- Keywords: {}'.format(', '.join(elements))
 
         new_content = match[0] + keywords + match[2]
 
@@ -250,6 +256,74 @@ def fix_keywords():
             # write again
             write_text(entry_path, new_content)
 
+    # code dependencies
+    regex = re.compile(r"(.*)- Code dependencies:([^\n]*)(.*)", re.DOTALL)
+
+    # iterate over all entries
+    for entry, entry_path, content in entry_iterator():
+        # match with regex
+        matches = regex.findall(content)
+
+        if not matches:
+            # no code dependencies given
+            continue
+
+        match = matches[0]
+
+        # get code dependencies out, split, strip, delete duplicates
+        elements = match[1].split(',')
+        elements = [x.strip() for x in elements]
+        elements = list(set(elements))
+
+        # special treatments here
+        elements = [x if x != 'Blender' else 'Blender game engine' for x in elements]
+        elements = [x if x.lower() != 'libgdx' else 'libGDX' for x in elements]
+        elements = [x if x != 'SDL 2' else 'SDL2' for x in elements]
+        elements = [x if x.lower() != "ren'py" else "Ren'Py" for x in elements]
+
+        # sort
+        elements.sort(key=str.casefold)
+
+        code_dependencies = '- Code dependencies: {}'.format(', '.join(elements))
+
+        new_content = match[0] + code_dependencies + match[2]
+
+        if new_content != content:
+            # write again
+            write_text(entry_path, new_content)
+
+    # build systems
+    regex = re.compile(r"(.*)- Build system:([^\n]*)(.*)", re.DOTALL)
+
+    # iterate over all entries
+    for entry, entry_path, content in entry_iterator():
+        # match with regex
+        matches = regex.findall(content)
+
+        if not matches:
+            # no build system given
+            continue
+
+        match = matches[0]
+
+        # get code dependencies out, split, strip, delete duplicates
+        elements = match[1].split(',')
+        elements = [x.strip() for x in elements]
+        elements = list(set(elements))
+
+        # special treatments here
+
+        # sort
+        elements.sort(key=str.casefold)
+
+        build_system = '- Build system: {}'.format(', '.join(elements))
+
+        new_content = match[0] + build_system + match[2]
+
+        if new_content != content:
+            # write again
+            write_text(entry_path, new_content)
+
 
 def parse_entry(content):
     """
@@ -536,7 +610,27 @@ def update_statistics(infos):
                 entries.append(info['title'])
                 # print(info[field])
     entries.sort()
-    statistics +=  '{}: '.format(len(entries)) + ', '.join(entries) + '\n\n'
+    statistics += '{}: '.format(len(entries)) + ', '.join(entries) + '\n\n'
+
+    # Code dependencies
+    statistics += '## Code dependencies\n\n'
+    field = 'code dependencies'
+
+    # get all code dependencies together
+    code_dependencies = []
+    entries_with_code_dependency = 0
+    for info in infos:
+        if field in info:
+            code_dependencies.extend(info[field])
+            entries_with_code_dependency += 1
+    statistics += 'With code dependency field {} ({:.1f}%)\n\n'.format(entries_with_code_dependency, rel(entries_with_code_dependency))
+
+    unique_code_dependencies = set(code_dependencies)
+    unique_code_dependencies = [(l, code_dependencies.count(l) / len(code_dependencies)) for l in unique_code_dependencies]
+    unique_code_dependencies.sort(key=lambda x: x[0]) # first sort by name
+    unique_code_dependencies.sort(key=lambda x: -x[1]) # then sort by occurrence (highest occurrence first)
+    unique_code_dependencies = ['- {} ({:.1f}%)'.format(x[0], x[1]*100) for x in unique_code_dependencies]
+    statistics += '##### Code dependencies frequency\n\n' + '\n'.join(unique_code_dependencies) + '\n\n'
 
     # Build systems:
     statistics += '## Build systems\n\n'
@@ -677,6 +771,7 @@ def git_repo(repo):
     # the rest is ignored
     return None
 
+
 def svn_repo(repo):
     """
     
@@ -792,8 +887,8 @@ if __name__ == "__main__":
     # check for unfilled template lines
     check_template_leftovers()
 
-    # fix keywords
-    fix_keywords()
+    # fix entries
+    fix_entries()
 
     # assemble info
     infos = assemble_infos()