diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp
index e69de29bb2..9a34e040f2 100644
--- a/UI/GameScreen.cpp
+++ b/UI/GameScreen.cpp
@@ -0,0 +1,18 @@
+// Copyright (c) 2013- PPSSPP Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0 or later versions.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official git repository and contact information can be found at
+// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
+
+#include "UI/GameScreen.h"
\ No newline at end of file
diff --git a/UI/GameScreen.h b/UI/GameScreen.h
index 2bd9490501..b7aeb7926d 100644
--- a/UI/GameScreen.h
+++ b/UI/GameScreen.h
@@ -1,4 +1,20 @@
+// Copyright (c) 2013- PPSSPP Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0 or later versions.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official git repository and contact information can be found at
+// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
+
 #pragma once
 
-
 // Game screen: Contains options such as 
\ No newline at end of file
diff --git a/UI/PluginScreen.cpp b/UI/PluginScreen.cpp
index 1a4bc77682..4219ec4076 100644
--- a/UI/PluginScreen.cpp
+++ b/UI/PluginScreen.cpp
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include "base/functional.h"
 #include "UI/PluginScreen.h"
 #include "ext/vjson/json.h"
 #include "i18n/i18n.h"
@@ -81,20 +82,8 @@ void PluginScreen::update(InputState &input) {
 		JsonReader reader(json.data(), json.size());
 		reader.parse();
 		const json_value *root = reader.root();
-#if 0
-#if defined(_M_IX86) && defined(_WIN32)
-		at3plusdecoder_ = downloader_.StartDownload(root->getString("Win32"), "D:\at3.dll");
-#elif defined(_M_X64) && defined(_WIN32)
-		at3plusdecoder_ = downloader_.StartDownload(root->getString("Win64"), "D:\at364.dll");
-#elif defined(ARMEABI)
-		at3plusdecoder_ = downloader_.StartDownload(root->getString("armeabi"), "D:\at364.so");
-#elif defined(ARMEABI_V7A)
-		at3plusdecoder_ = downloader_.StartDownload(root->getString("armeabi-v7a"), "D:\at364.so");
-#else
-		// No decoder available for this arch
-		// #error Unable to identify architecture
-#endif
-#endif
+
+		std::string destination = Atrac3plus_Decoder::GetInstalledFilename();
 
 		json_.reset();
 	}
@@ -109,6 +98,22 @@ void PluginScreen::update(InputState &input) {
 
 UI::EventReturn PluginScreen::OnDownload(UI::EventParams &e) {
 	buttonDownload_->SetEnabled(false);
+
+#if 0
+#if defined(_M_IX86) && defined(_WIN32)
+	at3plusdecoder_ = downloader_.StartDownload(root->getString("Win32"), destination);
+#elif defined(_M_X64) && defined(_WIN32)
+	at3plusdecoder_ = downloader_.StartDownload(root->getString("Win64"), destination);
+#elif defined(ARMEABI)
+	at3plusdecoder_ = downloader_.StartDownload(root->getString("armeabi"), destination);
+#elif defined(ARMEABI_V7A)
+	at3plusdecoder_ = downloader_.StartDownload(root->getString("armeabi-v7a"), destination);
+#else
+	// No decoder available for this arch
+	// #error Unable to identify architecture
+#endif
+#endif
+
 	return UI::EVENT_DONE;
 }
 
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index bfb1118598..14b88259cd 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -136,6 +136,7 @@ LOCAL_SRC_FILES := \
   $(SRC)/UI/GamepadEmu.cpp \
   $(SRC)/UI/GameInfoCache.cpp \
   $(SRC)/UI/OnScreenDisplay.cpp \
+  $(SRC)/UI/PluginScreen.cpp \
   $(SRC)/native/android/app-android.cpp \
   $(SRC)/ext/disarm.cpp \
   $(SRC)/ext/libkirk/AES.c \