diff --git a/Only-War-Enhanced/OnlyWarEnhanced.css b/Only-War-Enhanced/OnlyWarEnhanced.css
index bfc6a39be5..f4946d515c 100644
--- a/Only-War-Enhanced/OnlyWarEnhanced.css
+++ b/Only-War-Enhanced/OnlyWarEnhanced.css
@@ -708,169 +708,179 @@ ______________________________ start of equipment tab __________________________
 .sheet-equipment_numerics { grid-area: e3; margin-top: 10px; }
 .sheet-equipment_ranged_weapons_rep, .sheet-equipment_melee_weapons_rep { background:#6E8B3D; border:1px solid white; border-radius: 10px; padding: 2px; }
 
-.sheet-equipment_ranged_weapons_gs1 { grid-area: rw1; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs2 { grid-area: rw2; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs3 { grid-area: rw3; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs4 { grid-area: rw4; color: white; font-size: 12px; width: 50px!important;}
-.sheet-equipment_ranged_weapons_gs5 { grid-area: rw5; color: white; font-size: 12px; width: 50px!important;}
+.sheet-equipment_ranged_weapons_gs_a1 { grid-area: rwa1; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_a2 { grid-area: rwa2; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_a3 { grid-area: rwa3; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_a4 { grid-area: rwa4; color: white; font-size: 12px; width: 50px!important;}
+.sheet-equipment_ranged_weapons_gs_a5 { grid-area: rwa5; color: white; font-size: 12px; width: 50px!important;}
 
-.sheet-equipment_ranged_weapons_gs6 { grid-area: rw6; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs7 { grid-area: rw7; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_ranged_weapons_gs8 { grid-area: rw8; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs9 { grid-area: rw9; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_ranged_weapons_gs_b1 { grid-area: rwb1; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_b2 { grid-area: rwb2; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_ranged_weapons_gs_b3 { grid-area: rwb3; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_b4 { grid-area: rwb4; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
 
-.sheet-equipment_ranged_weapons_gs10 { grid-area: rw10; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs11 { grid-area: rw11; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white;}
-.sheet-equipment_ranged_weapons_gs12 { grid-area: rw12; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs13 { grid-area: rw13; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_ranged_weapons_gs14 { grid-area: rw14; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs15 { grid-area: rw15; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_ranged_weapons_gs16 { grid-area: rw16; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs17 { grid-area: rw17; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_ranged_weapons_gs_c1 { grid-area: rwc1; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_c2 { grid-area: rwc2; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white;}
+.sheet-equipment_ranged_weapons_gs_c3 { grid-area: rwc3; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_c4 { grid-area: rwc4; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_ranged_weapons_gs_c5 { grid-area: rwc5; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_c6 { grid-area: rwc6; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_ranged_weapons_gs_c7 { grid-area: rwc7; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_c8 { grid-area: rwc8; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
 
-.sheet-equipment_ranged_weapons_gs18 { grid-area: rw18;	color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs19 { grid-area: rw19;	color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_ranged_weapons_gs20 { grid-area: rw20;	color: white; font-size: 30px; margin-top: -27px; text-align: center; height: 15px; }
-.sheet-equipment_ranged_weapons_gs21 { grid-area: rw21; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_ranged_weapons_gs22 { grid-area: rw22; color: white; font-size: 30px; margin-top: -27px; text-align: center; height: 15px; }
-.sheet-equipment_ranged_weapons_gs23 { grid-area: rw23; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_ranged_weapons_gs24 { grid-area: rw24; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs25 { grid-area: rw25; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_ranged_weapons_gs26 { grid-area: rw26; color: white; font-size: 30px; margin-top: -27px; text-align: center; height: 15px; }
-.sheet-equipment_ranged_weapons_gs27 { grid-area: rw27; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
 
-.sheet-equipment_ranged_weapons_gs28 { grid-area: rw28; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs29 { grid-area: rw29; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs30 { grid-area: rw30; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs31 { grid-area: rw31; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_ranged_weapons_gs32 { grid-area: rw32; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs33 { grid-area: rw33; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_ranged_weapons_gs34 { grid-area: rw34; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs35 { grid-area: rw35; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
 
-.sheet-equipment_ranged_weapons_gs36 { grid-area: rw36; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs37 { grid-area: rw37; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_ranged_weapons_gs38 { grid-area: rw38; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs39 { grid-area: rw39; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs40 { grid-area: rw40; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_ranged_weapons_gs41 { grid-area: rw41; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_e1 { grid-area: rwe1; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_e2 { grid-area: rwe2; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_ranged_weapons_gs_e3 { grid-area: rwe3; color: white; font-size: 30px; margin-top: -27px; text-align: center; height: 15px; }
+.sheet-equipment_ranged_weapons_gs_e4 { grid-area: rwe4; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_ranged_weapons_gs_e5 { grid-area: rwe5; color: white; font-size: 30px; margin-top: -27px; text-align: center; height: 15px; }
+.sheet-equipment_ranged_weapons_gs_e6 { grid-area: rwe6; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_ranged_weapons_gs_e7 { grid-area: rwe7; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_e8 { grid-area: rwe8; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_ranged_weapons_gs_e9 { grid-area: rwe9; color: white; font-size: 30px; margin-top: -27px; text-align: center; height: 15px; }
+.sheet-equipment_ranged_weapons_gs_e10 { grid-area: rwe10; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
 
-/* gs1-5 (5) Range/Attack/Aim Dropdowns, Hit/Dmg Buttons*/
+.sheet-equipment_ranged_weapons_gs_f1 { grid-area: rwf1; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_f2 { grid-area: rwf2; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_f3 { grid-area: rwf3; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_f4 { grid-area: rwf4; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_ranged_weapons_gs_f5 { grid-area: rwf5; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_f6 { grid-area: rwf6; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_ranged_weapons_gs_f7 { grid-area: rwf7; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_f8 { grid-area: rwf8; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+
+.sheet-equipment_ranged_weapons_gs_g1 { grid-area: rwg1; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_g2 { grid-area: rwg2; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_ranged_weapons_gs_g3 { grid-area: rwg3; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_g4 { grid-area: rwg4; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_g5 { grid-area: rwg5; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_ranged_weapons_gs_g6 { grid-area: rwg6; color: white; font-size: 12px; padding: 0px 2px; }
+
+/* gs_a Range/Attack/Aim Dropdowns, Hit/Dmg Buttons*/
 .sheet-equipment_ranged_weapons_grid1 {
 	align-items: center;
 	display: grid;
 	grid-template-columns: auto auto auto 61px 61px;
 	grid-template-areas:
-	'rw1 rw2 rw3 rw4 rw5';
+	'rwa1 rwa2 rwa3 rwa4 rwa5';
 }
 
-/* gs6-9 (4) Name, Class */
+/* gs_b Name, Class */
 .sheet-equipment_ranged_weapons_grid2 {
 	align-items: center;
 	display: grid;
 	grid-template-columns: auto auto auto auto auto auto auto auto auto auto;
 	grid-template-areas:
-	'rw6 rw7 rw7 rw7 rw7 rw7 rw8 rw9 rw9 rw9';
+	'rwb1 rwb2 rwb2 rwb2 rwb2 rwb2 rwb3 rwb4 rwb4 rwb4';
 }
 
 
-/* gs10-17 (8) Range, Dmg, Pen, Type */
+/* gs_c Range, Dmg, Pen, Type */
 .sheet-equipment_ranged_weapons_grid3 {
 	align-items: center;
 	display: grid;
 	grid-template-columns: auto auto auto auto auto auto auto auto auto auto;
 	grid-template-areas:
-	'rw10 rw11 rw12 rw13 rw13 rw14 rw15 rw16 rw17 rw17';
+	'rwc1 rwc2 rwc3 rwc4 rwc4 rwc5 rwc6 rwc7 rwc8 rwc8';
 }
 
-/* gs18-27 (10) RoF, Magazine */
-.sheet-equipment_ranged_weapons_grid4 {
+/* gs_d Proven, Primitive, Vengeful, Accurate */
+
+
+/* gs_e RoF, Magazine */
+.sheet-equipment_ranged_weapons_grid5 {
 	align-items: center;
 	display: grid;
 	grid-template-columns: auto 10% 4% 10% 4% 10% 6px auto 13% 4% 13%; /* nonstandard */
 	grid-template-areas:
-	'rw18 rw19 rw20 rw21 rw22 rw23 . rw24 rw25 rw26 rw27';
+	'rwe1 rwe2 rwe3 rwe4 rwe5 rwe6 . rwe7 rwe8 rwe9 rwe10';
 }
 
-/* gs28-35 (8) Trained?, HitMod, Reload, Weight */
-.sheet-equipment_ranged_weapons_grid5 {
+/* gs_f Trained?, HitMod, Reload, Weight */
+.sheet-equipment_ranged_weapons_grid6 {
 	align-items: center;
 	display: grid;
 	grid-template-columns: auto 20px auto auto auto auto auto auto auto; /* nonstandard */
 	grid-template-areas:
-	'rw28 rw29 rw30 rw31 rw32 rw33 rw33 rw34 rw35';
+	'rwf1 rwf2 rwf3 rwf4 rwf5 rwf6 rwf6 rwf7 rwf8';
 }
 
-/* gs36-41 (6) Domain, Mishap chance, Spray */
-.sheet-equipment_ranged_weapons_grid6 {
+/* gs_g Domain, Mishap chance, Spray */
+.sheet-equipment_ranged_weapons_grid7 {
 	align-items: center;
 	display: grid;
 	grid-template-columns: auto auto auto auto auto auto auto auto auto 20px;
 	grid-template-areas:
-	'rw36 rw37 rw37 rw38 rw38 rw39 rw39 rw39 rw40 rw41';
+	'rwg1 rwg2 rwg2 rwg3 rwg3 rwg4 rwg4 rwg4 rwg5 rwg6';
 }
 
-.sheet-equipment_melee_weapons_gs1 { grid-area: mw1; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs2 { grid-area: mw2; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs3 { grid-area: mw3; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs4 { grid-area: mw4; color: white; font-size: 12px; width: 50px!important;}
-.sheet-equipment_melee_weapons_gs5 { grid-area: mw5; color: white; font-size: 12px; width: 50px!important;}
+.sheet-equipment_melee_weapons_gs_a1 { grid-area: mwa1; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs_a2 { grid-area: mwa2; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs_a3 { grid-area: mwa3; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs_a4 { grid-area: mwa4; color: white; font-size: 12px; width: 50px!important;}
+.sheet-equipment_melee_weapons_gs_a5 { grid-area: mwa5; color: white; font-size: 12px; width: 50px!important;}
 
-.sheet-equipment_melee_weapons_gs6 { grid-area: mw6; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs7 { grid-area: mw7; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_melee_weapons_gs8 { grid-area: mw8; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs9 { grid-area: mw9; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_melee_weapons_gs_b1 { grid-area: mwb1; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs_b2 { grid-area: mwb2; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_melee_weapons_gs_b3 { grid-area: mwb3; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs_b4 { grid-area: mwb4; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
 
-.sheet-equipment_melee_weapons_gs10 { grid-area: mw10; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs11 { grid-area: mw11; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_melee_weapons_gs12 { grid-area: mw12; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs13 { grid-area: mw13; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_melee_weapons_gs14 { grid-area: mw14; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs15 { grid-area: mw15; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_melee_weapons_gs16 { grid-area: mw16; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs17 { grid-area: mw17; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_melee_weapons_gs_c1 { grid-area: mwc1; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs_c2 { grid-area: mwc2; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_melee_weapons_gs_c3 { grid-area: mwc3; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs_c4 { grid-area: mwc4; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_melee_weapons_gs_c5 { grid-area: mwc5; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs_c6 { grid-area: mwc6; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_melee_weapons_gs_c7 { grid-area: mwc7; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs_c8 { grid-area: mwc8; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
 
-.sheet-equipment_melee_weapons_gs18 { grid-area: mw18; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs19 { grid-area: mw19; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs20 { grid-area: mw20; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs21 { grid-area: mw21; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_melee_weapons_gs22 { grid-area: mw22; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs23 { grid-area: mw23; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
 
-/* gs1-5 (5) Range/Attack/Aim Dropdowns, Hit/Dmg Buttons*/
+
+.sheet-equipment_melee_weapons_gs_d1 { grid-area: mwe1; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs_d2 { grid-area: mwe2; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs_d3 { grid-area: mwe3; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs_d4 { grid-area: mwe4; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_melee_weapons_gs_d5 { grid-area: mwe5; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs_d6 { grid-area: mwe6; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+
+/* gs_a Range/Attack/Aim Dropdowns, Hit/Dmg Buttons*/
 .sheet-equipment_melee_weapons_grid1 {
 	align-items: center;
 	display: grid;
 	grid-template-columns: auto auto auto 61px 61px;
 	grid-template-areas:
-	'mw1 mw2 mw3 mw4 mw5';
+	'mwa1 mwa2 mwa3 mwa4 mwa5';
 }
 
-/* gs6-9 (4) name, domain */
+/* gs_b name, domain */
 .sheet-equipment_melee_weapons_grid2 {
 	align-items: center;
 	display: grid;
 	grid-template-columns: auto auto auto auto auto auto auto auto auto auto;
 	grid-template-areas:
-	'mw6 mw7 mw7 mw7 mw7 mw7 mw7 mw8 mw9 mw9';
+	'mwb1 mwb2 mwb2 mwb2 mwb2 mwb2 mwb2 mwb3 mwb4 mwb4';
 }
 
-/* gs10-17 (8) reach, damage, pen, type */
+/* gs_c reach, damage, pen, type */
 .sheet-equipment_melee_weapons_grid3 {
 	align-items: center;
 	display: grid;
 	grid-template-columns: auto auto auto auto auto auto auto auto auto auto;
 	grid-template-areas:
-	'mw10 mw11 mw12 mw13 mw13 mw14 mw15 mw16 mw17 mw17';
+	'mwc1 mwc2 mwc3 mwc4 mwc4 mwc5 mwc6 mwc7 mwc8 mwc8';
 }
 
-/* gs18-23 (6) trained?, hitmod, weight */
+/* gs_d Proven, Primitive, Vengeful */
+
+
+/* gs_e trained?, hitmod, weight */
 .sheet-equipment_melee_weapons_grid4 {
 	align-items: center;
 	display: grid;
 	grid-template-columns: auto 20px auto auto auto auto auto auto;
 	grid-template-areas:
-	'mw18 mw19 mw20 mw21 mw21 mw22 mw23 mw23';
+	'mwe1 mwe2 mwe3 mwe4 mwe4 mwe5 mwe6 mwe6';
 }
 
 
diff --git a/Only-War-Enhanced/OnlyWarEnhanced.html b/Only-War-Enhanced/OnlyWarEnhanced.html
index 5506ad234d..0fcb9dec2b 100644
--- a/Only-War-Enhanced/OnlyWarEnhanced.html
+++ b/Only-War-Enhanced/OnlyWarEnhanced.html
@@ -1143,71 +1143,72 @@
 		<fieldset name='rangedweapons' class='repeating_rangedweapons'>
 		  <div class='equipment_ranged_weapons_rep'>
 			<div class='equipment_ranged_weapons_grid1'>
-			  <select name='attr_R_weapon_attack_range' class='equipment_ranged_weapons_gs1 full_width clear select_correction'>
+			  <select name='attr_R_weapon_attack_range' class='equipment_ranged_weapons_gs_a1 full_width clear select_correction'>
 				<option value='30' >Point Blank (+30)</option>
 				<option value='10' >Short Range (+10)</option>
 				<option value='0' selected='selected'>Standard (+0)</option>
 				<option value='-10' >Long Range (-10)</option>
 				<option value='-30' >Extreme Range (-30)</option>
 			  </select>
-			  <select name='attr_R_weapon_attack' class='equipment_ranged_weapons_gs2 full_width clear select_correction'>
+			  <select name='attr_R_weapon_attack' class='equipment_ranged_weapons_gs_a2 full_width clear select_correction'>
 				<option value='10' selected='selected'>Standard (+10)</option>
 				<option value='0' >Semi Auto (+0)</option>
 				<option value='-10' >Full Auto (-10)</option>
 				<option value='-20' >Called Shot (-20)</option>
 				<option value='-20' >Suppressing (-20)</option>
 			  </select>
-			  <select name='attr_R_weapon_aim' class='equipment_ranged_weapons_gs3 full_width clear select_correction'>
+			  <select name='attr_R_weapon_aim' class='equipment_ranged_weapons_gs_a3 full_width clear select_correction'>
 				<option value='0' selected='selected'>No Aim (+0)</option>
 				<option value='10' >Half Aim (+10)</option>
 				<option value='20' >Full Aim (+20)</option>
 			  </select>
-			  <button class='equipment_ranged_weapons_gs4 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }} {{weapon= @{R_weapon_name}}} {{degrees=[[1+ floor(abs( [[[[@{BS} + @{BS_advancement} + @{R_weapon_trained} - 20 + @{R_weapon_mod1}]] + [[@{R_weapon_attack} + @{R_weapon_aim} + @{R_weapon_attack_range} + @{inlinemod-toggle} ]]]] - [[1d100@{R_weapon_mishap_chance}]])/10)]]}}{{roll= $[[3]]}}{{target= $[[2]]}}@{settings_hitroll}{{aim= [[@{R_weapon_aim}]]}}{{R_type= [[@{R_weapon_attack}]]}}{{range= [[@{R_weapon_attack_range}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{characteristic= Ballistic Skill}}{{skill=[[@{BS}]]}}{{advancement= [[@{BS_advancement}]]}}{{hitmod= [[@{R_weapon_mod1}]]}}{{trained= [[@{R_weapon_trained} - 20]]}}' >Hit</button>
-			  <button class='equipment_ranged_weapons_gs5 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{type= @{R_weapon_type}}} {{weapon= @{R_weapon_name}}} {{damage=[[@{R_weapon_dam-roll}]] }} {{@{R_weapon_spray}= }} {{pen=[[@{R_weapon_pen}]] }}  {{@{settings_weapondescription}=@{R_ability_r} }}' >DMG</button>
+			  <button class='equipment_ranged_weapons_gs_a4 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }} {{weapon= @{R_weapon_name}}} {{degrees=[[1+ floor(abs( [[[[@{BS} + @{BS_advancement} + @{R_weapon_trained} - 20 + @{R_weapon_mod1}]] + [[@{R_weapon_attack} + @{R_weapon_aim} + @{R_weapon_attack_range} + @{inlinemod-toggle} ]]]] - [[1d100@{R_weapon_mishap_chance}]])/10)]]}}{{roll= $[[3]]}}{{target= $[[2]]}}@{settings_hitroll}{{aim= [[@{R_weapon_aim}]]}}{{R_type= [[@{R_weapon_attack}]]}}{{range= [[@{R_weapon_attack_range}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{characteristic= Ballistic Skill}}{{skill=[[@{BS}]]}}{{advancement= [[@{BS_advancement}]]}}{{hitmod= [[@{R_weapon_mod1}]]}}{{trained= [[@{R_weapon_trained} - 20]]}}' >Hit</button>
+			  <button class='equipment_ranged_weapons_gs_a5 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{type= @{R_weapon_type}}} {{weapon= @{R_weapon_name}}} {{damage=[[@{R_weapon_dam-roll}]] }} {{@{R_weapon_spray}= }} {{pen=[[@{R_weapon_pen}]] }}  {{@{settings_weapondescription}=@{R_ability_r} }}' >DMG</button>
 			</div>
 			<div class='equipment_ranged_weapons_grid2'>
-			  <div class='equipment_ranged_weapons_gs6'>Name</div>
-			  <input class='equipment_ranged_weapons_gs7 full_width' type='text' name='attr_R_weapon_name' />
-			  <div class='equipment_ranged_weapons_gs8'>Class</div>
-			  <input class='equipment_ranged_weapons_gs9 full_width' type='text' name='attr_R_weapon_class' />
+			  <div class='equipment_ranged_weapons_gs_b1'>Name</div>
+			  <input class='equipment_ranged_weapons_gs_b2 full_width' type='text' name='attr_R_weapon_name' />
+			  <div class='equipment_ranged_weapons_gs_b3'>Class</div>
+			  <input class='equipment_ranged_weapons_gs_b4 full_width' type='text' name='attr_R_weapon_class' />
 			</div>
 			<div class='equipment_ranged_weapons_grid3'>
-			  <div class='equipment_ranged_weapons_gs10'>Range</div>
-			  <input class='equipment_ranged_weapons_gs11 full_width' type='text' value='0' name='attr_R_weapon_range' />
-			  <div class='equipment_ranged_weapons_gs12'>Damage</div>
-			  <input class='equipment_ranged_weapons_gs13 full_width' type='text' value='0' name='attr_R_weapon_dam-roll' />
-			  <div class='equipment_ranged_weapons_gs14'>Pen</div>
-			  <input class='equipment_ranged_weapons_gs15 full_width' type='text' value='0' name='attr_R_weapon_pen' />
-			  <div class='equipment_ranged_weapons_gs16'>Type</div>
-			  <input class='equipment_ranged_weapons_gs17 full_width' type='text' name='attr_R_weapon_type' />
-			</div>
-			<div class='equipment_ranged_weapons_grid4'>
-			  <div class='equipment_ranged_weapons_gs18'>RoF</div>
-			  <input class='equipment_ranged_weapons_gs19 full_width' type='text' placeholder='Std' name='attr_R_weapon_standard' />
-			  <div class='equipment_ranged_weapons_gs20'>/</div>
-			  <input class='equipment_ranged_weapons_gs21 full_width' type='text' placeholder='Bst' name='attr_R_weapon_burst' />
-			  <div class='equipment_ranged_weapons_gs22'>/</div>
-			  <input class='equipment_ranged_weapons_gs23 full_width' type='text' placeholder='Auto' name='attr_R_weapon_auto' />
-			  <div class='equipment_ranged_weapons_gs24'>Magazine</div>
-			  <input class='equipment_ranged_weapons_gs25 full_width' type='text' value='0' name='attr_R_weapon_mag' />
-			  <div class='equipment_ranged_weapons_gs26'>/</div>
-			  <input class='equipment_ranged_weapons_gs27 full_width' type='text' value='0' name='attr_R_weapon_mag_max' />
+			  <div class='equipment_ranged_weapons_gs_c1'>Range</div>
+			  <input class='equipment_ranged_weapons_gs_c2 full_width' type='text' value='0' name='attr_R_weapon_range' />
+			  <div class='equipment_ranged_weapons_gs_c3'>Damage</div>
+			  <input class='equipment_ranged_weapons_gs_c4 full_width' type='text' value='0' name='attr_R_weapon_dam-roll' />
+			  <div class='equipment_ranged_weapons_gs_c5'>Pen</div>
+			  <input class='equipment_ranged_weapons_gs_c6 full_width' type='text' value='0' name='attr_R_weapon_pen' />
+			  <div class='equipment_ranged_weapons_gs_c7'>Type</div>
+			  <input class='equipment_ranged_weapons_gs_c8 full_width' type='text' name='attr_R_weapon_type' />
 			</div>
+			<!-- d -->
 			<div class='equipment_ranged_weapons_grid5'>
-			  <div class='equipment_ranged_weapons_gs28'>Trained?</div>
-			  <input class='equipment_ranged_weapons_gs29' type='checkbox' value='20' name='attr_R_weapon_trained' checked />
-			  <div class='equipment_ranged_weapons_gs30'>Hit Mod</div>
-			  <input class='equipment_ranged_weapons_gs31 full_width' type='text' value='0' name='attr_R_weapon_mod1' />
-			  <div class='equipment_ranged_weapons_gs32'>Reload</div>
-			  <input class='equipment_ranged_weapons_gs33 full_width' type='text' value='0' name='attr_R_weapon_reload' />
-			  <div class='equipment_ranged_weapons_gs34'>Weight</div>
-			  <input class='equipment_ranged_weapons_gs35 full_width' type='text' value='0' name='attr_R_weapon_weight' />
+			  <div class='equipment_ranged_weapons_gs_e1'>RoF</div>
+			  <input class='equipment_ranged_weapons_gs_e2 full_width' type='text' placeholder='Std' name='attr_R_weapon_standard' />
+			  <div class='equipment_ranged_weapons_gs_e3'>/</div>
+			  <input class='equipment_ranged_weapons_gs_e4 full_width' type='text' placeholder='Bst' name='attr_R_weapon_burst' />
+			  <div class='equipment_ranged_weapons_gs_e5'>/</div>
+			  <input class='equipment_ranged_weapons_gs_e6 full_width' type='text' placeholder='Auto' name='attr_R_weapon_auto' />
+			  <div class='equipment_ranged_weapons_gs_e7'>Magazine</div>
+			  <input class='equipment_ranged_weapons_gs_e8 full_width' type='text' value='0' name='attr_R_weapon_mag' />
+			  <div class='equipment_ranged_weapons_gs_e9'>/</div>
+			  <input class='equipment_ranged_weapons_gs_e10 full_width' type='text' value='0' name='attr_R_weapon_mag_max' />
 			</div>
 			<div class='equipment_ranged_weapons_grid6'>
-			  <div class='equipment_ranged_weapons_gs36' title='Las, Plasma, etc'>Domain</div>
-			  <input class='equipment_ranged_weapons_gs37 full_width' type='text' name='attr_R_weapon_domain' />
-			  <div class='equipment_ranged_weapons_gs38'>Mishap Chance</div>
-			  <select name='attr_R_weapon_mishap_chance' class='equipment_ranged_weapons_gs39 full_width select_correction'>
+			  <div class='equipment_ranged_weapons_gs_f1'>Trained?</div>
+			  <input class='equipment_ranged_weapons_gs_f2' type='checkbox' value='20' name='attr_R_weapon_trained' checked />
+			  <div class='equipment_ranged_weapons_gs_f3'>Hit Mod</div>
+			  <input class='equipment_ranged_weapons_gs_f4 full_width' type='text' value='0' name='attr_R_weapon_mod1' />
+			  <div class='equipment_ranged_weapons_gs_f5'>Reload</div>
+			  <input class='equipment_ranged_weapons_gs_f6 full_width' type='text' value='0' name='attr_R_weapon_reload' />
+			  <div class='equipment_ranged_weapons_gs_f7'>Weight</div>
+			  <input class='equipment_ranged_weapons_gs_f8 full_width' type='text' value='0' name='attr_R_weapon_weight' />
+			</div>
+			<div class='equipment_ranged_weapons_grid7'>
+			  <div class='equipment_ranged_weapons_gs_g1' title='Las, Plasma, etc'>Domain</div>
+			  <input class='equipment_ranged_weapons_gs_g2 full_width' type='text' name='attr_R_weapon_domain' />
+			  <div class='equipment_ranged_weapons_gs_g3'>Mishap Chance</div>
+			  <select name='attr_R_weapon_mishap_chance' class='equipment_ranged_weapons_gs_g4 full_width select_correction'>
 				<option value='cs>90' >Unreliable (91)</option>
 				<option value='cs>93' >Burst/Auto (94)</option>
 				<option value='cs>95' selected='selected'>Standard (96)</option>
@@ -1215,8 +1216,8 @@
 				<option value='cs11cs22cs33cs44cs55cs66cs77cs88cs99cs100' >Doubles</option>
 				<option value='cs>?{Mishap chance|96}' >Custom</option>
 			  </select>
-			  <div class='equipment_ranged_weapons_gs40'>Spray?</div>
-			  <input class='equipment_ranged_weapons_gs41' type='checkbox' value='spray' name='attr_R_weapon_spray' />
+			  <div class='equipment_ranged_weapons_gs_g5'>Spray?</div>
+			  <input class='equipment_ranged_weapons_gs_g6' type='checkbox' value='spray' name='attr_R_weapon_spray' />
 			</div>
 			<div>
 			  <input name='attr_R_ability_r' type='text' placeholder='Special' class='full_width_49px border_none' />
@@ -1235,47 +1236,50 @@
 		<fieldset name='meleeweapons' class='repeating_meleeweapons'>
 		  <div class='equipment_melee_weapons_rep'>
 			<div class='equipment_melee_weapons_grid1'>
-			  <select name='attr_M_weapon_attack' class='equipment_melee_weapons_gs1 full_width clear select_correction'>
+			  <select name='attr_M_weapon_attack' class='equipment_melee_weapons_gs_a1 full_width clear select_correction'>
 				<option value='10' selected='selected'>Standard (+10)</option>
 				<option value='20' >Charge (+20)</option>
 				<option value='30' >All Out (+30)</option>
 			  </select>
-			  <select name='attr_M_weapon_multi' class='equipment_melee_weapons_gs2 full_width clear select_correction'>
+			  <select name='attr_M_weapon_multi' class='equipment_melee_weapons_gs_a2 full_width clear select_correction'>
 				<option value='0' selected='selected'>Standard (-0)</option>
 				<option value='-10' >Swift (-10)</option>
 				<option value='-20' >Lighting (-20)</option>
 			  </select>
-			  <select name='attr_M_weapon_aim' class='equipment_melee_weapons_gs3 full_width clear select_correction'>
+			  <select name='attr_M_weapon_aim' class='equipment_melee_weapons_gs_a3 full_width clear select_correction'>
 				<option value='0' selected='selected'>No Aim (+0)</option>
 				<option value='10' >Half Aim (+10)</option>
 				<option value='20' >Full Aim (+20)</option>
 			  </select>
-			  <button class='equipment_melee_weapons_gs4 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }}{{weapon= @{M_weapon_name}}}{{degrees=[[1+ floor(abs([[[[@{WS}+@{WS_advancement} + @{M_weapon_trained} - 20 + @{M_weapon_mod1}]] + [[@{M_weapon_attack} + @{M_weapon_aim} + @{M_weapon_multi} + @{inlinemod-toggle} ]]]] - [[1d100]])/10)]]}}{{roll= $[[3]]}} {{target= $[[2]]}}@{settings_hitroll} {{aim= [[@{M_weapon_aim}]]}}{{M_type= [[@{M_weapon_attack}]]}}{{multi= [[@{M_weapon_multi}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{characteristic= Weapon Skill}}{{skill=[[@{WS}]]}}{{advancement= [[@{WS_advancement}]]}}{{hitmod= [[@{M_weapon_mod1}]]}}{{trained= [[@{M_weapon_trained}]]}}{{WS_bonus=[[floor((@{WS}+@{WS_advancement}+@{WS_unnat})/10)]]}}' >Hit</button>
-			  <button class='equipment_melee_weapons_gs5 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{weapon= @{M_weapon_name}}} {{type= @{M_weapon_type}}} {{damage=[[@{M_weapon_dam-roll}+[[floor((@{STR} + @{STR_advancement})/10) + @{str_unnat}]]]] }} {{pen= [[@{M_weapon_pen}]] }} {{@{settings_weapondescription}=@{M_ability_r} }}' >DMG</button>
+			  <button class='equipment_melee_weapons_gs_a4 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }}{{weapon= @{M_weapon_name}}}{{degrees=[[1+ floor(abs([[[[@{WS}+@{WS_advancement} + @{M_weapon_trained} - 20 + @{M_weapon_mod1}]] + [[@{M_weapon_attack} + @{M_weapon_aim} + @{M_weapon_multi} + @{inlinemod-toggle} ]]]] - [[1d100]])/10)]]}}{{roll= $[[3]]}} {{target= $[[2]]}}@{settings_hitroll} {{aim= [[@{M_weapon_aim}]]}}{{M_type= [[@{M_weapon_attack}]]}}{{multi= [[@{M_weapon_multi}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{characteristic= Weapon Skill}}{{skill=[[@{WS}]]}}{{advancement= [[@{WS_advancement}]]}}{{hitmod= [[@{M_weapon_mod1}]]}}{{trained= [[@{M_weapon_trained}]]}}{{WS_bonus=[[floor((@{WS}+@{WS_advancement}+@{WS_unnat})/10)]]}}' >Hit</button>
+			  <button class='equipment_melee_weapons_gs_a5 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{weapon= @{M_weapon_name}}} {{type= @{M_weapon_type}}} {{damage=[[@{M_weapon_dam-roll}+[[floor((@{STR} + @{STR_advancement})/10) + @{str_unnat}]]]] }} {{pen= [[@{M_weapon_pen}]] }} {{@{settings_weapondescription}=@{M_ability_r} }}' >DMG</button>
 			</div>
 			<div class='equipment_melee_weapons_grid2'>
-			  <div class='equipment_melee_weapons_gs6'>Name</div>
-			  <input class='equipment_melee_weapons_gs7 full_width' type='text' name='attr_M_weapon_name' />
-			  <div class='equipment_melee_weapons_gs8' title='Chain, Power, etc'>Domain</div>
-			  <input class='equipment_melee_weapons_gs9 full_width' type='text' name='attr_M_weapon_domain' />
+			  <div class='equipment_melee_weapons_gs_b1'>Name</div>
+			  <input class='equipment_melee_weapons_gs_b2 full_width' type='text' name='attr_M_weapon_name' />
+			  <div class='equipment_melee_weapons_gs_b3' title='Chain, Power, etc'>Domain</div>
+			  <input class='equipment_melee_weapons_gs_b4 full_width' type='text' name='attr_M_weapon_domain' />
 			</div>
 			<div class='equipment_melee_weapons_grid3'>
-			  <div class='equipment_melee_weapons_gs10'>Reach</div>
-			  <input class='equipment_melee_weapons_gs11 full_width' type='text' name='attr_M_weapon_reach' />
-			  <div class='equipment_melee_weapons_gs12'>Damage</div>
-			  <input class='equipment_melee_weapons_gs13 full_width' type='text' value='0' name='attr_M_weapon_dam-roll' />
-			  <div class='equipment_melee_weapons_gs14'>Pen</div>
-			  <input class='equipment_melee_weapons_gs15 full_width' type='text' value='0' name='attr_M_weapon_pen' />
-			  <div class='equipment_melee_weapons_gs16'>Type</div>
-			  <input class='equipment_melee_weapons_gs17 full_width' type='text' name='attr_M_weapon_type' />
+			  <div class='equipment_melee_weapons_gs_c1'>Reach</div>
+			  <input class='equipment_melee_weapons_gs_c2 full_width' type='text' name='attr_M_weapon_reach' />
+			  <div class='equipment_melee_weapons_gs_c3'>Damage</div>
+			  <input class='equipment_melee_weapons_gs_c4 full_width' type='text' value='0' name='attr_M_weapon_dam-roll' />
+			  <div class='equipment_melee_weapons_gs_c5'>Pen</div>
+			  <input class='equipment_melee_weapons_gs_c6 full_width' type='text' value='0' name='attr_M_weapon_pen' />
+			  <div class='equipment_melee_weapons_gs_c7'>Type</div>
+			  <input class='equipment_melee_weapons_gs_c8 full_width' type='text' name='attr_M_weapon_type' />
 			</div>
-			<div class='equipment_melee_weapons_grid4'>
-			  <div class='equipment_melee_weapons_gs18'>Trained?</div>
-			  <input class='equipment_melee_weapons_gs19' type='checkbox' value='20' name='attr_M_weapon_trained' checked />
-			  <div class='equipment_melee_weapons_gs20'>Hit Mod</div>
-			  <input class='equipment_melee_weapons_gs21 full_width' type='text' value='0' name='attr_M_weapon_mod1' />
-			  <div class='equipment_melee_weapons_gs22'>Weight</div>
-			  <input class='equipment_melee_weapons_gs23 full_width' type='text' value='0' name='attr_M_weapon_weight' />
+			
+			<!-- d -->
+			
+			<div class='equipment_melee_weapons_grid5'>
+			  <div class='equipment_melee_weapons_gs_e1'>Trained?</div>
+			  <input class='equipment_melee_weapons_gs_e2' type='checkbox' value='20' name='attr_M_weapon_trained' checked />
+			  <div class='equipment_melee_weapons_gs_e3'>Hit Mod</div>
+			  <input class='equipment_melee_weapons_gs_e4 full_width' type='text' value='0' name='attr_M_weapon_mod1' />
+			  <div class='equipment_melee_weapons_gs_e5'>Weight</div>
+			  <input class='equipment_melee_weapons_gs_e6 full_width' type='text' value='0' name='attr_M_weapon_weight' />
 
 			</div>
 			<div>