diff --git a/GURPS/gurps.css b/GURPS/gurps.css
index c89fc6d785..fb764bf711 100644
--- a/GURPS/gurps.css
+++ b/GURPS/gurps.css
@@ -463,6 +463,12 @@ input.sheet-module-roll:checked ~ .sheet-wrapper .sheet-module-off-roll,
 .sheet-traits .sheet-col2 { width: 30px; }
 .sheet-traits .sheet-col3 { width: 40px; }
 
+.sheet-disadvantages { width: calc(100% - 0.4em); }
+.sheet-disadvantages .sheet-col0 { width: calc(100% - 100px); }
+.sheet-disadvantages .sheet-col1 { width: 30px; }
+.sheet-disadvantages .sheet-col2 { width: 30px; }
+.sheet-disadvantages .sheet-col3 { width: 40px; }
+
 /* -- SKILLS -- */
 .sheet-skills { width: calc(100% - 0.4em); }
 .sheet-skills .sheet-col0 { width: calc(100% - 307px); }
@@ -495,13 +501,14 @@ input.sheet-module-roll:checked ~ .sheet-wrapper .sheet-module-off-roll,
 .sheet-active-defense .sheet-col4 { width: 22px; }
 
 .sheet-melee-attacks { width: calc(100% - 140px - 0.8em); }
-.sheet-melee-attacks .sheet-col0 { width: calc(100% - 122px); }
+.sheet-melee-attacks .sheet-col0 { width: calc(100% - 182px); }
 .sheet-melee-attacks .sheet-col1 { width: 40px; }
 .sheet-melee-attacks .sheet-col2 { width: 60px; }
-.sheet-melee-attacks .sheet-col3 { width: 22px; }
+.sheet-melee-attacks .sheet-col3 { width: 60px; }
+.sheet-melee-attacks .sheet-col4 { width: 22px; }
 
 .sheet-ranged-attacks { width: calc(100% - 140px - 0.8em); }
-.sheet-ranged-attacks .sheet-col0 { width: calc(100% - 292px); }
+.sheet-ranged-attacks .sheet-col0 { width: calc(100% - 352px); }
 .sheet-ranged-attacks .sheet-col1 { width: 40px; }
 .sheet-ranged-attacks .sheet-col2 { width: 30px; }
 .sheet-ranged-attacks .sheet-col3 { width: 30px; }
@@ -509,7 +516,8 @@ input.sheet-module-roll:checked ~ .sheet-wrapper .sheet-module-off-roll,
 .sheet-ranged-attacks .sheet-col5 { width: 30px; }
 .sheet-ranged-attacks .sheet-col6 { width: 40px; }
 .sheet-ranged-attacks .sheet-col7 { width: 60px; }
-.sheet-ranged-attacks .sheet-col8 { width: 22px; }
+.sheet-ranged-attacks .sheet-col8 { width: 60px; }
+.sheet-ranged-attacks .sheet-col9 { width: 22px; }
 
 .sheet-damage-reduction { float: right; width: 140px; }
 .sheet-damage-reduction .sheet-col0 { width: 50px; }
diff --git a/GURPS/gurps.html b/GURPS/gurps.html
index 021bd718f3..dbb310cd31 100644
--- a/GURPS/gurps.html
+++ b/GURPS/gurps.html
@@ -1053,12 +1053,13 @@
 		<div class="sheet-clearfix"> </div>
         
         
-        <!-- _____ _____ TRAITS BOX _____ _____ -->
-        
+        <!-- _____ _____ ADVENTAGES BOX _____ _____ -->
+        <!-- this box uses the identifier "traits" for backwards compatibility -->
+
 		<div class="sheet-box sheet-traits">
 			<div class="sheet-table">
 				<div class="sheet-header">
-					<div class="sheet-cell sheet-col0">Advantages and Disadvantages</div>
+					<div class="sheet-cell sheet-col0">Advantages</div>
 					<div class="sheet-cell sheet-col1">
                         <div class="sheet-popup">CR</div>
 						<span class="sheet-tooltip">
@@ -1102,7 +1103,56 @@
 					</div> <!-- .sheet-row -->
 				</fieldset> <!-- .repeating_traits -->
 			</div> <!-- .sheet-table -->
