diff --git a/composer.json b/composer.json
index 9418fdd..c9eba31 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,11 @@
 {
     "require": {
-        "tildeteam/wiki": "^1.0.0"
+        "tildeteam/wiki": "^1.0.0",
+        "ext-openssl": "*",
+        "ext-json": "*",
+        "ext-shmop": "*",
+        "ext-sockets": "*",
+        "ext-posix": "*",
+        "ext-mbstring": "*"
     }
 }
diff --git a/css/dracula.html b/css/dracula.html
index 994fe11..c1a74a1 100644
--- a/css/dracula.html
+++ b/css/dracula.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 
 <head>
     <meta charset="utf-8">
@@ -352,13 +352,16 @@ end</pre>
                                         <option>5</option>
                                     </select>
                                     <br>
-                                    <select multiple="" class="form-control">
-                                        <option>1</option>
-                                        <option>2</option>
-                                        <option>3</option>
-                                        <option>4</option>
-                                        <option>5</option>
-                                    </select>
+                                    <label>
+                                        Sample Dropdown
+                                        <select multiple="" class="form-control">
+                                            <option>1</option>
+                                            <option>2</option>
+                                            <option>3</option>
+                                            <option>4</option>
+                                            <option>5</option>
+                                        </select>
+                                    </label>
                                 </div>
                             </div>
                             <div class="form-group">
@@ -409,7 +412,10 @@ end</pre>
                         <label class="control-label">Input addons</label>
                         <div class="input-group">
                             <span class="input-group-addon">$</span>
-                            <input class="form-control" type="text">
+                            <label>
+                                Text Input
+                                <input class="form-control" type="text">
+                            </label>
                             <span class="input-group-btn">
                                 <button class="btn btn-default" type="button">Button</button>
                             </span>
