diff --git a/data/locale/ca.yaml b/data/locale/ca.yaml
index eb3fe30..9e6b43d 100644
--- a/data/locale/ca.yaml
+++ b/data/locale/ca.yaml
@@ -7,7 +7,7 @@ title:
   menu:
     play: "1. JUGAR"
     keyboard: "2. REDEFINIR TECLAT"
-    joystick: "3. REDEFINIR JOYSTICK"
+    joystick: "3. REDEFINIR MANDO"
     projects: "4. PROJECTES"
   keys:
     prompt0: "PREM TECLA PER ESQUERRA"
@@ -16,7 +16,7 @@ title:
     defined: "TECLES DEFINIDES"
     label0: "ESQUERRA: "
     label1: "DRETA: "
-    label2: "SALT: "
+    label2: "SALTAR: "
     invalid: "TECLA INVALIDA! PROVA UNA ALTRA"
     already_used: "TECLA JA USADA! PROVA UNA ALTRA"
   buttons:
@@ -35,15 +35,15 @@ game_over:
 
 ending:
   t0: "FINALMENT HO VA ACONSEGUIR"
-  t1: "ARRIBAR A LA PRESO"
+  t1: "ARRIBAR A LA JAIL"
   t2: "AMB TOTS ELS SEUS PROJECTES"
   t3: "A PUNT PER SER ALLIBERATS"
-  t4: "TOTS ELS JAILEROS HI EREN"
+  t4: "ALLI ESTAVEN TOTS ELS JAILERS"
   t5: "ESPERANT QUE ELS JAILGAMES"
   t6: "FOSSIN ALLIBERATS"
-  t7: "HI HAVIA FINS I TOT BARRULLS I"
-  t8: "PRINCIPIANTS ENTRE LA MULTITUD"
-  t9: "LA BRY PLORAVA..."
+  t7: "HI HAVIA FINS I TOT BARRULLS"
+  t8: "I BEGGINERS ENTRE LA MULTITUD"
+  t9: "BRY ESTAVA PLORANT..."
   t10: "PERO DE SOBTE ALGUNA COSA"
   t11: "VA ATREURE LA SEVA ATENCIO"
   t12: "UN MUNT DE FERALLA!"
@@ -60,9 +60,9 @@ ending2:
 
 credits:
   instructions: "INSTRUCCIONS:"
-  l0: "AJUDA AL JAILDOC A RECUPERAR"
+  l0: "AJUDA A JAILDOC A RECUPERAR"
   l1: "ELS SEUS PROJECTES I ANAR A"
-  l2: "LA PRESO PER ACABAR-LOS"
+  l2: "LA JAIL PER ACABAR-LOS"
   keys: "TECLES:"
   keys_move: "CURSORS PER MOURE I SALTAR"
   f8: "F8 ACTIVAR/DESACTIVAR MUSICA"
@@ -78,7 +78,7 @@ achievements:
   header: "ASSOLIMENT DESBLOQUEJAT!"
   c1: "COSES BRILLANTS"
   d1: "Obteniu el 25% dels objectes"
-  c2: "A MITAT DE CAMI"
+  c2: "A MEITAT DE CAMI"
   d2: "Obteniu el 50% dels objectes"
   c3: "QUASI HI SOM"
   d3: "Obteniu el 75% dels objectes"
@@ -90,7 +90,7 @@ achievements:
   d6: "Visiteu 40 sales"
   c7: "M'AGRADA EXPLORAR"
   d7: "Visiteu totes les sales"
-  c8: "ACABA EL JOC"
+  c8: "JA ESTA?"
   d8: "Completa el joc"
   c9: "EM VA XUCLAR UN FORAT"
   d9: "Completa el joc sense entrar a la preso"
@@ -113,15 +113,15 @@ ui:
   postfx_disabled: "POSTFX DESACTIVAT"
   postfx: "POSTFX"
   palette: "PALETA"
-  integer_scale_enabled: "ESCALA ENTERA ACTIVADA"
-  integer_scale_disabled: "ESCALA ENTERA DESACTIVADA"
+  integer_scale_enabled: "ESCALAT SENCER ACTIVAT"
+  integer_scale_disabled: "ESCALAT SENCER DESACTIVAT"
   vsync_enabled: "V-SYNC ACTIVAT"
   vsync_disabled: "V-SYNC DESACTIVAT"
 
 scoreboard:
-  items: "Objectes col.lec. "
-  time: " Temps "
-  rooms: "Sales"
+  items: "TRESORS PILLATS "
+  time: " HORA "
+  rooms: "SALES"
 
 game:
   music_enabled: "MUSICA ACTIVADA"
@@ -132,8 +132,8 @@ game:
   disabled: " DESACTIVAT"
   cheat_infinite_lives: "VIDES INFINITES"
   cheat_invincible: "INVENCIBLE"
