diff --git a/data/category-bank-ru b/data/category-bank-ru
index 8c872101..d70faf69 100644
--- a/data/category-bank-ru
+++ b/data/category-bank-ru
@@ -1,42 +1,71 @@
-# Alfa Bank
+## Multi domains
+# Alfa-Bank
 alfa.me
 alfabank.ru
 alfabank.st
 alfadirect.ru
 myapelsin.ru
 
-# BBR
-bbr.ru
+# Bank 131
+bank131.com
+bank131.ru
 
-# BCS bank
-bcs.ru
-bcs-bank.ru
-broker.ru
+# Bank Snezhinsky
+isnbank.ru
+snbank.ru
+
+# BCS Financial Group (bank and broker)
+bcs-bank.ru # bank
+bcs.ru # broker
+broker.ru # broker
+
+# ChelyabinvestBank
+chelinvest.ru
+investpay.ru
 
 # Deutsche Bank
 dbmoscow.ru
 deutsche-bank.ru
 deutschebank.ru
 
-# DOM.RF
-domrfbank.ru
-xn--d1aqf.xn--p1ai
+# Eurofinance Mosnarbank
+efbank.ru
+evrofinance.ru
 
 # GazpromBank
+creditural.ru # subsidiary
 gazprombank.com
 gazprombank.investments
 gazprombank.ru
-gid.ru
 gpb.ru
 
+# Koshelev Bank
+k-bnk.ru
+koshelev-bank.ru
+
+# MetallinvestBank
+metallinvestbank.ru
+metib.ru
+
 # Mizuho Bank
 mhcb.ru
 mhcbr.ru
 
-# MKB
+# MKB (Credit Bank of Moscow)
+dvbank.ru # merged
 mkb.ru
 
-# MTS
+# Moscow Exchange Group (MOEX)
+moex.com
+nationalclearingcentre.ru # subsidiary
+nkcbank.ru # subsidiary
+nsd.ru # subsidiary
+
+# MSP Bank (SME Bank)
+mspbank.ru
+smbfin.ru
+
+# MTS Bank
 dbo-dengi.online
 mtsbank.ru
 mtsdengi.ru
@@ -45,106 +74,224 @@ mtsdengi.ru
 # Feature request: implement @ru in otpbank category
 otpbank.ru
 
-# PSB Bank
+# Pervouralsk Bank
+pervbank.ru
+prvbank.ru
+pvubank.com
+
+# PSB (Promsvyaz Bank)
 payment.ru
 psb-ocenka.ru
 psb.ru
 psbank.ru
 
-# RUSSIA Bank
-abr.ru
+# Rosdor Bank
+rdb.ru
+rosdorbank.ru
 
-# Raiffeisen
-# Feature request: implement @ru in raiffeisenbank category
-raiffeisen-media.ru
-raiffeisen.ru
-
-# Russian Agricultural Bank
-rshb.ru
+# Saint Petersburg exchanges (SPB Exchange, SPVB)
+spbexchange.ru
+spvb.ru
 
 # SberBank
-include:sber
+include:sberbank
+
+# Solid Bank
+solid.ru
+solidbank.ru
 
 # Sovcombank
+halvacard.ru # Halva card
+home.bank # merged
+homecredit.ru # merged
+hva.im
+scb.ru
 sovcombank.ru
 
 # T-Bank (Tinkoff) and RosBank
 include:tbank-ru
 
-# Tochka bank
+# TKB Bank (TransCapitalBank)
+itb.ru # subsidiary
+tkbbank.ru
+
+# Tochka Bank
 tochka-tech.com
 tochka.com
 
-# VTB Bank
-pochtabank.ru #subsidiary
+# Transstroy Bank
+transstroybank.ru
+tsbnk.ru
+
+# UBS
+bank-credit-suisse-moscow.ru # subsidiary
+ubs.com
+
+# Uglemet Bank
+coalmetbank.ru
+umbank.ru
+
+# UniCredit Bank
+unicredit.ru
+unicreditbank.ru
+
+# VTB
+pochtabank.ru # subsidiary
+rncb.ru # merged
+sbpvtb.ru
 vtb-direct.com
 vtb-grants.fut.ru
+vtb.com
 vtb.ru
+vtbbo.ru
 vtbglobalperspectives.com
+xn--90ab2c.xn--p1ai
 
-# Zenit
+# Bank Zenit
 credit-zenit.ru
 zenit-card.ru
 zenit.ru
 