@@ -794,8 +800,8 @@ end</pre>
 
     </div>
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+    <script src="/js/jquery.min.js"></script>
+    <script src="/js/bootstrap.min.js"></script>
 
     <!-- Github stars script -->
     <script>jQuery(document).ready(function ($) {
diff --git a/css/index.html b/css/index.html
index 429c704..ed8108b 100644
--- a/css/index.html
+++ b/css/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 
 <head>
     <meta charset="utf-8">
@@ -352,13 +352,16 @@ end</pre>
                                         <option>5</option>
                                     </select>
                                     <br>
-                                    <select multiple="" class="form-control">
-                                        <option>1</option>
-                                        <option>2</option>
-                                        <option>3</option>
-                                        <option>4</option>
-                                        <option>5</option>
-                                    </select>
+                                    <label>
+                                        Sample Dropdown
+                                        <select multiple="" class="form-control">
+                                            <option>1</option>
+                                            <option>2</option>
+                                            <option>3</option>
+                                            <option>4</option>
+                                            <option>5</option>
+                                        </select>
+                                    </label>
                                 </div>
                             </div>
                             <div class="form-group">
@@ -409,7 +412,10 @@ end</pre>
                         <label class="control-label">Input addons</label>
                         <div class="input-group">
                             <span class="input-group-addon">$</span>
-                            <input class="form-control" type="text">
+                            <label>
+                                Text Input
+                                <input class="form-control" type="text">
+                            </label>
                             <span class="input-group-btn">
                                 <button class="btn btn-default" type="button">Button</button>
                             </span>
@@ -794,8 +800,8 @@ end</pre>
 
     </div>
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+    <script src="/js/jquery.min.js"></script>
+    <script src="/js/bootstrap.min.js"></script>
 
     <!-- Github stars script -->
     <script>jQuery(document).ready(function ($) {
diff --git a/news/pages/002_dns_redirects.md b/news/pages/002_dns_redirects.md
index f1deeb0..f18c3ee 100644
--- a/news/pages/002_dns_redirects.md
+++ b/news/pages/002_dns_redirects.md
@@ -14,4 +14,4 @@ there are no ssl certs for these subdomains, so you will have to request those w
 
 edit: there is now a wildcard cert from letsencrypt for *.tilde.team, so you can use https with your username as a subdomain!! :)
 
-edit2: there are now more than one domains that will server your user page. see [the wiki article about it](/wiki/?page=tildepages)
+edit2: there are now more than one domains that will server your user page. see [the wiki article about it](/wiki/tildepages)
diff --git a/news/pages/015_migration.md b/news/pages/015_migration.md
index c19cdc7..f220244 100644
--- a/news/pages/015_migration.md
+++ b/news/pages/015_migration.md
@@ -10,4 +10,4 @@ tilde.team is now on a beefy vps! 4cores, 6gb ram, and 100gb ssd space!
 everything is where you left it, but you will get a scary notice about a man-in-the-middle attack when you connect over ssh. (this is just because the IP address changed). the new IP is 104.223.31.252 and the ECDSA fingerprint is: `SHA256:CoJQp1mGtYJOZscJul6Ba94o2NsuzZTUI/b76JLGy3A` for your verification purposes.
 
 
-edit: it wasn't as stable as i thought... see [part 2](?page=020_migration_again)
+edit: it wasn't as stable as i thought... see [part 2](020_migration_again)
diff --git a/news/pages/016_tildemail.md b/news/pages/016_tildemail.md
index e2a12eb..e6f2194 100644
--- a/news/pages/016_tildemail.md
+++ b/news/pages/016_tildemail.md
@@ -5,4 +5,4 @@ title: tildemail
 author: ben
 ---
 
-what started as an initiative to get local mail working ended up with us just setting up a full mailserver with smtp and imap. see the [email wiki](/wiki/?page=email) for more info and [webmail](https://mail.tilde.team) for easy access.
+what started as an initiative to get local mail working ended up with us just setting up a full mailserver with smtp and imap. see the [email wiki](/wiki/email) for more info and [webmail](https://mail.tilde.team) for easy access.
diff --git a/news/pages/019_gopher.md b/news/pages/019_gopher.md
index cb09bff..f23a93b 100644
--- a/news/pages/019_gopher.md
+++ b/news/pages/019_gopher.md
@@ -5,6 +5,6 @@ title: tilde.team gopher server and proxy
 author: ben
 ---
 
-we're now running a [gopher server](/wiki/?page=gopher) and [http proxy](https://gopher.tilde.team)! connect to [gopher://tilde.team](gopher://tilde.team) or use [our http proxy](https://gopher.tilde.team) for when you don't have a gopher-capable browser handy
+we're now running a [gopher server](/wiki/gopher) and [http proxy](https://gopher.tilde.team)! connect to [gopher://tilde.team](gopher://tilde.team) or use [our http proxy](https://gopher.tilde.team) for when you don't have a gopher-capable browser handy
 
 to get started in gopherspace, check out [gopher.zone](https://gopher.zone) or use [`bb`](https://tildegit.org/team/bashblog), [`feels`](https://github.com/modgethanc/ttbp), or [`burrow`](https://github.com/tilde-team/burrow) at the shell!
diff --git a/news/pages/020_migration_again.md b/news/pages/020_migration_again.md
index 9d37c76..4a37049 100644
--- a/news/pages/020_migration_again.md
+++ b/news/pages/020_migration_again.md
@@ -7,4 +7,4 @@ author: khuxkm
 
 tilde.team is now on an even beeeeefier rig. bare metal this time! 4cores (8 threads), 64gb ram! 
 
-just like [last time](/news/?page=015_migration), everything is where you left it, but you **will** get a scary notice about a man-in-the-middle attack when you connect over ssh. (this is just because the IP address changed). the new IP is 195.201.242.48 and the ECDSA fingerprint is: `SHA256:R3qNfKIF3IiXhKCbFX6rCKl73yzexi9Wodsow6XFres` for your verification purposes.
+just like [last time](/news/015_migration), everything is where you left it, but you **will** get a scary notice about a man-in-the-middle attack when you connect over ssh. (this is just because the IP address changed). the new IP is 195.201.242.48 and the ECDSA fingerprint is: `SHA256:R3qNfKIF3IiXhKCbFX6rCKl73yzexi9Wodsow6XFres` for your verification purposes.
diff --git a/news/pages/021_discord_lockdown.md b/news/pages/021_discord_lockdown.md
index ec75c5a..86e5bc7 100644
--- a/news/pages/021_discord_lockdown.md
+++ b/news/pages/021_discord_lockdown.md
@@ -13,6 +13,6 @@ How this affects you:
 
 The behavior of some users in the tilde.chat Discord has been unacceptable and does not comply with our code of conduct. Upon further review, we have decided that managing the Discord server is a bit more than we can handle without discussing moderation in-depth. As such, ben and I (khuxkm) have decided to make it READ-ONLY until we have come to a more permanent decision (which may be to close it permanently).
 
-If you have any thoughts/ideas for the future of the discord bridge, please drop a line to ben or myself on IRC or by email (@tilde.team [or any of the other domains](/wiki/?page=email)). We can be found in the #sudoers channel.
+If you have any thoughts/ideas for the future of the discord bridge, please drop a line to ben or myself on IRC or by email (@tilde.team [or any of the other domains](/wiki/email)). We can be found in the #sudoers channel.
 
 Thanks for <del>flying tildeverse</del> being a member of the tildeverse and working with us to figure out a chat solution that works for everyone!
diff --git a/ring/index.php b/ring/index.php
index c6b6e19..fb9aa89 100644
--- a/ring/index.php
+++ b/ring/index.php
@@ -41,13 +41,13 @@ else {
     // keep this as a string so we can escape it easily with htmlspecialchars()
     $snippet = '<!-- tilde.team ring fragment-->
 <div id="newring">
-<center>
+<div style="text-align: center;">
 [<a href="https://tilde.team/ring/?action=prev&me=USERNAME">previous</a>]
 [<a href="https://tilde.team/ring/?action=random&me=USERNAME">random</a>]
 [<a href="https://tilde.team/ring/?action=next&me=USERNAME">next</a>]
 <br>
 <a href="https://tilde.team/ring/">how to join this webring</a>
-</center>
+</div>
 </div>';
 
     $title = "webring - how to join";
diff --git a/signup/email/Net/DNS2.php b/signup/email/Net/DNS2.php
index 83074e9..8d738a6 100644
--- a/signup/email/Net/DNS2.php
+++ b/signup/email/Net/DNS2.php
@@ -231,8 +231,7 @@ class Net_DNS2
 						break;
 
 					default:
-						;
-					}
+                    }
 				}
 
 				//
@@ -538,7 +537,7 @@ class Net_DNS2
 			$x = (8 - (count($part[0]) + count($part[1])));
 			for ($i = 0; $i < $x; $i++) {
 
-				array_push($missing, '0000');
+				$missing[] = '0000';
 			}
 
 			$missing    = array_merge($part[0], $missing);
@@ -1153,15 +1152,15 @@ class Net_DNS2_BitMap
 
 			$bitstr = '';
 
-			for ($i=0; $i<$bm[$window]['length'] * 8; $i++) {
-				if (isset($bm[$window][$i])) {
+			for ($i=0; $i< $bitdata['length'] * 8; $i++) {
+				if (isset($bitdata[$i])) {
 					$bitstr .= '1';
 				} else {
 					$bitstr .= '0';
 				}
 			}
 
-			$output .= pack('CC', $window, $bm[$window]['length']);
+			$output .= pack('CC', $window, $bitdata['length']);
 			$output .= pack('H*', self::bigBaseConvert($bitstr));
 		}
 
@@ -1358,7 +1357,7 @@ class Net_DNS2_Cache
 
 		return null;
 	}
-};
+}
 
 ?><?php
 
@@ -3767,7 +3766,7 @@ class Net_DNS2_Cache_File extends Net_DNS2_Cache
 			fclose($fp);
 		}
 	}
