diff --git a/.gitattributes b/.gitattributes
index 46b56d5d0..a4949d2ec 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,7 +13,15 @@ Adblock?list?template?-Hosts?and?uBlock?Origin-.txt linguist-language=hosts
 NordicFiltersHostsIPv6.txt linguist-language=hosts
 
 # AdBlock filter files
+a.txt linguist-detectable linguist-language=AdBlock
+a?—?AdGuard?Home?Miscellaneous.txt linguist-detectable linguist-language=AdBlock
+Adblock?list?template?-Beginner-.txt linguist-detectable linguist-language=AdBlock
+Adblock?list?template?-Novice-.txt linguist-detectable linguist-language=AdBlock
+AdGuardHomeCompilationList-Notifications.txt linguist-detectable linguist-language=AdBlock
+AdGuardHomeCompilationList.txt linguist-detectable linguist-language=AdBlock
+AdGuardHomeCompilationListIPs.txt linguist-detectable linguist-language=AdBlock
 AdGuardHomeDisallowedIPs.txt linguist-detectable linguist-language=AdBlock
+AdGuardSafeBrowsing-ReverseEngineered.txt linguist-detectable linguist-language=AdBlock
 AdRemovalListForUnusualAds.txt linguist-detectable linguist-language=AdBlock
 AfricanLanguagesList.txt linguist-detectable linguist-language=AdBlock
 Android?Scum?Class?—?Fake?notification?counters.txt linguist-detectable linguist-language=AdBlock
@@ -23,49 +31,78 @@ Anti-'Battle?Royale'?List.txt linguist-detectable linguist-language=AdBlock
 Anti-'Christmas?carols'?List.txt linguist-detectable linguist-language=AdBlock
 Anti-'Custom?cursors'?List.txt linguist-detectable linguist-language=AdBlock
 Anti-'Google?Hangouts'?List.txt linguist-detectable linguist-language=AdBlock
+Anti-'StockVectorArtOnCopypasteBackgrounds'.txt linguist-detectable linguist-language=AdBlock
 Anti-Elsagate?List.txt linguist-detectable linguist-language=AdBlock
 Anti-Futa?List.txt linguist-detectable linguist-language=AdBlock
 Anti-FіМ?List.txt linguist-detectable linguist-language=AdBlock
 Anti-IMDB?List.txt linguist-detectable linguist-language=AdBlock
 Anti-Skype?List.txt linguist-detectable linguist-language=AdBlock
 AntiAbusePorn.txt linguist-detectable linguist-language=AdBlock
+AntiAdblockEntries.txt linguist-detectable linguist-language=AdBlock
 AntiAdoptablesList.txt linguist-detectable linguist-language=AdBlock
 AntiAdventureTimeList.txt linguist-detectable linguist-language=AdBlock
 AntiAmazonListForTwitch.txt linguist-detectable linguist-language=AdBlock
+AntiAmazonListForTwitchDomains.txt linguist-detectable linguist-language=AdBlock
 AntiAnthroCombatWaifuList.txt linguist-detectable linguist-language=AdBlock
+AntiAstrologyList.txt linguist-detectable linguist-language=AdBlock
 AntiAwfulCommentsList.txt linguist-detectable linguist-language=AdBlock
 AntiBadCapitalismList.txt linguist-detectable linguist-language=AdBlock
 AntiCartoonHipsterList.txt linguist-detectable linguist-language=AdBlock
 AntiCorruptSportsList.txt linguist-detectable linguist-language=AdBlock
+AntiF%D1%96%D0%9C%20ListDomains.txt linguist-detectable linguist-language=AdBlock
 AntiFakeTransparentImagesList.txt linguist-detectable linguist-language=AdBlock
+AntiFaviconList.txt linguist-detectable linguist-language=AdBlock
 AntiFunctionalityRemovalList.txt linguist-detectable linguist-language=AdBlock
 AntiGachaAndKnockoffGamesList.txt linguist-detectable linguist-language=AdBlock
 AntiHivemindCartoonTrashingList.txt linguist-detectable linguist-language=AdBlock
+AntiHivemindCartoonTrashingListDomains.txt linguist-detectable linguist-language=AdBlock
+AntiKpopNitter.txt linguist-detectable linguist-language=AdBlock
 AntiKpopSpammersTwitter.txt linguist-detectable linguist-language=AdBlock
-AntiMV3List.txt linguist-detectable linguist-language=AdBlock
 AntiMacroList.txt linguist-detectable linguist-language=AdBlock
