diff --git a/AntiAbusePorn.txt b/AntiAbusePorn.txt
index 5cdd06c7f..3123e1419 100644
--- a/AntiAbusePorn.txt
+++ b/AntiAbusePorn.txt
@@ -1,46 +1,46 @@
 [Adblock Plus 3.2]
 ! Title: 🤗 Anti-'Abuse porn' list
-! Version: 21April2019v1-Alpha
+! Version: 29April2019v1-Alpha
 ! Description: Pixiv is an East Asian artsite, whose on-average art quality wipes the floor with DeviantArt. It also allows porn of many types. Pressure on "many". So say that you're looking for imagery of consensual and pleasurable sex, and then you stumble across a crying Daniel Tiger with a corset being strapped to a bench in a diaper? Now such scenarios won't occur nearly as often as they did before!
 ! This list currently deals with: Excessive bondage, uncomfortable bondage, rubber dolls, slaves, physical abuse, fluid-based abuse, breathplay, diapers.
 ! Other websites are also eligible for this list, but it'd depend almost entirely on user contributions. I am not a brave soul, you see. A few entries for rule34.xxx have however been added.
 
-! Search results
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains( bondage))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(Slave ))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains( slaves))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(-slave ))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(/Bedwet/i))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(/Bitchsuit/i))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(blazeheart))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(Jacketfreak))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(Justwhynot))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(KinkyDept))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(NotAShiny))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(/rubber doll/i))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(/Rubber slave/i))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(ToniBabelony))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(TheBunnyBoy))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(おむつ))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(お尻責め))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(どてらまん))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(なおモト))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(スパンキング))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(ノースカロライナパワー+G))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(ボンデージ))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(リブレスバッグ))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(呼吸乱交))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(呼吸交換プレイ))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(拘束衣))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(球頭))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(赤倉))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(阿★凡))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(SCAT))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(Scat):not(:-abp-contains(Scatman)))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(ノースカロライナパワー+G))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(/Torture/i))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(vhsephi_yaga))
-pixiv.net#?#section[id^="js-react-"] > div > div:-abp-has(figure[style^="width: 200px; "]:-abp-contains(Orchid in Detention))
+! Search results and «Discovery» page
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains( bondage))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(Slave ))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains( slaves))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(-slave ))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(/Bedwet/i))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(/Bitchsuit/i))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(blazeheart))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(Jacketfreak))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(Justwhynot))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(KinkyDept))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(NotAShiny))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(/rubber doll/i))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(/Rubber slave/i))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(ToniBabelony))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(TheBunnyBoy))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(おむつ))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(お尻責め))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(どてらまん))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(なおモト))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(スパンキング))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(ノースカロライナパワー+G))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(ボンデージ))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(リブレスバッグ))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(呼吸乱交))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(呼吸交換プレイ))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(拘束衣))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(球頭))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(赤倉))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(阿★凡))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(SCAT))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(Scat):not(:-abp-contains(Scatman)))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(ノースカロライナパワー+G))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(/Torture/i))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(vhsephi_yaga))
+pixiv.net#?#div:-abp-has(:scope > figure > figcaption:-abp-contains(Orchid in Detention))
 ! Suggestions on image pages
 pixiv.net#?#li:not([class*="level"]):not(.SXucpBq):-abp-has(a[href*="mode=medium"]):-abp-contains( bondage)
 pixiv.net#?#li:not([class*="level"]):not(.SXucpBq):-abp-has(a[href*="mode=medium"]):-abp-contains(Slave )
@@ -77,78 +77,42 @@ pixiv.net#?#li:not([class*="level"]):not(.SXucpBq):-abp-has(a[href*="mode=medium
 pixiv.net#?#li:not([class*="level"]):not(.SXucpBq):-abp-has(a[href*="mode=medium"]):-abp-contains(/Torture/i)
 pixiv.net#?#li:not([class*="level"]):not(.SXucpBq):-abp-has(a[href*="mode=medium"]):-abp-contains(vhsephi_yaga)
 pixiv.net#?#li:not([class*="level"]):not(.SXucpBq):-abp-has(a[href*="mode=medium"]):-abp-contains(Orchid in Detention)
-! Smartphone browser homepage
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains( bondage))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(Slave ))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains( slaves))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(-slave ))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(/Bedwet/i))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(/Bitchsuit/i))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(blazeheart))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(Jacketfreak))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(Justwhynot))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(KinkyDept))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(NotAShiny))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(/rubber doll/i))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(/Rubber slave/i))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(ToniBabelony))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(TheBunnyBoy))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(おむつ))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(お尻責め))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(どてらまん))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(なおモト))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(スパンキング))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(ノースカロライナパワー+G))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(ボンデージ))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(リブレスバッグ))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(呼吸乱交))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(呼吸交換プレイ))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(拘束衣))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(球頭))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(赤倉))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(阿★凡))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(SCAT))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(Scat):not(:-abp-contains(Scatman)))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(ノースカロライナパワー+G))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(/Torture/i))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(vhsephi_yaga))
-pixiv.net#?#li[id*=il]:-abp-has(a:-abp-contains(Orchid in Detention))
-! «Discovery» page
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains( bondage))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(Slave ))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains( slaves))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(-slave ))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(/Bedwet/i))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(/Bitchsuit/i))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(blazeheart))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(Jacketfreak))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(Justwhynot))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(KinkyDept))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(NotAShiny))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(/rubber doll/i))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(/Rubber slave/i))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(ToniBabelony))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(TheBunnyBoy))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(おむつ))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(お尻責め))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(どてらまん))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(なおモト))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(スパンキング))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(ノースカロライナパワー+G))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(ボンデージ))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(リブレスバッグ))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(呼吸乱交))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(呼吸交換プレイ))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(拘束衣))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(球頭))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(赤倉))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(阿★凡))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(SCAT))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(Scat):not(:-abp-contains(Scatman)))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(ノースカロライナパワー+G))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(/Torture/i))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(vhsephi_yaga))
-pixiv.net#?#div[class^="gtm-illust-"] > div:-abp-has(figure > figcaption:-abp-contains(Orchid in Detention))
+! Smartphone browser mode
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*=" bondage"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="Slave "])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*=" slaves"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="-slave "])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="/Bedwet/i"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="/Bitchsuit/i"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="blazeheart"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="Jacketfreak"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="Justwhynot"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="KinkyDept"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="NotAShiny"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="/rubber doll/i"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="/Rubber slave/i"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="ToniBabelony"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="TheBunnyBoy"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="おむつ"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="お尻責め"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="どてらまん"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="なおモト"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="スパンキング"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="ノースカロライナパワー+G"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="ボンデージ"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="リブレスバッグ"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="呼吸乱交"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="呼吸交換プレイ"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="拘束衣"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="球頭"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="赤倉"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="阿★凡"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="SCAT"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="Scat]:not([alt*="Scatman"]))
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="ノースカロライナパワー+G"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="/Torture/i"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="vhsephi_yaga"])
+pixiv.net#?#div[class="thumbnail"]:-abp-has(:scope > img[alt*="Orchid in Detention"])
 ! Other
 ||i.pximg.net/c/240x240/img-master/img/2018/05/27/09/32/38/68941772_p0_master1200.jpg^
 ||i.pximg.net/c/240x240/img-master/img/2018/05/27/09/47/26/68941922_p0_master1200.jpg^