From 40f0c6e89e94d2cc776516f91ddcd32705802e9c Mon Sep 17 00:00:00 2001
From: "James C (aka Chuz)" <jaculpiii@gmail.com>
Date: Mon, 29 May 2023 09:16:44 -0400
Subject: [PATCH 1/2] Initiate v.82

---
 Shadowrun Sixth World/CHANGELOG.md             |  2 ++
 Shadowrun Sixth World/Shadowrun6thEdition.html | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Shadowrun Sixth World/CHANGELOG.md b/Shadowrun Sixth World/CHANGELOG.md
index 0c396a91bc..0ac342c1d9 100644
--- a/Shadowrun Sixth World/CHANGELOG.md	
+++ b/Shadowrun Sixth World/CHANGELOG.md	
@@ -1,5 +1,7 @@
 Change Log
 ==============================================
+**2023-05-30 ** v.82 Chuz (James Culp)
+	
 **2023-05-22 ** v.81 Chuz (James Culp)
 	Bugfix - More weapon dicepool tweaks
 	New Feature - NPC->Spirits made spirits awakened and now display the spells section for them.  Dicepool does not auto-update when spirit force changes, that is an exercise for the user.
diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.html b/Shadowrun Sixth World/Shadowrun6thEdition.html
index 3e5c010ece..eef87de847 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.html	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.html	
@@ -3474,6 +3474,10 @@
 						<div class="notes-changelog">
 							<div name="changelog" class="changelog">
 								<h1 class="changelog-header">Most Recent Updates</h1>
+								<span class="changelog-entry">**2023-05-30 ** v.82 Chuz (James Culp)</span>
+								<ul>
+
+								</ul>
 								<span class="changelog-entry">**2023-05-22 ** v.81 Chuz (James Culp)</span>
 								<ul>
 									<li><span class="bullet">A</span><b>Bugfix</b> - More weapon dicepool tweaks
@@ -6255,7 +6259,7 @@
 <input type="hidden" name="attr_spellcasting_expert" value="0" />
 <input type="hidden" name="attr_universal_dicepool_adjustment" value="0" />
 
-<input type="hidden" name="attr_sheet_version" value="0.81">
+<input type="hidden" name="attr_sheet_version" value="0.82">
 <input type="hidden" name="attr_data_version" value="0">
 <script type="text/worker">
 // Sheet workers
@@ -9742,7 +9746,7 @@ console.log(s);
 			}
 
 
-1			// Apply dicepool mod if that changed
+			// Apply dicepool mod if that changed
 			if(eventInfo.sourceAttribute.endsWith('_dicepool_modifier')) {
 console.log("updating dicepool for dicepool_modifier change");
 				let nv = parseInt(eventInfo.newValue) || 0;
@@ -12490,7 +12494,7 @@ console.log("Adding Spell: "+data["data-name"]);
 		}
 
 		rowattrs["repeating_" + spell_type + "_" + row_id + "_effect_type"] = trans.Spells.effect_type[eftype] || '';
-		rowattrs["repeating_" + spell_type + "_" + row_id + "_range"] = trans.Spells.range[data["data-range"].toUpperCase()] || '';
+ 		rowattrs["repeating_" + spell_type + "_" + row_id + "_range"] = trans.Spells.range[data["data-range"].toUpperCase()] || '';
 		rowattrs["repeating_" + spell_type + "_" + row_id + "_type"] = ucfirst(data["data-type"]) || '';
 
 		rowattrs["repeating_" + spell_type + "_" + row_id + "_notes"] = data["data-notes"] || '';

From fb2574f1bb4184673cedea8b16691151c82d53d7 Mon Sep 17 00:00:00 2001
From: "James C (aka Chuz)" <jaculpiii@gmail.com>
Date: Mon, 29 May 2023 12:44:09 -0400
Subject: [PATCH 2/2] 1 Update, 2 New Features

	Update - Added Hack & Slash Matrix Actions to the Rolls Pane -> Matrix Roll Buttons
	New Feature - Added Matrix Roll Buttons Legality Filter, this allows you to hide illegal actions.  For pcs without a matrix persona or that are worried about OS
	New Feature - Added Matrix Roll Buttons Access Level Filter, this allows you to hide actions that are not usable at a particular Matrix Access Level (outsider/user/admin)
---
 Shadowrun Sixth World/CHANGELOG.md            |   4 +-
 Shadowrun Sixth World/Shadowrun6thEdition.css |  39 ++-
 .../Shadowrun6thEdition.html                  | 287 ++++++++++++------
 Shadowrun Sixth World/translation.json        |  23 +-
 4 files changed, 256 insertions(+), 97 deletions(-)

diff --git a/Shadowrun Sixth World/CHANGELOG.md b/Shadowrun Sixth World/CHANGELOG.md
index 0ac342c1d9..a9451bd475 100644
--- a/Shadowrun Sixth World/CHANGELOG.md	
+++ b/Shadowrun Sixth World/CHANGELOG.md	
@@ -1,7 +1,9 @@
 Change Log
 ==============================================
 **2023-05-30 ** v.82 Chuz (James Culp)
-	
+	Update - Added Hack & Slash Matrix Actions to the Rolls Pane -> Matrix Roll Buttons
+	New Feature - Added Matrix Roll Buttons Legality Filter, this allows you to hide illegal actions.  For pcs without a matrix persona or that are worried about OS
+	New Feature - Added Matrix Roll Buttons Access Level Filter, this allows you to hide actions that are not usable at a particular Matrix Access Level (outsider/user/admin)
 **2023-05-22 ** v.81 Chuz (James Culp)
 	Bugfix - More weapon dicepool tweaks
 	New Feature - NPC->Spirits made spirits awakened and now display the spells section for them.  Dicepool does not auto-update when spirit force changes, that is an exercise for the user.
diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.css b/Shadowrun Sixth World/Shadowrun6thEdition.css
index 5a5c18a030..6a72a3e40b 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.css	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.css	
@@ -475,6 +475,11 @@ input[type='radio'].tab-switch {
 .right, sheet-right {
   text-align: right !important; }
 
+.fleft {
+  float: left !important; }
+.fright {
+  float: right !important; }
+
 select.attribute-select option:nth-of-type(1n+5) {
   color: #460141 !important; }
 select.attribute-select option:nth-of-type(1n+9) {
@@ -3639,16 +3644,17 @@ div.notes-changelog div.changelog ul {
 .rolls-col {
   width: 100%;
   display: inline-block; }
-.rolls .pc-box .rolls-col .rolls-matrix {
+.rolls-matrix {
   width: 100%;
   display: grid;
   grid-column-gap: 5px;
   grid-row-gap: 2px;
   grid-template-columns: 32% 32% 32%; }
-.rolls .pc-box .rolls-col .rolls-matrix h1,
-.rolls .pc-box .rolls-col .rolls-matrix h2 {
+.rolls-matrix h1,
+.rolls-matrix h2,
+.rolls-matrix hr {
   grid-column: 1 / 4; }
-.rolls .pc-box .rolls-col h3[data-i18n="rollbuttonsdisclaimer"] {
+.rolls-col h3[data-i18n="rollbuttonsdisclaimer"] {
   line-height: 15px;
   font-weight: bolder;
   color: #555 !important;
@@ -3657,6 +3663,30 @@ div.notes-changelog div.changelog ul {
 .rolls-matrix label {
   grid-column: 1 / 4; }
 
+.rolls-matrix span.full-width {
+  grid-column: 1 / 4; }
+.rolls-matrix span.full-width label {
+  grid-column: unset; }
+
+/* Hides illegal matrix actions when the checkbox is unchecked */
+.rolls-matrix input[type="hidden"][name$="display_illegal_matrix_actions"][value="0"] ~ .illegal,
+.rolls-matrix input[type="hidden"][name$="display_illegal_matrix_actions"][value="0"] ~ .illegal > span{
+  display: none !important;
+}
+
+/* hides user and admin matrix actions when "Access Level Filter" is set to "Outsider" */
+.rolls-matrix input[type="hidden"][name$="access_level_filter"][value="outsider"] ~ .user:not(.outsider),
+.rolls-matrix input[type="hidden"][name$="access_level_filter"][value="outsider"] ~ .user:not(.outsider) > span,
+.rolls-matrix input[type="hidden"][name$="access_level_filter"][value="outsider"] ~ .admin:not(.outsider),
+.rolls-matrix input[type="hidden"][name$="access_level_filter"][value="outsider"] ~ .admin:not(.outsider) > span {
+  display: none !important;
+}
+
+/* hides admin matrix actions when "Access Level Filter" is set to "User" */
+.rolls-matrix input[type="hidden"][name$="access_level_filter"][value="user"] ~ .admin:not(.user),
+.rolls-matrix input[type="hidden"][name$="access_level_filter"][value="user"] ~ .admin:not(.user) > span {
+  display: none !important;
+}
 
 .npc-roll-rows .rolls-col .rolls-matrix span.matrix-action,
 .rolls .pc-box .rolls-col .rolls-matrix span.matrix-action {
@@ -3680,7 +3710,6 @@ div.notes-changelog div.changelog ul {
   text-shadow: 1px 1px 2px red, 0 0 25px #460141, 0 0 5px #460141 !important; }
 
 
-
 /* Misc Rolls */
 .rolls .pc-box .rolls-col .rolls-misc {
   width: 100%;
diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.html b/Shadowrun Sixth World/Shadowrun6thEdition.html
index eef87de847..cbc06fb207 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.html	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.html	
@@ -3476,7 +3476,9 @@
 								<h1 class="changelog-header">Most Recent Updates</h1>
 								<span class="changelog-entry">**2023-05-30 ** v.82 Chuz (James Culp)</span>
 								<ul>
-
+									<li><span class="bullet">E</span><b>Update</b> - Added Hack & Slash Matrix Actions to the Rolls Pane -> Matrix Roll Buttons
+									<li><span class="bullet">F</span><b>New Feature</b> - Added Matrix Roll Buttons Legality Filter, this allows you to hide illegal actions.  For pcs without a matrix persona or that are worried about OS
+									<li><span class="bullet">F</span><b>New Feature</b> - Added Matrix Roll Buttons Access Level Filter, this allows you to hide actions that are not usable at a particular Matrix Access Level (outsider/user/admin)
 								</ul>
 								<span class="changelog-entry">**2023-05-22 ** v.81 Chuz (James Culp)</span>
 								<ul>
@@ -3529,34 +3531,6 @@
 								<ul>
 									<li><span class="bullet">A</span><b>Bugfix</b> - PC Initiatives - Fixed a condition where if a dice mod is set and then the initiative base is changed it keeps adding the dice mod repeatedly.
 								</ul>
-								<span class="changelog-entry">**2023-02-20 ** v.72 Chuz (James Culp)</span>
-								<ul>
-									<li><span class="bullet">F</span><b>New Feature</b> - Added Magic and Resonance to attribute roll buttons as additional options in the drop down
-									<li><span class="bullet">E</span><b>Update</b> - Updated NPC Technomancer Complex Forms
-									<li><span class="bullet">E</span><b>Update</b> - Updated NPC Drag&Drop for Spells to attempt to auto-populate the dicepool
-									<li><span class="bullet">E</span><b>Update</b> - NPC Complex forms display changes
-									<li><span class="bullet">E</span><b>Update</b> - NPC Complex forms roll buttons for no dicepool defined (uses attr_skill + resonance), dicepool defined (uses the dicepool) or description only (skill empty)
-									<li><span class="bullet">E</span><b>Update</b> - The old NPCspells repeating data should be retained just in case, for now.
-									<li><span class="bullet">A</span><b>Bugfix</b> - Updated calls to geneerateRowID to use a work around to prevent them (hopefully) from duplicating an already existing ID which caused drag and drop items to sometimes not apply properly, causing symptoms like drag and drop NPCs without all of their skills, attacks, or some other repeating item. Or even weirder once a Skill that got overwritten so it had a Specialization from another skill that wasn't there.
-								</ul>
-<h2 style="color: red;">If it looks like your specialization or expertise buttons for Skills have disappeared, refresh your browser and they should return.</h2>
-								<span class="changelog-entry">**2023-02-13 ** v.71 Chuz (James Culp)</span>
-								<ul>
-									<li><span class="bullet">F</span><b>New Feature</b> - Added essence calculations for drag and drop (and others) allowing for Essence Base to be "Rating x #.##", also Grade calculations now.
-									<li><span class="bullet">F</span><b>New Feature</b> - Added drag and drop for Augmentations
-									<li><span class="bullet">F</span><b>New Feature</b> - Converted NPC Spell roll buttons to use the newer PC style
-									<li><span class="bullet">F</span><b>New Feature</b> - Converted NPC Attack (ranged and melee) buttons to use the new roll buttons
-									<li><span class="bullet">F</span><b>New Feature</b> - Converted NPC Attack (ranged and melee) buttons to use the new roll template weapon info block
-									<li><span class="bullet">E</span><b>Update</b> - Updated Matrix Roll buttons to include inline opposed roll buttons.  To use these the target's token must be selected.
-									<li><span class="bullet">F</span><b>New Feature</b> - Converted Grunt skill buttons to new style
-									<li><span class="bullet">F</span><b>New Feature</b> - Converted Vehicle Autosoft roll buttons to the newer PC style
-									<li><span class="bullet">F</span><b>New Feature</b> - Converted NPC attribute roll buttons to the newer PC style
-									<li><span class="bullet">F</span><b>New Feature</b> - Converted NPC Initiative and Defense button blocks to the newer PC style
-									<li><span class="bullet">F</span><b>New Feature</b> - Began adding weapon information as it's own section in the attack Roll Templates
-									<li><span class="bullet">F</span><b>New Feature</b> - Added weapon info to Ranged attack Roll Templates
-									<li><span class="bullet">F</span><b>New Feature</b> - Added weapon info to Ranged (Burst Fire Wide) attack Roll Templates
-									<li><span class="bullet">F</span><b>New Feature</b> - Added weapon info to Melee attack Roll Templates
-								</ul>
 							</div>
 						</div>
 					</div>
@@ -3675,47 +3649,82 @@
 					<div class="rolls-col">
 			         <input class="tab-switch" name="attr_rolls_toggle" type="hidden" value="matrix"/>
 						<div class="rolls-matrix">
+							<input type="hidden" name="attr_display_illegal_matrix_actions" value="">
+							<input type="hidden" name="attr_matrix_access_level_filter" value="">
 							<h3 data-i18n="rollbuttonsdisclaimer"></h3><br>
-							<label data-i18n-title="matrix_noise" title="Matrix Noise">
-								<span data-i18n="matrix_noise"></span>
-								<input type="number" name="attr_matrix_noise" value="0" placeholder="0" title="@{matrix_noise}" step="1">
-							</label>
+							<span class="full-width">
+								<label class="fright" data-i18n-title="illegal_actions" title="Display Illegal Actions">
+									<span data-i18n="illegal_actions"></span>
+									<input type="checkbox" name="attr_display_illegal_matrix_actions" value="1" checked="checked" title="@{display_illegal_matrix_actions}">
+								</label>
+							</span>
+							<span class="full-width">
+								<label class="fleft" data-i18n-title="matrix_noise" title="Matrix Noise">
+									<span data-i18n="matrix_noise"></span>
+									<input type="number" name="attr_matrix_noise" value="0" placeholder="0" title="@{matrix_noise}" step="1">
+								</label>
+								<label class="fright" data-i18n-title="matrix_access_level" title="Access Level Filter">
+									<span data-i18n="access_level_filter"></span>
+									<select name="attr_matrix_access_level_filter" title="@{matrix_access_level_filter}">
+										<option data-i18n="all" value="all">All</option>
+										<option data-i18n="outsider" value="outsider">Outsider</option>
+										<option data-i18n="user" value="user">User</option>
+										<option data-i18n="admin" value="admin">Admin</option>
+									</select>
+								</label>
+							</span>
+							<hr>
 							<h2 data-i18n="matrixmajor">Matrix Major Actions</h2>
-							<button title="Cracking + Logic" class="illegal outsider" name="act_matrix_backdoor_entry" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Backdoor Entry}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), vs. Willpower + Firewall}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="backdoorentry"></span></button>
-							<button title="Cracking + Logic" class="illegal outsider user admin" name="act_matrix_brute_force" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Brute Force}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), vs. Willpower + Firewall}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="bruteforce"></span></button>
-							<button title="Cracking + Logic" class="illegal admin" name="act_matrix_check_os" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Check OS}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), Threshold: 4}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="checkos"></span></button>
-							<button title="Electronics + Logic" class="legal user admin" name="act_matrix_control_device" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Control Device}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Legal), vs. Willpower + Firewall}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="controldevice"></span></button>
-							<button title="Cracking + Logic" class="illegal user admin" name="act_matrix_crack_file" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Crack File}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), vs. Encryption Rating x 2}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="crackfile"></span></button>
-							<button title="Cracking + Logic" class="illegal admin" name="act_matrix_crash_program" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Crash Program}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), vs. Data Processing + Device Rating}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="crashprogram"></span></button>
-							<button title="Cracking + Logic" class="illegal outsider user admin" name="act_matrix_data_spike" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Data Spike}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), vs. Data Processing + Firewall}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="dataspike"></span></button>
-							<button title="Cracking + Logic" class="legal user admin" name="act_matrix_disarm_data_bomb" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Disarm Data Bomb}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Legal), vs. Data Bomb Rating x 2}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="disarmdatabomb"></span></button>
-							<button title="Electronics + Logic" class="legal user admin" name="act_matrix_edit_file" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Edit File}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Legal), vs. Intuition + Firewall |or| Firewall + Sleaze}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="editfile"></span></button>
-							<button title="Electronics + Logic" class="legal user admin" name="act_matrix_encrypt_file" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Encrypt File}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Legal), Hits = Encryption Rating}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="encryptfile"></span></button>
-							<button title="Electronics + Logic" class="illegal user admin" name="act_matrix_erase_matrix_signature" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Erase Matrix Signature}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), vs. Willpower + Firewall |or| Firewall x 2}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="erasematrixsignature"></span></button>
-							<button title="Electronics + Logic" class="legal admin" name="act_matrix_format_device" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Format Device}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Legal), vs. Willpower + Firewall |or| Firewall x 2}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="formatdevice"></span></button>
-							<span class="matrix-action legal outsider user admin" data-i18n="fullmatrixdefense"></span>
-							<button title="Electronics + Logic" class="illegal user" name="act_matrix_hash_check" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Hash Check}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), CRB pg.182}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="hashcheck"></span></button>
-							<button title="Cracking + Intuition" class="illegal outsider user admin" name="act_matrix_hide" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Hide}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{intuition}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), vs. Intuition + Data Processing |or| Data Processing + Sleaze}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="hide"></span></button>
-							<button title="Electronics + Willpower" class="legal outsider user admin" name="act_matrix_jackout" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Jack Out}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{willpower}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Legal), vs. Charisma + Data Processing |or| Attack + Data Processing}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="jackout"></span></button>
-							<button title="Cracking + Logic" class="illegal admin" name="act_matrix_jam_signals" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Jam Signals}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), CRB pg.182}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="jamsignals"></span></button>
-							<button title="Electronics + Logic" class="legal user admin" name="act_matrix_jump_into_rigged_device" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Jump Into Rigged Device}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Legal), vs. Willpower + Firewall |or| Firewall x 2}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="jumpintoriggeddevice"></span></button>
-							<button title="Electronics + Intuition" class="legal outsider user admin" name="act_matrix_matrix_perception" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Matrix Perception}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{intuition}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Legal), * Without Resonance or Cyberdeck), vs. Willpower + Sleaze}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="matrixperception"></span></button>
-							<button title="Electronics + Intuition" class="legal outsider user admin" name="act_matrix_matrix_search" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Matrix Search}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{intuition}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Legal), Extended Test, 10 Minute Interval}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="matrixsearch"></span></button>
-							<button title="Cracking + Logic" class="illegal outsider user admin" name="act_matrix_probe" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Probe}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), vs. Willpower + Firewall |or| Firewall x 2}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="probe"></span></button>
-							<button title="Electronics + Logic" class="legal admin" name="act_matrix_reboot_device" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Reboot Device}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Legal), vs. Willpower + Firewall |or| Firewall x 2}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="rebootdevice"></span></button>
-							<button title="Electronics + Logic" class="illegal admin" name="act_matrix_set_data_bomb" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Set Data Bomb}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), vs. Device Rating x 2}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="setdatabomb"></span></button>
-							<button title="Cracking + Logic" class="illegal admin" name="act_matrix_snoop" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Snoop}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), vs. Logic + Firewall |or| Data Processing + Firewall}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="snoop"></span></button>
-							<button title="Cracking + Logic" class="illegal outsider user admin" name="act_matrix_spoof_command" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Spoof Command}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), vs. (Data Processing or Pilot) + Firewall}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="spoofcommand"></span></button>
-							<button title="Cracking + Logic" class="illegal outsider user admin" name="act_matrix_tarpit" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Tar Pit}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), vs. Data Processing + Firewall}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="tarpit"></span></button>
-							<button title="Electronics + Intuition" class="illegal admin" name="act_matrix_trace_icon" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Trace Icon}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{intuition}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=(Illegal), vs. Willpower + Sleaze |or| Firewall + Sleaze}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="traceicon"></span></button>
-
+							<button title="Cracking + Logic" class="illegal outsider crb" name="act_matrix_backdoor_entry" type="action" value=""><span data-i18n="backdoorentry"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin crb" name="act_matrix_brute_force" type="action" value=""><span data-i18n="bruteforce"></span></button>
+							<button title="Cracking + Logic" class="legal user admin hs" name="act_matrix_calibration" type="action" value=""><span data-i18n="calibration"></span></button>
+							<button title="Cracking + Logic" class="illegal admin crb" name="act_matrix_check_os" type="action" value=""><span data-i18n="checkos"></span></button>
+							<button title="Electronics + Logic" class="legal user admin crb" name="act_matrix_control_device" type="action" value=""><span data-i18n="controldevice"></span></button>
+							<button title="Cracking + Logic" class="illegal user admin crb" name="act_matrix_crack_file" type="action" value=""><span data-i18n="crackfile"></span></button>
+							<button title="Cracking + Logic" class="illegal admin crb" name="act_matrix_crash_program" type="action" value=""><span data-i18n="crashprogram"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin crb" name="act_matrix_data_spike" type="action" value=""><span data-i18n="dataspike"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin hs" name="act_matrix_delayed_command" type="action" value=""><span data-i18n="delayed_command"></span></button>
+							<button title="Electronics + Logic" class="illegal outsider hs" name="act_matrix_denial_of_service" type="action" value=""><span data-i18n="denial_of_service"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin hs" name="act_matrix_device_lock" type="action" value=""><span data-i18n="device_lock"></span></button>
+							<button title="Cracking + Logic" class="legal user admin crb" name="act_matrix_disarm_data_bomb" type="action" value=""><span data-i18n="disarmdatabomb"></span></button>
+							<button title="Electronics + Logic" class="legal user admin crb" name="act_matrix_edit_file" type="action" value=""><span data-i18n="editfile"></span></button>
+							<button title="Electronics + Logic" class="legal user admin crb" name="act_matrix_encrypt_file" type="action" value=""><span data-i18n="encryptfile"></span></button>
+							<button title="Electronics + Logic" class="illegal user admin crb" name="act_matrix_erase_matrix_signature" type="action" value=""><span data-i18n="erasematrixsignature"></span></button>
+							<button title="Electronics + Logic" class="legal admin crb" name="act_matrix_format_device" type="action" value=""><span data-i18n="formatdevice"></span></button>
+							<span class="matrix-action legal outsider user admin crb" data-i18n="fullmatrixdefense"></span>
+							<button title="Cracking + Logic" class="illegal user admin hs" name="act_matrix_garbage_in_garbage_out" type="action" value=""><span data-i18n="garbage_in_garbage_out"></span></button>
+							<button title="Electronics + Logic" class="illegal user admin crb" name="act_matrix_hash_check" type="action" value=""><span data-i18n="hashcheck"></span></button>
+							<button title="Cracking + Intuition" class="illegal outsider user admin crb" name="act_matrix_hide" type="action" value=""><span data-i18n="hide"></span></button>
+							<button title="Electronics + Willpower" class="legal outsider user admin crb" name="act_matrix_jackout" type="action" value=""><span data-i18n="jackout"></span></button>
+							<button title="Cracking + Logic" class="illegal admin crb" name="act_matrix_jam_signals" type="action" value=""><span data-i18n="jamsignals"></span></button>
+							<button title="Electronics + Logic" class="legal user admin crb" name="act_matrix_jump_into_rigged_device" type="action" value=""><span data-i18n="jumpintoriggeddevice"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider hs" name="act_matrix_known_exploit_backdoor_entry" type="action" value=""><span data-i18n="known_exploit_backdoor_entry"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider hs" name="act_matrix_masquerade" type="action" value=""><span data-i18n="masquerade"></span></button>
+							<button title="Electronics + Intuition" class="legal outsider user admin crb" name="act_matrix_matrix_perception" type="action" value=""><span data-i18n="matrixperception"></span></button>
+							<button title="Electronics + Intuition" class="legal outsider user admin crb" name="act_matrix_matrix_search" type="action" value=""><span data-i18n="matrixsearch"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider hs" name="act_matrix_metahuman_in_the_middle" type="action" value=""><span data-i18n="metahuman_in_the_middle"></span></button>
+							<button title="Electronics + Logic" class="illegal admin hs" name="act_matrix_modify_icon" type="action" value=""><span data-i18n="modify_icon"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider hs" name="act_matrix_popup" type="action" value=""><span data-i18n="popup"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin crb" name="act_matrix_probe" type="action" value=""><span data-i18n="probe"></span></button>
+							<button title="Electronics + Logic" class="legal admin crb" name="act_matrix_reboot_device" type="action" value=""><span data-i18n="rebootdevice"></span></button>
+							<button title="Electronics + Logic" class="illegal admin crb" name="act_matrix_set_data_bomb" type="action" value=""><span data-i18n="setdatabomb"></span></button>
+							<button title="Cracking + Logic" class="illegal admin crb" name="act_matrix_snoop" type="action" value=""><span data-i18n="snoop"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin crb" name="act_matrix_spoof_command" type="action" value=""><span data-i18n="spoofcommand"></span></button>
+							<button title="Electronics + Logic" class="illegal admin hs" name="act_matrix_subvert_infrastructure" type="action" value=""><span data-i18n="subvert_infrastructure"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin crb" name="act_matrix_tarpit" type="action" value=""><span data-i18n="tarpit"></span></button>
+							<button title="Electronics + Intuition" class="illegal admin crb" name="act_matrix_trace_icon" type="action" value=""><span data-i18n="traceicon"></span></button>
+							<button title="Electronics + Logic" class="legal outsider user admin hs" name="act_matrix_threat_analysis" type="action" value=""><span data-i18n="threat_analysis"></span></button>
+							<hr>
 							<h2 data-i18n="matrixminor">Matrix Minor Actions</h2>
 							<span class="matrix-action legal user admin" data-i18n="changeicon"></span>
 							<span class="matrix-action legal" data-i18n="enterexithost"></span>
