diff --git a/src/all/ehentai/AndroidManifest.xml b/src/all/ehentai/AndroidManifest.xml
index 4738b4802..65f41e2df 100644
--- a/src/all/ehentai/AndroidManifest.xml
+++ b/src/all/ehentai/AndroidManifest.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
     <application>
         <activity
-            android:name=".EHUrlActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true">
+            android:name=".all.ehentai.EHUrlActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
-                    android:scheme="https"
                     android:host="e-hentai.org"
-                    android:pathPattern="/g/..*/..*" />
+                    android:pathPattern="/g/..*/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
diff --git a/src/all/hitomi/AndroidManifest.xml b/src/all/hitomi/AndroidManifest.xml
index fa3931511..a7c4ada40 100644
--- a/src/all/hitomi/AndroidManifest.xml
+++ b/src/all/hitomi/AndroidManifest.xml
@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
     <application>
         <activity
-            android:name=".HitomiActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true">
+            android:name=".all.hitomi.HitomiActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="https"
-                      android:host="hitomi.la"
-                      android:pathPattern="/cg/..*"/>
+
+                <data
+                    android:host="hitomi.la"
+                    android:pathPattern="/cg/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
diff --git a/src/all/mangadex/AndroidManifest.xml b/src/all/mangadex/AndroidManifest.xml
index a0f7f73f5..d7b6f4f5a 100644
--- a/src/all/mangadex/AndroidManifest.xml
+++ b/src/all/mangadex/AndroidManifest.xml
@@ -1,30 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
     <application>
         <activity
-            android:name=".MangadexUrlActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true">
+            android:name=".all.mangadex.MangadexUrlActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
-                    android:scheme="https"
                     android:host="mangadex.org"
-                    android:pathPattern="/title/..*" />
+                    android:pathPattern="/title/..*"
+                    android:scheme="https" />
                 <data
-                    android:scheme="https"
                     android:host="www.mangadex.org"
-                    android:pathPattern="/title/..*" />
+                    android:pathPattern="/title/..*"
+                    android:scheme="https" />
                 <data
-                    android:scheme="https"
                     android:host="mangadex.org"
-                    android:pathPattern="/manga/..*" />
+                    android:pathPattern="/manga/..*"
+                    android:scheme="https" />
                 <data
-                    android:scheme="https"
                     android:host="www.mangadex.org"
-                    android:pathPattern="/manga/..*" />
+                    android:pathPattern="/manga/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
diff --git a/src/all/mangadventure/AndroidManifest.xml b/src/all/mangadventure/AndroidManifest.xml
index 44d302c6d..4f5e7d589 100644
--- a/src/all/mangadventure/AndroidManifest.xml
+++ b/src/all/mangadventure/AndroidManifest.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
 
-  <application>
-    <activity
-        android:name=".MangAdventureActivity"
-        android:theme="@android:style/Theme.NoDisplay"
-        android:excludeFromRecents="true">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
+    <application>
+        <activity
+            android:name=".all.mangadventure.MangAdventureActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
 
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
-        <!-- MangAdventure sites can be added here. -->
-        <data
-            android:scheme="https"
-            android:host="arc-relight.com"
-            android:pathPattern="/reader/..*"/>
-        <data
-            android:scheme="https"
-            android:host="reader.decadencescans.com"
-            android:pathPattern="/reader/..*"/>
-      </intent-filter>
-    </activity>
-  </application>
+                <!-- MangAdventure sites can be added here. -->
+                <data
+                    android:host="arc-relight.com"
+                    android:pathPattern="/reader/..*"
+                    android:scheme="https" />
+                <data
+                    android:host="reader.decadencescans.com"
+                    android:pathPattern="/reader/..*"
+                    android:scheme="https" />
+            </intent-filter>
+        </activity>
+    </application>
 </manifest>
diff --git a/src/all/nhentai/AndroidManifest.xml b/src/all/nhentai/AndroidManifest.xml
index b6d9a9e5a..294d8050f 100644
--- a/src/all/nhentai/AndroidManifest.xml
+++ b/src/all/nhentai/AndroidManifest.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
     <application>
         <activity
