diff --git a/GURPS/gurps.css b/GURPS/gurps.css
index 42f27dc71a..c8f1e2e203 100644
--- a/GURPS/gurps.css
+++ b/GURPS/gurps.css
@@ -1592,16 +1592,40 @@ input.sheet-toggle-unspoint-points[value="0"] ~ .sheet-row-total {
     width: calc(100% - 0.4em); 
 }
 
-.sheet-spells .sheet-col0 { width: calc(100% - 432px); }
-
 .sheet-spells .sheet-header {
     height: 30px;
     padding: 5px;
 }
 
+/* -- highlight row -- */
+.sheet-spells .repcontainer.ui-sortable.editmode .sheet-toggle-highlight {
+    opacity: 0;
+    z-index: -1;
+}
+
+.sheet-spells input.sheet-toggle-highlight[type="checkbox"] {
+    width: 16px;
+    height: 22px;
+    opacity: 1;
+    position: absolute;
+    margin-left: 5px;
+}
+
+.sheet-spells .sheet-toggle-notes {
+    position: absolute;
+    left: 22px;
+}
+
+.sheet-spells input.sheet-toggle-highlight[type="checkbox"]:checked ~ .sheet-row-stats,
+.sheet-spells input.sheet-toggle-highlight[type="checkbox"]:checked ~ .sheet-row-details {
+    background: #B7FFAA;    
+}
+
+.sheet-spells .sheet-col0 { width: calc(100% - 475px); }
+
 .sheet-spells .sheet-col0 input { text-align:left; }
 
-.sheet-spells .sheet-col1 { width: 22px; }
+.sheet-spells .sheet-col1 { width: 25px; }
 
 .sheet-spells .sheet-col1 input { text-align:left; }
 
@@ -1625,7 +1649,7 @@ input.sheet-toggle-unspoint-points[value="0"] ~ .sheet-row-total {
     margin-right: 15px;
 }
 
-.sheet-spells .sheet-row-stats .sheet-col0 { margin-left: 20px; width: calc(100% - 452px); }
+.sheet-spells .sheet-row-stats .sheet-col0 { margin-left: 44px; width: calc(100% - 523px); }
 
 /* -- if edit mode, hide toggle notes -- */
 .sheet-spells .repcontainer.ui-sortable.editmode .sheet-checkbox,
@@ -1746,6 +1770,10 @@ input.sheet-toggle-unspoint-points[value="0"] ~ .sheet-row-total {
     /*border-bottom: 1px solid black;*/
 }
 
