diff --git a/config.json.sample b/config.json.sample
index 7ebd6af..1f1501e 100644
--- a/config.json.sample
+++ b/config.json.sample
@@ -14,7 +14,7 @@
     "admins": [ "batman" ],
     "moderators": [ "whatever" ],
     "moduleNames": [ "ignore", "admin", "command", "dice", "js", "kick", "quotes", "spelling", "youare", "stats", "users" ],
-    "language": "english",
+    "language": "en",
     "debugMode": true,
     "version": "Depressionbot IRC bot 0.4-dev - Lovingly crafted by The DepressionBot Foundation (a charity arm of the Official Aberystwyth Open Source International Development League)."
 }
diff --git a/modules/admin/strings.json b/modules/admin/strings.json
index 272b72a..cd8c8ec 100644
--- a/modules/admin/strings.json
+++ b/modules/admin/strings.json
@@ -1,84 +1,84 @@
 {
     "join": {
-        "english": "Joined {channel}",
-        "spanish" : "Entrado en {channel}",
+        "en": "Joined {channel}",
+        "es" : "Entrado en {channel}",
         "na'vi": "fpxäkìm {channel}(nemfa)",
-        "welsh": "Wedi ymuno {channel}"
+        "cy": "Wedi ymuno {channel}"
     },
     "part": {
-        "english": "Left {channel}",
-        "spanish" : "Abandonada {channel}",
+        "en": "Left {channel}",
+        "es" : "Abandonada {channel}",
         "na'vi": "Hum {channel}",
-        "welsh": "Wedi gadael {channel}"
+        "cy": "Wedi gadael {channel}"
     },
     "gpull": {
-        "english": "Git pulled that shit.",
-        "spanish": "Hecho git pull en esta mierda.",
+        "en": "Git pulled that shit.",
+        "es": "Hecho git pull en esta mierda.",
         "na'vi": "Gìtìl fì'uti stamarsìm.",
-        "welsh": "Wedi tynnu git yr cach na i gyd"
+        "cy": "Wedi tynnu git yr cach na i gyd"
     },
     "reload": {
-        "english": "Reloaded that shit.",
-        "spanish": "Recargado esta mierda.",
+        "en": "Reloaded that shit.",
+        "es": "Recargado esta mierda.",
         "na'vi": "Oel fìuti stìyeftxaw.",
-        "welsh": "Ail-lwytho'r cach na"
+        "cy": "Ail-lwytho'r cach na"
     },
     "load_module": {
-        "english": "Loaded new module: {moduleName}",
-        "spanish": "Cargado módulo nuevo: {moduleName}",
+        "en": "Loaded new module: {moduleName}",
+        "es": "Cargado módulo nuevo: {moduleName}",
         "na'vi": "Oel {moduleName}it amip stìyeftxaw.",
-        "welsh": "Wedi llwytho modiwl newydd: {moduleName}"
+        "cy": "Wedi llwytho modiwl newydd: {moduleName}"
     },
     "unload_module": {
-        "english": "Turned off module: {moduleName}",
-        "spanish": "Descargado módulo: {moduleName}",
+        "en": "Turned off module: {moduleName}",
+        "es": "Descargado módulo: {moduleName}",
         "na'vi": "Oel {moduleName} tswìya'.",
-        "welsh": "Wedi troi ffwrdd y modiwl: {moduleName}"
+        "cy": "Wedi troi ffwrdd y modiwl: {moduleName}"
     },
     "unload_error": {
-        "english": "{moduleName} isn't loaded. Idiot.",
-        "spanish": "{moduleName} no está cargado. Idiota.",
+        "en": "{moduleName} isn't loaded. Idiot.",
+        "es": "{moduleName} no está cargado. Idiota.",
         "na'vi": "Oel {moduleName}it omum. Nga skxawng lu.",
-        "welsh": "Di {moduleName} ddim wedi llwytho. Twpsyn"
+        "cy": "Di {moduleName} ddim wedi llwytho. Twpsyn"
     },
     "banned": {
-        "english": "{user} banned from {command}",
-        "spanish": "{user} está prohibido de usar {command}",
+        "en": "{user} banned from {command}",
+        "es": "{user} está prohibido de usar {command}",
         "na'vi": "{command}ìri {user} ke tung.",
-        "welsh": "{user} wedi ei gohurio o {command}"
+        "cy": "{user} wedi ei gohurio o {command}"
     },
     "unbanned": {
-        "english": "{user} unbanned from {command}",
-        "spanish": "{user} no está prohibido de user {command}",
+        "en": "{user} unbanned from {command}",
+        "es": "{user} no está prohibido de user {command}",
         "na'vi": "{command}ìri {user} tung set.",
-        "welsh": "{user} wedi ei dad-wahardd o {command}"
+        "cy": "{user} wedi ei dad-wahardd o {command}"
     },
     "unban_error": {
-        "english": "{user} wasn't banned from that command, fool.",
-        "spanish": "{user} no fue prohibido de esta instrucción, tont@.",
+        "en": "{user} wasn't banned from that command, fool.",
+        "es": "{user} no fue prohibido de esta instrucción, tont@.",
         "na'vi": "{user} fìtsu'oti tamung srekrr, nga skxawng lu.",
-        "welsh": "Nid oedd {user} wedi ei wahardd o'r gyrchymun yna, fŵl"
+        "cy": "Nid oedd {user} wedi ei wahardd o'r gyrchymun yna, fŵl"
     },
     "qlock": {
-        "english": "Locked quote category: {category}",
-        "spanish": "Cerrado la categoría: {category}",
+        "en": "Locked quote category: {category}",
+        "es": "Cerrado la categoría: {category}",
         "na'vi": "{category}ìri oel 'upxareti fmoli",
-        "welsh": "Categori wedi cloi: {category}"
+        "cy": "Categori wedi cloi: {category}"
     },
     "already_in_channel": {
-        "english": "I'm already in {channel}",
+        "en": "I'm already in {channel}",
         "na'vi": "Oel {channel}it tok li"
     },
     "not_in_channel": {
-        "english": "I'm not in {channel}",
+        "en": "I'm not in {channel}",
         "na'vi": "Oel {channel}it ke tok"
     },
     "already_loaded_web": {
-        "english": "WHY CAN'T I LOAD ALL THIS WEB? (web already loaded)",
+        "en": "WHY CAN'T I LOAD ALL THIS WEB? (web already loaded)",
         "na'vi": "PELUN OEL KE TSUN OMUM FÌWETIT NÌWOTX (wetìri oe omum li)"
     },
     "already_loaded": {
-        "english": "{moduleName} is already loaded.",
+        "en": "{moduleName} is already loaded.",
         "na'vi": "Oel omum teri {moduleName}it li."
     }
 }
