diff --git a/GURPS/gurps.css b/GURPS/gurps.css
index b0a9466698..8ef193e8b9 100644
--- a/GURPS/gurps.css
+++ b/GURPS/gurps.css
@@ -3588,7 +3588,7 @@ input[type="hidden"][name="attr_show_roll_modifiers"][value="1"] ~ .sheet-modal
     text-align: left;
 }
 
-.sheet-modal-body .sheet-container .sheet-item.sheet-item8 {
+.sheet-modal-body .sheet-container .sheet-item.sheet-item8-10 {
     grid-column-start: span 3;
 }
 
diff --git a/GURPS/gurps.html b/GURPS/gurps.html
index 17262c5169..4aec4fb041 100644
--- a/GURPS/gurps.html
+++ b/GURPS/gurps.html
@@ -114,7 +114,7 @@
 						<span data-i18n="custom-modifier-label">Custom Modifier.</span>
 					</label>
 				</div>
-				<div class="item item8">
+				<div class="item item8-10">
 					<label>
 						<span data-i18n="reason-for-mod-label">Reason for Mod:</span>
 						<input type="text" name="attr_dialog_custom_roll_modifier_reason" title="macro: @{dialog_custom_roll_modifier_reason}" />
@@ -122,12 +122,12 @@
 				</div>
 
 				<!-- Row 3 -->
-				<div class="item full-width">
+				<div class="item item11-15 full-width">
 					<h4>Traits</h4>
 				</div>
 
-				<!-- Row 3 -->
-				<div class="item item11">
+				<!-- Row 4 -->
+				<div class="item item16">
 					<label>
 						<div>
 							<select name="attr_night_vision" class="number-only-width" title="macro name: @{night_vision}">
@@ -153,7 +153,7 @@
 						</div>
 					</label>
 				</div>
-				<div class="item item12">
+				<div class="item item17">
 					<label>
 						<div>
 							<input type="checkbox" name="attr_has_dark_vision" value="1" title="macro name: @{has_dark_vision}" />
@@ -168,7 +168,7 @@
 						</div>
 					</label>
 				</div>
-				<div class="item item13">
+				<div class="item item18">
 					<label>
 						<div>
 							<input type="checkbox" name="attr_has_high_pain_threshold" value="1" title="macro name: @{has_high_pain_threshold}" />
@@ -183,7 +183,7 @@
 						</div>
 					</label>   
 				</div>
-				<div class="item item14">
+				<div class="item item19">
 					<label>
 						<div>
 							<input type="checkbox" name="attr_is_used_to_blindness" value="1" title="macro name: @{is_used_to_blindness}" />
@@ -198,8 +198,146 @@
 						</div>
 					</label>
 				</div>
-				<div class="item item15"></div>
+				<div class="item item20"></div>
 				
+				<!-- Row 4 -->
+				<div class="item item21-25 full-width">
+					<h4>Visibility</h4>
+				</div>
+
+				<!-- Row 5 -->
+				<div class="item item26-30 full-width">
+					<label>
+						<div>
+							<input type="number" name="attr_visibility_modifier" readonly="readonly" title="macro name: @{visibility_modifier}" />
+						</div>
+						<div>
+							<div class="popup">
+								<span data-i18n="roll-modifier-label">Roll modifier</span>
+							</div>
+							<span class="tooltip">
+								<span data-i18n="visibility-roll-modifier-tooltip">Combined total can't exceed -10 or -6 if used to blindness.</span>
+							</span>
+						</div>
+					</label>
+				</div>
+
+				<!-- Row 6 -->
+				<div class="item item31">
+					<label>
+						<div>
+							<input type="checkbox" name="attr_cannot_see_anything" value="1" title="macro name: @{cannot_see_anything}" />
+						</div>
+						<div>
+							<div class="popup">
+								<span data-i18n="cannot-see-anything-label">Cannot see anything: -10 or -6 *</span>
+							</div>
+							<span class="tooltip">
+								<span data-i18n="cannot-see-anything-tooltip">If used to blindess, penalty is -6 and Max Skill is 9. See B124 and B394.</span>
+							</span>
+						</div>
+					</label>
+				</div>
+
+				<div class="item item32">
+					<label>
+						<div>
+							<input type="checkbox" name="attr_cannot_see_target" value="1" title="macro name: @{cannot_see_target}" />
+						</div>
+						<div>
+							<div class="popup">
+								<span data-i18n="cannot-see-target-label">Cannot see target: -6 *</span>
+							</div>
+							<span class="tooltip">
+								<span data-i18n="cannot-see-target-tooltip">Max Skill is 9. B394.</span>
+							</span>
+						</div>
+					</label>
+				</div>
+
+				<div class="item item33">
+					<label>
+						<div>
+							<select name="attr_darkness_penalty" class="number-only-width" title="macro name: @{darkness_penalty">
+								<option>0</option>
+								<option>-1</option>
+								<option>-2</option>
+								<option>-3</option>
+								<option>-4</option>
+								<option>-5</option>
+								<option>-6</option>
+								<option>-7</option>
+								<option>-8</option>
+								<option>-9</option>
+							</select>
+						</div>
+						<div>
+							<div class="popup">
+								<span data-i18n="darkness-label">Darkness</span>
+							</div>
+							<span class="tooltip">
+								<span data-i18n="darkness-tooltip">-10 is considered total darkness, no light available. See B394.</span>
+							</span>
+						</div>
+					</label>
+				</div>
+
+				<div class="item item34">
+					<label>
+						<div>
+							<select name="attr_smoke_penalty" class="number-only-width" title="macro name: @{smoke_penalty">
+								<option>0</option>
+								<option>-1</option>
+								<option>-2</option>
+								<option>-3</option>
+								<option>-4</option>
+								<option>-5</option>
+								<option>-6</option>
+								<option>-7</option>
+								<option>-8</option>
+								<option>-9</option>
+								<option>-10</option>
+							</select>
+						</div>
+						<div>
+							<div class="popup">
+								<span data-i18n="smoke-label">Smoke</span>
+							</div>
+							<span class="tooltip">
+								<span data-i18n="obscure-vision-tooltip">-10 totally obscures vision. See Obscure B72.</span>
+							</span>
+						</div>
+					</label>
+				</div>
+				
+				<div class="item item35">
+					<label>
+						<div>
+							<select name="attr_other_vision_penalty" class="number-only-width" title="macro name: @{other_vision_penalty">
+								<option>0</option>
+								<option>-1</option>
+								<option>-2</option>
+								<option>-3</option>
+								<option>-4</option>
+								<option>-5</option>
+								<option>-6</option>
+								<option>-7</option>
+								<option>-8</option>
+								<option>-9</option>
+								<option>-10</option>
+							</select>
+						</div>
+						<div>
+							<div class="popup">
+								<span data-i18n="other-label">Other</span>
+							</div>
+							<span class="tooltip">
+								<span data-i18n="obscure-vision-tooltip">-10 totally obscures vision. See Obscure B72.</span>
+							</span>
+						</div>
+					</label>
+				</div>
+
 			</div>
 
 		</div>
diff --git a/GURPS/translation.json b/GURPS/translation.json
index 35538cfe28..86a8daf749 100644
--- a/GURPS/translation.json
+++ b/GURPS/translation.json
@@ -48,6 +48,16 @@
   "high-pain-threshold-tooltip": "If checked, High Pain Threshold negates all shock penalties. See B59.",
   "used-to-blindness-label": "Used to blindess",
   "used-to-blindness-tooltip": "If used to blindess, the max Visibility penalty is -6. See B124 and B394.",
+  "roll-modifier-label": "Roll modifier",
+  "visibility-roll-modifier-tooltip": "Combined total can't exceed -10 or -6 if used to blindness.",
+  "cannot-see-anything-label": "Can't see anything: -10 *",
+  "cannot-see-anything-tooltip": "If used to blindess, penalty is -6 and Max skill is 9. See B124 and B394.",
+  "cannot-see-target-label": "Can't see target: -6 *",
+  "cannot-see-target-tooltip": "Max Skill is 9. B394.",
+  "darkness-label": "Darkness",
+  "darkness-tooltip": "-10 is considered total darkness, no light available. See B394.",
+  "smoke-label": "Smoke",
+  "obscure-vision-tooltip": "-10 totally obscures vision. See Obscure B72.",
   "announcements": "Announcements",
   "sheet-version-title": "GURPS Character Sheet Version:",
   "hide-until-next-update": "Hide until next update",