-		</div> <!-- .sheet-box .sheet-language -->
+		</div> <!-- .sheet-box .sheet-traits -->
+
+		<div class="sheet-box sheet-disadvantages">
+			<div class="sheet-table">
+				<div class="sheet-header">
+					<div class="sheet-cell sheet-col0">Disadvantages</div>
+					<div class="sheet-cell sheet-col1">
+                        <div class="sheet-popup">CR</div>
+						<span class="sheet-tooltip">
+	                        Control Rating
+	                        <br />
+	                        <table>
+	                            <tbody>
+	                                <tr><td>6 or less</td><td>2x</td></tr>
+	                                <tr><td>9 or less</td><td>1.5x</td></tr>
+	                                <tr><td>12 or less</td><td>1x</td></tr>
+	                                <tr><td>15 or less</td><td>0.5x</td></tr>
+	                            </tbody>
+	                        </table>
+						</span>
+					</div>
+					<div class="sheet-cell sheet-col2">Pts</div>
+					<div class="sheet-cell sheet-col3">Ref</div>
+				</div> <!-- .sheet-header -->
+				<fieldset class="repeating_disadvantages">
+					<div class="sheet-row sheet-row-stats">
+						<div class="sheet-cell sheet-col0">
+							<input type="text" name="attr_name" />
+						</div>
+						<div class="sheet-cell sheet-col1">
+							<input type="number" name="attr_control_rating" />
+						</div>
+						<div class="sheet-cell sheet-col2">
+							<input type="number" name="attr_points" />
+						</div>
+						<div class="sheet-cell sheet-col3">
+							<input type="text" name="attr_ref" />
+						</div>
+					</div> <!-- .sheet-row -->
+					<div class="sheet-row sheet-row-details">
+						<div class="sheet-cell sheet-col0 sheet-label">
+							Notes
+						</div>
+						<div class="sheet-cell sheet-col1">
+							<input type="text" name="attr_notes" />
+						</div>
+					</div> <!-- .sheet-row -->
+				</fieldset> <!-- .repeating_disadvantages -->
+			</div> <!-- .sheet-table -->
+		</div> <!-- .sheet-box .sheet-disadvantages -->
 
 	</div> <!-- .sheet-tab2 -->
     
@@ -1509,9 +1559,9 @@
 		                    <button class="sheet-module-on-roll" type="roll" value="/em rolls [[3d6]] vs IQ |<| [[@{skill}]]" name="roll_cmpSL" />
 		                </div>
 					</div> <!-- .sheet-row -->
-				</fieldset> <!-- .repeating_melee -->
+				</fieldset> <!-- .repeating_defense -->
 			</div> <!-- .sheet-table -->
-		</div> <!-- .sheet-box .sheet-melee-attacks -->
+		</div> <!-- .sheet-box .sheet-active-defense -->
 
 
 	    <!-- _____ _____ MELEE ATTACKS BOX _____ _____ -->
@@ -1540,24 +1590,33 @@
 	                        <br />
 	                        <strong>ex</strong>: indicates the attack causes an explosion.<br />
 	                        See page 269.
-	                        <br />
-	                        <strong>Damage Type</strong>:
-	                        <br />
+						</span>
+					</div>
+					<div class="sheet-cell sheet-col3">
+	    				<div class="sheet-popup">Type</div>
+						<span class="sheet-tooltip">
 	                        <table>
+	                        	<thead>
+	                        		<tr>
+	                        			<th>Abbr</th>
+	                        			<th>Multiplier</th>
+	                        			<th>Name</th>
+	                        		</tr>
+	                        	</thead>
 	                            <tbody>
-	                            	<tr><td>aff</td><td>Affliction</td></tr>
-		                            <tr><td>burn</td><td>Burning</td></tr>
-		                            <tr><td>cor</td><td>Corrosion</td></tr>
-		                            <tr><td>cr</td><td>Crushing</td></tr>
-		                            <tr><td>cut</td><td>Cutting</td></tr>
-		                            <tr><td>fat</td><td>Fatigue</td></tr>
-		                            <tr><td>imp</td><td>Impaling</td></tr>
-		                            <tr><td>pi-</td><td>Small Piercing</td></tr>
-		                            <tr><td>pi</td><td>Piercing</td></tr>
-		                            <tr><td>pi+</td><td>Large Piercing</td></tr>
-		                            <tr><td>pi++</td><td>Huge Piercing</td></tr>
-		                            <tr><td>tox</td><td>Toxic</td></tr>
-		                            <tr><td>spec</td><td>Special</td></tr>
+		                            <tr><td>cut</td> <td>x1.5</td><td>Cutting</td></tr>
+		                            <tr><td>imp</td> <td>x2.0</td><td>Impaling</td></tr>
+		                            <tr><td>cr</td>  <td>x1.0</td><td>Crushing</td></tr>
+		                            <tr><td>pi-</td> <td>x0.5</td><td>Small Piercing</td></tr>
+		                            <tr><td>pi</td>  <td>x1.0</td><td>Piercing</td></tr>
+		                            <tr><td>pi+</td> <td>x1.5</td><td>Large Piercing</td></tr>
+		                            <tr><td>pi++</td><td>x2.0</td><td>Huge Piercing</td></tr>
+	                            	<tr><td>aff</td> <td>-</td><td>Affliction</td></tr>
+		                            <tr><td>burn</td><td>x1.0</td><td>Burning</td></tr>
+		                            <tr><td>cor</td> <td>x1.0</td><td>Corrosion</td></tr>
+		                            <tr><td>fat</td> <td>x1.0</td><td>Fatigue</td></tr>
+		                            <tr><td>tox</td> <td>x1.0</td><td>Toxic</td></tr>
+		                            <tr><td>spec</td><td>-</td><td>Special</td></tr>
 	                            </tbody>
 	                        </table>
 						</span>
@@ -1575,7 +1634,24 @@
 							<input type="text" name="attr_damage" />
 						</div>
 						<div class="sheet-cell sheet-col3">