-  cheat_jail_open: "PRESO OBERTA"
-  debug_enabled: "DEBUG  ACTIVAT"
-  debug_disabled: "DEBUG  DESACTIVAT"
+  cheat_jail_open: "JAIL OBERTA"
+  debug_enabled: "DEBUG ACTIVAT"
+  debug_disabled: "DEBUG DESACTIVAT"
   achievement_unlocked: "ASSOLIMENT DESBLOQUEJAT!"
   c11: "M'AGRADEN ELS MEUS AMICS DE COLORS"
diff --git a/data/locale/en.yaml b/data/locale/en.yaml
index d9035b2..26c4d1e 100644
--- a/data/locale/en.yaml
+++ b/data/locale/en.yaml
@@ -118,9 +118,9 @@ ui:
   vsync_disabled: "V-SYNC DISABLED"
 
 scoreboard:
-  items: "Items collected "
-  time: " Time "
-  rooms: "Rooms"
+  items: "ITEMS COLLECTED "
+  time: " TIME "
+  rooms: "ROOMS"
 
 game:
   music_enabled: "MUSIC ENABLED"
diff --git a/data/room/01.yaml b/data/room/01.yaml
index 753498a..f43bdb5 100644
--- a/data/room/01.yaml
+++ b/data/room/01.yaml
@@ -1,7 +1,7 @@
 # THE JAIL
 room:
   name_en: "THE JAIL"
-  name_ca: "LA PRESO"
+  name_ca: "LA JAIL"
   bgColor: bright_blue
   border: blue
   tileSetFile: standard.gif
diff --git a/data/room/02.yaml b/data/room/02.yaml
index 62f7b9b..7e80192 100644
--- a/data/room/02.yaml
+++ b/data/room/02.yaml
@@ -1,7 +1,7 @@
 # ROAD TO THE JAIL
 room:
   name_en: "ROAD TO THE JAIL"
-  name_ca: "CAMI A LA PRESO"
+  name_ca: "CAMI A LA JAIL"
   bgColor: black
   border: blue
   tileSetFile: standard.gif
diff --git a/data/room/09.yaml b/data/room/09.yaml
index a10558d..4278c76 100644
--- a/data/room/09.yaml
+++ b/data/room/09.yaml
@@ -1,7 +1,7 @@
 # THE BIG TREE
 room:
   name_en: "THE BIG TREE"
-  name_ca: "EL ARBRE GRAN"
+  name_ca: "EL GRAN ARBRE"
   bgColor: black
   border: bright_blue
   tileSetFile: standard.gif
diff --git a/data/room/10.yaml b/data/room/10.yaml
index b3002c0..75b78f5 100644
--- a/data/room/10.yaml
+++ b/data/room/10.yaml
@@ -1,7 +1,7 @@
 # TREE TOP
 room:
   name_en: "TREE TOP"
-  name_ca: "CIMA DE L'ARBRE"
+  name_ca: "AMUNT DE L'ARBRE"
   bgColor: bright_black
   border: blue
   tileSetFile: standard.gif
diff --git a/data/room/11.yaml b/data/room/11.yaml
index cb41b3c..e70ea4f 100644
--- a/data/room/11.yaml
+++ b/data/room/11.yaml
@@ -1,7 +1,7 @@
 # LAZY ROOM
 room:
   name_en: "LAZY ROOM"
-  name_ca: "SALA MANDROSA"
+  name_ca: "SALA DE LA PEREA"
   bgColor: black
   border: blue
   tileSetFile: standard.gif
diff --git a/data/room/13.yaml b/data/room/13.yaml
index d75f5dd..ee3ad46 100644
--- a/data/room/13.yaml
+++ b/data/room/13.yaml
@@ -1,7 +1,7 @@
 # TUNO KILLER
 room:
   name_en: "TUNO KILLER"
-  name_ca: "ASSASSI DE TUNERS"
+  name_ca: "MATATUNOS"
   bgColor: black
   border: blue
   tileSetFile: standard.gif
diff --git a/data/room/17.yaml b/data/room/17.yaml
index 2a29a4c..958a039 100644
--- a/data/room/17.yaml
+++ b/data/room/17.yaml
@@ -1,7 +1,7 @@
 # I DID NOT COPY THIS ONE
 room:
   name_en: "I DID NOT COPY THIS ONE"
-  name_ca: "AQUEST NO EL VAIG COPIAR"
+  name_ca: "ESTA NO LA HE COPIADA, NO"
   bgColor: black
   border: magenta
   tileSetFile: standard.gif
diff --git a/data/room/18.yaml b/data/room/18.yaml
index 87725c5..b0cd985 100644
--- a/data/room/18.yaml
+++ b/data/room/18.yaml
@@ -1,7 +1,7 @@
 # MAKE MONEY
 room:
   name_en: "MAKE MONEY"