-							<button title="Electronics + Intuition" class="legal outsider user admin" name="act_matrix_matrix_perception" type="action" value="@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Matrix Perception}}{{?{Specialization or Expertise?|No,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{intuition}+?{Specialization or Expertise?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=* With Resonance or Cyberdeck, (Legal), vs. Willpower + Sleaze}}{{wilddie=[[@{wild_die}]]}}{{wilddie_dice=[[0]]}}"><span data-i18n="matrixperception"></span></button>
+							<button title="Electronics + Intuition" class="legal outsider user admin" name="act_matrix_matrix_perception" type="action" value=""><span data-i18n="matrixperception"></span></button>
 							<span class="matrix-action legal admin" data-i18n="reconfigurematrixattribute"></span>
 							<span class="matrix-action legal outsider user admin" data-i18n="sendmessage"></span>
+							<button title="Electronics + Logic" class="illegal outsider hs" name="act_matrix_squelch" type="action" value=""><span data-i18n="squelch"></span></button>
 							<span class="matrix-action legal admin" data-i18n="switchinterfacemode"></span>
+							<span class="matrix-action legal outsider" data-i18n="virtual_aim"></span>
+							<button title="Cracking + Logic" class="illegal user admin hs" name="act_matrix_watchdog" type="action" value=""><span data-i18n="watchdog"></span></button>
 						</div>
 
 			         <input class="tab-switch" name="attr_rolls_toggle" type="hidden" value="misc"/>