-};
+}
 
 ?><?php
 
@@ -3978,7 +3977,7 @@ class Net_DNS2_Cache_Shm extends Net_DNS2_Cache
 			fclose($fp);
 		}
 	}
-};
+}
 
 ?><?php
 
@@ -5781,7 +5780,6 @@ class Net_DNS2_RR_IPSECKEY extends Net_DNS2_RR
 			break;
 
 		case self::GATEWAY_TYPE_DOMAIN:
-			;
 			break;
 
 		default:
@@ -5798,7 +5796,6 @@ class Net_DNS2_RR_IPSECKEY extends Net_DNS2_RR
 
 		case self::ALGORITHM_DSA:
 		case self::ALGORITHM_RSA:
-			;
 			break;
 
 		default:
@@ -5905,7 +5902,6 @@ class Net_DNS2_RR_IPSECKEY extends Net_DNS2_RR
 		//
 		switch($this->gateway_type) {
 		case self::GATEWAY_TYPE_NONE:
-			;
 			break;
 
 		case self::GATEWAY_TYPE_IPV4:
@@ -5926,7 +5922,6 @@ class Net_DNS2_RR_IPSECKEY extends Net_DNS2_RR
 		//
 		switch($this->algorithm) {
 		case self::ALGORITHM_NONE:
-			;
 			break;
 
 		case self::ALGORITHM_DSA:
diff --git a/signup/email/ipaddr.php b/signup/email/ipaddr.php
index 691bbea..6f47779 100644
--- a/signup/email/ipaddr.php
+++ b/signup/email/ipaddr.php
@@ -207,4 +207,3 @@
 			return true;
 		}
 	}
-?>
\ No newline at end of file
diff --git a/signup/email/smtp.php b/signup/email/smtp.php
index b4cd6d3..c193d85 100644
--- a/signup/email/smtp.php
+++ b/signup/email/smtp.php
@@ -1283,7 +1283,7 @@
 					{
 						if (trim($line) !== "")
 						{
-							if ($line{0} !== "\xFF" && (($tagname === "/ul" && $line{0} !== "-") || ($tagname === "/ol" && !(int)$line{0})))  $prefix2 = "\xFF\xFF";
+							if ($line[0] !== "\xFF" && (($tagname === "/ul" && $line[0] !== "-") || ($tagname === "/ol" && !(int)$line[0])))  $prefix2 = "\xFF\xFF";
 							else  $prefix2 = "";
 
 							$lines[$num] = $prefix . $prefix2 . trim($line);
@@ -1373,8 +1373,7 @@
 			if ($htmlmessage == "" && !count($attachments))
 			{
 				// Plain-text e-mail.
-				$destheaders = "";
-				$destheaders .= $messagefromaddr;
+                $destheaders = $messagefromaddr;
 				if ($headers != "")  $destheaders .= $headers;
 				$destheaders .= "MIME-Version: 1.0\r\n";
 				if (!isset($options["usemail"]) || !$options["usemail"])  $destheaders .= $messagetoaddr;
@@ -1391,8 +1390,7 @@
 			{
 				// MIME e-mail (HTML, text, attachments).
 				$mimeboundary = "--------" . self::MIME_RandomString(25);
-				$destheaders = "";
-				$destheaders .= $messagefromaddr;
+                $destheaders = $messagefromaddr;
 				if ($headers != "")  $destheaders .= $headers;
 				$destheaders .= "MIME-Version: 1.0\r\n";
 				if (!isset($options["usemail"]) || !$options["usemail"])  $destheaders .= $messagetoaddr;
@@ -1516,4 +1514,3 @@
 			}
 		}
 	}
-?>
\ No newline at end of file
diff --git a/signup/email/utf8.php b/signup/email/utf8.php
index d5f878b..3b0deed 100644
--- a/signup/email/utf8.php
+++ b/signup/email/utf8.php
@@ -205,4 +205,3 @@
 			return "&#" . $num . ";";
 		}
 	}