-  name_ca: "FES DINERS"
+  name_ca: "INHERITEDS!"
   bgColor: black
   border: yellow
   tileSetFile: standard.gif
diff --git a/data/room/21.yaml b/data/room/21.yaml
index 10072a7..c918104 100644
--- a/data/room/21.yaml
+++ b/data/room/21.yaml
@@ -1,7 +1,7 @@
 # ENTER PAKU SIMBEL
 room:
   name_en: "ENTER PAKU SIMBEL"
-  name_ca: "ENTRA A PAKU SIMBEL"
+  name_ca: "ENTRANT A PAKU SIMBEL"
   bgColor: bright_black
   border: yellow
   tileSetFile: standard.gif
diff --git a/data/room/22.yaml b/data/room/22.yaml
index f2f279d..9263446 100644
--- a/data/room/22.yaml
+++ b/data/room/22.yaml
@@ -1,7 +1,7 @@
 # AEE REMAKE, PLEASE
 room:
   name_en: "AEE REMAKE, PLEASE"
-  name_ca: "AEE REMAKE, PLAU"
+  name_ca: "AEE REMAKE, PERFAPLIS"
   bgColor: bright_black
   border: yellow
   tileSetFile: standard.gif
diff --git a/data/room/24.yaml b/data/room/24.yaml
index 96a48a5..9cfdde3 100644
--- a/data/room/24.yaml
+++ b/data/room/24.yaml
@@ -1,7 +1,7 @@
 # PLAY IT AGAIN, SAM
 room:
   name_en: "PLAY IT AGAIN, SAM"
-  name_ca: "TORNA A TOCAR, SAM"
+  name_ca: "TORNA-LA A TOCAR, SAM"
   bgColor: black
   border: bright_yellow
   tileSetFile: standard.gif
diff --git a/data/room/26.yaml b/data/room/26.yaml
index ac1aca7..1411d47 100644
--- a/data/room/26.yaml
+++ b/data/room/26.yaml
@@ -1,7 +1,7 @@
 # JINGLE BELLS
 room:
   name_en: "JINGLE BELLS"
-  name_ca: "JINGLE BELLS"
+  name_ca: "CAMPANETES"
   bgColor: blue
   border: yellow
   tileSetFile: standard.gif
diff --git a/data/room/27.yaml b/data/room/27.yaml
index b0d7d55..e9db928 100644
--- a/data/room/27.yaml
+++ b/data/room/27.yaml
@@ -1,7 +1,7 @@
 # THE BACKYARD
 room:
   name_en: "THE BACKYARD"
-  name_ca: "EL PATI"
+  name_ca: "EL PATI DE DARRERE"
   bgColor: blue
   border: cyan
   tileSetFile: standard.gif
diff --git a/data/room/33.yaml b/data/room/33.yaml
index 8d04c22..5283701 100644
--- a/data/room/33.yaml
+++ b/data/room/33.yaml
@@ -1,7 +1,7 @@
 # } WE ALL LOVE JAILGAMES }
 room:
   name_en: "} WE ALL LOVE JAILGAMES }"
-  name_ca: "} TOTS ESTIMEM JAILGAMES }"
+  name_ca: "} AMOR PELS JAILGAMES }"
   bgColor: black
   border: bright_black
   tileSetFile: standard.gif
diff --git a/data/room/35.yaml b/data/room/35.yaml
index 201eeda..e468f75 100644
--- a/data/room/35.yaml
+++ b/data/room/35.yaml
@@ -1,7 +1,7 @@
 # SILICON BOOBS
 room:
   name_en: "SILICON BOOBS"
-  name_ca: "PITS DE SILICI"
+  name_ca: "MAMELLES DE SILICI"
   bgColor: black
   border: bright_green
   tileSetFile: standard.gif
diff --git a/data/room/36.yaml b/data/room/36.yaml
index 3310663..3abeb2a 100644
--- a/data/room/36.yaml
+++ b/data/room/36.yaml
@@ -1,7 +1,7 @@
 # BE CAREFUL WITH THE FUSE
 room:
   name_en: "BE CAREFUL WITH THE FUSE"
-  name_ca: "VIGILA AMB EL FUSIBLE"
+  name_ca: "COMPTE AMB EL FUSIBLE"
   bgColor: black
   border: bright_cyan
   tileSetFile: standard.gif
diff --git a/data/room/38.yaml b/data/room/38.yaml
index 0723a81..fdcf0ca 100644
--- a/data/room/38.yaml
+++ b/data/room/38.yaml
@@ -1,7 +1,7 @@
 # THE FINAL CROSSOVER
 room:
   name_en: "THE FINAL CROSSOVER"