-            android:name=".NHUrlActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true">
+            android:name=".all.nhentai.NHUrlActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
-                    android:scheme="https"
                     android:host="nhentai.net"
-                    android:pathPattern="/g/..*" />
+                    android:pathPattern="/g/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
diff --git a/src/en/guya/AndroidManifest.xml b/src/en/guya/AndroidManifest.xml
index eaf3e7084..8261486a9 100644
--- a/src/en/guya/AndroidManifest.xml
+++ b/src/en/guya/AndroidManifest.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
     <application>
         <activity
-                android:name=".GuyaUrlActivity"
-                android:theme="@android:style/Theme.NoDisplay"
-                android:excludeFromRecents="true">
+            android:name=".en.guya.GuyaUrlActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
-                        android:scheme="https"
-                        android:host="guya.moe"
-                        android:pathPattern="/read/manga/..*" />
+                    android:host="guya.moe"
+                    android:pathPattern="/read/manga/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
diff --git a/src/en/hentai2read/AndroidManifest.xml b/src/en/hentai2read/AndroidManifest.xml
index 392cfc103..a0c116d9e 100644
--- a/src/en/hentai2read/AndroidManifest.xml
+++ b/src/en/hentai2read/AndroidManifest.xml
@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
     <application>
         <activity
-            android:name=".Hentai2ReadActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true">
+            android:name=".en.hentai2read.Hentai2ReadActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="https"
-                      android:host="hentai2read.com"
-                      android:pathPattern="/..*"/>
+
+                <data
+                    android:host="hentai2read.com"
+                    android:pathPattern="/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
diff --git a/src/en/myhentaigallery/AndroidManifest.xml b/src/en/myhentaigallery/AndroidManifest.xml
index e51e30ee5..6e4d8d6aa 100644
--- a/src/en/myhentaigallery/AndroidManifest.xml
+++ b/src/en/myhentaigallery/AndroidManifest.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
     <application>
         <activity
-            android:name=".MyHentaiGalleryUrlActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true">
+            android:name=".en.myhentaigallery.MyHentaiGalleryUrlActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
-                    android:scheme="https"
                     android:host="myhentaigallery.com"
-                    android:pathPattern="/gallery/thumbnails/..*" />
+                    android:pathPattern="/gallery/thumbnails/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
diff --git a/src/en/naniscans/AndroidManifest.xml b/src/en/naniscans/AndroidManifest.xml
index a40e98075..16997e31e 100644
--- a/src/en/naniscans/AndroidManifest.xml
+++ b/src/en/naniscans/AndroidManifest.xml
@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
     <application>
         <activity
-            android:name=".NaniScansUrlActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true">
+            android:name=".en.naniscans.NaniScansUrlActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
-                    android:scheme="https"
                     android:host="naniscans.com"
-                    android:pathPattern="/titles/..*" />
+                    android:pathPattern="/titles/..*"
+                    android:scheme="https" />
                 <data
-                    android:scheme="https"
                     android:host="www.naniscans.com"
-                    android:pathPattern="/titles/..*" />
+                    android:pathPattern="/titles/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/src/en/tsumino/AndroidManifest.xml b/src/en/tsumino/AndroidManifest.xml
index ea128bfa4..920c8690f 100644
--- a/src/en/tsumino/AndroidManifest.xml
+++ b/src/en/tsumino/AndroidManifest.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
     <application>
         <activity
-            android:name=".TsuminoUrlActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true">
+            android:name=".en.tsumino.TsuminoUrlActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
-                    android:scheme="https"
                     android:host="www.tsumino.com"
-                    android:pathPattern="/entry/..*" />
+                    android:pathPattern="/entry/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
diff --git a/src/es/lectormanga/AndroidManifest.xml b/src/es/lectormanga/AndroidManifest.xml
index 857e54e0c..a19251e16 100644
--- a/src/es/lectormanga/AndroidManifest.xml
+++ b/src/es/lectormanga/AndroidManifest.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
     <application>
         <activity