-?>
\ No newline at end of file
diff --git a/signup/index.php b/signup/index.php
index 8780cf4..34ecd01 100644
--- a/signup/index.php
+++ b/signup/index.php
@@ -24,23 +24,31 @@ function esc($v) {
             <?php include 'signup-handler.php'; ?>
 
 			<div>
-					<p>your desired username (numbers and lowercase letters only, no spaces)</p>
-					<input class="form-control" name="username" value="<?=esc("username")?>" type="text" required>
+                <label>
+                    your desired username (numbers and lowercase letters only, no spaces)
+                    <input class="form-control" name="username" value="<?=esc("username")?>" type="text" required>
+                </label>
+            </div>
+
+			<div>
+				<label>
+                    email to contact you with account info
+				    <input class="form-control" name="email" value="<?=esc("email")?>" type="text" required>
+                </label>
 			</div>
 
 			<div>
-				<p>email to contact you with account info</p>
-				<input class="form-control" name="email" value="<?=esc("email")?>" type="text" required>
+				<label>
+                    what interests you about tilde.team? we want to make sure you're a real human being :)
+                    <textarea required class="form-control" name="interest" id="" cols="40" rows="7"><?=esc("interest")?></textarea>
+                </label>
 			</div>
 
 			<div>
-				<p>what interests you about tilde.team? we want to make sure you're a real human being :)</p>
-				<textarea required class="form-control" name="interest" id="" cols="40" rows="7"><?=esc("interest")?></textarea>
-			</div>
-
-			<div>
-				<p>SSH public key</p>
-				<textarea required class="form-control" name="sshkey" id="" cols="30" rows="10"><?=esc("sshkey")?></textarea>
+                <label>
+				    SSH public key
+				    <textarea required class="form-control" name="sshkey" id="" cols="30" rows="10"><?=esc("sshkey")?></textarea>
+                </label>
                 <p>if you don't have a key, don't worry! <a href="/wiki/ssh">check out our guide to ssh keys</a> and make sure that you only put your pubkey here</p>
             </div>
 
diff --git a/signup/signup-handler.php b/signup/signup-handler.php
index f01a281..f0b5f9b 100644
--- a/signup/signup-handler.php
+++ b/signup/signup-handler.php
@@ -149,8 +149,8 @@ if (isset($_REQUEST["username"]) && isset($_REQUEST["email"])) {
     $sshkey = trim($_REQUEST["sshkey"]);
     if ($sshkey == "" || (mb_substr($sshkey, 0, 4) !== "ssh-" && mb_substr($sshkey, 0, 11) !== "ecdsa-sha2-"))
         $message .= '<li>ssh key required: please create one and submit the public key. '
-            . 'see our <a href="https://tilde.team/wiki/?page=ssh">ssh wiki</a> or '
-            . 'hop on <a href="https://web.tilde.chat/?join=team">irc</a> and ask for help</li>';
+            . 'see our <a href="https://tilde.team/wiki/ssh">ssh wiki</a> or '
+            . 'hop on <a href="https://tilde.chat/kiwi/#team">irc</a> and ask for help</li>';
     else {
         if ($name != "" && $email != "") {
             if (forbidden_sshkey($sshkey)) {
@@ -163,7 +163,7 @@ if (isset($_REQUEST["username"]) && isset($_REQUEST["email"])) {
 
     // no validation errors
     if ($message == "") {
-        $makeuser = "makeuser {$_REQUEST["username"]} {$_REQUEST["email"]} \"{$sshkey}\"";
+        $makeuser = "makeuser {$_REQUEST["username"]} {$_REQUEST["email"]} \"$sshkey\"";
 
         $msgbody = "
 username: {$_REQUEST["username"]}
diff --git a/users/index.php b/users/index.php
index 2dc25cb..bcc267e 100644
--- a/users/index.php
+++ b/users/index.php
@@ -25,7 +25,7 @@ $total_users = shell_exec("members team | wc -w");
             $user = basename($user); ?>
             <li style="list-style: none; margin-left: -40px;">
                 <a href="/~<?=$user?>/" class="list-group-item">
-                    <h6 class="list-group-item-heading">~<?=$user?></h5>
+                    <h6 class="list-group-item-heading">~<?=$user?></h6>
                 </a>
             </li>
         <?php endforeach; ?>
diff --git a/wiki/pages/irc.md b/wiki/pages/irc.md
index 01e3883..f39bd4b 100644
--- a/wiki/pages/irc.md
+++ b/wiki/pages/irc.md
@@ -12,7 +12,7 @@ category:
 hi teammates!
 
 the tilde.chat irc network is available publicly at irc.tilde.chat:6697 (with ssl) as a round robin of 
-[available nodes](https://tilde.chat/wiki/?page=servers).
+[available nodes](https://tilde.chat/wiki/servers).
 
 to connect directly to our node, you can use the following addresses:
 - localhost port 6667 when at your shell or via ssh port-forwarding
diff --git a/wiki/pages/other-tildes.md b/wiki/pages/other-tildes.md
index 310f829..3485272 100644
--- a/wiki/pages/other-tildes.md
+++ b/wiki/pages/other-tildes.md
@@ -12,44 +12,46 @@ category:
 if you're starting a tilde and want to be added to this list, [open a PR :)](
 https://tildegit.org/team/site/src/branch/master/wiki/pages/other-tildes.md)
 
-| tilde name | description | where to join | notes |
-| --- | --- | --- | ---|
-| [breadpunk.club](https://breadpunk.club) | breadpunk.club is a small tilde focused on bread-making and community-building.  see the [manifesto](https://breadpunk.club/docs/manifesto/) for more information on our mission. | [signup information here](https://breadpunk.club/join/) | |
-| [cosmic.voyage](https://cosmic.voyage) | cosmic.voyage is an Ubuntu server focused on collaborative sci-fi storytelling. The background story is visible on the homepage. New authors are welcome to join and take on the voice of various ships, outposts, and colonies scattered across the universe, sending text messages back to a relay at Earth's L4 point. | [signup information here](https://cosmic.voyage/join.html) | |
-| [ctrl-c.club](http://ctrl-c.club) | A place for the curious to poke around and play. SSH access, web pages, games, and programming languages on tap. | [signup form](http://goo.gl/forms/oviL1wYSrV) | |
-| [dimension.sh](https://dimension.sh/) | dimension.sh is a small public linux shell host (or pubnix system) that is open to anyone who wants to learn, experiment, and socialize with other like minded people. | [signup form](https://dimension.sh/join.html) | |
-| [envs.net](https://envs.net/) | envs.net is a minimalist, non-commercial shared unix system and will always be free to use. | [signup here](https://envs.net/signup) | |
-| [hackers.cool](http://hackers.cool) | A tilde.club started by some nerd at Hacker School. As such, it's got a lot of Hacker Schoolers on it, but everyone is welcome! | [signup form](https://docs.google.com/forms/d/1PHnXadDW1WySCB9frIefjXI3P6bt8n_p4YMyiPPD4O4/viewform) | |
-| [nand.club](http://nand.club) | a new anti-capitalist, solarpunk tilde | [signup info here](http://nand.club) | down |
-| [palvelin.club](http://palvelin.club) | Finnish language tilde server. | [signup form](https://docs.google.com/forms/d/1tTGiOU0z3M92nCb5Lv3Tv_sJXGLh8kj5Gl79Gx4ZOdM/viewform) | |
-| [pebble.ink](http://pebble.ink) | pebble.ink is a project almost, but not quite, like tilde.club | ask [@phildini](https://twitter.com/phildini) or try [this signup form](http://pebble.ink/apply.html) | |
-| [protocol.club](http://protocol.club) | protocol.club explores the fundamental and unique learning opportunities provided by the implementation of standardized protocols. It is a place for curious minds to explore and experiment, to educate and be educated about protocols and implementations old and new alike. While inspired by tilde.club and federated with the rest of the tildeverse via NNTP (et cetera), protocol.club has a stronger focus on its particular mission and has several differences from other tilde boxes, namely: we have a Code of Conduct, and we have some resources available locally to aid development of protocol implementations and new draft protocols. We also serve pages over HTTPS. | [signup form](https://docs.google.com/forms/d/11sJKpZnqaqNVR-rYRfCxKl05iSpjJa85XbigY8xbzBM/viewform?c=0&w=1) | down |
-| [rawtext.club](https://rawtext.club) | rawtext.club (RTC) is an experimental public access shell server with a focus on use of collaborative projects for gnu/linux skill building. Projects include simple, command line social tools and utilities, or whatever lightweight programs users are interested in.  RTC does not use IRC, and instead focuses on other slower and more thoughtful forms of user interaction.  | Send email to admin@rawtext.club with your ssh pubkey, desired username, and a statement describing your interest in joining.  | |
-| [remotes.club](https://remotes.club) | Anyone who works remotely is welcome. | [signup form](https://www.remotes.club/request.php) | |
-| [rw.rs](http://rw.rs) | An experimental software community with a 199X aesthetic. | [signup via pull request](https://github.com/adsr/rw.rs/) | |
-| [salyut.one](https://salyut.one) | a new, freebsd based tilde ! we don't bite :) | [signup instructions](https://salyut.one/welcome.html) | |
-| [skylab.org](http://skylab.org) | An open-source community co-operative with ~150 members that has existed since 1997. Based in Portland, Oregon, United States with a userbase across the world, we have quietly existed. Featuring geektalk community chat, a variety of tools and hosting running on FreeBSD. | Email [skylabstatus@gmail.com](mailto:skylabstatus@gmail.com) with subject line SKYLAB.ORG and an email containing your desired username, full name, public SSH key and an acknowledgement to play nice. | |
-| [southlondon.cc](https://southlondon.cc) | a nice debian server hosted in the uk. it's got ssh access, web hosting, an xmpp server that sorta works and some slightly more interesting things coming soon. | [take a look at this page](https://southlondon.cc/signup) | |
-| [squiggle.city](http://squiggle.city) | squiggle.city is a Debian server in the spirit of tilde.club. It's for making web pages and learning about the command line. If you are reading [userland](https://p1k3.com/userland-book/), which is about how to unix, squiggle.city is a place to explore the ideas it contains. | email [bbearnes@gmail.com](mailto:bbearnes@gmail.com) with your ssh pubkey and a promise to not be a jerk | |
-| [summit pubnix](https://www.summit.tildex.com) | summit is an intentional and inclusive community for developing, making, learning, teaching, socializing, and enjoying various aspects of GNU/Linux in a free/non-commercial environment. If you need help or have any questions, feel free to ask in #pubnix on irc.tilde.chat. | [signup form](https://www.summit.tildex.com/join) | |
-| [texto-plano.xyz](https://texto-plano.xyz) | A small UNIX system community in the spirit of [Tilde.club](https://tilde.club), [RTC](https://rawtext.club) and the [small Internet](http://gopher.muffinlabs.com/republic.circumlunar.space/~spring/phlog/2019-01-16__The_Small_Internet.txt) in Spanish language (we use OpenBSD) | Send your public key and your username to [admin@texto-plano.xyz](mailto:admin@texto-plano.xyz) | |
-| [theasylum](https://theasylum.team) | invite-only tilde catering to programmers of all languages | join #theasylum on tilde.chat, and let us get to know you | |
-| [thunix](https://thunix.net) | thunix offers Secure Shell (SSH) accounts, Web Hosting, Email Accounts, and many other things to people free of charge. | [signup info here](https://www.thunix.net/signup.php) | |
-| [tilde.best](https://tilde.best) | tilde.best is a Debian server which is aiming to have a *best* community and *best* features. | email [root@tilde.best](mailto:root@tilde.best) with your ssh pubkey, desired username and reason why you want to join | down |
-| [tilde.cafe](https://tilde.cafe) | tilde.cafe is a new debian server offering ssh, web hosting, email and more - easy going with plans to host games | [signup form](https://tilde.cafe/signup/) |  |
-| [tilde.cat](https://tilde.cat) | This is (or rather might be) public shell server like [the club](https://tilde.club), [the town](https://tilde.town), or other ~ servers. | [signup form](http://signup.tilde.cat) | down |
-| [tilde.center](https://tilde.center) | A public unix server focused around decentralization, federation, and home-brewed open source projects. | [signup form](https://tilde.center/signup.php) | down |
-| [tilde.guru](https://tilde.guru) | A public freebsd server focused around learning, open source and minimalism. | [signup instructions](https://tilde.guru/signup) | |
-| [tilde.fun](https://tilde.fun) | This is a Linux machine on the internet where you can get a shell account. | `ssh tilde@tilde.fun` | down |
-| [tilde.institute](https://tilde.institute) | Provides a space dedicated to the OpenBSD operating system. Includes a functional BCHS stack for users to experiment with and use to create web applications. | [signup form](https://tilde.institute/signup) | |
-| [tilde.my.to](https://tilde.my.to) | If you're looking for a great tilde, to learn and play and also maybe break things, come check tilde.my.to out. | [signup request is via mail](https://tilde.my.to) | |
-| [tilde.pink](gopher://tilde.pink) | A gopher only tilde, providing shell acounts with email and gopher services running on a DragonflyBSD server. The site is accessible via [web proxy](https://proxy.tilde.pink) |  [signup form](gopher://tilde.pink/1/signup.gph) | |
-| [tilde.pw](https://tilde.pw) | tilde.pw is a unix server with some people on it and that unix server hosts webpages and other things too. | [signup form](https://tilde.pw/signup.php) | |
-| [tilde.town](https://tilde.town) | tilde.town is an open, welcoming and safe place for the exploration of lo-fi HTML art, hi-fi javascript experiments, generative poetic works, and digital socialization in a post-facebook age. | [signup form](https://cgi.tilde.town/users/signup) | |
-| [tildespark](https://tildespark.ddns.net) | Tilde Spark is a constantly evolving intentional community devoted to free software, open hardware and meeting new people! | [signup info here](https://tildespark.ddns.net/ikiwiki/tildespark/howtojoin/) | down |
-| [ttylde](https://ttylde.karx.xyz) | ttylde is an experimental tilde running FreeBSD. Currently seeking new members! | [signup form](https://ttylde.karx.xyz/signup.php) | |
-| [unix.lgbt](https://unix.lgbt) | unix.lgbt is an explictly LGBTQ+ friendly public unix/tilde! we offer web, gemini, irc and various other community services. | [signup form](https://unix.lgbt/register.php) | |
-| [wilde.ftp.sh](http://wilde.ftp.sh/) | The world's first (and possibly only) Windows-based tilde! | [signup form](http://wilde.ftp.sh/signup.php) | down |
-| [xhec.one](https://xhec.one) | A brand new ~ running on Arch Linux. Seeking members and suggestions for content :) | [signup instructions](https://xhec.one) 
-| [yourtilde.com](https://yourtilde.com) | If you're looking for a new ~, to learn and play, come check us out. | [signup form](https://yourtilde.com/sign-up) | |
-| [xinu.me](https://xinu.me) | Experimental community for socializing, developing digital skills and collaborating through the system shell. In Spanish, mainly. | [signup instructions](https://xinu.me/inscripcion.html) | |
\ No newline at end of file
+also see the [known tildes](https://tilde.wiki/wiki/Known_tildes) section on tilde.wiki.
+
+| tilde name                                     | description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | where to join                                                                                                                                                                                            | notes |
+|------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------|
+| [breadpunk.club](https://breadpunk.club)       | breadpunk.club is a small tilde focused on bread-making and community-building.  see the [manifesto](https://breadpunk.club/docs/manifesto/) for more information on our mission.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | [signup information here](https://breadpunk.club/join/)                                                                                                                                                  |       |
+| [cosmic.voyage](https://cosmic.voyage)         | cosmic.voyage is an Ubuntu server focused on collaborative sci-fi storytelling. The background story is visible on the homepage. New authors are welcome to join and take on the voice of various ships, outposts, and colonies scattered across the universe, sending text messages back to a relay at Earth's L4 point.                                                                                                                                                                                                                                                                                                                                                                 | [signup information here](https://cosmic.voyage/join.html)                                                                                                                                               |       |
+| [ctrl-c.club](http://ctrl-c.club)              | A place for the curious to poke around and play. SSH access, web pages, games, and programming languages on tap.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | [signup form](http://goo.gl/forms/oviL1wYSrV)                                                                                                                                                            |       |
+| [dimension.sh](https://dimension.sh/)          | dimension.sh is a small public linux shell host (or pubnix system) that is open to anyone who wants to learn, experiment, and socialize with other like minded people.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | [signup form](https://dimension.sh/join.html)                                                                                                                                                            |       |
+| [envs.net](https://envs.net/)                  | envs.net is a minimalist, non-commercial shared unix system and will always be free to use.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | [signup here](https://envs.net/signup)                                                                                                                                                                   |       |
+| [hackers.cool](http://hackers.cool)            | A tilde.club started by some nerd at Hacker School. As such, it's got a lot of Hacker Schoolers on it, but everyone is welcome!                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | [signup form](https://docs.google.com/forms/d/1PHnXadDW1WySCB9frIefjXI3P6bt8n_p4YMyiPPD4O4/viewform)                                                                                                     |       |
+| [nand.club](http://nand.club)                  | a new anti-capitalist, solarpunk tilde                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | [signup info here](http://nand.club)                                                                                                                                                                     | down  |
+| [palvelin.club](http://palvelin.club)          | Finnish language tilde server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | [signup form](https://docs.google.com/forms/d/1tTGiOU0z3M92nCb5Lv3Tv_sJXGLh8kj5Gl79Gx4ZOdM/viewform)                                                                                                     |       |
+| [pebble.ink](http://pebble.ink)                | pebble.ink is a project almost, but not quite, like tilde.club                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | ask [@phildini](https://twitter.com/phildini) or try [this signup form](http://pebble.ink/apply.html)                                                                                                    |       |
+| [protocol.club](http://protocol.club)          | protocol.club explores the fundamental and unique learning opportunities provided by the implementation of standardized protocols. It is a place for curious minds to explore and experiment, to educate and be educated about protocols and implementations old and new alike. While inspired by tilde.club and federated with the rest of the tildeverse via NNTP (et cetera), protocol.club has a stronger focus on its particular mission and has several differences from other tilde boxes, namely: we have a Code of Conduct, and we have some resources available locally to aid development of protocol implementations and new draft protocols. We also serve pages over HTTPS. | [signup form](https://docs.google.com/forms/d/11sJKpZnqaqNVR-rYRfCxKl05iSpjJa85XbigY8xbzBM/viewform?c=0&w=1)                                                                                             | down  |
+| [rawtext.club](https://rawtext.club)           | rawtext.club (RTC) is an experimental public access shell server with a focus on use of collaborative projects for gnu/linux skill building. Projects include simple, command line social tools and utilities, or whatever lightweight programs users are interested in.  RTC does not use IRC, and instead focuses on other slower and more thoughtful forms of user interaction.                                                                                                                                                                                                                                                                                                        | Send email to admin@rawtext.club with your ssh pubkey, desired username, and a statement describing your interest in joining.                                                                            |       |
+| [remotes.club](https://remotes.club)           | Anyone who works remotely is welcome.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | [signup form](https://www.remotes.club/request.php)                                                                                                                                                      |       |
+| [rw.rs](http://rw.rs)                          | An experimental software community with a 199X aesthetic.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | [signup via pull request](https://github.com/adsr/rw.rs/)                                                                                                                                                |       |
+| [salyut.one](https://salyut.one)               | a new, freebsd based tilde ! we don't bite :)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | [signup instructions](https://salyut.one/welcome.html)                                                                                                                                                   |       |
+| [skylab.org](http://skylab.org)                | An open-source community co-operative with ~150 members that has existed since 1997. Based in Portland, Oregon, United States with a userbase across the world, we have quietly existed. Featuring geektalk community chat, a variety of tools and hosting running on FreeBSD.                                                                                                                                                                                                                                                                                                                                                                                                            | Email [skylabstatus@gmail.com](mailto:skylabstatus@gmail.com) with subject line SKYLAB.ORG and an email containing your desired username, full name, public SSH key and an acknowledgement to play nice. |       |
+| [southlondon.cc](https://southlondon.cc)       | a nice debian server hosted in the uk. it's got ssh access, web hosting, an xmpp server that sorta works and some slightly more interesting things coming soon.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | [take a look at this page](https://southlondon.cc/signup)                                                                                                                                                |       |
+| [squiggle.city](http://squiggle.city)          | squiggle.city is a Debian server in the spirit of tilde.club. It's for making web pages and learning about the command line. If you are reading [userland](https://p1k3.com/userland-book/), which is about how to unix, squiggle.city is a place to explore the ideas it contains.                                                                                                                                                                                                                                                                                                                                                                                                       | email [bbearnes@gmail.com](mailto:bbearnes@gmail.com) with your ssh pubkey and a promise to not be a jerk                                                                                                |       |
+| [summit pubnix](https://www.summit.tildex.com) | summit is an intentional and inclusive community for developing, making, learning, teaching, socializing, and enjoying various aspects of GNU/Linux in a free/non-commercial environment. If you need help or have any questions, feel free to ask in #pubnix on irc.tilde.chat.                                                                                                                                                                                                                                                                                                                                                                                                          | [signup form](https://www.summit.tildex.com/join)                                                                                                                                                        |       |
+| [texto-plano.xyz](https://texto-plano.xyz)     | A small UNIX system community in the spirit of [Tilde.club](https://tilde.club), [RTC](https://rawtext.club) and the [small Internet](http://gopher.muffinlabs.com/republic.circumlunar.space/~spring/phlog/2019-01-16__The_Small_Internet.txt) in Spanish language (we use OpenBSD)                                                                                                                                                                                                                                                                                                                                                                                                      | Send your public key and your username to [admin@texto-plano.xyz](mailto:admin@texto-plano.xyz)                                                                                                          |       |
+| [theasylum](https://theasylum.team)            | invite-only tilde catering to programmers of all languages                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | join #theasylum on tilde.chat, and let us get to know you                                                                                                                                                |       |
+| [thunix](https://thunix.net)                   | thunix offers Secure Shell (SSH) accounts, Web Hosting, Email Accounts, and many other things to people free of charge.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | [signup info here](https://www.thunix.net/signup.php)                                                                                                                                                    |       |
+| [tilde.best](https://tilde.best)               | tilde.best is a Debian server which is aiming to have a *best* community and *best* features.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | email [root@tilde.best](mailto:root@tilde.best) with your ssh pubkey, desired username and reason why you want to join                                                                                   | down  |
+| [tilde.cafe](https://tilde.cafe)               | tilde.cafe is a new debian server offering ssh, web hosting, email and more - easy going with plans to host games                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | [signup form](https://tilde.cafe/signup/)                                                                                                                                                                |       |
+| [tilde.cat](https://tilde.cat)                 | This is (or rather might be) public shell server like [the club](https://tilde.club), [the town](https://tilde.town), or other ~ servers.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | [signup form](http://signup.tilde.cat)                                                                                                                                                                   | down  |
+| [tilde.center](https://tilde.center)           | A public unix server focused around decentralization, federation, and home-brewed open source projects.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | [signup form](https://tilde.center/signup.php)                                                                                                                                                           | down  |
+| [tilde.guru](https://tilde.guru)               | A public freebsd server focused around learning, open source and minimalism.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | [signup instructions](https://tilde.guru/signup)                                                                                                                                                         |       |
+| [tilde.fun](https://tilde.fun)                 | This is a Linux machine on the internet where you can get a shell account.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `ssh tilde@tilde.fun`                                                                                                                                                                                    | down  |
+| [tilde.institute](https://tilde.institute)     | Provides a space dedicated to the OpenBSD operating system. Includes a functional BCHS stack for users to experiment with and use to create web applications.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | [signup form](https://tilde.institute/signup)                                                                                                                                                            |       |
+| [tilde.my.to](https://tilde.my.to)             | If you're looking for a great tilde, to learn and play and also maybe break things, come check tilde.my.to out.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | [signup request is via mail](https://tilde.my.to)                                                                                                                                                        |       |
+| [tilde.pink](gopher://tilde.pink)              | A gopher only tilde, providing shell acounts with email and gopher services running on a DragonflyBSD server. The site is accessible via [web proxy](https://proxy.tilde.pink)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | [signup form](gopher://tilde.pink/1/signup.gph)                                                                                                                                                          |       |
+| [tilde.pw](https://tilde.pw)                   | tilde.pw is a unix server with some people on it and that unix server hosts webpages and other things too.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | [signup form](https://tilde.pw/signup.php)                                                                                                                                                               |       |
+| [tilde.town](https://tilde.town)               | tilde.town is an open, welcoming and safe place for the exploration of lo-fi HTML art, hi-fi javascript experiments, generative poetic works, and digital socialization in a post-facebook age.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | [signup form](https://cgi.tilde.town/users/signup)                                                                                                                                                       |       |
+| [tildespark](https://tildespark.ddns.net)      | Tilde Spark is a constantly evolving intentional community devoted to free software, open hardware and meeting new people!                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | [signup info here](https://tildespark.ddns.net/ikiwiki/tildespark/howtojoin/)                                                                                                                            | down  |
+| [ttylde](https://ttylde.karx.xyz)              | ttylde is an experimental tilde running FreeBSD. Currently seeking new members!                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | [signup form](https://ttylde.karx.xyz/signup.php)                                                                                                                                                        |       |
+| [unix.lgbt](https://unix.lgbt)                 | unix.lgbt is an explictly LGBTQ+ friendly public unix/tilde! we offer web, gemini, irc and various other community services.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | [signup form](https://unix.lgbt/register.php)                                                                                                                                                            |       |
+| [wilde.ftp.sh](http://wilde.ftp.sh/)           | The world's first (and possibly only) Windows-based tilde!                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | [signup form](http://wilde.ftp.sh/signup.php)                                                                                                                                                            | down  |
+| [xhec.one](https://xhec.one)                   | A brand new ~ running on Arch Linux. Seeking members and suggestions for content :)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | [signup instructions](https://xhec.one)                                                                                                                                                                  |       |
+| [yourtilde.com](https://yourtilde.com)         | If you're looking for a new ~, to learn and play, come check us out.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | [signup form](https://yourtilde.com/sign-up)                                                                                                                                                             |       |
+| [xinu.me](https://xinu.me)                     | Experimental community for socializing, developing digital skills and collaborating through the system shell. In Spanish, mainly.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | [signup instructions](https://xinu.me/inscripcion.html)                                                                                                                                                  |       |
\ No newline at end of file
diff --git a/wiki/pages/ssh.md b/wiki/pages/ssh.md
index 0d9c3bb..a6137ce 100644
--- a/wiki/pages/ssh.md
+++ b/wiki/pages/ssh.md
@@ -103,7 +103,7 @@ a password any time you used them (impractical) or use something like [ssh-agent
 We don't have documentation for this [(yet)](https://tildegit.org/team/site/src/branch/master/wiki)
 so either go with no password keys, or ask on IRC ([#team](https://web.tilde.chat/?join=team)) for help.
 
-pick your fighter: [[mac](#mac)] | [[windows](#windows)] | [[linux](#linux)]
+pick your fighter: [[mac](#mac)] | [[windows](#windows-10)] | [[linux](#linux)]
 
 ---
 
