diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.css b/Shadowrun Sixth World/Shadowrun6thEdition.css
index 4b674cef97..eed799c1e6 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.css	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.css	
@@ -1566,7 +1566,8 @@ div.matrix-device .matrixFirewall {
 
 
   /*  Matrix Complex Forms  */
-  #SR6WE .pc div.matrix div.complex-forms-rolls button, #SR6WE .pc div.matrix div.complex-forms-rolls button span {
+  #SR6WE .pc div.matrix div.complex-forms-rolls button, 
+  #SR6WE .pc div.matrix div.complex-forms-rolls button span {
     padding-right: 3px;
     display: inline !important; }
 
@@ -1621,9 +1622,107 @@ div.matrix-device .matrixFirewall {
     display: inherit; }
 
 
+  /*  Matrix  Submersion  */
+  #SR6WE .pc div.matrix div.submersion div.submersion-headers {
+    align-items: center;
+    padding: 0px 20px 0px 0px;
+    grid-gap: 5px;
+    display: grid;
+    grid-template-columns: auto 1fr auto 2em; }
+
+  /*  Matrix echoes Echoes  */
+  #SR6WE .pc div.matrix div.echoes div.repitem {
+    display: grid;
+    grid-template-columns: auto 1fr 1em 1em; }
+  #SR6WE .pc div.matrix div.echoes div.repitem label[data-i18n-title='notes'],
+  #SR6WE .pc div.matrix div.echoes div.repitem h3[data-i18n='notes'],
+  #SR6WE .pc div.matrix div.echoes div.repitem div.collapse,
+  #SR6WE .pc div.matrix div.echoes div.repitem label[data-i18n-title='modifiers'],
+  #SR6WE .pc div.matrix div.echoes div.repitem h3[data-i18n='modifiers'] {
+    grid-column: 1 / 5; }
+  #SR6WE .pc div.matrix div.echoes div.repitem input.collapse-flag {
+    grid-area: 1 / 3 / 1 / 4; }
+  #SR6WE .pc div.matrix div.echoes div.repitem input.collapse-flag + span.pictos, #SR6WE .pc div.matrix div.echoes div.repitem .settings-toggle input[type='checkbox'].collapse-flag + span, #SR6WE .settings-toggle .pc div.matrix div.echoes div.repitem input[type='checkbox'].collapse-flag + span,
+  #SR6WE .pc div.matrix div.echoes div.repitem .settings-flag input[type='checkbox'].collapse-flag + span,
+  #SR6WE .settings-flag .pc div.matrix div.echoes div.repitem input[type='checkbox'].collapse-flag + span, #SR6WE .pc div.matrix div.echoes div.repitem .flag-primary + div > input.collapse-flag + span, #SR6WE .pc div.matrix div.echoes div.repitem .repcontrol input.collapse-flag + span.repcontrol_edit:after, #SR6WE .repcontrol .pc div.matrix div.echoes div.repitem input.collapse-flag + span.repcontrol_edit:after,
+  #SR6WE .pc div.matrix div.echoes div.repitem .repcontrol input.collapse-flag + span.repcontrol_add:after,
+  #SR6WE .repcontrol .pc div.matrix div.echoes div.repitem input.collapse-flag + span.repcontrol_add:after, #SR6WE .pc div.matrix div.echoes div.repitem .itemcontrol input.collapse-flag + span.repcontrol_del, #SR6WE .itemcontrol .pc div.matrix div.echoes div.repitem input.collapse-flag + span.repcontrol_del {
+    grid-area: 1 / 3 / 1 / 4; }
+  #SR6WE .pc div.matrix div.echoes div.repitem input.settings-flag,
+  #SR6WE .pc div.matrix div.echoes div.repitem input.settings-flag + span.pictos,
+  #SR6WE .pc div.matrix div.echoes div.repitem .settings-toggle input[type='checkbox'].settings-flag + span,
+  #SR6WE .settings-toggle .pc div.matrix div.echoes div.repitem input[type='checkbox'].settings-flag + span,
+  #SR6WE .pc div.matrix div.echoes div.repitem .settings-flag input[type='checkbox'].settings-flag + span,
+  #SR6WE .settings-flag .pc div.matrix div.echoes div.repitem input[type='checkbox'].settings-flag + span,
+  #SR6WE .pc div.matrix div.echoes div.repitem .flag-primary + div > input.settings-flag + span,
+  #SR6WE .pc div.matrix div.echoes div.repitem .repcontrol input.settings-flag + span.repcontrol_edit:after,
+  #SR6WE .repcontrol .pc div.matrix div.echoes div.repitem input.settings-flag + span.repcontrol_edit:after,
+  #SR6WE .pc div.matrix div.echoes div.repitem .repcontrol input.settings-flag + span.repcontrol_add:after,
+  #SR6WE .repcontrol .pc div.matrix div.echoes div.repitem input.settings-flag + span.repcontrol_add:after,
+  #SR6WE .pc div.matrix div.echoes div.repitem .itemcontrol input.settings-flag + span.repcontrol_del,
+  #SR6WE .itemcontrol .pc div.matrix div.echoes div.repitem input.settings-flag + span.repcontrol_del {
+    grid-area: 1 / 4 / 1 / 5; }
+  #SR6WE .pc div.matrix div.echoes div.repitem div.row {
+    grid-column: 1 / 5;
+    margin-left: 0px; }
+  #SR6WE .pc div.matrix div.echoes div.repitem div.settings {
+    grid-column: 1 / 5;
+    grid-template-columns: 1fr; }
+
+
+
+  /*  Matrix sprites Echoes  */
+  #SR6WE .pc div.matrix div.sprites div.headers {
+    display: grid;
+    grid-template-columns: 11px 2em 10em 2em 1fr 1em 1em;
+    margin-bottom: 0px; }
+
+  #SR6WE .pc div.matrix div.sprites div.repitem {
+    display: grid;
+    grid-template-columns: 11px 2em 10em 2em 1fr; }
+  #SR6WE .pc div.matrix div.sprites div.repitem label[data-i18n-title='notes'],
+  #SR6WE .pc div.matrix div.sprites div.repitem h3[data-i18n='notes'],
+  #SR6WE .pc div.matrix div.sprites div.repitem div.collapse,
+  #SR6WE .pc div.matrix div.sprites div.repitem label[data-i18n-title='modifiers'],
+  #SR6WE .pc div.matrix div.sprites div.repitem h3[data-i18n='modifiers'] {
+    grid-column: 1 / 8; }
+  #SR6WE .pc div.matrix div.sprites div.repitem input.collapse-flag {
+    grid-area: 1 / 6 / 1 / 7; }
+  #SR6WE .pc div.matrix div.sprites div.repitem input.collapse-flag + span.pictos, #SR6WE .pc div.matrix div.sprites div.repitem .settings-toggle input[type='checkbox'].collapse-flag + span, #SR6WE .settings-toggle .pc div.matrix div.sprites div.repitem input[type='checkbox'].collapse-flag + span,
+  #SR6WE .pc div.matrix div.sprites div.repitem .settings-flag input[type='checkbox'].collapse-flag + span,
+  #SR6WE .settings-flag .pc div.matrix div.sprites div.repitem input[type='checkbox'].collapse-flag + span, #SR6WE .pc div.matrix div.sprites div.repitem .flag-primary + div > input.collapse-flag + span, #SR6WE .pc div.matrix div.sprites div.repitem .repcontrol input.collapse-flag + span.repcontrol_edit:after, #SR6WE .repcontrol .pc div.matrix div.sprites div.repitem input.collapse-flag + span.repcontrol_edit:after,
+  #SR6WE .pc div.matrix div.sprites div.repitem .repcontrol input.collapse-flag + span.repcontrol_add:after,
+  #SR6WE .repcontrol .pc div.matrix div.sprites div.repitem input.collapse-flag + span.repcontrol_add:after, #SR6WE .pc div.matrix div.sprites div.repitem .itemcontrol input.collapse-flag + span.repcontrol_del, #SR6WE .itemcontrol .pc div.matrix div.sprites div.repitem input.collapse-flag + span.repcontrol_del {
+    grid-area: 1 / 6 / 1 / 7; }
+  #SR6WE .pc div.matrix div.sprites div.repitem input.settings-flag,
+  #SR6WE .pc div.matrix div.sprites div.repitem input.settings-flag + span.pictos,
+  #SR6WE .pc div.matrix div.sprites div.repitem .settings-toggle input[type='checkbox'].settings-flag + span,
+  #SR6WE .settings-toggle .pc div.matrix div.sprites div.repitem input[type='checkbox'].settings-flag + span,
+  #SR6WE .pc div.matrix div.sprites div.repitem .settings-flag input[type='checkbox'].settings-flag + span,
+  #SR6WE .settings-flag .pc div.matrix div.sprites div.repitem input[type='checkbox'].settings-flag + span,
+  #SR6WE .pc div.matrix div.sprites div.repitem .flag-primary + div > input.settings-flag + span,
+  #SR6WE .pc div.matrix div.sprites div.repitem .repcontrol input.settings-flag + span.repcontrol_edit:after,
+  #SR6WE .repcontrol .pc div.matrix div.sprites div.repitem input.settings-flag + span.repcontrol_edit:after,
+  #SR6WE .pc div.matrix div.sprites div.repitem .repcontrol input.settings-flag + span.repcontrol_add:after,
+  #SR6WE .repcontrol .pc div.matrix div.sprites div.repitem input.settings-flag + span.repcontrol_add:after,
+  #SR6WE .pc div.matrix div.sprites div.repitem .itemcontrol input.settings-flag + span.repcontrol_del,
+  #SR6WE .itemcontrol .pc div.matrix div.sprites div.repitem input.settings-flag + span.repcontrol_del {
+    grid-area: 1 / 7 / 1 / 8; }
+  #SR6WE .pc div.matrix div.sprites div.repitem div.row {
+    grid-column: 1 / 8;
+    padding-left: 0px; }
+  #SR6WE .pc div.matrix div.sprites div.repitem div.settings {
+    margin-left: 0px;
+    grid-column: 1 / 7;
+    grid-template-columns: 2em 10em 2em 1fr; }
+
+
+
+
+
 /***** PC ROWS & COLUMNS SETTINGS *****/
 .pc-row {
-  margin-bottom: 10px !important; }
+  margin-bottom: 10px; }
 
 .pc-col {
   vertical-align: top !important;
@@ -3077,17 +3176,17 @@ span.d6 {
 /* DISPLAY SETTINGS
   ============================= */
 .pc div.skill-box input[name='attr_display_specialization'][value=' '] ~ div.buttons button[name*='specialization'],
-.pc div.skill-box input[name='attr_display_specialization'][value=''] ~ div.buttons button[name*='specialization'], .pc div.magic input.magic-toggle[value='rituals'] ~ .headers h2:nth-of-type(1n+2), .collapsable .desc, .collapsable .desc-lifestyle, .matrix,
-.magic,
-.resonance,
-.optional,
-.textboxes,
+.pc div.skill-box input[name='attr_display_specialization'][value=''] ~ div.buttons button[name*='specialization'], 
+.pc div.magic input.magic-toggle[value='rituals'] ~ .headers h2:nth-of-type(1n+2), 
+.collapsable .desc, .collapsable .desc-lifestyle, 
+.matrix, .magic, .resonance, .optional, .textboxes,
 .optional-flag[value='0'] + .attr-header,
-.category + div,
+.category + div, 
 .category + div + div, .npc, .pc, .arms, .augs, .core, .gear, .options, .social, .vehicle,
 .skills-active, .skills-knowledge, .skills-language, 
 .magic-spells, .magic-preps, .magic-rituals,
 .powers-adept, .powers-meta, .powers-conjuring,
+.complexforms, .submersion,
 .quality, .martial, div.collapse,
 .settings, input.settings-toggle:checked ~ div.display,
 input.settings-toggle:checked ~ .attr-col .attr-und div.display,
@@ -3148,6 +3247,7 @@ input[name='attr_category']:not([value='Combat']) ~ label[data-i18n-title='dam']
 .skills-toggle[value='active'] ~ .skills-active, .skills-toggle[value='knowledge'] ~ .skills-knowledge, .skills-toggle[value='language'] ~ .skills-language, 
 .magic-toggle[value='spells'] ~ .magic-spells, .magic-toggle[value='preps'] ~ .magic-preps, .magic-toggle[value='rituals'] ~ .magic-rituals, 
 .powers-toggle[value='adept'] ~ .powers-adept, .powers-toggle[value='meta'] ~ .powers-meta, .powers-toggle[value='conjuring'] ~ .powers-conjuring, 
+.techno-toggle[value='complexforms'] ~ .complexforms, .techno-toggle[value='submersion'] ~ .submersion, 
 .tab-switch[value='quality'] ~ .quality, .tab-switch[value='martial'] ~ .martial {
   display: inline !important; }
 
diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.html b/Shadowrun Sixth World/Shadowrun6thEdition.html
index 82c54f5708..137fec64d4 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.html	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.html	
@@ -2090,7 +2090,8 @@
 
           <div class="rows repeating-container programs">
             <h2 data-i18n="programs">Programs</h2>
-            <fieldset class="repeating_programs"><span name="attr_program"></span>
+            <fieldset class="repeating_programs">
+              <span name="attr_program"></span>
               <input class="collapse-flag" name="attr_display_flag" type="checkbox"/><span class="pictos">i</span>
               <input class="settings-flag" name="attr_flag" title="Settings toggle" type="checkbox" checked="checked"/><span class="pictos">x</span>
               <div class="collapse"><span name="attr_notes"></span></div>
@@ -2115,75 +2116,189 @@
 
 
 
-    <div class="pc-row techno-see">
+<!-- Technomancer -->
+    <div class="pc-row techno techno-see">
       <div class="header right-header">
-        <h1 data-i18n="complexforms">Complex Forms</h1>
+        <h1 data-i18n="technomancer">Technomancer</h1>
         <div class="right-tri"></div>
       </div>
-      <div class="border-box">
-        <div class="pc-box medium-box complex-forms-rolls">
-          <input type="hidden" name="attr_complex_form_attack_rating" value="0">
-          <button type="roll" name="roll_complex_forms_attack_rating" value="&{template:rolls}{{header=@{character_name}}}{{base=Complex Form Attack Rating}}{{rating=[[@{electronics}+@{resonance}]]}}{{desc=Electronics + Resonance}}" title="Complex Form Attack Rating"><span data-i18n="attackrating">Attack Rating</span><span name='attr_complex_form_attack_rating'></span></button>
-          <button data-i18n="resistfade" name="roll_fade" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{resistfade}}}{{dice=[[(@{willpower}+@{logic}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{wilddie=[[@{wild_die}d6]]}}{{desc=Willpower + Logic}}"></button>
-          <div class="rows repeating-container complex-forms">
-            <div class="row-long headers">
-              <h2 data-i18n="complexform">Complex Form</h2>
-              <h2 data-i18n="duration">Duration</h2>
-              <h2 data-i18n="fade">Fade</h2>
-            </div>
-            <fieldset class="repeating_forms">
-              <input name="attr_dicepool" type="hidden" value="0"/>
-              <span class='hide-roll-button' name='attr_skill'></span><span class='show-name' name='attr_name'></span><button name="roll_complex_form" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{complexform} @{name}}}{{dice=[[((@{skill}+@{resonance}+@{dicepool_modifier}+@{spec}+@{expert})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=@{notes}}}{{fade=[[@{fade}]]}}{{wilddie=[[@{wild_die}d6]]}}"><span name="attr_name"></span></button>
-              <span class="center" name="attr_duration"></span>
-              <span class="center" name="attr_fade"></span>
-              <input class="collapse-flag" name="attr_display_flag" type="checkbox"/><span class="pictos">i</span>
-              <input class="settings-flag" name="attr_flag" title="Settings toggle" type="checkbox" checked="checked"/><span class="pictos">x</span>
-              <div class="collapse"><span name="attr_notes"></span></div>
-              <div class="settings">
-                <label data-i18n-title="name" title="name">
-                  <input name="attr_name" placeholder="name" title="@{repeating_forms_${x}_name}" type="text" value=""/>
-                </label>
-                <select name="attr_duration" title="@{repeating_forms_${x}_duration}" value="Instant">
-                  <option data-i18n="instant" value="Instant">Instant</option>
-                  <option data-i18n="sustained" value="Sustained">Sustained</option>
-                  <option data-i18n="permanent" value="Permanent">Permanent</option>
-                  <option data-i18n="other" value="Other">Other</option>
-                </select>
-                <label data-i18n-title="fade" title="fade">
-                  <input name="attr_fade" placeholder="-1" title="@{repeating_forms_${x}_fade}" type="number" value=""/>
-                </label>
-                <div class="row">
-                  <h3 data-i18n="skill">skill</h3>
-                  <select name="attr_skill" title="@{repeating_forms_${x}_skill}" value="@{software}">
-                    <option data-i18n="noroll" value="">No Roll</option>
-                    <option data-i18n="cracking" value="@{cracking}">Cracking</option>
-                    <option data-i18n="electronics" value="@{electronics}">Electronics</option>
-                    <option data-i18n="tasking" value="@{tasking}">Tasking</option>
-                    <option data-i18n="other" value="@{other}">Other</option>
-                  </select>
-                  <h3 data-i18n="specialization">Specialization</h3>
-                  <label data-i18n-title="specialization" title="Specialization">
-                    <input name="attr_spec" value="2" title="@{repeating_forms_${x}_spec}" type="checkbox"/>
-                  </label>
-                  <h3 data-i18n="expertise">Expertise</h3>
-                  <label data-i18n-title="expertise" title="Expertise">
-                    <input name="attr_expert" value="3" title="@{repeating_forms_${x}_expert}" type="checkbox"/>
-                  </label>
-                </div>
-                <div class="row">
-                  <h3 data-i18n="modifier">modifier</h3>
-                  <label data-i18n-title="modifier" title="modifier">
-                    <input name="attr_dicepool_modifier" title="@{repeating_forms_${x}_dicepool_modifier}" type="number"/>
-                  </label>
-                </div>
-                <h3 data-i18n="notes">notes</h3>
-                <label data-i18n-title="notes" title="notes">
-                  <textarea name="attr_notes" placeholder="Notes" title="@{repeating_forms_${x}_notes}" type="text" value=""></textarea>
-                </label>
-              </div>
-            </fieldset>
-          </div>
+      <div class="header right-header">
+        <div class="header htab">
+          <div class="triangle"></div>
+          <input class="techno-toggle" name="attr_techno_toggle" title="@{techno_toggle}" type="radio" value="complexforms"/>
+          <h1 data-i18n="complexforms">Complex Forms</h1>
+          <div class="right-tri"></div>
         </div>
+        <div class="header htab">
+          <div class="triangle"></div>
+          <input class="techno-toggle" name="attr_techno_toggle" title="@{techno_toggle}" type="radio" value="submersion"/>
+          <h1 data-i18n="submersion">Submersion</h1>
+          <div class="right-tri"></div>
+        </div>
+      </div>
+      <div class="border-box">
+        <div class="pc-box medium-box">
+          <input class="techno-toggle" name="attr_techno_toggle" type="hidden" value="complexforms"/>
+          <div class="complex-forms-rolls complexforms">
+            <input type="hidden" name="attr_complex_form_attack_rating" value="0">
+            <button type="roll" name="roll_complex_forms_attack_rating" value="&{template:rolls}{{header=@{character_name}}}{{base=Complex Form Attack Rating}}{{rating=[[@{electronics}+@{resonance}]]}}{{desc=Electronics + Resonance}}" title="Complex Form Attack Rating"><span data-i18n="attackrating">Attack Rating</span><span name='attr_complex_form_attack_rating'></span></button>
+            <button data-i18n="resistfade" name="roll_fade" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{resistfade}}}{{dice=[[(@{willpower}+@{logic}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{wilddie=[[@{wild_die}d6]]}}{{desc=Willpower + Logic}}"></button>
+            <div class="rows repeating-container complex-forms">
+              <div class="row-long headers">
+                <h2 data-i18n="complexform">Complex Form</h2>
+                <h2 data-i18n="duration">Duration</h2>
+                <h2 data-i18n="fade">Fade</h2>
+              </div>
+              <fieldset class="repeating_forms">
+                <input name="attr_dicepool" type="hidden" value="0"/>
+                <span class='hide-roll-button' name='attr_skill'></span><span class='show-name' name='attr_name'></span><button name="roll_complex_form" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{complexform} @{name}}}{{dice=[[((@{skill}+@{resonance}+@{dicepool_modifier}+@{spec}+@{expert})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=@{notes}}}{{fade=[[@{fade}]]}}{{wilddie=[[@{wild_die}d6]]}}"><span name="attr_name"></span></button>
+                <span class="center" name="attr_duration"></span>
+                <span class="center" name="attr_fade"></span>
+                <input class="collapse-flag" name="attr_display_flag" type="checkbox"/><span class="pictos">i</span>
+                <input class="settings-flag" name="attr_flag" title="Settings toggle" type="checkbox" checked="checked"/><span class="pictos">x</span>
+                <div class="collapse"><span name="attr_notes"></span></div>
+                <div class="settings">
+                  <label data-i18n-title="name" title="name">
+                    <input name="attr_name" placeholder="name" title="@{repeating_forms_${x}_name}" type="text" value=""/>
+                  </label>
+                  <select name="attr_duration" title="@{repeating_forms_${x}_duration}" value="Instant">
+                    <option data-i18n="instant" value="Instant">Instant</option>
+                    <option data-i18n="sustained" value="Sustained">Sustained</option>
+                    <option data-i18n="permanent" value="Permanent">Permanent</option>
+                    <option data-i18n="other" value="Other">Other</option>
+                  </select>
+                  <label data-i18n-title="fade" title="fade">
+                    <input name="attr_fade" placeholder="-1" title="@{repeating_forms_${x}_fade}" type="number" value=""/>
+                  </label>
+                  <div class="row">
+                    <h3 data-i18n="skill">skill</h3>
+                    <select name="attr_skill" title="@{repeating_forms_${x}_skill}" value="@{software}">
+                      <option data-i18n="noroll" value="">No Roll</option>
+                      <option data-i18n="cracking" value="@{cracking}">Cracking</option>
+                      <option data-i18n="electronics" value="@{electronics}">Electronics</option>
+                      <option data-i18n="tasking" value="@{tasking}">Tasking</option>
+                      <option data-i18n="other" value="@{other}">Other</option>
+                    </select>
+                    <h3 data-i18n="specialization">Specialization</h3>
+                    <label data-i18n-title="specialization" title="Specialization">
+                      <input name="attr_spec" value="2" title="@{repeating_forms_${x}_spec}" type="checkbox"/>
+                    </label>
+                    <h3 data-i18n="expertise">Expertise</h3>
+                    <label data-i18n-title="expertise" title="Expertise">
+                      <input name="attr_expert" value="3" title="@{repeating_forms_${x}_expert}" type="checkbox"/>
+                    </label>
+                  </div>
+                  <div class="row">
+                    <h3 data-i18n="modifier">modifier</h3>
+                    <label data-i18n-title="modifier" title="modifier">
+                      <input name="attr_dicepool_modifier" title="@{repeating_forms_${x}_dicepool_modifier}" type="number"/>
+                    </label>
+                  </div>
+                  <h3 data-i18n="notes">notes</h3>
+                  <label data-i18n-title="notes" title="notes">
+                    <textarea name="attr_notes" placeholder="Notes" title="@{repeating_forms_${x}_notes}" type="text" value=""></textarea>
+                  </label>
+                </div>
+              </fieldset>
+            </div>
+          </div>
+
+
+
+          <div class="complex-forms-rolls submersion">
+            <input class="techno-toggle" name="attr_techno_toggle" type="hidden" value="submersion"/>
+            <div class="pc-row submersion-headers">
+              <button data-i18n="resistfade" name="roll_fade" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{resistfade} ^{compiling}}}{{dice=[[(@{willpower}+@{charisma}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{wilddie=[[@{wild_die}d6]]}}{{desc=Willpower + Charisma}}"></button>
+              <span>&nbsp;</span>
+              <h2 data-i18n="submersionlevel">Submersion Level</h2>
+              <label data-i18n-title="submersionlevel" title="Submersion Level">
+                <input name="submersion_level" value="0" title="@{submersion_level}" type="number" min='0' step='1'>
+              </label>
+            </div>
+
+
+            <div class="rows">
+              <h1 data-i18n="echos">Echos</h1>
+            </div>
+            <div class="rows repeating-container echoes">
+              <fieldset class="repeating_echoes">
+                <span name="attr_echo"></span>
+                <input class="collapse-flag" name="attr_display_flag" type="checkbox"/><span class="pictos">i</span>
+                <input class="settings-flag" name="attr_flag" title="Settings toggle" type="checkbox" checked="checked"/><span class="pictos">x</span>
+                <div class="collapse"><span name="attr_notes"></span></div>
+                <div class="settings">
+                  <label data-i18n-title="echo" title="Echo">
+                    <input name="attr_echo" type="text" title="Echo">
+                  </label>
+                  <label data-i18n-title="notes" title="Notes"><span data-i18n="notes">Notes</span>
+                    <textarea name="attr_notes" value="" placeholder="Notes" title="@{repeating_echos_${x}_notes}"></textarea>
+                  </label>
+                  <label data-i18n-title="modifiers" title="modifiers"><span data-i18n="modifiers">modifiers</span>
+                    <textarea name="attr_modifiers" value="" placeholder="modifiers" title="@{repeating_echos_${x}_modifiers}"></textarea>
+                  </label>
+                </div>
+              </fieldset>
+            </div>
+
+<div>&nbsp;</div>
+
+            <div class="rows">
+              <h1 data-i18n="sprites">Sprites</h1>
+            </div>
+            <div class="rows repeating-container sprites">
+              <div class="pc-row headers">
+                <span>&nbsp;</span>
+                <h2 data-i18n="lvl">Lvl</h2>
+                <h2 data-i18n="type">Type</h2>
+                <h2 data-i18n="tasks">Tasks</h2>
+                <span>&nbsp;</span>
+                <span>&nbsp;</span>
+                <span>&nbsp;</span>
+              </div>
+              <fieldset class="repeating_sprites">
+                <span>&nbsp;</span>
+                <span name="attr_level"></span>
+                <span name="attr_type"></span>
+                <span name="attr_tasks"></span>
+                <span>&nbsp;</span>
+                <input class="collapse-flag" name="attr_display_flag" type="checkbox"/><span class="pictos">i</span>
+                <input class="settings-flag" name="attr_flag" title="Settings toggle" type="checkbox" checked="checked"/><span class="pictos">x</span>
+                <div class="collapse"><span name="attr_notes"></span></div>
+                <div class="settings">
+                  <label data-i18n-title="level" title="Level">
+                    <input name="attr_level" title="@{repeating_sprites_${x}_level}" type="number" min='0' step='1' value=''>
+                  </label>
+                  <label data-i18n-title="tasks" title="Tasks">
+                    <select name="attr_type" title="@{repeating_sprites_${x}_type}">
+                      <option data-i18n="couriersprite" value="Courier">Courier</option>
+                      <option data-i18n="cracksprite" value="Crack">Crack</option>
+                      <option data-i18n="datasprite" value="Data">Data</option>
+                      <option data-i18n="faultsprite" value="Fault">Fault</option>
+                      <option data-i18n="machinesprite" value="Machine">Machine</option>
+                      <option data-i18n="other" value="Other">Other</option>
+                    </select>
+                  </label>
+                  <label data-i18n-title="tasks" title="@{repeating_sprites_${x}_tasks}">
+                    <input name="attr_tasks" type="number" title="@{repeating_sprites_${x}_tasks}" min='0' step='1' value=''>
+                  </label>
+                  <span>&nbsp;</span>
+                  <label data-i18n-title="notes" title="Notes"><span data-i18n="notes">Notes</span>
+                    <textarea name="attr_notes" value="" placeholder="Notes" title="@{repeating_sprites_${x}_notes}"></textarea>
+                  </label>
+                  <label data-i18n-title="modifiers" title="modifiers"><span data-i18n="modifiers">Modifiers</span>
+                    <textarea name="attr_modifiers" value="" placeholder="modifiers" title="@{repeating_sprites_${x}_modifiers}"></textarea>
+                  </label>
+                </div>
+              </fieldset>
+            </div>
+
+
+          </div>
+
+
+        </div>
+
+
       </div>
     </div>
   </div>
@@ -5023,6 +5138,7 @@ on("change:repeating_skills:name", (eventInfo) => {
 				rating = s[`${skill}`];
 
 				const tot = mod + spec + expert + rating;
+
 				setAttrs({
 					[`${weap}_rating`]: s[`${skill}`],
 					[`${weap}_dicepool`]: tot
diff --git a/Shadowrun Sixth World/translation.json b/Shadowrun Sixth World/translation.json
index d4787b7267..8c17761f23 100644
--- a/Shadowrun Sixth World/translation.json	
+++ b/Shadowrun Sixth World/translation.json	
@@ -66,6 +66,7 @@
 	"command": "Command",
 	"commlink": "Commlink",
 	"commandconsole": "Command Console",
+	"compiling": "Compiling",
 	"complexform": "Complex Form",
 	"complexforms": "Complex Forms",
 	"composure": "Composure",
@@ -122,6 +123,7 @@
 	"drone": "Drone",
 	"duration": "Duration",
 	"e": "E",
+	"echo": "Echo",
 	"echos": "Echos",
 	"edge": "Edge",
 	"effecttype": "Effect Type",
@@ -222,6 +224,7 @@
 	"los (a)": "LOS (A)",
 	"lowpaintolerance": "Low Pain Tolerance",
 	"loyalty": "Loyalty",
+	"lvl": "Lvl",
 	"m": "M",
 	"machinesprite": "Machine Sprite",
 	"mage": "Mage",
@@ -381,6 +384,7 @@
 	"spirit": "Spirit",
 	"sprint": "Sprint",
 	"sprite": "Sprite",
+	"sprites": "Sprites",
 	"ss": "SS",
 	"stealth": "Stealth",
 	"streetcred": "Street Cred",
@@ -391,6 +395,7 @@
 	"style": "Style",
 	"submarine": "Submarine",
 	"submersion": "Submersion",
+	"submersionlevel": "Submersion Level",
 	"sustained": "Sustained",
 	"t": "T",
 	"t (a)": "T (A)",