diff --git a/assets/shared.qrc b/assets/shared.qrc
index a7cd388..4d8ed66 100644
--- a/assets/shared.qrc
+++ b/assets/shared.qrc
@@ -1,11 +1,3 @@
 <RCC>
-    <qresource prefix="/">
-        <file alias="fonts/TitilliumWeb-Bold.ttf">shared/fonts/TitilliumWeb-Bold.ttf</file>
-        <file alias="fonts/TitilliumWeb-Italic.ttf">shared/fonts/TitilliumWeb-Italic.ttf</file>
-        <file alias="fonts/TitilliumWeb-Regular.ttf">shared/fonts/TitilliumWeb-Regular.ttf</file>
-        <file alias="fonts/fontawesome-webfont.ttf">shared/fonts/fontawesome-webfont.ttf</file>
-        <file alias="qml/controls/TvRemoteInputArea.qml">shared/qml/TvRemoteInputArea.qml</file>
-        <file alias="qml/controls/TvRemoteInputMethod.qml">shared/qml/TvRemoteInputMethod.qml</file>
-        <file alias="qml/components/Time.qml">shared/qml/Time.qml</file>
-    </qresource>
+    <qresource prefix="/"/>
 </RCC>
diff --git a/plugin/plugin.qbs b/plugin/plugin.qbs
index 614731b..9f4a4e3 100644
--- a/plugin/plugin.qbs
+++ b/plugin/plugin.qbs
@@ -16,11 +16,11 @@ QtGuiApplication {
 
     Properties {
         condition: qbs.targetOS.contains("android")
-        architectures: !qbs.architecture ? ["x86", "armv7a"] : undefined
+        qbs.architectures: !qbs.architecture ? ["x86", "armv7a"] : undefined
         Android.ndk.appStl: "gnustl_shared"
     }
 
-    architectures: undefined
+    qbs.architectures: undefined
 
     files: [
         "Info.plist",
diff --git a/ui/android/AndroidManifest.xml b/ui/android/AndroidManifest.xml
index 267dbcf..b7c4541 100644
--- a/ui/android/AndroidManifest.xml
+++ b/ui/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.qtproject.qttv" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
+<manifest package="io.qt.stbdemo" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Qt TV">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="Qt TV" android:screenOrientation="landscape" android:launchMode="singleTop">
             <intent-filter>
@@ -27,9 +27,11 @@
             <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
             <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
             <!--  Messages maps -->
+            <!--
             <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
             <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
             <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
+            -->
             <!--  Messages maps -->
 
             <!-- Splash screen -->
diff --git a/ui/ui.qbs b/ui/ui.qbs
index 43eaa22..d92a472 100644
--- a/ui/ui.qbs
+++ b/ui/ui.qbs
@@ -9,6 +9,7 @@ Project {
         name: "qt-tv"
         packageName: "io.qt.stbdemo"
         targetName: "qt-tv"
+        resourcesDir: FileInfo.joinPaths(sourceDirectory, "android", "res")
         Depends {
             productTypes: ["android.nativelibrary"]
             limitToSubProject: true
@@ -29,11 +30,11 @@ Project {
 
         Properties {
             condition: qbs.targetOS.contains("android")
-            architectures: !qbs.architecture ? ["x86", "armv7a"] : undefined
+            qbs.architectures: !qbs.architecture ? ["x86", "armv7a"] : undefined
             Android.ndk.appStl: "gnustl_shared"
         }
 
-        architectures: undefined
+        qbs.architectures: undefined
         cpp.minimumIosVersion: "8.0"
         cpp.cxxLanguageVersion: "c++11"
         cpp.rpaths: qbs.targetOS.contains("darwin") ? ["@loader_path/../Frameworks"] : undefined