diff --git a/heroic-tattoo.lic b/heroic-tattoo.lic
index 9f7246f7da..80c8398237 100644
--- a/heroic-tattoo.lic
+++ b/heroic-tattoo.lic
@@ -5,8 +5,9 @@ no_kill_all
 
 class HeroicTattoo
   settings = get_settings
-  no_use_rooms = settings.wand_watcher_no_use_rooms
-  no_use_scripts = ['burgle', 'go2', 'athletics']
+  no_use_rooms = settings.heroic_tattoo_no_use_rooms
+  no_use_scripts = settings.heroic_tattoo_no_use_scripts
+
   downtime = settings.heroic_tattoo_downtime_override || (DRSkill.getrank('Arcana') < 1400 ? (60 - DRSkill.getrank('Arcana') / 24) * 60 : 0)
   timer = 3600 + downtime
   next_invoke = UserVars.herotatt_next_invoke || Time.now
@@ -49,6 +50,7 @@ class HeroicTattoo
                   'already under a heroic effect',
                   'Closing your eyes, you carefully bend',
                   'seem to be able to move to do that',
+                  /^Are you sure you want to do that/,
                   'Invoke what')
     when 'as its magic washes over you'
       next_invoke = Time.now + timer
diff --git a/profiles/base-empty.yaml b/profiles/base-empty.yaml
index 372b841de4..842e1a344a 100644
--- a/profiles/base-empty.yaml
+++ b/profiles/base-empty.yaml
@@ -1,119 +1,128 @@
 ---
 empty_values:
-  appraisal_training: []
-  loot_additions: []
-  loot_subtractions: []
-  loot_specials: []
-  dont_steal_list: []
-  waggle_sets: {}
-  buff_spells: {}
-  offensive_spells: []
-  necromancer_healing: {}
-  zombie: {}
-  empath_healing: {}
-  healme: {}
-  storage_containers: []
-  summoned_weapons: []
-  stances: {}
+  aim_fillers_stealth: {}
   aim_fillers: []
-  dance_actions: []
-  dance_actions_stealth: []
-  crossing_training: []
-  research_skills: []
-  train_workorders: []
-  gear: []
-  hunting_info: []
-  hunting_file_list: []
-  mining_buddy_vein_list: []
-  training_manager_priority_skills: []
-  forging_tools: []
-  outfitting_tools: []
-  shaping_tools: []
-  tinkering_tools: []
-  carving_tools: []
+  aiming_trainables: []
   alchemy_tools: []
-  enchanting_tools: []
-  aim_fillers_stealth: {}
-  skinning: {}
-  thanatology: {}
+  almanac_no_use_rooms: []
+  almanac_no_use_scripts: []
+  almanac_skills: []
+  appraisal_training: []
+  astrology_training: []
+  athletics_outdoorsmanship_rooms: []
+  attack_overrides: {}
+  attunement_rooms: []
+  avtalia_array: {}
+  barb_famine_healing: {}
+  base_wayto_overrides: {}
+  battle_cries: []
+  battle_cry_cycle: []
   buff_nonspells: {}
-  training_abilities: {}
-  weapon_training: {}
-  priority_weapons: []
+  buff_spells: {}
+  buff_watcher_no_use_rooms: []
+  buff_watcher_no_use_scripts: []
+  burgle_settings: {}
+  caravan_recipes: {}
+  caravan_training_skills: {}
+  carving_tools: []
   charged_maneuvers: {}
-  training_nonspells: {}
-  training_spells: {}
-  magic_training: {}
-  research_training_spells: {}
-  gear_sets: {}
-  lichbot_buffs: []
-  lockpick_buffs: {}
-  listen_skills: []
-  offensive_spell_cycle: []
-  ignored_npcs: []
-  hunting_buddies: []
-  hunting_nemesis: []
-  empty_hunting_room_messages: []
   classes_to_teach: []
-  whirlwind_trainables: []
-  aiming_trainables: []
-  attack_overrides: {}
-  astrology_training: []
-  attunement_rooms: []
-  perceive_health_rooms: []
-  restock: {}
-  athletics_outdoorsmanship_rooms: []
   combat_spell_training: {}
-  stealing_towns: []
-  safe_room_empaths: []
+  consumable_lockboxes: []
+  cornmaze_containers: {}
+  craft_overrides: {}
   crafting_training_spells: {}
-  restock_shop: {}
-  theurgy_supply_levels: {}
-  caravan_training_skills: {}
-  caravan_recipes: {}
-  almanac_skills: []
-  almanac_no_use_scripts: []
-  almanac_no_use_rooms: []
-  held_athletics_items: []
-  training_list: []
-  t2_avoids: []
-  t2_after_shutdown: []
-  stabbity: {}
-  telescope_storage: {}
-  smoke: {}
-  divination_tool: {}
+  crossing_training: []
+  cyclic_no_release: []
+  dance_actions_stealth: []
+  dance_actions: []
   divination_bones_storage: {}
-  avtalia_array: {}
-  cornmaze_containers: {}
-  maze_junk: {}
-  burgle_settings: {}
-  consumable_lockboxes: []
+  divination_tool: {}
+  dont_steal_list: []
+  doublestrike_trainables: []
   duskruin: {}
-  sanowret_no_use_scripts: []
-  sanowret_no_use_rooms: []
+  empath_healing: {}
+  empty_hunting_room_messages: []
+  enchanting_tools: []
+  esp_channels: []
   faux_atmo_items: []
-  faux_atmo_no_use_scripts: []
   faux_atmo_no_use_rooms: []