-# NSPK (QR-code payments)
-nspk.ru
+## Non-banks
+asia-pay.ru                   # LLC RNCO AsiaPay (non-bank credit organization)
+best2pay.net                  # LLC Best2Pay (payment service provider)
+koronapay.com                 # Zolotaya Korona (KoronaPay), RNCO Payment Center
+moneta.ru                     # LLC NCO Moneta (non-bank credit organization)
+nspk.ru                       # JSC NSPK (National Card Payment System; SBP, QR payments)
+rbsgate.com                   # RBS (Runet Business Systems): bank payment gateway
+rbsuat.com                    # RBS (Runet Business Systems): payment gateway test environment
+rncoluminis.ru                # JSC RNCO Luminis (non-bank credit organization)
+veb.ru                        # VEB.RF (state development corporation)
+westernunion.ru               # LLC NCO Western Union DP Vostok (non-bank credit organization)
+yoobusiness.ru                # LLC NCO YooMoney (YooBusiness service)
 
-# Other
-absolutbank.ru
-akbars.ru
-alefbank.com
-ankb.ru
-asia-pay.ru
-atb.su
-autokreditbank.ru
-avangard.ru
-aversbank.ru
-bank-arzamas.ru
-bank-credit-suisse-moscow.ru
-bank131.com
-bankermak.ru
-best2pay.net
-bfa.ru
-blanc.ru
-bm-bank.ru
-bspb.ru
-commerzbank.ru
-finambank.ru
-forshtadt.ru
-homecredit.ru
-hva.im # Sovcombank Halva
-ibamoscow.ru
-jpmorgan.ru
-korona.com
-kubankredit.ru
-mfk-bank.ru
-mvs-bank.ru
-noosferabank.ru
-primbank.ru
-prvbank.ru
-pskb.ru
-pvubank.com
-rbsgate.com
-rbsuat.com
-rencapbank.ru
-rencredit.ru
-rncoluminis.ru
-ru.ccb.com
-sbibankllc.ru
-seb.ru
-selkombank.ru
-sinara.ru
-slavbank.ru
-smbcr-bank.ru
-solid.ru
-ssb.msk.ru
-tagbank.ru
-tatsotsbank.ru
-tkbbank.ru
-ubs.com
-uralsib.ru
-vlb100.ru
-westernunion.ru
-yoobusiness.ru
-ziraatbank.ru
+## Single domains
+abr.ru                        # JSC AB Rossiya (Bank Rossiya)
+absolutbank.ru                # PJSC Absolut Bank
+agroros.ru                    # LLC Bank Agroros
+ai-bank.ru                    # JSC Asia-Invest Bank
+akbars.ru                     # PJSC AK BARS Bank
+akcept.ru                     # JSC Bank Akcept
+akibank.ru                    # PJSC AKIBANK
+albank.ru                     # JSC Almazergienbank
+alefbank.com                  # JSC Alef-Bank
+ankb.ru                       # PJSC Bratsky ANKB
+apkbank.ru                    # JSC CB Agropromcredit
+aresbank.ru                   # LLC CB Aresbank
+atb.su                        # PJSC Asian-Pacific Bank (ATB)
+autofinancebank.ru            # LLC Auto Finance Bank (formerly RN Bank)
+autokreditbank.ru             # JSC Avtokreditbank
+avangard.ru                   # PJSC JSCB Avangard
+aversbank.ru                  # PJSC Bank Avers
+bancaintesa.ru                # JSC Banca Intesa
+bank-arzamas.ru               # JSC CB Arzamas
+bank-hlynov.ru                # JSC CB Khlynov
+bank.yandex.ru                # JSC Yandex Bank
+bankermak.ru                  # JSC Bank Ermak
+bankofkazan.ru                # LLC CBER Bank of Kazan
+bankperm.ru                   # JSC Bank Perm
+bankstavr.ru                  # PJSC Bank Stavr (formerly Stavropolpromstroybank)
+bankvl.ru                     # JSC Bank Vologzhanin
+bbr.ru                        # JSC BBR Bank
+bfa.ru                        # JSC Bank BFA
+blanc.ru                      # LLC Blanc Bank (formerly Investment Bank Vesta)
+bm-bank.ru                    # JSC BM-Bank
+bmwbank.ru                    # LLC BMW Bank
+boc.ru                        # JSC Bank of China (Russia)
+bspb.ru                       # PJSC Bank Saint Petersburg
+bystrobank.ru                 # PJSC BystroBank
+centrinvest.ru                # PJSC CB Center-invest
+chelindbank.ru                # PJSC Chelindbank
+cibank.ru                     # JSC City Invest Bank (not Citibank)
+cifra-bank.ru                 # LLC Cifra Bank (formerly Freedom Finance Bank)
+cmrbank.ru                    # LLC CMRBank (Center for International Settlements)
+commerzbank.ru                # JSC Commerzbank (Eurasija)
+crediteurope.ru               # JSC Credit Europe Bank (Russia)
+databank.ru                   # JSC Databank
+dcapital.ru                   # JSC Bank Razvitie-Stolitsa
+derzhava.ru                   # PJSC JSCB Derzhava
+domrfbank.ru                  # JSC BANK DOM.RF
+emb.ru                        # PJSC Kontur.Bank (formerly Ekaterinburg Municipal Bank)
+energobank.ru                 # JSC Energobank
+energotransbank.com           # JSC Energotransbank
+eximbank.ru                   # JSC ROSEXIMBANK
+expobank.ru                   # JSC Expobank
+finambank.ru                  # JSC Bank FINAM
+finance.ozon.ru               # LLC Ozon Bank
+finstarbank.ru                # JSC Finstar Bank
+forabank.ru                   # JSC JSCB Fora-Bank
+forshtadt.ru                  # JSC JSCB Forshtadt
+gaztransbank.ru               # LLC Gaztransbank
+gebank.ru                     # JSC Gazenergobank
+genbank.ru                    # JSC Genbank
+ibamoscow.ru                  # LLC Bank IBA-Moscow (International Bank of Azerbaijan)
+icbcmoscow.ru                 # JSC Bank ICBC (Moscow)
+in-bank.ru                    # LLC Inbank
+ingobank.ru                   # JSC Ingosstrakh Bank
+jpmorgan.ru                   # LLC J.P. Morgan Bank International
+kamkombank.ru                 # LLC Kamkombank
+kbb.ru                        # JSC Kuznetskbusinessbank
+kremlinbank.ru                # LLC CB Kremlevsky
+kubankredit.ru                # LLC CB Kuban Kredit
+kuzbank.ru                    # PJSC Bank Kuznetsky
+lanta.ru                      # JSC JSCB Lanta-Bank
+lockobank.ru                  # JSC CB Locko-Bank
+maritimebank.com              # JSC Maritime Bank
+mcbank.ru                     # PJSC Bank Moscow-City
+mfk-bank.ru                   # JSC JSCB International Financial Club (MFK Bank)
+modulbank.ru                  # JSC CB Modulbank
+mvs-bank.ru                   # JSC MVS Bank
+nico-bank.ru                  # JSC Nico-Bank
+nipbank.ru                    # JSC Natsinvestprombank (National Investment and Industrial Bank)
+noosferabank.ru               # JSC Noosfera
+norvikbank.ru                 # PJSC Norvik Bank
+novikom.ru                    # JSC JSCB Novikombank
+novobank.ru                   # PJSC UCB Novobank
+ns-bank.ru                    # JSC Bank National Standard
+nskbl.ru                      # PJSC Bank Levoberezhny
+okbank.ru                     # JSC Bank Obyedinenny Kapital (United Capital)
+orbank.ru                     # JSC Bank Orenburg
+pikhtabank.ru                 # LLC Pikhta Bank (formerly Volkswagen Bank Rus)
+poidem.ru                     # JSC CB Poidem!
+primbank.ru                   # PJSC JSCB Primorye
+priobye.ru                    # JSC Bank Priobye
+priovtb.com                   # PJSC Prio-Vneshtorgbank
+pskb.com                      # PJSC Petersburg Social Commercial Bank (PSCB)
+raiffeisen.ru                 # JSC Raiffeisenbank
+rencapbank.ru                 # JSC RenCap Bank (formerly JSC Citibank)
+rencredit.ru                  # LLC CB Renaissance Credit
+resocreditbank.ru             # JSC RESO Credit
+rsb.ru                        # JSC Russian Standard Bank
+rshb.ru                       # JSC Russian Agricultural Bank (Rosselkhozbank)
+ru.ccb.com                    # JSC China Construction Bank (Russia)
+sbibankllc.ru                 # LLC SBI Bank (State Bank of India)
+sdm.ru                        # JSC SDM-Bank
+seb.ru                        # JSC SEB Bank
+selkombank.ru                 # LLC Kostromaselkombank
+sevnb.ru                      # JSC Severny Narodny Bank
+sibsoc.ru                     # LLC Sibsotsbank
+sinara.ru                     # PJSC Bank Sinara (formerly SKB-Bank)
+slavbank.ru                   # JSC NCB Slavyanbank
+slbank.ru                     # LLC CB Stroylesbank
+smbcr-bank.ru                 # LLC Sumitomo Mitsui Rus Bank
+sngb.ru                       # JSC Bank SNGB (Surgutneftegazbank)
+socium-bank.ru                # LLC Socium-Bank
+ssb.msk.ru                    # LLC CB Spetsstroybank
+svoi.ru                       # JSC Svoi Bank (formerly Gazneftbank)
+tagbank.ru                    # PJSC Taganrogbank
+tatsotsbank.ru                # LLC Tatsotsbank
+thbank.ru                     # JSC Tolyattikhimbank
+timerbank.ru                  # JSC Timer Bank
+toyota-bank.ru                # JSC Toyota Bank
+ubrr.ru                       # PJSC CB UBRD (Ural Bank for Reconstruction and Development)
+united.ru                     # JSC Yenisei United Bank
+uralfd.ru                     # PJSC Ural FD
+uralprombank.ru               # JSC Uralprombank
+uralsib.ru                    # PJSC Bank Uralsib
+vbrr.ru                       # JSC VBRR (All-Russian Regional Development Bank)
+venets-bank.ru                # JSC Bank Venets
+vfbank.ru                     # LLC CB Vneshfinbank
+vlb100.ru                     # JSC Velikiye Luki Bank
+vlbb.ru                       # JSC Vladbusinessbank
+wb-bank.ru                    # LLC Wildberries Bank
+ziraatbank.ru                 # JSC Ziraat Bank (Moscow)
diff --git a/data/category-ru b/data/category-ru
index 26375004..6f66743a 100644
--- a/data/category-ru
+++ b/data/category-ru
@@ -59,9 +59,6 @@ include:category-bank-ru
 ## Credit History Bureaus
 credistory.ru
 nbki.ru
