diff --git a/test/versions.html b/test/versions.html
index e936e26..94d0808 100644
--- a/test/versions.html
+++ b/test/versions.html
@@ -45,7 +45,7 @@
 			<noscript>Please enable JavaScript</noscript>
 			<select id="phase-dropdown" hidden></select>
 			<select id="downloads-dropdown" hidden></select>
-			<!-- <select id="clientorserver-dropdown" hidden></select> -->
+			<select id="type-dropdown" hidden></select>
 			<!-- See below todo -->
 			<p id="downloads-box"><span>Loading...</span></p>
 			<script>
@@ -62,16 +62,26 @@
 							});
 							$("#downloads-dropdown").change();
 						});
-						// TODO: add new dropdown button for client/server downloads
-						// $("#clientorserver-dropdown").change(e => {
-						// 	$("")
-						// });
-						$("#downloads-dropdown").change(e => {
+						$("#type-dropdown").change(e => {
+							let target = $("#type-dropdown").val();
 							$("#downloads-box").children().remove();
 							versions[$("#phase-dropdown").val()][$("#downloads-dropdown").val()].forEach(element => {
+								if((element.type == undefined ? "Client" : element.type) != target) return;
 								$("#downloads-box").append("<li><a href=\"" + element.download + "\">" + element.version + "</a></li>");
 							});
 						});
+						$("#downloads-dropdown").change(e => {
+							$("#type-dropdown").removeAttr("hidden").children().remove();
+							let types = [];
+							versions[$("#phase-dropdown").val()][$("#downloads-dropdown").val()].forEach(element => {
+								let type = element.type == undefined ? "Client" : element.type;
+								if(types.includes(type)) return;
+								types.push(type);
+								$("#type-dropdown").append("<option>" + type + "</option>");
+							});
+							if(types.length == 1) $("#type-dropdown").attr("hidden", true);
+							$("#type-dropdown").change();
+						});
 						Object.keys(result).forEach(element => {
 							$("#phase-dropdown").append("<option>" + element + "</option>");
 						});
diff --git a/test/versions.json b/test/versions.json
index 4c1f000..4e634ac 100644
--- a/test/versions.json
+++ b/test/versions.json
@@ -161,9 +161,12 @@
             },
             {
                 "version": "v3.1",
-                "download": "/mods/64bit/release/1.0.0/minecraft_1.0.0_64bit_v3.1_314rft.zip",
-                "version-server": "v2.2 (SERVER)",
-                "download-server": "/mods/64bit/release/1.0.0/minecraft_server_1.0.0_64bit_v2.2_314rft.zip"
+                "download": "/mods/64bit/release/1.0.0/minecraft_1.0.0_64bit_v3.1_314rft.zip"
+            },
+            {
+                "version": "v2.2 (SERVER)",
+                "download": "/mods/64bit/release/1.0.0/minecraft_server_1.0.0_64bit_v2.2_314rft.zip",
+                "type": "Server"
             }
         ],
         "1.2.5 (314rft)": [