diff --git a/po/8192.neothethird.pot b/po/8192.neothethird.pot
index bed5b52..612e0df 100644
--- a/po/8192.neothethird.pot
+++ b/po/8192.neothethird.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 8192.neothethird\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-18 23:06+0000\n"
+"POT-Creation-Date: 2017-07-18 23:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/8192.pot b/po/8192.pot
deleted file mode 100644
index 6b5cf37..0000000
--- a/po/8192.pot
+++ /dev/null
@@ -1,103 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# 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"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-18 21:37+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../qml/modules/Header.qml:74
-msgid "YOUR SCORE"
-msgstr ""
-
-#: ../qml/modules/Header.qml:91
-msgid "HIGHSCORE"
-msgstr ""
-
-#: ../qml/modules/Footer.qml:61 ../qml/modules/Footer.qml:69
-#: ../qml/Main.qml:170 ../qml/Main.qml:188
-msgid "Restart"
-msgstr ""
-
-#: ../qml/modules/Footer.qml:70
-msgid "Are you sure you want to restart the game?"
-msgstr ""
-
-#: ../qml/modules/Footer.qml:73
-msgid "Yes"
-msgstr ""
-
-#: ../qml/modules/Footer.qml:81
-msgid "No"
-msgstr ""
-
-#: ../qml/modules/Footer.qml:104
-msgid "About"
-msgstr ""
-
-#: ../qml/modules/Footer.qml:113
-msgid "Version"
-msgstr ""
-
-#: ../qml/modules/Footer.qml:113
-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 ""
-
-#: ../qml/modules/Footer.qml:113
-msgid "Copyright"
-msgstr ""
-
-#: ../qml/modules/Footer.qml:116
-msgid "Donate"
-msgstr ""
-
-#: ../qml/modules/Footer.qml:124
-msgid "Report a bug"
-msgstr ""
-
-#: ../qml/modules/Footer.qml:133
-msgid "Close"
-msgstr ""
-
-#: ../qml/Main.qml:35 ../qml/Main.qml:92
-msgid "Welcome to 8192"
-msgstr ""
-
-#: ../qml/Main.qml:160
-msgid "Victory"
-msgstr ""
-
-#: ../qml/Main.qml:163
-msgid "Keep going"
-msgstr ""
-
-#: ../qml/Main.qml:184
-msgid "Game over. :("
-msgstr ""
-
-#: ../qml/Main.qml:185
-msgid "Score"
-msgstr ""
-
-#: ../qml/Main.qml:197
-msgid "Quit"
-msgstr ""
-
-#: 8192.desktop.in.h:1
-msgid "8192"
-msgstr ""
diff --git a/po/de.po b/po/de.po
index 1d2102c..945cb6d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 8192\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-16 14:07+0200\n"
-"PO-Revision-Date: 2017-07-16 14:07+0200\n"
+"POT-Creation-Date: 2017-07-19 01:20+0200\n"
+"PO-Revision-Date: 2017-07-19 01:20+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de\n"
@@ -18,64 +18,37 @@ msgstr ""
 "X-Generator: Poedit 1.8.7.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../qml/Main.qml:79
-msgid "Welcome to 8192"
-msgstr "Willkommen zu 8192"
-
-#: ../qml/Main.qml:123
+#: ../qml/modules/Header.qml:74
 msgid "YOUR SCORE"
 msgstr "SPIELSTAND"
 
-#: ../qml/Main.qml:129
+#: ../qml/modules/Header.qml:91
 msgid "HIGHSCORE"
 msgstr "HIGHSCORE"
 
-#: ../qml/Main.qml:160 ../qml/Main.qml:195 ../qml/Main.qml:228
-#: ../qml/Main.qml:248
+#: ../qml/modules/PopupController.qml:41 ../qml/modules/PopupController.qml:118
+#: ../qml/modules/PopupController.qml:140 ../qml/modules/Footer.qml:60
+#: ../qml/Main.qml:107
 msgid "Restart"
 msgstr "Neustart"
 
-#: ../qml/Main.qml:168
-msgid "About"
-msgstr "Informationen"
-
-#: ../qml/Main.qml:196
+#: ../qml/modules/PopupController.qml:42
 msgid "Are you sure you want to restart the game?"
 msgstr "Bist du sicher, dass du neustarten möchtest?"
 
-#: ../qml/Main.qml:198
+#: ../qml/modules/PopupController.qml:45
 msgid "Yes"
 msgstr "Ja"
 
-#: ../qml/Main.qml:205
+#: ../qml/modules/PopupController.qml:53
 msgid "No"
 msgstr "Nein"
 
-#: ../qml/Main.qml:220
-msgid "Victory"
-msgstr "Gewonnen"
-
-#: ../qml/Main.qml:222
-msgid "Keep going"
-msgstr "Weitermachen"
-
-#: ../qml/Main.qml:244
-msgid "Game over. :("
-msgstr "Game over. :("
-
-#: ../qml/Main.qml:245
-msgid "Score"
-msgstr "Spielstand"
-
-#: ../qml/Main.qml:256
-msgid "Quit"
-msgstr "Beenden"
-
-#: ../qml/Main.qml:273
+#: ../qml/modules/PopupController.qml:71
 msgid "Version"
 msgstr "Version"
 
-#: ../qml/Main.qml:273
+#: ../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 "
@@ -88,22 +61,54 @@ msgstr ""
 "treffen solltest, gib ihnen doch bitte einen Kaffee aus, sie haben es "
 "verdient!"
 
-#: ../qml/Main.qml:273
+#: ../qml/modules/PopupController.qml:71
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../qml/Main.qml:276
+#: ../qml/modules/PopupController.qml:74
 msgid "Donate"
 msgstr "Spenden"
 
-#: ../qml/Main.qml:283
+#: ../qml/modules/PopupController.qml:82
 msgid "Report a bug"
 msgstr "Fehler melden"
 
-#: ../qml/Main.qml:291
+#: ../qml/modules/PopupController.qml:91
 msgid "Close"
 msgstr "Schließen"
 
-#: 8192.desktop.in.h:1
+#: ../qml/modules/PopupController.qml:108
+msgid "Victory"
+msgstr "Gewonnen"
+
+#: ../qml/modules/PopupController.qml:111
+msgid "Keep going"
+msgstr "Weitermachen"
+
+#: ../qml/modules/PopupController.qml:136
+msgid "Game over. :("
+msgstr "Game over. :("
+
+#: ../qml/modules/PopupController.qml:137
+msgid "Score"
+msgstr "Spielstand"
+
+#: ../qml/modules/PopupController.qml:149
+msgid "Quit"
+msgstr "Beenden"
+
+#: ../qml/modules/Footer.qml:78 ../qml/Main.qml:103
+msgid "About"
+msgstr "Informationen"
+
+#: ../qml/Main.qml:35 ../qml/Main.qml:93
+msgid "Welcome to 8192"
+msgstr "Willkommen zu 8192"
+
+#: ../qml/Main.qml:112
+msgid "Undo"
+msgstr "Zurück"
+
+#: 8192.neothethird.desktop.in.h:1
 msgid "8192"
 msgstr "8192"