-## Currency and stock exchanges
-moex.com   # Moscow Stock Exchange
-spvb.ru    # Saint-Petersburg Stock Exchange
 ## Card & Document delivery
 efin.ru
 ## Financial marketplace
@@ -72,8 +69,6 @@ sistema-capital.com
 ## Mir payment system
 mironline.ru
 mirpayonline.ru
-## National Payment Card System
-nspk.ru
 ## Tipping service
 netmonet.co
 tips.tips
diff --git a/data/sber b/data/sber
index c98ba18f..fe7b19e9 100644
--- a/data/sber
+++ b/data/sber
@@ -1,23 +1,14 @@
 include:2gis
 include:okko
-
-bps-sberbank.by
-sber-bank.by
-sber.ru
-sberbank.com
-sberbank.ru
-sbrf.ru
+include:sberbank
 
 # Ads/tracking
-ads.sber.ru @ads
-clickstream.sberbank.ru @ads
 neon.click @ads
 sbermarketing.ru @ads
 full:error-tracking.megamarket.tech @ads
 full:metrics.21-school.ru @ads
 full:sentry.sberauto.com @ads
 full:tracing-http.megamarket.tech @ads
-full:visor.sberbank.ru @ads
 
 # Business ecosystem
 id.ru
@@ -102,15 +93,6 @@ otello.ru
 sber.pro
 full:sberpro.vedomosti.ru
 
-## Sber Spasibo (loyalty service)
-cplsb.ru
-sberspasibo.ru
-spasibo.digital
-spasibo.market
-spasibobonus.ru
-spasibosb.ru
-spasibosberbank.ru
-
 ## Sber Tech
 accesspoint.uz
 getsynapse.io
diff --git a/data/sberbank b/data/sberbank
new file mode 100644
index 00000000..a196013c
--- /dev/null
+++ b/data/sberbank
@@ -0,0 +1,23 @@
+bps-sberbank.by
+sber-bank.by
+sber.ru
+sberbank.com
+sberbank.ru
+sbrf.ru
+
+# NCO ЮMoney
+yookassa.ru
+yoomoney.ru
+
+# Sber Spasibo (loyalty service)
+cplsb.ru
+sberspasibo.ru
+spasibo.digital
+spasibo.market
+spasibobonus.ru
+spasibosb.ru
+spasibosberbank.ru
+
+ads.sber.ru @ads
+clickstream.sberbank.ru @ads
+full:visor.sberbank.ru @ads