diff --git a/modules/command/strings.json b/modules/command/strings.json
index 511c51e..676532e 100644
--- a/modules/command/strings.json
+++ b/modules/command/strings.json
@@ -1,30 +1,30 @@
 {
     "command_ban": {
-        "english": "{user} is banned from using this command. Commence incineration.",
-        "spanish": "{user} está prohibido de usar esta instrucción. Comenzar incineración.",
+        "en": "{user} is banned from using this command. Commence incineration.",
+        "es": "{user} está prohibido de usar esta instrucción. Comenzar incineración.",
         "na'vi": "Tsu'ori {user} ke tung. Nga skxawng lu.",
-        "welsh": "Mae {user} wedi ei gohurio gan ddefnyddio'r gorchymun yma. Cychwyn orfflosgiad"
+        "cy": "Mae {user} wedi ei gohurio gan ddefnyddio'r gorchymun yma. Cychwyn orfflosgiad"
     },
     "syntax_error": { 
-        "english": "Invalid syntax. Initiate incineration.",
-        "spanish": "Sintaxis no válida. Iniciar incineración.",
+        "en": "Invalid syntax. Initiate incineration.",
+        "es": "Sintaxis no válida. Iniciar incineración.",
         "na'vi": "Ngeyä pamrel keyawr lu. Nga skxawng lu.",
-        "welsh": "Cystrawen annilys. Cychwyn orfflosgiad"
+        "cy": "Cystrawen annilys. Cychwyn orfflosgiad"
     },
     "usage": {
-        "english": "Usage for {command}: {usage}.",
+        "en": "Usage for {command}: {usage}.",
         "na'vi": "Nga tsun sivar ìlä {command}: {usage}."
     },
     "no_usage_info": {
-        "english": "No usage information found for {command}.",
+        "en": "No usage information found for {command}.",
         "na'vi": "Oel ke tsun sivar {comamnd}it"
     },
     "help_link": {
-        "english": "Help for {module}: {link}",
+        "en": "Help for {module}: {link}",
         "na'vi": "{module}ä srungìl {link} it tok"
     },
     "no_help": {
-        "english": "No help found for {module}.",
+        "en": "No help found for {module}.",
         "na'vi": "Fì{module}ìri oel ke tsun run srungit"
     }
 }