-		                    <button type="roll" value="/roll @{damage}" name="roll_damage" />
+							<select name="attr_type">
+								<option value="Cutting (cut)">cut</option>
+								<option value="Impaling (imp)">imp</option>
+								<option value="Crushing (cr)">cr</option>
+								<option value="Small Piercing (pi-)">pi-</option>
+								<option value="Piercing (pi)">pi</option>
+								<option value="Large Piercing (pi+)">pi+</option>
+								<option value="Huge Piercing (pi++)">pi++</option>
+								<option value="Affliction (aff)">aff</option>
+								<option value="Burning (burn)">burn</option>
+								<option value="Corrosion (cor)">cor</option>
+								<option value="Fatigue (fat)">fat</option>
+								<option value="Toxic (tox)">tox</option>
+								<option value="Special (spec)">spec</option>
+							</select>
+						</div>
+						<div class="sheet-cell sheet-col4">
+		                    <button type="roll" value="/em rolls [[@{damage}]] @{type} damage. (@{name})" name="roll_damage" />
 		                </div>
 					</div> <!-- .sheet-row -->
 					<div class="sheet-row sheet-row-details">
@@ -1647,6 +1723,35 @@
 						</span>
 					</div>
 					<div class="sheet-cell sheet-col7">Damage</div>
+					<div class="sheet-cell sheet-col8">
+	    				<div class="sheet-popup">Type</div>
+						<span class="sheet-tooltip">
+	                        <table>
+	                        	<thead>
+	                        		<tr>
+	                        			<th>Abbr</th>
+	                        			<th>Multiplier</th>
+	                        			<th>Name</th>
+	                        		</tr>
+	                        	</thead>
+	                            <tbody>
+		                            <tr><td>cut</td> <td>x1.5</td><td>Cutting</td></tr>
+		                            <tr><td>imp</td> <td>x2.0</td><td>Impaling</td></tr>
+		                            <tr><td>cr</td>  <td>x1.0</td><td>Crushing</td></tr>
+		                            <tr><td>pi-</td> <td>x0.5</td><td>Small Piercing</td></tr>
+		                            <tr><td>pi</td>  <td>x1.0</td><td>Piercing</td></tr>
+		                            <tr><td>pi+</td> <td>x1.5</td><td>Large Piercing</td></tr>
+		                            <tr><td>pi++</td><td>x2.0</td><td>Huge Piercing</td></tr>
+	                            	<tr><td>aff</td> <td>-</td><td>Affliction</td></tr>
+		                            <tr><td>burn</td><td>x1.0</td><td>Burning</td></tr>
+		                            <tr><td>cor</td> <td>x1.0</td><td>Corrosion</td></tr>
+		                            <tr><td>fat</td> <td>x1.0</td><td>Fatigue</td></tr>
+		                            <tr><td>tox</td> <td>x1.0</td><td>Toxic</td></tr>
+		                            <tr><td>spec</td><td>-</td><td>Special</td></tr>
+	                            </tbody>
+	                        </table>
+						</span>
+					</div>
 				</div> <!-- .sheet-header -->
 				<fieldset class="repeating_ranged">
 					<div class="sheet-row sheet-row-stats">
@@ -1675,7 +1780,22 @@
 							<input type="text" name="attr_damage" />
 						</div>
 						<div class="sheet-cell sheet-col8">
-		                    <button type="roll" value="/roll @{damage}" name="roll_damage" />
+							<select name="attr_type">
+								<option value="Cutting (cut)">cut</option>
+								<option value="Impaling (imp)">imp</option>
+								<option value="Crushing (cr)">cr</option>
+								<option value="Small Piercing (pi-)">pi-</option>
+								<option value="Piercing (pi)">pi</option>
+								<option value="Large Piercing (pi+)">pi+</option>
+								<option value="Huge Piercing (pi++)">pi++</option>
+								<option value="Burning (burn)">burn</option>
+								<option value="Corrosion (cor)">cor</option>
+								<option value="Fatigue (fat)">fat</option>
+								<option value="Toxic (tox)">tox</option>
+							</select>
+						</div>
+						<div class="sheet-cell sheet-col9">
+		                    <button type="roll" value="/em rolls [[@{damage}]] @{type} damage. (For @{name})" name="roll_damage" />
 		                </div>
 					</div> <!-- .sheet-row -->
 					<div class="sheet-row sheet-row-details">

Abbr	Multiplier	Name
aff	Affliction
burn	Burning
cor	Corrosion
cr	Crushing
cut	Cutting
fat	Fatigue
imp	Impaling
pi-	Small Piercing
pi	Piercing
pi+	Large Piercing
pi++	Huge Piercing
tox	Toxic
spec	Special
cut	x1.5	Cutting
imp	x2.0	Impaling
cr	x1.0	Crushing
pi-	x0.5	Small Piercing
pi	x1.0	Piercing
pi+	x1.5	Large Piercing
pi++	x2.0	Huge Piercing
aff	-	Affliction
burn	x1.0	Burning
cor	x1.0	Corrosion
fat	x1.0	Fatigue
tox	x1.0	Toxic
spec	-	Special