diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8b140281f..8ddf03e9d 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -227,151 +227,145 @@
             android:label="@string/app_name"
             android:theme="@style/Theme.Tachiyomi"
             android:exported="true">
+            <!-- E-Hentai -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <!-- EH -->
-                <data
-                    android:host="g.e-hentai.org"
-                    android:pathPrefix="/g/"
-                    android:scheme="http" />
-                <data
-                    android:host="g.e-hentai.org"
-                    android:pathPrefix="/g/"
-                    android:scheme="https" />
-                <data
-                    android:host="e-hentai.org"
-                    android:pathPrefix="/g/"
-                    android:scheme="http" />
-                <data
-                    android:host="e-hentai.org"
-                    android:pathPrefix="/g/"
-                    android:scheme="https" />
+                <data android:scheme="https" />
+                <data android:scheme="http" />
 
-                <!-- EXH -->
-                <data
-                    android:host="exhentai.org"
-                    android:pathPrefix="/g/"
-                    android:scheme="http" />
-                <data
-                    android:host="exhentai.org"
-                    android:pathPrefix="/g/"
-                    android:scheme="https" />
+                <data android:host="e-hentai.org" />
+                <data android:host="www.e-hentai.org" />
+                <data android:host="g.e-hentai.org" />
 
-                <!-- nhentai -->
-                <data
-                    android:host="nhentai.net"
-                    android:pathPrefix="/g/"
-                    android:scheme="http" />
-                <data
-                    android:host="nhentai.net"
-                    android:pathPrefix="/g/"
-                    android:scheme="https" />
+                <data android:pathPattern="/g/..*" />
+            </intent-filter>
+            <!-- ExHentai -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
 
-                <!-- Perv Eden -->
-                <data
-                    android:host="www.perveden.com"
-                    android:pathPattern="/.*/.*-manga/.*"
-                    android:scheme="http" />
-                <data
-                    android:host="www.perveden.com"
-                    android:pathPattern="/.*/.*-manga/.*"
-                    android:scheme="https" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
-                <!-- Hentai Cafe -->
-                <data
-                    android:host="hentai.cafe"
-                    android:pathPrefix="/hc.fyi/"
-                    android:scheme="http" />
-                <data
-                    android:host="hentai.cafe"
-                    android:pathPrefix="/hc.fyi/"
-                    android:scheme="https" />
+                <data android:scheme="https" />
+                <data android:scheme="http" />
 
-                <!-- Tsumino -->
-                <data
-                    android:host="www.tsumino.com"
-                    android:pathPrefix="/Book/Info/"
-                    android:scheme="http" />
-                <data
-                    android:host="www.tsumino.com"
-                    android:pathPrefix="/Book/Info/"
-                    android:scheme="https" />
-                <data
-                    android:host="www.tsumino.com"
-                    android:pathPrefix="/Read/View/"
-                    android:scheme="http" />
-                <data
-                    android:host="www.tsumino.com"
-                    android:pathPrefix="/Read/View/"
-                    android:scheme="https" />
+                <data android:host="exhentai.org" />
+                <data android:host="www.exhentai.org" />
 
-                 <!-- Hitomi.la -->
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/galleries/"
-                    android:scheme="http" />
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/reader/"
-                    android:scheme="http" />
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/galleries/"
-                    android:scheme="https" />
-                <data
-                    android:host="hitomi.la"
-                    android:pathPrefix="/reader/"
-                    android:scheme="https" />
+                <data android:pathPattern="/g/..*" />
+            </intent-filter>
+            <!-- NHentai -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
 
-                <!-- Pururin.io -->
-                <data
-                    android:host="pururin.io"
-                    android:pathPrefix="/gallery/"
-                    android:scheme="http" />
-                <data
-                    android:host="pururin.io"
-                    android:pathPrefix="/gallery/"
-                    android:scheme="https" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
-                <!-- HBrowse -->
-                <data
-                    android:host="www.hbrowse.com"
-                    android:scheme="http" />
-                <data
-                    android:host="www.hbrowse.com"
-                    android:scheme="https" />
+                <data android:scheme="https" />
+                <data android:scheme="http" />
 
-                <!-- MangaDex -->
-                <data
-                    android:scheme="https"
-                    android:host="www.mangadex.org"
-                    android:pathPrefix="/manga/" />
-                <data
-                    android:scheme="https"
-                    android:host="mangadex.org"
-                    android:pathPrefix="/manga/" />
+                <data android:host="nhentai.net" />
+                <data android:host="www.nhentai.net" />
 
-                <data
-                    android:scheme="https"
-                    android:host="www.mangadex.org"
-                    android:pathPrefix="/title/" />
-                <data
-                    android:scheme="https"
-                    android:host="mangadex.org"
-                    android:pathPrefix="/title/" />
+                <data android:pathPattern="/g/..*" />
+            </intent-filter>
+            <!-- Perv Eden -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
 
-                <data
-                    android:scheme="https"
-                    android:host="www.mangadex.org"
-                    android:pathPrefix="/chapter/" />
-                <data
-                    android:scheme="https"
-                    android:host="mangadex.org"
-                    android:pathPrefix="/chapter/" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:scheme="http" />
+
+                <data android:host="perveden.com" />
+                <data android:host="www.perveden.com" />
+
+                <data android:pathPattern="/.*/.*-manga/.*" />
+            </intent-filter>
+            <!-- Tsumino -->
+            <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" />
+                <data android:scheme="http" />
+
+                <data android:host="tsumino.com" />
+                <data android:host="www.tsumino.com" />
+
+                <data android:pathPattern="/Read/View/..*" />
+                <data android:pathPattern="/Book/Info/..*" />
+            </intent-filter>
+            <!-- Hitomi.la -->
+            <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" />
+                <data android:scheme="http" />
+
+                <data android:host="hitomi.la" />
+                <data android:host="www.hitomi.la" />
+
+                <data android:pathPattern="/reader/..*" />
+                <data android:pathPattern="/galleries/..*" />
+            </intent-filter>
+            <!-- Pururin -->
+            <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" />
+                <data android:scheme="http" />
+
+                <data android:host="pururin.io" />
+
+                <data android:pathPattern="/gallery/..*" />
+            </intent-filter>
+            <!-- HBrowse -->
+            <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" />
+                <data android:scheme="http" />
+
+                <data android:host="hbrowse.com" />
+                <data android:host="www.hbrowse.com" />
+
+                <!--<data android:pathPattern="/gallery/..*" />-->
+            </intent-filter>
+            <!-- Mangadex -->
+            <intent-filter android:autoVerify="true">
+                <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" />
+
+                <data android:host="mangadex.org" />
+                <data android:host="mangadex.cc" />
+                <data android:host="www.mangadex.org" />
+                <data android:host="www.mangadex.cc" />
+
+                <data android:pathPattern="/manga/..*" />
+                <data android:pathPattern="/title/..*" />
+                <data android:pathPattern="/chapter/..*" />
             </intent-filter>
         </activity>
         <activity