diff --git a/modules/ignore/strings.json b/modules/ignore/strings.json
index 7b31d66..8202cb0 100644
--- a/modules/ignore/strings.json
+++ b/modules/ignore/strings.json
@@ -1,64 +1,64 @@
 {
     "ignore_usage": {
-        "english": "{user}: Usage: ~ignore [module]. Modules you can ignore are: {modules}.",
-        "spanish": "{user}: Modo de empleo: ~ignore [módulo]. Módulos que tú puedes ignorar son: {modules}.",
+        "en": "{user}: Usage: ~ignore [module]. Modules you can ignore are: {modules}.",
+        "es": "{user}: Modo de empleo: ~ignore [módulo]. Módulos que tú puedes ignorar son: {modules}.",
         "na'vi": "{user}: Sar: ~ignore ['u]. U, nga ke tìng mikyun: {modules}.",
-        "welsh": "{user}: Defnydd: ~ignore [modiwl]. Modiwlau a allech anwybyddu yw: {modules}."
+        "cy": "{user}: Defnydd: ~ignore [modiwl]. Modiwlau a allech anwybyddu yw: {modules}."
     },
     "already_ignoring": {
-        "english": "{user}: You're already ignoring that module.",
-        "spanish": "{user}: Ya ignoras este módulo.",
+        "en": "{user}: You're already ignoring that module.",
+        "es": "{user}: Ya ignoras este módulo.",
         "na'vi": "{user}: 'uri nga ke tìng mikyun srekrr.",
-        "welsh": "{user}: Mi rwyt ti'n anwybyddu'r modiwl yna'n barod."
+        "cy": "{user}: Mi rwyt ti'n anwybyddu'r modiwl yna'n barod."
     },
     "ignored": {
-        "english": "{user}: Now ignoring {module}.",
-        "spanish": "{user}: Estás ignorando {module}.",
+        "en": "{user}: Now ignoring {module}.",
+        "es": "{user}: Estás ignorando {module}.",
         "na'vi": "{user}: Nga ke terìng mikyun {module}ne set.",
-        "welsh": "{user}: Nawr yn anwybyddu {module}"
+        "cy": "{user}: Nawr yn anwybyddu {module}"
     },
     "invalid_ignore": {
-        "english": "{user}: That isn't a valid module name.",
-        "spanish": "{user}: Ese no es un nombre de un módulo valido.",
+        "en": "{user}: That isn't a valid module name.",
+        "es": "{user}: Ese no es un nombre de un módulo valido.",
         "na'vi": "{user}: Tsatstxo eyawr ke lu.",
-        "welsh": "{user}: Nid oedd hwna'n modiwl dilys"
+        "cy": "{user}: Nid oedd hwna'n modiwl dilys"
     },
     "unignore_usage": {
-        "english": "{user}: Usage: ~unignore [module]. Modules you are currently ignoring: {modules}.",
-        "spanish": "{user}: Modo de empleo: ~unignore [módulo]. Módulos que ignoras ahora mismo: {modules}.",
+        "en": "{user}: Usage: ~unignore [module]. Modules you are currently ignoring: {modules}.",
+        "es": "{user}: Modo de empleo: ~unignore [módulo]. Módulos que ignoras ahora mismo: {modules}.",
         "na'vi": "{user}: Sar: ~unignore ['u]. Uri, nga ke terìng mikyun: {modules}.",
-        "welsh": "{user}: Defnydd ~unignore [modiwl]. Modiwlau rydech yn anwybyddu ar hyn o bryd: {modules}"
+        "cy": "{user}: Defnydd ~unignore [modiwl]. Modiwlau rydech yn anwybyddu ar hyn o bryd: {modules}"
     },
     "invalid_unignore": {
-        "english": "{user}: You're not ignoring that module or it doesn't exist.",
-        "spanish": "{user}: No ignoras este módulo o no existe.",
+        "en": "{user}: You're not ignoring that module or it doesn't exist.",
+        "es": "{user}: No ignoras este módulo o no existe.",
         "na'vi":"{user}: Nga terìng mikyun fu fì'ul fìtsengit ke tok.",
-        "welsh": "{user}: Nid wyt ti'n anwybyddu'r modiwl yna neu nid yw e'n bodoli"
+        "cy": "{user}: Nid wyt ti'n anwybyddu'r modiwl yna neu nid yw e'n bodoli"
     },
     "unignored": {
-        "english": "{user}: No longer ignoring {module}.",
-        "spanish": "{user}: Ya no ignoras {module}.",
+        "en": "{user}: No longer ignoring {module}.",
+        "es": "{user}: Ya no ignoras {module}.",
         "na'vi": "{user}: Nga terìng mikyun {module}ne set",
-        "welsh": "{user}: Ddim yn anwybyddu {module} bellach"
+        "cy": "{user}: Ddim yn anwybyddu {module} bellach"
     },
     "ignoring_channel": {
-        "english": "Now ignoring {module} in {channel}",
+        "en": "Now ignoring {module} in {channel}",
         "na'vi": "Oe ke stayawm {module}ur mì {channel}"
     },
     "already_ignoring_channel": {
-        "english": "Already ignoring {module} in {channel}",
+        "en": "Already ignoring {module} in {channel}",
         "na'vi": "Oe ke stayawm {module}ur mì {channel} li"
     },
     "module_not_exist": {
-        "english": "{module} isn't loaded or doesn't exist.",
+        "en": "{module} isn't loaded or doesn't exist.",
         "na'vi": "Oel ke omum teri {module}it fu {module} ke fkeytok"
     },
     "unignoring_channel": {
-        "english": "No longer ignoring {module} in {channel}",
+        "en": "No longer ignoring {module} in {channel}",
         "na'vi": "Oel stayawm {module}ur mì {channel} set."
     },
     "not_ignoring_channel": {
-        "english": "{module} wasn't being ignored in {channel}",
+        "en": "{module} wasn't being ignored in {channel}",
         "na'vi": "Oel stayawm {module}ur mì {channel} li."
     }
 }
diff --git a/modules/kick/strings.json b/modules/kick/strings.json
index 0fe8376..5c11a74 100644
--- a/modules/kick/strings.json
+++ b/modules/kick/strings.json
@@ -1,14 +1,14 @@
 {
     "user_kicks": {
-        "english": "{user} has been kicked {kicks} times and has kicked people {kicked} times.",
-        "spanish": "Se ha expulsado {user} {kicks} veces y {user} ha expulsado personas {kicked} veces.",
+        "en": "{user} has been kicked {kicks} times and has kicked people {kicked} times.",
+        "es": "Se ha expulsado {user} {kicks} veces y {user} ha expulsado personas {kicked} veces.",
         "na'vi": "Tuteol {user}it tsrame'i {kicks} hìmtxan ulte sute tsrame'i {kicked} hìmtxan.",
-        "welsh": "Cafwyd {user} ei gicio {kicks} gwaith ac wedi cicio pobl {kicked} gwaith."
+        "cy": "Cafwyd {user} ei gicio {kicks} gwaith ac wedi cicio pobl {kicked} gwaith."
     },
     "kicked_dbot": {
-        "english": "Thou shalt not kick {botname}",
-        "spanish": "No expulsás {botname}",
+        "en": "Thou shalt not kick {botname}",
+        "es": "No expulsás {botname}",
         "na'vi": "Ngal {botname}it ke tsun tsrive'i",
-        "welsh": "Ni ddylech cicio {botname}"
+        "cy": "Ni ddylech cicio {botname}"
     }
 }