@@ -5490,6 +5499,86 @@
 				<div class="pc-box">
 					<div class="rolls-col">
 			         <input class="tab-switch" name="attr_rolls_toggle" type="hidden" value="matrix"/>
+
+						<div class="rolls-matrix">
+							<input type="hidden" name="attr_display_illegal_matrix_actions" value="">
+							<input type="hidden" name="attr_matrix_access_level_filter" value="">
+							<h3 data-i18n="rollbuttonsdisclaimer"></h3><br>
+							<span class="full-width">
+								<label class="fright" data-i18n-title="illegal_actions" title="Display Illegal Actions">
+									<span data-i18n="illegal_actions"></span>
+									<input type="checkbox" name="attr_display_illegal_matrix_actions" value="1" checked="checked" title="@{display_illegal_matrix_actions}">
+								</label>
+							</span>
+							<span class="full-width">
+								<label class="fleft" data-i18n-title="matrix_noise" title="Matrix Noise">
+									<span data-i18n="matrix_noise"></span>
+									<input type="number" name="attr_matrix_noise" value="0" placeholder="0" title="@{matrix_noise}" step="1">
+								</label>
+								<label class="fright" data-i18n-title="matrix_access_level" title="Access Level Filter">
+									<span data-i18n="access_level_filter"></span>
+									<select name="attr_matrix_access_level_filter" title="@{matrix_access_level_filter}">
+										<option data-i18n="all" value="all">All</option>
+										<option data-i18n="outsider" value="outsider">Outsider</option>
+										<option data-i18n="user" value="user">User</option>
+										<option data-i18n="admin" value="admin">Admin</option>
+									</select>
+								</label>
+							</span>
+
+							<h2 data-i18n="matrixmajor">Matrix Major Actions</h2>
+							<button title="Cracking + Logic" class="illegal outsider crb" name="act_matrix_backdoor_entry" type="action" value=""><span data-i18n="backdoorentry"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin crb" name="act_matrix_brute_force" type="action" value=""><span data-i18n="bruteforce"></span></button>
+							<button title="Cracking + Logic" class="legal user admin hs" name="act_matrix_calibration" type="action" value=""><span data-i18n="calibration"></span></button>
+							<button title="Cracking + Logic" class="illegal admin crb" name="act_matrix_check_os" type="action" value=""><span data-i18n="checkos"></span></button>
+							<button title="Electronics + Logic" class="legal user admin crb" name="act_matrix_control_device" type="action" value=""><span data-i18n="controldevice"></span></button>
+							<button title="Cracking + Logic" class="illegal user admin crb" name="act_matrix_crack_file" type="action" value=""><span data-i18n="crackfile"></span></button>
+							<button title="Cracking + Logic" class="illegal admin crb" name="act_matrix_crash_program" type="action" value=""><span data-i18n="crashprogram"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin crb" name="act_matrix_data_spike" type="action" value=""><span data-i18n="dataspike"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin hs" name="act_matrix_delayed_command" type="action" value=""><span data-i18n="delayed_command"></span></button>
+							<button title="Electronics + Logic" class="illegal outsider hs" name="act_matrix_denial_of_service" type="action" value=""><span data-i18n="denial_of_service"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin hs" name="act_matrix_device_lock" type="action" value=""><span data-i18n="device_lock"></span></button>
+							<button title="Cracking + Logic" class="legal user admin crb" name="act_matrix_disarm_data_bomb" type="action" value=""><span data-i18n="disarmdatabomb"></span></button>
+							<button title="Electronics + Logic" class="legal user admin crb" name="act_matrix_edit_file" type="action" value=""><span data-i18n="editfile"></span></button>
+							<button title="Electronics + Logic" class="legal user admin crb" name="act_matrix_encrypt_file" type="action" value=""><span data-i18n="encryptfile"></span></button>
+							<button title="Electronics + Logic" class="illegal user admin crb" name="act_matrix_erase_matrix_signature" type="action" value=""><span data-i18n="erasematrixsignature"></span></button>
+							<button title="Electronics + Logic" class="legal admin crb" name="act_matrix_format_device" type="action" value=""><span data-i18n="formatdevice"></span></button>
+							<span class="matrix-action legal outsider user admin crb" data-i18n="fullmatrixdefense"></span>
+							<button title="Cracking + Logic" class="illegal user admin hs" name="act_matrix_garbage_in_garbage_out" type="action" value=""><span data-i18n="garbage_in_garbage_out"></span></button>
+							<button title="Electronics + Logic" class="illegal user admin crb" name="act_matrix_hash_check" type="action" value=""><span data-i18n="hashcheck"></span></button>
+							<button title="Cracking + Intuition" class="illegal outsider user admin crb" name="act_matrix_hide" type="action" value=""><span data-i18n="hide"></span></button>
+							<button title="Electronics + Willpower" class="legal outsider user admin crb" name="act_matrix_jackout" type="action" value=""><span data-i18n="jackout"></span></button>
+							<button title="Cracking + Logic" class="illegal admin crb" name="act_matrix_jam_signals" type="action" value=""><span data-i18n="jamsignals"></span></button>
+							<button title="Electronics + Logic" class="legal user admin crb" name="act_matrix_jump_into_rigged_device" type="action" value=""><span data-i18n="jumpintoriggeddevice"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider hs" name="act_matrix_known_exploit_backdoor_entry" type="action" value=""><span data-i18n="known_exploit_backdoor_entry"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider hs" name="act_matrix_masquerade" type="action" value=""><span data-i18n="masquerade"></span></button>
+							<button title="Electronics + Intuition" class="legal outsider user admin crb" name="act_matrix_matrix_perception" type="action" value=""><span data-i18n="matrixperception"></span></button>
+							<button title="Electronics + Intuition" class="legal outsider user admin crb" name="act_matrix_matrix_search" type="action" value=""><span data-i18n="matrixsearch"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider hs" name="act_matrix_metahuman_in_the_middle" type="action" value=""><span data-i18n="metahuman_in_the_middle"></span></button>
+							<button title="Electronics + Logic" class="illegal admin hs" name="act_matrix_modify_icon" type="action" value=""><span data-i18n="modify_icon"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider hs" name="act_matrix_popup" type="action" value=""><span data-i18n="popup"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin crb" name="act_matrix_probe" type="action" value=""><span data-i18n="probe"></span></button>
+							<button title="Electronics + Logic" class="legal admin crb" name="act_matrix_reboot_device" type="action" value=""><span data-i18n="rebootdevice"></span></button>
+							<button title="Electronics + Logic" class="illegal admin crb" name="act_matrix_set_data_bomb" type="action" value=""><span data-i18n="setdatabomb"></span></button>
+							<button title="Cracking + Logic" class="illegal admin crb" name="act_matrix_snoop" type="action" value=""><span data-i18n="snoop"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin crb" name="act_matrix_spoof_command" type="action" value=""><span data-i18n="spoofcommand"></span></button>
+							<button title="Electronics + Logic" class="illegal admin hs" name="act_matrix_subvert_infrastructure" type="action" value=""><span data-i18n="subvert_infrastructure"></span></button>
+							<button title="Cracking + Logic" class="illegal outsider user admin crb" name="act_matrix_tarpit" type="action" value=""><span data-i18n="tarpit"></span></button>
+							<button title="Electronics + Intuition" class="illegal admin crb" name="act_matrix_trace_icon" type="action" value=""><span data-i18n="traceicon"></span></button>
+							<button title="Electronics + Logic" class="legal outsider user admin hs" name="act_matrix_threat_analysis" type="action" value=""><span data-i18n="threat_analysis"></span></button>
+
+							<h2 data-i18n="matrixminor">Matrix Minor Actions</h2>
+							<span class="matrix-action legal user admin" data-i18n="changeicon"></span>
+							<span class="matrix-action legal" data-i18n="enterexithost"></span>
+							<button title="Electronics + Intuition" class="legal outsider user admin" name="act_matrix_matrix_perception" type="action" value=""><span data-i18n="matrixperception"></span></button>
+							<span class="matrix-action legal admin" data-i18n="reconfigurematrixattribute"></span>
+							<span class="matrix-action legal outsider user admin" data-i18n="sendmessage"></span>
+							<button title="Electronics + Logic" class="illegal outsider hs" name="act_matrix_squelch" type="action" value=""><span data-i18n="squelch"></span></button>
+							<span class="matrix-action legal admin" data-i18n="switchinterfacemode"></span>
+							<span class="matrix-action legal outsider" data-i18n="virtual_aim"></span>
+							<button title="Cracking + Logic" class="illegal user admin hs" name="act_matrix_watchdog" type="action" value=""><span data-i18n="watchdog"></span></button>
+						</div>
+<!--
 						<h3 data-i18n="rollbuttonsdisclaimer"></h3><br>
 						<h2 data-i18n="matrixmajor">Matrix Major Actions</h2>
 						<div class="rolls-matrix">
