epstein-files 1.1.0__py3-none-any.whl → 1.1.3__py3-none-any.whl

epstein_files/util/highlighted_group.py

@@ -1,4 +1,6 @@
+import json
 import re
+from abc import ABC
 from dataclasses import dataclass, field
 
 from rich.highlighter import RegexHighlighter
@@ -7,10 +9,11 @@ from rich.text import Text
 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, HEADER_ABBREVIATIONS,
+from epstein_files.util.constants import (EMAILER_ID_REGEXES, EPSTEIN_V_ROTHSTEIN_EDWARDS,
      OSBORNE_LLP, REPLY_REGEX, SENT_FROM_REGEX, VIRGIN_ISLANDS)
 from epstein_files.util.doc_cfg import *
-from epstein_files.util.data import extract_last_name, listify, without_falsey
+from epstein_files.util.data import extract_last_name, without_falsey
+from epstein_files.util.logging import logger
 
 CIVIL_ATTORNEY = 'civil attorney'
 CRIMINAL_DEFENSE_ATTORNEY = 'criminal defense attorney'
@@ -19,6 +22,7 @@ EPSTEIN_LAWYER = 'Epstein lawyer'
 EPSTEIN_V_ROTHSTEIN_EDWARDS_ATTORNEY = f"{CIVIL_ATTORNEY} working on {EPSTEIN_V_ROTHSTEIN_EDWARDS}"
 ESTATE_EXECUTOR = 'estate executor'
 EPSTEIN_ESTATE_EXECUTOR = f"Epstein {ESTATE_EXECUTOR}"
+QUESTION_MARKS_TXT = Text(QUESTION_MARKS, style='dim')
 REGEX_STYLE_PREFIX = 'regex'
 SIMPLE_NAME_REGEX = re.compile(r"^[-\w ]+$", re.IGNORECASE)
 
