epstein-files 1.2.5__py3-none-any.whl → 1.5.0__py3-none-any.whl

epstein_files/util/highlighted_group.py

@@ -7,11 +7,11 @@ from rich.console import Console
 from rich.highlighter import RegexHighlighter
 from rich.text import Text
 
+from epstein_files.documents.emails.emailers import EMAILER_ID_REGEXES
 from epstein_files.util.constant.names import *
 from epstein_files.util.constant.strings import *
 from epstein_files.util.constant.urls import ARCHIVE_LINK_COLOR
-from epstein_files.util.constants import (EMAILER_ID_REGEXES, EPSTEIN_V_ROTHSTEIN_EDWARDS,
-     OSBORNE_LLP, REPLY_REGEX, SENT_FROM_REGEX)
+from epstein_files.util.constants import EPSTEIN_V_ROTHSTEIN_EDWARDS, OSBORNE_LLP, REPLY_REGEX, SENT_FROM_REGEX
 from epstein_files.util.data import sort_dict, without_falsey
 from epstein_files.util.doc_cfg import *
 from epstein_files.util.env import args
@@ -31,6 +31,8 @@ REGEX_STYLE_PREFIX = 'regex'
 SIMPLE_NAME_REGEX = re.compile(r"^[-\w, ]+$", re.IGNORECASE)
 TECH_BRO = 'tech bro'
 