+AntiMalwareABP.txt linguist-detectable linguist-language=AdBlock
+AntiMalwareAdGuard.txt linguist-detectable linguist-language=AdBlock
+AntiMalwareAdGuardHome.txt linguist-detectable linguist-language=AdBlock
+AntiMalwareDomains.txt linguist-detectable linguist-language=AdBlock
+AntiMV3List.txt linguist-detectable linguist-language=AdBlock
 AntiNonNewsList.txt linguist-detectable linguist-language=AdBlock
 AntiOwlHouseList.txt linguist-detectable linguist-language=AdBlock
 AntiPCPriceHiderList.txt linguist-detectable linguist-language=AdBlock
-AntiPPGList.txt linguist-detectable linguist-language=AdBlock
 AntiPepeList.txt linguist-detectable linguist-language=AdBlock
 AntiPorkMeatOnRestaurantMenusList.txt linguist-detectable linguist-language=AdBlock
+AntiPPGList.txt linguist-detectable linguist-language=AdBlock
+AntiPrayerTimesList.txt linguist-detectable linguist-language=AdBlock
+AntiPreacherList-AdblockerExtension.txt linguist-detectable linguist-language=AdBlock
+AntiPreacherList.txt linguist-detectable linguist-language=AdBlock
 AntiRacismList.txt linguist-detectable linguist-language=AdBlock
 AntiSnowMarketingList.txt linguist-detectable linguist-language=AdBlock
 AntiStevenUniverseList.txt linguist-detectable linguist-language=AdBlock
+AntiStevenUniverseListDomains.txt linguist-detectable linguist-language=AdBlock
 AntiSubmissiveEroticaList.txt linguist-detectable linguist-language=AdBlock
+AntiWeebBoobGamesList.txt linguist-detectable linguist-language=AdBlock
+BrowseWebsitesWithoutLoggingIn-uBOExtension.txt linguist-detectable linguist-language=AdBlock
 BrowseWebsitesWithoutLoggingIn.txt linguist-detectable linguist-language=AdBlock
+BrowseWebsitesWithoutLoggingInAGH.txt linguist-detectable linguist-language=AdBlock
+BrowseWebsitesWithoutLoggingInDomains.txt linguist-detectable linguist-language=AdBlock
+clear_urls_uboified.txt linguist-detectable linguist-language=AdBlock
 DailyMotionSimplicity.txt linguist-detectable linguist-language=AdBlock
 Dandelion?Sprout's?Anti-Malware?List.txt linguist-detectable linguist-language=AdBlock
+Dandelion?Sprout's?Anti-Religion?List.txt linguist-detectable linguist-language=AdBlock
 Dandelion?Sprout's?Website?Stretcher.txt linguist-detectable linguist-language=AdBlock
+DandelionSproutsNorskeFiltreDomains.txt linguist-detectable linguist-language=AdBlock
+deviantART?Sanity?Test?List.txt linguist-detectable linguist-language=AdBlock
 DeviantARTQualityArtMagnifier.txt linguist-detectable linguist-language=AdBlock
+DummyList.txt linguist-detectable linguist-language=AdBlock
+EkstraBladetEroticContentRemover.txt linguist-detectable linguist-language=AdBlock
 EmptyPaddingRemover.txt linguist-detectable linguist-language=AdBlock
 ExtremelyCondensedList.txt linguist-detectable linguist-language=AdBlock
 FalukorvList.txt linguist-detectable linguist-language=AdBlock
-GDPR?451?List.txt linguist-detectable linguist-language=AdBlock
+FanboyNotifications-LoadableInUBO.txt linguist-detectable linguist-language=AdBlock
 GameConsoleAdblockList.txt linguist-detectable linguist-language=AdBlock
+GDPR?451?List.txt linguist-detectable linguist-language=AdBlock
 HaveIBeenPwnedPasteRemover.txt linguist-detectable linguist-language=AdBlock
 I?Don't?Want?to?Download?Your?Browser.txt linguist-detectable linguist-language=AdBlock
+IDNHomographProtection-USLatinTLDsOnly.txt linguist-detectable linguist-language=AdBlock
+IDNHomographProtectionTotal.txt linguist-detectable linguist-language=AdBlock
 IHateOverpromotedGames.txt linguist-detectable linguist-language=AdBlock
 ImgurPureImageryExperience.txt linguist-detectable linguist-language=AdBlock
 Imperial?Units?Remover.txt linguist-detectable linguist-language=AdBlock
@@ -75,39 +112,10 @@ LegitimateURLShortener-AffiliateTagAllowlist.txt linguist-detectable linguist-la
 LegitimateURLShortener.txt linguist-detectable linguist-language=AdBlock
 ListForOldPeople.txt linguist-detectable linguist-language=AdBlock
 ListForYoungPeople.txt linguist-detectable linguist-language=AdBlock