-  play_no_use_scripts: []
-  barb_famine_healing: {}
-  private_textsubs: {}
-  craft_overrides: {}
-  pattern_hues: {}
-  holy_weapon: {}
+  faux_atmo_no_use_scripts: []
+  forging_tools: []
+  gear_sets: {}
+  gear: []
+  healme: {}
+  held_athletics_items: []
+  heroic_tattoo_no_use_rooms: []
+  heroic_tattoo_no_use_scripts: []
   hollow_eve_loot_container: []
-  wands: []
-  wand_watcher_no_use_scripts: []
-  wand_watcher_no_use_rooms: []
-  buff_watcher_no_use_scripts: []
-  buff_watcher_no_use_rooms: []
+  holy_weapon: {}
+  hunting_buddies: []
+  hunting_file_list: []
+  hunting_info: []
+  hunting_nemesis: []
+  ignored_npcs: []
+  lichbot_buffs: []
+  listen_skills: []
+  lockpick_buffs: {}
+  loot_additions: []
+  loot_specials: []
+  loot_subtractions: []
+  magic_training: {}
+  maze_junk: {}
+  mining_buddy_vein_list: []
+  necromancer_healing: {}
   noheal_empathylink: []
+  offensive_spell_cycle: []
+  offensive_spells: []
+  outfitting_tools: []
+  pattern_hues_no_use_rooms: []
+  pattern_hues_no_use_scripts: []
+  pattern_hues: {}
+  perceive_health_rooms: []
+  personal_wayto_overrides: {}
+  play_no_use_scripts: []
+  priority_weapons: []
+  private_textsubs: {}
   repair_heuristic_gear: []
+  research_skills: []
+  research_training_spells: {}
+  restock_shop: {}
+  restock: {}
+  safe_room_empaths: []
+  sanowret_no_use_rooms: []
+  sanowret_no_use_scripts: []
   sell_loot_ignored_metals_and_stones: []
-  esp_channels: []
-  doublestrike_trainables: []
-  battle_cries: []
-  battle_cry_cycle: []
-  cyclic_no_release: []
-  base_wayto_overrides: {}
-  personal_wayto_overrides: {}
-
+  shaping_tools: []
+  skinning: {}
+  smoke: {}
+  stabbity: {}
+  stances: {}
+  stealing_towns: []
+  storage_containers: []
+  summoned_weapons: []
+  t2_after_shutdown: []
+  t2_avoids: []
+  tarantula_no_use_rooms: []
+  tarantula_no_use_scripts: []
+  telescope_storage: {}
+  tessera_no_use_rooms: []
+  tessera_no_use_scripts: []
+  thanatology: {}
+  theurgy_supply_levels: {}
+  tinkering_tools: []
+  train_workorders: []
+  training_abilities: {}
+  training_list: []
+  training_manager_priority_skills: []
+  training_nonspells: {}
+  training_spells: {}
+  waggle_sets: {}
+  walkingastro_no_use_rooms: []
+  walkingastro_no_use_scripts: []
+  wand_watcher_no_use_rooms: []
+  wand_watcher_no_use_scripts: []
+  wands: []
+  weapon_training: {}
+  whirlwind_trainables: []
+  zombie: {}
diff --git a/profiles/base.yaml b/profiles/base.yaml
index 57f959d16c..60bcbf9889 100644
--- a/profiles/base.yaml
+++ b/profiles/base.yaml
@@ -305,6 +305,20 @@ pattern_hues_no_use_rooms:
 # This will be a function of (60 - <arcana modified ranks>/24)*60, added on to the end of the timer from an expired heroic buff.
 heroic_tattoo_downtime_override: # In seconds
 
+heroic_tattoo_no_use_scripts:
+  - burgle
+  - go2
+  - athletics
+  - researcher
+
+# Same as wand_watcher_no_use_rooms
+heroic_tattoo_no_use_rooms:
+  - 1900                                          # Crossing bank teller - included with regex below but shown for example
+  - Knife Clan, Triage                            # Dokt - silenced room
+  - !ruby/regexp '/^(?:First )?Provincial Bank,/' # Crossing Bank - mapped, but 1 regex- -> 3 rooms
+  - !ruby/regexp '/Carousel (?:Booth|Chamber)$/'  # Vaults - unmapped silenced / nomagic
+  - !ruby/regexp '/^(?:Shard, )?First Bank of Ilithi,?/' # Shard bank - 1 regex -> 4 rooms
+
 # settings for WM or MM summoned weapons.  See Dartellum-setup or Crannach-setup
 summoned_weapons:
 summoned_weapons_element:
@@ -2513,7 +2527,7 @@ base_wayto_overrides:
     start_room: 13600
     end_room: 13603
     str_proc: start_script('bescort', ['coffin']); wait_while{running?('bescort')};
-    
+
 # Settings for task-forage (completing foraging tasks for Mags and similar NPCs, primarily for Trading experience)
 task_forage_settings:
   # Where foraged items should be temporarily stored
@@ -2535,7 +2549,7 @@ task_forage_settings:
 tome_settings:
   # Name of tome. If using quit_early, it must be one of these exact names:
   # tel'athi treatise, mikkhalbamar manuscript, spiritwood tome, field guide, brinewood book, kuwinite codex, smokewood codex, togball manual
-  tome_name: 
+  tome_name:
   # Try to stow the tome before finishing the last page, which comes with a 50% concentration hit and not much scholarship at higher ranks
   quit_early: true
   # Target mindstates to train to
@@ -2552,4 +2566,3 @@ tome_settings:
   - crossing-repair
   - task-forage
   debug: false
-