@@ -40,9 +44,9 @@ CATEGORY_STYLES = {
 
 
 @dataclass(kw_only=True)
-class HighlightedText:
+class BaseHighlight:
     """
-    Color highlighting for things other than people's names (e.g. phone numbers, email headers).
+    Regex and style information.
 
     Attributes:
         label (str): RegexHighlighter match group name, defaults to 1st 'emailers' key if only 1 emailer provided
@@ -52,24 +56,47 @@ class HighlightedText:
         theme_style_name (str): The style name that must be a part of the rich.Console's theme
     """
     label: str = ''
-    pattern: str = ''
-    style: str
     regex: re.Pattern = field(init=False)
+    style: str
     theme_style_name: str = field(init=False)
     _capture_group_label: str = field(init=False)
     _match_group_var: str = field(init=False)
 
     def __post_init__(self):
         if not self.label:
-            raise ValueError(f"No label provided for {repr(self)}")
+            raise ValueError(f'Missing label for {self}')
 
         self._capture_group_label = self.label.lower().replace(' ', '_').replace('-', '_')
         self._match_group_var = fr"?P<{self._capture_group_label}>"
         self.theme_style_name = f"{REGEX_STYLE_PREFIX}.{self._capture_group_label}"
-        self.regex = re.compile(fr"({self._match_group_var}{self.pattern})", re.IGNORECASE | re.MULTILINE)
 
-    def __str__(self) -> str:
-        return f"{type(self).__name__}(label='{self.label}')"
+
+@dataclass(kw_only=True)
+class HighlightedText(BaseHighlight):
+    """
+    Color highlighting for things other than people's names (e.g. phone numbers, email headers).
+
+    Attributes:
+        label (str): RegexHighlighter match group name, defaults to 1st 'emailers' key if only 1 emailer provided
+        patterns (list[str]): regex patterns identifying strings matching this group
+        regex (re.Pattern): matches self.pattern
+        style (str): Rich style to apply to text matching this group
+        theme_style_name (str): The style name that must be a part of the rich.Console's theme
+    """
+    patterns: list[str] = field(default_factory=list)
+    _pattern: str = field(init=False)
+
+    def __post_init__(self):
+        super().__post_init__()
+
+        if not self.label:
+            raise ValueError(f"No label provided for {repr(self)}")
+
+        self._pattern = '|'.join(self.patterns)
+        self.regex = re.compile(fr"({self._match_group_var}{self._pattern})", re.IGNORECASE | re.MULTILINE)
+
+    def __repr__(self) -> str:
+        return f"{type(self).__name__}(label='{self.label}', pattern='{self._pattern}', style='{self.style}')"
 
 
 @dataclass(kw_only=True)
@@ -85,10 +112,9 @@ class HighlightedNames(HighlightedText):
     """
     category: str = ''
     emailers: dict[str, str | None] = field(default_factory=dict)
-    _pattern: str = field(init=False)
 
     def __post_init__(self):
-        if not (self.emailers or self.pattern):
+        if not (self.emailers or self.patterns):
             raise ValueError(f"Must provide either 'emailers' or 'pattern' arg.")
         elif not self.label:
             if len(self.emailers) == 1:
@@ -97,13 +123,13 @@ class HighlightedNames(HighlightedText):
                 raise ValueError(f"No label provided for {repr(self)}")
 
         super().__post_init__()
-        self._pattern = '|'.join([self._emailer_pattern(e) for e in self.emailers] + listify(self.pattern))
+        self._pattern = '|'.join([self._emailer_pattern(e) for e in self.emailers] + self.patterns)
         self.regex = re.compile(fr"\b({self._match_group_var}({self._pattern})s?)\b", re.IGNORECASE)
 
     def get_info(self, name: str) -> str | None:
         """Label and additional info for 'name' if 'name' is in self.emailers."""
         info_pieces = [
-            None if len(self.emailers) == 1 else (self.category or self.label.replace('_', ' ')),
+            self.category or ('' if len(self.emailers) == 1 else self.label.replace('_', ' ')),
             self.emailers.get(name),
         ]
 
@@ -136,89 +162,287 @@ class HighlightedNames(HighlightedText):
         return '|'.join(name_patterns)
 
     def __str__(self) -> str:
-        return f"{type(self).__name__}(label='{self.label}')"
+        return super().__str__()
+
+    def __repr__(self) -> str:
+        s = f"{type(self).__name__}("
+
+        for property in ['label', 'style', 'category', 'patterns', 'emailers']:
+            value = getattr(self, property)
+
+            if not value or (property == 'label' and len(self.emailers) == 1 and not self.patterns):
+                continue
+
+            s += f"\n    {property}="
+
+            if isinstance(value, dict):
+                s += '{'
+
+                for k, v in value.items():
+                    s += f"\n        {constantize_name(k)}: {json.dumps(v).replace('null', 'None')},"
+
+                s += '\n    },'
+            elif property == 'patterns':
+                s += '[\n        '
+                s += repr(value).removeprefix('[').removesuffix(']').replace(', ', ',\n        ')
+                s += ',\n    ],'
+            else:
+                s += f"{json.dumps(value)},"
+
+        return s + '\n)'
+
+
+@dataclass(kw_only=True)
+class ManualHighlight(BaseHighlight):
+    """For when you can't construct the regex."""
+    pattern: str
+
+    def __post_init__(self):
+        super().__post_init__()
+
+        if self._match_group_var not in self.pattern:
+            raise ValueError(f"Label '{self.label}' must appear in regex pattern '{self.pattern}'")
+
+        self.regex = re.compile(self.pattern, re.MULTILINE)
 
 
 HIGHLIGHTED_NAMES = [
+    # This has to come first to get both stylings applied to the email subjects
+    ManualHighlight(
+        label='email_subject',
+        style='light_yellow3',
+        pattern=r"^(> )?Subject: (?P<email_subject>.*)",
+    ),
+    HighlightedNames(
+        label=ACADEMIA,
+        style='light_goldenrod2',
+        emailers={
+            DAVID_HAIG: 'evolutionary geneticist?',
+            JOSCHA_BACH: 'cognitive science / AI research',
+            'Daniel Kahneman': 'Nobel economic sciences laureate and cognitivie psychologist (?)',
+            'Ed Boyden': f'Associate Professor, {MIT_MEDIA_LAB} neurobiology',
+            'Harry Fisch': "men's health expert at New York-Presbyterian / Weill Cornell (?)",
+            LAWRENCE_KRAUSS: 'theoretical physicist',
+            LINDA_STONE: f'ex-Microsoft, {MIT_MEDIA_LAB}',
+            MARK_TRAMO: 'professor of neurology at UCLA',
+            'Nancy Dahl': 'wife of Lawrence Krauss',
+            NEAL_KASSELL: 'professor of neurosurgery at University of Virginia',
+            PETER_ATTIA: 'longevity medicine',
+            ROBERT_TRIVERS: 'evolutionary biology',
+            ROGER_SCHANK: 'Teachers College, Columbia University',
+        },
+        patterns=[
+            r"Alain Forget",
+            r"Brotherton",
+            r"Carl\s*Sagan",
+            r"Columbia",
+            r"David Grosof",
+            r"J(ames|im)\s*Watson",
+            r"(Lord\s*)?Martin\s*Rees",
+            r"Massachusetts\s*Institute\s*of\s*Technology",
+            r"Media\s*Lab",
+            r"Minsky",
+            r"MIT(\s*Media\s*Lab)?",
+            r"((Noam|Valeria)\s*)?Chomsky",
+            r"Norman\s*Finkelstein",
+            r"Praluent",
+            r"Regeneron",
+            r"(Richard\s*)?Dawkins",
+            r"Sanofi",
+            r"Stanford",
+            r"(Stephen\s*)?Hawking",
+            r"(Steven?\s*)?Pinker",
+            r"UCLA",
+        ],
+    ),
     HighlightedNames(
         label='Africa',
         style='light_pink4',
-        pattern=r'Buhari|Econet(\s*Wireless)|Ghana(ian)?|Glencore|Goodluck Jonathan|Johannesburg|Kenya|Nigerian?|Okey Enelamah|Senegal(ese)?|Serengeti|(South\s*)?African?|(Strive\s*)?Masiyiwa|Tanzania|Ugandan?|Zimbabwe(an)?',
         emailers={
-            'Abdoulaye Wade': 'former president of Senegal, father of Karim Wade',
+            'Abdoulaye Wade': "former president of Senegal, father of Karim Wade",
             'Ivan Glasenberg': "South African former CEO of Glencore, one of the world's largest commodity trading and mining companies",
             'Karim Wade': 'son of the president of Senegal, facing arrest for corruption, email handle is "Afri zp"',
-            'Miles Alexander': 'Operations Manager Michaelhouse Balgowan KwaZulu-Natal South Africa',  # TODO: what's up with this person?
+            'Miles Alexander': 'Operations Manager Michaelhouse Balgowan KwaZulu-Natal South Africa',
             'Macky Sall': 'prime minister of Senegal, defeated Abdoulaye Wade',
         },
+        patterns=[
+            r"Buhari",
+            r"Econet(\s*Wireless)",
+            r"Ghana(ian)?",
+            r"Glencore",
+            r"Goodluck Jonathan",
+            r"Johannesburg",
+            r"Kenya",
+            r"Nigerian?",
+            r"Okey Enelamah",
+            r"Senegal(ese)?",
+            r"Serengeti",
+            r"(South\s*)?African?",
+            r"(Strive\s*)?Masiyiwa",
+            r"Tanzania",
+            r"Ugandan?",
+            r"Zimbabwe(an)?",
+        ],
     ),
     HighlightedNames(
         label='bitcoin',
         style='orange1 bold',
-        pattern=r'Balaji|bitcoin|block ?chain(\s*capital)?|Brock(\s*Pierce)?|coins?|cr[iy]?pto(currenc(y|ies))?|e-currency|(Gavin )?Andressen|(Howard\s+)?Lutnic?k|Libra|Madars|(Patrick\s*)?Murck|(Ross\s*)?Ulbricht|Silk\s*Road|SpanCash|Tether|virtual\s*currenc(ies|y)|(zero\s+knowledge\s+|zk)pro(of|tocols?)',
-        emailers = {
+        emailers={
             '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",
             ANTHONY_SCARAMUCCI: 'Skybridge Capital, FTX investor',
         },
+        patterns=[
+            r"Balaji",
+            r"bitcoin",
+            r"block ?chain(\s*capital)?",
+            r"Brock(\s*Pierce)?",
+            r"coins?",
+            r"cr[iy]?pto(currenc(y|ies))?",
+            r"e-currency",
+            r"(Gavin )?Andressen",
+            r"(Howard\s+)?Lutnic?k",
+            r"Libra",
+            r"Madars",
+            r"(Patrick\s*)?Murck",
+            r"(Ross\s*)?Ulbricht",
+            r"Silk\s*Road",
+            r"SpanCash",
+            r"Tether",
+            r"virtual\s*currenc(ies|y)",
+            r"(zero\s+knowledge\s+|zk)pro(of|tocols?)",
+        ],
     ),
     HighlightedNames(
         label=BUSINESS,
         style='spring_green4',
-        pattern=r'Gruterite|(John\s*)?Kluge|Marc Rich|(Mi(chael|ke)\s*)?Ovitz|(Steve\s+)?Wynn|(Les(lie)?\s+)?Wexner|New Leaf Ventures|Park Partners|SALSS|Swedish[-\s]*American\s*Life\s*Science\s*Summit|Valhi|(Yves\s*)?Bouvier',
-        emailers = {
+        emailers={
             ALIREZA_ITTIHADIEH: 'CEO Freestream Aircraft Limited',
             BARBRO_C_EHNBOM: 'Swedish pharmaceuticals, SALSS',
+            'David Mitchell': 'president of New York real estate development firm Mitchell Holdings',
             FRED_HADDAD: "co-founder of Heck's in West Virginia",
-            GERALD_BARTON: "Maryland property developer Landmark Land Company, fan of Trump's Irish golf course",
+            GERALD_BARTON: "Maryland property developer Landmark Land Company",
             GORDON_GETTY: 'heir of oil tycoon J. Paul Getty',
             NICHOLAS_RIBIS: 'Hilton CEO, former president of Trump Organization',
             'Philip Kafka': 'president of Prince Concepts (and son of Terry Kafka?)',
-            ROBERT_LAWRENCE_KUHN: "investment banker, China expert",
+            ROBERT_LAWRENCE_KUHN: 'investment banker, China expert',
             TERRY_KAFKA: 'CEO of Impact Outdoor (highway billboards)',
             TOM_PRITZKER: 'brother of J.B. Pritzker',
-        }
+        },
+        patterns=[
+            r"((Bill|David)\s*)?Koch(\s*(Bro(s|thers)|Industries))?",
+            r"Gruterite",
+            r"(John\s*)?Kluge",
+            r"Marc Rich",
+            r"(Mi(chael|ke)\s*)?Ovitz",
+            r"(Steve\s+)?Wynn",
+            r"(Les(lie)?\s+)?Wexner",
+            r"New Leaf Ventures",
+            r"Park Partners",
+            r"SALSS",
+            r"Swedish[-\s]*American\s*Life\s*Science\s*Summit",
+            r"Valhi",
+            r"(Yves\s*)?Bouvier",
+        ],
     ),
     HighlightedNames(
         label='cannabis',
         style='chartreuse2',
-        pattern=r"CBD|cannabis|marijuana|THC|WEED(guide|maps)?[^s]?",
+        patterns=[
+            r"CBD",
+            r"cannabis",
+            r"marijuana",
+            r"THC",
+            r"WEED(guide|maps)?[^s]?",
+        ],
     ),
     HighlightedNames(
         label='China',
         style='bright_red',
-        pattern=r"Ali.?baba|Beijing|CCP|Chin(a|e?se)(?! Daily)|DPRK|Global Times|Guo|Hong|Huaw[ae]i|Kim\s*Jong\s*Un|Kong|Jack\s+Ma|Kwok|Ministry\sof\sState\sSecurity|Mongolian?|MSS|North\s*Korea|Peking|PRC|SCMP|Tai(pei|wan)|Xi(aomi)?|Jinping",
         emailers={
             'Gino Yu': 'professor / game designer in Hong Kong',
-        }
+        },
+        patterns=[
+            r"Ali.?baba",
+            r"Beijing",
+            r"CCP",
+            r"Chin(a|e?se)(?! Daily)",
+            r"DPRK",
+            r"Global Times",
+            r"Guo",
+            r"Hong",
+            r"Huaw[ae]i",
+            r"Kim\s*Jong\s*Un",
+            r"Kong",
+            r"Jack\s+Ma",
+            r"Kwok",
+            r"Ministry\sof\sState\sSecurity",
+            r"Mongolian?",
+            r"MSS",
+            r"North\s*Korea",
+            r"Peking",
+            r"PRC",
+            r"Pyongyang",
+            r"SCMP",
+            r"Xi(aomi)?",
+            r"Jinping",
+        ],
     ),
     HighlightedNames(
-        label='Deepak Chopra',
+        label=DEEPAK_CHOPRA,
         style='dark_sea_green4',
-        emailers = {
-            'Carolyn Rangel': 'assistant',
+        emailers={
+            CAROLYN_RANGEL: 'assistant',
             DEEPAK_CHOPRA: 'woo woo',
-        }
+        },
     ),
     HighlightedNames(
-        label='Democrats',
+        label='Democrat',
         style='sky_blue1',
-        pattern=r'(Al\s*)?Franken|((Bill|Hillart?y)\s*)?Clinton|((Chuck|Charles)\s*)?S(ch|hc)umer|(Diana\s*)?DeGette|DNC|Elena\s*Kagan|(Eliott?\s*)?Spitzer(, Eliot)?|George\s*Mitchell|(George\s*)?Soros|Hill?ary|Dem(ocrat(ic)?)?|(Jo(e|seph)\s*)?Biden|(John\s*)?Kerry|Lisa Monaco|(Matteo\s*)?Salvini|Maxine\s*Waters|(Barac?k )?Obama|(Nancy )?Pelosi|Ron\s*Dellums|Schumer|(Tim\s*)?Geithner|Vernon\s*Jordan',
+        emailers={
+            PAUL_PROSPERI: 'friend of Bill Clinton',
+        },
+        patterns=[
+            r"(Al\s*)?Franken",
+            r"(Barac?k )?Obama",
+            r"((Bill|Hillart?y)\s*)?Clinton",
+            r"((Chuck|Charles)\s*)?S(ch|hc)umer",
+            r"Dem(ocrat(ic)?)?",
+            r"(Diana\s*)?DeGette",
+            r"DNC",
+            r"Elena\s*Kagan",
+            r"(Eliott?\s*)?Spitzer(, Eliot)?",
+            r"Eric Holder",
+            r"George\s*Mitchell",
+            r"(George\s*)?Soros",
+            r"Hill?ary",
+            r"HRC",
+            r"(Jo(e|seph)\s*)?Biden",
+            r"(John\s*)?Kerry",
+            r"Lisa Monaco",
+            r"(Matteo\s*)?Salvini",
+            r"Maxine\s*Waters",
+            r"(Nancy )?Pelosi",
+            r"Ron\s*Dellums",
+            r"Schumer",
+            r"(Tim\s*)?Geithner",
+            r"Vernon\s*Jordan",
+        ],
     ),
     HighlightedNames(
         label='Dubin family',
         style='medium_orchid1',
-        pattern=r'((Celina|Eva( Anderss?on)?|Glenn) )?Dubin',
-        emailers = {
+        emailers={
             GLENN_DUBIN: "Highbridge Capital Management, married to Epstein's ex-gf Eva",
             EVA: "possibly Epstein's ex-girlfriend (?)",
         },
+        patterns=[r"((Celina|Eva( Anderss?on)?|Glenn) )?Dubin"],
     ),
     HighlightedNames(
         label='employee',
         style='deep_sky_blue4',
-        pattern=r'Merwin',
-        emailers = {
+        emailers={
             'Alfredo Rodriguez': "Epstein's butler, stole the journal",
             ERIC_ROTH: 'jet decorator',
             GWENDOLYN_BECK: 'Epstein fund manager in the 90s',
@@ -229,28 +453,51 @@ HIGHLIGHTED_NAMES = [
             MERWIN_DELA_CRUZ: None,  # HOUSE_OVERSIGHT_032652 Groff says "Jojo and Merwin both requested off Nov. 25 and 26"
             NADIA_MARCINKO: 'pilot',
             'Sean J. Lancaster': 'airplane reseller',
-        }
+        },
+        patterns=[r"Merwin"],
     ),
     HighlightedNames(
         label=ENTERTAINER,
         style='light_steel_blue3',
-        pattern=r'(Art )?Spiegelman|Bobby slayton|bono\s*mick|Errol(\s*Morris)?|Etienne Binant|(Frank\s)?Gehry|Jagger|(Jeffrey\s*)?Katzenberg|(Johnny\s*)?Depp|Kid Rock|Lena\s*Dunham|Madonna|Mark\s*Burnett|Ramsey Elkholy|shirley maclaine|Steven Gaydos?|Woody( Allen)?|Zach Braff',
         emailers={
             ANDRES_SERRANO: "'Piss Christ' artist",
-            'Barry Josephson': 'American film producer and former music manager, editor FamilySecurityMatters.org',
+            'Barry Josephson': 'American film producer, editor FamilySecurityMatters.org',
             BILL_SIEGEL: 'documentary film producer and director',
             DAVID_BLAINE: 'famous magician',
             HENRY_HOLT: f"{MICHAEL_WOLFF}'s book publisher",
             'Richard Merkin': 'painter, illustrator and arts educator',
             STEVEN_PFEIFFER: 'Associate Director at Independent Filmmaker Project (IFP)',
         },
+        patterns=[
+            r"(Art )?Spiegelman",
+            r"Artspace",
+            r"Bobby slayton",
+            r"bono\s*mick",
+            r"Errol(\s*Morris)?",
+            r"Etienne Binant",
+            r"(Frank\s)?Gehry",
+            r"Jagger",
+            r"(Jeffrey\s*)?Katzenberg",
+            r"(Johnny\s*)?Depp",
+            r"Kid Rock",
+            r"(Larry\s*)?Gagosian",
+            r"Lena\s*Dunham",
+            r"Madonna",
+            r"Mark\s*Burnett",
+            r"Phaidon",
+            r"Ramsey Elkholy",
+            r"Regan arts",
+            r"shirley maclaine",
+            r"Steven Gaydos?",
+            r"Woody( Allen)?",
+            r"Zach Braff",
+        ],
     ),
     HighlightedNames(
         label=EPSTEIN_LAWYER,
         style='purple',
-        pattern=r'(Barry (E. )?)?Krischer|Kate Kelly|Kirkland\s*&\s*Ellis|(Leon\s*)?Jaworski|Michael J. Pike|Paul,?\s*Weiss|Steptoe|Wein(berg|garten)',
-        emailers = {
-            'Alan S Halperin': 'parnter at Paul, Weiss',
+        emailers={
+            'Alan S Halperin': 'partner at Paul, Weiss',
             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',
@@ -261,52 +508,119 @@ HIGHLIGHTED_NAMES = [
             JACK_GOLDBERGER: CRIMINAL_DEFENSE_2008,
             JACKIE_PERCZEK: CRIMINAL_DEFENSE_2008,
             JAY_LEFKOWITZ: f"Kirkland & Ellis partner, {CRIMINAL_DEFENSE_2008}",
-            JESSICA_CADWELL: 'paralegal',  # paralegal, see https://x.com/ImDrinknWyn/status/1993765348898927022
+            JESSICA_CADWELL: f'paralegal to {ROBERT_D_CRITTON_JR}',  # house_oversight_030464
             LILLY_SANCHEZ: CRIMINAL_DEFENSE_ATTORNEY,
             MARTIN_WEINBERG: CRIMINAL_DEFENSE_ATTORNEY,
             MICHAEL_MILLER: 'Steptoe LLP partner',
             REID_WEINGARTEN: 'Steptoe LLP partner',
-            ROBERT_D_CRITTON_JR: 'criminal defense attorney',
-            'Robert Gold': None,
+            ROBERT_D_CRITTON_JR: CRIMINAL_DEFENSE_ATTORNEY,
+            'Robert Gold': 'helped Epstein track down millions belonging to wealthy Spanish families',
             'Roy Black': CRIMINAL_DEFENSE_2008,
-            SCOTT_J_LINK: None,
+            SCOTT_J_LINK: CRIMINAL_DEFENSE_ATTORNEY,
             TONJA_HADDAD_COLEMAN: f'{EPSTEIN_V_ROTHSTEIN_EDWARDS_ATTORNEY}, maybe daughter of Fred Haddad?',
-        }
+        },
+        patterns=[
+            r"(Barry (E. )?)?Krischer",
+            r"Kate Kelly",
+            r"Kirkland\s*&\s*Ellis",
+            r"(Leon\s*)?Jaworski",
+            r"Michael J. Pike",
+            r"Paul,?\s*Weiss",
+            r"Steptoe(\s*LLP)?",
+            r"Wein(berg|garten)",
+        ],
     ),
     HighlightedNames(
         label=ESTATE_EXECUTOR,
         style='purple3 bold',
-        category='Epstein lawyer',
-        emailers = {
+        category=EPSTEIN_LAWYER,
+        emailers={
             DARREN_INDYKE: EPSTEIN_ESTATE_EXECUTOR,
             RICHARD_KAHN: EPSTEIN_ESTATE_EXECUTOR,
-        }
+        },
     ),
     HighlightedNames(
-        label='europe',
+        label='Europe',
         style='light_sky_blue3',
-        pattern=r'(Angela )?Merk(el|le)|Austria|(Benjamin\s*)?Harnwell|Berlin|Borge|Boris\s*Johnson|Brexit(eers?)?|Brit(ain|ish)|Brussels|Cannes|(Caroline|Jack)?\s*Lang(, Caroline)?|Cypr(iot|us)|Davos|ECB|England|EU|Europe(an)?(\s*Union)?|Fr(ance|ench)|Geneva|Germany?|Gillard|Gree(ce|k)|Ital(ian|y)|Jacques|(Kevin\s*)?Rudd|Le\s*Pen|London|Macron|Melusine|Munich|(Natalia\s*)?Veselnitskaya|(Nicholas\s*)?Sarkozy|Nigel(\s*Farage)?|Norw(ay|egian)|Oslo|Paris|Polish|pope|(Sebastian )?Kurz|(Vi(c|k)tor\s+)?Orbah?n|Edward Rod Larsen|Strasbourg|Strauss[- ]?Kahn|Swed(en|ish)(?![-\s]+America)|Switzerland|(Tony\s)?Blair|U\.?K\.?|Ukrain(e|ian)|Vienna|(Vitaly\s*)?Churkin|Zug',
-        emailers = {
+        emailers={
             ANDRZEJ_DUDA: 'former president of Poland',
             MIROSLAV_LAJCAK: 'Russia-friendly Slovakian politician, friend of Steve Bannon',
             PETER_MANDELSON: 'UK politics',
             TERJE_ROD_LARSEN: 'Norwegian diplomat',
             THORBJORN_JAGLAND: 'former prime minister of Norway and head of the Nobel Peace Prize Committee',
-        }
+        },
+        patterns=[
+            r"(Angela )?Merk(el|le)",
+            r"Austria",
+            r"(Benjamin\s*)?Harnwell",
+            r"Berlin",
+            r"Borge",
+            r"Boris\s*Johnson",
+            r"Brexit(eers?)?",
+            r"Brit(ain|ish)",
+            r"Brussels",
+            r"Cannes",
+            r"(Caroline|Jack)?\s*Lang(, Caroline)?",
+            r"Cypr(iot|us)",
+            r"Davos",
+            r"ECB",
+            r"England",
+            r"EU",
+            r"Europe(an)?(\s*Union)?",
+            r"Fr(ance|ench)",
+            r"Geneva",
+            r"Germany?",
+            r"Gillard",
+            r"Gree(ce|k)",
+            r"Ital(ian|y)",
+            r"Jacques",
+            r"Kiev",
+            r"Le\s*Pen",
+            r"London",
+            r"Macron",
+            r"Melusine",
+            r"MI\s*5",
+            r"Munich",
+            r"NATO",
+            r"(Nicholas\s*)?Sarkozy",
+            r"Nigel(\s*Farage)?",
+            r"Norw(ay|egian)",
+            r"Oslo",
+            r"Paris",
+            r"Polish",
+            r"pope",
+            r"(Sebastian )?Kurz",
+            r"(Vi(c|k)tor\s+)?Orbah?n",
+            r"Edward Rod Larsen",
+            r"Strasbourg",
+            r"Strauss[- ]?Kahn",
+            r"Swed(en|ish)(?![-\s]+American Life Scienc)",
+            r"Switzerland",
+            r"(Tony\s)?Blair",
+            r"U\.K\.",
+            r"Ukrain(e|ian)",
+            r"Vienna",
+            r"Zug",
+        ],
     ),
     HighlightedNames(
         label='famous lawyer',
         style='medium_purple3',
-        pattern=r'(David\s*)?Bo[il]es|dersh|(Gloria\s*)?Allred|(Mi(chael|ke)\s*)?Avenatti',
-        emailers = {
+        emailers={
             ALAN_DERSHOWITZ: 'Harvard Law School professor and all around (in)famous American lawyer',
+            'Fabrice Aidan': f'diplomat who worked with {TERJE_ROD_LARSEN}',
             KEN_STARR: 'head of the Monica Lewinsky investigation against Bill Clinton',
-        }
+        },
+        patterns=[
+            r"(David\s*)?Bo[il]es",
+            r"dersh",
+            r"(Gloria\s*)?Allred",
+            r"(Mi(chael|ke)\s*)?Avenatti",
+        ],
     ),
     HighlightedNames(
         label=FINANCE,
         style='green',
-        pattern=r'Apollo|Ari\s*Glass|Bank|(Bernie\s*)?Madoff|Black(rock|stone)|B\s*of\s*A|Boothbay(\sFund\sManagement)?|Chase\s*Bank|Credit\s*Suisse|DB|Deutsche?\s*(Asset|Bank)|Electron\s*Capital\s*(Partners)?|Fenner|FRBNY|Goldman(\s*Sachs)|HSBC|Invesco|(Janet\s*)?Yellen|(Jerome\s*)?Powell(?!M\. Cabot)|(Jimmy\s*)?Cayne|JPMC?|j\.?p\.?\s*morgan(\.?com|\s*Chase)?|Madoff|Merrill(\s*Lynch)?|(Michael\s*)?(Cembalest|Milken)|Mizrahi\s*Bank|MLPF&S|((anti.?)?money\s+)?launder(s?|ers?|ing)?(\s+money)?|Morgan Stanley|(Peter L. )?Scher|(Ray\s*)?Dalio|(Richard\s*)?LeFrak|Schwartz?man|Serageldin|UBS|us.gio@jpmorgan.com',
         emailers={
             AMANDA_ENS: 'Citigroup',
             BRAD_WECHSLER: f"head of {LEON_BLACK}'s personal investment vehicle according to FT",
@@ -317,101 +631,325 @@ HIGHLIGHTED_NAMES = [
             'Laurie Cameron': 'currency trading',
             LEON_BLACK: 'Apollo CEO',
             MARC_LEON: 'Luxury Properties Sari Morrocco',
-            MELANIE_SPINELLA: f'representative of {LEON_BLACK}',
-            MORTIMER_ZUCKERMAN: 'business partner of Epstein',
+            MELANIE_SPINELLA: 'representative of Leon Black',
+            MORTIMER_ZUCKERMAN: 'business partner of Epstein, newspaper publisher',
+            NORMAN_D_RAU: 'managing director at Morgan Stanley',
             PAUL_BARRETT: None,
             PAUL_MORRIS: DEUTSCHE_BANK,
+            'Skip Rimer': 'Milken Institute (Michael Milken)',
             'Steven Elkman': DEUTSCHE_BANK,
-        }
+            'Vahe Stepanian': 'Cetera Financial Group',
+        },
+        patterns=[
+            r"((anti.?)?money\s+)?launder(s?|ers?|ing)?(\s+money)?",
+            r"Apollo",
+            r"Ari\s*Glass",
+            r"Bank(\s*of\s*Scotland)",
+            r"(Bernie\s*)?Madoff",
+            r"Black(rock|stone)",
+            r"B\s*of\s*A",
+            r"Boothbay(\sFund\sManagement)?",
+            r"Chase\s*Bank",
+            r"Credit\s*Suisse",
+            r"DB",
+            r"Deutsche?\s*(Asset|Bank)",
+            r"Electron\s*Capital\s*(Partners)?",
+            r"Fenner",
+            r"FRBNY",
+            r"Goldman(\s*Sachs)",
+            r"GRAT",
+            r"HSBC",
+            r"Invesco",
+            r"(Janet\s*)?Yellen",
+            r"(Jerome\s*)?Powell(?!M\. Cabot)",
+            r"(Jimmy\s*)?Cayne",
+            r"JPMC?",
+            r"j\.?p\.?\s*morgan(\.?com|\s*Chase)?",
+            r"Madoff",
+            r"Merrill(\s*Lynch)?",
+            r"(Michael\s*)?(Cembalest|Milken)",
+            r"Mizrahi\s*Bank",
+            r"MLPF&S",
+            r"Morgan Stanley",
+            r"(Peter L. )?Scher",
+            r"(Ray\s*)?Dalio",
+            r"(Richard\s*)?LeFrak",
+            r"Schwartz?man",
+            r"Serageldin",
+            r"UBS",
+            r"us.gio@jpmorgan.com",
+        ],
     ),
     HighlightedNames(
         label='friend',
         style='tan',
-        pattern=r"Andrew Farkas|Thomas\s*(J\.?\s*)?Barrack(\s*Jr)?",
-        emailers = {
+        emailers={
             DANGENE_AND_JENNIE_ENTERPRISE: 'founders of the members-only CORE club',
             DAVID_STERN: f'emailed Epstein from Moscow, appears to know chairman of {DEUTSCHE_BANK}',
             JONATHAN_FARKAS: "heir to the Alexander's department store fortune",
-            'linkspirit': "Skype username of someone Epstein communicated with",
+            'linkspirit': 'Skype username of someone Epstein communicated with',
             'Peter Thomas Roth': 'student of Epstein at Dalton, skincare company founder',
             STEPHEN_HANSON: None,
             TOM_BARRACK: 'long time friend of Trump',
         },
+        patterns=[
+            r"Andrew Farkas",
+            r"Thomas\s*(J\.?\s*)?Barrack(\s*Jr)?",
+        ],
     ),
     HighlightedNames(
         label=HARVARD,
         style='light_goldenrod3',
-        pattern=r'Cambridge|(Derek\s*)?Bok|Elisa(\s*New)?|Harvard(\s*(Business|Law|University)(\s*School)?)?|(Jonathan\s*)?Zittrain|(Stephen\s*)?Kosslyn',
-        emailers = {
-            "Donald Rubin": f"Professor of Statistics",
-            "Kelly Friendly": f"longtime aide and spokesperson of {LARRY_SUMMERS}",
-            LARRY_SUMMERS: 'board of Digital Currency Group (DCG), Harvard president, Obama economic advisor',
-            'Leah Reis-Dennis': 'producer for Lisa New\'s Poetry in America',
+        emailers={
+            'Donald Rubin': 'Professor of Statistics',
+            'Kelly Friendly': 'longtime aide and spokesperson of Larry Summers',
+            LARRY_SUMMERS: 'board of Digital Currency Group (DCG), Obama economic advisor',
+            'Leah Reis-Dennis': "producer for Lisa New's Poetry in America",
             LISA_NEW: f'professor of poetry, wife of {LARRY_SUMMERS}, AKA "Elisa New"',
             'Lisa Randall': 'theoretical physicist',
             MARTIN_NOWAK: 'professor of mathematics and biology',
             MOSHE_HOFFMAN: 'lecturer and research scholar in behavioral and evolutionary economics',
-        }
+        },
+        patterns=[
+            r"Cambridge",
+            r"(Derek\s*)?Bok",
+            r"Elisa(\s*New)?",
+            r"Harvard(\s*(Business|Law|University)(\s*School)?)?",
+            r"(Jonathan\s*)?Zittrain",
+            r"Poetry\s*in\s*America",
+            r"(Stephen\s*)?Kosslyn",
+        ],
     ),
     HighlightedNames(
         label='India',
         style='bright_green',
-        pattern=r'Abraaj|Anna\s*Hazare|(Arif\s*)?Naqvi|(Arvind\s*)?Kejriwal|Bangalore|Hardeep( Pur[ei]e)?|Indian?|InsightsPod|Modi|Mumbai|(New\s*)?Delhi|Tranchulas',
-        emailers = {
+        emailers={
             ANIL_AMBANI: 'chairman of Reliance Group',
             VINIT_SAHNI: None,
-            ZUBAIR_KHAN: 'cybersecurity firm Tranchulas CEO, InsightsPod founder, based in Islamabad and Dubai',
-        }
+            ZUBAIR_KHAN: 'cybersecurity firm Tranchulas CEO, InsightsPod founder, Islamabad/Dubai',
+        },
+        patterns=[
+            r"Abraaj",
+            r"Anna\s*Hazare",
+            r"(Arif\s*)?Naqvi",
+            r"(Arvind\s*)?Kejriwal",
+            r"Bangalore",
+            r"Hardeep( Pur[ei]e)?",
+            r"Indian?",
+            r"InsightsPod",
+            r"Modi",
+            r"Mumbai",
+            r"(New\s*)?Delhi",
+            r"Tranchulas",
+        ],
     ),
     HighlightedNames(
         label='Israel',
         style='dodger_blue2',
-        pattern=r"AIPAC|Bibi|(eh|(Ehud|Nili Priell) )?barak|Ehud\s*Barack|Israeli?|Jerusalem|J\s*Street|Mossad|Netanyahu|(Sheldon\s*)?Adelson|Tel\s*Aviv|(The\s*)?Shimon\s*Post|Yitzhak|Rabin|YIVO|zionist",
         emailers={
             EHUD_BARAK: 'former primer minister',
             'Mitchell Bard': 'director of the American-Israeli Cooperative Enterprise (AICE)',
-            'Nili Priell Barak': f'wife of {EHUD_BARAK}',
-        }
+            'Nili Priell Barak': 'wife of Ehud Barak',
+        },
+        patterns=[
+            r"AIPAC",
+            r"Bibi",
+            r"(eh|(Ehud|Nili Priell)\s*)?barak",
+            r"Ehud\s*Barack",
+            r"Israeli?",
+            r"Jerusalem",
+            r"J\s*Street",
+            r"Mossad",
+            r"Netanyahu",
+            r"(Sheldon\s*)?Adelson",
+            r"Tel\s*Aviv",
+            r"(The\s*)?Shimon\s*Post",
+            r"Yitzhak", r"Rabin",
+            r"YIVO",
+            r"zionist",
+        ],
     ),
     HighlightedNames(
         label='Japan',
         style='color(168)',
-        pattern=r'BOJ|(Bank\s+of\s+)?Japan(ese)?|jpy?(?! Morgan)|SG|Singapore|Toky[op]',
+        patterns=[
+            r"BOJ",
+            r"(Bank\s+of\s+)?Japan(ese)?",
+            r"jpy?(?! Morgan)",
+            r"SG",
+            r"Singapore",
+            r"Toky[op]",
+        ],
     ),
     HighlightedNames(
         label=JOURNALIST,
         style='bright_yellow',
-        pattern=r'Palm\s*Beach\s*(Daily\s*News|Post)|ABC(\s*News)?|Alex\s*Yablon|(Andrew\s*)?Marra|Arianna(\s*Huffington)?|(Arthur\s*)?Kretchmer|BBC|Bloomberg|Breitbart|Charlie\s*Rose|China\s*Daily|CNBC|CNN(politics?)?|Con[cs]hita|Sarnoff|(?<!Virgin[-\s]Islands[-\s])Daily\s*(Beast|Mail|News|Telegraph)|(David\s*)?Pecker|David\s*Brooks|Ed\s*Krassenstein|(Emily\s*)?Michot|Ezra\s*Klein|(George\s*)?Stephanopoulus|Globe\s*and\s*Mail|Good\s*Morning\s*America|Graydon(\s*Carter)?|Huffington(\s*Post)?|Ingram, David|(James\s*)?(Hill|Patterson)|Jonathan\s*Karl|Julie\s*(K.?\s*)?Brown|(Katie\s*)?Couric|Keith\s*Larsen|L\.?A\.?\s*Times|Miami\s*Herald|(Michele\s*)?Dargan|(National\s*)?Enquirer|(The\s*)?N(ew\s*)?Y(ork\s*)?(P(ost)?|T(imes)?)|(The\s*)?New\s*Yorker|NYer|PERVERSION\s*OF\s*JUSTICE|Politico|Pro\s*Publica|(Sean\s*)?Hannity|Sulzberger|SunSentinel|Susan Edelman|(Uma\s*)?Sanghvi|(The\s*)?Wa(shington\s*)?Po(st)?|Viceland|Vick[iy]\s*Ward|Vox|WGBH|(The\s*)?Wall\s*Street\s*Journal|WSJ|[-\w.]+@(bbc|independent|mailonline|mirror|thetimes)\.co\.uk',
-        emailers = {
-            EDWARD_JAY_EPSTEIN: 'reporter who wrote about the kinds of crimes Epstein was involved in, no relation to Jeffrey',
-            'James Hill': 'ABC News',
+        emailers={
+            EDWARD_JAY_EPSTEIN: 'no relation, wrote about the kinds of crimes Epstein was involved in',
+            JAMES_HILL: 'ABC News',
             JENNIFER_JACQUET: 'Future Science',
             JOHN_BROCKMAN: 'literary agent and author specializing in scientific literature',
             LANDON_THOMAS: 'New York Times',
             MICHAEL_WOLFF: 'Author of "Fire and Fury: Inside the Trump White House"',
             PAUL_KRASSNER: '60s counterculture guy',
             'Tim Zagat': 'Zagat restaurant guide CEO',
-        }
+        },
+        patterns=[
+            r"ABC(\s*News)?",
+            r"Alex\s*Yablon",
+            r"Arianna(\s*Huffington)?",
+            r"(Arthur\s*)?Kretchmer",
+            r'Associated\s*Press',
+            r"BBC",
+            r"Bloomberg",
+            r"Breitbart",
+            r"Charlie\s*Rose",
+            r"China\s*Daily",
+            r"CNBC",
+            r"CNN(politics?)?",
+            r"Con[cs]hita",
+            r"Sarnoff",
+            r"(?<!Virgin[-\s]Islands[-\s])Daily\s*(Beast|Mail|News|Telegraph)",
+            r"(David\s*)?(Pecker|Pegg)",
+            r"David\s*Brooks",
+            r"Ed\s*Krassenstein",
+            r"(Emily\s*)?Michot",
+            r"Ezra\s*Klein",
+            r"FrontPage Magazine",
+            r"FT",
+            r"(George\s*)?Stephanopoulus",
+            r"Globe\s*and\s*Mail",
+            r"Good\s*Morning\s*America",
+            r"Graydon(\s*Carter)?",
+            r"Huff(ington)?(\s*Po(st)?)?",
+            r"Ingram, David",
+            r"(James\s*)?(Hill|Patterson)",
+            r"Jonathan\s*Karl",
+            r"Julie\s*(K.?\s*)?Brown", r'jbrown@miamiherald.com',
+            r"(Katie\s*)?Couric",
+            r"Keith\s*Larsen",
+            r"L\.?A\.?\s*Times",
+            r"Miami\s*Herald",
+            r"(Michele\s*)?Dargan",
+            r"(National\s*)?Enquirer",
+            r"NYer",
+            r"Palm\s*Beach\s*(Daily\s*News|Post)",
+            r"PERVERSION\s*OF\s*JUSTICE",
+            r"Politico",
+            r"Pro\s*Publica",
+            r"(Sean\s*)?Hannity",
+            r"Sulzberger",
+            r"SunSentinel",
+            r"Susan Edelman",
+            r"(The\s*)?Financial\s*Times",
+            r"The\s*Guardian",
+            r"(The\s*)?N(ew\s*)?Y(ork\s*)?(P(ost)?|T(imes)?)",
+            r"(The\s*)?New\s*Yorker",
+            r"(The\s*)?Wall\s*Street\s*Journal",
+            r"(The\s*)?Wa(shington\s*)?Po(st)?",
+            r"(Uma\s*)?Sanghvi",
+            r"Vanity\s*Fair",
+            r"Viceland",
+            r"Vick[iy]\s*Ward",
+            r"Vox",
+            r"WGBH",
+            r"WSJ",
+            r"[-\w.]+@(bbc|independent|mailonline|mirror|thetimes)\.co\.uk",
+        ],
     ),
     HighlightedNames(
         label='Latin America',
         style='yellow',
-        pattern=r'Argentin(a|ian)|Bolsonar[aio]|Bra[sz]il(ian)?|Bukele|Caracas|Castro|Colombian?|Cuban?|El\s*Salvador|((Enrique )?Pena )?Nieto|LatAm|Lula|Mexic(an|o)|(Nicolas\s+)?Maduro|Panama( Papers)?|Peru|Venezuelan?|Zambrano',
+        patterns=[
+            r"Argentin(a|ian)",
+            r"Bolsonar[aio]",
+            r"Bra[sz]il(ian)?",
+            r"Caracas",
+            r"Castro",
+            r"Colombian?",
+            r"Cuban?",
+            r"El\s*Salvador",
+            r"((Enrique )?Pena )?Nieto",
+            r"Lat(in)?\s*Am(erica)?",
+            r"Lula",
+            r"Mexic(an|o)",
+            r"(Nicolas\s+)?Maduro",
+            r"Panama( Papers)?",
+            r"Peru(vian)?",
+            r"Venezuelan?",
+            r"Zambrano",
+        ],
     ),
     HighlightedNames(
         label='law enforcement',
         style='color(24) bold',
-        pattern=r'ag|(Alicia\s*)?Valle|AML|(Andrew\s*)?McCabe|((Bob|Robert)\s*)?Mueller|(Byung\s)?Pak|CFTC?|CIA|CIS|CVRA|Dep(artmen)?t\.?\s*of\s*(the\s*)?(Justice|Treasury)|DHS|DOJ|FBI|FCPA|FDIC|Federal\s*Bureau\s*of\s*Investigation|FinCEN|FINRA|FOIA|FTC|IRS|(James\s*)?Comey|(Jennifer\s*Shasky\s*)?Calvery|((Judge|Mark)\s*)?(Carney|Filip)|(Kirk )?Blouin|KYC|NIH|NS(A|C)|OCC|OFAC|(Lann?a\s*)?Belohlavek|(Michael\s*)?Reiter|OGE|Office\s*of\s*Government\s*Ethics|Police Code Enforcement|(Preet\s*)?Bharara|SCOTUS|SD(FL|NY)|SEC|Secret\s*Service|Securities\s*and\s*Exchange\s*Commission|Southern\s*District\s*of\s*(Florida|New\s*York)|State\s*Dep(artmen)?t|Strzok|Supreme\s*Court|Treasury\s*(Dep(artmen)?t|Secretary)|TSA|USAID|(William\s*J\.?\s*)?Zloch',
-        emailers = {
-            ANN_MARIE_VILLAFANA: 'southern district of Florida U.S. Attorney',
-            DANNY_FROST: 'Director of Communications at Manhattan DA',
-        }
+        emailers={
+            ANN_MARIE_VILLAFANA: 'Southern District of Florida (SDFL) U.S. Attorney',
+            DANNY_FROST: 'Director of Communications at Manhattan D.A.',
+        },
+        patterns=[
+            r"AG",
+            r"(Alicia\s*)?Valle",
+            r"AML",
+            r"(Andrew\s*)?McCabe",
+            r"Attorney General",
+            r"((Bob|Robert)\s*)?Mueller",
+            r"(Byung\s)?Pak",
+            r"Case 1:19-cv-03377(-LAP)?",
+            r"CFTC?",
+            r"CIA",
+            r"CIS",
+            r"CVRA",
+            r"Dep(artmen)?t\.?\s*of\s*(the\s*)?(Justice|Treasury)",
+            r"DHS",
+            r"DOJ",
+            r"FBI",
+            r"FCPA",
+            r"FDIC",
+            r"Federal\s*Bureau\s*of\s*Investigation",
+            r"FinCEN",
+            r"FINRA",
+            r"FOIA",
+            r"FTC",
+            r"IRS",
+            r"(James\s*)?Comey",
+            r"Jeff(rey)?\s*Sessions",
+            r"(Jennifer\s*Shasky\s*)?Calvery",
+            r"((Judge|Mark)\s*)?(Carney|Filip)",
+            r"(Judge\s*)?(Kenneth\s*)?(A\.?\s*)?Marra",
+            r"(Justice|Treasury)\s*Dep(t|artment)",
+            r"(Kirk )?Blouin",
+            r"KYC",
+            r"(Lann?a\s*)?Belohlavek",
+            r"NIH",
+            r"NS(A|C)",
+            r"OCC",
+            r"OFAC",
+            r"(Michael\s*)?Reiter",
+            r"OGE",
+            r"Office\s*of\s*Government\s*Ethics",
+            r"Police Code Enforcement",
+            r"(Preet\s*)?Bharara",
+            r"SCOTUS",
+            r"SD(FL|NY)",
+            r"SEC",
+            r"Secret\s*Service",
+            r"Securities\s*and\s*Exchange\s*Commission",
+            r"Southern\s*District\s*of\s*(Florida|New\s*York)",
+            r"State\s*Dep(artmen)?t",
+            r"Strzok",
+            r"Supreme\s*Court",
+            r"Treasury\s*(Dep(artmen)?t|Secretary)",
+            r"TSA",
+            r"U\.?S\.? attorney",
+            r"USAID",
+            r"(William\s*J\.?\s*)?Zloch",
+        ],
     ),
     HighlightedNames(
         label=LOBBYIST,
         style='light_coral',
-        pattern=r'[BR]ob Crowe|CSIS|Stanley Rosenberg',
-        emailers = {
+        emailers={
             'Joshua Cooper Ramo': 'co-CEO of Henry Kissinger Associates',
             KATHERINE_KEATING: 'Daughter of former Australian PM',
             MOHAMED_WAHEED_HASSAN: 'former president of the Maldives',
@@ -419,25 +957,113 @@ HIGHLIGHTED_NAMES = [
             'Paul Keating': 'former PM of Australia',
             PUREVSUREN_LUNDEG: 'Mongolian ambassador to the UN',
             'Stanley Rosenberg': 'former President of the Massachusetts Senate',
-        }
+        },
+        patterns=[
+            r"[BR]ob Crowe",
+            r"CSIS",
+            r"(Kevin\s*)?Rudd",
+            r"Stanley Rosenberg",
+        ],
     ),
     HighlightedNames(
         label='mideast',
         style='dark_sea_green4',
-        # something like this won't match ever because of word boundary: [-\s]9/11[\s.]
-        pattern=r"Abdulmalik Al-Makhlafi|Abdullah|Abu\s+Dhabi|Afghanistan|Al[-\s]?Qa[ei]da|Ahmadinejad|Arab|Aramco|Assad|Bahrain|Basiji?|Benghazi|Cairo|Chagoury|Dj[iu]bo?uti|Doha|[DB]ubai|Egypt(ian)?|Emir(at(es?|i))?|Erdogan|Fashi|Gaddafi|(Hamid\s*)?Karzai|Hamad\s*bin\s*Jassim|HBJ|Houthi|Imran\s+Khan|Iran(ian)?|Isi[ls]|Islam(abad|ic|ist)?|Istanbul|Kh?ashoggi|(Kairat\s*)?Kelimbetov|kasshohgi|Kaz(akh|ich)stan|Kazakh?|Kh[ao]menei|Khalid\s*Sheikh\s*Mohammed|KSA|Leban(ese|on)|Libyan?|Mahmoud|Marra[hk]e[cs]h|MB(N|S|Z)|Mid(dle)?\s*East|Mohammed\s+bin\s+Salman|Morocco|Mubarak|Muslim|Nayaf|Pakistani?|Omar|(Osama\s*)?Bin\s*Laden|Osama(?! al)|Palestin(e|ian)|Persian?|Riya(dh|nd)|Saddam|Salman|Saudi(\s+Arabian?)?|Shariah?|SHC|sheikh|shia|(Sultan\s*)?Yacoub|Syrian?|(Tarek\s*)?El\s*Sayed|Tehran|Tunisian?|Turk(ey|ish)|UAE|((Iraq|Iran|Kuwait|Qatar|Yemen)i?)",
-        emailers = {
-            ANAS_ALRASHEED: f'former information minister of Kuwait {QUESTION_MARKS}',
+        emailers={
+            ANAS_ALRASHEED: 'former information minister of Kuwait (???)',
             AZIZA_ALAHMADI: 'Abu Dhabi Department of Culture & Tourism',
             RAAFAT_ALSABBAGH: 'Saudi royal advisor',
             SHAHER_ABDULHAK_BESHER: 'Yemeni billionaire',
-        }
+        },
+        patterns=[
+            r"Abdulmalik Al-Makhlafi",
+            r"Abdullah",
+            r"Abu\s+Dhabi",
+            r"Afghanistan",
+            r"Al[-\s]?Qa[ei]da",
+            r"Ahmadinejad",
+            r"Arab",
+            r"Aramco",
+            r"Armenia",
+            r"Assad",
+            r"Ayatollah",
+            r"Bahrain",
+            r"Basiji?",
+            r"Beirut",
+            r"Benghazi",
+            r"Cairo",
+            r"Chagoury",
+            r"Damascus",
+            r"Dj[iu]bo?uti",
+            r"Doha",
+            r"[DB]ubai",
+            r"Egypt(ian)?",
+            r"Emir(at(es?|i))?",
+            r"Erdogan",
+            r"Fashi",
+            r"Gaddafi",
+            r"Gulf\s*Cooperation\s*Council",
+            r"GCC",
+            r"(Hamid\s*)?Karzai",
+            r"Hamad\s*bin\s*Jassim",
+            r"Hamas",
+            r"Hezbollah",
+            r"HBJ",
+            r"Houthi",
+            r"Imran\s+Khan",
+            r"Iran(ian)?([-\s]Contra)?",
+            r"Isi[ls]",
+            r"Islam(abad|ic|ist)?",
+            r"Istanbul",
+            r"Kabul",
+            r"(Kairat\s*)?Kelimbetov",
+            r"kasshohgi",
+            r"Kaz(akh|ich)stan",
+            r"Kazakh?",
+            r"Kh[ao]menei",
+            r"Khalid\s*Sheikh\s*Mohammed",
+            r"Kh?ashoggi",
+            r"KSA",
+            r"Leban(ese|on)",
+            r"Libyan?",
+            r"Mahmoud",
+            r"Marra[hk]e[cs]h",
+            r"MB(N|S|Z)",
+            r"Mid(dle)?\s*East(ern)?",
+            r"Mohammed\s+bin\s+Salman",
+            r"Morocco",
+            r"Mubarak",
+            r"Muslim",
+            r"Nayaf",
+            r"Pakistani?",
+            r"Omar",
+            r"(Osama\s*)?Bin\s*Laden",
+            r"Osama(?! al)",
+            r"Palestin(e|ian)",
+            r"Persian?(\s*Gulf)?",
+            r"Riya(dh|nd)",
+            r"Saddam",
+            r"Salman",
+            r"Saudi(\s+Arabian?)?",
+            r"Shariah?",
+            r"SHC",
+            r"sheikh",
+            r"shia",
+            r"(Sultan\s*)?Yacoub",
+            r"Sultan",
+            r"Syrian?",
+            r"(Tarek\s*)?El\s*Sayed",
+            r"Tehran",
+            r"Tripoli",
+            r"Tunisian?",
+            r"Turk(ey|ish)",
+            r"UAE",
+            r"((Iraq|Iran|Kuwait|Qatar|Yemen)i?)",
+        ],
     ),
     HighlightedNames(
         label='modeling',
         style='pale_violet_red1',
-        pattern=r'\w+@mc2mm.com|model(ed|ing)|(Nicole\s*)?Junkerman',
-        emailers = {
+        emailers={
             'Abi Schwinck': 'MC2 Model Management (?)',
             DANIEL_SIAD: None,
             FAITH_KATES: 'Next Models co-founder',
@@ -448,166 +1074,333 @@ HIGHLIGHTED_NAMES = [
             MANUELA_MARTINEZ: 'Mega Partners (Brazilian agency)',
             MARIANA_IDZKOWSKA: None,
             'Michael Sanka': 'MC2 Model Management (?)',
-        }
+            'Vladimir Yudashkin': 'director of the 1 Mother Agency',
+        },
+        patterns=[
+            r"\w+@mc2mm.com",
+            r"model(ed|ing)",
+            r"(Nicole\s*)?Junkerman",  # Also a venture fund manager now
+        ],
     ),
     HighlightedNames(
         label=PUBLICIST,
         style='orange_red1',
-        pattern=fr"(Matt(hew)? )?Hiltzi[gk]|{REPUTATION_MGMT}",
-        emailers = {
+        emailers={
             AL_SECKEL: 'husband of Isabel Maxwell, Mindshift conference organizer who fell off a cliff',
             'Barnaby Marsh': 'co-founder of Saint Partners, a philanthropy services company',
-            CHRISTINA_GALBRAITH: f"{REPUTATION_MGMT}, worked on Epstein's Google search results with {TYLER_SHEARS}",
-            IAN_OSBORNE: f"{OSBORNE_LLP} reputation repairer possibly hired by Epstein ca. 2011-06",
+            CHRISTINA_GALBRAITH: f"{REPUTATION_MGMT}, worked with Tyler Shears",
+            IAN_OSBORNE: f'{OSBORNE_LLP} reputation repairer hired by Epstein in 2011',
             MICHAEL_SITRICK: 'crisis PR',
             'Owen Blicksilver': 'OBPR, Inc.',
             PEGGY_SIEGAL: 'socialite',
             'R. Couri Hay': None,
             ROSS_GOW: 'Acuity Reputation Management',
-            TYLER_SHEARS: f"{REPUTATION_MGMT}, worked on Epstein's Google search results with {CHRISTINA_GALBRAITH}",
-        }
+            TYLER_SHEARS: f"{REPUTATION_MGMT}, worked on with {CHRISTINA_GALBRAITH}",
+        },
+        patterns=[
+            r"(Matt(hew)? )?Hiltzi[gk]",
+            REPUTATION_MGMT,
+        ],
     ),
     HighlightedNames(
-        label='Republicans',
-        style='bold dark_red',
-        pattern=r'Alberto\sGonzale[sz]|(Alex\s*)?Acosta|(Bill\s*)?Barr|Bill\s*Shine|(Bob\s*)?Corker|(John\s*(R.?\s*)?)Bolton|Broidy|(Chris\s)?Christie|Devin\s*Nunes|(Don\s*)?McGa[hn]n|McMaster|(George\s*)?Nader|GOP|(Brett\s*)?Kavanaugh|Kissinger|Kobach|Koch\s*Brothers|Kolfage|Kudlow|Lewandowski|(Marco\s)?Rubio|(Mark\s*)Meadows|Mattis|McCain|(?<!Merwin Dela )Cruz|(Michael\s)?Hayden|((General|Mike)\s*)?(Flynn|Pence)|(Mitt\s*)?Romney|Mnuchin|Nikki|Haley|(Paul\s+)?(Manafort|Volcker)|(Peter\s)?Navarro|Pompeo|Reagan|Reince|Priebus|Republican|(Rex\s*)?Tillerson|(?<!Cynthia )(Richard\s*)?Nixon|Sasse|Tea\s*Party',
-        # There's no emails from these people, they're just here to automate the regex creation for both first + last names
-        emailers = {
+        label='Republican',
+        style='dark_red bold',
+        emailers={
+            "Juleanna Glover": 'CEO of D.C. public affairs advisory firm Ridgely|Walsh',
             RUDY_GIULIANI: None,
             TULSI_GABBARD: None,
         },
+        patterns=[
+            r"Alberto\sGonzale[sz]",
+            r"(Alex\s*)?Acosta",
+            r"(Ben\s*)?Sasse",
+            r"((Bill|William)\s*)?Barr",
+            r"Bill\s*Shine",
+            r"(Bob\s*)?Corker",
+            r"(Brett\s*)?Kavanaugh",
+            r"Broidy",
+            r"(Chris\s)?Christie",
+            r"(?<!Merwin Dela )Cruz",
+            r"Devin\s*Nunes",
+            r"(Don\s*)?McGa[hn]n",
+            r"Fox\s*News",
+            r"George\s*(H\.?\s*)?(W\.?\s*)?Bush",
+            r"(George\s*)?Nader",
+            r"GOP",
+            r"(John\s*(R.?\s*)?)Bolton",
+            r"Kissinger",
+            r"Kobach",
+            r"Kolfage",
+            r"Kudlow",
+            r"Lewandowski",
+            r"(Marco\s)?Rubio",
+            r"(Mark\s*)Meadows",
+            r"Mattis",
+            r"McCain",
+            r"McMaster",
+            r"(Michael\s)?Hayden",
+            r"((General|Mike)\s*)?(Flynn|Pence)",
+            r"(Mitt\s*)?Romney",
+            r"Mnuchin",
+            r"Nikki",
+            r"Haley",
+            r"(Paul\s*)?(Manafort|Volcker)",
+            r"(Peter\s*)?Navarro",
+            r"Pompeo",
+            r"Reagan",
+            r"Reince", r"Priebus",
+            r"Republican",
+            r"(Rex\s*)?Tillerson",
+            r"(?<!Cynthia )(Richard\s*)?Nixon",
+            r"Tea\s*Party",
+        ],
     ),
     HighlightedNames(
-        label='Rothschild family',
+        label='Rothschild',
         style='indian_red',
         emailers={
             ARIANE_DE_ROTHSCHILD: 'heiress',
-            JOHNNY_EL_HACHEM: f'Works with {ARIANE_DE_ROTHSCHILD}',
+            JOHNNY_EL_HACHEM: f'works with {ARIANE_DE_ROTHSCHILD}',
         },
+        patterns=['AdR'],
     ),
     HighlightedNames(
         label='Russia',
         style='red bold',
-        pattern=r'Alfa\s*Bank|Anya\s*Rasulova|Chernobyl|Day\s+One\s+Ventures|(Dmitry\s)?(Kiselyov|(Lana\s*)?Pozhidaeva|Medvedev|Rybolo(o?l?ev|vlev))|Dmitry|FSB|GRU|KGB|Kislyak|Kremlin|Kuznetsova|Lavrov|Lukoil|Moscow|(Oleg\s*)?Deripaska|Oleksandr Vilkul|Rosneft|RT|St.?\s*?Petersburg|Russian?|Sberbank|Soviet(\s*Union)?|USSR|Vladimir|(Vladimir\s*)?(Putin|Yudashkin)|Women\s*Empowerment|Xitrans',
-        emailers = {
+        emailers={
             'Dasha Zhukova': 'art collector, daughter of Alexander Zhukov',
             MASHA_DROKOVA: 'silicon valley VC, former Putin Youth',
             RENATA_BOLOTOVA: 'former aspiring model, now fund manager at New York State Insurance Fund',
-            SVETLANA_POZHIDAEVA: f'Epstein\'s Russian assistant who was recommended for a visa by Sergei Belyakov (FSB) and {DAVID_BLAINE}',
-        }
-    ),
-    HighlightedNames(
-        label=ACADEMIA,
-        style='light_goldenrod2',
-        pattern=r'Alain Forget|Brotherton|Carl\s*Sagan|Columbia|David Grosof|J(ames|im)\s*Watson|(Lord\s*)?Martin\s*Rees|Massachusetts\s*Institute\s*of\s*Technology|MIT(\s*Media\s*Lab)?|Media\s*Lab|Minsky|((Noam|Valeria)\s*)?Chomsky|Norman\s*Finkelstein|Praluent|Regeneron|(Richard\s*)?Dawkins|Sanofi|Stanford|(Stephen\s*)?Hawking|(Steven?\s*)?Pinker|UCLA',
-        emailers = {
-            DAVID_HAIG: 'evolutionary geneticist?',
-            JOSCHA_BACH: 'cognitive science / AI research',
-            'Daniel Kahneman': 'Nobel economic sciences laureate and cognitivie psychologist (?)',
-            'Ed Boyden': 'Associate Professor, MIT Media Lab neurobiology',
-            LAWRENCE_KRAUSS: 'theoretical physicist',
-            LINDA_STONE: 'ex-Microsoft, MIT Media Lab',
-            MARK_TRAMO: 'professor of neurology at UCLA',
-            'Nancy Dahl': f'wife of {LAWRENCE_KRAUSS}',
-            NEAL_KASSELL: 'professor of neurosurgery at University of Virginia',
-            PETER_ATTIA: 'longevity medicine',
-            ROBERT_TRIVERS: 'evolutionary biology',
-            ROGER_SCHANK: 'Teachers College, Columbia University',
+            SVETLANA_POZHIDAEVA: "Epstein's Russian assistant who was recommended for a visa by Sergei Belyakov (FSB) and David Blaine",
         },
+        patterns=[
+            r"Alfa\s*Bank",
+            r"Anya\s*Rasulova",
+            r"Chernobyl",
+            r"Crimea",
+            r"Day\s+One\s+Ventures",
+            r"(Dmitry\s)?(Kiselyov|(Lana\s*)?Pozhidaeva|Medvedev|Rybolo(o?l?ev|vlev))",
+            r"Dmitry",
+            r"FSB",
+            r"GRU",
+            r"KGB",
+            r"Kislyak",
+            r"Kremlin",
+            r"Kuznetsova",
+            r"Lavrov",
+            r"Lukoil",
+            r"Moscow",
+            r"(Natalia\s*)?Veselnitskaya",
+            r"(Oleg\s*)?Deripaska",
+            r"Oleksandr Vilkul",
+            r"Rosneft",
+            r"RT",
+            r"St.?\s*?Petersburg",
+            r'Svet',
+            r"Russian?",
+            r"Sberbank",
+            r"Soviet(\s*Union)?",
+            r"USSR",
+            r"Vladimir",
+            r"(Vladimir\s*)?Putin",
+            r"Women\s*Empowerment",
+            r"Xitrans",
+            r"(Vitaly\s*)?Churkin",
+        ],
     ),
+
     HighlightedNames(
-        label='southeast Asia',
+        label='Southeast Asia',
         style='light_salmon3 bold',
-        pattern=r'Bangkok|Burm(a|ese)|Cambodian?|Laos|Malaysian?|Myan?mar|Thai(land)?|Vietnam(ese)?',
+        patterns=[
+            r"Bangkok",
+            r"Burm(a|ese)",
+            r"Cambodian?",
+            r"Laos",
+            r"Malaysian?",
+            r"Myan?mar",
+            r"Philippines",
+            r"South\s*Korea",
+            r"Tai(pei|wan)",
+            r"Thai(land)?",
+            r"Vietnam(ese)?",
+        ],
     ),
     HighlightedNames(
         label='tech bro',
         style='bright_cyan',
-        pattern=r"AG?I|Chamath|Palihapitiya|Danny\s*Hillis|Drew\s*Houston|Eric\s*Schmidt|Greylock(\s*Partners)?|(?<!(ustin|Moshe)\s)Hoffmand?|LinkedIn|(Mark\s*)?Zuckerberg|Masa(yoshi)?(\sSon)?|Najeev|Nathan\s*Myhrvold|Palantir|(Peter\s)?Th(ie|ei)l|Pierre\s*Omidyar|Sergey\s*Brin|Silicon\s*Valley|Softbank|SpaceX|Tim\s*Ferriss?|WikiLeak(ed|s)",
-        emailers = {
+        emailers={
             'Auren Hoffman': 'CEO of SafeGraph (firm that gathers location data from mobile devices) and LiveRamp',
             ELON_MUSK: 'father of Mecha-Hitler',
-            PETER_THIEL: 'Paypal mafia member, founder of Palantir, early Facebook investor, reactionary',
+            PETER_THIEL: 'Paypal mafia member, founder of Palantir, Facebook investor',
             REID_HOFFMAN: 'PayPal mafia member, founder of LinkedIn',
             STEVEN_SINOFSKY: 'ex-Microsoft, loves bitcoin',
+            VINCENZO_IOZZO: 'CEO of the identity-security company SlashID',
         },
+        patterns=[
+            r"AG?I",
+            r"Chamath", r"Palihapitiya",
+            r"Danny\s*Hillis",
+            r"Drew\s*Houston",
+            r"Eric\s*Schmidt",
+            r"Greylock(\s*Partners)?",
+            r"(?<!(ustin|Moshe)\s)Hoffmand?",
+            r"LinkedIn",
+            r"(Mark\s*)?Zuckerberg",
+            r"Masa(yoshi)?(\sSon)?",
+            r"Najeev",
+            r"Nathan\s*Myhrvold",
+            r"Palantir",
+            r"(Peter\s)?Th(ie|ei)l",
+            r"Pierre\s*Omidyar",
+            r"Sergey\s*Brin",
+            r"Silicon\s*Valley",
+            r"Softbank",
+            r"SpaceX",
+            r"Tim\s*Ferriss?",
+            r"WikiLeak(ed|s)",
+        ],
     ),
     HighlightedNames(
-        label='trump',
+        label='Trump',
         style='red3 bold',
-        pattern=r"@?realDonaldTrump|(Alan\s*)?Weiss?elberg|\bDJ?T\b|Donald J. Tramp|(Donald\s+(J\.\s+)?)?Trump(ism|\s*Properties)?|Don(ald| *Jr)(?! Rubin)|Ivank?a|Jared|Kushner|(Madeleine\s*)?Westerhout|Mar[-\s]*a[-\s]*Lago|(Marla\s*)?Maples|(Matt(hew)? )?Calamari|\bMatt C\b|Melania|(Michael (J.? )?)?Boccio|Rebekah\s*Mercer|Roger\s+Stone|rona|(The\s*)?Art\s*of\s*the\s*Deal",
-        emailers = {
+        emailers={
             'Bruce Moskowitz': "'Trump's health guy' according to Epstein",
         },
+        patterns=[
+            r"@?realDonaldTrump",
+            r"(Alan\s*)?Weiss?elberg",
+            r"\bDJ?T\b",
+            r"Donald J. Tramp",
+            r"(Donald\s+(J\.\s+)?)?Trump(ism|\s*(Org(anization)?|Properties)(\s*LLC)?)?",
+            r"Don(ald| *Jr)(?! Rubin)",
+            r"Ivank?a",
+            r"Jared",
+            r"Kushner",
+            r"(Madeleine\s*)?Westerhout",
+            r"Mar[-\s]*a[-\s]*Lago",
+            r"(Marla\s*)?Maples",
+            r"(Matt(hew)? )?Calamari",
+            r"\bMatt C\b",
+            r"Melania",
+            r"(Michael (J.? )?)?Boccio",
+            r"Paul Rampell",
+            r"Rebekah\s*Mercer",
+            r"Roger\s+Stone",
+            r"rona",
+            r"(The\s*)?Art\s*of\s*the\s*Deal",
+        ],
     ),
     HighlightedNames(
         label='victim',
         style='orchid1',
-        pattern=r'BVI|(Jane|Tiffany)\s*Doe|Katie\s*Johnson|(Virginia\s+((L\.?|Roberts)\s+)?)?Giuffre|Virginia\s+Roberts',
+        patterns=[
+            r"(Jane|Tiffany)\s*Doe",
+            r"Katie\s*Johnson",
+            r"(Virginia\s+((L\.?|Roberts)\s+)?)?Giuffre",
+            r"Virginia\s+Roberts",
+        ],
     ),
     HighlightedNames(
         label='victim lawyer',
-        style='dark_magenta bold',
-        pattern=r'(Alan(\s*P.)?|MINTZ)\s*FRAADE|Paul\s*(G.\s*)?Cassell|Rothstein\s*Rosenfeldt\s*Adler|(Scott\s*)?Rothstein|(J\.?\s*)?(Stan(ley)?\s*)?Pottinger',
-        emailers = {
-            BRAD_EDWARDS: 'Rothstein Rosenfeldt Adler (Rothstein was a crook & partner of Roger Stone)',
+        style='medium_orchid1',
+        emailers={
+            BRAD_EDWARDS: ROTHSTEIN_ROSENFELDT_ADLER,
+            'Grant J. Smith': ROTHSTEIN_ROSENFELDT_ADLER,
             JACK_SCAROLA: 'Searcy Denney Scarola Barnhart & Shipley',
-        }
+            KEN_JENNE: ROTHSTEIN_ROSENFELDT_ADLER,
+        },
+        patterns=[
+            r"(Alan(\s*P.)?|MINTZ)\s*FRAADE",
+            r"(J\.?\s*)?(Stan(ley)?\s*)?Pottinger",
+            r"Paul\s*(G.\s*)?Cassell",
+            r"Rothstein\s*Rosenfeldt\s*Adler",
+            r"(Scott\s*)?Rothstein",
+        ],
     ),
     HighlightedNames(
         label=VIRGIN_ISLANDS,
         style='sea_green1',
-        pattern=r'Antigua|Bahamas|Caribb?ean|Dominican\s*Republic|(Great|Little)\s*St.?\s*James|Haiti(an)?|(John\s*)deJongh(\s*Jr\.?)|(Kenneth E\. )?Mapp|Palm\s*Beach(?!\s*Post)|PBI|S(ain)?t.?\s*Thomas|USVI|(?<!Epstein )VI|(The\s*)?Virgin\s*Islands(\s*Daily\s*News)?',  # TODO: VI Daily News should be yellow but it's hard bc Daily News xists
-        emailers = {
-            CECILE_DE_JONGH: f'first lady 2007-2015',
-            STACEY_PLASKETT: 'non-voting member of Congress',
+        emailers={
+            CECILE_DE_JONGH: 'first lady 2007-2015',
             KENNETH_E_MAPP: 'Governor',
+            STACEY_PLASKETT: 'non-voting member of Congress',
         },
+        patterns=[
+            r"Antigua",
+            r"Bahamas",
+            r"BVI",
+            r"Caribb?ean",
+            r"Dominican\s*Republic",
+            r"(Great|Little)\s*St.?\s*James",
+            r"Haiti(an)?",
+            r"(John\s*)deJongh(\s*Jr\.?)",
+            r"(Kenneth E\. )?Mapp",
+            r"PBI",
+            r"Puerto\s*Ric(an|o)",
+            r"S(ain)?t.?\s*Thomas",
+            r"USVI",
+            r"(?<!Epstein )VI",
+            r"(The\s*)?Virgin\s*Islands(\s*Daily\s*News)?",  # Hard to make this work right
+            r"(West\s*)?Palm\s*Beach(?!\s*(Daily|Post))",
+        ],
     ),
-
-    # Individuals
     HighlightedNames(
         label=BILL_GATES,
         style='turquoise4',
-        pattern=r'BG|b?g?C3|(Bill\s*((and|or)\s*Melinda\s*)?)?Gates|Melinda(\s*Gates)?|Microsoft|MSFT',
-        emailers = {
+        emailers={
             BORIS_NIKOLIC: f'biotech VC partner of {BILL_GATES}, {EPSTEIN_ESTATE_EXECUTOR}',
         },
+        patterns=[
+            r"BG",
+            r"b?g?C3",
+            r"(Bill\s*((and|or)\s*Melinda\s*)?)?Gates",
+            r"Melinda(\s*Gates)?",
+            r"Microsoft",
+            r"MSFT",
+        ],
     ),
     HighlightedNames(
         label=STEVE_BANNON,
         style='color(58)',
-        pattern=r'((Steve|Sean)\s*)?Bannon?|(American\s*)?Dharma',
-        emailers = {
-            STEVE_BANNON: 'Trump campaign manager, memecoin grifter, convicted criminal',
-        }
+        category=POLITICS,
+        emailers={
+            STEVE_BANNON: "Trump campaign manager, memecoin grifter, convicted criminal",
+        },
+        patterns=[
+            r"(American\s*)?Dharma",
+            r"((Steve|Sean)\s*)?Bannon?",
+        ],
     ),
     HighlightedNames(
-        emailers={STEVEN_HOFFENBERG: HEADER_ABBREVIATIONS['Hoffenberg']},
-        pattern=r'(steven?\s*)?hoffenberg?w?',
-        style='gold3'
+        style='dark_olive_green3',
+        category=FINANCE,
+        emailers={STEVEN_HOFFENBERG: "Epstein's ponzi scheme partner at Towers Financial, prison for 18 years"},
+        patterns=[r"(steven?\s*)?hoffenberg?w?"],
     ),
-    HighlightedNames(emailers={GHISLAINE_MAXWELL: None}, pattern='gmax(1@ellmax.com)?|TerraMar', style='deep_pink3'),
-    HighlightedNames(emailers={JABOR_Y: HEADER_ABBREVIATIONS['Jabor']}, style='spring_green1'),
-    HighlightedNames(emailers={JEFFREY_EPSTEIN: None}, pattern='JEGE|LSJ|Mark (L. )?Epstein', style='blue1'),
-    HighlightedNames(emailers={JOI_ITO: 'former head of MIT Media Lab'}, style='gold1'),
+    HighlightedNames(emailers={GHISLAINE_MAXWELL: None}, patterns=[r"gmax(1@ellmax.com)?", r"TerraMar"], style='deep_pink3'),
+    HighlightedNames(emailers={JABOR_Y: '"an influential man in Qatar"'}, category='mideast', style='spring_green1'),
+    HighlightedNames(emailers={JEFFREY_EPSTEIN: None}, patterns=[r"JEGE", r"LSJ", r"Mark (L. )?Epstein"], style='blue1'),
     HighlightedNames(emailers={KATHRYN_RUEMMLER: 'former Obama legal counsel'}, style='magenta2'),
     HighlightedNames(emailers={MELANIE_WALKER: 'doctor'}, style='pale_violet_red1'),
-    HighlightedNames(emailers={PAULA: "Epstein's ex-girlfriend who is now in the opera"}, label='paula_heil_fisher', style='pink1'),
+    HighlightedNames(emailers={PAULA: "Epstein's ex-girlfriend who is now in the opera world"}, label='paula', style='pink1'),
     HighlightedNames(emailers={PRINCE_ANDREW: 'British royal family'}, style='dodger_blue1'),
-    HighlightedNames(emailers={SOON_YI_PREVIN: "wife of Woody Allen"}, style='hot_pink'),
+    HighlightedNames(emailers={SOON_YI_PREVIN: 'wife of Woody Allen'}, style='hot_pink'),
     HighlightedNames(emailers={SULTAN_BIN_SULAYEM: 'CEO of DP World, chairman of ports in Dubai'}, style='green1'),
 
     # HighlightedText not HighlightedNames bc of word boundary issue
-    HighlightedText(
-        label='unknown',
-        style='cyan',
-        pattern=r'\(unknown\)'
-    ),
     HighlightedText(
         label='phone_number',
         style='bright_green',
-        pattern=r"\+?(1?\(?\d{3}\)?[- ]\d{3}[- ]\d{4}|\d{2}[- ]\(?0?\)?\d{2}[- ]\d{4}[- ]\d{4})|(\b|\+)[\d+]{10,12}\b",
+        patterns=[
+            r"\+?(1?\(?\d{3}\)?[- ]\d{3}[- ]\d{4}|\d{2}[- ]\(?0?\)?\d{2}[- ]\d{4}[- ]\d{4})",
+            r"(\b|\+)[\d+]{10,12}\b",
+        ],
+    ),
+    HighlightedText(
+        label='unknown',
+        style='cyan',
+        patterns=[r'\(unknown\)']
     ),
 ]
 
@@ -616,37 +1409,49 @@ HIGHLIGHTED_TEXTS = [
     HighlightedText(
         label='header_field',
         style='plum4',
-        pattern=r'^(Date|From|Sent|To|C[cC]|Importance|Subject|Bee|B[cC]{2}|Attachments):',
+        patterns=[r'^(> )?(Date|From|Sent|To|C[cC]|Importance|Subject|Bee|B[cC]{2}|Attachments):'],
     ),
     HighlightedText(
         label='http_links',
         style=f'{ARCHIVE_LINK_COLOR} underline',
-        pattern=r"https?:[^\s]+",
+        patterns=[r"https?:[^\s]+"],
     ),
     HighlightedText(
         label='quoted_reply_line',
         style='dim',
-        pattern=REPLY_REGEX.pattern,
+        patterns=[REPLY_REGEX.pattern],
     ),
     HighlightedText(
         label='redacted',
         style='grey58',
-        pattern=fr"{REDACTED}|Privileged - Redacted",
+        patterns=[fr"{REDACTED}|Privileged - Redacted"],
     ),
     HighlightedText(
         label='sent_from',
         style='gray42 italic',
-        pattern=SENT_FROM_REGEX.pattern,
+        patterns=[SENT_FROM_REGEX.pattern],
     ),
     HighlightedText(
         label='snipped_signature',
         style='gray19',
-        pattern=r'<\.\.\.(snipped|trimmed).*\.\.\.>',
+        patterns=[r'<\.\.\.(snipped|trimmed).*\.\.\.>'],
     ),
     HighlightedText(
         label='timestamp_2',
         style=TIMESTAMP_STYLE,
-        pattern=r"\d{1,4}[-/]\d{1,2}[-/]\d{2,4} \d{1,2}:\d{2}:\d{2}( [AP]M)?",
+        patterns=[r"\d{1,4}[-/]\d{1,2}[-/]\d{2,4} \d{1,2}:\d{2}:\d{2}( [AP]M)?"],
+    ),
+
+    # Manual regexes
+    ManualHighlight(
+        label='email_attachments',
+        style='gray30 italic',
+        pattern=r"^(> )?Attachments: (?P<email_attachments>.*)",
+    ),
+    ManualHighlight(
+        label='email_timestamp',
+        style=TIMESTAMP_STYLE,
+        pattern=r"^(> )?(Date|Sent): (?P<email_timestamp>.*)",
     ),
 ]
 
@@ -659,10 +1464,20 @@ class EpsteinHighlighter(RegexHighlighter):
     highlights = [highlight_group.regex for highlight_group in ALL_HIGHLIGHTS]
 
 
-def get_info_for_name(name: str) -> str | None:
+def get_category_txt_for_name(name: str | None) -> Text | None:
     highlight_group = _get_highlight_group_for_name(name)
 
     if highlight_group and isinstance(highlight_group, HighlightedNames):
+        category = highlight_group.category or highlight_group.label
+
+        if category != name:
+            return styled_category(category)
+
+
+def get_info_for_name(name: str | None) -> str | None:
+    highlight_group = _get_highlight_group_for_name(name)
+
+    if highlight_group and isinstance(highlight_group, HighlightedNames) and name:
         return highlight_group.get_info(name)
 
 
@@ -685,11 +1500,26 @@ def get_style_for_name(name: str | None, default_style: str = DEFAULT, allow_bol
     return style if allow_bold else style.replace('bold', '').strip()
 
 
-def styled_category(category: str) -> Text:
+def styled_category(category: str | None) -> Text:
+    if not category:
+        return QUESTION_MARKS_TXT
+
     return Text(category, get_style_for_category(category) or 'wheat4')
 
 
-def _get_highlight_group_for_name(name: str) -> HighlightedNames | None:
+def _get_highlight_group_for_name(name: str | None) -> HighlightedNames | None:
+    if name is None:
+        return None
+
     for highlight_group in HIGHLIGHTED_NAMES:
         if highlight_group.regex.search(name):
             return highlight_group
+
+
+def _print_highlighted_names_repr() -> None:
+    for hn in HIGHLIGHTED_NAMES:
+        if isinstance(hn, HighlightedNames):
+            print(indented(repr(hn)) + ',')
+
+    import sys
+    sys.exit()