-            android:name=".LectorMangaUrlActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true">
+            android:name=".es.lectormanga.LectorMangaUrlActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
-                    android:scheme="https"
                     android:host="lectormanga.com"
-                    android:pathPattern="/gotobook/..*" />
+                    android:pathPattern="/gotobook/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
diff --git a/src/es/tmohentai/AndroidManifest.xml b/src/es/tmohentai/AndroidManifest.xml
index fc4bf495e..47fe58746 100644
--- a/src/es/tmohentai/AndroidManifest.xml
+++ b/src/es/tmohentai/AndroidManifest.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
     <application>
         <activity
-            android:name=".TMOHentaiUrlActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true">
+            android:name=".es.tmohentai.TMOHentaiUrlActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
-                    android:scheme="https"
                     android:host="tmohentai.com"
-                    android:pathPattern="/contents/..*" />
+                    android:pathPattern="/contents/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
diff --git a/src/es/tumangaonline/AndroidManifest.xml b/src/es/tumangaonline/AndroidManifest.xml
index a2410ef1c..8706ffc60 100644
--- a/src/es/tumangaonline/AndroidManifest.xml
+++ b/src/es/tumangaonline/AndroidManifest.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
     <application>
         <activity
-            android:name=".TuMangaOnlineUrlActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true">
+            android:name=".es.tumangaonline.TuMangaOnlineUrlActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
-                    android:scheme="https"
                     android:host="lectortmo.com"
-                    android:pathPattern="/library/..*/..*/..*" />
+                    android:pathPattern="/library/..*/..*/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
diff --git a/src/pt/unionmangas/AndroidManifest.xml b/src/pt/unionmangas/AndroidManifest.xml
index cef4e9042..4807b6071 100644
--- a/src/pt/unionmangas/AndroidManifest.xml
+++ b/src/pt/unionmangas/AndroidManifest.xml
@@ -1,22 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
+
     <application>
         <activity
-            android:name=".UnionMangasUrlActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true">
+            android:name=".pt.unionmangas.UnionMangasUrlActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
-                    android:scheme="https"
                     android:host="unionleitor.top"
-                    android:pathPattern="/perfil-manga/..*" />
+                    android:pathPattern="/perfil-manga/..*"
+                    android:scheme="https" />
                 <data
-                    android:scheme="https"
                     android:host="unionmangas.top"
-                    android:pathPattern="/perfil-manga/..*" />
+                    android:pathPattern="/perfil-manga/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
diff --git a/src/ru/libmanga/AndroidManifest.xml b/src/ru/libmanga/AndroidManifest.xml
index ef36ba98c..b11155115 100644
--- a/src/ru/libmanga/AndroidManifest.xml
+++ b/src/ru/libmanga/AndroidManifest.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
 
     <application>
         <activity
-            android:name=".LibMangaActivity"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:excludeFromRecents="true">
+            android:name=".ru.libmanga.LibMangaActivity"
+            android:excludeFromRecents="true"
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
+                <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
                 <!-- LibMangaActivity sites can be added here. -->
                 <data
-                    android:scheme="https"
                     android:host="mangalib.me"
-                    android:pathPattern="/..*/v..*/c..*/..*"/>
+                    android:pathPattern="/..*/v..*/c..*/..*"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
     </application>
diff --git a/src/zh/manhuagui/AndroidManifest.xml b/src/zh/manhuagui/AndroidManifest.xml
index 5db873a97..ac51d458f 100644
--- a/src/zh/manhuagui/AndroidManifest.xml
+++ b/src/zh/manhuagui/AndroidManifest.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.kanade.tachiyomi.extension">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.kanade.tachiyomi.extension">
 
     <application>
         <activity
-            android:name=".ManhuaguiUrlActivity"
+            android:name=".zh.manhuagui.ManhuaguiUrlActivity"
             android:excludeFromRecents="true"
             android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>