diff --git a/World Wide Wrestling 2nd Ed/wwwrpg.css b/World Wide Wrestling 2nd Ed/wwwrpg.css
index 3803699651..968b35524c 100644
--- a/World Wide Wrestling 2nd Ed/wwwrpg.css	
+++ b/World Wide Wrestling 2nd Ed/wwwrpg.css	
@@ -1031,7 +1031,6 @@ div.match-grid input[type="text"] {
 	font-family: 'Kulim Park';
 	font-size: 16px;
 	font-weight: bold;
-	font-align: center;
 	
 	position: relative;
 	top: 2px;
@@ -1039,19 +1038,40 @@ div.match-grid input[type="text"] {
 	width: 38px;
 	display: inline;
 	
-	/*border: 2px solid transparent;
-	border-color: #183;*/
 	border: none;
 	appearance: none;
     -webkit-appearance: none;
     -moz-appearance: none; 
-	background: #ad9
+	background: var(--fillcolor);
+}
+
+.match-selector:hover, .match-selector:focus {
+	background: white;
+}
+
+div.vs-match-block, div.tag-match-block {
+	display: none;
+}
+
+.match-type-toggle[value="vs"] ~ div.vs-match-block,
+.match-type-toggle[value="tag"] ~ div.tag-match-block {
+	display: inline;
 }
 
 .vs-input {
 	width: 607px;
 }
 
+.tag-team-input {
+	width: 250px;
+	margin-right: 8px;
+}
+
+.tag-vs-input {
+	width: 315px;
+	margin-left: 3px;
+}
+
 .match-stipulation-box {
 	grid-column-start: 1;
 	grid-column-end: 3;
diff --git a/World Wide Wrestling 2nd Ed/wwwrpg.html b/World Wide Wrestling 2nd Ed/wwwrpg.html
index 0cedd989b4..087f9756bb 100644
--- a/World Wide Wrestling 2nd Ed/wwwrpg.html	
+++ b/World Wide Wrestling 2nd Ed/wwwrpg.html	
@@ -1,8 +1,8 @@
-<input type="hidden" class="tabs-toggle" name="attr_sheetTab"  value="character"  />
-<input type="hidden" class="color-toggle" name="attr_sheetColor"  value="red"  />
+<input type="hidden" class="tabs-toggle" name="attr_sheetTab"  value="character" />
+<input type="hidden" class="color-toggle" name="attr_sheetColor"  value="red" />
 
 <div class="nav-buttons">
-	<input type="hidden" class="tabs-toggle" name="attr_sheetTab"  value="character"  />
+	<input type="hidden" class="tabs-toggle" name="attr_sheetTab"  value="character" />
 	<button type="action" class="char-button" name="act_character">Character</button><button type="action" class="notes-button" name="act_notes">Notes</button><button type="action" class="settings-button" name="act_settings">Settings</button>
 </div>
 
@@ -290,12 +290,17 @@
 						<input class="episode-input" type="number" step="1" min="0" name="attr_episode" />
 					</div>
 					<div class="match-vs-box">
-						<!--<label>VS.</label>-->
-						<select class="match-selector" name="attr_match-type">
+						<select class="match-selector" name="attr_match_type">
 							<option value="vs" selected="selected">VS.</option>
 							<option value="tag">Tag</option>
 						</select>
-						<input class="vs-input" type="text" name="attr_match_vs" />
+						<input type="hidden" class="match-type-toggle" name="attr_match_type"  value="vs" />
+						<div class="vs-match-block">
+							<input class="vs-input" type="text" name="attr_match_vs" />
+						</div>
+						<div class="tag-match-block">
+							<input class="tag-team-input" type="text" name="attr_tag_team" /><label>VS.</label><input class="tag-vs-input" type="text" name="attr_match_vs" />
+						</div>
 					</div>
 					<div class="match-stipulation-box">
 						<label>Stipulation / Title Match</label>
@@ -397,6 +402,14 @@
 			});
 		});
     });
+	
+	/*on("change:match_type", function() {
+		getAttrs(["match_type"], function(values) {
+			setAttrs({
+				matchType: values.match_type
+			});
+		});
+    }); */
 </script>
 
 <rolltemplate class="sheet-rolltemplate-rollstat">