diff --git a/_data/credits.json b/_data/credits.json
new file mode 100644
index 0000000..bfb1336
--- /dev/null
+++ b/_data/credits.json
@@ -0,0 +1,82 @@
+{
+	"core_developers": [
+		"Perttu Ahola (celeron55) <celeron55@gmail.com> [Project founder]",
+		"sfan5 <sfan5@live.de>",
+		"ShadowNinja <shadowninja@minetest.net>",
+		"Nathanaëlle Courant (Nore/Ekdohibs) <nore@mesecons.net>",
+		"Loic Blot (nerzhul/nrz) <loic.blot@unix-experience.fr>",
+		"Andrew Ward (rubenwardy) <rw@rubenwardy.com>",
+		"Krock/SmallJoker <mk939@ymail.com>",
+		"Lars Hofhansl <larsh@apache.org>",
+		"v-rob <robinsonvincent89@gmail.com>",
+		"Desour/DS",
+		"srifqi",
+		"Gregor Parzefall (grorp)",
+		"Lars Müller (luatic)"
+	],
+	"previous_core_developers": [
+		"BlockMen",
+		"Maciej Kasatkin (RealBadAngel) [RIP]",
+		"Lisa Milne (darkrose) <lisa@ltmnet.com>",
+		"proller",
+		"Ilya Zhuravlev (xyz) <xyz@minetest.net>",
+		"PilzAdam <pilzadam@minetest.net>",
+		"est31 <MTest31@outlook.com>",
+		"kahrl <kahrl@gmx.net>",
+		"Ryan Kwolek (kwolekr) <kwolekr@minetest.net>",
+		"sapier",
+		"Zeno",
+		"Auke Kok (sofar) <sofar@foo-projects.org>",
+		"Aaron Suen <warr1024@gmail.com>",
+		"paramat",
+		"Pierre-Yves Rollo <dev@pyrollo.com>",
+		"hecks",
+		"Jude Melton-Houghton (TurkeyMcMac) [RIP]",
+		"Hugues Ross <hugues.ross@gmail.com>",
+		"Dmitry Kostenko (x2048) <codeforsmile@gmail.com>"
+	],
+	"core_team": [
+		"Zughy [Issue triager]",
+		"wsor [Issue triager]",
+		"Hugo Locurcio (Calinou) [Issue triager]"
+	],
+	"contributors": [
+		"cx384",
+		"numzero",
+		"AFCMS",
+		"sfence",
+		"Wuzzy",
+		"ROllerozxa",
+		"JosiahWI",
+		"OgelGames",
+		"David Heidelberg",
+		"1F616EMO",
+		"HybridDog",
+		"Bradley Pierce (Thresher)",
+		"savilli",
+		"Stvk imension",
+		"y5nw",
+		"chmodsayshello",
+		"jordan4ibanez",
+		"superfloh247"
+	],
+	"previous_contributors": [
+		"Nils Dagsson Moskopp (erlehmann) <nils@dieweltistgarnichtso.net> [Minetest logo]",
+		"red-001 <red-001@outlook.ie>",
+		"Giuseppe Bilotta",
+		"HybridDog",
+		"ClobberXD",
+		"Dániel Juhász (juhdanad) <juhdanad@gmail.com>",
+		"MirceaKitsune <mirceakitsune@gmail.com>",
+		"Jean-Patrick Guerrero (kilbith)",
+		"MoNTE48",
+		"Constantin Wenger (SpeedProg)",
+		"Ciaran Gultnieks (CiaranG)",
+		"Paul Ouellette (pauloue)",
+		"stujones11",
+		"Rogier <rogier777@gmail.com>",
+		"Gregory Currie (gregorycu)",
+		"JacobF",
+		"Jeija <jeija@mesecons.net>"
+	]
+}
diff --git a/_data/credits.yml b/_data/credits.yml
deleted file mode 100644
index 5ae94e9..0000000
--- a/_data/credits.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-active_core_devs: [
-  "Perttu Ahola (celeron55) &lt;<a href='mailto:celeron55@gmail.com' title='celeron55@gmail.com'>celeron55@gmail.com</a>&gt;",
-  "sfan5 &lt;<a href='mailto:sfan5@live.de' title='sfan5@live.de'>sfan5@live.de</a>&gt;",
-  "ShadowNinja &lt;<a href='mailto:shadowninja@minetest.net' title='shadowninja@minetest.net'>shadowninja@minetest.net</a>&gt;",
-  "Nathanaëlle Courant (Nore/Ekdohibs) &lt;<a href='mailto:nore@mesecons.net' title='nore@mesecons.net'>nore@mesecons.net</a>&gt;",
-  "Loic Blot (nerzhul/nrz) &lt;<a href='mailto:loic.blot@unix-experience.fr' title='loic.blot@unix-experience.fr'>loic.blot@unix-experience.fr</a>&gt;",
-  "Andrew Ward (rubenwardy) &lt;<a href='https://rubenwardy.com/contact/'>Contact</a>&gt;",
-  "Krock/SmallJoker",
-  "Lars Hofhansl",
-  "v-rob",
-  "hecks",
-  "Hugues Ross",
-  "Dmitry Kostenko (x2048)",
-]
-
-active_core_team: [
-  "Zughy [Issue triager]",
-]
-
-previous_core_devs: [
-  "BlockMen",
-  "Maciej Kasatkin (RealBadAngel) [RIP]",
-  "Lisa Milne (darkrose)",
-  "proller",
-  "Ilya Zhuravlev (xyz)",
-  "PilzAdam",
-  "est31",
-  "kahrl",
-  "Ryan Kwolek (kwolekr)",
-  "sapier",
-  "Zeno",
-  "Auke Kok (sofar)",
-  "Aaron Suen",
-  "paramat",
-  "Pierre-Yves Rollo",
-  "Jude Melton-Houghton [Optimizations, bugfixes]",
-]
-
-
-active_contributors: [
-  "Wuzzy [Features, translations, devtest]",
-  "Lars Müller [Lua optimizations and fixes]",
-  "paradust7 [Performance, fixes, Irrlicht refactoring]",
-  "Desour [Fixes]",
-  "ROllerozxa [Main menu]",
-  "savilli [Bugfixes]",
-  "Lexi Hale [Particlespawner animation]",
-  "Liso [Shadow Mapping]",
-  "JosiahWI [Fixes, build system]",
-  "numzero [Graphics and rendering]",
-  "HybridDog [Fixes]",
-  "NeroBurner [Joystick]",
-  "pecksin [Clickable web links]",
-  "Daroc Alden [Fixes]",
-  "Jean-Patrick Guerrero (kilbith) [Fixes]",
-]
-
-previous_contributors: [
-  "Nils Dagsson Moskopp (erlehmann) [Minetest logo]",
-  "red-001",
-  "Giuseppe Bilotta",
-  "ClobberXD",
-  "Dániel Juhász (juhdanad)",
-  "MirceaKitsune",
-  "MoNTE48",
-  "Constantin Wenger (SpeedProg)",
-  "Ciaran Gultnieks (CiaranG)",
-  "Paul Ouellette (pauloue)",
-  "stujones11",
-  "srifqi",
-  "Rogier",
-  "Gregory Currie (gregorycu)",
-  "JacobF",
-  "Jeija",
-]
diff --git a/credits.html b/credits.html
index d621009..993ef92 100644
--- a/credits.html
+++ b/credits.html
@@ -28,21 +28,21 @@ <h2>Core Team</h2>
 
         <h3>Active Core Developers</h3>
         <ul>
-          {% for x in site.data.credits.active_core_devs %}
+          {% for x in site.data.credits.core_developers %}
           <li>{{ x }}</li>
           {% endfor %}
         </ul>
 
         <h3>Active Core Team Members</h3>
         <ul>
-          {% for x in site.data.credits.active_core_team %}
+          {% for x in site.data.credits.core_team %}
           <li>{{ x }}</li>
           {% endfor %}
         </ul>
 
         <h3>Previous Core Developers</h3>
         <ul>
-          {% for x in site.data.credits.previous_core_devs %}
+          {% for x in site.data.credits.previous_core_developers %}
           <li>{{ x }}</li>
           {% endfor %}
         </ul>
@@ -58,7 +58,7 @@ <h2>Contributors</h2>
 
         <h3>Active</h3>
         <ul>
-          {% for x in site.data.credits.active_contributors %}
+          {% for x in site.data.credits.contributors %}
           <li>{{ x }}</li>
           {% endfor %}
         </ul>