diff --git a/modules/link/strings.json b/modules/link/strings.json
index 935e635..a89c9e5 100644
--- a/modules/link/strings.json
+++ b/modules/link/strings.json
@@ -1,12 +1,12 @@
 {
     "title_not_found": {
-        "english": "No page title found.",
+        "en": "No page title found.",
         "na'vi": "Oel ke tsun run 'upxare atxin."
     },
     "xkcd": {
-        "english": "xkcd {num}: {title} https://xkcd.com/{num}"
+        "en": "xkcd {num}: {title} https://xkcd.com/{num}"
     },
     "no-hits": {
-        "english": "No hits."
+        "en": "No hits."
     }
 }
diff --git a/modules/poll/strings.json b/modules/poll/strings.json
index 412c3ec..7e76d92 100644
--- a/modules/poll/strings.json
+++ b/modules/poll/strings.json
@@ -1,87 +1,87 @@
 {
     "newpoll_usage": {
-        "english": "Usage: ~newpoll name [options=opt1,opt2,opt3] description",
-        "spanish" : "Modo de empleo: ~newpoll nombre [options=opción1,opción2,opción3] descripción",
+        "en": "Usage: ~newpoll name [options=opt1,opt2,opt3] description",
+        "es" : "Modo de empleo: ~newpoll nombre [options=opción1,opción2,opción3] descripción",
         "na'vi": "Usage: ~newpoll tstxo [sìftxey=tìfxey1,tìfxey2,fìfxey3] tìsla'tsu",
-        "welsh": "Defnydd: ~newpoll enw [optiynau=opt1,opt2,op3] disgrifiad"
+        "cy": "Defnydd: ~newpoll enw [optiynau=opt1,opt2,op3] disgrifiad"
     },
     "poll_exists": {
-        "english": "Poll '{name}' already exists.",
-        "spanish" : "Votación '{name}' ya existe.",
+        "en": "Poll '{name}' already exists.",
+        "es" : "Votación '{name}' ya existe.",
         "na'vi": "sìpawm sna'o '{name}' fkeytok srekrr.",
-        "welsh": "Mae'r pôl {name} bodoli'n barod"
+        "cy": "Mae'r pôl {name} bodoli'n barod"
     },
     "poll_created": {
-        "english": "Poll '{name}' created ({description}). Cast thy votations! - {url}",
-        "spanish" : "Votación '{name}' creado ({description}). ¡Emited sus votas! - {url}",
+        "en": "Poll '{name}' created ({description}). Cast thy votations! - {url}",
+        "es" : "Votación '{name}' creado ({description}). ¡Emited sus votas! - {url}",
         "na'vi": "sìpawm sna'o '{name}' ngìyop ({description}). Nga tìpe'unit Pe'eiun - {url}"
     },
     "poll_describe": {
-        "english": "{name}: {description} - {url}."
+        "en": "{name}: {description} - {url}."
     },
     "changed_vote": {
-        "english": "{user} changed their vote in {poll} to '{vote}' ({count}).",
-        "spanish" : "{user} cambió su voto en {poll} a '{vote}' ({count}).",
+        "en": "{user} changed their vote in {poll} to '{vote}' ({count}).",
+        "es" : "{user} cambió su voto en {poll} a '{vote}' ({count}).",
         "na'vi": "{user} lìyatem ngeyä tìpe'un {poll}mì, ngeyä tìpe'un amip '{vote}'({count}) lu.",
-        "welsh": "Newidiodd {user} eu pleidlais yn {poll} i '{vote}' ({count})."
+        "cy": "Newidiodd {user} eu pleidlais yn {poll} i '{vote}' ({count})."
     },
     "voted": {
-        "english": "{user} voted for '{vote}' in {poll} ({count}).",
-        "spanish" : "{user} votó para '{vote}' en {poll} ({count}).",
+        "en": "{user} voted for '{vote}' in {poll} ({count}).",
+        "es" : "{user} votó para '{vote}' en {poll} ({count}).",
         "na'vi": "'{vote}'ìri {user} pìye'un {poll}mì ({count}).",
-        "welsh": "Pledleisiodd {user} am '{vote}' yn {poll} ({count})."
+        "cy": "Pledleisiodd {user} am '{vote}' yn {poll} ({count})."
     },
     "invalid_vote": {
-        "english": "Invalid vote: {vote}",
-        "spanish" : "Vota inválida: {vote}",
+        "en": "Invalid vote: {vote}",
+        "es" : "Vota inválida: {vote}",
         "na'vi": "Ngeyä tìpe'un keyawr lu ({vote}).",
-        "welsh": "Pleidlais annilys: {vote}"
+        "cy": "Pleidlais annilys: {vote}"
     },
     "poll_unexistent": {
-        "english": "Poll '{name}' doesn't exist.",
-        "spanish" : "Votación '{name}' no existe.",
+        "en": "Poll '{name}' doesn't exist.",
+        "es" : "Votación '{name}' no existe.",
         "na'vi": "sìpawm sna'o '{name}' ke fkeytok.",
-        "welsh": "Nid yw pôl '{name}' yn bodoli"
+        "cy": "Nid yw pôl '{name}' yn bodoli"
     },
     "option_added": {
-        "english": "{user}: '{option}' added to '{name}'.",
-        "spanish" : "{user}: '{option}' añadido a '{name}'.",
+        "en": "{user}: '{option}' added to '{name}'.",
+        "es" : "{user}: '{option}' añadido a '{name}'.",
         "na'vi": "'{name}'ur {user}ìl '{option}'it sung.",
-        "welsh": "{user}: Ychwanegwyd '{option}' i '{name}'"
+        "cy": "{user}: Ychwanegwyd '{option}' i '{name}'"
     },
     "option_exists": {
-        "english": "{user}: '{option}' already exists in '{name}'.",
-        "spanish" : "{user}: '{option}' ya existe en '{name}'.",
+        "en": "{user}: '{option}' already exists in '{name}'.",
+        "es" : "{user}: '{option}' ya existe en '{name}'.",
         "na'vi": "{user}: '{option}' fkeytok srekrr '{name}'mì.",
-        "welsh": "{user}: Mae '{option}' yn bodoli'n barod yn '{name}'."
+        "cy": "{user}: Mae '{option}' yn bodoli'n barod yn '{name}'."
     },
     "not_poll_owner": {
-        "english": "{user}: You don't own the '{name}' poll.",
-        "spanish" : "{user}: La votación '{name}' no es tuyo.",
+        "en": "{user}: You don't own the '{name}' poll.",
+        "es" : "{user}: La votación '{name}' no es tuyo.",
         "na'vi": "{user}: ngaru '{name}' sìpawm sna'o ke lu.",
-        "welsh": "{user}: Nid ydech chi'n berchen y pôl '{name}'."
+        "cy": "{user}: Nid ydech chi'n berchen y pôl '{name}'."
     },
     "option_removed": {
-        "english": "{user}: '{option}' removed from '{name}'",
-        "spanish" : "{user}: '{option}' eliminado de '{name}'",
+        "en": "{user}: '{option}' removed from '{name}'",
+        "es" : "{user}: '{option}' eliminado de '{name}'",
         "na'vi": "{user}: '{option}'it 'aku '{name}'ta",
-        "welsh": "{user}: '{option}' wedi ei ddileu o '{name}'"
+        "cy": "{user}: '{option}' wedi ei ddileu o '{name}'"
     },
     "av_voted": {
-        "english": "{user} voted '{vote}' in {poll}.",
-        "spanish": "{user} votó '{vote}' en {poll}.",
+        "en": "{user} voted '{vote}' in {poll}.",
+        "es": "{user} votó '{vote}' en {poll}.",
         "na'vi": "{user}ìl '{vote}'it pìye'un '{poll}'mì.",
-        "welsh": "Pledleisiodd {user} am '{vote}' yn {poll}"
+        "cy": "Pledleisiodd {user} am '{vote}' yn {poll}"
     },
     "av_changed_vote": {
-        "english": "{user} changed their vote in {poll} to '{vote}'.",
-        "spanish" : "{user} cambió su voto en {poll} a '{vote}'.",
+        "en": "{user} changed their vote in {poll} to '{vote}'.",
+        "es" : "{user} cambió su voto en {poll} a '{vote}'.",
         "na'vi": "{user}ìl lìyatem ngeyä tìpa'unit '{poll}'mì, ngeyä tìpe'un '{vote} lu set.",
-        "welsh": "Newidiodd {user} eu pleidlais yn {poll} i '{vote}'"
+        "cy": "Newidiodd {user} eu pleidlais yn {poll} i '{vote}'"
     },
     "count": {
-        "english": "The running-order of poll '{poll}' ({description}) is: {places}.",
+        "en": "The running-order of poll '{poll}' ({description}) is: {places}.",
         "na'vi": "Sute tsnì pole'un '{poll}'mì ({description}) lu: {places}.",
-        "welsh": "Trefn yr pôl '{poll}' ({description}) yw: {places}"
+        "cy": "Trefn yr pôl '{poll}' ({description}) yw: {places}"
     }
 }