@@ -5530,7 +5619,7 @@
 							<span class="matrix-action legal outsider user admin" data-i18n="sendmessage"></span>
 							<span class="matrix-action legal admin" data-i18n="switchinterfacemode"></span>
 						</div>
-
+-->
 					</div>
 				</div>
 			</div>
@@ -5901,7 +5990,7 @@
 			{{#rollGreater() mod 0}}<span>|</span><span data-i18n="modifier">Modifier</span> ({{mod}})<span>|</span>{{/rollGreater() mod 0}}
 			{{#rollGreater() edge 0}}<span>|</span><span data-i18n="edge">Edge</span> ({{edge}})<span>|</span>{{/rollGreater() edge 0}}
 			{{#rollGreater() overclock 0}}<span>|</span><span data-i18n="overclock">Overclock</span> (2)<span>|</span>{{/rollGreater() overclock 0}}
-			{{#rollGreater() matrix_noise 0}}<span>|</span><span data-i18n="noise">Noise</span> ({{matrix_noise}})<span>|</span>{{/rollGreater() matrix_noise 0}}
+			{{#rollGreater() matrix_noise 0}}<span>|</span><span data-i18n="noise">Noise</span> (-{{matrix_noise}})<span>|</span>{{/rollGreater() matrix_noise 0}}
 			{{#rollGreater() combat_paralysis 0}}<span>|</span><span data-i18n="combat_paralysis">Combat Paralysis</span><span>|</span>{{/rollGreater() combat_paralysis 0}}
 		</div>
 		{{#rollGreater() computed::glitch 0}}
@@ -7154,33 +7243,50 @@ const rollButtons = {
 	matrixresist_dr_dr: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{selected|wounds_toggle}]]}}{{edge=[[@{selected|edge_toggle}]]}}{{header=@{selected|character_name}}}{{base=^{devicerating} x 2}}{{dice=[[(@{selected|matrix_device_rating}+@{selected|matrix_device_rating}+@{selected|wounds_toggle}+@{selected|modifiers_toggle}+@{selected|edge_toggle}+@{uda})d6>5@{selected|explode_toggle}cs>5cf<[[(1+@{selected|bad_luck})]]]]}}{{desc=}}{{wilddie=[[@{selected|wild_die}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}",
 	matrixresist_l_f: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{selected|wounds_toggle}]]}}{{edge=[[@{selected|edge_toggle}]]}}{{header=@{selected|character_name}}}{{base=^{logic} + ^{firewall}}}{{dice=[[(@{selected|logic}+@{selected|firewall}+@{selected|wounds_toggle}+@{selected|modifiers_toggle}+@{selected|edge_toggle}+@{uda})d6>5@{selected|explode_toggle}cs>5cf<[[(1+@{selected|bad_luck})]]]]}}{{desc=}}{{wilddie=[[@{selected|wild_die}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}",
 	matrixresist_pilot_f: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{selected|wounds_toggle}]]}}{{edge=[[@{selected|edge_toggle}]]}}{{header=@{selected|character_name}}}{{base=^{firewall} + ^{pilot}}}{{dice=[[(@{selected|firewall}+@{selected|pilot}+@{selected|wounds_toggle}+@{selected|modifiers_toggle}+@{selected|edge_toggle}+@{uda})d6>5@{selected|explode_toggle}cs>5cf<[[(1+@{selected|bad_luck})]]]]}}{{desc=}}{{wilddie=[[@{selected|wild_die}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}",
+	matrixresist_s_s: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{selected|wounds_toggle}]]}}{{edge=[[@{selected|edge_toggle}]]}}{{header=@{selected|character_name}}}{{base=^{sleaze} + ^{sleaze}}}{{dice=[[(@{selected|sleaze}+@{selected|sleaze}+@{selected|wounds_toggle}+@{selected|modifiers_toggle}+@{selected|edge_toggle}+@{uda})d6>5@{selected|explode_toggle}cs>5cf<[[(1+@{selected|bad_luck})]]]]}}{{desc=}}{{wilddie=[[@{selected|wild_die}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}",
 
-	matrix_backdoor_entry: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Backdoor Entry}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_brute_force: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Brute Force}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_check_os: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Check OS}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), Threshold: 4}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_control_device: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Control Device}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. [Willpower + Firewall](~selected|matrixresist_w_f)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_crack_file: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Crack File}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. Encryption Rating x 2}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_crash_program: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Crash Program}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Data Processing + Device Rating](~selected|matrixresist_dp_dr)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_data_spike: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Data Spike}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Data Processing + Firewall](~selected|matrixresist_dp_f)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_disarm_data_bomb: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Disarm Data Bomb}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. Data Bomb Rating x 2}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_backdoor_entry: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Backdoor Entry}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f), CRB p.180}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_brute_force: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Brute Force}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f), CRB p.180}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_check_os: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Check OS}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), Threshold: 4, CRB p.180}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_control_device: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Control Device}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. [Willpower + Firewall](~selected|matrixresist_w_f), CRB p.180}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_crack_file: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Crack File}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. Encryption Rating x 2, CRB p.180}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_crash_program: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Crash Program}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Data Processing + Device Rating](~selected|matrixresist_dp_dr), CRB p.181}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_data_spike: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Data Spike}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Data Processing + Firewall](~selected|matrixresist_dp_f), CRB p.181}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_disarm_data_bomb: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Disarm Data Bomb}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. Data Bomb Rating x 2, CRB p.181}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
 	matrix_edit_file: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Edit File}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. [Intuition + Firewall](~selected|matrixresist_int_f) |or| [Firewall + Sleaze](~selected|matrixresist_f_s)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_encrypt_file: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Encrypt File}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), Hits = Encryption Rating}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_erase_matrix_signature: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Erase Matrix Signature}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f) |or| [Firewall x 2](~selected|matrixresist_f_f)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_format_device: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Format Device}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. [Willpower + Firewall](~selected|matrixresist_w_f) |or| [Firewall x 2](~selected|matrixresist_f_f)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_hash_check: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Hash Check}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), CRB pg.182}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_hide: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Hide}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{intuition}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Intuition + Data Processing](~selected|matrixresist_int_dp) |or| [Data Processing + Sleaze](~selected|matrixresist_dp_s)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_jackout: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Jack Out}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{willpower}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. [Charisma + Data Processing](~selected|matrixresist_c_dp) |or| [Attack + Data Processing](~selected|matrixresist_a_dp)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_jam_signals: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Jam Signals}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), CRB pg.182}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_jump_into_rigged_device: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Jump Into Rigged Device}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. [Willpower + Firewall](~selected|matrixresist_w_f) |or| [Firewall x 2](~selected|matrixresist_f_f)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_matrix_perception: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Matrix Perception}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{intuition}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. [Willpower + Sleaze](~selected|matrixresist_w_s)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_matrix_search: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Matrix Search}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{intuition}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), Extended Test, 10 Minute Interval}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_probe: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Probe}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f) |or| [Firewall x 2](~selected|matrixresist_f_f)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_reboot_device: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Reboot Device}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. [Willpower + Firewall](~selected|matrixresist_w_f) |or| [Firewall x 2](~selected|matrixresist_f_f)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_set_data_bomb: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Set Data Bomb}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Device Rating x 2](~selected|matrixresist_dr_dr)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_snoop: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Snoop}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Logic + Firewall](~selected|matrixresist_l_f) |or| [Data Processing + Firewall](~selected|matrixresist_dp_f)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_spoof_command: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Spoof Command}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Data Processing + Firewall](~selected|matrixresist_dp_f) |or| [Pilot + Firewall](~selected|matrixresist_pilot_f)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_tarpit: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Tar Pit}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Data Processing + Firewall](~selected|matrixresist_dp_f)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