+.sheet-rolltemplate-skillRoll .sheet-container table.sheet-result td span.sheet-ref-label {
+    float: right;
+}
+
 .sheet-rolltemplate-skillRoll .sheet-container table.sheet-result span.sheet-damageType {
     font-weight: bold;
     color: darkred;
diff --git a/GURPS/gurps.html b/GURPS/gurps.html
index f158b3834c..72037e95da 100644
--- a/GURPS/gurps.html
+++ b/GURPS/gurps.html
@@ -20,15 +20,13 @@
 	        <div class="content">
 	            <h4>GURPS Version <input type="text" name="attr_announcement_version" readonly="readonly" value="0" title="GURPS Sheet Version" /></h4>
 	            <ul>
+	                <li>Roll template update: Move "Ref" to the right of roll type to save space. Suggested by Mike W.</li>
+	                <li>Grimoire tab: Added checkbox to highlight spells. Added a spell level modifier column. Suggested by Mike W.</li>
 	                <li>
-	                    Notes boxes for advantages, disadvantages, racial traits, skills, techniques, possesions table, and spells
-	                    were converted to a text area, allowing you to enter more notes easily. There's also an option to include 
-	                    the notes on the roll table. For the possesions table, you could use the text area to list items, such as 
-	                    items in a backpack.
+	                    Fallling/Collision notes: Revised the default notes when the falling damage is rolled. 
+	                    However, these notes are only visible on new characters sheets, since the those notes can be edited on the options page.
 	                </li>
-	                <li>Roll results table. Removed "Notes" label to provide more space to notes.</li>
-	                <li>Skills tab: changed column heading from BONUS to MOD. MOD can be positive or negative numbers. Suggested by Mike W.</li>
-	                <li>Removed powered by GURPS logo. Suggested by Mike W.</li>
+	                <li>Bug fix: Racial Traits Self-control roll. Success/Fail text was missing, fixed.</li>
                 </ul>
 	            <label class="check"><input type="checkbox" name="attr_announcements_hide" value="1">&nbsp;<b><span>Hide until next update</span></b></label>
 	            <button type="action" name="act_view_updates_tab" class="reset" />View All Updates</button>
@@ -1971,7 +1969,7 @@
 							<input type="number" name="attr_control_rating" />
 						</div>
 						<div class="sheet-cell sheet-col2">
-							<button type="roll" value="@{roll}&{template:skillRoll} {{type=Self-control Check}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6]]}} {{effectiveSkill=[[@{control_rating} + @{modifier}]]}} {{notes=@{notes}}} {{showNotes=[[@{show_notes}]]}} {{bookReference=@{ref}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}}" name="roll_vsRSCR" />
+							<button type="roll" value="@{roll}&{template:skillRoll} {{type=Self-control Check}} {{showSuccessLabel=[[1]]}} {{characterName=@{character_name}}} {{skillName=@{name}}} {{rollResult=[[3d6]]}} {{effectiveSkill=[[@{control_rating} + @{modifier}]]}} {{notes=@{notes}}} {{showNotes=[[@{show_notes}]]}} {{bookReference=@{ref}}} {{useCriticalPlusTen=[[@{use_critical_plus_10}]]}}" name="roll_vsRSCR" />
 						</div>
 						<div class="sheet-cell sheet-col3">
 							<input type="number" name="attr_points" />
@@ -3529,6 +3527,7 @@
 					<div class="sheet-cell sheet-col1"></div>
 					<div class="sheet-cell sheet-col2">Level</div>
 					<div class="sheet-cell sheet-col3">Diff</div>
+					<div class="sheet-cell sheet-col4">Mod</div>
 					<div class="sheet-cell sheet-col4">Pts</div>
 					<div class="sheet-cell sheet-col5">Time</div>
 					<div class="sheet-cell sheet-col6">Duration</div>
@@ -3537,7 +3536,8 @@
 					<div class="sheet-cell sheet-col9">Ref</div>
 				</div> <!-- .sheet-header -->
 				<fieldset class="repeating_spells">
-					<input class="sheet-toggle" type="checkbox" />
+				    <input class="toggle-highlight" type="checkbox" name="attr_highlight" />
+					<input class="toggle toggle-notes" type="checkbox" />
 					<span class="sheet-checkbox"></span>
 					<div class="sheet-row sheet-row-stats">
 						<div class="sheet-cell sheet-col0">
@@ -3548,7 +3548,7 @@
 						</div>
 						<div class="sheet-cell sheet-col2">
 							<input type="text" name="attr_level" disabled="disabled"
-								value="@{spell_base} + @{difficulty} + @{spell_bonus} + (floor((@{points} * 0.25) + 2) * ceil( ( ( @{points} - 2 ) + abs( @{points} - 2) ) / 256 ) + @{points} * abs( ceil( ( ( @{points} - 2 ) + abs( @{points} - 2) ) / 256 ) - 1 ))"/>
+								value="@{spell_base} + @{difficulty} + @{modifier} + @{spell_bonus} + (floor((@{points} * 0.25) + 2) * ceil( ( ( @{points} - 2 ) + abs( @{points} - 2) ) / 256 ) + @{points} * abs( ceil( ( ( @{points} - 2 ) + abs( @{points} - 2) ) / 256 ) - 1 ))"/>
 						</div>
 						<div class="sheet-cell sheet-col3">
 							<select name="attr_difficulty">
@@ -3557,7 +3557,10 @@
 							</select>
 						</div>
 						<div class="sheet-cell sheet-col4">
-							<input type="number" name="attr_points" value"0" />
+							<input type="number" name="attr_modifier" value="0" />
+						</div>
+						<div class="sheet-cell sheet-col4">
+							<input type="number" name="attr_points" value="0" />
 						</div>
 						<div class="sheet-cell sheet-col5">
 							<input type="text" name="attr_casttime" />
@@ -3624,6 +3627,18 @@
 
 		<p>If there are others that are working on or wish to work on this sheet, lets coordinate using the Roll20 forum for now - perhaps later we can use GitHub.</p>
 	<ul>
+	    
+	<h4>Version 1.6.0</h4>
+	
+	<ul>
+	    <li>Roll template update: Move "Ref" to the right of roll type to save space. Suggested by Mike W.</li>
+	    <li>Grimoire tab: Added checkbox to highlight spells. Added a spell level modifier column.</li>
+	    <li>
+            Fallling/Collision notes: Revised the default notes when the falling damage is rolled. 
+            However, these notes are only visible on new characters sheets, since the those notes can be edited on the options page.
+        </li>
+        <li>Bug fix: Racial Traits Self-control roll. Success/Fail text was missing, fixed.</li>
+	</ul>
 	
 	<h4>Version: 1.5.9</h4>
 	
@@ -3659,7 +3674,7 @@
 	    <li>Combat Tab: Added Falling and collision combat tool</li>
     </ul>
 	    
-	<h4>Version: 1.5.99</h4>
+	<h4>Version: 1.5.6</h4>
 	
 	<p>Pull Request: 4/9/2019</p>
 	
@@ -3886,7 +3901,9 @@
 			
 			<div class="box collision-falling-options">
 			    <span class="label">Falling & Collision Damage Notes</span><br />
-			    <textarea name="attr_falling_collision_damage_notes">If an object is bullet-shaped, sharp, or spiked, it does half damage, but this damage is piercing, cutting, or impaling, rather than crushing.</textarea>
+			    <textarea name="attr_falling_collision_damage_notes">Collisions: If an object is bullet-shaped, sharp, or spiked, it does half damage, but this damage is piercing, cutting, or impaling, rather than crushing.
+			    
+Falling Damage: If using hit locations, roll randomly for the hit location damaged in a fall. If the injury is to an extremity or a limb, do not ignore injury in excess of that required to cripple it. Instead, subtract the full amount from HP! If the fall would cripple a limb, roll 1d. On 5-6, all limbs of that type are crippled, although there is no extra injury. B431</textarea>
 			</div>
 			
 			<hr />
@@ -4064,6 +4081,9 @@ Skull Damage x4
                     <td class="label">Type:</td>
                     <td>
                         {{type}}
+                        {{#bookReference}}
+                        <span class="ref-label"><b>Ref:</b> {{bookReference}}</span>
+                        {{/bookReference}}
                     </td>
                 </tr>
                 {{/type}}
@@ -4266,12 +4286,6 @@ Skull Damage x4
                     <td>{{recoil}}</td>
                 </tr>
                 {{/recoil}}
-                {{#bookReference}}
-                <tr>
-                    <td class="label">Reference:</td>
-                    <td>{{bookReference}}</td>
-                </tr>
-                {{/bookReference}}
             </table>
         </div>
     </rolltemplate>
@@ -4282,7 +4296,7 @@ Skull Damage x4
 
 	var noop = function () {}; // do nothing.
 
-	var version = "1.5.9";
+	var version = "1.6.0";
 
 	var modCascade = true;