+MediaPlayerGradientRemover.txt linguist-detectable linguist-language=AdBlock
 MeWe?Pink?Theme.txt linguist-detectable linguist-language=AdBlock
 MeWeHappyTimeFunClub.txt linguist-detectable linguist-language=AdBlock
-MediaPlayerGradientRemover.txt linguist-detectable linguist-language=AdBlock
-NorwegianCashbackAssistantReborn.txt linguist-detectable linguist-language=AdBlock
-NorwegianList.txt linguist-detectable linguist-language=AdBlock
-PokémonNoGOZone.txt linguist-detectable linguist-language=AdBlock
-Pro-LED?List.txt linguist-detectable linguist-language=AdBlock
-Add?Dutch?bol.com?to?Pro-LED?List.txt linguist-detectable linguist-language=AdBlock
-RedditTrashRemovalService.txt linguist-detectable linguist-language=AdBlock
-RickrollLinkIdentifier.txt linguist-detectable linguist-language=AdBlock
-SerboCroatianList.txt linguist-detectable linguist-language=AdBlock
-SocialShareList.txt linguist-detectable linguist-language=AdBlock
-StopAutoplayOnYouTube.txt linguist-detectable linguist-language=AdBlock
-TwitchEvenMorePureViewingExperience.txt linguist-detectable linguist-language=AdBlock
-TwitchPureViewingExperience.txt linguist-detectable linguist-language=AdBlock
-TwitterPureReadingExperience.txt linguist-detectable linguist-language=AdBlock
-UndertaleRemoverForSoundCloud.txt linguist-detectable linguist-language=AdBlock
-Username?Hider?for?Compilation?Creators.txt linguist-detectable linguist-language=AdBlock
-VeryThoroughWebsiteCleaner.txt linguist-detectable linguist-language=AdBlock
-WebsiteStretcher4K.txt linguist-detectable linguist-language=AdBlock
-WebsiteStretcherVertical.txt linguist-detectable linguist-language=AdBlock
-WikiaPureBrowsingExperience.txt linguist-detectable linguist-language=AdBlock
-WordPressTranslatorAssistant.txt linguist-detectable linguist-language=AdBlock
-YouTubeEvenMorePureVideoExperience.txt linguist-detectable linguist-language=AdBlock
-YouTubeYetEvenMorePureVideoExperience.txt linguist-detectable linguist-language=AdBlock
-a?—?AdGuard?Home?Miscellaneous.txt linguist-detectable linguist-language=AdBlock
-a.txt linguist-detectable linguist-language=AdBlock
-AntiFaviconList.txt linguist-detectable linguist-language=AdBlock
-DummyList.txt linguist-detectable linguist-language=AdBlock
-IDNHomographProtection-USLatinTLDsOnly.txt linguist-detectable linguist-language=AdBlock
-IDNHomographProtectionTotal.txt linguist-detectable linguist-language=AdBlock
-AntiAdblockEntries.txt linguist-detectable linguist-language=AdBlock
-DandelionSproutsNorskeFiltreDomains.txt linguist-detectable linguist-language=AdBlock
+Nitter?De-Politificator.txt linguist-detectable linguist-language=AdBlock
 NordicFilters-FirefoxAndroidUBOWorkaround.txt linguist-detectable linguist-language=AdBlock
 NordicFilters-NotBrave.txt linguist-detectable linguist-language=AdBlock
 NordicFilters-NotFirefox.txt linguist-detectable linguist-language=AdBlock
@@ -122,41 +130,32 @@ NordicFiltersForMinerBlock.txt linguist-detectable linguist-language=AdBlock
 NordicFiltersPiHole.txt linguist-detectable linguist-language=AdBlock
 NordicFiltersPrivacy.txt linguist-detectable linguist-language=AdBlock
 NordicFiltersRPZ.txt linguist-detectable linguist-language=AdBlock