-	matrix_trace_icon: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Trace Icon}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{intuition}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Sleaze](~selected|matrixresist_w_s) |or| [Firewall + Sleaze](~selected|matrixresist_f_s)}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_encrypt_file: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Encrypt File}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), Hits = Encryption Rating, CRB p.181}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_erase_matrix_signature: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Erase Matrix Signature}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f) |or| [Firewall x 2](~selected|matrixresist_f_f), CRB p.181}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_format_device: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Format Device}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. [Willpower + Firewall](~selected|matrixresist_w_f) |or| [Firewall x 2](~selected|matrixresist_f_f), CRB p.181}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_hash_check: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Hash Check}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), CRB p.182}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_hide: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Hide}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{intuition}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Intuition + Data Processing](~selected|matrixresist_int_dp) |or| [Data Processing + Sleaze](~selected|matrixresist_dp_s), CRB p.182}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_jackout: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Jack Out}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{willpower}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. [Charisma + Data Processing](~selected|matrixresist_c_dp) |or| [Attack + Data Processing](~selected|matrixresist_a_dp), CRB p.182}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_jam_signals: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Jam Signals}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), CRB p.182}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_jump_into_rigged_device: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Jump Into Rigged Device}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. [Willpower + Firewall](~selected|matrixresist_w_f) |or| [Firewall x 2](~selected|matrixresist_f_f), CRB p.182}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_matrix_perception: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Matrix Perception}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{intuition}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. [Willpower + Sleaze](~selected|matrixresist_w_s), CRB p.182}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_matrix_search: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Matrix Search}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{intuition}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), Extended Test, 10 Minute Interval, CRB p.183}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_probe: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Probe}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f) |or| [Firewall x 2](~selected|matrixresist_f_f), CRB p.183}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_reboot_device: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Reboot Device}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), vs. [Willpower + Firewall](~selected|matrixresist_w_f) |or| [Firewall x 2](~selected|matrixresist_f_f), CRB p.183}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_set_data_bomb: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Set Data Bomb}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Device Rating x 2](~selected|matrixresist_dr_dr), CRB p.183}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_snoop: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Snoop}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Logic + Firewall](~selected|matrixresist_l_f) |or| [Data Processing + Firewall](~selected|matrixresist_dp_f), CRB p.184}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_spoof_command: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Spoof Command}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Data Processing + Firewall](~selected|matrixresist_dp_f) |or| [Pilot + Firewall](~selected|matrixresist_pilot_f), CRB p.184}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_tarpit: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Tar Pit}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Data Processing + Firewall](~selected|matrixresist_dp_f), CRB p.184}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_trace_icon: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Trace Icon}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{intuition}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Sleaze](~selected|matrixresist_w_s) |or| [Firewall + Sleaze](~selected|matrixresist_f_s), CRB p.184}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+
+	matrix_calibration: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Calibration}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), HS p.28}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_delayed_command: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Delayed Command}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Data Processing + Firewall](~selected|matrixresist_dp_f) |or| [Pilot + Firewall](~selected|matrixresist_pilot_f), HS p.28}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_denial_of_service: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Denial of Service}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f), HS p.28}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_device_lock: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Device Lock}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f), HS p.29}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_garbage_in_garbage_out: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Garbage/In Garbage Out}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f), HS p.29}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_known_exploit_backdoor_entry: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Known Exploit Backdoor Entry}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f) |or| [Firewall x 2](~selected|matrixresist_f_f), HS p.30}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_masquerade: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Masquerade}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Intuition + Data Processing](~selected|matrixresist_int_dp), HS p.30}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_metahuman_in_the_middle: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Metahuman in the Middle}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Intuition + Data Processing](~selected|matrixresist_int_dp), HS p.30}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_modify_icon: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Modify Icon}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Intuition + Data Processing](~selected|matrixresist_int_dp) |or| [Data Processing + Sleaze](~selected|matrixresist_dp_s), HS p.30}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_popup: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Popup}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Intuition + Data Processing](~selected|matrixresist_int_dp), HS p.30}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_squelch: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Squelch}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Intuition + Sleaze](~selected|matrixresist_int_s) |or| [Sleaze x 2](~selected|matrixresist_s_s), HS p.30}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_subvert_infrastructure: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Subvert Infrastructure}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f), HS p.30}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_threat_analysis: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Threat Analysis}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{electronics}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Legal), HS p.31}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+	matrix_watchdog: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Matrix Watchdog}}{{?{Training Level?|Untrained,-1|Trained,0|Specialized,2|Expertise,3}}}{{dice=[[(@{cracking}+@{logic}+?{Training Level?|0}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle}+(@{matrix_overclock}*2)-@{matrix_noise}+@{uda})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=(Illegal), vs. [Willpower + Firewall](~selected|matrixresist_w_f), HS p.31}}{{wilddie=[[@{wild_die}+@{matrix_overclock}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{dicepool=[[0]]}}{{overclock=[[@{matrix_overclock}]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}{{matrix_noise=[[@{matrix_noise}]]}}",
+
 
 	extended_start: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Begin Extended Test}}{{reason=?{Extended Test Reason?}}}{{dice=[[(?{Dicepool?|1}+@{modifiers_toggle}+@{wounds_toggle}+@{edge_toggle})d6>5@{explode_toggle}cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=Extended Test Beginning}}{{wilddie=[[@{wild_die}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{extendedtest=[[1]]}}{{newdicepool=[[(?{Dicepool?|1}-1)]]}}{{dicepool=[[?{Dicepool?|1}]]}}{{hitstotal=[[0]]}}{{intervals=[[1]]}}{{passthrough=[[0]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}",
 	extended_next: "@{gm_toggle} &{template:rolls-computed}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Continue Extended Test}}{{dice=[[(%DICEPOOL%+@{modifiers_toggle}+@{wounds_toggle})d6>5cs>5cf<[[(1+@{bad_luck})]]]]}}{{desc=Extended Test Continuing}}{{wilddie=[[@{wild_die}]]}}{{glitch=[[0]]}}{{wilddie_dice=[[0]]}}{{extendedtest=[[2]]}}{{newdicepool=[[%NEWDICEPOOL%]]}}{{dicepool=[[%DICEPOOL%]]}}{{hitstotal=[[0]]}}{{intervals=[[%INTERVALS%]]}}{{reason=%REASON%}}{{passthrough=[[0]]}}{{misses=[[0]]}}{{hits=[[0]]}}{{fours=[[0]]}}{{rerolls=[[@{rerolls}]]}}",
@@ -7285,7 +7391,8 @@ Object.keys(initiatives).forEach((ini) => {
 'connections1', 'connections2', 'connections3', 'connections4', 'connections5', 'connections6', 'connections7', 'connections8', 'connections9', 'connections10',
 'loyalty1', 'loyalty2', 'loyalty3', 'loyalty4', 'loyalty5', 'loyalty6', 'loyalty7', 'loyalty8', 'loyalty9', 'loyalty10',
 'matrix_backdoor_entry', 'matrix_brute_force', 'matrix_check_os', 'matrix_control_device', 'matrix_crack_file', 'matrix_crash_program', 'matrix_data_spike', 'matrix_disarm_data_bomb', 'matrix_edit_file', 'matrix_encrypt_file', 'matrix_erase_matrix_signature', 'matrix_format_device', 'matrix_hash_check', 'matrix_hide', 'matrix_jackout', 'matrix_jam_signals', 'matrix_jump_into_rigged_device', 'matrix_matrix_perception', 'matrix_matrix_search', 'matrix_probe', 'matrix_reboot_device', 'matrix_set_data_bomb', 'matrix_snoop', 'matrix_spoof_command', 'matrix_tarpit', 'matrix_trace_icon',
-'matrixresist_int_f', 'matrixresist_f_s', 'matrixresist_w_f', 'matrixresist_dp_f', 'matrixresist_f_f', 'matrixresist_int_dp', 'matrixresist_dp_s', 'matrixresist_c_dp', 'matrixresist_dp_dr', 'matrixresist_a_dp', 'matrixresist_w_s', 'matrixresist_dr_dr', 'matrixresist_l_f', 'matrixresist_pilot_f',
+'matrix_calibration', 'matrix_delayed_command', 'matrix_denial_of_service', 'matrix_device_lock', 'matrix_garbage_in_garbage_out', 'matrix_known_exploit_backdoor_entry', 'matrix_masquerade', 'matrix_metahuman_in_the_middle', 'matrix_modify_icon', 'matrix_popup', 'matrix_squelch', 'matrix_subvert_infrastructure', 'matrix_threat_analysis', 'matrix_watchdog',
+'matrixresist_int_f', 'matrixresist_f_s', 'matrixresist_w_f', 'matrixresist_dp_f', 'matrixresist_f_f', 'matrixresist_int_dp', 'matrixresist_dp_s', 'matrixresist_c_dp', 'matrixresist_dp_dr', 'matrixresist_a_dp', 'matrixresist_w_s', 'matrixresist_dr_dr', 'matrixresist_l_f', 'matrixresist_pilot_f', 'matrixresist_s_s',
 'host_rating', 'host_attack', 'host_sleaze', 'host_data_processing', 'host_firewall',
 'pilot', 'vehicle_dr', 'vehicle_defense', 'npc_clearsight', 'npc_electronicwarfare', 'npc_evasion', 'npc_maneuvering', 'npc_stealth', 'npc_targeting', 'npc_targeting2', 'npc_targeting3',
 'level', 'sprite_attack', 'sprite_sleaze', 'sprite_data_processing', 'sprite_firewall', 'resonance',
diff --git a/Shadowrun Sixth World/translation.json b/Shadowrun Sixth World/translation.json
index b775bb19de..d9f57d0af6 100644
--- a/Shadowrun Sixth World/translation.json	
+++ b/Shadowrun Sixth World/translation.json	
@@ -3,6 +3,7 @@
 	"acc": "ACC",
 	"accel": "Accel",
 	"acceleration": "Acceleration",
+	"access_level_filter": "Access Level Filter",
 	"acid": "Acid",
 	"acidprotection": "Acid Protection",
 	"act": "Act",
@@ -12,11 +13,13 @@
 	"addedgetodicepool": "Add Edge to dice pool and make 6's explode",
 	"adept": "Adept",
 	"adeptpowers": "Adept Powers",
+	"admin": "Admin",
 	"age": "Age",
 	"agent/gm": "Agent/GM",
 	"agility": "Agility",
 	"air": "Air",
 	"alchemy": "Alchemy",
+	"all": "All",
 	"alphaware": "Alphaware",
 	"ammo": "Ammo",
 	"ap": "AP",
@@ -68,6 +71,7 @@
 	"burstwide": "Burst Fire Wide (BW)",
 	"bus": "Bus",
 	"c": "C",
+	"calibration": "Calibration",
 	"capacity": "Capacity",
 	"car": "Car",
 	"category": "Category",
@@ -145,9 +149,12 @@
 	"defenserating": "Defense Rating",
 	"defense attribute": "Defense Attribute",
 	"defense matrix attribute": "Defense Matrix Attribute",
+	"delayed_command": "Delayed Command",
 	"deltaware": "Deltaware",
+	"denial_of_service": "Denial of Service",
 	"detection": "Detection",
 	"device": "Device",
+	"device_lock": "Device Lock",
 	"devicerating": "Device Rating",
 	"devicetype": "Device Type",
 	"dice": "Dice",
@@ -234,6 +241,7 @@
 	"gm": "To GM",
 	"gm-whisper": "Whisper Roll to GM",
 	"/w GM": "/w GM",
+	"garbage_in_garbage_out": "Garbage In/Garbage Out",
 	"grade": "Grade",
 	"gravity": "Gravity",
 	"grenade": "Grenade",
@@ -270,6 +278,7 @@
 	"ic limit": "IC Limit",
 	"idslifestylecurrency": "SINs/Lifestyles/Currency",
 	"lifestylelicensesnotes": "Lifestyle / Licenses / Notes",
+	"illegal_actions": "Display Illegal Actions",
 	"illusion": "Illusion",
 	"indirect": "Indirect",
 	"indirectcombat": "Indirect Combat",
@@ -304,6 +313,7 @@
 	"kin": "Kin",
 	"knowledge": "Knowledge",
 	"knowledgeskills": "Knowledge Skills",
+	"known_exploit_backdoor_entry": "Known Exploit Backdoor Entry",
 	"l": "L",
 	"language": "Language",
 	"languageskills": "Language Skills",
@@ -338,6 +348,7 @@
 	"maneuvering": "Maneuvering",
 	"manipulation": "Manipulation",
 	"martialarts": "Martial Arts",
+	"masquerade": "Masquerade",
 	"matchgrade": "Match-Grade",
 	"matrix": "Matrix",
 	"matrix_ar": "Matrix AR",
@@ -362,6 +373,7 @@
 	"memory": "Memory",
 	"mental": "Mental",
 	"meta": "Meta",
+	"metahuman_in_the_middle": "Metahuman in the Middle",
 	"metamagic": "Metamagic",
 	"metatype": "Metatype",
 	"mi-km": "Miles <=> Kilometers",
@@ -381,6 +393,7 @@
 	"modifier_text_boxes": "Modifier Text Boxes",
 	"modifierdice": "Modifier Dice",
 	"modifiers": "Modifiers",
+	"modify_icon": "Modify Icon",
 	"moreshots": "More Shots",
 	"movement": "Movement",
 	"movementmodifier": "Movement Modifier",
@@ -408,6 +421,7 @@
 	"options": "Options",
 	"other": "Other",
 	"outdoors": "Outdoors",
+	"outsider": "Outsider",
 	"overclock": "Overclock",
 	"overflow": "Overflow",
 	"overflowmodifier": "Overflow Modifier",
@@ -433,6 +447,7 @@
 	"playername": "Player Name",
 	"plot": "Plot",
 	"pool": "Pool",
+	"popup": "Popup",
 	"potency": "Potency",
 	"power": "Power",
 	"powers": "Powers",
@@ -530,6 +545,7 @@
 	"social_rating": "Social Rating",
 	"social_rating_desc": "Charisma + Armor Social Mods",
 	"sorcery": "Sorcery",
+	"source": "Source",
 	"special": "Special",
 	"specialization": "Specialization (+2)",
 	"speed": "Speed",
@@ -541,7 +557,7 @@
 	"sprint": "Sprint",
 	"sprite": "Sprite",
 	"sprites": "Sprites",
-	"source": "Source",
+	"squelch": "Squelch",
 	"ss": "SS",
 	"standard": "Standard",
 	"stealth": "Stealth",
@@ -555,6 +571,7 @@
 	"submarine": "Submarine",
 	"submersion": "Submersion",
 	"submersionlevel": "Submersion Level",
+	"subvert_infrastructure": "Subvert Infrastructure",
 	"summonspirit": "Summon Spirit",
 	"sustained": "Sustained",
 	"switchinterfacemode": "Switch Mode",
@@ -570,6 +587,7 @@
 	"technomancer": "Technomancer",
 	"temp": "Temp",
 	"temporarymodifiers": "Temporary Modifiers",
+	"threat_analysis": "Threat Analysis",
 	"threshold": "Threshold",
 	"thrown": "Thrown",
 	"time": "Time",
@@ -590,12 +608,15 @@
 	"unset": "Unset",
 	"updates": "Updates",
 	"used": "Used",
+	"user": "User",
 	"van": "Van",
 	"vehicle": "Vehicle",
 	"vehicleweapons": "Vehicle Weapons",
+	"virtual_aim": "Virtual Aim",
 	"vtolvstol": "VTOL/VSTOL",
 	"w": "W",
 	"walkmodifier": "Walk Modifier",
+	"watchdog": "Watchdog",
 	"water": "Water",
 	"weakness": "Weakness",
 	"weaknesses": "Weaknesses",