diff --git a/src/main.cpp b/src/main.cpp
index 26b97bf..7bf766f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
     main_app.installTranslator(&qtTranslator);
 
     QTranslator appTranslator;
-    appTranslator.load("ao_" + QLocale::system().name());
+    appTranslator.load("ao_" + QLocale::system().name(),"base/translations/");
     main_app.installTranslator(&appTranslator);
 
     main_app.construct_lobby();
diff --git a/translations/ao_de.qm b/translations/ao_de.qm
new file mode 100644
index 0000000..28e45d3
Binary files /dev/null and b/translations/ao_de.qm differ
diff --git a/translations/ao_en.pot b/translations/ao_en.pot
deleted file mode 100644
index f256947..0000000
--- a/translations/ao_en.pot
+++ /dev/null
@@ -1,330 +0,0 @@
-msgid ""
-msgstr ""
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Language: en_US\n"
-"X-Qt-Contexts: true\n"
-
-#: ../aoapplication.cpp:133
-msgctxt "AOApplication|"
-msgid "Disconnected from server."
-msgstr ""
-
-#: ../aoapplication.cpp:157
-#, qt-format
-msgctxt "AOApplication|"
-msgid "Error connecting to master server. Will try again in %n seconds."
-msgstr ""
-
-#: ../aoapplication.cpp:162
-msgctxt "AOApplication|"
-msgid ""
-"There was an error connecting to the master server.\n"
-"We deploy multiple master servers to mitigate any possible downtime, but the "
-"client appears to have exhausted all possible methods of finding and "
-"connecting to one.\n"
-"Please check your Internet connection and firewall, and please try again."
-msgstr ""
-
-#: ../packet_distribution.cpp:107
-#, qt-format
-msgctxt "AOApplication|"
-msgid ""
-"Outdated version! Your version: %1\n"
-"Please go to aceattorneyonline.com to update."
-msgstr ""
-
-#: ../packet_distribution.cpp:115
-msgctxt "AOApplication|"
-msgid ""
-"You have been exiled from AO.\n"
-"Have a nice day."
-msgstr ""
-
-#: ../packet_distribution.cpp:228
-msgctxt "AOApplication|"
-msgid "Attorney Online 2"
-msgstr ""
-
-#: ../packet_distribution.cpp:254
-msgctxt "AOApplication|"
-msgid "Loading"
-msgstr ""
-
-#: ../packet_distribution.cpp:341
-#, qt-format
-msgctxt "AOApplication|"
-msgid ""
-"Loading evidence:\n"
-"%1/%2"
-msgstr ""
-
-#: ../packet_distribution.cpp:370 ../packet_distribution.cpp:435
-#, qt-format
-msgctxt "AOApplication|"
-msgid ""
-"Loading music:\n"
-"%1/%2"
-msgstr ""
-
-#: ../packet_distribution.cpp:415
-#, qt-format
-msgctxt "AOApplication|"
-msgid ""
-"Loading chars:\n"
-"%1/%2"
-msgstr ""
-
-#: ../packet_distribution.cpp:548
-msgctxt "AOApplication|"
-msgid "You have been kicked."
-msgstr ""
-
-#: ../packet_distribution.cpp:561
-msgctxt "AOApplication|"
-msgid "You are banned on this server."
-msgstr ""
-
-#: ../charselect.cpp:27
-msgctxt "Courtroom|"
-msgid "Spectator"
-msgstr ""
-
-#: ../charselect.cpp:149
-#, qt-format
-msgctxt "Courtroom|"
-msgid "Could not find %1"
-msgstr ""
-
-#: ../courtroom.cpp:111
-msgctxt "Courtroom|"
-msgid "Name"
-msgstr ""
-
-#: ../courtroom.cpp:152 ../courtroom.cpp:460
-msgctxt "Courtroom|"
-msgid "Pre"
-msgstr ""
-
-#: ../courtroom.cpp:154
-msgctxt "Courtroom|"
-msgid "Flip"
-msgstr ""
-
-#: ../courtroom.cpp:157
-msgctxt "Courtroom|"
-msgid "Guard"
-msgstr ""
-
-#: ../courtroom.cpp:171
-msgctxt "Courtroom|"
-msgid "White"
-msgstr ""
-
-#: ../courtroom.cpp:172
-msgctxt "Courtroom|"
-msgid "Green"
-msgstr ""
-
-#: ../courtroom.cpp:173
-msgctxt "Courtroom|"
-msgid "Red"
-msgstr ""
-
-#: ../courtroom.cpp:174
-msgctxt "Courtroom|"
-msgid "Orange"
-msgstr ""
-
-#: ../courtroom.cpp:175
-msgctxt "Courtroom|"
-msgid "Blue"
-msgstr ""
-
-#: ../courtroom.cpp:177
-msgctxt "Courtroom|"
-msgid "Yellow"
-msgstr ""
-
-#: ../courtroom.cpp:429
-msgctxt "Courtroom|"
-msgid "Music"
-msgstr ""
-
-#: ../courtroom.cpp:431
-msgctxt "Courtroom|"
-msgid "Sfx"
-msgstr ""
-
-#: ../courtroom.cpp:433
-msgctxt "Courtroom|"
-msgid "Blips"
-msgstr ""
-
-#: ../courtroom.cpp:443 ../courtroom.cpp:1656
-msgctxt "Courtroom|"
-msgid "Server"
-msgstr ""
-
-#: ../courtroom.cpp:451
-msgctxt "Courtroom|"
-msgid "Change character"
-msgstr ""
-
-#: ../courtroom.cpp:454
-msgctxt "Courtroom|"
-msgid "Reload theme"
-msgstr ""
-
-#: ../courtroom.cpp:457
-msgctxt "Courtroom|"
-msgid "Call mod"
-msgstr ""
-
-#: ../courtroom.cpp:531
-msgctxt "Courtroom|"
-msgid "Back to Lobby"
-msgstr ""
-
-#: ../courtroom.cpp:1508
-msgctxt "Courtroom|"
-msgid "You have been banned."
-msgstr ""
-
-#: ../courtroom.cpp:1534
-#, qt-format
-msgctxt "Courtroom|"
-msgid "%1 has played a song: %2"
-msgstr ""
-
-#: ../courtroom.cpp:1620
-msgctxt "Courtroom|"
-msgid "Rainbow"
-msgstr ""
-
-#: ../courtroom.cpp:1648
-msgctxt "Courtroom|"
-msgid "Master"
-msgstr ""
-
-#: ../evidence.cpp:28
-msgctxt "Courtroom|"
-msgid "Choose.."
-msgstr ""
-
-#: ../evidence.cpp:196
-msgctxt "Courtroom|"
-msgid "Images (*.png)"
-msgstr ""
-
-#: ../evidence.cpp:275
-msgctxt "Courtroom|"
-msgid "Add new evidence..."
-msgstr ""
-
-#: ../discord_rich_presence.cpp:38 ../discord_rich_presence.cpp:53
-#: ../discord_rich_presence.cpp:79 ../discord_rich_presence.cpp:98
-msgctxt "Discord|"
-msgid "Objection!"
-msgstr ""
-
-#: ../discord_rich_presence.cpp:41
-msgctxt "Discord|"
-msgid "In Lobby"
-msgstr ""
-
-#: ../discord_rich_presence.cpp:42
-msgctxt "Discord|"
-msgid "Idle"
-msgstr ""
-
-#: ../discord_rich_presence.cpp:58
-msgctxt "Discord|"
-msgid "In a Server"
-msgstr ""
-
-#: ../discord_rich_presence.cpp:73
-#, qt-format
-msgctxt "Discord|"
-msgid "Playing as %1"
-msgstr ""
-
-#: ../discord_rich_presence.cpp:104
-msgctxt "Discord|"
-msgid "Spectating"
-msgstr ""
-
-#: ../lobby.cpp:15
-msgctxt "Lobby|"
-msgid "Attorney Online 2"
-msgstr ""
-
-#: ../lobby.cpp:31
-msgctxt "Lobby|"
-msgid "Name"
-msgstr ""
-
-#: ../lobby.cpp:71
-msgctxt "Lobby|"
-msgid ""
-"It doesn't look like your client is set up correctly.\n"
-"Did you download all resources correctly from tiny.cc/getao, including the "
-"large 'base' folder?"
-msgstr ""
-
-#: ../lobby.cpp:144
-msgctxt "Lobby|"
-msgid "Loading"
-msgstr ""
-
-#: ../lobby.cpp:148
-msgctxt "Lobby|"
-msgid "Cancel"
-msgstr ""
-
-#: ../lobby.cpp:267
-msgctxt "Lobby|"
-msgid ""
-"Attorney Online 2 is built using Qt 5.11.\n"
-"\n"
-"Lead development:\n"
-"longbyte1\n"
-"OmniTroid\n"
-"\n"
-"stonedDiscord\n"
-"Supporting development:\n"
-"Fiercy\n"
-"\n"
-"UI design:\n"
-"Ruekasu\n"
-"Draxirch\n"
-"\n"
-"Special thanks:\n"
-"Unishred\n"
-"Argoneus\n"
-"Noevain\n"
-"Cronnicossy"
-msgstr ""
-
-#: ../lobby.cpp:315
-msgctxt "Lobby|"
-msgid "Offline"
-msgstr ""
-
-#: ../debug_functions.cpp:10
-#, qt-format
-msgctxt "debug_functions|"
-msgid "Error: %1"
-msgstr ""
-
-#: ../debug_functions.cpp:11
-msgctxt "debug_functions|"
-msgid "Error"
-msgstr ""
-
-#: ../debug_functions.cpp:23
-msgctxt "debug_functions|"
-msgid "Notice"
-msgstr ""
diff --git a/translations/ao_en.qm b/translations/ao_en.qm
new file mode 100644
index 0000000..9dad8df
Binary files /dev/null and b/translations/ao_en.qm differ
diff --git a/translations/ao_ja.pot b/translations/ao_ja.pot
deleted file mode 100644
index 52ae792..0000000
--- a/translations/ao_ja.pot
+++ /dev/null
@@ -1,330 +0,0 @@
-msgid ""
-msgstr ""
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Language: ja_JP\n"
-"X-Qt-Contexts: true\n"
-
-#: ../aoapplication.cpp:133
-msgctxt "AOApplication|"
-msgid "Disconnected from server."
-msgstr ""
-
-#: ../aoapplication.cpp:157
-#, qt-format
-msgctxt "AOApplication|"
-msgid "Error connecting to master server. Will try again in %n seconds."
-msgstr ""
-
-#: ../aoapplication.cpp:162
-msgctxt "AOApplication|"
-msgid ""
-"There was an error connecting to the master server.\n"
-"We deploy multiple master servers to mitigate any possible downtime, but the "
-"client appears to have exhausted all possible methods of finding and "
-"connecting to one.\n"
-"Please check your Internet connection and firewall, and please try again."
-msgstr ""
-
-#: ../packet_distribution.cpp:107
-#, qt-format
-msgctxt "AOApplication|"
-msgid ""
-"Outdated version! Your version: %1\n"
-"Please go to aceattorneyonline.com to update."
-msgstr ""
-
-#: ../packet_distribution.cpp:115
-msgctxt "AOApplication|"
-msgid ""
-"You have been exiled from AO.\n"
-"Have a nice day."
-msgstr ""
-
-#: ../packet_distribution.cpp:228
-msgctxt "AOApplication|"
-msgid "Attorney Online 2"
-msgstr ""
-
-#: ../packet_distribution.cpp:254
-msgctxt "AOApplication|"
-msgid "Loading"
-msgstr ""
-
-#: ../packet_distribution.cpp:341
-#, qt-format
-msgctxt "AOApplication|"
-msgid ""
-"Loading evidence:\n"
-"%1/%2"
-msgstr ""
-
-#: ../packet_distribution.cpp:370 ../packet_distribution.cpp:435
-#, qt-format
-msgctxt "AOApplication|"
-msgid ""
-"Loading music:\n"
-"%1/%2"
-msgstr ""
-
-#: ../packet_distribution.cpp:415
-#, qt-format
-msgctxt "AOApplication|"
-msgid ""
-"Loading chars:\n"
-"%1/%2"
-msgstr ""
-
-#: ../packet_distribution.cpp:548
-msgctxt "AOApplication|"
-msgid "You have been kicked."
-msgstr ""
-
-#: ../packet_distribution.cpp:561
-msgctxt "AOApplication|"
-msgid "You are banned on this server."
-msgstr ""
-
-#: ../charselect.cpp:27
-msgctxt "Courtroom|"
-msgid "Spectator"
-msgstr ""
-
-#: ../charselect.cpp:149
-#, qt-format
-msgctxt "Courtroom|"
-msgid "Could not find %1"
-msgstr ""
-
-#: ../courtroom.cpp:111
-msgctxt "Courtroom|"
-msgid "Name"
-msgstr ""
-
-#: ../courtroom.cpp:152 ../courtroom.cpp:460
-msgctxt "Courtroom|"
-msgid "Pre"
-msgstr ""
-
-#: ../courtroom.cpp:154
-msgctxt "Courtroom|"
-msgid "Flip"
-msgstr ""
-
-#: ../courtroom.cpp:157
-msgctxt "Courtroom|"
-msgid "Guard"
-msgstr ""
-
-#: ../courtroom.cpp:171
-msgctxt "Courtroom|"
-msgid "White"
-msgstr ""
-
-#: ../courtroom.cpp:172
-msgctxt "Courtroom|"
-msgid "Green"
-msgstr ""
-
-#: ../courtroom.cpp:173
-msgctxt "Courtroom|"
-msgid "Red"
-msgstr ""
-
-#: ../courtroom.cpp:174
-msgctxt "Courtroom|"
-msgid "Orange"
-msgstr ""
-
-#: ../courtroom.cpp:175
-msgctxt "Courtroom|"
-msgid "Blue"
-msgstr ""
-
-#: ../courtroom.cpp:177
-msgctxt "Courtroom|"
-msgid "Yellow"
-msgstr ""
-
-#: ../courtroom.cpp:429
-msgctxt "Courtroom|"
-msgid "Music"
-msgstr ""
-
-#: ../courtroom.cpp:431
-msgctxt "Courtroom|"
-msgid "Sfx"
-msgstr ""
-
-#: ../courtroom.cpp:433
-msgctxt "Courtroom|"
-msgid "Blips"
-msgstr ""
-
-#: ../courtroom.cpp:443 ../courtroom.cpp:1656
-msgctxt "Courtroom|"
-msgid "Server"
-msgstr ""
-
-#: ../courtroom.cpp:451
-msgctxt "Courtroom|"
-msgid "Change character"
-msgstr ""
-
-#: ../courtroom.cpp:454
-msgctxt "Courtroom|"
-msgid "Reload theme"
-msgstr ""
-
-#: ../courtroom.cpp:457
-msgctxt "Courtroom|"
-msgid "Call mod"
-msgstr ""
-
-#: ../courtroom.cpp:531
-msgctxt "Courtroom|"
-msgid "Back to Lobby"
-msgstr ""
-
-#: ../courtroom.cpp:1508
-msgctxt "Courtroom|"
-msgid "You have been banned."
-msgstr ""
-
-#: ../courtroom.cpp:1534
-#, qt-format
-msgctxt "Courtroom|"
-msgid "%1 has played a song: %2"
-msgstr ""
-
-#: ../courtroom.cpp:1620
-msgctxt "Courtroom|"
-msgid "Rainbow"
-msgstr ""
-
-#: ../courtroom.cpp:1648
-msgctxt "Courtroom|"
-msgid "Master"
-msgstr ""
-
-#: ../evidence.cpp:28
-msgctxt "Courtroom|"
-msgid "Choose.."
-msgstr ""
-
-#: ../evidence.cpp:196
-msgctxt "Courtroom|"
-msgid "Images (*.png)"
-msgstr ""
-
-#: ../evidence.cpp:275
-msgctxt "Courtroom|"
-msgid "Add new evidence..."
-msgstr ""
-
-#: ../discord_rich_presence.cpp:38 ../discord_rich_presence.cpp:53
-#: ../discord_rich_presence.cpp:79 ../discord_rich_presence.cpp:98
-msgctxt "Discord|"
-msgid "Objection!"
-msgstr ""
-
-#: ../discord_rich_presence.cpp:41
-msgctxt "Discord|"
-msgid "In Lobby"
-msgstr ""
-
-#: ../discord_rich_presence.cpp:42
-msgctxt "Discord|"
-msgid "Idle"
-msgstr ""
-
-#: ../discord_rich_presence.cpp:58
-msgctxt "Discord|"
-msgid "In a Server"
-msgstr ""
-
-#: ../discord_rich_presence.cpp:73
-#, qt-format
-msgctxt "Discord|"
-msgid "Playing as %1"
-msgstr ""
-
-#: ../discord_rich_presence.cpp:104
-msgctxt "Discord|"
-msgid "Spectating"
-msgstr ""
-
-#: ../lobby.cpp:15
-msgctxt "Lobby|"
-msgid "Attorney Online 2"
-msgstr ""
-
-#: ../lobby.cpp:31
-msgctxt "Lobby|"
-msgid "Name"
-msgstr ""
-
-#: ../lobby.cpp:71
-msgctxt "Lobby|"
-msgid ""
-"It doesn't look like your client is set up correctly.\n"
-"Did you download all resources correctly from tiny.cc/getao, including the "
-"large 'base' folder?"
-msgstr ""
-
-#: ../lobby.cpp:144
-msgctxt "Lobby|"
-msgid "Loading"
-msgstr ""
-
-#: ../lobby.cpp:148
-msgctxt "Lobby|"
-msgid "Cancel"
-msgstr ""
-
-#: ../lobby.cpp:267
-msgctxt "Lobby|"
-msgid ""
-"Attorney Online 2 is built using Qt 5.11.\n"
-"\n"
-"Lead development:\n"
-"longbyte1\n"
-"OmniTroid\n"
-"\n"
-"stonedDiscord\n"
-"Supporting development:\n"
-"Fiercy\n"
-"\n"
-"UI design:\n"
-"Ruekasu\n"
-"Draxirch\n"
-"\n"
-"Special thanks:\n"
-"Unishred\n"
-"Argoneus\n"
-"Noevain\n"
-"Cronnicossy"
-msgstr ""
-
-#: ../lobby.cpp:315
-msgctxt "Lobby|"
-msgid "Offline"
-msgstr ""
-
-#: ../debug_functions.cpp:10
-#, qt-format
-msgctxt "debug_functions|"
-msgid "Error: %1"
-msgstr ""
-
-#: ../debug_functions.cpp:11
-msgctxt "debug_functions|"
-msgid "Error"
-msgstr ""
-
-#: ../debug_functions.cpp:23
-msgctxt "debug_functions|"
-msgid "Notice"
-msgstr ""
diff --git a/translations/ao_ja.qm b/translations/ao_ja.qm
new file mode 100644
index 0000000..be651ee
--- /dev/null
+++ b/translations/ao_ja.qm
@@ -0,0 +1 @@
+<¸dÊÍ!¿`¡½Ý
\ No newline at end of file