+VICTIM_COLOR = 'orchid1'
+
 CATEGORY_STYLE_MAPPING = {
     ARTICLE: JOURNALIST,
     BOOK: JOURNALIST,
@@ -160,7 +162,7 @@ class HighlightedNames(HighlightedText):
 
         pattern = '|'.join(name_patterns)
 
-        if args.deep_debug:
+        if args.deep_debug and args.colors_only:
             debug_console.print(Text('').append(f"{name:25s}", style=self.style).append(f" '{pattern}'", style='dim'))
 
         return pattern
@@ -215,7 +217,7 @@ HIGHLIGHTED_NAMES = [
     ManualHighlight(
         label='email_subject',
         style='light_yellow3',
-        pattern=r"^(> )?(Classification|Flag|Subject): (?P<email_subject>.*)",
+        pattern=r"^(> )?(Classification|Flag|Subject|Sujet ?): (?P<email_subject>.*)",
     ),
     HighlightedNames(
         label=ACADEMIA,
@@ -245,12 +247,13 @@ HIGHLIGHTED_NAMES = [
             r"Bard\s+((Early )?College|High School|Schools)",
             r"Brotherton",
             r"Carl\s*Sagan",
-            r"Columbia",
+            r"Columbia(\s*(Business\s*School|University))?",
             r"Dan(iel|ny) Kahneman",
             r"(Francis\s*)?Crick",
             r"J(ames|im)\s*Watson",
             r"(Lord\s*)?Martin\s*Rees",
             r"Massachusetts\s*Institute\s*of\s*Technology",
+            r"Mayo\s*Clinic",
             r"Media\s*Lab",
             r"(Marvin\s*)?Minsky",
             r"MIT(\s*Media\s*Lab)?",
@@ -260,10 +263,11 @@ HIGHLIGHTED_NAMES = [
             r"Princeton(\s*University)?",
             r"Regeneron",
             r"(Richard\s*)?Dawkins",
+            r"Rockefeller\s*University",
             r"(Sandy\s*)?Pentland",  # Media Lab
             r"Sanofi",
             r"Stanford(\s*University)?(\s*Hospital)?",
-            r"(Stephen\s*)?Hawking",
+            r"(Ste(ph|v)en\s*)?Hawking",
             r"(Steven?\s*)?Pinker",
             r"Texas\s*A&M",
             r"Tulane",
@@ -319,6 +323,7 @@ HIGHLIGHTED_NAMES = [
         patterns=[
             r"(Art )?Spiegelman",
             r"Artspace",
+            r"Ayn\s*Rand",
             r"Bobby slayton",
             r"bono\s*mick",
             r"Errol(\s*Morris)?",
@@ -367,6 +372,8 @@ HIGHLIGHTED_NAMES = [
         label='bitcoin',
         style='orange1 bold',
         emailers={
+            AMIR_TAAKI: f"bitcoin bro, partner of {BROCK_PIERCE} (?)",
+            BROCK_PIERCE: 'crypto bro, Bannon business partner, Tether co-founder, arrested in house full of machine guns & "8,000 fotografias de pornopgraphia infantil"',
             JEFFREY_WERNICK: 'former COO of Parler, involved in numerous crypto companies like Bitforex',
             JEREMY_RUBIN: 'developer/researcher',
             JOI_ITO: f"former head of {MIT_MEDIA_LAB} and MIT Digital Currency Initiative",
@@ -374,11 +381,12 @@ HIGHLIGHTED_NAMES = [
         },
         patterns=[
             r"Balaji",
+            r"Bart\s*Stephens",  # co-founder, Blockchain Capital
+            r"Bioptix",  # Now RIOT Blockchain
             r"bitcoin(\s*Foundation)?",
-            r"block ?chain(\s*capital)?",
             r"Brian Forde",
             r"Brock(\s*Pierce)?",
-            r"coins?",
+            r"coins?(\s*Center)?",
             r"Cory\s*Fields",  # bitcoin dev
             r"cr[iy]?pto(currenc(y|ies))?",
             r"Digital\s*Currenc(ies|y)(\s*Initiative)?",
@@ -390,12 +398,16 @@ HIGHLIGHTED_NAMES = [
             r"Madars",
             r"Mi(chael|ke)\s*Novogratz",
             r"(Patrick\s*)?Murck",
-            r"Ron Rivest",
+            r"(Hester\s*)?Peirce",
+            r"(?-i:RIOT)",  # (?-i:) makes it case sensitive
+            r"Ron\s*Rivest",
+            r"block ?chain(\s*capital)?",
             r"(Ross\s*)?Ulbricht",
             r"Silk\s*Road",
             r"SpanCash",
             r"Tether",
             r"virtual\s*currenc(ies|y)",
+            r"Wire\s*ca\n?rd",
             r"Wladimir( van der Laan)?",  # bitcoin dev
             r"(zero\s+knowledge\s+|zk)pro(of|tocols?)",
         ],
@@ -413,9 +425,11 @@ HIGHLIGHTED_NAMES = [
             'Philip Kafka': 'president of Prince Concepts (and son of Terry Kafka?)',
             ROBERT_LAWRENCE_KUHN: 'investment banker, China expert',
             TERRY_KAFKA: 'CEO of Impact Outdoor (highway billboards)',
-            TOM_PRITZKER: 'brother of J.B. Pritzker',
+            TOM_PRITZKER: 'chairman of The Pritzker Organization and Hyatt Hotels',
         },
         patterns=[
+            r"Arthur Klein",
+            r"(Barry\s*)?Honig",
             r"((Bill|David)\s*)?Koch(\s*(Bro(s|thers)|Industries))?",
             r"Gruterite",
             r"((John|Patricia)\s*)?Kluge",
@@ -423,6 +437,7 @@ HIGHLIGHTED_NAMES = [
             r"(Mi(chael|ke)\s*)?Ovitz",
             r"(Steve\s+)?Wynn",
             r"(Les(lie)?\s+)?Wexner",
+            r"Michael\s*Klein",
             r"New Leaf Ventures",
             r"Park Partners",
             r"SALSS",
@@ -500,6 +515,7 @@ HIGHLIGHTED_NAMES = [
             r"Dem(ocrat(ic)?)?",
             r"(Diana\s*)?DeGette",
             r"DNC",
+            r"(Ed(ward)?\s*)?Mezvinsky",
             r"Elena\s*Kagan",
             r"(Eliott?\s*)?Spitzer(, Eliot)?",
             r"Eric Holder",
@@ -550,7 +566,6 @@ HIGHLIGHTED_NAMES = [
             MERWIN_DELA_CRUZ: None,  # HOUSE_OVERSIGHT_032652 Groff says "Jojo and Merwin both requested off Nov. 25 and 26"
             NADIA_MARCINKO: "Epstein's pilot",
             'Sean J. Lancaster': 'airplane reseller',
-            ZUBAIR_KHAN: 'Tranchulas cybersecurity, InsightsPod founder, Islamabad / Dubai',
         },
         patterns=[
             r"Adriana\s*Ross",
@@ -566,8 +581,9 @@ HIGHLIGHTED_NAMES = [
             MARK_EPSTEIN: 'brother of Jeffrey',
         },
         patterns=[
-            r"JEGE(\s*Inc)",
+            r"JEGE(\s*Inc)?",
             r"LSJ",
+            r"Zorro(\s*Ranch)?",
         ],
     ),
     HighlightedNames(
@@ -579,6 +595,7 @@ HIGHLIGHTED_NAMES = [
             ARDA_BESKARDES: 'NYC immigration attorney allegedly involved in sex-trafficking operations',
             BENNET_MOSKOWITZ: f'represented the {EPSTEIN_ESTATE_EXECUTOR}s',
             BRAD_KARP: 'head of the law firm Paul Weiss',
+            CHRISTIAN_EVERDELL: f"{GHISLAINE_MAXWELL}'s lawyer ca. 2021, Cohen & Gresser",
             'Connie Zaguirre': f"office of {ROBERT_D_CRITTON_JR}",
             DAVID_SCHOEN: f"{CRIMINAL_DEFENSE_ATTORNEY} after 2019 arrest",
             DEBBIE_FEIN: EPSTEIN_V_ROTHSTEIN_EDWARDS_ATTORNEY,
@@ -599,6 +616,7 @@ HIGHLIGHTED_NAMES = [
             'Robert Gold': 'helped Epstein track down money belonging to Spanish families',
             'Roy Black': CRIMINAL_DEFENSE_2008,
             SCOTT_J_LINK: CRIMINAL_DEFENSE_ATTORNEY,
+            STACEY_RICHMAN: f"New York {CRIMINAL_DEFENSE_ATTORNEY}",
             TONJA_HADDAD_COLEMAN: f'{EPSTEIN_V_ROTHSTEIN_EDWARDS_ATTORNEY}',  # relation of Fred Haddad?
         },
         patterns=[
@@ -610,6 +628,7 @@ HIGHLIGHTED_NAMES = [
             r"Michael J. Pike",
             r"Paul,?\s*Weiss",
             r"Steptoe(\s*& Johnson)?(\s*LLP)?",
+            r"Sull(ivan)?\s*(&|and)?\s*Crom(well)?",
             r"Wein(berg|garten)",
         ],
     ),
@@ -638,8 +657,10 @@ HIGHLIGHTED_NAMES = [
         },
         patterns=[
             r"AfD",
+            r"Alfa(\s*Bank)",
             r"(Angela )?Merk(el|le)",
             r"Austria",
+            r"Belgi(an|um)",
             r"(Benjamin\s*)?Harnwell",
             r"Berlin",
             r"Borge",
@@ -649,6 +670,7 @@ HIGHLIGHTED_NAMES = [
             r"Brussels",
             r"Cannes",
             r"Cypr(iot|us)",
+            r"David\s*Cameron",
             r"Davos",
             r"ECB",
             r"England",
@@ -663,6 +685,8 @@ HIGHLIGHTED_NAMES = [
             r"Ital(ian|y)",
             r"Jacques",
             r"Kiev",
+            r"Latvian?",
+            r"Lithuanian?",
             r"Le\s*Pen",
             r"London",
             r"Macron",
@@ -672,11 +696,13 @@ HIGHLIGHTED_NAMES = [
             r"NATO",
             r"(Nicholas\s*)?Sarkozy",
             r"Nigel(\s*Farage)?",
+            r"(Northern\s*)?Ireland",
             r"Norw(ay|egian)",
             r"Oslo",
             r"Paris",
             r"Polish",
             r"pope",
+            r"Portugal",
             r"Scotland",
             r"(Sebastian )?Kurz",
             r"Stockholm",
@@ -685,6 +711,7 @@ HIGHLIGHTED_NAMES = [
             r"Swed(en|ish)(?![-\s]+American Life Scienc)",
             r"Swi(ss|tzerland)",
             r"(Tony\s)?Blair",
+            r"United\s*Kingdom",
             r"U\.K\.",
             r"Ukrain(e|ian)",
             r"Venice",
@@ -748,6 +775,7 @@ HIGHLIGHTED_NAMES = [
             r"(Janet\s*)?Yellen",
             r"(Jerome\s*)?Powell(?! M\. Cabot)",
             r"(Jimmy\s*)?Cayne",
+            r"Joon\s*Yun",
             r"JPMC?",
             r"j\.?p\.?\s*morgan(\.?com|\s*Chase)?",
             r"Madoff",
@@ -760,8 +788,12 @@ HIGHLIGHTED_NAMES = [
             r"(Peter L. )?Scher",
             r"(Ray\s*)?Dalio",
             r"(Richard\s*)?LeFrak",
-            r"(Ste(phen|ve)\s*)?Schwart?z?man",
+            r"Rockefeller(?! University)(\s*Foundation)?",
+            r"SBNY",
             r"Serageldin",
+            r"Signature\s*Bank",
+            r"(Ste(phen|ve)\s*)?Schwart?z?man",
+            r"Susquehanna",
             r"UBS",
             r"us.gio@jpmorgan.com",
             r"Wall\s*Street(?!\s*Jour)",
@@ -789,7 +821,9 @@ HIGHLIGHTED_NAMES = [
         label='government',
         style='color(24) bold',
         emailers={
+            ALISON_J_NATHAN: "judge in New York's Southern District",
             ANN_MARIE_VILLAFANA: 'Southern District of Florida (SDFL) U.S. Attorney',
+            CHRISTOPHER_DILORIO: 'self described whistleblower',
             DANNY_FROST: 'Director of Communications at Manhattan D.A.',
             'Police Code Enforcement': f"{PALM_BEACH} buildings code enforcement",
         },
@@ -799,7 +833,9 @@ HIGHLIGHTED_NAMES = [
             r'Alice\s*Fisher|Fisher, Alice',
             r"AML",
             r"(Andrew\s*)?(McCabe|Natsios)",
+            r"(Assistant\s+)?State\s*Attorney",
             r"Attorney General",
+            r'Barbara\s*Burns',  # AUSA
             r"((Bob|Robert)\s*)?Mueller",
             r"(Byung\s)?Pak",
             r"Case 1:19-cv-03377(-LAP)?",
@@ -812,17 +848,19 @@ HIGHLIGHTED_NAMES = [
             r"Dep(artmen)?t\.?\s*of\s*(the\s*)?(Justice|Treasury)",
             r"DHS",
             r"DOJ",
+            r"EDGAR (Filing|Search)",  # SEC database is EDGAR
             r"FBI",
             r"FCPA",
             r"FDIC",
             r"FDLE",
             r"Federal\s*Bureau\s*of\s*Investigation",
             r"FinCEN",
-            r"FINRA",
+            r"(www\.)?FINRA(\.org)?",
             r"FOIA",
             r"FTC",
             r"(General\s*)?P(a|e)traeus",
             r"Geoff\s*Ling",
+            r"Homeland\s*Security",
             r"IRS",
             r"(James\s*)?Comey",
             r"(Jennifer\s*Shasky\s*)?Calvery",
@@ -840,11 +878,12 @@ HIGHLIGHTED_NAMES = [
             r"(Michael\s*)?Reiter",
             r"OGE",
             r"Office\s*of\s*Government\s*Ethics",
+            r"PBPD",
             r"police",
             r"(Preet\s*)?Bharara",
             r"SCOTUS",
             r"SD(FL|NY)",
-            r"SEC",
+            r"SEC(\.gov)?",
             r"Secret\s*Service",
             r"Securities\s*and\s*Exchange\s*Commission",
             r"Southern\s*District(\s*of\s*(Florida|New\s*York))?",
@@ -919,6 +958,7 @@ HIGHLIGHTED_NAMES = [
             r"(eh|(Ehud|Nili Priell)\s*)?barak",
             r"EB",
             r"Ehud\s*Barack",
+            r"Hapoalim",
             r"Israeli?",
             r"Jerusalem",
             r"J\s*Street",
@@ -952,7 +992,7 @@ HIGHLIGHTED_NAMES = [
             'Alain Forget': 'author of "How To Get Out Of This World ALIVE"',
             'Alex Yablon': 'New York Magazine fact checker (?)',
             EDWARD_JAY_EPSTEIN: 'no relation, wrote books about spies',
-            HENRY_HOLT: f"{MICHAEL_WOLFF}'s book publisher",
+            HENRY_HOLT: f"{MICHAEL_WOLFF}'s book publisher (company not a person)",
             JAMES_HILL: 'ABC News',
             JENNIFER_JACQUET: 'Future Science magazine',
             JOHN_BROCKMAN: 'literary agent and author specializing in scientific literature',
@@ -972,14 +1012,14 @@ HIGHLIGHTED_NAMES = [
             r'Associated\s*Press',
             r"Axios",
             r"BBC",
-            r"(Bob|Robert)\s*Costa",
+            r"(Bob|Robert)\s*(Costa|Woodward)",
             r"Breitbart",
             r"BuzzFeed(\s*News)?",
             r"C-?Span",
             r"CBS(\s*(4|Corp|News))?",
             r"Charlie\s*Rose",
             r"China\s*Daily",
-            r"CNBC",
+            r"(C|MS)?NBC(\s*News)?",
             r"CNN(politics?)?",
             r"Con[cs]hita", r"Sarnoff",
             r"Daily Business Review",
@@ -1000,6 +1040,7 @@ HIGHLIGHTED_NAMES = [
             r"Globe\s*and\s*Mail",
             r"Good\s*Morning\s*America",
             r"Graydon(\s*Carter)?",
+            r"Hollywood\s*Reporter",
             r"Huff(ington)?(\s*Po(st)?)?",
             r"Ingram, David",
             r"James\s*Hill",
@@ -1007,6 +1048,7 @@ HIGHLIGHTED_NAMES = [
             r"Jesse Kornbluth",
             r"John\s*Connolly",
             r"Jonathan\s*Karl",
+            r"Journal of Criminal Law and Criminology",
             r"Julie\s*(K.?\s*)?Brown", r'jbrown@miamiherald.com',
             r"(Katie\s*)?Couric",
             r"Keith\s*Larsen",
@@ -1025,7 +1067,6 @@ HIGHLIGHTED_NAMES = [
             r"PERVERSION\s*OF\s*JUSTICE",
             r"Politico",
             r"Pro\s*Publica",
-            r"Reuters",
             r"(Sean\s*)?Hannity",
             r"Sharon Churcher",  # Daily Mail
             r"Sulzberger",
@@ -1038,7 +1079,9 @@ HIGHLIGHTED_NAMES = [
             r"(The\s*)?New\s*Yorker",
             r"(The\s*)?Wall\s*Street\s*Journal",
             r"(The\s*)?Wa(shington\s*)?Po(st)?",
+            r"(Thomson\s*)?Reuters",
             r"(Uma\s*)?Sanghvi",
+            r"USA\s*Today",
             r"Vanity\s*Fair",
             r"Viceland",
             r"Vick[iy]\s*Ward",
@@ -1072,6 +1115,7 @@ HIGHLIGHTED_NAMES = [
             r"Chile",
             r"Colombian?",
             r"Cuban?",
+            r"el chapo",
             r"El\s*Salvador",
             r"((Enrique )?Pena )?Nieto",
             r"Lat(in)?\s*Am(erican?)?",
@@ -1113,12 +1157,17 @@ HIGHLIGHTED_NAMES = [
             r"Arizona(?! State University)",
             r"Aspen",
             r"Berkeley",
+            r"Boston",
             r"Brooklyn",
             r"California",
             r"Canada",
             r"Cape Cod",
+            r"Charlottesville",
+            r"Colorado",
             r"Connecticut",
             r"Florida",
+            r"Jersey\s*City",
+            r"Los Angeles",
             r"Loudoun\s*County?",
             r"Martha's\s*Vineyard",
             r"Miami(?!\s?Herald)",
@@ -1128,9 +1177,12 @@ HIGHLIGHTED_NAMES = [
             r"NY(C|\s*State)",
             r"Orange\s*County",
             r"Oregon",
+            r"Palo Alto",
+            r"Pennsylvania",
             r"Phoenix",
             r"Portland",
-            r"Santa\s*Fe",
+            r"San Francisco",
+            r"Sant[ae]\s*Fe",
             r"Telluride",
             r"Teterboro",
             r"Texas(?! A&M)",
@@ -1146,7 +1198,7 @@ HIGHLIGHTED_NAMES = [
         style='dark_sea_green4',
         emailers={
             ANAS_ALRASHEED: 'former information minister of Kuwait (???)',
-            AZIZA_ALAHMADI: 'Abu Dhabi Department of Culture & Tourism',
+            AZIZA_ALAHMADI: 'Abu Dhabi Department of Culture & Tourism, assistant of Al Sabbagh',
             RAAFAT_ALSABBAGH: 'Saudi royal advisor',
             SHAHER_ABDULHAK_BESHER: 'Yemeni billionaire',
         },
@@ -1157,6 +1209,7 @@ HIGHLIGHTED_NAMES = [
             r"Afghanistan",
             r"Al[-\s]?Qa[ei]da",
             r"Ahmadinejad",
+            r"(Rakhat )?Aliyev",
             r"Arab",
             r"Aramco",
             r"Armenia",
@@ -1185,6 +1238,7 @@ HIGHLIGHTED_NAMES = [
             r"Hamas",
             r"Hezbollah",
             r"HBJ",
+            r"Hourani",
             r"Houthi",
             r"Imran\s+Khan",
             r"Iran(ian)?([-\s]Contra)?",
@@ -1207,10 +1261,11 @@ HIGHLIGHTED_NAMES = [
             r"MB(N|S|Z)",
             r"Mid(dle)?\s*East(ern)?",
             r"Mohammed\s+bin\s+Salman",
-            r"Morocco",
+            r"Morocc(an|o)",
             r"Mubarak",
             r"Muslim(\s*Brotherhood)?",
             r"Nayaf",
+            r"Nazarbayev",
             r"Pakistani?",
             r"Omar",
             r"(Osama\s*)?Bin\s*Laden",
@@ -1230,10 +1285,10 @@ HIGHLIGHTED_NAMES = [
             r"Syrian?",
             r"(Tarek\s*)?El\s*Sayed",
             r"Tehran",
+            r"Timur\s*Kulibayev",
             r"Tripoli",
             r"Tunisian?",
-            r"Turk(ey|ish)",
-            r"Turks(?! & Caicos)",
+            r"Turk(ey|ish)?(?!s & Caicos)",
             r"UAE",
             r"((Iraq|Iran|Kuwait|Qatar|Yemen)i?)",
         ],
@@ -1281,6 +1336,7 @@ HIGHLIGHTED_NAMES = [
         },
         patterns=[
             r"(Matt(hew)? )?Hiltzi[gk]",
+            r"Philip\s*Barden",
             r"PR\s*Newswire",
             REPUTATION_MGMT,
             r"Reputation.com",
@@ -1308,6 +1364,7 @@ HIGHLIGHTED_NAMES = [
             r"Broidy",
             r"(Chris\s)?Christie",
             r"(?<!Merwin Dela )Cruz",
+            r"Darrell\s*Issa",
             r"Devin\s*Nunes",
             r"(Don\s*)?McGa[hn]n",
             r"Erik Prince",
@@ -1315,6 +1372,8 @@ HIGHLIGHTED_NAMES = [
             r"George\s*(H\.?\s*)?(W\.?\s*)?Bush",
             r"(George\s*)?Nader",
             r"GOP",
+            r"((Chair|Jay|Joseph)\s*)?Clayton",  # SEC chair, now SDNY
+            r"((Bill|William)\s*)?Hinman"
             r"Jeff(rey)?\s*Sessions",
             r"(John\s*(R.?\s*)?)?Bolton",
             r"Kasich",
@@ -1333,7 +1392,7 @@ HIGHLIGHTED_NAMES = [
             r"(Michael\s)?Hayden",
             r"((General|Mike)\s*)?(Flynn|Pence)",
             r"(Mitt\s*)?Romney",
-            r"Mnuchin",
+            r"(Steven?\s*)?Mnuchin",
             r"(Newt\s*)Gingrich",
             r"Nikki",
             r"Haley",
@@ -1346,7 +1405,9 @@ HIGHLIGHTED_NAMES = [
             r"(Rex\s*)?Till?erson",
             r"(?<!Cynthia )(Richard\s*)?Nixon",
             r"RNC",
+            r"(Roy|Stephen)\s*Moore",
             r"Tea\s*Party",
+            r"Wilbur\s*Ross",
         ],
     ),
     HighlightedNames(
@@ -1364,7 +1425,7 @@ HIGHLIGHTED_NAMES = [
         emailers={
             'Dasha Zhukova': 'art collector, daughter of Alexander Zhukov',
             MASHA_DROKOVA: 'silicon valley VC, former Putin Youth member',
-            RENATA_BOLOTOVA: 'former model, fund manager at New York State Insurance Fund',
+            RENATA_BOLOTOVA: 'former model, fund manager at New York State Insurance Fund, Рената Болотова',
             SVETLANA_POZHIDAEVA: "Epstein's Russian assistant who was recommended for a visa by Sergei Belyakov (FSB) and David Blaine",
         },
         patterns=[
@@ -1383,20 +1444,21 @@ HIGHLIGHTED_NAMES = [
             r"(Anastasia\s*)?Kuznetsova",
             r"Lavrov",
             r"Lukoil",
+            r'(Semion\s*)?Mogilevich',
             r"Moscow",
             r"(Natalia\s*)?Veselnitskaya",
             r"(Oleg\s*)?Deripaska",
             r"Oleksandr Vilkul",
             r"Onexim",  # Prokhorov investment vehicle
             r"Prokhorov",
+            r"Rakishev",
             r"Rosneft",
             r"RT",
             r"St.?\s*?Petersburg",
             r'Svet',
-            r"Russian?",
+            r"Russ?ian?",
             r"Sberbank",
             r"Soviet(\s*Union)?",
-            r"Timur\s*Kulibayev",
             r"USSR",
             r"Vlad(imir)?(?! Yudash)",
             r"(Vladimir\s*)?Putin",
@@ -1435,6 +1497,7 @@ HIGHLIGHTED_NAMES = [
             REID_HOFFMAN: 'PayPal mafia member, founder of LinkedIn',
             STEVEN_SINOFSKY: 'ex-Microsoft, loves bitcoin',
             VINCENZO_IOZZO: 'CEO of the identity-security company SlashID',
+            ZUBAIR_KHAN: 'Tranchulas cybersecurity, InsightsPod founder, Islamabad / Dubai',
         },
         patterns=[
             r"AG?I",
@@ -1443,6 +1506,7 @@ HIGHLIGHTED_NAMES = [
             r"Danny\s*Hillis",
             r"deep learning",
             r"Drew\s*Houston",
+            r"Eliezer\s*Yudkowsky",
             r"Eric\s*Schmidt",
             r"Greylock(\s*Partners)?",
             r"(?<!(ustin|Moshe)\s)Hoffmand?",
@@ -1462,6 +1526,7 @@ HIGHLIGHTED_NAMES = [
             r"Softbank",
             r"SpaceX",
             r"Tim\s*Ferriss?",
+            r"Vision\s*Fund",
             r"WikiLeak(ed|s)",
         ],
     ),
@@ -1476,6 +1541,7 @@ HIGHLIGHTED_NAMES = [
             r"@?realDonaldTrump",
             r"(Alan\s*)?Weiss?elberg",
             r"Alex\s*Jones",
+            r"(Brad(ley)?\s*)Parscale",
             r"\bDJ?T\b",
             r"Donald J. Tramp",
             r"(Donald\s+(J\.\s+)?)?Trump(ism|\s*(Org(anization)?|Properties)(\s*LLC)?)?",
@@ -1518,22 +1584,24 @@ HIGHLIGHTED_NAMES = [
             r"(Kenneth E\. )?Mapp",
             r"PBI",
             r"Puerto\s*Ric(an|o)",
+            r"San\s*Juan",
             r"S(ain)?t.?\s*Thomas",
             r"USVI",
             r"(?<!stein |vis-a-)VI(?!s-a-)",
-            r"(The\s*)?Virgin\s*Is(al|la)nds(\s*Daily\s*News)?",  # Hard to make this work right
+            r"(The\s*)?Virgin\s*Is(al|la)nd?s(\s*Daily\s*News)?",  # Hard to make this work right
             r"(West\s*)?Palm\s*Beach(\s*County)?(?!\s*(Daily|Post))",
         ],
     ),
     HighlightedNames(
         label='victim',
-        style='orchid1',
+        style=VICTIM_COLOR,
         patterns=[
-            r"#metoo",
+            r"child\s*pornography",
             r"(David\s*)?Bo[il]es(,?\s*Schiller( & Flexner)?)?",
             r"(Gloria\s*)?Allred",
             r"(Jane|Tiffany)\s*Doe",
             r"Katie\s*Johnson",
+            r"Minor\s*Victim",
             r"pedophile",
             r"Stephanie\s*Clifford",
             r"Stormy\s*Daniels",
@@ -1546,7 +1614,9 @@ HIGHLIGHTED_NAMES = [
         style='medium_orchid1',
         emailers={
             BRAD_EDWARDS: ROTHSTEIN_ROSENFELDT_ADLER,
+            'Douglas Wigdor': f'lawsuit against {LEON_BLACK}, Wigdor LLP',
             'Grant J. Smith': ROTHSTEIN_ROSENFELDT_ADLER,
+            'Jeanne M. Christensen': f'lawsuit against {LEON_BLACK}, Wigdor LLP',
             JACK_SCAROLA: 'Searcy Denney Scarola Barnhart & Shipley',
             KEN_JENNE: ROTHSTEIN_ROSENFELDT_ADLER,
         },
@@ -1557,6 +1627,7 @@ HIGHLIGHTED_NAMES = [
             r"Paul\s*(G.\s*)?Cassell",
             r"Rothstein\s*Rosenfeldt\s*Adler",
             r"(Scott\s*)?Rothstein",
+            r"Wigdor(Law)?",
         ],
     ),
     HighlightedNames(
@@ -1583,7 +1654,11 @@ HIGHLIGHTED_NAMES = [
     HighlightedNames(
         emailers={GHISLAINE_MAXWELL: "Epstein's girlfriend, daughter of the spy Robert Maxwell"},
         category='Epstein',
-        patterns=[r"gmax(1@ellmax.com)?", r"(The )?TerraMar Project"],
+        patterns=[
+            r"gmax(1@ellmax.com)?",
+            r"(The )?TerraMar Project",
+            r"(Scott\s*)?Borgenson",
+        ],
         style='deep_pink3',
     ),
     HighlightedNames(emailers={JABOR_Y: '"an influential man in Qatar"'}, category=MIDEAST, style='spring_green1'),
@@ -1595,6 +1670,11 @@ HIGHLIGHTED_NAMES = [
     HighlightedNames(emailers={SULTAN_BIN_SULAYEM: 'chairman of ports in Dubai, CEO of DP World'}, style='green1', category=MIDEAST),
 
     # HighlightedText not HighlightedNames bc of word boundary issue
+    HighlightedText(
+        label='metoo',
+        style=VICTIM_COLOR,
+        patterns=[r"#metoo"]
+    ),
     HighlightedText(
         label='phone_number',
         style='bright_green',
@@ -1615,7 +1695,7 @@ HIGHLIGHTED_TEXTS = [
     HighlightedText(
         label='header_field',
         style='plum4',
-        patterns=[r'^>? ?(Date|From|Sent|To|C[cC]|Importance|Reply[- ]?To|Subject|Bee|B[cC]{2}|Attachments|Flag|Classification|((A|De(stinataire)?|Envoye|Expe(cl|d)iteur|Objet|Q) ?)):'],
+        patterns=[r'^[>• ]{,4}(Date ?|From|Sent|To|C[cC]|Importance|Reply[- ]?To|Subject|Bee|B[cC]{2}|Attachments|Flag|Classification|[Il]nline-[Il]mages|((A|Debut du message transfer[&e]|De(stinataire)?|Envoye|Expe(cl|d)iteur|Objet|Q|Sujet) ?)):|^on behalf of'],
     ),
     HighlightedText(
         label='http_links',
@@ -1625,16 +1705,20 @@ HIGHLIGHTED_TEXTS = [
     HighlightedText(
         label='quoted_reply_line',
         style='dim',
-        patterns=[REPLY_REGEX.pattern],
+        patterns=[
+            REPLY_REGEX.pattern, r"^(> )?wrote:$",
+            r"CONFIDENTIAL FOR ATTORNEY'S EYES ONLY(\nDO NOT COPY)?",
+            r"PRIVILEGED ?- ?ATTORNEY WORK.*(\nCONFIDENTIAL - SUBJECT TO.*)?",
+        ],
     ),
     HighlightedText(
         label='redacted',
         style='grey58',
-        patterns=[fr"{REDACTED}|Privileged - Redacted"],
+        patterns=[fr"{REDACTED}|<?Privileged - Redacted>?"],
     ),
     HighlightedText(
         label='sent_from',
-        style='gray42 italic',
+        style='light_cyan3 italic dim',
         patterns=[SENT_FROM_REGEX.pattern],
     ),
     HighlightedText(
@@ -1652,7 +1736,7 @@ HIGHLIGHTED_TEXTS = [
     ManualHighlight(
         label='email_attachments',
         style='gray30 italic',
-        pattern=r"^(> )?Attachments: (?P<email_attachments>.*)",
+        pattern=r"^(> )?(Attachments|[Il]nline-[Il]mages): (?P<email_attachments>.*)",
     ),
     ManualHighlight(
         label='email_timestamp',