-AntiAmazonListForTwitchDomains.txt linguist-detectable linguist-language=AdBlock
-AntiF%D1%96%D0%9C%20ListDomains.txt linguist-detectable linguist-language=AdBlock
-AntiHivemindCartoonTrashingListDomains.txt linguist-detectable linguist-language=AdBlock
-AntiKpopNitter.txt linguist-detectable linguist-language=AdBlock
-AntiStevenUniverseListDomains.txt linguist-detectable linguist-language=AdBlock
-BrowseWebsitesWithoutLoggingInAGH.txt linguist-detectable linguist-language=AdBlock
-BrowseWebsitesWithoutLoggingInDomains.txt linguist-detectable linguist-language=AdBlock
-FanboyNotifications-LoadableInUBO.txt linguist-detectable linguist-language=AdBlock
-Nitter?De-Politificator.txt linguist-detectable linguist-language=AdBlock
-WikiaPureBrowsingExperienceDomains.txt linguist-detectable linguist-language=AdBlock
-AdGuardHomeCompilationList-Notifications.txt linguist-detectable linguist-language=AdBlock
-AdGuardHomeCompilationList.txt linguist-detectable linguist-language=AdBlock
-AdGuardHomeCompilationListIPs.txt linguist-detectable linguist-language=AdBlock
-Adblock?list?template?-Beginner-.txt linguist-detectable linguist-language=AdBlock
-Adblock?list?template?-Novice-.txt linguist-detectable linguist-language=AdBlock
-clear_urls_uboified.txt linguist-detectable linguist-language=AdBlock
-AdGuardSafeBrowsing-ReverseEngineered.txt linguist-detectable linguist-language=AdBlock
-BrowseWebsitesWithoutLoggingIn-uBOExtension.txt linguist-detectable linguist-language=AdBlock
-StopAutoplayOnYouTube-uBOExtension.txt linguist-detectable linguist-language=AdBlock
-Anti-'StockVectorArtOnCopypasteBackgrounds'.txt linguist-detectable linguist-language=AdBlock
-AntiAstrologyList.txt linguist-detectable linguist-language=AdBlock
-AntiPrayerTimesList.txt linguist-detectable linguist-language=AdBlock
-AntiPreacherList.txt linguist-detectable linguist-language=AdBlock
-AntiWeebBoobGamesList.txt linguist-detectable linguist-language=AdBlock
-Dandelion?Sprout's?Anti-Religion?List.txt linguist-detectable linguist-language=AdBlock
-EkstraBladetEroticContentRemover.txt linguist-detectable linguist-language=AdBlock
+NorwegianCashbackAssistantReborn.txt linguist-detectable linguist-language=AdBlock
+NorwegianList.txt linguist-detectable linguist-language=AdBlock
+PokémonNoGOZone.txt linguist-detectable linguist-language=AdBlock
+Pro-LED?List.txt linguist-detectable linguist-language=AdBlock
+RedditTrashRemovalService.txt linguist-detectable linguist-language=AdBlock
+RickrollLinkIdentifier.txt linguist-detectable linguist-language=AdBlock
 SayNoToRacismOnTwitch.txt linguist-detectable linguist-language=AdBlock
+SerboCroatianList.txt linguist-detectable linguist-language=AdBlock
+SocialShareList.txt linguist-detectable linguist-language=AdBlock
+StopAutoplayOnYouTube-uBOExtension.txt linguist-detectable linguist-language=AdBlock
+StopAutoplayOnYouTube.txt linguist-detectable linguist-language=AdBlock
 TabloidRemover.txt linguist-detectable linguist-language=AdBlock
+TwitchEvenMorePureViewingExperience.txt linguist-detectable linguist-language=AdBlock
+TwitchPureViewingExperience.txt linguist-detectable linguist-language=AdBlock
 Twitter?De-Politificator.txt linguist-detectable linguist-language=AdBlock
-AntiPreacherList-AdblockerExtension.txt linguist-detectable linguist-language=AdBlock
-deviantART?Sanity?Test?List.txt linguist-detectable linguist-language=AdBlock
-AntiMalwareABP.txt linguist-detectable linguist-language=AdBlock
-AntiMalwareAdGuard.txt linguist-detectable linguist-language=AdBlock
-AntiMalwareAdGuardHome.txt linguist-detectable linguist-language=AdBlock
-AntiMalwareDomains.txt linguist-detectable linguist-language=AdBlock
+TwitterPureReadingExperience.txt linguist-detectable linguist-language=AdBlock
+UndertaleRemoverForSoundCloud.txt linguist-detectable linguist-language=AdBlock
+Username?Hider?for?Compilation?Creators.txt linguist-detectable linguist-language=AdBlock
+VeryThoroughWebsiteCleaner.txt linguist-detectable linguist-language=AdBlock
+WebsiteStretcher4K.txt linguist-detectable linguist-language=AdBlock
+WebsiteStretcherVertical.txt linguist-detectable linguist-language=AdBlock
+WikiaPureBrowsingExperience.txt linguist-detectable linguist-language=AdBlock
+WikiaPureBrowsingExperienceDomains.txt linguist-detectable linguist-language=AdBlock
+WordPressTranslatorAssistant.txt linguist-detectable linguist-language=AdBlock
+YouTubeEvenMorePureVideoExperience.txt linguist-detectable linguist-language=AdBlock
+YouTubeYetEvenMorePureVideoExperience.txt linguist-detectable linguist-language=AdBlock
 *.notlist adb
 AnnoyancesList adb
 AntiCelebBirthList adb