-  name_ca: "EL CROSSOVER FINAL"
+  name_ca: "EL CROSSOVER DEFINITIU"
   bgColor: bright_black
   border: yellow
   tileSetFile: standard.gif
diff --git a/data/room/39.yaml b/data/room/39.yaml
index 2246fa9..3e7b1b4 100644
--- a/data/room/39.yaml
+++ b/data/room/39.yaml
@@ -1,7 +1,7 @@
 # YOU'LL BELIEVE AROUNDER CAN FLY
 room:
   name_en: "YOU'LL BELIEVE AROUNDER CAN FLY"
-  name_ca: "CREUREU QUE AROUNDER POT VOLAR"
+  name_ca: "CREURAS QUE ELS AROUNDERS VOLEN"
   bgColor: black
   border: cyan
   tileSetFile: standard.gif
diff --git a/data/room/44.yaml b/data/room/44.yaml
index 1e6a942..074e9d5 100644
--- a/data/room/44.yaml
+++ b/data/room/44.yaml
@@ -1,7 +1,7 @@
 # SANDWITCH AND COUNTER
 room:
   name_en: "SANDWITCH AND COUNTER"
-  name_ca: "SANDVITX I COMPTADOR"
+  name_ca: "SANDVITX I COUNTER S."
   bgColor: black
   border: cyan
   tileSetFile: standard.gif
diff --git a/data/room/48.yaml b/data/room/48.yaml
index b5999df..81c9db7 100644
--- a/data/room/48.yaml
+++ b/data/room/48.yaml
@@ -1,7 +1,7 @@
 # WELCOME TO THE JAILBATTLE
 room:
   name_en: "WELCOME TO THE JAILBATTLE"
-  name_ca: "BENVINGUTS A LA JAILTAULA"
+  name_ca: "BENVINGUTS A JAILBATTLE"
   bgColor: green
   border: bright_green
   tileSetFile: standard.gif
diff --git a/data/room/54.yaml b/data/room/54.yaml
index 53b681a..a681484 100644
--- a/data/room/54.yaml
+++ b/data/room/54.yaml
@@ -1,7 +1,7 @@
 # THE BASEMENT
 room:
   name_en: "THE BASEMENT"
-  name_ca: "EL SOTERRANI"
+  name_ca: "EL SOTAN"
   bgColor: black
   border: blue
   tileSetFile: standard.gif
diff --git a/data/room/56.yaml b/data/room/56.yaml
index 61aa494..196d0fd 100644
--- a/data/room/56.yaml
+++ b/data/room/56.yaml
@@ -1,7 +1,7 @@
 # HEAVY DEMONS ON LEGGINS
 room:
   name_en: "HEAVY DEMONS ON LEGGINS"
-  name_ca: "DIMONIS PESATS AMB MALLES"
+  name_ca: "DIMONIS HEAVIES AMB MALLES"
   bgColor: black
   border: black
   tileSetFile: standard.gif
diff --git a/data/room/57.yaml b/data/room/57.yaml
index 7e05fa8..cb482c6 100644
--- a/data/room/57.yaml
+++ b/data/room/57.yaml
@@ -1,7 +1,7 @@
 # JAILGAMES GO TO HELL
 room:
   name_en: "JAILGAMES GO TO HELL"
-  name_ca: "JAILGAMES ANEU A L'INFERN"
+  name_ca: "JAILGAMES A L'INFERN"
   bgColor: red
   border: bright_red
   tileSetFile: standard.gif
diff --git a/data/room/58.yaml b/data/room/58.yaml
index fc8d52c..2e8037d 100644
--- a/data/room/58.yaml
+++ b/data/room/58.yaml
@@ -1,7 +1,7 @@
 # CHIRPING
 room:
-  name_en: "CHIRPING"
-  name_ca: "PIULANT"
+  name_en: "CHIRPING DEVELOPMENT"
+  name_ca: "DESENVOLUPANT CHIRPING"
   bgColor: black
   border: magenta
   tileSetFile: standard.gif
diff --git a/source/game/scenes/game.cpp b/source/game/scenes/game.cpp
index 3e0a4b3..8343bde 100644
--- a/source/game/scenes/game.cpp
+++ b/source/game/scenes/game.cpp
@@ -459,7 +459,7 @@ void Game::handleDebugEvents(const SDL_Event& event) {
                 break;
 
             case SDLK_7:
-                Notifier::get()->show({Locale::get()->get("game.achievement_unlocked"), Locale::get()->get("game.c11")}, Notifier::Style::CHEEVO, -1, false, "F7");
+                Notifier::get()->show({Locale::get()->get("achievements.header"), Locale::get()->get("achievements.c11")}, Notifier::Style::CHEEVO, -1, false, "F7");
                 break;
 
             case SDLK_0: