diff --git a/articles/.signup.md.swp b/articles/.signup.md.swp
deleted file mode 100644
index da92d1a..0000000
Binary files a/articles/.signup.md.swp and /dev/null differ
diff --git a/articles/signup.md b/articles/signup.md
index 334727a..f6f7af9 100644
--- a/articles/signup.md
+++ b/articles/signup.md
@@ -1,73 +1,17 @@
-# Formtest
+To sign up for an account with thunix, please fill in the form below. Be sure to include a contact name, email address, a desired username, a little blurb about your interest in us and a public SSH key. Once you've filled in the form, click on the send button; the signup form will be processed and you'll receive an email, with instructions on how to log into your new account.
 
-<form method="post" name="myemailform" action="form-to-email.php">
-<p>Enter Name: <input type="text" name="name"></p>
-<p>Enter Email Address:    <input type="text" name="email"></p>
-<p>Enter Message:  <textarea name="message"></textarea></p>
-<input type="submit" value="Send Form">
+If you have any questions or problems, feel free to contact us.
+
+<form action='/includes/email.php'>
+
+Contact Name: <input type='text' name='contact_name'><br>
+Email Address: <input type='text' name='email_address'><br>
+Desired Username: <input type='text' name='username'><br>
+What interests you about thunix: : <input type='textarea' name='interest'><br>
+SSH Public Key: <input type='textarea' name='pubkey'><br>
+<input type='submit'>
 </form>
 
-<script>
-$(function()
-{
-    function after_form_submitted(data)
-    {
-        if(data.result == 'success')
-        {
-            $('form#reused_form').hide();
-            $('#success_message').show();
-            $('#error_message').hide();
-        }
-        else
-        {
-            $('#error_message').append('<ul></ul>');
+If you don't have a public SSH key, don't worry! Check out [this guide to SSH keys](https://tilde.team/wiki/?page=ssh) and make sure that you only fill in your public SSH key here.
 
-            jQuery.each(data.errors,function(key,val)
-            {
-                $('#error_message ul').append('<li>'+key+':'+val+'</li>');
-            });
-            $('#success_message').hide();
-            $('#error_message').show();
-
-            //reverse the response on the button
-            $('button[type="button"]', $form).each(function()
-            {
-                $btn = $(this);
-                label = $btn.prop('orig_label');
-                if(label)
-                {
-                    $btn.prop('type','submit' );
-                    $btn.text(label);
-                    $btn.prop('orig_label','');
-                }
-            });
-
-        }//else
-    }
-
-	$('#reused_form').submit(function(e)
-      {
-        e.preventDefault();
-
-        $form = $(this);
-        //show some response on the button
-        $('button[type="submit"]', $form).each(function()
-        {
-            $btn = $(this);
-            $btn.prop('type','button' );
-            $btn.prop('orig_label',$btn.text());
-            $btn.text('Sending ...');
-        });
-
-
-                    $.ajax({
-                type: "POST",
-                url: 'handler.php',
-                data: $form.serialize(),
-                success: after_form_submitted,
-                dataType: 'json'
-            });
-
-      });
-});
-</script>
+Signing up implies that you agree with our [terms of service](/tos). If you haven't done so, please read it before you sign up.
diff --git a/includes/footer.md b/includes/footer.md
index 0555fa5..05899d3 100644
--- a/includes/footer.md
+++ b/includes/footer.md
@@ -1,9 +1,7 @@
-Unless otherwise noted, all thunix.net materials (besides all user-generated content) is licensed as [CC BY-SA 4.0license](https://creativecommons.org/licenses/by-sa/4.0/). Permissions beyond the scope of this license may be available at [https://www.thunix.net/copyright.php](/copyright.php).
+Unless otherwise noted, all thunix.net materials (besides all user-generated content) is licensed as [CC BY-SA 4.0license](https://creativecommons.org/licenses/by-sa/4.0/). Permissions beyond the scope of this license may be available at [https://www.thunix.net/copyright.php](/copyright).
 
 Users define their own licensing and own all of their content.
 
-Page last updated on 2019-06-23T19:32:58+0000.  You may have to refresh the page to see any changes or updates.
-
-All questions, comments, and concerns about this site should be sent to [the administration team](/contact.php).
+All questions, comments, and concerns about this site should be sent to [the administration team](/contact).
 
 Created with valid [HTML](https://validator.w3.org/check?uri=referer) and [CSS](https://jigsaw.w3.org/css-validator/check/referer) code.
diff --git a/includes/sidebar.md b/includes/sidebar.md
index eb7f92f..ed08eea 100644
--- a/includes/sidebar.md
+++ b/includes/sidebar.md
@@ -5,9 +5,8 @@
     -   [FAQ](/faq)
     -   [Terms of Service](/tos)
     -   [GDPR Statement and Privacy Policy](/gdpr)
-    -   [Contact Us](contact.php)
-    -   [Sign Up](signup.php)
-    -   [Report Abuse](abuse.php)
+    -   [Contact Us](/contact)
+    -   [Sign Up](/signup)
     -   [thunix Mirror Services](https://ftp.thunix.net/)
     -   [Web Server Stats](https://stats.thunix.net/)
     -   [Donations](/donate)