diff --git a/po/es.po b/po/es.po
index 0e4e41a..80746f2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,108 +3,111 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 8192\n"
+"Project-Id-Version: 8192.neothethird\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-17 02:35+0200\n"
-"PO-Revision-Date: 2017-09-16 17:54+0200\n"
-
+"POT-Creation-Date: 2018-06-06 08:12+0000\n"
+"PO-Revision-Date: 2018-06-16 12:30+0000\n"
 "Last-Translator: advocatux <advocatux@airpost.net>\n"
 "Language-Team: UBports Spanish Team\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: handmade for you\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../qml/Main.qml:93
-msgid "Welcome to 8192"
-msgstr "Bienvenido a 8192"
-
-#: ../qml/Main.qml:137
-msgid "YOUR SCORE"
-msgstr "SU PUNTUACIÓN"
 
-#: ../qml/Main.qml:143
-msgid "HIGHSCORE"
-msgstr "RECORD"
-
-#: ../qml/Main.qml:173 ../qml/Main.qml:208 ../qml/Main.qml:241
-#: ../qml/Main.qml:261
+#: ../qml/modules/PopupController.qml:41
+#: ../qml/modules/PopupController.qml:118
+#: ../qml/modules/PopupController.qml:140 ../qml/modules/Footer.qml:60
+#: ../qml/Main.qml:99
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../qml/Main.qml:181
-msgid "About"
-msgstr "Acerca de"
-
-#: ../qml/Main.qml:209
+#: ../qml/modules/PopupController.qml:42
 msgid "Are you sure you want to restart the game?"
 msgstr "¿Seguro que desea reiniciar el juego?"
 
-#: ../qml/Main.qml:211
+#: ../qml/modules/PopupController.qml:45
 msgid "Yes"
-msgstr "Si"
+msgstr "Sí"
 
-#: ../qml/Main.qml:218
+#: ../qml/modules/PopupController.qml:53
 msgid "No"
 msgstr "No"
 
-#: ../qml/Main.qml:233
-msgid "Victory"
-msgstr "Victoria"
-
-#: ../qml/Main.qml:235
-msgid "Keep going"
-msgstr "Continuar"
-
-#: ../qml/Main.qml:257
-msgid "Game over. :("
-msgstr "Juego terminado. :("
-
-#: ../qml/Main.qml:258
-msgid "Score"
-msgstr "Puntuación"
-
-#: ../qml/Main.qml:269
-msgid "Quit"
-msgstr "Salir"
-
-#: ../qml/Main.qml:286
+#: ../qml/modules/PopupController.qml:71
 msgid "Version"
 msgstr "Versión"
 
-#: ../qml/Main.qml:286
+#: ../qml/modules/PopupController.qml:71
 msgid ""
 "This game was shamelessly ripped of from Gabriele Cirulli's game \"2048\", "
 "which was inspired by Jason Saxon's game \"1024!\". If you enjoy this game "
 "and you ever happen to meet them, please consider treating them for a decent "
 "cup of coffee, they really deserve it!"
-
 msgstr ""
 "Este juego ha fusilado descaradamente el juego \"2048\" de Gabriele Cirulli, "
 "que se inspiró en el juego \"1024!\" de Jason Saxon. Si disfruta con el juego "
 "y alguna vez se encuentra con ellos, considere invitarlos a una buena "
 "taza de café, ¡realmente se lo merecen! "
 
-#: ../qml/Main.qml:286
+#: ../qml/modules/PopupController.qml:71
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../qml/Main.qml:289
+#: ../qml/modules/PopupController.qml:74
 msgid "Donate"
 msgstr "Donar"
 
-#: ../qml/Main.qml:296
+#: ../qml/modules/PopupController.qml:82
 msgid "Report a bug"
 msgstr "Informar de un error"
 
-#: ../qml/Main.qml:304
+#: ../qml/modules/PopupController.qml:91
 msgid "Close"
 msgstr "Cerrar"
 
-#: 8192.desktop.in.h:1
+#: ../qml/modules/PopupController.qml:108
+msgid "Victory"
+msgstr "Victoria"
+
+#: ../qml/modules/PopupController.qml:111
+msgid "Keep going"
+msgstr "Continuar"
+
+#: ../qml/modules/PopupController.qml:136
+msgid "Game over. :("
+msgstr "Fin de la partida. :("
+
+#: ../qml/modules/PopupController.qml:137
+msgid "Score"
+msgstr "Puntuación"
+
+#: ../qml/modules/PopupController.qml:149
+msgid "Quit"
+msgstr "Salir"
+
+#: ../qml/modules/Footer.qml:78 ../qml/Main.qml:95
+msgid "About"
+msgstr "Acerca de"
+
+#: ../qml/modules/Header.qml:74
+msgid "YOUR SCORE"
+msgstr "SU PUNTUACIÓN"
+
+#: ../qml/modules/Header.qml:91
+msgid "HIGHSCORE"
+msgstr "RECORD"
+
+#: ../qml/Main.qml:35 ../qml/Main.qml:85
+msgid "Welcome to 8192"
+msgstr "Bienvenido a 8192"
+
+#: ../qml/Main.qml:104
+msgid "Undo"
+msgstr "Deshacer"
+
+#: 8192.neothethird.desktop.in.h:1
 msgid "8192"
-msgstr "8192"
+msgstr "8192"