diff --git a/modules/quotes/strings.json b/modules/quotes/strings.json
index 3d3a9c1..5c3d3d3 100644
--- a/modules/quotes/strings.json
+++ b/modules/quotes/strings.json
@@ -1,130 +1,130 @@
 {
     "category_not_found": {
-        "english": "Nobody loves {category}",
-        "spanish": "Nadie ama a {category}",
+        "en": "Nobody loves {category}",
+        "es": "Nadie ama a {category}",
         "na'vi": "{category} yawne ke lu kawturu.",
-        "welsh": "Does neb yn caru {category}"
+        "cy": "Does neb yn caru {category}"
     },
     "large_categories": {
-        "english": "Largest categories: ",
-        "spanish": "Los categorías más grandes: ",
+        "en": "Largest categories: ",
+        "es": "Los categorías más grandes: ",
         "na'vi": "U atsawl: ",
-        "welsh": "Categoriau mwyaf: "
+        "cy": "Categoriau mwyaf: "
     },
     "empty_category": {
-        "english": "That category has no quotes in. Commence incineration.",
-        "spanish": "Categoría vacía. Iniciar incineración.",
+        "en": "That category has no quotes in. Commence incineration.",
+        "es": "Categoría vacía. Iniciar incineración.",
         "na'vi": "Tsauru upxare lu. Nga skxawng lu.",
-        "welsh": "Nid yw'r categori yna efo dyfyniadau. Cychwyn orfflosgiad"
+        "cy": "Nid yw'r categori yna efo dyfyniadau. Cychwyn orfflosgiad"
     },
     "no_results": {
-        "english": "No results found.",
-        "spanish": "No hubo ningún resultado.",
+        "en": "No results found.",
+        "es": "No hubo ningún resultado.",
         "na'vi": "Oel kea humit rìmun",
-        "welsh": "Dim canlyniadau ar gael"
+        "cy": "Dim canlyniadau ar gael"
     },
     "locked_category": {
-        "english": "{category} is locked. Commence incineration.",
-        "spanish": "{category} está cerrada. Comenzar incineración.",
+        "en": "{category} is locked. Commence incineration.",
+        "es": "{category} está cerrada. Comenzar incineración.",
         "na'vi": "{category} ke fkeytok set. Nga skxawng lu nafì'u",
-        "welsh": "Mae {category} wedi cloi. Cychwyn orfflosgiad"
+        "cy": "Mae {category} wedi cloi. Cychwyn orfflosgiad"
     },
     "no_quotes": {
-        "english": "No quotes exist under {category}",
-        "spanish": "Ninguna cita existe en {category}",
+        "en": "No quotes exist under {category}",
+        "es": "Ninguna cita existe en {category}",
         "na'vi": "Kea upxare fkeytok {category}mì",
-        "welsh": "Does dim dyfyniadau gan {category}"
+        "cy": "Does dim dyfyniadau gan {category}"
     },
     "last_removed": {
-        "english": "Last quote removed from {category}.",
-        "spanish": "Última cita quitado de {category}.",
+        "en": "Last quote removed from {category}.",
+        "es": "Última cita quitado de {category}.",
         "na'vi": "Oel 'upxareti aham 'aku {category}ta",
-        "welsh": "Dyfyniad olaf wedi ei ddileu o {category}"
+        "cy": "Dyfyniad olaf wedi ei ddileu o {category}"
     },
     "no_recent_adds": {
-        "english": "No quotes were added recently.",
-        "spanish": "Ninguna cita fue añadido recientamente.",
+        "en": "No quotes were added recently.",
+        "es": "Ninguna cita fue añadido recientamente.",
         "na'vi": "Kea upxareti samung nìfkrr",
-        "welsh": "Nid oes unrhyw dyfyniadau wedi ei ychwwanegu'n ddiweddar"
+        "cy": "Nid oes unrhyw dyfyniadau wedi ei ychwwanegu'n ddiweddar"
     },
     "rmlast_spam": {
-        "english": "No spamming that shit. Try again in a few minutes...",
-        "spanish": "No me inundes de mierda. Intenta otra vez en unos minutos...",
+        "en": "No spamming that shit. Try again in a few minutes...",
+        "es": "No me inundes de mierda. Intenta otra vez en unos minutos...",
         "na'vi": "Nga Tsasngelit ke zene fpivere'. Sweylu nga fmivi ye'rìn...",
-        "welsh": "Peidiwch a sbamio hwna. Triwch eto mewn ychydyg funudau..."
+        "cy": "Peidiwch a sbamio hwna. Triwch eto mewn ychydyg funudau..."
     },
     "removed_from": {
-        "english": "'{quote}' removed from {category}",
-        "spanish": "'{quote}' quitado de {category}",
+        "en": "'{quote}' removed from {category}",
+        "es": "'{quote}' quitado de {category}",
         "na'vi": "'{quote}'(it/ti) 'ìyaku {category}",
-        "welsh": "'{quote}' wedi ei ddileu o {category}"
+        "cy": "'{quote}' wedi ei ddileu o {category}"
     },
     "q_not_exist_under": {
-        "english": "'{quote}' doesn't exist under '{category}'.",
-        "spanish": "'{quote}' no existe en '{category}'.",
+        "en": "'{quote}' doesn't exist under '{category}'.",
+        "es": "'{quote}' no existe en '{category}'.",
         "na'vi": "'{quote}' ke fkeytok '{category}'ta.",
-        "welsh": "Nid yw '{quote}' yn bodoli yn '{category}'"
+        "cy": "Nid yw '{quote}' yn bodoli yn '{category}'"
     },
     "total_quotes": {
-        "english": "Total quote count: {count}.",
-        "spanish": "Total de citas: {count}.",
+        "en": "Total quote count: {count}.",
+        "es": "Total de citas: {count}.",
         "na'vi": "'upxareri holpxay: {count}.",
-        "welsh": "Cyfanswm dyfyniadau: {count}."
+        "cy": "Cyfanswm dyfyniadau: {count}."
     },
     "quote_exists": {
-        "english": "Quote already in DB. Initiate incineration.",
-        "spanish": "Cita ya existe. Iniciar incineración.",
+        "en": "Quote already in DB. Initiate incineration.",
+        "es": "Cita ya existe. Iniciar incineración.",
         "na'vi": "'Upxarel säomumit fìtsengit tok srekrr. Nga skxawng lu.",
-        "welsh": "Dyfyniad yn y gronfa ddata yn barod. Cychwyn orfflosgiad"
+        "cy": "Dyfyniad yn y gronfa ddata yn barod. Cychwyn orfflosgiad"
     },
     "quote_saved": {
-        "english": "Quote saved in '{category}' ({count}).",
-        "spanish": "Cita guardada en '{category}' ({count}).",
+        "en": "Quote saved in '{category}' ({count}).",
+        "es": "Cita guardada en '{category}' ({count}).",
         "na'vi": "Oe zayerok '{category}'mì ({count}).",
-        "welsh": "Dyfyniad wedi ei gadw yn '{category}' ({count})."
+        "cy": "Dyfyniad wedi ei gadw yn '{category}' ({count})."
     },
     "quote_replace": {
-        "english": "No replacing arrays, you whore.",
-        "spanish": "No sustituites arrays, hijo de puta.",
+        "en": "No replacing arrays, you whore.",
+        "es": "No sustituites arrays, hijo de puta.",
         "na'vi": "Ngal fìsäomumit ke tsun rivawn. Nga muntxa sayi suteo hrh.",
-        "welsh": "Peidiwch a newid rhestrau, y cachgi"
+        "cy": "Peidiwch a newid rhestrau, y cachgi"
     },
     "quote_count": {
-        "english": "{category} has {count} quotes.",
-        "spanish": "{category} tiene {count} citas.",
+        "en": "{category} has {count} quotes.",
+        "es": "{category} tiene {count} citas.",
         "na'vi": "{count}a upxare {category}ur lu.",
-        "welsh": "{count} dyfyniad yn {category}"
+        "cy": "{count} dyfyniad yn {category}"
     },
     "quote_link": {
-        "english": "Link to {category} - {url}",
-        "spanish": "Enlace a {category} - {url}",
+        "en": "Link to {category} - {url}",
+        "es": "Enlace a {category} - {url}",
         "na'vi": "Fya'o {category}ne - {url}",
-        "welsh": "Dolen i {category} - {url}"
+        "cy": "Dolen i {category} - {url}"
     },
     "search_results": {
-        "english": "{category} ({needle}): '{quote}' [{matches} results]",
-        "spanish" : "{category} ({needle}): '{quote}' [{matches} resultados]",
+        "en": "{category} ({needle}): '{quote}' [{matches} results]",
+        "es" : "{category} ({needle}): '{quote}' [{matches} resultados]",
         "na'vi": "{category} ({needle}): '{quote}' [kum a{matches}]",
-        "welsh": "{category} ({needle}): '{quote}' [{matches} canlyniad]"
+        "cy": "{category} ({needle}): '{quote}' [{matches} canlyniad]"
     },
     "quote_cache_auto_remove": {
-        "english": "There are {count} quotes in the removal cache, which will be automatically cleared.",
+        "en": "There are {count} quotes in the removal cache, which will be automatically cleared.",
         "na'vi": "{count}a 'upxarel sngelit tok, Oel 'ayku sngelit lukenga."
     },
     "quote_cache_manual_remove": {
-        "english": "There are {count} quotes in the removal cache, which must be manually cleared.",
+        "en": "There are {count} quotes in the removal cache, which must be manually cleared.",
         "na'vi": "{count}a 'upxarel sngelit tok slä oel ke 'ayku sngelit tafral nga zene 'aivku"
     },
     "quote_cache_cleared": {
-        "english": "{count} quotes cleared from the removal cache.",
+        "en": "{count} quotes cleared from the removal cache.",
         "na'vi": "Oel 'aìmku {count}a 'upxareti ta sngel."
     },
     "quote_cache_reinstated": {
-        "english": "{count} quotes reinstated from the removal cache.",
+        "en": "{count} quotes reinstated from the removal cache.",
         "na'vi": "{count}a 'upxare tolätxaw ta sngel."
     },
     "rm_cache_limit": {
-        "english": "Attention: Too many quotes removed, rmCache must be cleared or reinstated manually with ~rmconfirm or ~rmdeny.",
+        "en": "Attention: Too many quotes removed, rmCache must be cleared or reinstated manually with ~rmconfirm or ~rmdeny.",
         "na'vi": "Oel zerok 'upxareti apxay set, sweylu txo nga 'aivku upxareti ìlä ~rmconfirm fu ~rmdeny."
     }
 }
diff --git a/modules/rain/strings.json b/modules/rain/strings.json
index 60904e6..235677e 100644
--- a/modules/rain/strings.json
+++ b/modules/rain/strings.json
@@ -1,44 +1,44 @@
- {
-    "rain-0": { 
-        "english" : "It's not raining in {place}."
-    },
-    "rain-1": {
-        "english" : "It's raining in {place}."
-    },
-    "rain-2": {
-        "english" : "It's raining rather a lot in {place}."
-    },
-    "rain-3": { 
-        "english" : "It's raining shitloads."
-    },
-    "rain-4": {
-        "english" : "It's raining fucktons."
-    },
-    "rain-5": { 
-        "english" : "It's raining whales (in {place})!"
-    },
-    "rain-6": { 
-        "english" : "IT'S SO FUCKING WET OUT HERE MAN"
-    },
-    "rain-7": { 
-        "english" : "I AM SO MOIST RIGHT NOW"
-    },
-    "rain-8": {
-        "english" : "You used a #3 pencil instead of #2, didn't you?"
-    },
-    "rain-9": { 
-        "english" : "WELCOME TO ATLANTIS"
-    },
-    "rain-10": { 
-        "english" : "GET INSIDE"
-    },
-    "rain-11": {
-        "english" : "LOL U PROBABLY DIED"
-    },
-    "rain-e": {
-        "english" : "Unable to fetch weather data."
-    },
-    "rain-u": {
-        "english": "Location too ambigious to process."
-    }
-}
+ {
+    "rain-0": { 
+        "en" : "It's not raining in {place}."
+    },
+    "rain-1": {
+        "en" : "It's raining in {place}."
+    },
+    "rain-2": {
+        "en" : "It's raining rather a lot in {place}."
+    },
+    "rain-3": { 
+        "en" : "It's raining shitloads."
+    },
+    "rain-4": {
+        "en" : "It's raining fucktons."
+    },
+    "rain-5": { 
+        "en" : "It's raining whales (in {place})!"
+    },
+    "rain-6": { 
+        "en" : "IT'S SO FUCKING WET OUT HERE MAN"
+    },
+    "rain-7": { 
+        "en" : "I AM SO MOIST RIGHT NOW"
+    },
+    "rain-8": {
+        "en" : "You used a #3 pencil instead of #2, didn't you?"
+    },
+    "rain-9": { 
+        "en" : "WELCOME TO ATLANTIS"
+    },
+    "rain-10": { 
+        "en" : "GET INSIDE"
+    },
+    "rain-11": {
+        "en" : "LOL U PROBABLY DIED"
+    },
+    "rain-e": {
+        "en" : "Unable to fetch weather data."
+    },
+    "rain-u": {
+        "en": "Location too ambigious to process."
+    }
+}
diff --git a/modules/report/strings.json b/modules/report/strings.json
index 3b0393d..242739a 100644
--- a/modules/report/strings.json
+++ b/modules/report/strings.json
@@ -1,18 +1,18 @@
 {
     "report": {
-        "english": "Attention: {reporter} has reported {reported} in {channel}. The reason given was: \"{reason}.\"",
+        "en": "Attention: {reporter} has reported {reported} in {channel}. The reason given was: \"{reason}.\"",
         "na'vi": "{reporter}ìl fpìl futa {reported} fe' lu taluna {reason}."
     },
     "reported": {
-        "english": "Thank you, {reported} has been reported to the channel administrators.",
+        "en": "Thank you, {reported} has been reported to the channel administrators.",
         "na'vi": "Irayo si ngari, fìtsengìri ayeyktan omum teri {reported}it set."
     },
     "user_not_found": {
-        "english": "{reported} isn't a known user in {channel}.",
+        "en": "{reported} isn't a known user in {channel}.",
         "na'vi": "Oel ke omum {reported}it mì {channel}."
     },
     "not_in_channel": {
-        "english": "I am not present in {channel}.",
+        "en": "I am not present in {channel}.",
         "na'vi": "Oel {channel}it ke tok."
     }
 }
diff --git a/modules/spelling/strings.json b/modules/spelling/strings.json
index 057786e..d7fc82e 100644
--- a/modules/spelling/strings.json
+++ b/modules/spelling/strings.json
@@ -1,14 +1,14 @@
 {
     "spelling_self": {
-        "english": "{correcter} meant: {fix}",
-        "spanish": "{correcter} quería decir: {fix}",
+        "en": "{correcter} meant: {fix}",
+        "es": "{correcter} quería decir: {fix}",
         "na'vi": "Sweylu {correcter} pamrel sivi: {fix}",
-        "welsh": "Oedd {correcter} yn feddwl: {fix}"
+        "cy": "Oedd {correcter} yn feddwl: {fix}"
     },
     "spelling_other": {
-        "english": "{correcter} thinks {candidate} meant: {fix}",
-        "spanish": "{correcter} piensa que {candidate} queria decir: {fix}",
+        "en": "{correcter} thinks {candidate} meant: {fix}",
+        "es": "{correcter} piensa que {candidate} queria decir: {fix}",
         "na'vi": "{correcter} fpìl futa sweylu {candiate} pamrel sivi: {fix}",
-        "welsh": "Mae {correcter} yn meddwl bod {candidate} yn feddwl: {fix}"
+        "cy": "Mae {correcter} yn meddwl bod {candidate} yn feddwl: {fix}"
     }
 }
diff --git a/modules/users/strings.json b/modules/users/strings.json
index b3d7a52..a46e7dc 100644
--- a/modules/users/strings.json
+++ b/modules/users/strings.json
@@ -1,26 +1,26 @@
 {
     "alias": {
-        "english": "{alias} is an alias of {user}",
+        "en": "{alias} is an alias of {user}",
         "na'vi": "ayfko syaw {user} {alias} nìteng"
     }, 
     "primary": {
-        "english": "{user} is a primary user with {count} aliases, ",
+        "en": "{user} is a primary user with {count} aliases, ",
         "na'vi": "{user} lu txin ulte {count}a stxo lu poru, "
     },
     "unknown_alias": {
-        "english": "{alias} does not currently exist as an alias or known user.",
+        "en": "{alias} does not currently exist as an alias or known user.",
         "na'vi": "{alias} ke fkeytok nìfkrr"
     }, 
     "aliasparentset": {
-        "english": "{newParent} is now the parent user, and {newAlias} is an alias.",
+        "en": "{newParent} is now the parent user, and {newAlias} is an alias.",
         "na'vi": "{newParent} lu sa'sem set ulte {newAlias} lu stxo set nìteng."
     },
     "unprimary_error": {
-        "english": "One of those users isn't currently recorded as a primary user.",
+        "en": "One of those users isn't currently recorded as a primary user.",
         "na'vi": "fo sute txin ke lu."
     },
     "merged_users": {
-        "english": "{old_user} and their aliases have been merged into {new_user}.",
+        "en": "{old_user} and their aliases have been merged into {new_user}.",
         "na'vi": "{old_user} ulte stxo alahe {new_user} lu set."
     }
 }