Update wiki/pages/other-tildes.md

removed down from thunix.net
Add tilde.amcforum.wiki to other-tildes.md page
2023-12-27 06:49:53 +00:00 · 2023-09-16 19:22:43 +00:00 · 2023-09-11 12:42:24 +02:00 · 2023-08-15 20:56:19 +00:00 · 2023-07-28 21:17:19 +00:00 · 2023-05-30 22:20:37 +02:00
119 changed files with 10167 additions and 10553 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -22,5 +22,7 @@ steps:
    - name: deploy
      commands:
          - cd /var/www/tilde.team
-          - sudo -Hu www-data git pull origin master
-
+          - sudo -Hu www-data git fetch
+          - sudo -Hu www-data git reset --hard origin/master
+          - sudo -Hu www-data composer install
+          - sudo -Hu www-data make -C css
--- a/.gitignore
+++ b/.gitignore
@ -5,6 +5,5 @@ mg.key
 /vendor/
 tilde.json
 graffiti.txt
-.well-known/
 stats/
 ttbp
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
--- a/.idea/jsonSchemas.xml
+++ b/.idea/jsonSchemas.xml
@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JsonSchemaMappingsProjectConfiguration">
+    <state>
+      <map>
+        <entry key="composer.json">
+          <value>
+            <SchemaInfo>
+              <option name="name" value="composer.json" />
+              <option name="relativePathToSchema" value="https://raw.githubusercontent.com/composer/composer/main/res/composer-schema.json" />
+              <option name="applicationDefined" value="true" />
+              <option name="patterns">
+                <list>
+                  <Item>
+                    <option name="path" value="composer.json" />
+                  </Item>
+                </list>
+              </option>
+            </SchemaInfo>
+          </value>
+        </entry>
+      </map>
+    </state>
+  </component>
+</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/tilde.team.iml" filepath="$PROJECT_DIR$/.idea/tilde.team.iml" />
+    </modules>
+  </component>
+</project>
--- a/.idea/php.xml
+++ b/.idea/php.xml
@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MessDetectorOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCSFixerOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCodeSnifferOptionsConfiguration">
+    <option name="highlightLevel" value="WARNING" />
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PhpIncludePathManager">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/tildeteam/wiki" />
+      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/yaml" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
+      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/mnapoli/front-yaml" />
+      <path value="$PROJECT_DIR$/vendor/dflydev/dot-access-data" />
+      <path value="$PROJECT_DIR$/vendor/league/config" />
+      <path value="$PROJECT_DIR$/vendor/league/commonmark" />
+      <path value="$PROJECT_DIR$/vendor/nette/utils" />
+      <path value="$PROJECT_DIR$/vendor/nette/schema" />
+      <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
+    </include_path>
+  </component>
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.1">
+    <option name="suggestChangeDefaultLanguageLevel" value="false" />
+  </component>
+  <component name="PhpStanOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PhpUnit">
+    <phpunit_settings>
+      <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" />
+    </phpunit_settings>
+  </component>
+  <component name="PsalmOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+</project>
--- a/.idea/runConfigurations/builtin_server.xml
+++ b/.idea/runConfigurations/builtin_server.xml
@ -0,0 +1,5 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="builtin server" type="PhpBuiltInWebServerConfigurationType" factoryName="PHP Built-in Web Server" document_root="$PROJECT_DIR$" port="9000" router_script="$PROJECT_DIR$/localrouter.php" use_router_script="true">
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/watch_css.xml
+++ b/.idea/runConfigurations/watch_css.xml
@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="watch css" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile">
+    <makefile filename="$PROJECT_DIR$/css/Makefile" target="dev" workingDirectory="" arguments="">
+      <envs />
+    </makefile>
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/tilde.team.iml
+++ b/.idea/tilde.team.iml
@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/tildeteam/wiki" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/yaml" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php80" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/deprecation-contracts" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/mnapoli/front-yaml" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/dflydev/dot-access-data" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/league/config" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/league/commonmark" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/nette/utils" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/nette/schema" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/event-dispatcher" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
--- a/.well-known/host-meta
+++ b/.well-known/host-meta
@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8'?>
+<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
+  <Link rel="urn:xmpp:alt-connections:xbosh"
+        href="https://tilde.team:5443/bosh" />
+  <Link rel="urn:xmpp:alt-connections:websocket"
+        href="wss://tilde.team:5443/ws" />
+</XRD>
+
--- a/.well-known/host-meta.json
+++ b/.well-known/host-meta.json
@ -0,0 +1,12 @@
+{
+  "links": [
+    {
+      "rel": "urn:xmpp:alt-connections:xbosh",
+      "href": "https://tilde.team:5443/bosh"
+    },
+    {
+      "rel": "urn:xmpp:alt-connections:websocket",
+      "href": "wss://tilde.team:5443/ws"
+    }
+  ]
+}
--- a/.well-known/openpgpkey/README.md
+++ b/.well-known/openpgpkey/README.md
@ -0,0 +1,26 @@
+# tilde.team WKD
+
+if you have a gpg key for your @tilde.team email, you can publish your pubkey here.
+
+first, clone (and fork if needed) the site repo.
+
+find the wkd hash of your email.
+i'll show the example of my key:
+
+    $ gpg --list-keys --with-wkd ben@tilde.team
+	pub   rsa4096 2018-06-28 [C] [expires: 2023-08-27]
+		  FC2255B7BBC7EABD4EFAFA1068907D8BCCD85A5A
+	uid           [ultimate] Ben Harris <ben@tilde.team>
+				  qpui546ptjbsz3rqaetbdz8wj9op6nur@tilde.team
+	uid           [ultimate] Ben Harris <benharri@hashbang.sh>
+				  dk83ceeke8ohb85nrwo35ed66cgx6so6@hashbang.sh
+	uid           [ unknown] Ben Harris <ben@libera.chat>
+				  qpui546ptjbsz3rqaetbdz8wj9op6nur@libera.chat
+	sub   rsa4096 2018-06-28 [S]
+	sub   rsa4096 2018-06-28 [E]
+	sub   rsa4096 2018-06-28 [A]
+
+    gpg --export ben@tilde.team > ~/.well-known/openpgpkey/hu/qpui546ptjbsz3rqaetbdz8wj9op6nur
+
+commit and send a patch or pull request!
+
--- a/.well-known/openpgpkey/hu/4buhdjdsutx5h78ohniofu49pre6g9qj
+++ b/.well-known/openpgpkey/hu/4buhdjdsutx5h78ohniofu49pre6g9qj
--- a/.well-known/openpgpkey/hu/5nuwcbzo4f41amednpkbbzk8n4i5ekqo
+++ b/.well-known/openpgpkey/hu/5nuwcbzo4f41amednpkbbzk8n4i5ekqo
--- a/.well-known/openpgpkey/hu/7bw7webs8ru53nq7rzypkdjjphjms461
+++ b/.well-known/openpgpkey/hu/7bw7webs8ru53nq7rzypkdjjphjms461
@ -0,0 +1,242 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=ioIA
+-----END PGP PUBLIC KEY BLOCK-----
--- a/.well-known/openpgpkey/hu/9y1ehru1qhec1tzz8s8shyzm1pjo5sq6
+++ b/.well-known/openpgpkey/hu/9y1ehru1qhec1tzz8s8shyzm1pjo5sq6
--- a/.well-known/openpgpkey/hu/dkmx1o5s19zwge5apby1477tmge3cu5q
+++ b/.well-known/openpgpkey/hu/dkmx1o5s19zwge5apby1477tmge3cu5q
--- a/.well-known/openpgpkey/hu/dn4krf8j6wiyzyf7tzhgrz55gt7x1xbk
+++ b/.well-known/openpgpkey/hu/dn4krf8j6wiyzyf7tzhgrz55gt7x1xbk
--- a/.well-known/openpgpkey/hu/fngb3r9o9zi5bkg8ry5wimuwf4o478n6
+++ b/.well-known/openpgpkey/hu/fngb3r9o9zi5bkg8ry5wimuwf4o478n6
--- a/.well-known/openpgpkey/hu/nkex9r86hwayh57rmtriuu5met9n34q3
+++ b/.well-known/openpgpkey/hu/nkex9r86hwayh57rmtriuu5met9n34q3
--- a/.well-known/openpgpkey/hu/qehuiqw8bfoxkfq7ekgbi1h3thewb5od
+++ b/.well-known/openpgpkey/hu/qehuiqw8bfoxkfq7ekgbi1h3thewb5od
--- a/.well-known/openpgpkey/hu/qpui546ptjbsz3rqaetbdz8wj9op6nur
+++ b/.well-known/openpgpkey/hu/qpui546ptjbsz3rqaetbdz8wj9op6nur
--- a/.well-known/openpgpkey/hu/qqb7bgagu5kiicrffmyw9s3ausg6bcoi
+++ b/.well-known/openpgpkey/hu/qqb7bgagu5kiicrffmyw9s3ausg6bcoi
--- a/.well-known/openpgpkey/hu/tdwikz19u1aiux1afao46kgwbcfarx63
+++ b/.well-known/openpgpkey/hu/tdwikz19u1aiux1afao46kgwbcfarx63
--- a/.well-known/openpgpkey/policy
+++ b/.well-known/openpgpkey/policy
--- a/.well-known/webfinger/README.md
+++ b/.well-known/webfinger/README.md
@ -0,0 +1,13 @@
+# webfinger
+
+to add your own, run the `webfinger` tool at your shell.
+
+it will prompt you for your fedi handle and save the correct json to `~/.webfinger.json`.
+
+you can do this manually by grabbing the webfinger from your fedi host.
+
+as an example, to get the webfinger response for `@ben@tilde.zone`
+
+    curl 'https://tilde.zone/.well-known/webfinger?resource=acct:ben@tilde.zone' > ~/.webfinger.json
+
+see [webfinger.net](https://webfinger.net) for more info and a simple tester for your setup.
--- a/.well-known/webfinger/index.php
+++ b/.well-known/webfinger/index.php
@ -0,0 +1,30 @@
+<?php
+
+$trims = [
+    "acct:",
+    "@tilde.team",
+    "@fuckup.club",
+    "@nand.sh",
+    "@ttm.sh",
+    "@tild3.org",
+    "@tilde.chat",
+    "@tilde.news",
+    "@tilde.site",
+    "@tildeteam.net",
+    "@tildeteam.org",
+    "@tildeverse.net",
+    "@tildeverse.org",
+];
+
+$user = str_replace($trims, "", $_GET["resource"]);
+$webfinger_file = "/home/$user/.webfinger.json";
+
+if (file_exists($webfinger_file))
+{
+    header("Content-type: application/jrd+json");
+    echo file_get_contents($webfinger_file);
+}
+else
+    header("Status: 404");
+
+die();
--- a/LICENSE.md
+++ b/LICENSE.md
@ -0,0 +1,675 @@
+### GNU GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+<https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+### Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users. We, the Free Software Foundation, use
+the GNU General Public License for most of our software; it applies
+also to any other work released this way by its authors. You can apply
+it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so. This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software. The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products. If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary. To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+### TERMS AND CONDITIONS
+
+#### 0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+#### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+#### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+#### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+#### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+-   a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+-   b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7. This requirement modifies the requirement in section 4
+    to "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy. This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged. This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+-   d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+#### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+-   a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+-   b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the Corresponding
+    Source from a network server at no charge.
+-   c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+-   d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+-   e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the general
+    public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+#### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
+
+-   a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+-   b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+-   c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+-   d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+-   f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the recipient,
+    for any liability that these contractual assumptions directly
+    impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+#### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+#### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+#### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+#### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+#### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+#### 13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+#### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU General Public
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of the GNU General Public
+License, you may choose any version ever published by the Free
+Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+#### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+#### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+#### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+### How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+        <one line to give the program's name and a brief idea of what it does.>
+        Copyright (C) <year>  <name of author>
+
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation, either version 3 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+        <program>  Copyright (C) <year>  <name of author>
+        This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+        This is free software, and you are welcome to redistribute it
+        under certain conditions; type `show c' for details.
+
+The hypothetical commands \`show w' and \`show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".
+
+You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU GPL, see <https://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your
+program into proprietary programs. If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+GNU Lesser General Public License instead of this License. But first,
+please read <https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/README.md
+++ b/README.md
@ -25,22 +25,22 @@ see also [css/](css/) for info on the theme and working with that.

 1. clone this repo

-1. install deps (markdown parser)
+2. install deps (markdown parser)
 ```bash
 composer install
 ```

-1. start a php development server
+3. start a php development server
 ```bash
-php -S localhost:9000
+php -S localhost:9000 localrouter.php
 ```

-1. create a feature branch
+4. create a feature branch
 ```bash
 git checkout -b my-cool-feature
 ```

-1. [open a PR](https://tildegit.org/team/site/pulls)
+5. [open a PR](https://tildegit.org/team/site/pulls)

 thanks!

--- a/composer.json
+++ b/composer.json
@ -1,11 +1,13 @@
 {
    "require": {
-        "tildeverse/wiki": "dev-master"
-    },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://tildegit.org/team/tildewiki"
-        }
-    ]
+        "tildeteam/wiki": "^2.0",
+        "mibe/feedwriter": "^1.1",
+        "ext-openssl": "*",
+        "ext-json": "*",
+        "ext-shmop": "*",
+        "ext-sockets": "*",
+        "ext-posix": "*",
+        "ext-mbstring": "*",
+        "ext-ctype": "*"
+    }
 }
--- a/composer.lock
+++ b/composer.lock
@ -4,123 +4,393 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "a88f8d05a0f0cb5d15c4597d5616f036",
+    "content-hash": "932fa6699aef88e3be5f372d748d856d",
    "packages": [
        {
-            "name": "erusev/parsedown",
-            "version": "1.7.4",
+            "name": "dflydev/dot-access-data",
+            "version": "v3.0.2",
            "source": {
                "type": "git",
-                "url": "https://github.com/erusev/parsedown.git",
-                "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3"
+                "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
+                "reference": "f41715465d65213d644d3141a6a93081be5d3549"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
-                "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3",
+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549",
+                "reference": "f41715465d65213d644d3141a6a93081be5d3549",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.42",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.3",
+                "scrutinizer/ocular": "1.6.0",
+                "squizlabs/php_codesniffer": "^3.5",
+                "vimeo/psalm": "^4.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dflydev\\DotAccessData\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Dragonfly Development Inc.",
+                    "email": "info@dflydev.com",
+                    "homepage": "http://dflydev.com"
+                },
+                {
+                    "name": "Beau Simensen",
+                    "email": "beau@dflydev.com",
+                    "homepage": "http://beausimensen.com"
+                },
+                {
+                    "name": "Carlos Frutos",
+                    "email": "carlos@kiwing.it",
+                    "homepage": "https://github.com/cfrutos"
+                },
+                {
+                    "name": "Colin O'Dell",
+                    "email": "colinodell@gmail.com",
+                    "homepage": "https://www.colinodell.com"
+                }
+            ],
+            "description": "Given a deep data structure, access data by dot notation.",
+            "homepage": "https://github.com/dflydev/dflydev-dot-access-data",
+            "keywords": [
+                "access",
+                "data",
+                "dot",
+                "notation"
+            ],
+            "support": {
+                "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues",
+                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2"
+            },
+            "time": "2022-10-27T11:44:00+00:00"
+        },
+        {
+            "name": "league/commonmark",
+            "version": "2.3.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/commonmark.git",
+                "reference": "c1e114f74e518daca2729ea8c4bf1167038fa4b5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c1e114f74e518daca2729ea8c4bf1167038fa4b5",
+                "reference": "c1e114f74e518daca2729ea8c4bf1167038fa4b5",
                "shasum": ""
            },
            "require": {
                "ext-mbstring": "*",
-                "php": ">=5.3.0"
+                "league/config": "^1.1.1",
+                "php": "^7.4 || ^8.0",
+                "psr/event-dispatcher": "^1.0",
+                "symfony/deprecation-contracts": "^2.1 || ^3.0",
+                "symfony/polyfill-php80": "^1.16"
            },
            "require-dev": {
-                "phpunit/phpunit": "^4.8.35"
+                "cebe/markdown": "^1.0",
+                "commonmark/cmark": "0.30.0",
+                "commonmark/commonmark.js": "0.30.0",
+                "composer/package-versions-deprecated": "^1.8",
+                "embed/embed": "^4.4",
+                "erusev/parsedown": "^1.0",
+                "ext-json": "*",
+                "github/gfm": "0.29.0",
+                "michelf/php-markdown": "^1.4 || ^2.0",
+                "nyholm/psr7": "^1.5",
+                "phpstan/phpstan": "^1.8.2",
+                "phpunit/phpunit": "^9.5.21",
+                "scrutinizer/ocular": "^1.8.1",
+                "symfony/finder": "^5.3 | ^6.0",
+                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0",
+                "unleashedtech/php-coding-standard": "^3.1.1",
+                "vimeo/psalm": "^4.24.0 || ^5.0.0"
+            },
+            "suggest": {
+                "symfony/yaml": "v2.3+ required if using the Front Matter extension"
            },
            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.4-dev"
+                }
+            },
            "autoload": {
-                "psr-0": {
-                    "Parsedown": ""
+                "psr-4": {
+                    "League\\CommonMark\\": "src"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
-                "MIT"
+                "BSD-3-Clause"
            ],
            "authors": [
                {
-                    "name": "Emanuil Rusev",
-                    "email": "hello@erusev.com",
-                    "homepage": "http://erusev.com"
+                    "name": "Colin O'Dell",
+                    "email": "colinodell@gmail.com",
+                    "homepage": "https://www.colinodell.com",
+                    "role": "Lead Developer"
                }
            ],
-            "description": "Parser for Markdown.",
-            "homepage": "http://parsedown.org",
+            "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and GitHub-Flavored Markdown (GFM)",
+            "homepage": "https://commonmark.thephpleague.com",
            "keywords": [
+                "commonmark",
+                "flavored",
+                "gfm",
+                "github",
+                "github-flavored",
                "markdown",
+                "md",
                "parser"
            ],
-            "time": "2019-12-30T22:54:17+00:00"
+            "support": {
+                "docs": "https://commonmark.thephpleague.com/",
+                "forum": "https://github.com/thephpleague/commonmark/discussions",
+                "issues": "https://github.com/thephpleague/commonmark/issues",
+                "rss": "https://github.com/thephpleague/commonmark/releases.atom",
+                "source": "https://github.com/thephpleague/commonmark"
+            },
+            "funding": [
+                {
+                    "url": "https://www.colinodell.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.paypal.me/colinpodell/10.00",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/colinodell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/league/commonmark",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-02-15T14:07:24+00:00"
        },
        {
-            "name": "erusev/parsedown-extra",
-            "version": "0.8.1",
+            "name": "league/config",
+            "version": "v1.2.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/erusev/parsedown-extra.git",
-                "reference": "91ac3ff98f0cea243bdccc688df43810f044dcef"
+                "url": "https://github.com/thephpleague/config.git",
+                "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/91ac3ff98f0cea243bdccc688df43810f044dcef",
-                "reference": "91ac3ff98f0cea243bdccc688df43810f044dcef",
+                "url": "https://api.github.com/repos/thephpleague/config/zipball/754b3604fb2984c71f4af4a9cbe7b57f346ec1f3",
+                "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3",
                "shasum": ""
            },
            "require": {
-                "erusev/parsedown": "^1.7.4"
+                "dflydev/dot-access-data": "^3.0.1",
+                "nette/schema": "^1.2",
+                "php": "^7.4 || ^8.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^4.8.35"
+                "phpstan/phpstan": "^1.8.2",
+                "phpunit/phpunit": "^9.5.5",
+                "scrutinizer/ocular": "^1.8.1",
+                "unleashedtech/php-coding-standard": "^3.1",
+                "vimeo/psalm": "^4.7.3"
            },
            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.2-dev"
+                }
+            },
            "autoload": {
-                "psr-0": {
-                    "ParsedownExtra": ""
+                "psr-4": {
+                    "League\\Config\\": "src"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
-                "MIT"
+                "BSD-3-Clause"
            ],
            "authors": [
                {
-                    "name": "Emanuil Rusev",
-                    "email": "hello@erusev.com",
-                    "homepage": "http://erusev.com"
+                    "name": "Colin O'Dell",
+                    "email": "colinodell@gmail.com",
+                    "homepage": "https://www.colinodell.com",
+                    "role": "Lead Developer"
                }
            ],
-            "description": "An extension of Parsedown that adds support for Markdown Extra.",
-            "homepage": "https://github.com/erusev/parsedown-extra",
+            "description": "Define configuration arrays with strict schemas and access values with dot notation",
+            "homepage": "https://config.thephpleague.com",
            "keywords": [
-                "markdown",
-                "markdown extra",
-                "parsedown",
-                "parser"
+                "array",
+                "config",
+                "configuration",
+                "dot",
+                "dot-access",
+                "nested",
+                "schema"
            ],
-            "time": "2019-12-30T23:20:37+00:00"
+            "support": {
+                "docs": "https://config.thephpleague.com/",
+                "issues": "https://github.com/thephpleague/config/issues",
+                "rss": "https://github.com/thephpleague/config/releases.atom",
+                "source": "https://github.com/thephpleague/config"
+            },
+            "funding": [
+                {
+                    "url": "https://www.colinodell.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.paypal.me/colinpodell/10.00",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/colinodell",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-12-11T20:36:23+00:00"
+        },
+        {
+            "name": "mibe/feedwriter",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mibe/FeedWriter.git",
+                "reference": "f4cc748ad8700e36663f08cfeebe7fd39b00eea2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mibe/FeedWriter/zipball/f4cc748ad8700e36663f08cfeebe7fd39b00eea2",
+                "reference": "f4cc748ad8700e36663f08cfeebe7fd39b00eea2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "FeedWriter\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bemmerl",
+                    "email": "mail@mx-server.de"
+                },
+                {
+                    "name": "Phil Freo"
+                },
+                {
+                    "name": "Paul Ferrett"
+                },
+                {
+                    "name": "Brennen Bearnes"
+                },
+                {
+                    "name": "Michael Robinson",
+                    "email": "mike@pagesofinterest.net"
+                },
+                {
+                    "name": "Baptiste Fontaine"
+                },
+                {
+                    "name": "Kristián Valentín"
+                },
+                {
+                    "name": "Brandtley McMinn"
+                },
+                {
+                    "name": "Julian Bogdani"
+                },
+                {
+                    "name": "Anis Uddin Ahmad",
+                    "email": "anis.programmer@gmail.com"
+                },
+                {
+                    "name": "Cedric Gampert"
+                },
+                {
+                    "name": "Yamek"
+                },
+                {
+                    "name": "thielj"
+                },
+                {
+                    "name": "Pavel Khakhlou"
+                },
+                {
+                    "name": "Daniel"
+                },
+                {
+                    "name": "Tino Goratsch"
+                }
+            ],
+            "description": "Generate feeds in either RSS 1.0, RSS 2.0 or ATOM formats",
+            "homepage": "https://github.com/mibe/FeedWriter",
+            "keywords": [
+                "RSS 1.0",
+                "atom",
+                "feed",
+                "rss",
+                "rss 2.0",
+                "rss2"
+            ],
+            "support": {
+                "issues": "https://github.com/mibe/FeedWriter/issues",
+                "source": "https://github.com/mibe/FeedWriter/tree/master"
+            },
+            "time": "2016-11-19T20:47:44+00:00"
        },
        {
            "name": "mnapoli/front-yaml",
-            "version": "1.7.0",
+            "version": "2.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/mnapoli/FrontYAML.git",
-                "reference": "7602e0ffe84ca07b68865960d255d3ae9502e5d4"
+                "reference": "58d2c735db395000eb9c181acdc7fb9a901e4a1a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/mnapoli/FrontYAML/zipball/7602e0ffe84ca07b68865960d255d3ae9502e5d4",
-                "reference": "7602e0ffe84ca07b68865960d255d3ae9502e5d4",
+                "url": "https://api.github.com/repos/mnapoli/FrontYAML/zipball/58d2c735db395000eb9c181acdc7fb9a901e4a1a",
+                "reference": "58d2c735db395000eb9c181acdc7fb9a901e4a1a",
                "shasum": ""
            },
            "require": {
-                "erusev/parsedown": "~1.0",
-                "php": "^7.2",
-                "symfony/yaml": "~2.1|^3.0|^4.0|^5.0"
+                "league/commonmark": "^2.0",
+                "php": "^7.4|^8.0",
+                "symfony/yaml": "^4.0|^5.0|^6.0"
            },
            "require-dev": {
-                "league/commonmark": "~1.4",
-                "phpunit/phpunit": "~8.5"
+                "phpunit/phpunit": "^9.0"
            },
            "type": "library",
            "autoload": {
@ -132,29 +402,231 @@
            "license": [
                "MIT"
            ],
-            "time": "2020-05-21T08:30:56+00:00"
+            "support": {
+                "source": "https://github.com/mnapoli/FrontYAML/tree/2.0.2"
+            },
+            "time": "2021-12-19T17:35:56+00:00"
        },
        {
-            "name": "symfony/deprecation-contracts",
-            "version": "v2.2.0",
+            "name": "nette/schema",
+            "version": "v1.2.3",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665"
+                "url": "https://github.com/nette/schema.git",
+                "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665",
-                "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665",
+                "url": "https://api.github.com/repos/nette/schema/zipball/abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
+                "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.1"
+                "nette/utils": "^2.5.7 || ^3.1.5 ||  ^4.0",
+                "php": ">=7.1 <8.3"
+            },
+            "require-dev": {
+                "nette/tester": "^2.3 || ^2.4",
+                "phpstan/phpstan-nette": "^1.0",
+                "tracy/tracy": "^2.7"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "2.2-dev"
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0-only",
+                "GPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "📐 Nette Schema: validating data structures against a given Schema.",
+            "homepage": "https://nette.org",
+            "keywords": [
+                "config",
+                "nette"
+            ],
+            "support": {
+                "issues": "https://github.com/nette/schema/issues",
+                "source": "https://github.com/nette/schema/tree/v1.2.3"
+            },
+            "time": "2022-10-13T01:24:26+00:00"
+        },
+        {
+            "name": "nette/utils",
+            "version": "v4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/utils.git",
+                "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/utils/zipball/cacdbf5a91a657ede665c541eda28941d4b09c1e",
+                "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0 <8.3"
+            },
+            "conflict": {
+                "nette/finder": "<3",
+                "nette/schema": "<1.2.2"
+            },
+            "require-dev": {
+                "jetbrains/phpstorm-attributes": "dev-master",
+                "nette/tester": "^2.4",
+                "phpstan/phpstan": "^1.0",
+                "tracy/tracy": "^2.9"
+            },
+            "suggest": {
+                "ext-gd": "to use Image",
+                "ext-iconv": "to use Strings::webalize(), toAscii(), chr() and reverse()",
+                "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()",
+                "ext-json": "to use Nette\\Utils\\Json",
+                "ext-mbstring": "to use Strings::lower() etc...",
+                "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()",
+                "ext-xml": "to use Strings::length() etc. when mbstring is not available"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0-only",
+                "GPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "🛠  Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.",
+            "homepage": "https://nette.org",
+            "keywords": [
+                "array",
+                "core",
+                "datetime",
+                "images",
+                "json",
+                "nette",
+                "paginator",
+                "password",
+                "slugify",
+                "string",
+                "unicode",
+                "utf-8",
+                "utility",
+                "validation"
+            ],
+            "support": {
+                "issues": "https://github.com/nette/utils/issues",
+                "source": "https://github.com/nette/utils/tree/v4.0.0"
+            },
+            "time": "2023-02-02T10:41:53+00:00"
+        },
+        {
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\EventDispatcher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
+            "time": "2019-01-08T18:20:26+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v3.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3",
+                "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.3-dev"
                },
                "thanks": {
                    "name": "symfony/contracts",
@ -182,6 +654,9 @@
            ],
            "description": "A generic function and convention to trigger deprecation notices",
            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0"
+            },
            "funding": [
                {
                    "url": "https://symfony.com/sponsor",
@ -196,32 +671,35 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2020-09-07T11:33:47+00:00"
+            "time": "2022-11-25T10:21:52+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.20.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41"
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41",
-                "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
                "shasum": ""
            },
            "require": {
                "php": ">=7.1"
            },
+            "provide": {
+                "ext-ctype": "*"
+            },
            "suggest": {
                "ext-ctype": "For best performance"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.20-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -229,12 +707,12 @@
                }
            },
            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                "files": [
                    "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
@ -258,6 +736,9 @@
                "polyfill",
                "portable"
            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
+            },
            "funding": [
                {
                    "url": "https://symfony.com/sponsor",
@ -272,32 +753,114 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2020-10-23T14:02:19+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
-            "name": "symfony/yaml",
-            "version": "v5.1.7",
+            "name": "symfony/polyfill-php80",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "e147a68cb66a8b510f4b7481fe4da5b2ab65ec6a"
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/e147a68cb66a8b510f4b7481fe4da5b2ab65ec6a",
-                "reference": "e147a68cb66a8b510f4b7481fe4da5b2ab65ec6a",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
                "shasum": ""
            },
            "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1",
-                "symfony/polyfill-ctype": "~1.8"
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.27-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-11-03T14:55:06+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v6.2.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "2bbfbdacc8a15574f8440c4838ce0d7bb6c86b19"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/2bbfbdacc8a15574f8440c4838ce0d7bb6c86b19",
+                "reference": "2bbfbdacc8a15574f8440c4838ce0d7bb6c86b19",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/polyfill-ctype": "^1.8"
            },
            "conflict": {
-                "symfony/console": "<4.4"
+                "symfony/console": "<5.4"
            },
            "require-dev": {
-                "symfony/console": "^4.4|^5.0"
+                "symfony/console": "^5.4|^6.0"
            },
            "suggest": {
                "symfony/console": "For validating YAML files using the lint command"
@ -306,11 +869,6 @@
                "Resources/bin/yaml-lint"
            ],
            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.1-dev"
-                }
-            },
            "autoload": {
                "psr-4": {
                    "Symfony\\Component\\Yaml\\": ""
@ -333,8 +891,11 @@
                    "homepage": "https://symfony.com/contributors"
                }
            ],
-            "description": "Symfony Yaml Component",
+            "description": "Loads and dumps YAML files",
            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/yaml/tree/v6.2.5"
+            },
            "funding": [
                {
                    "url": "https://symfony.com/sponsor",
@ -349,48 +910,65 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2020-09-27T03:44:28+00:00"
+            "time": "2023-01-10T18:53:53+00:00"
        },
        {
-            "name": "tildeverse/wiki",
-            "version": "dev-master",
+            "name": "tildeteam/wiki",
+            "version": "2.0.8",
            "source": {
                "type": "git",
                "url": "https://tildegit.org/team/tildewiki",
-                "reference": "413c46fc21d1cd02d0dd1f8a1ea6ca3b58f36c8c"
+                "reference": "dcbb9740225768c74cfd0002a150549cd6df4bc4"
            },
            "require": {
-                "erusev/parsedown-extra": "^0.8.1",
-                "mnapoli/front-yaml": "^1.7.0"
+                "mnapoli/front-yaml": "^2.0.0",
+                "php": "^7.4|^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
            },
            "type": "library",
            "autoload": {
                "psr-4": {
-                    "Tildeverse\\Wiki\\": "src/"
+                    "tildeteam\\": "src/"
                }
            },
+            "notification-url": "https://packagist.org/downloads/",
            "license": [
-                "GPLv3"
+                "GPL-3.0-or-later"
            ],
            "authors": [
                {
                    "name": "Ben Harris",
-                    "email": "ben@tilde.team"
+                    "email": "ben@tilde.team",
+                    "homepage": "https://tilde.team/~ben/",
+                    "role": "Developer"
                }
            ],
-            "description": "parsedown extensions for tilde wikis",
-            "time": "2020-10-27T18:43:33+00:00"
+            "description": "unified extensions for tilde wikis",
+            "homepage": "https://tildegit.org/team/tildewiki",
+            "keywords": [
+                "markdown",
+                "wiki"
+            ],
+            "time": "2022-02-16T18:31:48+00:00"
        }
    ],
    "packages-dev": [],
    "aliases": [],
    "minimum-stability": "stable",
-    "stability-flags": {
-        "tildeverse/wiki": 20
-    },
+    "stability-flags": [],
    "prefer-stable": false,
    "prefer-lowest": false,
-    "platform": [],
+    "platform": {
+        "ext-openssl": "*",
+        "ext-json": "*",
+        "ext-shmop": "*",
+        "ext-sockets": "*",
+        "ext-posix": "*",
+        "ext-mbstring": "*",
+        "ext-ctype": "*"
+    },
    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.2.0"
 }
--- a/css/.gitignore
+++ b/css/.gitignore
@ -0,0 +1,2 @@
+hacker.css
+dracula.css
--- a/css/Makefile
+++ b/css/Makefile
@ -3,26 +3,25 @@ lightserver := node_modules/.bin/light-server

 NPM != command -v npm 2> /dev/null

-.PHONY: build dev clean
+.PHONY: dev clean

-# First target is default
 build: hacker.css dracula.css

 dev: build
 	$(lightserver) -s . -p 9000 -w "index.html, **/*.less \# make" -o

-%.css: node_modules less/%/*.less less/plex.css
-	$(info building $@)
+%.css: node_modules less/*.less
+	$(info building $@:)
 	$(lessc) less/$*.less $*.css --clean-css="--s1 --advanced --compatibility=ie8"

 node_modules: package.json package-lock.json Makefile
 ifndef NPM
 	$(error Missing dependency 'npm'. Please install and try again.)
 endif
-	npm install
+	$(NPM) install
 	touch node_modules # fixes watch bug if you manually ran npm install

 clean:
 	rm -rf node_modules
-	rm dracula.css 
+	rm dracula.css
 	rm hacker.css
--- a/css/dracula.css
+++ b/css/dracula.css
--- a/css/dracula.html
+++ b/css/dracula.html
@ -1,12 +1,12 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">

 <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1">

-    <title>tilde theme</title>
+    <title>tilde dracula theme</title>
    <link href="dracula.css" rel="stylesheet">

    <style>
@ -69,6 +69,7 @@
                    <li>
                        <a href="//reddit.com/r/itsaunixsystem" target="_blank">H4x0rs Only</a>
                    </li>
+                    <li><a href="/">&lt;- back</a></li>
                </ul>
            </div>
        </div>
@ -352,13 +353,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 +413,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,15 +801,7 @@ 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>
-
-    <!-- Github stars script -->
-    <script>jQuery(document).ready(function ($) {
-        $.getJSON("https://tildegit.org/api/v1/repos/team/site", function (data) {
-            $("#stars").text(data['stars_count'] + " stars");
-        });
-    });</script>
-
+    <script src="/js/jquery.min.js"></script>
+    <script src="/js/bootstrap.min.js"></script>
 </body>
 </html>
--- a/css/fork-awesome.min.css
+++ b/css/fork-awesome.min.css
--- a/css/hacker.css
+++ b/css/hacker.css
--- a/css/index.html
+++ b/css/index.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">

 <head>
    <meta charset="utf-8">
@ -69,6 +69,7 @@
                    <li>
                        <a href="//reddit.com/r/itsaunixsystem" target="_blank">H4x0rs Only</a>
                    </li>
+                    <li><a href="/">&lt;- back</a></li>
                </ul>
            </div>
        </div>
@ -352,13 +353,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 +413,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,15 +801,7 @@ 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>
-
-    <!-- Github stars script -->
-    <script>jQuery(document).ready(function ($) {
-        $.getJSON("https://tildegit.org/api/v1/repos/team/site", function (data) {
-            $("#stars").text(data['stars_count'] + " stars");
-        });
-    });</script>
-
+    <script src="/js/jquery.min.js"></script>
+    <script src="/js/bootstrap.min.js"></script>
 </body>
 </html>
--- a/css/less/hacker/_theme.less
+++ b/css/less/hacker/_theme.less
@ -1,12 +1,13 @@
 /*!
 * Bootstrap v3.3.7 (http://getbootstrap.com)
 * Copyright 2011-2016 Twitter, Inc.
+ * Copyright 2022 DJ Chase
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * Forked by mio for tilde.team
 */

 select {
-  background-color: darken(@btn-default-bg,5%);
+  background-color: darken(@btn-default-bg, 5%);
  border-color: @btn-default-border;
  padding: 5px;
 }
@ -30,12 +31,29 @@ a {
  text-decoration: underline;
 }

-.btn-default { .btn-styles(@btn-default-bg); }
-.btn-primary { .btn-styles(@btn-primary-bg); }
-.btn-success { .btn-styles(@btn-success-bg); }
-.btn-info    { .btn-styles(@btn-info-bg); }
-.btn-warning { .btn-styles(@btn-warning-bg); }
-.btn-danger  { .btn-styles(@btn-danger-bg); }
+.btn-default {
+  .btn-styles(@btn-default-bg);
+}
+
+.btn-primary {
+  .btn-styles(@btn-primary-bg);
+}
+
+.btn-success {
+  .btn-styles(@btn-success-bg);
+}
+
+.btn-info {
+  .btn-styles(@btn-info-bg);
+}
+
+.btn-warning {
+  .btn-styles(@btn-warning-bg);
+}
+
+.btn-danger {
+  .btn-styles(@btn-danger-bg);
+}


 // Forms
@ -162,15 +180,28 @@ tr.active {
  }
 }

-.alert-success .close { .close-styles(@brand-success); }
-.alert-info .close    { .close-styles(@brand-info); }
-.alert-warning .close { .close-styles(@brand-warning); }
-.alert-danger .close  { .close-styles(@brand-danger); }
+.alert-success .close {
+  .close-styles(@brand-success);
+}
+
+.alert-info .close {
+  .close-styles(@brand-info);
+}
+
+.alert-warning .close {
+  .close-styles(@brand-warning);
+}
+
+.alert-danger .close {
+  .close-styles(@brand-danger);
+}


 // Modals
 // Apply close button mixin
-.modal-header .close { .close-styles(@close-color); }
+.modal-header .close {
+  .close-styles(@close-color);
+}


 // List groups
@ -186,6 +217,7 @@ tr.active {
      border: 1px solid #222;
    }
  }
+
  p {
    word-wrap: break-word;
    overflow-wrap: break-word;
@ -196,15 +228,36 @@ tr.active {
  background: @hacker-primary-lighter;
  color: @hacker-bg
 }
+
 *::selection {
  background: @hacker-primary-lighter;
  color: @hacker-bg
 }
+
 ::-moz-selection {
  background: @hacker-primary-lighter;
  color: @hacker-bg
 }
+
 *::-moz-selection {
  background: @hacker-primary-lighter;
  color: @hacker-bg
 }
+
+ul.table-of-contents {
+  margin-bottom: 22px;
+  padding-bottom: 22px;
+  border-bottom: 1px solid @hacker-box-border;
+}
+
+// Headings
+h1, h2 {
+  font-weight: bold;
+}
+
+// Space between paragraphs
+p {
+  &:not(:last-child) {
+    margin-bottom: @line-height-with-unit;
+  }
+}
--- a/css/less/dracula.less
+++ b/css/less/dracula.less
@ -1,9 +1,50 @@
 // import bootstrap base
@import "../node_modules/bootstrap/less/bootstrap.less";
-@import (inline) "plex.css";

 // import custom variables
-@import "dracula/_variables.less";
+@import "variables.less";
+
+// dracula colors by SinaCutie
+@hacker-primary-darker: darken(@hacker-primary, 20%); /* Primary 1 */
+@hacker-primary-dark: darken(@hacker-primary, 10%); /* Primary 2 */
+@hacker-primary: #F8F8F2; /* Main primary */
+@hacker-primary-light: lighten(@hacker-primary, 10%); /* Primary 3 */
+@hacker-primary-lighter: lighten(@hacker-primary, 20%); /* Primary 3 */
+
+@hacker: @hacker-primary-lighter; /* Body text */
+@hacker-bg: #282A36; /* Body bg */
+@hacker-box-bg: lighten(@hacker-bg, 10%); /* Container elem bg */
+@hacker-box-border: lighten(@hacker-bg, 20%); /* Container border */
+
+@brand-primary: @hacker-primary;
+@brand-success: #50FA7B;
+@brand-warning: #F1FA8C;
+@brand-danger: #FF5555;
+@brand-info: #8BE9FD;
+
+@comment: #6272A4;
+
+@link-color: #BD93F9;
+@pre-color: @hacker-primary;
+
+@btn-default-color: @hacker-primary-lighter;
+@btn-default-bg: @comment;
+@btn-default-border: @hacker-box-border;
+@btn-primary-bg: @hacker-primary-light;
+
+@table-bg-active: @comment;
+@panel-bg: @hacker-bg;
+@panel-inner-border: @hacker-box-bg;
+@panel-footer-bg: @hacker-box-bg;
+@panel-default-heading-bg: lighten(@hacker-bg, 10%);
+@panel-primary-text: @hacker-primary;
+@panel-primary-border: @hacker-box-bg;
+@panel-primary-heading-bg: @hacker-box-bg;
+
+@list-group-active-bg: @comment;
+@progress-bar-color: lighten(@hacker-primary-lighter, 10%);
+@progress-bar-bg: #FFB86C;
+

 // import custom theme changes
-@import "hacker/_theme.less";
+@import "_theme.less";
--- a/css/less/dracula/_variables.less
+++ b/css/less/dracula/_variables.less
@ -1,366 +0,0 @@
-/*
-A Bootstrap theme for 31337 H4X0RS
-by Tobin Brown, 2015
-forked by benharri for tilde.team
-dracula colors for tilde.team by SinaCutie
-Palette URL: http://paletton.com/#uid=12U0u0knnfti5bkladVnSlVo6tw
-*/
-
-
-// Hacker Colors
-@hacker-primary-darker:  darken(@hacker-primary, 20%);        /* Primary 1 */
-@hacker-primary-dark:    darken(@hacker-primary, 10%);        /* Primary 2 */
-@hacker-primary:         #F8F8F2;        /* Main primary */
-@hacker-primary-light:   lighten(@hacker-primary, 10%);        /* Primary 3 */
-@hacker-primary-lighter: lighten(@hacker-primary, 20%);        /* Primary 3 */
-
-@hacker:                 @hacker-primary-lighter;       /* Body text */
-@hacker-bg:              #282A36;                     /* Body bg */
-@hacker-box-bg:          lighten(@hacker-bg, 10%);    /* Container elem bg */
-@hacker-box-border:      lighten(@hacker-bg, 20%);    /* Container border */
-
-
-// Bootstrap Colors
-@gray-darker:           #181417;
-@gray-dark:             #453c44;
-@gray:                  #675b65;
-@gray-light:            #907f8d;
-@gray-lighter:          #b9adb6;
-
-@brand-primary:         @hacker-primary;
-@brand-success:         #50FA7B;
-@brand-warning:         #F1FA8C;
-@brand-danger:          #FF5555;
-@brand-info:            #8BE9FD;
-
-@comment:               #6272A4;
-
-// Scaffolding
-@body-bg:                   @hacker-bg;
-@text-color:                @hacker;
-@link-color:                #BD93F9;
-@link-hover-color:          lighten(@link-color, 10%);
-@padding-base-vertical:     6px;
-@padding-base-horizontal:   12px;
-@padding-large-vertical:    10px;
-@padding-large-horizontal:  16px;
-@padding-small-vertical:    5px;
-@padding-small-horizontal:  10px;
-@border-radius-base:        2;
-@border-radius-large:       4;
-@border-radius-small:       1;
-@line-height-large:         1.33;
-@line-height-small:         1.5;
-@component-active-color:    @hacker-bg;
-@component-active-bg:       @hacker-primary-lighter;
-
-
-// Typography
-@font-family-sans-serif:    "IBM Plex Mono", monospace;
-@font-family-serif:         "IBM Plex Mono", monospace;
-@font-family-monospace:     "IBM Plex Mono", monospace;
-@font-family-base:          @font-family-monospace;
-@font-size-base:            16px;
-@font-size-large:           ceil(@font-size-base * 1.25);
-@font-size-small:           ceil(@font-size-base * 0.85);
-@font-size-h1:              floor((@font-size-base * 3));
-@font-size-h2:              floor((@font-size-base * 2.5));
-@font-size-h3:              floor((@font-size-base * 2));
-@font-size-h4:              floor((@font-size-base * 1.5));
-@font-size-h5:              floor((@font-size-base * 1.25));
-@font-size-h6:              @font-size-base;
-@line-height-base:          1.428571429;
-@line-height-computed:      floor(@font-size-base * @line-height-base);
-@headings-font-family:      @font-family-base;
-@headings-font-weight:      500;
-@headings-line-height:      1.2;
-@headings-color:            @hacker-primary-lighter;
-
-
-// Code
-@code-color:                @hacker-primary-lighter;
-@code-bg:                   @hacker-box-bg;
-
-@kbd-color:                 @hacker-primary-lighter;
-@kbd-bg:                    @hacker-box-bg;
-
-@pre-color:                 @hacker-primary;
-@pre-bg:                    @hacker-box-bg;
-@pre-border-color:          @hacker-box-border;
-
-
-// Buttons
-@btn-font-weight:           normal;
-@btn-default-color:         @hacker-primary-lighter;
-@btn-default-bg:            @comment;
-@btn-default-border:        @hacker-box-border;
-@btn-primary-color:         @hacker-bg;
-@btn-primary-bg:            @hacker-primary-light;
-@btn-primary-border:        darken(@btn-primary-bg, 10%);
-@btn-success-color:         @hacker-bg;
-@btn-success-bg:            @brand-success;
-@btn-success-border:        darken(@btn-success-bg, 10%);
-@btn-warning-color:         @hacker-bg;
-@btn-warning-bg:            @brand-warning;
-@btn-warning-border:        darken(@btn-warning-bg, 10%);
-@btn-danger-color:          @hacker-bg;
-@btn-danger-bg:             @brand-danger;
-@btn-danger-border:         darken(@btn-danger-bg, 10%);
-@btn-info-color:            @hacker-bg;
-@btn-info-bg:               @brand-info;
-@btn-info-border:           darken(@btn-info-bg, 10%);
-@btn-link-disabled-color:   @gray-light;
-
-
-// Well
-@well-bg:                   @hacker-box-bg;
-@well-border:               @hacker-box-border;
-
-
-// Dropdowns
-@dropdown-bg:                   @hacker-box-bg;
-@dropdown-border:               @hacker-box-border;
-@dropdown-divider-bg:           @hacker-box-border;
-@dropdown-link-active-color:    @component-active-color;
-@dropdown-link-active-bg:       @component-active-bg;
-@dropdown-link-color:           @hacker-primary-light;
-@dropdown-link-hover-color:     @link-hover-color;
-@dropdown-link-hover-bg:        @gray-darker;
-@dropdown-link-disabled-color:  @gray-light;
-@dropdown-header-color:         @headings-color;
-@dropdown-caret-color:          #000000;
-// Custom colors
-@dropdown-header-bg:            lighten(@dropdown-bg, 10%);
-
-
-// Forms
-@input-bg:                          @hacker-bg;
-@input-bg-disabled:                 lighten(@hacker-bg, 20%);
-@input-color:                       @hacker;
-@input-border:                      @hacker-box-border;
-@input-border-focus:                @component-active-bg;
-@input-border-radius:               @border-radius-base;
-@input-color-placeholder:           @hacker;
-@input-height-base:                 (@line-height-computed + (@padding-base-vertical * 2) + 2);
-@input-height-large:                (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
-@input-height-small:                (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
-@legend-color:                      @headings-color;
-@legend-border-color:               @hacker-box-border;
-@input-group-addon-bg:              @hacker-bg;
-@input-group-addon-border-color:    @input-border;
-
-
-// Table
-@table-cell-padding:            8px;
-@table-condensed-cell-padding:  5px;
-@table-cell-padding:            8px;
-@table-condensed-cell-padding:  5px;
-@table-bg:                      @hacker-box-bg;
-@table-bg-accent:               lighten(@hacker-bg, 13%);
-@table-bg-hover:                darken(@gray-darker, 5%); /* Match active */
-@table-bg-active:               @comment;
-@table-border-color:            @hacker-box-border;
-// Custom colors
-@table-heading-color:           @hacker-primary-lighter;
-@table-heading-bg:              darken(@hacker-box-bg, 5%);
-@table-hover-color:             @hacker-primary-lighter;
-@table-active-color:            @hacker-primary-lighter;
-
-
-// Navbar
-@navbar-height:                         50px;
-@navbar-margin-bottom:                  @line-height-computed;
-@navbar-default-color:                  @hacker;
-@navbar-default-bg:                     @hacker-box-bg;
-@navbar-default-border:                 @hacker-bg;
-@navbar-border-radius:                  @border-radius-base;
-@navbar-padding-horizontal:             floor(@grid-gutter-width / 2);
-@navbar-padding-vertical:               ((@navbar-height - @line-height-computed) / 2);
-@navbar-default-link-color:             @link-color;
-@navbar-default-link-hover-color:       @link-hover-color;
-@navbar-default-link-hover-bg:          @hacker-bg;
-@navbar-default-link-active-color:      @hacker-bg;
-@navbar-default-link-active-bg:         @hacker-primary-lighter;
-@navbar-default-link-disabled-color:    #CCCCCC;
-@navbar-default-link-disabled-bg:       transparent;
-@navbar-default-brand-color:            @navbar-default-link-color;
-@navbar-default-brand-hover-color:       lighten(@navbar-default-link-color, 10%);
-@navbar-default-brand-hover-bg:         transparent;
-@navbar-default-toggle-hover-bg:        #DDDDDD;
-@navbar-default-toggle-icon-bar-bg:     #888888;
-@navbar-default-toggle-border-color:    #DDDDDD;
-
-
-// Navs Tabs
-@nav-link-padding:                              10px 15px;
-@nav-link-hover-bg:                             @gray-darker;
-@nav-disabled-link-color:                       @hacker-primary-light;
-@nav-disabled-link-hover-color:                 @gray-light;
-@nav-tabs-border-color:                         #444444;
-@nav-tabs-link-hover-border-color:              #444444;
-@nav-tabs-active-link-hover-bg:                 @hacker-primary-lighter;
-@nav-tabs-active-link-hover-color:              @hacker-bg;
-@nav-tabs-active-link-hover-border-color:       #444444;
-@nav-tabs-justified-link-border-color:          #DDDDDD;
-@nav-tabs-justified-active-link-border-color:   @body-bg;
-@nav-pills-border-radius:                       @border-radius-base;
-@nav-pills-active-link-hover-bg:                @component-active-bg;
-@nav-pills-active-link-hover-color:             @component-active-color;
-
-
-// Panel
-@panel-bg:                    @hacker-bg;
-@panel-body-padding:          15px;
-@panel-heading-padding:       10px 15px;
-@panel-footer-padding:        @panel-heading-padding;
-@panel-border-radius:         @border-radius-base;
-
-@panel-inner-border:          @hacker-box-bg;
-@panel-footer-bg:             @hacker-box-bg;
-
-@panel-default-text:          @hacker-bg;
-@panel-default-border:        @hacker-box-bg;
-@panel-default-heading-bg:    lighten(@hacker-bg, 10%);
-
-@panel-primary-text:          @hacker-primary;
-@panel-primary-border:        @hacker-box-bg;
-@panel-primary-heading-bg:    @hacker-box-bg;
-
-@panel-success-text:          @state-success-text;
-@panel-success-border:        @state-success-border;
-@panel-success-heading-bg:    @state-success-bg;
-
-@panel-info-text:             @state-info-text;
-@panel-info-border:           @state-info-border;
-@panel-info-heading-bg:       @state-info-bg;
-
-@panel-warning-text:          @state-warning-text;
-@panel-warning-border:        @state-warning-border;
-@panel-warning-heading-bg:    @state-warning-bg;
-
-@panel-danger-text:           @state-danger-text;
-@panel-danger-border:         @state-danger-border;
-@panel-danger-heading-bg:     @state-danger-bg;
-
-
-// Jumbotron
-@jumbotron-padding: 30px;
-@jumbotron-color: inherit;
-@jumbotron-bg: lighten(@hacker-bg, 10%);
-@jumbotron-heading-color: @headings-color;
-@jumbotron-font-size: ceil((@font-size-base * 1.5));
-
-
-// Pagination
-@pagination-bg:                 @hacker-bg;
-@pagination-border:             #444444;
-@pagination-hover-bg:           @gray-darker;
-@pagination-hover-color:        @link-hover-color;
-@pagination-hover-border:       @pagination-border;
-@pagination-active-bg:          @component-active-bg;
-@pagination-active-color:       @component-active-color;
-@pagination-active-border:      @pagination-border;
-@pagination-disabled-color:     @hacker-primary;
-@pagination-disabled-bg:        @pagination-bg;
-@pagination-disabled-border:    @pagination-border;
-@pager-bg:                      @pagination-bg;
-@pager-border:                  @pagination-border;
-@pager-border-radius:           0;
-@pager-hover-bg:                @pagination-hover-bg;
-@pager-active-bg:               @pagination-active-bg;
-@pager-active-color:            @pagination-active-color;
-@pager-bg:                      @pagination-bg;
-@pager-disabled-color:          @gray-light;
-
-
-// Form States
-@state-warning-text:    @brand-warning;
-@state-warning-bg:      lighten(@hacker-bg, 10%);
-@state-warning-border:  darken(spin(@state-warning-bg, -10), 3%);
-@state-danger-text:     @brand-danger;
-@state-danger-bg:       lighten(@hacker-bg, 10%);
-@state-danger-border:   darken(spin(@state-danger-bg, -10), 3%);
-@state-success-text:    @brand-success;
-@state-success-bg:      lighten(@hacker-bg, 10%);
-@state-success-border:  darken(spin(@state-success-bg, -10), 5%);
-@state-info-text:       @brand-info;
-@state-info-bg:         lighten(@hacker-bg, 10%);
-@state-info-border:     darken(spin(@state-info-bg, -10), 7%);
-
-
-// ToolTip
-@tooltip-max-width:     200px;
-@tooltip-color:         #FFFFFF;
-@tooltip-bg:            #000000;
-@tooltip-arrow-width:   5px;
-@tooltip-arrow-color:   @tooltip-bg;
-@tooltip-opacity:       .9;
-
-
-// Popover
-@popover-bg:                            @hacker-box-bg;
-@popover-max-width:                     276px;
-@popover-border-color:                  rgba(0,0,0,.2);
-@popover-fallback-border-color:         #333333;
-@popover-title-bg:                      darken(@popover-bg, 3%);
-@popover-arrow-width:                   10px;
-@popover-arrow-color:                   @popover-bg;
-@popover-arrow-outer-width:             (@popover-arrow-width + 1);
-@popover-arrow-outer-color:             rgba(0,0,0,.25);
-@popover-arrow-outer-fallback-color:    #999999;
-
-
-// List Group
-@list-group-bg:                 lighten(@hacker-bg, 5%);
-@list-group-border:             #222222;
-@list-group-border-radius:      @border-radius-base;
-@list-group-hover-bg:           lighten(@hacker-bg, 10%);
-@list-group-active-color:       @hacker-primary-lighter;
-@list-group-active-bg:          @comment;
-@list-group-active-border:      @list-group-active-bg;
-@list-group-active-text-color:  @hacker-bg;
-@list-group-link-color:         @hacker;
-@list-group-link-heading-color: @hacker;
-
-
-// Modal
-@modal-content-bg:                      @hacker-box-bg;
-@modal-content-border-color:            transparent;
-@modal-content-fallback-border-color:   #999999;
-@modal-backdrop-bg:                     @hacker-bg;
-@modal-backdrop-opacity:                .5;
-@modal-header-border-color:             lighten(@hacker-bg, 10%);
-@modal-footer-border-color:             @modal-header-border-color;
-
-
-// Badge
-@badge-color:   @hacker;
-@badge-bg:      @hacker-bg;
-
-
-// Progress bars
-@progress-bg:                 @hacker-box-bg;
-@progress-bar-color:          lighten(@hacker-primary-lighter, 10%);
-@progress-bar-bg:             #FFB86C;
-@progress-bar-success-bg:     @brand-success;
-@progress-bar-warning-bg:     @brand-warning;
-@progress-bar-danger-bg:      @brand-danger;
-@progress-bar-info-bg:        @brand-info;
-
-
-// Breadcrumb
-@breadcrumb-bg:             @hacker-box-bg;
-@breadcrumb-color:          @hacker-primary-light;
-@breadcrumb-active-color:   lighten(@hacker, 10%);
-
-
-// Close
-@close-color: @hacker-primary-light;
-@close-text-shadow: none;
-
-
-// Labels
-@label-color:   @hacker-bg;
-
-// hr
-@hr-border: lighten(@hacker-bg, 20%);
--- a/css/less/hacker.less
+++ b/css/less/hacker.less
@ -1,9 +1,9 @@
 // import bootstrap base
@import "../node_modules/bootstrap/less/bootstrap.less";
-@import (inline) "plex.css";
+// @import (inline) "plex.css";

 // import custom variables
-@import "hacker/_variables.less";
+@import "variables.less";

 // import custom theme changes
-@import "hacker/_theme.less";
+@import "_theme.less";
--- a/css/less/plex.css
+++ b/css/less/plex.css
@ -1,49 +1,56 @@
@font-face {
-  font-family: 'IBM Plex Mono';
-  font-style: italic;
-  font-weight: 300;
-  src: local('IBM Plex Mono Light Italic'), local('IBMPlexMono-LightItalic'), url(https://tilde.team/fonts/plex/IBMPlexMono-LightItalic.woff2) format('woff2');
+    font-family: 'IBM Plex Mono';
+    font-style: italic;
+    font-weight: 300;
+    src: local('IBM Plex Mono Light Italic'), local('IBMPlexMono-LightItalic'), url(https://tilde.team/fonts/plex/IBMPlexMono-LightItalic.woff2) format('woff2');
 }
+
 /* latin */
@font-face {
-  font-family: 'IBM Plex Mono';
-  font-style: italic;
-  font-weight: 400;
-  src: local('IBM Plex Mono Italic'), local('IBMPlexMono-Italic'), url(https://tilde.team/fonts/plex/IBMPlexMono-Italic.woff2) format('woff2');
+    font-family: 'IBM Plex Mono';
+    font-style: italic;
+    font-weight: 400;
+    src: local('IBM Plex Mono Italic'), local('IBMPlexMono-Italic'), url(https://tilde.team/fonts/plex/IBMPlexMono-Italic.woff2) format('woff2');
 }
+
@font-face {
-  font-family: 'IBM Plex Mono';
-  font-style: italic;
-  font-weight: 500;
-  src: local('IBM Plex Mono Medium Italic'), local('IBMPlexMono-MediumItalic'), url(https://tilde.team/fonts/plex/IBMPlexMono-MediumItalic.woff2) format('woff2');
+    font-family: 'IBM Plex Mono';
+    font-style: italic;
+    font-weight: 500;
+    src: local('IBM Plex Mono Medium Italic'), local('IBMPlexMono-MediumItalic'), url(https://tilde.team/fonts/plex/IBMPlexMono-MediumItalic.woff2) format('woff2');
 }
+
@font-face {
-  font-family: 'IBM Plex Mono';
-  font-style: italic;
-  font-weight: 700;
-  src: local('IBM Plex Mono Bold Italic'), local('IBMPlexMono-BoldItalic'), url(https://tilde.team/fonts/plex/IBMPlexMono-BoldItalic.woff2) format('woff2');
+    font-family: 'IBM Plex Mono';
+    font-style: italic;
+    font-weight: 700;
+    src: local('IBM Plex Mono Bold Italic'), local('IBMPlexMono-BoldItalic'), url(https://tilde.team/fonts/plex/IBMPlexMono-BoldItalic.woff2) format('woff2');
 }
+
@font-face {
-  font-family: 'IBM Plex Mono';
-  font-style: normal;
-  font-weight: 300;
-  src: local('IBM Plex Mono Light'), local('IBMPlexMono-Light'), url(https://tilde.team/fonts/plex/IBMPlexMono-Light.woff2) format('woff2');
+    font-family: 'IBM Plex Mono';
+    font-style: normal;
+    font-weight: 300;
+    src: local('IBM Plex Mono Light'), local('IBMPlexMono-Light'), url(https://tilde.team/fonts/plex/IBMPlexMono-Light.woff2) format('woff2');
 }
+
@font-face {
-  font-family: 'IBM Plex Mono';
-  font-style: normal;
-  font-weight: 400;
-  src: local('IBM Plex Mono'), local('IBMPlexMono'), url(https://tilde.team/fonts/plex/IBMPlexMono-Regular.woff2) format('woff2');
+    font-family: 'IBM Plex Mono';
+    font-style: normal;
+    font-weight: 400;
+    src: local('IBM Plex Mono'), local('IBMPlexMono'), url(https://tilde.team/fonts/plex/IBMPlexMono-Regular.woff2) format('woff2');
 }
+
@font-face {
-  font-family: 'IBM Plex Mono';
-  font-style: normal;
-  font-weight: 500;
-  src: local('IBM Plex Mono Medium'), local('IBMPlexMono-Medium'), url(https://tilde.team/fonts/plex/IBMPlexMono-Medium.woff2) format('woff2');
+    font-family: 'IBM Plex Mono';
+    font-style: normal;
+    font-weight: 500;
+    src: local('IBM Plex Mono Medium'), local('IBMPlexMono-Medium'), url(https://tilde.team/fonts/plex/IBMPlexMono-Medium.woff2) format('woff2');
 }
+
@font-face {
-  font-family: 'IBM Plex Mono';
-  font-style: normal;
-  font-weight: 700;
-  src: local('IBM Plex Mono Bold'), local('IBMPlexMono-Bold'), url(https://tilde.team/fonts/plex/IBMPlexMono-Bold.woff2) format('woff2');
+    font-family: 'IBM Plex Mono';
+    font-style: normal;
+    font-weight: 700;
+    src: local('IBM Plex Mono Bold'), local('IBMPlexMono-Bold'), url(https://tilde.team/fonts/plex/IBMPlexMono-Bold.woff2) format('woff2');
 }
--- a/css/less/hacker/_variables.less
+++ b/css/less/hacker/_variables.less
@ -39,24 +39,26 @@ Palette URL: http://paletton.com/#uid=12U0u0knnfti5bkladVnSlVo6tw
@link-color:                @hacker-primary-lighter;
@link-hover-color:          lighten(@link-color, 10%);
@padding-base-vertical:     6px;
-@padding-base-horizontal:   12px;
+@padding-base-horizontal:   2ch;
@padding-large-vertical:    10px;
-@padding-large-horizontal:  16px;
+@padding-large-horizontal:  3ch;
@padding-small-vertical:    5px;
-@padding-small-horizontal:  10px;
+@padding-small-horizontal:  1ch;
@border-radius-base:        2;
@border-radius-large:       4;
@border-radius-small:       1;
-@line-height-large:         1.33;
-@line-height-small:         1.5;
+@line-height-base:          1.428571429;
+@line-height-with-unit:     1.428571429em;
+@line-height-large:         @line-height-base * 2;
+@line-height-small:         @line-height-base;
@component-active-color:    @hacker-bg;
@component-active-bg:       @hacker-primary-lighter;


 // Typography
-@font-family-sans-serif:    "IBM Plex Mono", monospace;
-@font-family-serif:         "IBM Plex Mono", monospace;
-@font-family-monospace:     "IBM Plex Mono", monospace;
+@font-family-monospace:     "IBM Plex Mono", "JetBrains Mono", "Fira Mono", Consolas, Inconsolata, ui-monospace, monospace;
+@font-family-sans-serif:    @font-family-monospace;
+@font-family-serif:         @font-family-monospace;
@font-family-base:          @font-family-monospace;
@font-size-base:            16px;
@font-size-large:           ceil(@font-size-base * 1.25);
@ -67,11 +69,10 @@ Palette URL: http://paletton.com/#uid=12U0u0knnfti5bkladVnSlVo6tw
@font-size-h4:              floor((@font-size-base * 1.5));
@font-size-h5:              floor((@font-size-base * 1.25));
@font-size-h6:              @font-size-base;
-@line-height-base:          1.428571429;
@line-height-computed:      floor(@font-size-base * @line-height-base);
@headings-font-family:      @font-family-base;
@headings-font-weight:      500;
-@headings-line-height:      1.2;
+@headings-line-height:      @line-height-base;
@headings-color:            @hacker-primary-lighter;


--- a/css/package-lock.json
+++ b/css/package-lock.json
--- a/css/package.json
+++ b/css/package.json
@ -12,9 +12,9 @@
    },
    "dependencies": {
        "bootstrap": "3.4.1",
-        "less": "3.11.1",
+        "less": "3.13.1",
        "less-plugin-clean-css": "1.5.1",
-        "light-server": "^2.6.4"
+        "light-server": "^2.9.1"
    },
    "preferGlobal": true,
    "license": "MIT"
--- a/css/shrinkwrap.yaml
+++ b/css/shrinkwrap.yaml
--- a/css/skeleton.html
+++ b/css/skeleton.html
@ -2,11 +2,11 @@
 <html lang="en">

 <head>
-  <meta charset="utf-8">
-  <meta http-equiv="x-ua-compatible" content="ie=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="https://tilde.team/css/hacker.css">
-  <title>my page</title>
+    <meta charset="utf-8">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="https://tilde.team/css/hacker.css">
+    <title>my page</title>
 </head>

 <body>
--- a/footer.php
+++ b/footer.php
@ -1,17 +1,22 @@
        <hr>
        <footer class="text-center">
-            <pre>ECDSA fingerprint: SHA256:R3qNfKIF3IiXhKCbFX6rCKl73yzexi9Wodsow6XFres</pre>
-            <a href="https://tildegit.org/team/site">page source</a>
-            &mdash;
+            <div class="collapse" id="sshfp">
+                <pre>
+ECDSA:   SHA256:R3qNfKIF3IiXhKCbFX6rCKl73yzexi9Wodsow6XFres
+ED25519: SHA256:FErDF9upMkSg/yzw0N7i2o971LT/Bocd1qrDDpE315I
+RSA:     SHA256:JR5oQPfC34ogd/SeIcMpaGR8BiBo4ciI5xWyBVCjj5o</pre>
+            </div>
+            <a href="https://tildegit.org/team/site">site source</a>
+            ~
+            <a href="https://tildegit.org/team/site/src/branch/master/<?=str_ireplace("/var/www/tilde.team/", "", $filepath ?? "")?>">page source</a>
+            ~
            <a href="https://bhh.sh/donate/">donate</a>
+            ~
+            <a data-toggle="collapse" href="#sshfp" aria-expanded="false" aria-controls="sshfp">
+                ssh fingerprints
+            </a>
        </footer>
    </div>
-
-    <br>
-    <br>
-
-    <script src="/js/jquery.min.js"></script>
-    <script src="/js/bootstrap.min.js"></script>
 </body>

 </html>
--- a/header.php
+++ b/header.php
@ -15,14 +15,26 @@
    <link rel="icon" type="image/png" sizes="192x192" href="/apple-touch-icon-precomposed.png">
    <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">

+    <script defer src="/js/jquery.min.js"></script>
+    <script defer src="/js/bootstrap.min.js"></script>
+
    <link rel="stylesheet" href="/css/hacker.css">
-    <link rel="stylesheet" href="/css/fork-awesome.css">
+
+    <style>
+        /* offset #fragments */
+        :target:before {
+            content: "";
+            display: block;
+            height: 70px;
+            margin: -70px 0 0;
+        }
+    </style>

    <?=$additional_head ?? ""?>
    <?php unset($title); unset($additional_head); ?>
 </head>

-<body style="padding-top: 70px;">
+<body style="padding-top: 70px; padding-bottom: 30px;">
    <div class="container">

        <nav class="navbar navbar-default navbar-fixed-top">
--- a/humans.txt
+++ b/humans.txt
@ -16,7 +16,7 @@ Site: https://tilde.team/~virtual/ virtual@tilde.team
 Location tildeverse, the internet

 Users: tilde.team teammates
-Sites: https://tilde.team/~<username>/ (see https://tilde.team for a list)
+Sites: https://tilde.team/~<username>/ (see https://tilde.team/users/ for a list)
 Location: tildeverse, the internet


@ -24,7 +24,6 @@ Location: tildeverse, the internet
 Name: Paul Ford, for inspiring tilde.team through tilde.club

 /* SITE */
-Last update: 2018/08/13
+Last update: 2022/02/17
 Components: Bootstrap 3
 Software: PHP
-
--- a/index.php
+++ b/index.php
@ -1,12 +1,15 @@
 <?php
+$filepath = __FILE__;
 include 'header.php';
 require __DIR__.'/vendor/autoload.php';
-$parser = Tildeverse\Wiki\Parser::factory();
+use tildeteam\wiki;
+
+$parser = wiki::factory(true);
 ?>

-        <div class="jumbotron">
-            <h1>~team</h1>
-            <pre>
+<div class="jumbotron">
+    <h1>~team</h1>
+    <pre>
   __  _ __    __      __
  / /_(_) /___/ /__   / /____  ____ _____ ___
 / __/ / / __  / _ \ / __/ _ \/ __ `/ __ `__ \
@ -14,128 +17,169 @@ $parser = Tildeverse\Wiki\Parser::factory();
 \__/_/_/\__,_/\___(_)__/\___/\__,_/_/ /_/ /_/
 </pre>

-            <br>
+    <br>

-            <p>a digital community for socializing, learning, and making cool stuff</p>
-        </div>
+    <p>a digital community for socializing, learning, and making cool stuff</p>
+</div>

-        <p>
-            tilde.team is a shared system that provides an inclusive, 
-            non-commercial space for teaching, learning, practicing and 
-            enjoying the social medium of unix.
-        </p>
-        <p>
-            i created this tilde after hearing about paul ford's 
-            <a href="http://tilde.club/">tilde.club</a>. when i was unable 
-            to join due to the waitlist, i decided to create my own tilde.
-        </p>
+<p>
+    tilde.team is a shared system that provides an inclusive,
+    non-commercial space for teaching, learning, practicing and
+    enjoying the social medium of unix.
+</p>
+<p>
+    i created this tilde after hearing about paul ford's
+    <a href="https://tilde.club/">tilde.club</a>. when i was unable
+    to join due to the waitlist, i decided to create my own tilde.
+</p>

-        <p>thanks for stopping by!</p>
+<p>thanks for stopping by!</p>

-        <p>
-            tilde.team is a founding member of <a href="https://tildeverse.org">tildeverse.org</a>, 
-            which is a collaborative effort among several <a href="https://tildeverse.org/members/">
-            other tilde servers</a>.
-        </p>
-        <p>
-            hosting and domains are paid out-of-pocket. tilde.team will always 
-            be free to use. however, if you are able and willing to pitch in, 
-            you can <a href="https://bhh.sh/donate/">donate here</a>.
-        </p>
+<p>
+    tilde.team is a founding member of <a href="https://tildeverse.org">tildeverse.org</a>,
+    which is a collaborative effort among several <a href="https://tildeverse.org/members/">
+    other tilde servers</a>.
+</p>
+<p>
+    hosting and domains are paid out-of-pocket. tilde.team will always
+    be free to use. however, if you are able and willing to pitch in,
+    you can <a href="https://bhh.sh/donate/">donate here</a>.
+</p>

-        <p><a href="/~ben/">~ben</a></p>
+<p><a href="/~ben/">~ben</a></p>

-        <br>
+<br>

-        <a href="/signup/" class="btn btn-primary btn-lg">
-            <i class="fa fa-user-plus"></i> signup</a>
+<a href="/signup/" class="btn btn-primary btn-lg">
+    <i class="fa fa-user-plus"></i> signup</a>

-        <br>
-        <br>
-        <hr>
+<br>
+<br>
+<hr>

-        <h3>tilde.team services</h3>
+<h2>tilde.team services</h2>

-        <?php include 'services.php'; ?>
+<?php include 'services.php'; ?>

-        <br>
-        <hr>
+<br>
+<hr>

-        <div class="row">
-            <div class="col-md-7">
-                <h1>~news~</h1>
-                <?php foreach (array_slice(array_reverse(glob("news/pages/*.md")), 0, 4) as $page):
-                    $parsed = $parser->parse(file_get_contents($page));
-                    $yaml = $parsed->getYAML();
-                    if (!$yaml["published"]) continue; ?>
+<div class="row">
+    <div class="col-md-6">
+        <h2 id="news">~news~</h2>

-                    <div class="list-group">
-                        <div class="list-group-item">
-                            <h3 class="list-group-item-heading"><?=$yaml["title"]?></h3>
-                            <em>
-                                <a href="/news/<?=basename($page, ".md")?>">
-                                <?=$yaml["date"]?></a> - <a href="/~<?=$yaml["author"]?>/"><?=$yaml["author"]?></a>
-                            </em>
-                            <hr>
-                            <div class="list-group-item-text"><?=$parsed->getContent()?></div>
-                        </div>
-                    </div>
+        <?php foreach (array_slice(array_reverse(glob("news/pages/*.md")), 0, 4) as $page):
+            $parsed = $parser->parse(file_get_contents($page));
+            $yaml = $parsed->getYAML();
+            if (!$yaml["published"]) continue; ?>

-                <?php endforeach; ?>
-
-                <div class="list-group">
-                    <div class="list-group-item">
-                        <p class="list-group-item-text"><a href="/news/">news archive here...</a></p>
-                    </div>
+            <div class="list-group">
+                <div class="list-group-item">
+                    <h3 class="list-group-item-heading"><?=$yaml["title"]?></h3>
+                    <em><a href="/news/<?=basename($page, ".md")?>"><?=$yaml["date"]?></a></em>
+                    &bull;
+                    <em><a href="/~<?=$yaml["author"]?>/"><?=$yaml["author"]?></a></em>
+                    <hr>
+                    <div class="list-group-item-text"><?=$parsed->getContent()?></div>
                </div>
-
-                <h1>~current projects~</h1>
-                <h4>on our <a href="https://tildegit.org/team">gitea</a></h4>
-                <hr>
-                <div class="list-group">
-                    <?php foreach (json_decode(file_get_contents("https://tildegit.org/api/v1/orgs/team/repos")) ?? [] as $repo): ?>
-                        <div class="list-group-item">
-                            <h3 style="display:inline;" class="list-group-item-heading">
-                                <a href="<?=$repo->html_url?>"><?=$repo->name?></a>
-                            </h3>
-                            <?php if ($repo->website != ""): ?>
-                                &mdash;
-                                <p style="display:inline;"><em><a href="<?=$repo->website?>"><?=$repo->website?></a></em></p>
-                            <?php endif; ?>
-                            <br>
-                            <p class="list-group-item-text"><?=$repo->description?></p>
-                        </div>
-                    <?php endforeach; ?>
-                </div>
-
            </div>

-            <div class="col-md-5">
-                <h1>~users~</h1>
-                <p><em><a href="/tilde.24h.html"><i class="fa fa-clock-o"></i> recent updates</a></em></p>
-                <p>if you're not listed here, make some changes to your page</p>
-                <p><a href="/users/">all users</a></p>
-                <br><br>
-                <div class="list-group">
+        <?php endforeach; ?>
+
+        <div class="list-group">
+            <div class="list-group-item">
+                <p class="list-group-item-text"><a href="/news/">news archive...</a></p>
+            </div>
+        </div>
+    </div>
+    
+    <div class="col-md-6">
+        <h2 id="projects">~projects~</h2>
+
+        <?php // readonly token, gitea changed perms on this endpoint
+        $repo_url = "https://tildegit.org/api/v1/orgs/team/repos?limit=100&token=448c748ee0082f46ccf246daf759874ca5d067cb";
+        foreach (json_decode(file_get_contents($repo_url)) ?? [] as $repo):
+            if ($repo->archived) continue; ?>
+
+            <div class="list-group">
+                <div class="list-group-item">
+                    <h3 style="display:inline;" class="list-group-item-heading">
+                        <a href="<?=$repo->html_url?>"><?=$repo->name?></a>
+                    </h3>
+                    <?php if ($repo->website != ""): ?>
+                        &mdash;
+                        <p style="display:inline;"><em><a href="<?=$repo->website?>"><?=$repo->website?></a></em></p>
+                    <?php endif; ?>
+                    <br>
+                    <p class="list-group-item-text"><?=$repo->description?></p>
+                </div>
+            </div>
+        <?php endforeach; ?>
+
+        <div class="list-group">
+            <div class="list-group-item">
+                <p class="list-group-item-text"><a href="https://tildegit.org/team">gitea repos...</a></p>
+            </div>
+        </div>
+    </div>
+</div>
+<hr>
+<div class="row">
+    <div class="col-md-12">
+        <h2 id="newstuff">~user spotlight~</h2>
+        <div class="list-group">
+            <div class="list-group-item">
                <ul>
-                <?php
-                foreach (glob("/home/*") as $user):
-                    if (!is_dir("$user/public_html")
-                        || (file_exists("$user/public_html/index.php")
-                            && in_array(sha1_file("$user/public_html/index.php"),
-                            // these are the sha1s of two previous default pages
-                            ["ca32714c33abb57430583ad07efec6097ae1a044", "f190ba3a1ed796a20bea83304e45e799420c0716"])))
-                        continue;
-                    $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?></h6>
-                        </a>
+                    <li>
+                       <a href="https://gtlsgamr.tilde.team">~gtlsgamr</a> has made a <a href="https://gtlsgamr.tilde.team/nethack_scores.php">page</a> to show tilde.team's top nethack scorers!
+                    </li>
+                    <li>
+                        For the text-only enthusiasts, <a href="https://soxfox.tilde.team">~soxfox</a> has also made a <a href="gemini://tilde.team/~soxfox/nethack">gemini page</a> to show nethack scorers.
                    </li>
-                <?php endforeach; ?>
                </ul>
-                </div>
            </div>
        </div>
+    </div>
+</div>
+<hr>

+<div class="clearfix">
+    <h2 id="users">~users~</h2>
+
+    <p><em><a href="/tilde.24h.html"><i class="fa fa-clock-o"></i> recent updates</a></em> | <a href="/users/">all users</a></p>
+    <p>if you're not listed here, make some changes to your page</p>
+
+    <ul class="list-unstyled">
+    <?php
+    $usercount = 0;
+    foreach (glob("/home/*/public_html", GLOB_ONLYDIR) as $user):
+        if (
+            (
+                // make sure we have an index page
+                !is_file("$user/index.html")
+                && !is_file("$user/index.htm")
+                && !is_file("$user/index.cgi")
+                && !is_file("$user/index.php")
+            )
+            || (
+                // if it's php, compare the hash to the default page
+                is_file("$user/index.php")
+                && in_array(
+                    sha1_file("$user/index.php"),
+                    [
+                        // these are the sha1s of two previous pages
+                        "ca32714c33abb57430583ad07efec6097ae1a044",
+                        "f190ba3a1ed796a20bea83304e45e799420c0716"
+                    ]
+                )
+            )
+        ) continue;
+        $user = basename(dirname($user));
+        $usercount++; ?>
+        <li><a href="/~<?=$user?>/" class="list-group-item col-xs-6 col-sm-4 col-md-2">~<?=$user?></a></li>
+    <?php endforeach; ?>
+    </ul>
+</div>
+<br>
+<p>users who have updated their homepages: <?=$usercount?></p>
 <?php include 'footer.php'; ?>
--- a/localrouter.php
+++ b/localrouter.php
@ -0,0 +1,7 @@
+<?php
+if (preg_match('/^.*\/(news|wiki)\/(.*)$/', $_SERVER["REQUEST_URI"], $matches))
+{
+    $_GET["page"] = $matches[2];
+}
+
+return false;
--- a/logos/mail.svg
+++ b/logos/mail.svg
@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+	 width="240"
+	 height="240">
+  <g fill="white" stroke="black">
+	<path d="M4 120L120 4l116 116"
+		  stroke-width="8" stroke-linecap="round"/>
+	<path d="M210 200V40H30v160z"
+		  stroke-width="3.5"/>
+	<path d="M236 120l-116 45L4 120v116h232z"
+		  stroke-width="8" stroke-linejoin="round"/>
+  </g>
+  <path d="M70.33 110.55c1.05-2.68 2.55-4.86 4.27-7.21 8.94-12.2 19.62-11.8 32.66-6.53 15.52 6.28 30.61 17.28 48.22 12.37 7.41-2.07 13.19-7.01 17.78-13.05 1.57-2.07 5.1-5.34 4.62-8.24-.4-2.41-3.28-4.63-4.96-6.18-1.44-1.34-2.35-1.55-4.1-2.06-4.03 5.7-8.79 13.2-15.39 16.14-8.44 3.77-17.13-1.08-24.62-4.64-14.02-6.65-30.38-14.54-46.17-10.13-9.71 2.71-27.87 16.42-17.44 26.45 1.78 1.71 2.86 2.43 5.13 3.09"
+		fill="black"/>
+  <path d="M4 236l116-96 116 96z"
+		fill="white" stroke="black" stroke-width="8" stroke-linejoin="round"/>
+</svg>
--- a/logos/team.svg
+++ b/logos/team.svg
@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+	 width="240" height="240">
+  <path d="M34.05 232.58c1.75-20.09 9.89-38.03 23.92-52.71 6.68-7 16.25-14.23 23.85-18.04 2.25-1.13 4.25-2.19 4.44-2.36s-1.73-2.59-4.27-5.37c-10.61-11.61-14.96-28.28-11.56-44.32 2.16-10.19 6.24-17.53 14.04-25.25 7.97-7.89 13.49-11.12 23.35-13.64 8.91-2.28 16.39-2.28 25.3 0 9.85 2.52 15.38 5.75 23.35 13.64 7.79 7.72 11.88 15.06 14.04 25.25 3.38 15.94-1.01 32.78-11.54 44.3-2.55 2.79-4.49 5.22-4.29 5.39s2.19 1.23 4.44 2.36c7.6 3.81 17.17 11.04 23.85 18.04 14.02 14.68 22.16 32.62 23.92 52.71l.65 7.42H33.4zM0 42.94c2.94-1.13 14.48-1.06 21.29.68 9.85 2.52 15.38 5.75 23.35 13.64 7.79 7.72 11.88 15.06 14.04 25.25 3.38 15.94-1.01 32.78-11.54 44.3-2.55 2.79-4.49 5.22-4.29 5.39s2.19 1.23 4.44 2.36c7.14 3.58 16.61 10.62 23.13 17.2 3.47 3.51 6.13 6.52 5.91 6.69s-3.27 2.2-6.77 4.5c-8.18 5.37-20.74 18.26-26.68 27.37-2.56 3.92-5.95 10.57-7.55 14.77l-2.9 7.64H16.21 0zm205.54 162.02c-1.62-4.27-5.34-11.33-8.25-15.69-6.25-9.35-19.86-22.86-27.98-27.78-3.12-1.89-5.68-3.75-5.68-4.13s2.97-3.55 6.59-7.05c6.83-6.58 14.52-12.2 21.59-15.75 2.25-1.13 4.25-2.2 4.44-2.37s-1.73-2.59-4.27-5.37c-10.61-11.61-14.96-28.28-11.56-44.32 2.16-10.19 6.24-17.53 14.04-25.25 3.8-3.76 9.02-7.96 11.61-9.34 8.79-4.67 24.75-7.44 31.89-5.52l2.05.55v169.79h-15.75-15.75z"
+		fill="black" stroke="white" stroke-width="8" paint-order="stroke"/>
+  <path d="M84.48 217.12c.75-1.91 1.82-3.48 3.06-5.16 6.39-8.72 14.03-8.44 23.35-4.67 11.1 4.49 21.89 12.36 34.48 8.84 5.3-1.48 9.43-5.02 12.72-9.33 1.13-1.48 3.65-3.82 3.3-5.9-.29-1.72-2.35-3.31-3.55-4.42-1.03-.96-1.68-1.11-2.93-1.47-2.88 4.08-6.29 9.44-11 11.54-6.03 2.69-12.25-.77-17.61-3.32-10.03-4.76-21.72-10.4-33.01-7.25-6.95 1.94-19.93 11.74-12.47 18.91 1.27 1.22 2.05 1.74 3.67 2.21"
+		fill="white"/>
+</svg>
--- a/logos/verse.svg
+++ b/logos/verse.svg
@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+	 width="240" height="240">
+  <path d="M127.26 10.25c1.89 8.99 4.12 15.75-.14 24.77-3.13 6.62-7.72 12.53-12.67 17.94-3.4 3.71-7.7 6.48-11.1 10.25-7.33 8.12-10.89 19.48-6.69 29.89 1.38 3.42 3.32 6.47 5.55 9.4 2.9 3.8 6.24 7.25 10.53 9.4-2.18-4.35-4.7-8.61-4.98-13.67-1.13-20.27 21.65-29.97 32.03-43.56 11.38-14.89 2.44-35.75-12.53-44.41m-17.08 1.71c.77 4.18 1.42 8.13-1.14 11.96-4.88 7.33-18.14 13.21-13.24 23.91a20 20 0 0 0 2.56 4.27c1.25 1.54 2.49 2.47 4.13 3.42-3.56-12.3 7.24-16.34 12.53-25.62 3.76-6.61 1.66-14.18-4.84-17.94M80.28 81.99c2.96-1.09 5.97-2.59 8.54-4.56a21.1 21.1 0 0 0 4.55-4.84c10.4-14.97-8.22-27.17-11.1-41-1.5-7.21 1.49-11.3 4.84-17.08-3.21.68-6 2.29-8.54 4.41-1.73 1.44-3.55 3.13-4.84 4.98-9.64 13.88 6.63 27.23 9.68 40.14 1.63 6.91-.86 11.78-3.13 17.94m52.95-15.37v.85c3.45 2.18 7.11 4.21 11.1 5.27 26.92 7.1 23.38-41.27 50.39-33.45-5.08-7.15-18.47-8.95-25.62-3.99-11.33 7.87-12.76 24.27-26.48 30.18-3.05 1.31-6.15 1.14-9.4 1.14m-104.2-8.54v.85c18.34 0 27.15 20.02 31.32 35.02 2.05 7.39 2.91 14.88 7.4 21.35 10.38 14.95 26.02 10.39 40.71 7.69-2.13-1.65-5.01-1.21-7.69-1.99-7.21-2.1-13.04-7.94-16.8-14.24C74.93 91.6 80.1 67.6 63.2 57.51c-3.01-1.8-6.01-2.43-9.4-3.13-3.29-.69-6.9-.94-10.25-.28a92.5 92.5 0 0 0-14.52 3.99m179.36-.85c-4.11 4-7.86 5.69-13.67 5.12-9.11-.89-20.69-8.97-26.19 3.42-.95 2.13-1.57 4.56-1.99 6.83 5.58-3.23 8.39-5.8 15.37-5.12 6.11.59 12.46 4.48 18.79 2.28 4.15-1.44 9.36-8.43 7.69-12.53m9.4 14.52c-6.74 8.26-15.64 12.81-26.48 12.81-19.42 0-41.05-17.03-58.08 0-2.44 2.44-4.38 5.45-5.84 8.54-2.39 5.05-3.41 10.79-4.41 16.23h.85c1.5-2.99 3.55-5.36 5.98-7.69 19.79-18.97 44.07 6.8 65.77 2.28 11.6-2.42 18.35-12.78 21.21-23.63.67-2.55 1.88-6.38 1-8.54M23.91 74.31v.85c4.15 2.08 7.86 4.16 10.11 8.54 3.82 7.42 1.36 19.12 12.1 21.21 1.62.32 3.5.25 5.12 0a19.6 19.6 0 0 0 5.12-1.57c-3.58-2.77-7.21-3.94-9.96-8.54-4.64-7.77-3-20.21-14.8-21.35-2.63-.26-5.11.65-7.69.85m-9.4 22.21c0 4.54-.26 9.28 1.14 13.67 2.93 9.19 11.44 12.18 20.21 12.67 2.82.16 5.6-1 8.54-.71 10.9 1.06 18.77 4.17 24.77 13.67h.85c0-3.81.01-7.37-.71-11.1-.46-2.35-.82-4.76-2.14-6.83-8.75-13.8-27.11-4.4-39.86-8.83-7.09-2.46-8.23-8.15-12.81-12.53m157.15 6.83c0 5.37-.24 11.19 1.99 16.23 3.88 8.72 11.89 9.4 20.21 9.4 12.73 0 27.66-1.51 32.46 13.67h.85c0-4.54.26-9.28-1.14-13.67-5.58-17.48-26.53-10.25-39.86-13.95-7.22-2.01-9.21-7.78-14.52-11.67m-40.14 12.81v.85a27.8 27.8 0 0 1 10.25 2.28c13.37 5.76 18.49 20.33 21.07 33.59 2.26 11.6 3.74 23.79 15.66 29.75 2.46 1.23 5.04 1.58 7.69 2.14 2.76.58 5.69.85 8.54.57 5.59-.54 11.05-2.36 16.23-4.27-1.89-1.37-5.21-1.13-7.69-1.99-5.22-1.81-10.08-6.5-13.38-10.82-13.45-17.61-8.56-52.75-37.01-55.52-7.46-.73-14.21 2.1-21.35 3.42m-4.27 11.1c2.18 4.35 4.7 8.61 4.98 13.67 1.13 20.27-21.65 29.97-32.03 43.56-11.38 14.89-2.44 35.75 12.53 44.41-1.89-8.99-4.12-15.75.14-24.77 3.13-6.62 7.72-12.53 12.67-17.94 3.4-3.71 7.7-6.48 11.1-10.25 7.33-8.12 10.89-19.48 6.69-29.89-1.38-3.42-3.32-6.47-5.55-9.4-2.9-3.8-6.24-7.25-10.53-9.4m-11.96 2.56c-1.5 2.99-3.55 5.36-5.98 7.69-20.75 19.89-46.5-9.3-69.18-1.42-13.98 4.86-16.13 19.17-19.64 31.32 3.4-2.14 5.82-5.92 9.4-8.26 4.51-2.94 12.57-4.85 17.94-4.55 16.3.91 33.35 12.21 49.54 5.69 9.44-3.8 14.44-12.46 16.94-21.92.68-2.56 2.17-6.55 1-8.54m70.04 5.98v.85c13.55 1.43 10.35 18.89 17.22 26.48 4.23 4.67 9.9 2.98 15.23 2.56-2.35-2.99-6.7-4.06-9.11-7.69-5.2-7.81-1.16-19.96-12.24-23.34a13.2 13.2 0 0 0-5.12-.57 19.4 19.4 0 0 0-5.98 1.71m-26.48 20.5c-4.43 2.8-9.36 4.84-12.53 9.4-8.59 12.38 3.77 22.91 8.97 33.31 2.63 5.26 4.04 12.36 1.57 17.94-.99 2.23-2.8 3.93-3.99 5.98 3.21-.68 5.99-2.29 8.54-4.41 1.73-1.44 3.55-3.13 4.84-4.98 9.52-13.71-6.66-26.5-9.68-39.29-.8-3.38-1.07-7.75 0-11.1.77-2.41 3.07-4.65 2.28-6.83M46.98 199v.85c2.74 1.88 5.39 3.46 8.54 4.55 8.21 2.85 16.49.85 21.92-6.26 3.01-3.94 4.66-8.69 7.4-12.81 5.62-8.42 12.64-13.67 22.78-13.67-5.58-7.86-20.33-9.06-27.33-2.56C69.79 178.84 67 204.8 46.98 199m27.33-32.46c-4.38 4.38-8.31 5.73-14.52 5.12-8.66-.84-18.09-6.64-24.48 2.56-1.58 2.28-2.09 5.08-2.85 7.69 5.17-2.99 8.06-5.75 14.52-5.12 6.58.64 12.7 5.44 19.64 3.13 4.21-1.4 9.98-9.51 7.69-13.38m64.06 17.08c3.58 12.37-7.28 16.4-12.53 25.62-3.71 6.52-1.61 14.2 4.84 17.94-.77-4.17-1.42-8.13 1.14-11.96 4.96-7.44 18.19-13.11 13.24-23.91a20 20 0 0 0-2.56-4.27c-1.25-1.54-2.49-2.47-4.13-3.42z"
+		fill="black"/>
+</svg>
--- a/news/feed.php
+++ b/news/feed.php
@ -0,0 +1,32 @@
+<?php
+
+require_once __DIR__ .'/../vendor/autoload.php';
+
+use FeedWriter\ATOM;
+use tildeteam\wiki;
+
+$feed = new ATOM();
+$parser = wiki::factory();
+
+$feed->setTitle("tilde.team news");
+$feed->setLink("https://tilde.team/news/");
+$feed->setDescription("updates and news for tilde.team");
+
+foreach (glob("pages/*.md") as $page)
+{
+    $file = $parser->parse(file_get_contents($page));
+    $yaml = $file->getYAML();
+    if (!$yaml["published"]) continue;
+
+    $item = $feed->createNewItem();
+
+    $item->setTitle($yaml["title"]);
+    $item->setLink("https://tilde.team/news/" . basename($page, ".md"));
+    $item->setDate($yaml["date"]);
+    $item->setContent($file->getContent());
+
+    $feed->addItem($item);
+}
+
+$feed->printFeed();
+
--- a/news/index.php
+++ b/news/index.php
@ -1,22 +1,15 @@
 <?php
+$filepath = __FILE__;
 require __DIR__.'/../vendor/autoload.php';
+use tildeteam\wiki;

 $additional_head = "
-    <style>
-    :target:before {
-        content:\"\";
-        display:block;
-        height:90px; /* fixed header height*/
-        margin:-90px 0 0; /* negative fixed header height */
-    }
-    </style>
    <meta property='og:type' content='website'>
    <meta property='og:image' content='https://tilde.team/apple-icon.png'>
    <meta property='og:site_name' content='tilde.team news'>
 ";

-$parser = Tildeverse\Wiki\Parser::factory();
-
+$parser = wiki::factory(true);

 if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {

@ -37,6 +30,8 @@ if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
        <a href="https://tildegit.org/team/site/src/branch/master/news">source</a> and open a PR!
    </p>

+    <p>also available as a <a href="feed.php">feed</a></p>
+
    <hr>
    <h3>updates:</h3>

--- 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)
--- a/news/pages/003_mastodon.md
+++ b/news/pages/003_mastodon.md
@ -5,6 +5,6 @@ title: mastodon
 author: ben
 ---

-hey tilders, there's a mastodon instance out there at <a href="https://social.tilde.team/">social.tilde.team</a> for members of the tilde community (and any others who are interested in an actually <em>social</em> social network. see you on there!
+hey tilders, there's a mastodon instance out there at <a href="https://social.tilde.team/">social.tilde.team</a> for members of the tilde community (and any others who are interested in an actually <em>social</em> social network). see you on there!

-edit: the mastodon instance is now at [tilde.zone](https://tilde.zone)
+update: the mastodon instance is at [tilde.zone](https://tilde.zone)
--- 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)
--- 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.
--- 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!
--- 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.
--- 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!
--- a/news/pages/023_tilde.team_down.md
+++ b/news/pages/023_tilde.team_down.md
@ -13,4 +13,4 @@ later!

 update: i've written up a [post mortem](/~ben/blog/november-13-post-mortem.html) ~ben

-update 2: i've written a [article from my perspective](https://tilde.team/~fosslinux/blog/on-november-13th-i-made-a-bit-of-an-oops.html) ~fosslinux
+update 2: i've written an [article from my perspective](https://tilde.team/~fosslinux/blog/on-november-13th-i-made-a-bit-of-an-oops.html) ~fosslinux
--- a/news/pages/024_mailing_list.md
+++ b/news/pages/024_mailing_list.md
@ -9,7 +9,7 @@ we now have new mailing lists for the tildeverse :D

 ~teamers, you are automatically signed up to the ~team mailing list.

-see [the list archives](https://lists.tildeverse.org/hyperkitty/list/tildeteam@lists.tildeverse.org/) for topics that you've missed, or just send an email to the list directly (tildeteam@lists.tildeverse.org) to start a new thread/topic.
+see [the list archives](https://lists.tildeverse.org/hyperkitty/list/tildeteam@lists.tildeverse.org/) for topics that you've missed, or just email the list directly (tildeteam@lists.tildeverse.org) to start a new thread/topic.

 all lists and settings can be found at https://lists.tildeverse.org

--- a/news/pages/030_ubuntu20.04.md
+++ b/news/pages/030_ubuntu20.04.md
@ -7,7 +7,7 @@ author: ben

 i've been preparing a large upgrade for tilde.team to ubuntu 20.04 focal fossa.

-the new vm has a fresh install and will help to address some of the long-standing
+the new vm has a fresh install and will help to address some long-standing
 issues that i've been wanting to fix for quite some time now

 ---
@ -28,7 +28,7 @@ issues that i've been wanting to fix for quite some time now
 the ip address is the same and everything should be as you left it. please let me
 know on irc or shoot an email if something is amiss.

-i have an ongoing list [here](/~ben/todo.txt) that i will update as i get things
+i have an [ongoing list](/~ben/todo.txt) that i will update as i get things
 back up and running.

 another important note: python is now 3.8 by default and you will need to
--- a/news/pages/031_update-adventures.md
+++ b/news/pages/031_update-adventures.md
@ -0,0 +1,18 @@
+---
+published: true
+date: august 24 2021
+title: update adventures
+author: ben
+---
+
+it appears that there hasn't been a news post here in over a year...
+
+perfect time to have a major outage!
+
+we ran into a nasty [breaking change](
+https://pve.proxmox.com/wiki/Upgrade_from_6.x_to_7.0#Linux_Bridge_MAC-Address_Change)
+in the systemd included in proxmox 7. we lost networking on the proxmox
+host tilde.team lives on for a while while i scrambled to get stuff back up
+and running.
+
+see my [blog post](/~ben/blog/update-adventures.html) for the full story.
--- a/news/pages/032_disk_quotas.md
+++ b/news/pages/032_disk_quotas.md
@ -0,0 +1,18 @@
+---
+published: true
+date: march 23 2022
+title: disk quotas
+author: ben
+---
+
+as of today, we will be enforcing per-user disk quotas here on tilde.team.
+
+this was a manual chore that i have been meaning to set up for a while.
+
+the limits will be 1gb as a soft limit then 3gb as the hard limit.
+
+there's a 1-week grace period after reaching 1gb for you to find and remove files.
+
+see the [disk usage wikipage](/wiki/disk-usage) for help on finding large files.
+
+thanks for keeping this a usable system for everyone :)
--- a/news/pages/033_5_years.md
+++ b/news/pages/033_5_years.md
@ -0,0 +1,24 @@
+---
+published: true
+date: may 31 2022
+title: 5 years of tilde.team
+author: ben
+---
+
+as of may 30 tilde.team is 5 years old!
+
+the early days were hectic and the memories for me are a bit hazy so i'm going
+off the date that the domain was registered.
+according to WHOIS info:
+
+    Creation Date: 2017-05-30T20:25:48Z
+
+at the time of writing (one day late) we have 1224 members. 219 people have logged
+in since the last reboot.
+
+i'm not particularly good at words but tilde.team has been a massive part of my
+life over the last 5 years and i'm so grateful for all you folks who make it fun
+and enjoyable to hang out here.
+
+keep on making cool things and see ya 'round!
+
--- a/news/pages/034_ubuntu22.04.md
+++ b/news/pages/034_ubuntu22.04.md
@ -0,0 +1,19 @@
+---
+published: true
+date: september 25 2022
+title: "ubuntu 22.04 upgrades"
+author: ben
+---
+
+i completed the upgrade to ubuntu 22.04 today!
+
+this one was relatively easy, only a couple things to sort out.
+
+got all kinds of new software with this one, including stuff
+like ruby 3, php 8.1, and python 3.10.
+
+it's likely that you will have to recreate any python virtualenvs
+or any similar locally-downloaded deps.
+
+holler if you notice anything amiss on irc or the mailing list!
+
--- a/ring/index.php
+++ b/ring/index.php
@ -0,0 +1,97 @@
+<?php
+$filepath = __FILE__;
+$action = $_GET["action"] ?? "index";
+$users = array_map(function ($f) { return basename(dirname($f)); }, glob("/home/*/.ring"));
+
+if ($action !== "index") {
+    // handle webring redirects
+    $me = $_GET["me"] ?? "";
+    if (!in_array($me, $users) && $action != "random") {
+        header("Location: https://tilde.team/ring/?error");
+        die();
+    }
+    $i = array_search($me, $users);
+
+    switch ($action) {
+    case "random":
+        $notme = array_diff($users, [$me]);
+        $user = $notme[array_rand($notme)];
+        break;
+    case "next":
+        $user = $users[$i + 1] ?? reset($users);
+        break;
+    case "prev":
+        $user = $users[$i - 1] ?? end($users);
+        break;
+    default:
+        die("invalid action");
+    }
+
+    // use custom link from second line of ~/.ring
+    if (filesize("/home/$user/.ring") > 0) {
+        $ringfile = file("/home/$user/.ring", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+        if (count($ringfile) > 1 && $ringfile[1] !== "")
+            $dest = trim($ringfile[1]);
+    }
+    $location = $dest ?? "/~$user/";
+    header("Location: $location");
+    die();
+}
+else {
+    // keep this as a string so we can escape it easily with htmlspecialchars()
+    $snippet = '<!-- tilde.team ring fragment-->
+<div id="newring">
+<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>
+</div>
+</div>';
+
+    $title = "webring - how to join";
+    include __DIR__ . '/../header.php';
+?>
+    <h1>how to join the webring</h1>
+    <?php if (isset($_GET["error"])): ?>
+        <div class="alert alert-danger" role="alert"><strong>ERROR</strong> please be sure that me=USERNAME is set to your user and have created a <code>~/.ring</code> file.</div>
+    <?php endif; ?>
+
+    <p>this webring can be joined by any user on tilde.team.</p>
+    <p>first, add the following links to your page, replacing USERNAME by your username (no ~):</p>
+
+    <pre><?=htmlspecialchars($snippet)?></pre>
+
+    <p>you may edit the code however you want. it should work as long as the URLs are kept in place and have your user in them.</p>
+
+    <p>then create a .ring file in your ~ to be added in the webring:</p>
+    <pre>$ touch ~/.ring</pre>
+
+    <p>the first line of ~/.ring will be displayed here as a tagline.</p>
+    <p>the second line of the file is used as a custom link if your webring tags are not on your homepage.</p>
+
+    <h3 id="explore">explore webring</h3>
+    <p><a href="?action=random">jump to random page</a></p>
+    <p><?=count($users)?> members in the webring:</p>
+    <ul>
+    <?php foreach ($users as $user):
+        if (filesize("/home/$user/.ring") > 0) {
+            $ringfile = file("/home/$user/.ring", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+            $tagline = htmlspecialchars($ringfile[0]);
+            if (count($ringfile) > 1 && $ringfile[1] !== "")
+                $link = htmlspecialchars($ringfile[1]);
+        }
+        else {
+            unset($tagline);
+            unset($link);
+        } ?>
+
+        <li><a href="<?=$link ?? "/~$user/"?>">~<?=$user?></a><?=(isset($tagline) ? " &mdash; $tagline" : "")?></li>
+    <?php endforeach; ?>
+    </ul>
+
+    <p>it will probably work if you copy it to your own <code>~/public_html</code> and adjust the links accordingly.</p>
+<?php 
+    include __DIR__ . '/../footer.php';
+}
--- a/services.php
+++ b/services.php
@ -1,23 +1,28 @@
 <?php
 $services = [
-    'gitea' => ['fa' => 'code-fork', 'url' => 'https://tildegit.org/team/'],
-    'forum' => ['fa' => 'comment', 'url' => 'https://bbj.tildeverse.org'],
-    'mastodon' => ['fa' => 'retweet', 'url' => 'https://tilde.zone'],
-    'chat' => ['fa' => 'comments-o', 'url' => '/wiki/irc'],
-    'nextcloud' => ['fa' => 'cloud', 'url' => 'https://cloud.tilde.team/'],
-    'webmail' => ['fa' => 'envelope', 'url' => 'https://mail.tilde.team/'],
    'cryptpad' => ['fa' => 'sticky-note', 'url' => 'https://pad.tildeverse.org'],
-    'pastebin' => ['fa' => 'paste', 'url' => 'https://paste.tildeverse.org/'],
+    'forum' => ['fa' => 'comment', 'url' => 'https://bbj.tildeverse.org'],
+    'gitea' => ['fa' => 'code-fork', 'url' => 'https://tildegit.org/team'],
+    'gemini' => ['fa' => 'gem', 'url' => 'gemini://tilde.team'],
+    'gopher' => ['fa' => 'floppy-o', 'url' => 'gopher://tilde.team'],
+    'irc' => ['fa' => 'comments-o', 'url' => '/wiki/irc'],
+    'mastodon' => ['fa' => 'retweet', 'url' => 'https://tilde.zone'],
+    'nextcloud' => ['fa' => 'cloud', 'url' => 'https://cloud.tilde.team/'],
    'nullpointer' => ['fa' => 'file-code-o', 'url' => 'https://ttm.sh'],
-    'gopher' => ['fa' => 'floppy-o', 'url' => 'https://gopher.tildeverse.org/tilde.team'],
+    'pastebin' => ['fa' => 'paste', 'url' => 'https://paste.tildeverse.org/'],
+    'webmail' => ['fa' => 'envelope', 'url' => 'https://mail.tilde.team/'],
+    'webring' => ['fa' => 'life-ring', 'url' => '/ring/'],
+    'xmpp' => ['fa' => 'xmpp', 'url' => '/wiki/xmpp'],
 ];

-$nav = isset($navbar);
+$nav = isset($navbar) && $navbar;
 unset($navbar);

-foreach ($services as $name => $service) { ?>
-    <?php if ($nav) echo '<li>'; ?>
-    <a href="<?=$service['url']?>" <?php if (!$nav) echo 'class="btn btn-default"'; ?>><i class="fa fa-<?=$service['fa']?>"></i> ~<?=$name?>~</a>
-    <?php if ($nav) echo '</li>'; ?>
-<?php }
+foreach ($services as $name => $service) {
+    if ($nav) { ?>
+    <li><a href="<?=$service["url"]?>" role="menuitem"><?=$name?></a></li>
+    <?php } else { ?>
+    <a href="<?=$service["url"]?>" class="btn btn-default"><?=$name?></a>
+    <?php }
+}

--- a/signup/email/Net/DNS2.php
+++ b/signup/email/Net/DNS2.php
--- a/signup/email/ipaddr.php
+++ b/signup/email/ipaddr.php
@ -7,11 +7,10 @@
 		static function NormalizeIP($ipaddr)
 		{
 			$ipv4addr = "";
-			$ipv6addr = "";

 			// Generate IPv6 address.
 			$ipaddr = strtolower(trim($ipaddr));
-			if (strpos($ipaddr, ":") === false)  $ipaddr = "::ffff:" . $ipaddr;
+			if (!str_contains($ipaddr, ":"))  $ipaddr = "::ffff:" . $ipaddr;
 			$ipaddr = explode(":", $ipaddr);
 			if (count($ipaddr) < 3)  $ipaddr = array("", "", "0");
 			$ipaddr2 = array();
@ -27,7 +26,7 @@
 				}
 			}
 			// Convert ::ffff:123.123.123.123 format.
-			if (strpos($ipaddr2[count($ipaddr2) - 1], ".") !== false)
+			if (str_contains($ipaddr2[count($ipaddr2) - 1], "."))
 			{
 				$x = count($ipaddr2) - 1;
 				if ($ipaddr2[count($ipaddr2) - 2] != "ffff")  $ipaddr2[$x] = "0";
@ -51,7 +50,7 @@
 			$ipv6addr = implode(":", $ipaddr);

 			// Extract IPv4 address.
-			if (substr($ipv6addr, 0, 30) == "0000:0000:0000:0000:0000:ffff:")  $ipv4addr = hexdec(substr($ipv6addr, 30, 2)) . "." . hexdec(substr($ipv6addr, 32, 2)) . "." . hexdec(substr($ipv6addr, 35, 2)) . "." . hexdec(substr($ipv6addr, 37, 2));
+			if (str_starts_with($ipv6addr, "0000:0000:0000:0000:0000:ffff:"))  $ipv4addr = hexdec(substr($ipv6addr, 30, 2)) . "." . hexdec(substr($ipv6addr, 32, 2)) . "." . hexdec(substr($ipv6addr, 35, 2)) . "." . hexdec(substr($ipv6addr, 37, 2));

 			// Make a short IPv6 address.
 			$shortipv6 = $ipv6addr;
@ -73,7 +72,7 @@

 		static function GetRemoteIP($proxies = array())
 		{
-			$ipaddr = self::NormalizeIP(isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : "127.0.0.1");
+			$ipaddr = self::NormalizeIP($_SERVER["REMOTE_ADDR"] ?? "127.0.0.1");

 			// Check for trusted proxies.  Stop at first untrusted IP in the chain.
 			if (isset($proxies[$ipaddr["ipv6"]]) || ($ipaddr["ipv4"] != "" && isset($proxies[$ipaddr["ipv4"]])))
@ -85,10 +84,9 @@
 				{
 					$found = false;

-					if (isset($proxies[$ipaddr["ipv6"]]))  $header = $proxies[$ipaddr["ipv6"]];
-					else  $header = $proxies[$ipaddr["ipv4"]];
+                    $header = $proxies[$ipaddr["ipv6"]] ?? $proxies[$ipaddr["ipv4"]];

-					$header = strtolower($header);
+                    $header = strtolower($header);
 					if ($header == "xforward" && count($xforward) > 0)
 					{
 						$ipaddr = self::NormalizeIP(array_pop($xforward));
@ -109,7 +107,7 @@
 		{
 			if (is_string($ipaddr))  $ipaddr = self::NormalizeIP($ipaddr);

-			if (strpos($pattern, ":") !== false)
+			if (str_contains($pattern, ":"))
 			{
 				// Pattern is IPv6.
 				$pattern = explode(":", strtolower($pattern));
@ -128,7 +126,7 @@
 							$piece = $piece[0];

 							if ($piece == "*")  $found = true;
-							else if (strpos($piece, "-") !== false)
+							else if (str_contains($piece, "-"))
 							{
 								$range = explode("-", $piece);
 								$range[0] = hexdec($range[0]);
@ -148,7 +146,7 @@
 							$val2 = hexdec(substr($ipaddr[$num], 2, 2));

 							if ($piece[0] == "*")  $found2 = true;
-							else if (strpos($piece[0], "-") !== false)
+							else if (str_contains($piece[0], "-"))
 							{
 								$range = explode("-", $piece[0]);
 								if ($range[0] > $range[1])  $range[0] = $range[1];
@ -157,7 +155,7 @@
 							else if ($piece[0] == $val)  $found2 = true;

 							if ($piece[1] == "*")  $found3 = true;
-							else if (strpos($piece[1], "-") !== false)
+							else if (str_contains($piece[1], "-"))
 							{
 								$range = explode("-", $piece[1]);
 								if ($range[0] > $range[1])  $range[0] = $range[1];
@ -189,7 +187,7 @@
 						$piece = trim($piece);

 						if ($piece == "*")  $found = true;
-						else if (strpos($piece, "-") !== false)
+						else if (str_contains($piece, "-"))
 						{
 							$range = explode("-", $piece);
 							if ($range[0] > $range[1])  $range[0] = $range[1];
@ -207,4 +205,3 @@
 			return true;
 		}
 	}
-?>
--- a/signup/email/smtp.php
+++ b/signup/email/smtp.php
@ -14,16 +14,14 @@
 		// Reduce dependencies.  Duplicates code though.
 		private static function FilenameSafe($filename)
 		{
-			return preg_replace('/[_]+/', "_", preg_replace('/[^A-Za-z0-9_.\-]/', "_", $filename));
+			return preg_replace('/_+/', "_", preg_replace('/[^A-Za-z0-9_.\-]/', "_", $filename));
 		}

 		private static function ReplaceNewlines($replacewith, $data)
 		{
 			$data = str_replace("\r\n", "\n", $data);
 			$data = str_replace("\r", "\n", $data);
-			$data = str_replace("\n", $replacewith, $data);
-
-			return $data;
+            return str_replace("\n", $replacewith, $data);
 		}

 		// RFC1341 is a hacky workaround to allow 8-bit over 7-bit transport.
@ -184,7 +182,7 @@
 			// Reverse parse out the initial domain/IP address part of the e-mail address.
 			$domain = "";
 			$state = "domend";
-			$cfwsdepth = 0;
+
 			while ($email != "" && $state != "")
 			{
 				$prevchr = substr($email, -2, 1);
@ -224,7 +222,7 @@
 						{
 							$email = trim(substr($email, 0, -1));
 							$depth--;
-							if (!$depth && substr($email, -1) != ")")  $state = $laststate;
+							if (!$depth && !str_ends_with($email, ")"))  $state = $laststate;
 						}
 						else  $email = trim(substr($email, 0, -1));

@ -286,7 +284,7 @@

 			// Forward parse out the local part of the e-mail address.
 			// Remove CFWS (comments, folding whitespace).
-			while (substr($email, 0, 1) == "(")
+			while (str_starts_with($email, "("))
 			{
 				while ($email != "")
 				{
@ -301,14 +299,14 @@
 					{
 						$email = trim(substr($email, 1));
 						$depth--;
-						if (!$depth && substr($email, 0, 1) != "(")  break;
+						if (!$depth && !str_starts_with($email, "("))  break;
 					}
 				}
 			}

 			// Process quoted/unquoted string.
 			$local = "";
-			if (substr($email, 0, 1) == "\"")
+			if (str_starts_with($email, "\""))
 			{
 				$email = substr($email, 1);
 				while ($email != "")
@ -338,7 +336,7 @@
 					else  $email = substr($email, 1);
 				}

-				if (substr($local, -1) != "\"")  $local .= "\"";
+				if (!str_ends_with($local, "\""))  $local .= "\"";
 			}
 			else
 			{
@ -355,17 +353,17 @@
 				}

 				$local = preg_replace('/[.]+/', ".", $local);
-				if (substr($local, 0, 1) == ".")  $local = substr($local, 1);
-				if (substr($local, -1) == ".")  $local = substr($local, 0, -1);
+				if (str_starts_with($local, "."))  $local = substr($local, 1);
+				if (str_ends_with($local, "."))  $local = substr($local, 0, -1);
 			}
-			while (substr($local, -2) == "\\\"")  $local = substr($local, 0, -2) . "\"";
+			while (str_ends_with($local, "\\\""))  $local = substr($local, 0, -2) . "\"";
 			if ($local == "\"" || $local == "\"\"")  $local = "";

 			// Analyze the domain/IP part and fix any issues.
 			$domain = preg_replace('/[.]+/', ".", $domain);
-			if (substr($domain, -1) == "]")
+			if (str_ends_with($domain, "]"))
 			{
-				if (substr($domain, 0, 1) != "[")  $domain = "[" . $domain;
+				if (!str_starts_with($domain, "["))  $domain = "[" . $domain;

 				// Process the IP address.
 				if (strtolower(substr($domain, 0, 6)) == "[ipv6:")  $ipaddr = IPAddr::NormalizeIP(substr($domain, 6, -1));
@ -377,13 +375,13 @@
 			else
 			{
 				// Process the domain.
-				if (substr($domain, 0, 1) == ".")  $domain = substr($domain, 1);
-				if (substr($domain, -1) == ".")  $domain = substr($domain, 0, -1);
+				if (str_starts_with($domain, "."))  $domain = substr($domain, 1);
+				if (str_ends_with($domain, "."))  $domain = substr($domain, 0, -1);
 				$domain = explode(".", $domain);
 				foreach ($domain as $num => $part)
 				{
-					if (substr($part, 0, 1) == "-")  $part = substr($part, 1);
-					if (substr($part, -1) == "-")  $part = substr($part, 0, -1);
+					if (str_starts_with($part, "-"))  $part = substr($part, 1);
+					if (str_ends_with($part, "-"))  $part = substr($part, 0, -1);
 					if (strlen($part) > 63)  $part = substr($part, 0, 63);

 					$domain[$num] = $part;
@ -401,13 +399,13 @@
 			if ($y > 64 || $y2 > 253 || $y + $y2 + 1 > 253)  return array("success" => false, "error" => self::SMTP_Translate("E-mail address is too long."), "errorcode" => "email_too_long", "info" => $email);

 			// Process results.
-			if (substr($domain, 0, 1) == "[" && substr($domain, -1) == "]")  $result = array("success" => true, "email" => $email, "lookup" => false, "type" => "IP");
+			if (str_starts_with($domain, "[") && str_ends_with($domain, "]"))  $result = array("success" => true, "email" => $email, "lookup" => false, "type" => "IP");
 			else if (isset($options["usedns"]) && $options["usedns"] === false)  $result = array("success" => true, "email" => $email, "lookup" => false, "type" => "Domain");
 			else if ((!isset($options["usednsttlcache"]) || $options["usednsttlcache"] === true) && isset(self::$dnsttlcache[$domain]) && self::$dnsttlcache[$domain] >= time())  $result = array("success" => true, "email" => $email, "lookup" => false, "type" => "CachedDNS");
 			else
 			{
 				// Check for a mail server based on a DNS lookup.
-				$result = self::GetDNSRecord($domain, array("MX", "A"), (isset($options["nameservers"]) ? $options["nameservers"] : array("8.8.8.8", "8.8.4.4")), (!isset($options["usednsttlcache"]) || $options["usednsttlcache"] === true));
+				$result = self::GetDNSRecord($domain, array("MX", "A"), ($options["nameservers"] ?? array("8.8.8.8", "8.8.4.4")), (!isset($options["usednsttlcache"]) || $options["usednsttlcache"] === true));
 				if ($result["success"])  $result = array("success" => true, "email" => $email, "lookup" => true, "type" => $result["type"], "records" => $result["records"]);
 			}

@ -480,7 +478,6 @@
 				$name = "";
 				$email = "";
 				$state = "addrend";
-				$cfwsdepth = 0;
 				$inbracket = false;

 				while ($data != "" && $state != "")
@ -538,7 +535,7 @@
 							{
 								$data = trim(substr($data, 0, -1));
 								$depth--;
-								if (!$depth && substr($data, -1) != ")")  $state = $laststate;
+								if (!$depth && !str_ends_with($data, ")"))  $state = $laststate;
 							}
 							else  $data = trim(substr($data, 0, -1));

@ -616,18 +613,18 @@
 						{
 							if ($prevchr == "\\")
 							{
-								$email .= $lastchar . $prevchr;
+								$email .= $lastchr . $prevchr;
 								$data = substr($data, 0, -2);
 							}
 							else if ($lastchr == "\"")
 							{
-								$email .= $lastchar;
+								$email .= $lastchr;
 								$data = trim(substr($data, 0, -1));
 								$state = "localstart";
 							}
 							else
 							{
-								$email .= $lastchar;
+								$email .= $lastchr;
 								$data = substr($data, 0, -1);
 							}

@ -683,7 +680,7 @@
 						{
 							if ($prevchr == "\\")
 							{
-								$name .= $lastchar . $prevchr;
+								$name .= $lastchr . $prevchr;
 								$data = substr($data, 0, -2);
 							}
 							else if ($lastchr == "\"")
@ -718,7 +715,7 @@
 				{
 					if ($removenames)  $name = "";
 					$name = trim(strrev($name));
-					if (substr($name, 0, 1) == "\"")  $name = trim(substr($name, 1));
+					if (str_starts_with($name, "\""))  $name = trim(substr($name, 1));
 					$name = str_replace("\\\\", "\\", $name);
 					$name = str_replace("\\\"", "\"", $name);

@ -816,11 +813,11 @@
 		// Reads one or more lines in.
 		private static function ProcessState__ReadLine(&$state)
 		{
-			while (strpos($state["data"], "\n") === false)
+			while (!str_contains($state["data"], "\n"))
 			{
 				$data2 = @fgets($state["fp"], 116000);
 				if ($data2 === false)  return array("success" => false, "error" => self::SMTP_Translate("Underlying stream encountered a read error."), "errorcode" => "stream_read_error");
-				if (strpos($data2, "\n") === false)
+				if (!str_contains($data2, "\n"))
 				{
 					if (feof($state["fp"]))  return array("success" => false, "error" => self::SMTP_Translate("Remote peer disconnected."), "errorcode" => "peer_disconnected");
 					if (self::StreamTimedOut($state["fp"]))  return array("success" => false, "error" => self::SMTP_Translate("Underlying stream timed out."), "errorcode" => "stream_timeout_exceeded");
@ -851,7 +848,7 @@
 				if ($state["timeout"] !== false && self::GetTimeLeft($state["startts"], $state["timeout"]) == 0)  return array("success" => false, "error" => self::SMTP_Translate("HTTP timeout exceeded."), "errorcode" => "timeout_exceeded");

 				$data2 = substr($state["data"], 0, $result);
-				$state["data"] = (string)substr($state["data"], $result);
+				$state["data"] = substr($state["data"], $result);

 				$state["result"]["rawsendsize"] += $result;

@ -993,9 +990,9 @@
 					case "helo_ehlo":
 					{
 						// Send EHLO or HELO depending on server support.
-						$hostname = (isset($state["options"]["hostname"]) ? $state["options"]["hostname"] : "[" . trim(isset($_SERVER["SERVER_ADDR"]) && $_SERVER["SERVER_ADDR"] != "127.0.0.1" ? $_SERVER["SERVER_ADDR"] : "192.168.0.101") . "]");
+						$hostname = ($state["options"]["hostname"] ?? "[" . trim(isset($_SERVER["SERVER_ADDR"]) && $_SERVER["SERVER_ADDR"] != "127.0.0.1" ? $_SERVER["SERVER_ADDR"] : "192.168.0.101") . "]");
 						$state["size_supported"] = 0;
-						if (strpos($state["response"], " ESMTP") !== false)
+						if (str_contains($state["response"], " ESMTP"))
 						{
 							self::InitSMTPRequest($state, "EHLO " . $hostname, 250, "esmtp_extensions", self::SMTP_Translate("Expected a 250 response from the SMTP server upon EHLO."));
 						}
@ -1021,7 +1018,7 @@
 						$state["state"] = "mail_from";

 						// Process login (if any and supported).
-						if (strpos($auth, "LOGIN") !== false)
+						if (str_contains($auth, "LOGIN"))
 						{
 							$state["username"] = (isset($state["options"]["username"]) ? (string)$state["options"]["username"] : "");
 							$state["password"] = (isset($state["options"]["password"]) ? (string)$state["options"]["password"] : "");
@ -1132,7 +1129,7 @@
 		public static function SendSMTPEmail($toaddr, $fromaddr, $message, $options = array())
 		{
 			$startts = microtime(true);
-			$timeout = (isset($options["timeout"]) ? $options["timeout"] : false);
+			$timeout = ($options["timeout"] ?? false);

 			if (!function_exists("stream_socket_client") && !function_exists("fsockopen"))  return array("success" => false, "error" => self::SMTP_Translate("The functions 'stream_socket_client' and 'fsockopen' do not exist."), "errorcode" => "function_check");

@ -1143,11 +1140,11 @@
 			if (!self::EmailAddressesToNamesAndEmail($temptonames, $temptoaddrs, $toaddr, true, $options))  return array("success" => false, "error" => self::SMTP_Translate("Invalid 'To' e-mail address(es)."), "errorcode" => "invalid_to_address", "info" => $toaddr);
 			if (!self::EmailAddressesToNamesAndEmail($tempfromnames, $tempfromaddrs, $fromaddr, true, $options))  return array("success" => false, "error" => self::SMTP_Translate("Invalid 'From' e-mail address."), "errorcode" => "invalid_from_address", "info" => $fromaddr);

-			$server = (isset($options["server"]) ? $options["server"] : "localhost");
-			$secure = (isset($options["secure"]) ? $options["secure"] : false);
+			$server = ($options["server"] ?? "localhost");
+			$secure = ($options["secure"] ?? false);
 			$port = (isset($options["port"]) ? (int)$options["port"] : -1);
 			if ($port < 0 || $port > 65535)  $port = ($secure ? 465 : 25);
-			$debug = (isset($options["debug"]) ? $options["debug"] : false);
+			$debug = ($options["debug"] ?? false);

 			$headers = "Message-ID: <" . self::SMTP_RandomHexString(8) . "." . self::SMTP_RandomHexString(7) . "@" . substr($tempfromaddrs[0], strrpos($tempfromaddrs[0], "@") + 1) . ">\r\n";
 			$headers .= "Date: " . date("D, d M Y H:i:s O") . "\r\n";
@ -1168,7 +1165,7 @@
 			if ($timeout !== false && self::GetTimeLeft($startts, $timeout) == 0)  return array("success" => false, "error" => self::SMTP_Translate("HTTP timeout exceeded."), "errorcode" => "timeout_exceeded");

 			// Connect to the target server.
-			$hostname = (isset($options["hostname"]) ? $options["hostname"] : "[" . trim(isset($_SERVER["SERVER_ADDR"]) && $_SERVER["SERVER_ADDR"] != "127.0.0.1" ? $_SERVER["SERVER_ADDR"] : "192.168.0.101") . "]");
+			$hostname = ($options["hostname"] ?? "[" . trim(isset($_SERVER["SERVER_ADDR"]) && $_SERVER["SERVER_ADDR"] != "127.0.0.1" ? $_SERVER["SERVER_ADDR"] : "192.168.0.101") . "]");
 			$errornum = 0;
 			$errorstr = "";
 			if (isset($options["fp"]) && is_resource($options["fp"]))
@ -1202,7 +1199,7 @@
 			// Initialize the connection request state array.
 			$state = array(
 				"fp" => $fp,
-				"async" => (isset($options["async"]) ? $options["async"] : false),
+				"async" => ($options["async"] ?? false),
 				"debug" => $debug,
 				"startts" => $startts,
 				"timeout" => $timeout,
@ -1283,7 +1280,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);
@ -1305,7 +1302,7 @@
 			if (TagFilter::GetParentPos($stack, "pre") === false)
 			{
 				$content = preg_replace('/\s{2,}/', "  ", str_replace(array("\r\n", "\n", "\r", "\t"), " ", $content));
-				if ($result !== "" && substr($result, -1) === "\n")  $content = trim($content);
+				if ($result !== "" && str_ends_with($result, "\n"))  $content = trim($content);
 			}
 		}

@ -1352,13 +1349,13 @@
 			$subject = str_replace("\n", " ", $subject);
 			if (!UTF8::IsASCII($subject))  $subject = self::ConvertToRFC1342($subject);

-			$replytoaddr = (isset($options["replytoaddr"]) ? $options["replytoaddr"] : "");
-			$ccaddr = (isset($options["ccaddr"]) ? $options["ccaddr"] : "");
-			$bccaddr = (isset($options["bccaddr"]) ? $options["bccaddr"] : "");
-			$headers = (isset($options["headers"]) ? $options["headers"] : "");
-			$textmessage = (isset($options["textmessage"]) ? $options["textmessage"] : "");
-			$htmlmessage = (isset($options["htmlmessage"]) ? $options["htmlmessage"] : "");
-			$attachments = (isset($options["attachments"]) ? $options["attachments"] : array());
+			$replytoaddr = ($options["replytoaddr"] ?? "");
+			$ccaddr = ($options["ccaddr"] ?? "");
+			$bccaddr = ($options["bccaddr"] ?? "");
+			$headers = ($options["headers"] ?? "");
+			$textmessage = ($options["textmessage"] ?? "");
+			$htmlmessage = ($options["htmlmessage"] ?? "");
+			$attachments = ($options["attachments"] ?? array());

 			$messagetoaddr = self::EmailAddressesToEmailHeaders($toaddr, "To", true, false, $options);
 			$replytoaddr = self::EmailAddressesToEmailHeaders($replytoaddr, "Reply-To", false, false, $options);
@ -1373,8 +1370,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 +1387,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 +1511,3 @@
 			}
 		}
 	}
-?>
--- a/signup/email/utf8.php
+++ b/signup/email/utf8.php
@ -192,7 +192,7 @@
 		// Converts UTF8 characters in a string to HTML entities.
 		public static function ConvertToHTML($data)
 		{
-			return preg_replace_callback('/([\xC0-\xF7]{1,1}[\x80-\xBF]+)/', 'UTF8::ConvertToHTML__Callback', $data);
+			return preg_replace_callback('/([\xC0-\xF7][\x80-\xBF]+)/', 'UTF8::ConvertToHTML__Callback', $data);
 		}

 		private static function ConvertToHTML__Callback($data)
@ -205,4 +205,3 @@
 			return "&#" . $num . ";";
 		}
 	}
-?>
--- a/signup/index.php
+++ b/signup/index.php
@ -1,5 +1,11 @@
 <?php
+$filepath = __FILE__;
 include __DIR__.'/../header.php';
+
+function esc($v): string
+{
+    return isset($_REQUEST[$v]) ? htmlspecialchars($_REQUEST[$v]) : "";
+}
 ?>

    <div class="container" id="app">
@ -11,31 +17,39 @@ include __DIR__.'/../header.php';
        </h1>
        <h3>so you wanna join the tilde.team?</h3>

-        <p>hi there. fill out this form and i'll get back to you with your account info.</p>
+        <p>hi there. fill out this form and we'll get back to you with your account info.</p>

        <hr>

        <form method="post">
            <?php include 'signup-handler.php'; ?>

-            <div class="form-group">
-                <label>your desired username (numbers and lowercase letters only, no spaces)</label>
-                <input class="form-control" name="username" value="<?=$_REQUEST["username"] ?? ""?>" type="text" required>
+			<div>
+                <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 class="form-group">
-                <label>email to contact you with account info</label>
-                <input class="form-control" name="email" value="<?=$_REQUEST["email"] ?? ""?>" type="text" required>
-            </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 class="form-group">
-                <label>what interests you about tilde.team?</label>
-                <textarea class="form-control" name="interest" id="" cols="30" rows="10"><?=$_REQUEST["interest"] ?? ""?></textarea>
-            </div>
+			<div>
+				<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 class="form-group">
-                <label>SSH public key</label>
-                <textarea required class="form-control" name="sshkey" id="" cols="30" rows="10"><?=$_REQUEST["sshkey"] ?? ""?></textarea>
+			<div>
+                <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>

--- a/signup/signup-handler.php
+++ b/signup/signup-handler.php
@ -1,4 +1,5 @@
 <?php
+$filepath = __FILE__;
 require __DIR__.'/../vendor/autoload.php';
 require_once "email/smtp.php";

@ -15,13 +16,35 @@ function getUserIpAddr() {
    return $ip;
 }

-function add_ban_info($name, $email) {
+function add_ban_info($name, $email): void
+{
    $user_ip = getUserIpAddr();
    $user_info = "$name - $email - $user_ip";
    file_put_contents("/var/signups_banned", $user_info.PHP_EOL, FILE_APPEND);
 }

-function forbidden_name($name) {
+function is_ssh_pubkey($string): bool
+{
+    // list from sshd(8)
+    $valid_pubkeys = [
+        'sk-ecdsa-sha2-nistp256@openssh.com',
+        'ecdsa-sha2-nistp256',
+        'ecdsa-sha2-nistp384',
+        'ecdsa-sha2-nistp521',
+        'sk-ssh-ed25519@openssh.com',
+        'ssh-ed25519',
+        'ssh-dss',
+        'ssh-rsa',
+    ];
+
+    foreach ($valid_pubkeys as $pub)
+        if (str_starts_with($string, $pub)) return true;
+
+    return false;
+}
+
+function forbidden_name($name): bool
+{
    $badnames = [
        '0x0',
        'abuse',
@ -87,14 +110,17 @@ function forbidden_name($name) {
    );
 }

-function forbidden_email($email) {
+function forbidden_email($email): bool
+{
    $femail = file("/var/banned_emails.txt", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
    return in_array($email, $femail);
 }

-function forbidden_sshkey($sshkey) {
+function forbidden_sshkey($sshkey): bool
+{
    $fsshkey = file("/var/banned_sshkeys.txt", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-    foreach ($fsshkey as $line_num => $line) {
+    $fsk = [];
+    foreach ($fsshkey as $line) {
        $fsk_line = explode(' ',trim($line));
        $fsk[] = $fsk_line[1];
    }
@ -112,7 +138,7 @@ if (isset($_REQUEST["username"]) && isset($_REQUEST["email"])) {
    if ($name == "")
        $message .= "<li>fill in your desired username</li>\n";
    else {
-        if ($name != "" && strlen($name) < 2)
+        if (strlen($name) < 2)
            $message .= "<li>username is too short (2 character min)</li>\n";

        if (strlen($name) > 32)
@ -146,10 +172,10 @@ if (isset($_REQUEST["username"]) && isset($_REQUEST["email"])) {
        $message .= "<li>please explain why you're interested so we can make sure you're a real human being</li>";

    $sshkey = trim($_REQUEST["sshkey"]);
-    if ($sshkey == "" || mb_substr($sshkey, 0, 4) !== "ssh-")
+    if ($sshkey == "" || !is_ssh_pubkey($sshkey))
        $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)) {
@ -162,7 +188,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"]}
@ -174,24 +200,26 @@ $makeuser

        if (mail('sudoers', 'new tilde.team signup', $msgbody)) {
            echo '<div class="alert alert-success" role="alert">
-                    email sent! we\'ll get back to you soon (usually within a day) with login instructions! <a href="/">back to tilde.team home</a>
-                  </div>';
+                email sent! we\'ll get back to you soon (usually within a day) with login instructions! <a href="/">back to tilde.team home</a>
+                </div>';
            // temp. add to forbidden to prevent double signups (cleanup after user creation)
            file_put_contents("/var/signups_current", $name.PHP_EOL, FILE_APPEND);
            file_put_contents("/var/signups", $makeuser.PHP_EOL, FILE_APPEND);
+            // clear form fields
+            $_REQUEST["email"] = $_REQUEST["username"] = $_REQUEST["sshkey"] = $_REQUEST["interest"] = "";
        } else {
            echo '<div class="alert alert-danger" role="alert">
-                    something went wrong... please send an email to <a href="mailto:sudoers@tilde.team">sudoers@tilde.team</a> with details of what happened
-                  </div>';
+                something went wrong... please send an email to <a href="mailto:sudoers@tilde.team">sudoers@tilde.team</a> with details of what happened
+                </div>';
        }

    } else {
-        ?>
+?>
        <div class="alert alert-warning" role="alert">
            <strong>notice: </strong>
            <?=$message?>
        </div>
-        <?php
+<?php
    }
 }
 ?>
--- a/users/index.php
+++ b/users/index.php
@ -1,36 +1,31 @@
 <?php
+$filepath = __FILE__;
 include __DIR__.'/../header.php';

-$online_users = shell_exec("online-users");
+$online_users = shell_exec("online-users | head -n1 | awk '{print $3}'");
 $total_users = shell_exec("members team | wc -w");
 ?>

 <div class="row">
    <h1>users</h1>
-</div>

-<div class="row">
-    <?=$online_users?> of <?=$total_users?> total users
+    <p><a href="https://tilde.chat/kiwi/#team">
+        <img src="https://tilde.chat/badges/badge.php?channel=%23team" alt="users online in #team">
+    </a></p>
+    <p><?=$online_users?> of <?=$total_users?> total users logged in</p>
+    <p><em><a href="/tilde.24h.html"><i class="fa fa-clock-o"></i> recent updates</a></em></p>
 </div>

-<div class="row">
-    <img src="https://tilde.chat/badges/badge.php?channel=%23team" alt="users online in #team">
-</div>
-
-
 <div class="row">
    <div class="col-md-5">
-        <p><em><a href="/tilde.24h.html"><i class="fa fa-clock-o"></i> recent updates</a></em></p>
-        <br><br>
        <div class="list-group">
        <ul>
        <?php
        foreach (glob("/home/*") as $user):
-            if (!is_dir("$user/public_html")) continue;
            $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; ?>
--- a/wiki/index.php
+++ b/wiki/index.php
@ -1,22 +1,15 @@
 <?php
+$filepath = __FILE__;
 require __DIR__.'/../vendor/autoload.php';
+use tildeteam\wiki;

 $additional_head = "
-    <style>
-    :target:before {
-        content:\"\";
-        display:block;
-        height:50px; /* fixed header height*/
-        margin:-50px 0 0; /* negative fixed header height */
-    }
-    </style>
    <meta property='og:type' content='website'>
    <meta property='og:image' content='https://tilde.team/apple-icon.png'>
    <meta property='og:site_name' content='tilde.team wiki'>
 ";

-$parser = Tildeverse\Wiki\Parser::factory();
-
+$parser = wiki::factory(true);

 if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {

@ -27,6 +20,19 @@ if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
    <meta property='og:description' content='tilde.team wiki'>
    ";
    include __DIR__.'/../header.php';
+
+    $pages = [];
+    foreach (glob("pages/*.md") as $page) {
+        $yaml = $parser->parse(file_get_contents($page))->getYAML();
+        if (!$yaml["published"]) continue;
+        $pages[] = [
+            "title" => $yaml["title"],
+            "description" => $yaml["description"],
+            "name" => basename($page, ".md"),
+        ];
+    }
+    usort($pages, function($a, $b) { return $a["title"] <=> $b["title"]; });
+
    // render wiki index ?>

    <h1>tilde.team wiki</h1>
@ -38,16 +44,26 @@ if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
    </p>

    <hr>
-    <h3>pages:</h3>
+    <h2>pages:</h2>
+    <table class="table table-responsive table-hover table-striped">
+        <thead>
+            <tr>
+                <th>title</th>
+                <th>description</th>
+            </tr>
+        </thead>
+        <tbody>
+        <?php foreach ($pages as $page) { ?>
+            <tr>
+                <td><a href="<?=$page["name"]?>"><?=$page["title"]?></a></td>
+	            <td><?=$page["description"] ?? ""?></td>
+            </tr>
+        <?php } ?>
+        </tbody>
+    </table>

-    <?php
-    foreach (glob("pages/*.md") as $page) {
-        $yaml = $parser->parse(file_get_contents($page))->getYAML();
-        if (!$yaml["published"]) continue; ?>
-        <a href="<?=basename($page, ".md")?>"><?=$yaml["title"]?></a><br>
-    <?php }

-} else {
+<?php } else {

    $pg = $parser->parse(file_get_contents("pages/{$_GET["page"]}.md"));
    $yml = $pg->getYAML();
@ -62,9 +78,9 @@ if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
    // show a single page ?>

    <a href=".">&lt; ~wiki</a>
+    <h1><?=$yml['title']?></h1>

-    <hr>
-        <?=$pg->getContent()?>
+    <?=$pg->getContent()?>
    <hr>
    <a href="https://tildegit.org/team/site/src/branch/master/wiki/pages/<?=$_GET["page"]?>.md">
        <i class="fa fa-edit"></i> source
--- a/wiki/pages/account-recovery.md
+++ b/wiki/pages/account-recovery.md
@ -4,11 +4,10 @@ published: true
 title: account recovery
 description: how to get back in to your account
 category: 
-    - main
+- about
+- guides
 ---

-# account recovery
-
 if you ever lose access to your tilde.team account, there are a couple ways
 to get back in.

@ -26,10 +25,12 @@ if you've also lost your password, please send a mail to sudoers@tilde.team
 with your new pubkey from the email address you signed up with. this is the
 only thing besides sending the welcome email that we use your email address for.

-# password
+## password

 if you've forgotten your password, it's a similar process to ssh keys.

+> if you still know it, use the `passwd` command to change it.
+
 if you still have access to your shell, send a mail using `mutt` to sudoers@tilde.team
 to request a password reset.

--- a/wiki/pages/administration.md
+++ b/wiki/pages/administration.md
@ -1,13 +1,12 @@
 ---
 author: ~ben and ~khuxkm
-published: true
+published: false
 title: administration
 description: ~team admin guide
 category:
-    - main
+- admin
 ---

-# administration
 1. [adding users](#adding-users)
 2. [backups](#backups)
 3. [bypassing resource limits as services user](#bypassing-resource-limits)
--- a/wiki/pages/advanced-ssh.md
+++ b/wiki/pages/advanced-ssh.md
@ -3,28 +3,32 @@ author: ~ubergeek
 published: true
 title: advanced ssh
 description: advanced ssh tricks
-category: 
-    - main
+category:
+- technical
+- guides
 ---

-# advanced ssh
-
 Some more advanced ssh topics.

 ## SSH Tunnels

-SSH can be used as a sort of "poor man's VPN". For example, you want to get into IRC with your local client (mIRC, Weechat, etc), but your local network blocks IRC ports.
+SSH can be used as a sort of "poor man's VPN". For example, you want to get into IRC with your local client (mIRC,
+Weechat, etc), but your local network blocks IRC ports.

-However! Your local network will almost always allow SSH (sysadmins need this for most day to day work). You can connect to tilde.team, and use port forwarding to get on.
+However! Your local network will almost always allow SSH (sysadmins need this for most day to day work). You can connect
+to tilde.team, and use port forwarding to get on.

 If you are connecting from a Linux machine, you can do this:
+
 ```
 ssh -L 6667:localhost:6667 tilde.team
 ```

-After being logged in, open your local IRC client, and use 127.0.0.1:6667 for your server setting. Voila! You're now on team's IRC server.
+After being logged in, open your local IRC client, and use 127.0.0.1:6667 for your server setting. Voila! You're now on
+team's IRC server.

-What that SSH command did was open a local port tunnel (-L), using local port 6667 (6667:) pointed at localhost (From the remote's point of view), on remote port 6667 (Default IRC port).
+What that SSH command did was open a local port tunnel (-L), using local port 6667 (6667:) pointed at localhost (From
+the remote's point of view), on remote port 6667 (Default IRC port).

 Putty has the same ability (For Windows and Mac users), under Connection --> SSH --> Tunnels.

@ -32,7 +36,8 @@ You can do this for any arbitrary port.

 ## File Copying

-What if you don't want to edit files on the team server, but instead, you want to create it on your local machine? You don't want to have to copy/paste or re-type all of that, right?
+What if you don't want to edit files on the team server, but instead, you want to create it on your local machine? You
+don't want to have to copy/paste or re-type all of that, right?

 SCP to the rescue! SCP copies files over the ssh protocol. It works just like the cp command, but allows you to do this:

@ -42,15 +47,35 @@ As long as you can ssh, you can copy files to and from the remote side. It also

 `scp tilde.team:~/CrapINeedThisFileLocally.js ./AwesomeLocalJSFile.js`

+## Mount tilde folders on your machine using sshfs
+
+But what if manually downloading files, editing them, and uploading them again is too tedious? Wouldn't it be great to
+just be able to edit a file on tilde.team from your home terminal?
+
+With sshfs, you can mount a remote folder on your computer, and access it as if it were a local folder.
+
+Refer to your distribution's package manager on how to install sshfs.
+
+Once sshfs is installed, you can mount any folder on tilde.team to any folder on your machine. This example mounts your
+homefolder to `/tmp/tilde`:
+
+`mkdir -p /tmp/tilde && sshfs USERNAME@tilde.team:/home/USERNAME /tmp/tilde`
+
+You can unmount the tilde from your machine by running `umount` on the directory you mounted the directory to:
+
+`umount /tmp/tilde`
+
 ## Remote execution

 What if you don't want to really log into team.tilde, but you just need to run a command. You can do that too, with ssh!

 `ssh tilde.team ping google.com`

-The above executes the ping command from the server side of the house. The one thing you need to be careful of here are quotes and input redirection. It can have surprising affects, mixing remote and local pipes.
+The above executes the ping command from the server side of the house. The one thing you need to be careful of here are
+quotes and input redirection. It can have surprising affects, mixing remote and local pipes.

 ## SSH config
+
 Each user has their own, personal configuration for ssh. The configuration files lives at `~/.ssh/config.`

 A very common thing to do in this file is to create hosts aliases.
@ -62,8 +87,10 @@ host tilde
    LocalForward localhost:6667 localhost:6667
 ```

-There are tons of other options, including this LocalForward line to automatically set up the tunnel as show [above](#ssh-tunnels).
+There are tons of other options, including this LocalForward line to automatically set up the tunnel as
+show [above](#ssh-tunnels).

 For more information about the available options, check the man page: `man ssh_config`.

-You can set this up remotely, to make jumping to other hosts easier, or locally (If supported in your ssh setup) to make connecting easier for you.
+You can set this up remotely, to make jumping to other hosts easier, or locally (If supported in your ssh setup) to make
+connecting easier for you.
--- a/wiki/pages/bsd.md
+++ b/wiki/pages/bsd.md
@ -3,21 +3,29 @@ author: ~ben
 published: true
 title: bsd.tilde.team
 description: an alternate freebsd host for tilde.team
-category: 
-    - main
+category:
+- services
+- guides
+- technical
 ---

-# bsd.tilde.team
-
-tilde.team offers an alternate host: [bsd.tilde.team](https://bsd.tilde.team), which runs freebsd 12.
+tilde.team offers an alternate host: [bsd.tilde.team](https://bsd.tilde.team), which runs freebsd 13.

 currently it supports:

 - webhosting out of `~/public_html` at `https://<user>.bsd.tilde.team` or `https://bsd.tilde.team/~<user>`
 - email with user@bsd.tilde.team - feel free to forward this elsewhere or to your main @tilde.team address
 - finger
+- local irc server: localhost:6667 plaintext or bsd.tilde.chat:6697

-the user creation script copied over the `~/.ssh/authorized_keys` file in your $HOME on ~team. feel free to adjust as needed or holler if you need an admin for something. you should be able to just ssh user@bsd.tilde.team instead of user@tilde.team
+currently, this vm is hosted on a server i rent from hetzner in germany, so feel free to put your chat client
+etc here if you get better ping.

-there's a [mailing list thread](https://lists.tildeverse.org/hyperkitty/list/tildeteam@lists.tildeverse.org/thread/LRLAYRTHJLFQWZAXZZW62GYQLW7S2WYC/) for discussion that i'll post updates to. feel free to holler in #team on irc as well.
+the user creation script copies over the `~/.ssh/authorized_keys` file in your $HOME on ~team. feel free to adjust as
+needed or holler if you need an admin for something. you should be able to just ssh user@bsd.tilde.team instead of
+user@tilde.team
+
+there's
+a [mailing list thread](https://lists.tildeverse.org/hyperkitty/list/tildeteam@lists.tildeverse.org/thread/LRLAYRTHJLFQWZAXZZW62GYQLW7S2WYC/)
+for discussion that i'll post updates to. feel free to holler in #team on irc as well.

--- a/wiki/pages/cli-for-beginners.md
+++ b/wiki/pages/cli-for-beginners.md
@ -4,60 +4,90 @@ published: true
 title: command line for absolute beginners
 description: guide for those looking for a foothold in learning and using gnu+linux
 category:
-  - main
+- beginners
+- guides
+- technical
 ---

-# Command Line Shell, for _Absolute_ Beginners
-
-So, you want to join a public-access shell community like tilde.team, but you don't yet have experience using GNU+Linux or other UNIX-like operating systems? This tutorial is designed to give you enough guidance that you can get started and move on to successfully directing your future learning. Once you get a basic level of self-sufficiency, tilde.team is a great place to practice and learn more.
+So, you want to join a public-access shell community like tilde.team, but you don't yet have experience using GNU+Linux
+or other UNIX-like operating systems? This tutorial is designed to give you enough guidance that you can get started and
+move on to successfully directing your future learning. Once you get a basic level of self-sufficiency, tilde.team is a
+great place to practice and learn more.

 ## GNU+Linux is a text-based operating system. And it takes work and thought to start using.

-You'll find a lot of people online arguing that GNU+Linux is _not_ a text-based operating system, and that it in fact has a GUI interface just like Windows. It is true that you can use GNU+Linux through a graphical user interface (GUI) like Gnome, or that you can use services from GNU+Linux servers like tilde.team through a web interface. But the people who are so keen on GUIs are saying this to make GNU+Linux sound like an easy transition for Windows or Mac users. However: (1) to really leverage the power of GNU+Linux, you need to learn to interact with it as a text-based system, and (2) while it is different, it's not really that hard. It will take effort to learn the differences, but that effort will pay huge dividends.
+You'll find a lot of people online arguing that GNU+Linux is _not_ a text-based operating system, and that it in fact
+has a GUI interface just like Windows. It is true that you can use GNU+Linux through a graphical user interface (GUI)
+like Gnome, or that you can use services from GNU+Linux servers like tilde.team through a web interface. But the people
+who are so keen on GUIs are saying this to make GNU+Linux sound like an easy transition for Windows or Mac users.
+However: (1) to really leverage the power of GNU+Linux, you need to learn to interact with it as a text-based system,
+and (2) while it is different, it's not really that hard. It will take effort to learn the differences, but that effort
+will pay huge dividends.

 ## How do I connect to a shell server?

-The most common way to connect remote GNU+Linux system is with an SSH client. SSH stands for secure-shell. SSH allows you to make a private connection between your computer and a shell server like [tilde.team](https://tilde.team), and it ensures that nobody else along the wire can listen in on your connection. Check out [our SSH page](https://tilde.team/wiki/ssh) for information on connecting to tilde.team over SSH.
+The most common way to connect remote GNU+Linux system is with an SSH client. SSH stands for secure-shell. SSH allows
+you to make a private connection between your computer and a shell server like [tilde.team](https://tilde.team), and it
+ensures that nobody else along the wire can listen in on your connection. Check
+out [our SSH page](https://tilde.team/wiki/ssh) for information on connecting to tilde.team over SSH.

-If you are having trouble with making your first SSH connection to tilde.team, or anything else while you're learning from this tutorial, drop by the [tilde.team web chat](https://web.tilde.chat/) or email an admin for help ([sudoers@tilde.team](mailto:sudoers@tilde.team)).
+If you are having trouble with making your first SSH connection to tilde.team, or anything else while you're learning
+from this tutorial, drop by the [tilde.team web chat](https://web.tilde.chat/) or email an admin for
+help ([sudoers@tilde.team](mailto:sudoers@tilde.team)).

 ## What is a shell?

-An operating system (OS) is the nuts and bolts that makes all the parts of your computer work together for you. At its core, the OS is not friendly for day to day computer usage. A shell is a user friendly "wrapper" around the operating system that allows you to use it easily. A shell can be graphical, like the Windows or Android GUIs. Or a shell can be text-based. A text based shell, also called a command line interface (or CLI), is a tool you can use to control the operating system by sending it text commands.
+An operating system (OS) is the nuts and bolts that makes all the parts of your computer work together for you. At its
+core, the OS is not friendly for day to day computer usage. A shell is a user friendly "wrapper" around the operating
+system that allows you to use it easily. A shell can be graphical, like the Windows or Android GUIs. Or a shell can be
+text-based. A text based shell, also called a command line interface (or CLI), is a tool you can use to control the
+operating system by sending it text commands.

-What kind of things can you make the OS do? Things like opening files, listing the files in a directory, displaying the current system load, or telling you what other users are currently doing.
+What kind of things can you make the OS do? Things like opening files, listing the files in a directory, displaying the
+current system load, or telling you what other users are currently doing.

 ## What is a command?

-Commands are simple words, often abbreviated, that make the system do things when typed into the shell. Some simple examples are 'ls' which lists the files in a directory, or 'cd' which changes your location to a new directory (cd = change directory), or 'exit' which logs you out of your current shell session. There are thousands of useful commands, but you only need to know a few to get started and be self-sustaining.
+Commands are simple words, often abbreviated, that make the system do things when typed into the shell. Some simple
+examples are 'ls' which lists the files in a directory, or 'cd' which changes your location to a new directory (cd =
+change directory), or 'exit' which logs you out of your current shell session. There are thousands of useful commands,
+but you only need to know a few to get started and be self-sustaining.

-This tutorial will teach you the few commands that should allow you to take care of yourself and start down the real, longer-term path of self-directed learning. Once you're logged into tilde.team (or any GNU+Linux shell server), you can practice the following commands as you learn them.
+This tutorial will teach you the few commands that should allow you to take care of yourself and start down the real,
+longer-term path of self-directed learning. Once you're logged into tilde.team (or any GNU+Linux shell server), you can
+practice the following commands as you learn them.

 ## What are the first commands a new user should learn?

-When you're first starting to use a shell in a UNIX-like environment, you will want to be able to do the following things:
+When you're first starting to use a shell in a UNIX-like environment, you will want to be able to do the following
+things:

 1. logging in and logging out
-1. list the files or directories in a directory
-1. move between directories
-1. read, write, and save files
-1. create new files or directories
-1. move or copy files between directories
-1. delete files or directories
-1. download files from elsewhere on the internet
-1. learn more about new commands
+2. list the files or directories in a directory
+3. move between directories
+4. read, write, and save files
+5. create new files or directories
+6. move or copy files between directories
+7. delete files or directories
+8. download files from elsewhere on the internet
+9. learn more about new commands

-When you're logged into a shell, you should see a command prompt and a blinking cursor. At this point, simply type a command and hit Enter to run it. You can try this as you work through learning the commands below.
+When you're logged into a shell, you should see a command prompt and a blinking cursor. At this point, simply type a
+command and hit Enter to run it. You can try this as you work through learning the commands below.

 ### Logging In, with `ssh`

-Recall from the How-Do-I-Connect section above that you can use a SSH client to log into tilde.team. Once you're logged in, you can use the command line SSH client to log into any other shell server; in the example below, let's say you want to log into tilde.town from tilde.team.
+Recall from the How-Do-I-Connect section above that you can use a SSH client to log into tilde.team. Once you're logged
+in, you can use the command line SSH client to log into any other shell server; in the example below, let's say you want
+to log into tilde.town from tilde.team.

 Skipping some specifics for now, you can log into tilde.town from a tilde.team shell by using SSH as follows:

 > `ssh tilde.team`

-Some shell servers allow you to log in with nothing more than a username and password. But increasingly, many servers (like both tilde.team and tilde.town) require you to use ssh keys. To learn more about ssh keys, again, see our [SSH page](ssh).
+Some shell servers allow you to log in with nothing more than a username and password. But increasingly, many servers (
+like both tilde.team and tilde.town) require you to use ssh keys. To learn more about ssh keys, again, see
+our [SSH page](ssh).

 ### Logging Out, with `logout` or `exit`

@ -71,7 +101,8 @@ To list the files in a directory, simply type `ls`. This will print a list of th

 ### Changing Directories, with `cd`

-You may move from one directory to another with `cd`. Wherever you are in the file system, you can type `cd` by itself to return to your home directory:
+You may move from one directory to another with `cd`. Wherever you are in the file system, you can type `cd` by itself
+to return to your home directory:

 > `cd`

@ -81,24 +112,29 @@ Change to the directory with your html files as follows:

 ### Read the Contents of a File, with `less`

-If you're still in your public_html directory, you should see a file called 'index.php' when you use the `ls` command. Let's peek inside 'index.php' as follows:
+If you're still in your public_html directory, you should see a file called 'index.php' when you use the `ls` command.
+Let's peek inside 'index.php' as follows:

 > `less index.php`

-`less` has opened the 'index.php' file for you to read. You cannot edit it; only read it. Type `q` (quit) to stop viewing the file contents and return to the shell.
+`less` has opened the 'index.php' file for you to read. You cannot edit it; only read it. Type `q` (quit) to stop
+viewing the file contents and return to the shell.

 ### Edit and Save Changes to a File, with `nano`

-`nano` is one of many text editors availble for GNU+Linux. There are many more powerful editors, but we'll start with this one because it is simple. Let's open your 'index.php' file and make some changes.
+`nano` is one of many text editors availble for GNU+Linux. There are many more powerful editors, but we'll start with
+this one because it is simple. Let's open your 'index.php' file and make some changes.

 > `nano index.php`

-Now you're viewing the contents of 'index.php' again, but this time you can change the contents. If you don't know HTML, be careful here. Use your arrow keys to move the cursor down to the line that says the following:
+Now you're viewing the contents of 'index.php' again, but this time you can change the contents. If you don't know HTML,
+be careful here. Use your arrow keys to move the cursor down to the line that says the following:
 `<p>Just log in with your secure internet shell to change this file!</p>`

 Leave the `<p>` and `</p>` tags as they are, but change the sentence in between them.

-Now, save and quit by hitting the key combination Ctrl+x, and then typing 'y' in response to the question about wanting to save the modified buffer.
+Now, save and quit by hitting the key combination Ctrl+x, and then typing 'y' in response to the question about wanting
+to save the modified buffer.

 Now you can pull up a browser to see the change at your tilde.team URL:
 'https://tilde.team/~yourUserName'
@ -111,7 +147,8 @@ Let's create a new file in your public_html directory, called 'testing.html'.

 'testing.html' did not exist before you opened it with `nano`, so it was created for you.

-Now, add some quick contents by opening the file for editing with `nano`, and adding whatever you want. Then Ctrl+x to save, you will have created a new file.
+Now, add some quick contents by opening the file for editing with `nano`, and adding whatever you want. Then Ctrl+x to
+save, you will have created a new file.

 Type `ls` to view the contents of your directory an confirm that you did indeed make the file.

@ -119,7 +156,8 @@ Later in this tutorial, we will come back to this file and make it viewable in y

 ### Create a New Directory, with `mkdir`

-First, hop back to your home directory with the `cd` command (remember that `cd` from anywhere in the file system will take you back to your home directory).
+First, hop back to your home directory with the `cd` command (remember that `cd` from anywhere in the file system will
+take you back to your home directory).

 Now create a new directory called 'downloads' in your home directory:

@ -137,17 +175,21 @@ Move 'fileone.txt' into 'downloads':

 > `mv fileone.txt downloads/`

-Now if you `ls` the contents of your home directory, you will no longer see 'fileone.txt', because it has been moved into 'downloads'. If you 'ls' the contents of 'downloads' (a shortcut command is `ls downloads`), you will see it there.
+Now if you `ls` the contents of your home directory, you will no longer see 'fileone.txt', because it has been moved
+into 'downloads'. If you 'ls' the contents of 'downloads' (a shortcut command is `ls downloads`), you will see it there.

 Next, copy 'filetwo.txt' into 'downloads' as follows:

 > `cp filetwo.txt downloads`

-Now if you `ls` the contents of your home directory, 'filetwo.txt' will still be there. This is because `cp` made a copy of 'filetwo.txt' and put the copy in 'downloads'. It did not touch the original file in your home directory. Verify this with `ls` in your home directory and in 'downloads'.
+Now if you `ls` the contents of your home directory, 'filetwo.txt' will still be there. This is because `cp` made a copy
+of 'filetwo.txt' and put the copy in 'downloads'. It did not touch the original file in your home directory. Verify this
+with `ls` in your home directory and in 'downloads'.

 ### Delete Files and Directories, with `rm` and `rmdir`

-As long as you're in one of your own directories (e.g. your home, or 'downloads' or 'public_html'), you can create a new files. Create a new file called 'testtrash.txt':
+As long as you're in one of your own directories (e.g. your home, or 'downloads' or 'public_html'), you can create a new
+files. Create a new file called 'testtrash.txt':

 > `nano testtrash.txt`

@ -157,9 +199,12 @@ Now, you can delete the file with the `rm` (remove) command:

 > `rm testtrash.txt`

-Notice that you don't get a warning that you're about to delete it, and you don't even get a confirmation that it is deleted. You've learned your first command that you need to be careful with. If you delete an important file with `rm`, it is gone forever.
+Notice that you don't get a warning that you're about to delete it, and you don't even get a confirmation that it is
+deleted. You've learned your first command that you need to be careful with. If you delete an important file with `rm`,
+it is gone forever.

-You can delete directories the same way, only using the `rmdir` command (remove directory) instead of `rm`. If you use `mkdir testtrash`, you can then delete it as follows:
+You can delete directories the same way, only using the `rmdir` command (remove directory) instead of `rm`. If you
+use `mkdir testtrash`, you can then delete it as follows:

 > `rmdir testtrash`

@ -169,83 +214,118 @@ If you want to delete directories that still have contents in them, use the foll

 > `rm -rf directoryName`

-Be very, very careful with this command. Many a user, new and seasoned, has been stung by hastily deleting directories like this. This is also the source of the classic sysadmin joke/horror story about `rm -rf /` which deletes the entire file system.
+Be very, very careful with this command. Many a user, new and seasoned, has been stung by hastily deleting directories
+like this. This is also the source of the classic sysadmin joke/horror story about `rm -rf /` which deletes the entire
+file system.

 ### Downloading Files, with `wget`

 Now `cd` into your 'downloads' directory because we're going to use it for actual downloads.

-Use the `wget` (WWW get) command to download a text copy of this tutorial from tilde.team user cmccabe's public_html directory:
+Use the `wget` (WWW get) command to download a text copy of this tutorial from tilde.team user cmccabe's public_html
+directory:

 > `wget https://tilde.team/~cmccabe/gnu-linux-toot.txt`

-You will see output of the command that confirms it is downloading. You can also verify that it has downloaded with your `ls` command. You can also peek at the contents with the `nano` or `less` commands that you learned above.
+You will see output of the command that confirms it is downloading. You can also verify that it has downloaded with
+your `ls` command. You can also peek at the contents with the `nano` or `less` commands that you learned above.

-If you know the URL of other files you'd like to download, you can grab those too, just swapping the URL above for any URL:
+If you know the URL of other files you'd like to download, you can grab those too, just swapping the URL above for any
+URL:

 > `wget [URL here]`

-A brief note on security here, if you do pull any scripts from the Internet using `wget`, it's important that you do not execute those scripts until you've read over what it does. Otherwise, you run the risk of compromising your account or allowing other malicious actions to take place.
+A brief note on security here, if you do pull any scripts from the Internet using `wget`, it's important that you do not
+execute those scripts until you've read over what it does. Otherwise, you run the risk of compromising your account or
+allowing other malicious actions to take place.

 ### Learn More About Commands, with `man` (and `help`)

-At this point, you've learned most of the commands you need for basic self-sufficiency in a GNU+Linux shell environment. With just a few more, you can go a long way. When you want to learn more about a command, you can look at its "man page" with the `man` command. "Man pages" are the instruction manuals for most commands and programs in GNU+Linux.
+At this point, you've learned most of the commands you need for basic self-sufficiency in a GNU+Linux shell environment.
+With just a few more, you can go a long way. When you want to learn more about a command, you can look at its "man page"
+with the `man` command. "Man pages" are the instruction manuals for most commands and programs in GNU+Linux.

-Try out `man` by looking at any of the commands you've learned already (except `cd`\*). For example, `man ls` would open the man page for the `ls` command. When looking at a man page, type `q` at any time to quit and return to the shell.
+Try out `man` by looking at any of the commands you've learned already (except `cd`\*). For example, `man ls` would open
+the man page for the `ls` command. When looking at a man page, type `q` at any time to quit and return to the shell.

-The `man` command will be one of your most valuable tools for as long as you're using the GNU+Linux shell. You will always be learning new commands and new ways to use old commands, and `man` will help you do it.
+The `man` command will be one of your most valuable tools for as long as you're using the GNU+Linux shell. You will
+always be learning new commands and new ways to use old commands, and `man` will help you do it.

-\* Note: technically speaking `cd` is a shell built-in, not a command. Make a mental note of that and you can learn more about the distinction later. For now, note that you can use `help cd` to learn more about the `cd` command.
+\* Note: technically speaking `cd` is a shell built-in, not a command. Make a mental note of that and you can learn more
+about the distinction later. For now, note that you can use `help cd` to learn more about the `cd` command.

 ## Commands have options and arguments.

-When you look at the man page for a command like `ls`, you'll see in the DESCRIPTION section a number of **options** that you can use to modify how the command works. They look like `-a` or `-h` or `-l`. Try adding the `-a` option to `ls` and note the difference:
+When you look at the man page for a command like `ls`, you'll see in the DESCRIPTION section a number of **options**
+that you can use to modify how the command works. They look like `-a` or `-h` or `-l`. Try adding the `-a` option
+to `ls` and note the difference:

 > `ls -a`

-The `-a` option now lists "all" contents of your directory, including "hidden" files (aka dot files). You could combine the three options listed above in the form of `ls -alh` to list "all" files, in "long" form, and display file sizes in "human" readable format. Most commands have
+The `-a` option now lists "all" contents of your directory, including "hidden" files (aka dot files). You could combine
+the three options listed above in the form of `ls -alh` to list "all" files, in "long" form, and display file sizes in "
+human" readable format. Most commands have

-Commands also have **arguments**, or information passed into a command for some kind of processing. You have already used these arguments when you told nano to open a file: `nano testtrash.txt`. In this case, "testtrash.txt" was the argument to the nano command. You also used "testtrash.txt" as an argument to the `rm` command when you did `rm testtrash.txt`.
+Commands also have **arguments**, or information passed into a command for some kind of processing. You have already
+used these arguments when you told nano to open a file: `nano testtrash.txt`. In this case, "testtrash.txt" was the
+argument to the nano command. You also used "testtrash.txt" as an argument to the `rm` command when you
+did `rm testtrash.txt`.

-Commands will often combine options and arguments, sometimes in specific sequences. You can learn about these when read a command's man page.
+Commands will often combine options and arguments, sometimes in specific sequences. You can learn about these when read
+a command's man page.

 ## The Filesystem Hierarchy

-You already know that you get dropped into your "home" directory when you first log in. Your home directory is just one of many, many other directories on the system. All of these directories are organized under one master directory called the "root directory". The root directory is often referred to with a single forward slash, like this: /
+You already know that you get dropped into your "home" directory when you first log in. Your home directory is just one
+of many, many other directories on the system. All of these directories are organized under one master directory called
+the "root directory". The root directory is often referred to with a single forward slash, like this: /

 You can list all the directories at the root level by using the `ls` command again, as follows:

 > `ls /`

-Want to check out some of the directories you see in root? You could either `cd` into them and `ls` the contents, or just `ls` the comments directly as follows:
+Want to check out some of the directories you see in root? You could either `cd` into them and `ls` the contents, or
+just `ls` the comments directly as follows:

 > `ls /etc`

-This would display the contents of the "etc" directory, which itself lives in the "root" directory. Notice that the command uses "/" + "etc" to create a path to the destination. In "etc" is another directory called "cron.d", and you can use the same principle to view its contents:
+This would display the contents of the "etc" directory, which itself lives in the "root" directory. Notice that the
+command uses "/" + "etc" to create a path to the destination. In "etc" is another directory called "cron.d", and you can
+use the same principle to view its contents:

 > `ls /etc/cron.d`

-You now know enough to look around the file system. Note that most GNU+Linux systems (like tilde.team) adhere somewhat to an organization scheme called the Filesystem Hierarchy Standard ([Wikipedia link](https://en.wikipedia.org/wiki/Filesystem_Hierarchy_Standard)). This is another subject for you to read up on later.
+You now know enough to look around the file system. Note that most GNU+Linux systems (like tilde.team) adhere somewhat
+to an organization scheme called the Filesystem Hierarchy
+Standard ([Wikipedia link](https://en.wikipedia.org/wiki/Filesystem_Hierarchy_Standard)). This is another subject for
+you to read up on later.

 ## How can I keep my things private, or share them with others?

-As you explore the filesystem, you might bump into some directories that won't let you in. For example, if you try to `cd` into the home directory for the root user (not the same as the root directory), you'll see this error: "/root: Permission denied". This is because GNU+Linux systems maintain a "mode" for each file that limits which users can read, write or execute it.
+As you explore the filesystem, you might bump into some directories that won't let you in. For example, if you try
+to `cd` into the home directory for the root user (not the same as the root directory), you'll see this error: "/root:
+Permission denied". This is because GNU+Linux systems maintain a "mode" for each file that limits which users can read,
+write or execute it.

 If you don't own a file, then you can't change its mode. This is a basic security principle in GNU+Linux systems.

-For the files you own (i.e. the files within your home directory), you can change the file modes yourself. You do this using the "change mode" command, `chmod`.
+For the files you own (i.e. the files within your home directory), you can change the file modes yourself. You do this
+using the "change mode" command, `chmod`.

-Each file has three permission levels: for the file owner, for members of the file's group\*, and for all other system users. For each level, you can permit any combination of "read", "write", and "execute" permissions.
+Each file has three permission levels: for the file owner, for members of the file's group\*, and for all other system
+users. For each level, you can permit any combination of "read", "write", and "execute" permissions.

 (/\* Do a web search for GNU+Linux users and groups to learn more about this important concept.)

-You can change a file's mode with `chmod` one of two ways. The first is a symbolic way in which you add or subtract 'r', 'w', and/or 'x' (read, write, execute) to 'u', 'g', or 'o' (user, group, or other). For example:
+You can change a file's mode with `chmod` one of two ways. The first is a symbolic way in which you add or subtract '
+r', 'w', and/or 'x' (read, write, execute) to 'u', 'g', or 'o' (user, group, or other). For example:

 > `chmod g+x filename.txt`

 This gives 'execute' privileges to members of filename.txt's group.

-You can also use `chmod` numerically, through which you may set the user, group and other permissions all at once. For example:
+You can also use `chmod` numerically, through which you may set the user, group and other permissions all at once. For
+example:

 > `chmod 755 filename.txt`

@ -257,7 +337,8 @@ To get an interactive, visual feel for numeric file modes, try the tilde.team [f

 --

-Finally, remember that 'testing.html' file we made above? Let's use that as an example of how you can control who can view your files. Use the following to make the 'testing.html' file visible in your website:
+Finally, remember that 'testing.html' file we made above? Let's use that as an example of how you can control who can
+view your files. Use the following to make the 'testing.html' file visible in your website:

 > cd ## to return you to your home directory
 > `chmod 644 public_html testing.html`
@ -268,11 +349,14 @@ https://tilde.team/~username/testing.html

 ## The End (of The Beginning)

-There you have it -- you know about logging in, using basic shell commands, and the file system, and you're now self-sustaining (and a little more).
+There you have it -- you know about logging in, using basic shell commands, and the file system, and you're now
+self-sustaining (and a little more).

-tilde.team is about community, but it is about community of individuals who work hard to learn. what you have just leaned will give you a platform on which you can learn by doing and trying things out.
+tilde.team is about community, but it is about community of individuals who work hard to learn. what you have just
+leaned will give you a platform on which you can learn by doing and trying things out.

-Below are some other common programs you'll likely want to use. Most of these have man pages, so you can read more about them. Others you'll just have to try out to see how they work.
+Below are some other common programs you'll likely want to use. Most of these have man pages, so you can read more about
+them. Others you'll just have to try out to see how they work.

 ## List of Common Programs

@ -300,7 +384,8 @@ Below are some other common programs you'll likely want to use. Most of these ha

 `tilde` - a manager for user-submitted scripts

-`webirc` - register for [thelounge](https://irc.tilde.team) webchat (in case you don't like weechat or irssi, or want to get push notifications for mentions and query messages :)
+`webirc` - register for [thelounge](https://irc.tilde.team) webchat (in case you don't like weechat or irssi, or want to
+get push notifications for mentions and query messages :)

 `chat` - open `weechat` preconnected to our irc

@ -310,7 +395,8 @@ And in this corner, we shall describe some common activities people perform in a

 ## Other Intro-to-Linux Material

-Not suprisingly, you'll find a lot of other intro material online or in your local library. Here are a few that have been mentioned by tilde.team members:
+Not suprisingly, you'll find a lot of other intro material online or in your local library. Here are a few that have
+been mentioned by tilde.team members:

 Terminus - an interactive game-like introduction to shell commands
 http://www.mprat.org/Terminus/
--- a/wiki/pages/code-of-conduct.md
+++ b/wiki/pages/code-of-conduct.md
@ -3,80 +3,82 @@ author: ~ben
 published: true
 title: code of conduct
 description: tilde.team code of conduct
-category: 
-    - main
+category:
+- beginners
+- about
 ---

-# code of conduct
-
 > **tl;dr** learn by doing and helping. be excellent to each other. have fun!

-
 ## 1. purpose

-a primary goal of tilde.team is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. as such, we are committed to providing a friendly, safe and welcoming environment for all.
+a primary goal of tilde.team is to be inclusive to the largest number of contributors, with the most varied and diverse
+backgrounds possible. as such, we are committed to providing a friendly, safe and welcoming environment for all.

-this code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
+this code of conduct outlines our expectations for all those who participate in our community, as well as the
+consequences for unacceptable behavior.

 we invite all those who participate in tilde.team to help us create safe and positive experiences for everyone.

-
 ## 2. tilde.team mission

 [full goals/roadmap document](https://tilde.team/wiki/goals-roadmap)

 **tilde.team exists to foster an engaged community for socializing, learning, and making cool stuff**

-in a mass-media age, it is up to small, intentional communities to gather and work together to provide a space outside of the advertising-laden, profit-seeking, corporate-owned world of social media.
-
-to that end, tilde.team strives to be a radically inclusive community where people of all backgrounds and all technological experience levels can come together to learn, to teach, and to delight in one another's creations.
+in a mass-media age, it is up to small, intentional communities to gather and work together to provide a space outside
+of the advertising-laden, profit-seeking, corporate-owned world of social media.

+to that end, tilde.team strives to be a radically inclusive community where people of all backgrounds and all
+technological experience levels can come together to learn, to teach, and to delight in one another's creations.

 ## 3. expected behavior

 the following behaviors are expected and requested of all community members:

-  * participate in an authentic and active way. in doing so, you contribute to the health and longevity of this community.
-  * exercise consideration and respect in your speech and actions.
-  * attempt collaboration before conflict.
-  * refrain from demeaning, discriminatory, or harassing behavior and speech.
-  * be mindful of your surroundings and of your fellow participants.
-  * teach when people need help. don't do it for them.
-
+* participate in an authentic and active way. in doing so, you contribute to the health and longevity of this community.
+* exercise consideration and respect in your speech and actions.
+* attempt collaboration before conflict.
+* refrain from demeaning, discriminatory, or harassing behavior and speech.
+* be mindful of your surroundings and of your fellow participants.
+* teach when people need help. don't do it for them.

 ## 4. unacceptable behavior

 the following behaviors are considered harassment and are unacceptable within our community:

-  * violence, threats of violence or violent language directed against another person.
-  * sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
-  * posting or displaying sexually explicit or violent material.
-  * posting or threatening to post other people's personally identifying information ("doxing").
-  * personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
-  * unwelcome sexual attention. this includes sexualized comments or jokes.
-  * deliberate intimidation, stalking or following.
-
+* violence, threats of violence or violent language directed against another person.
+* sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
+* posting or displaying sexually explicit or violent material.
+* posting or threatening to post other people's personally identifying information ("doxing").
+* personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
+* unwelcome sexual attention. this includes sexualized comments or jokes.
+* deliberate intimidation, stalking or following.
+* attempting to disrupt the normal operation of tilde.team (colloquially "hacking the Gibson"). if you think something's
+  insecure and want to poke at it, tell us first.

 ## 5. consequences of unacceptable behavior

-unacceptable behavior from any community member, including sponsors and those with decision-making authority (sudo), will not be tolerated.
+unacceptable behavior from any community member, including sponsors and those with decision-making authority (sudo),
+will not be tolerated.

 anyone asked to stop unacceptable behavior is expected to comply immediately.

-if a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from tilde.team without warning (meaning your account will be terminated and all user data deleted).
-
+if a community member engages in unacceptable behavior, the community organizers may take any action they deem
+appropriate, up to and including a temporary ban or permanent expulsion from tilde.team without warning (meaning your
+account will be terminated and all user data deleted).

 ## 6. reporting guidelines

-if you are subject to or witness unacceptable behavior, or have any other concerns, please contact an admin (see info below).
+if you are subject to or witness unacceptable behavior, or have any other concerns, please contact an admin (see info
+below).

 additionally, help engaging with law enforcement is available.

-
 ## 7. addressing grievances

-if you feel you have been falsely or unfairly accused of violating this code of conduct, use the contact info below to send a concise description of your grievance.
-
+if you feel you have been falsely or unfairly accused of violating this code of conduct, use the contact info below to
+send a concise description of your grievance.

 ## 8. scope

@ -85,28 +87,27 @@ we expect all tilde.team members to abide by this code of conduct while:
 * engaging with other members
 * publishing content on tilde.team

-
 ## 9. contact info

 tilde.team admins:

 you can also send a mail to [sudoers@tilde.team](mailto:sudoers@tilde.team) to make sure we all get it.

-* [ben](https://tilde.team/~ben/): 
-  - [ben@tilde.team](mailto:ben@tilde.team)
-  - on irc `/query ben hello`
+* [ben](https://tilde.team/~ben/):
+    - [ben@tilde.team](mailto:ben@tilde.team)
+    - on irc `/query ben hello`
 * [khuxkm](https://tilde.team/~khuxkm/):
-  - [khuxkm@tilde.team](mailto:khuxkm@tilde.team)
-  - on irc `/query khuxkm hello`
+    - [khuxkm@tilde.team](mailto:khuxkm@tilde.team)
+    - on irc `/query khuxkm hello`
 * [cmccabe](https://tilde.team/~cmccabe/):
-  - [cmccabe@tilde.team](mailto:cmccabe@tilde.team)
-  - on irc `/query cmccabe hello`
-
+    - [cmccabe@tilde.team](mailto:cmccabe@tilde.team)
+    - on irc `/query cmccabe hello`

 ## 10. license and attribution

-this code of conduct is based on [citizencodeofconduct.org](http://citizencodeofconduct.org/) and [tilde.town coc](http://tilde.town/wiki/conduct.html) under the terms of the [creative commons attribution-sharealike license](http://creativecommons.org/licenses/by-sa/3.0/).
-
+this code of conduct is based on [citizencodeofconduct.org](http://citizencodeofconduct.org/)
+and [tilde.town coc](http://tilde.town/wiki/conduct.html) under the terms of
+the [creative commons attribution-sharealike license](http://creativecommons.org/licenses/by-sa/3.0/).

 ## 11. terms of service

--- a/wiki/pages/disk-usage.md
+++ b/wiki/pages/disk-usage.md
@ -3,16 +3,41 @@ author: ~ben
 published: true
 title: disk usage tools and guidelines
 description: tips and tricks for keeping track of your disk usage on tilde.team and elsewhere
-category: 
-    - main
+category:
+- about
+- guidelines
 ---

-# disk usage
-
 files tend to keep growing and growing until you run out of disk space all of a sudden.

 let's take a look at some tools to keep an eye on disk usage.

+## tilde.team guidelines
+
+even though we have plenty of disk space to go around on tilde.team,
+we request that you keep your usage below 1 gb.
+
+a good rule of thumb is to consider if _all_ teammates
+were to use the same amount of resources and how that would affect
+the experience for everyone else.
+
+> as of march 2022, disk quotas will now be enforced.
+> 1gb soft limit where you will get reminded.
+> 3gb hard limit where you will no longer be able to write more files.
+
+admins regularly take a look at disk usage in `/home` and may
+request that you delete large or unnecessary files.
+
+please check with admins if you expect to use a lot of disk
+for a short period of time so we can adjust your quota temporarily.
+
+## handy tools
+
+### quota
+
+run `quota` to see your current usage and grace period (if you're over).
+add `-s` to print using friendlier units.
+
 ### du

 `du` (short for `d`isk `u`sage) is the go-to tool.
@ -26,14 +51,14 @@ common switches include:
 example:

 to see the disk usage of the current directory, run:
-    du -sh
+du -sh

 check the manpage for more information and additional switches

 ### ncdu

 `ncdu` (short for `nc`urses `d`isk `u`sage) is extremely useful for visualizing
-disk usage. 
+disk usage.

 call `ncdu` with no args to recurse starting in the current directory or
 pass a dir name to start there
@ -53,18 +78,3 @@ disk usage
 don't forget to use `-h` to get human readable units.


-## tilde.team guidelines
-
-even though we have plenty of disk space to go around on tilde.team,
-we request that you try to keep your usage below 1 gb.
-
-a good rule of thumb is to consider if _all_ teammates
-were to use the same amount of resources and how that would affect
-the experience for everyone else.
-
-admins occasionally take a look at disk usage in `/home` and may
-request that you delete large or unnecessary files.
-
-please check with admins if you expect to use a lot of disk
-for a short period of time so we don't bother you excessively.
-
--- a/wiki/pages/domains.md
+++ b/wiki/pages/domains.md
@ -3,31 +3,31 @@ author: ~ben
 published: true
 title: domains
 description: domains associated with tilde.team
-category: 
-    - main
+category:
+- about
+- services
 ---

-# tilde.team domains
-
-because [~ben](https://tilde.team/~ben/) hoards domain names, the following domains are associated with tilde.team and/or the tildeverse somehow:
+because [~ben](https://tilde.team/~ben/) hoards domain names, the following domains are associated with tilde.team
+and/or the tildeverse somehow:

 * [fuckup.club](http://fuckup.club) - alias
 * [nand.sh](https://nand.sh/) - alias
 * [ttm.sh](https://ttm.sh/) - url shortener
-* [tild3.org](https://tild3.org/) - alias *note*: this is tentatively planned to be decommissioned
+* [tild3.org](https://tild3.org/) - alias
 * [tilde.chat](https://tilde.chat/) - irc net
-* [tilde.life](http://tilde.life/) - redirect
 * [tilde.news](https://tilde.news/) - lobste.rs clone
 * [tilde.site](https://tilde.site/) - alias
-* [tilde.wiki](https://tilde.wiki/) - alias of [tilde.team wiki](https://tilde.team/wiki/)
+* [tilde.wiki](https://tilde.wiki/) - tildeverse mediawiki
 * [tilde.zone](https://tilde.zone/) - mastodon and related stuff
 * [tildegit.org](https://tildegit.org/) - gitea
 * [tilderadio.org](https://tilderadio.org/) - tildeverse radio
 * [tildeteam.net](https://tildeteam.net/) - alias
 * [tildeteam.org](https://tildeteam.org/) - alias
-* [tildeverse.net](https://tildeverse.net/) - the tildeverse! (registered due to impending .org price hikes)
+* [tildeverse.net](https://tildeverse.net/) - the tildeverse!
 * [tildeverse.org](https://tildeverse.org/) - the tildeverse!

 aliases can be used as-is, where redirects will simply change to a tilde.team url.

-note that redirects do not have ssl certs. if you have a cool project that could use one of the not sure or redirect domains, let me know.
+note that redirects do not have ssl certs. if you have a cool project that could use one of the not sure or redirect
+domains, let me know.
--- a/wiki/pages/email.md
+++ b/wiki/pages/email.md
@ -4,11 +4,10 @@ published: true
 title: email
 description: email settings for tilde.team
 category:
-  - main
+- services
+- guides
 ---

-# email
-
 tilde.team has a mailserver. here are your options:

 ### clients and connection settings
@ -17,52 +16,74 @@ tilde.team has a mailserver. here are your options:
 - alpine - should work out of the box
 - [webmail](https://mail.tilde.team)
 - imap/smtp
-  - some clients will autoconfigure (tested with thunderbird)
-  - email address: username@tilde.team (or any of the aliased [domains](domains))
-  - username: username (without the domain)
-  - password: your shell password
-  - port info:
-    - imap: imap.tilde.team port 143 (starttls)
-    - imaps: imap.tilde.team port 993 (tls)
-    - pop3: pop3.tilde.team port 995 (tls)
-    - smtp: smtp.tilde.team port 587 (starttls)
-    - smtps: smtp.tilde.team port 465 (tls)
+    - some clients will autoconfigure (tested with thunderbird)
+    - email address: username@tilde.team (or any of the aliased [domains](domains))
+    - username: username (without the domain)
+    - password: your shell password
+
+#### connection info
+
+| protocol | hostname        | port | security |
+|----------|-----------------|------|----------|
+| imap     | imap.tilde.team | 143  | starttls |
+| imaps    | imap.tilde.team | 993  | tls      |
+| pop3s    | pop.tilde.team  | 995  | tls      |
+| smtp     | smtp.tilde.team | 587  | starttls |
+| smtps    | smtp.tilde.team | 465  | tls      |
+
+note: these domains all resolve to the same IP of our main server.

 ### alternate domains and addresses

-because [~ben](https://tilde.team/~ben/) hoards domain names, you can 
+because [~ben](https://tilde.team/~ben/) hoards domain names, you can
 use any of the [domains on this list](domains) with your tildemail:

-mail sent to yourusername@ any of those domains will end up in your 
+mail sent to yourusername@ any of those domains will end up in your
 inbox. most clients will allow you to add additional identities/aliases.

-additionally, any address with a `+` and arbitrary text behind it 
+additionally, any address with a `+` and arbitrary text behind it
 will be forwarded to your email: ie. `yourusername+somethingcool@tildeteam.org`.
 plus-addresses are very useful for filtering mail.

+### outlook
+For outlook, there's a specific setup - if you have to use it and prefer to not
+have multiple email clients, you can do this.
+
+1. Run `outlook.exe /manageprofiles` and make sure outlook is closed before hand
+2. Now you should have a windows with three options, click `email accounts...`
+3. Click on `New` in the first tab to create a new email account
+4. Select manual setup or additional server types and then select `POP or IMAP`
+5. Fill the servers in using the table. Not it won't work yet as we need to do some things.
+6. After entering the details on the page, select `More Settings`, go to `Outgoing Server` 
+   and select `Log on using` and fill the username (without domain) and password
+7. Then go into the `Advanced` tab and fill in the ports and connection types as per the table.
+   Make sure all the ports are correct and click `ok` and then finally click `next`
+
+Everything should now be setup.
+
 ### forwarding and sieve

-if you would like your tildemail to be forwarded somewhere else, put that 
+if you would like your tildemail to be forwarded somewhere else, put that
 email address in a file called `~/.forward`

 ```bash
 echo myotheraddress@example.com > ~/.forward
 ```

-we also have [sieve](http://sieve.info) and 
-[managesieve](https://wiki1.dovecot.org/ManageSieve) support.
+we also have [sieve](http://sieve.info) and
+[managesieve](https://doc.dovecot.org/admin_manual/pigeonhole_managesieve_server/) support.

-scripts belong in `~/sieve/`, with the active sieve script 
+scripts belong in `~/sieve/`, with the active sieve script
 named `~/.dovecot.sieve` (to conform with managesieve).

 here are some [example sieve scripts](
-https://wiki.dovecot.org/Pigeonhole/Sieve/Examples)
+https://doc.dovecot.org/configuration_manual/sieve/examples/)

-managesieve is available on the default port (4190) if you want 
+managesieve is available on the default port (4190) if you want
 to use an external managesieve client (like the [thunderbird add-on](
 https://github.com/thsmi/sieve)).

-[our webmail](https://mail.tilde.team/#/settings/filters) is pre-configured 
+[our webmail](https://mail.tilde.team/#/settings/filters) is pre-configured
 to manage your sieve scripts.

 ---
--- a/wiki/pages/finger.md
+++ b/wiki/pages/finger.md
@ -4,16 +4,21 @@ published: false
 title: finger
 description: finger as a social network
 category:
-  - main
+- publishing
+- services
+- guides
 ---

-# finger
+the [finger protocol](https://en.wikipedia.org/wiki/Finger_protocol) was created way back in 1977. its purpose was to
+display information about the queried user of a system, or all the users of a system.

-the [finger protocol](https://en.wikipedia.org/wiki/Finger_protocol) was created way back in 1977. its purpose was to display information about the queried user of a system, or all the users of a system.
+it fell out of use in the 1990s due to various security concerns. the old finger daemons were buggy and easily
+exploited, while the information garnered from a query could be used for social engineering attacks. nowadays, the
+finger daemons have been refined and are no longer so vulnerable.

-it fell out of use in the 1990s due to various security concerns. the old finger daemons were buggy and easily exploited, while the information garnered from a query could be used for social engineering attacks. nowadays, the finger daemons have been refined and are no longer so vulnerable.
-
-in the post-facebook world, new types of social networks are popping up. the latest in this movement is a resurgence of the finger protocol. what follows is a rough guide for getting yourself up to speed with finger on [tilde.team](https://tilde.team).
+in the post-facebook world, new types of social networks are popping up. the latest in this movement is a resurgence of
+the finger protocol. what follows is a rough guide for getting yourself up to speed with finger
+on [tilde.team](https://tilde.team).

 ## tilde.team specifics

@ -29,7 +34,8 @@ the standard query for finger is simply
 finger user@host
 ```

-which displays login name, home directory, shell, real name, current login time, idle time, whether or not the user has mail, and the contents of the user's ~/.plan file. Here is an example of the output:
+which displays login name, home directory, shell, real name, current login time, idle time, whether or not the user has
+mail, and the contents of the user's ~/.plan file. Here is an example of the output:

 ```
 Login: username                          Name: Bob Bobson XXII
@ -44,10 +50,14 @@ hey hey hey everybody!

 ## .plan

-The ~/.plan file displayed at the end of the finger query response allows for some customization. You can put literally any text you want there. Status updates, summaries, etc. This little file allows us to use finger as a rudimentary social network.
+The ~/.plan file displayed at the end of the finger query response allows for some customization. You can put literally
+any text you want there. Status updates, summaries, etc. This little file allows us to use finger as a rudimentary
+social network.

-For example, say you want to use it as a personal summary, like having a blurb about what you're working on. Place the statement into ~/.plan and you're ready to go!
+For example, say you want to use it as a personal summary, like having a blurb about what you're working on. Place the
+statement into ~/.plan and you're ready to go!

-For a more traditional social network style format, put dated and timed status updates as if you're tooting on a mastodon instance. The sky's the limit! Well, actually, text is the limit. But you get the idea. Right?
+For a more traditional social network style format, put dated and timed status updates as if you're tooting on a
+mastodon instance. The sky's the limit! Well, actually, text is the limit. But you get the idea. Right?

 hope to see you on finger soon!
--- a/wiki/pages/gemini-cgi.md
+++ b/wiki/pages/gemini-cgi.md
@ -0,0 +1,94 @@
+---
+author: ~khuxkm
+published: true
+title: gemini cgi guide
+description: a guide to using CGI on gemini
+category:
+- publishing
+- guides
+- technical
+---
+
+## where to put CGI scripts
+
+you can put CGI scripts anywhere. as long as you make the file executable and 
+have it output the correct format for gemini. the server calls a new instance 
+of the program for every request it has to handle, meaning that data isn't 
+saved between runs unless you manually save the data to a file or database and 
+load the data on the next run.
+
+## what languages can be used to write CGI
+
+any language that can read environment variables can be used for CGI. even 
+shell scripting can be used for CGI, given you provide the correct shebang.
+
+## how to write a gemini CGI script
+
+these are the environment variables gemserv (our trusty gemini server) gives a 
+CGI program:
+
+ - `GATEWAY_INTERFACE` - always `CGI/1.1` in our case
+ - `GEMINI_URL` - the full URL used to request the page, including any query 
+strings
+ - `PATH_INFO` - any extra path after the script itself (for instance, 
+`gemini://tilde.team/~khuxkm/test.cgi/test/one` gives a `PATH_INFO` of 
+`/test/one`)
+ - `REMOTE_ADDR`, `REMOTE_HOST`, `REMOTE_PORT` - the addr/host/port of the 
+connecting client, the former two useful for rate-limiting
+ - `SCRIPT_NAME` - the path component of the URL that corresponds to the script 
+being called
+ - `SERVER_NAME` - the name of the server, in our case `tilde.team`
+ - `SERVER_PROTOCOL` - always `GEMINI` in our case
+ - `SERVER_SOFTWARE` - always `gemserv` in our case
+ - `LC_CTYPE` - always `C.UTF-8` in our case (allows for UTF-8 output)
+
+also, if the user supplies a cert:
+
+ - `AUTH_TYPE` - always `Certificate` if present; if not present, no cert is 
+supplied
+ - `TLS_CLIENT_HASH` - the hash of the certificate, prepended with the hash type
+ - `REMOTE_USER` - the Common Name of the certificate
+
+in order to write a CGI program, simply use these environment variables to 
+figure out what you want to do and then do it. for a simple hello world:
+
+```
+#!/bin/sh
+printf '20 text/gemini\r\n'
+printf 'Hello world from CGI!\r\n'
+```
+
+do note that the first line MUST use \r\n as a terminator. after that, if 
+you're serving gemtext, you can use whatever LF/CRLF you want for line endings 
+as long as you stay consistent.
+
+for a more complex hello world that asks for input, here's a python script that 
+asks for your name and says hello to you:
+
+```
+#!/usr/bin/python3
+from urllib.parse import unquote
+from os import environ
+from sys import exit
+
+if "QUERY_STRING" not in environ:
+    print("10 Please enter your name",end="\r\n")
+    exit()
+name = unquote(environ["QUERY_STRING"])
+
+print("20 text/gemini",end="\r\n")
+print(f"Hello {name}!")
+```
+
+remember, anything that can read environment variables and write to stdout can 
+be used to make CGI, as long as the server can figure out how to execute it.
+
+##how to set a CGI script as executable
+
+The CGI script must be marked as executable in order to actually run. 
+
+To make the script executable, run this command:
+
+```
+chmod +x SCRIPT_NAME.cgi
+```
--- a/wiki/pages/gemini.md
+++ b/wiki/pages/gemini.md
@ -4,11 +4,11 @@ published: true
 title: gemini
 description: gemini hosting on tilde.team
 category:
-    - main
+- publishing
+- services
+- guides
 ---

-# gemini
-
 tilde.team offers gemini hosting!

 see our homepage for a list of users.
@ -36,4 +36,6 @@ here's a simple example in sh

 only the first line of the file MUST send `\r\n`

+for more info see [the CGI page](https://tilde.team/wiki/gemini-cgi)
+
 see you in geminispace and feel free to stop by #gemini on irc to discuss!
--- a/wiki/pages/getting-started.md
+++ b/wiki/pages/getting-started.md
@ -4,12 +4,13 @@ published: true
 title: getting started
 description: tilde.team getting started guide
 category:
-  - main
+- beginners
+- technical
+- guides
 ---

-# getting started
-
-this guide is not very thorough or complete. if you want something nicer, try [our cli for beginners article](cli-for-beginners).
+this guide is not very thorough or complete. if you want something nicer,
+try [our cli for beginners article](cli-for-beginners).

 ---

@ -36,12 +37,12 @@ New to the command line and all this webby cowfoolery? You're in luck! Here's a
 - `ssh your_username@tilde.team`
 - Enter your ssh key passphrase (if you set one).

-
 ### Legacy Windows

 - [git bash](https://gitforwindows.org) included with a standard git install
 - [msys2](https://msys2.github.io) is quite nice and has support for [mosh](https://mosh.org)
- another option is to use [WSL (windows subsystem for linux)](https://docs.microsoft.com/en-us/windows/wsl/install-win10)
+- another option is to
+  use [WSL (windows subsystem for linux)](https://docs.microsoft.com/en-us/windows/wsl/install-win10)

 ### Linux

@ -51,7 +52,8 @@ New to the command line and all this webby cowfoolery? You're in luck! Here's a

 ### MacOS

- Browse to Applications/Utilities/Terminal and launch Terminal (or press cmd+space, start typing Terminal, and press return)
+- Browse to Applications/Utilities/Terminal and launch Terminal (or press cmd+space, start typing Terminal, and press
+  return)
 - `ssh your_username@tilde.team`
 - Enter your ssh key passphrase (if you set one).

@ -68,7 +70,8 @@ Type: `ls` to see where you are. You should see a directory called "public_html"
 Type: `cd public_html` to move into that folder. (cd stands for change directory.)

 Type: `ls` to see where you are. You should see your index.php file
-Editing your index.php file
+
+## Editing your index.php file

 Type: `nano index.php` to open your index.php file and begin editing

--- a/wiki/pages/goals-roadmap.md
+++ b/wiki/pages/goals-roadmap.md
@ -3,66 +3,65 @@ author: ~ben
 published: false
 title: goals and roadmap
 description: tilde.team roadmap and goals list
-category: 
-    - main
+category:
+- about
 ---

-# tilde.team goals and roadmap
+[living draft of this document](https://pad.tildeverse.org/code/#/2/code/edit/RFBUqXec+9+MlZzx4mnhU3ps/)

-[living draft of this document](https://pad.tilde.team/code/#/2/code/edit/RFBUqXec+9+MlZzx4mnhU3ps/)
+these ideas are partly about building one system (in this case, tilde.team) but also about supporting a
+broader ecosystem of interconnected systems.

-these ideas are partly about building one system (in this case, tilde.team) but also about supporting a 
-broader ecosystem of inter-connected systems.
+1. develop a clear system identity as an alternative social environment for the technically-inclined;
+   specifically, serving as a non-commercial alternative to the mainstream, corporate-owned media and social media.
+   the dual points of (1) an alternative social/communications medium and (2) technically inclined user base are  
+   important because, together, they put the users in the role of protecting (and enjoying!) the tools of
+   communication that are currently being neutered by corporate commodification of the www.

-1. develop a clear system identity as an alternative social environment for the techncially-inclined; 
-specifically, serving as a non-commercial alternative to the mainstream, corporate-owned media and social media. 
-the dual points of (1) an alternative social/communications medium and (2) technically inclined user base are  
-important because, together, they put the users in the role of protecting (and enjoying!) the tools of 
-communication that are currently being neutered by corporate commodification of the www.
+2. related to #1, focus on cultivating a technically-inclined user base that is aware of the societal value of
+   non-commercial, alternative communication and social media. (not all users have to be code wizards, but it's safe
+   to assume that the very premise of a command-line platform will weed out pure-GUI people.)

-2. related to #1, focus on cultivating a technically-inclined user base that is aware of the societal value of 
-non-commercial, alternative communication and social media. (not all users have to be code wizards, but it's safe 
-to assume that the very premise of a command-line platform will weed out pure-GUI people.)
-
-3. provide tools, resources and encouragement for users to develop ideas and best practices for the next 
-generation of public access unix systems (in this case, in the form of a tilde box [1]).  the "next generation" is 
-always ahead of the present, so this implies that the system is in a constant state of development and 
-self-improvement, with a continually rolling set of goals, and regular testing and evaluation of experimental 
-projects. --all of which is powered by user involvement in a brainstorming/experimenting/teaching/learning/doing 
-model.
+3. provide tools, resources and encouragement for users to develop ideas and best practices for the next
+   generation of public access unix systems (in this case, in the form of a tilde box [1]). the "next generation" is
+   always ahead of the present, so this implies that the system is in a constant state of development and
+   self-improvement, with a continually rolling set of goals, and regular testing and evaluation of experimental
+   projects. --all of which is powered by user involvement in a brainstorming/experimenting/teaching/learning/doing
+   model.

 4. related to #3, really emphasize that learning through doing is a core theme of the system.

-5. serve partly as a meta-community among other tildes and pubnixes, both spreading best practices to them and 
-learning from experiences from them.
+5. serve partly as a meta-community among other tildes and pubnixes, both spreading best practices to them and
+   learning from experiences from them.

-6. through this development (#5) of interconnections among similar communities, develop trusted individual-based 
-communication networks among many similar systems. here's where that federation concept comes in, possibly 
-allowing people to have a 'home' system, and to use those credentials to visit other systems as well.
+6. through this development (#5) of interconnections among similar communities, develop trusted individual-based
+   communication networks among many similar systems. here's where that federation concept comes in, possibly
+   allowing people to have a 'home' system, and to use those credentials to visit other systems as well.

 7. last but absolutely not least --> MAKE IT FUN!  it should not be a bitter place to sulk or rant about the
-mainstream. it should be a social environment in which users can go wild and push their creative skills to the 
-limit. it should be a place to appreciate what does not exist on facebook and other exploitative commercial 
-environments.
+   mainstream. it should be a social environment in which users can go wild and push their creative skills to the
+   limit. it should be a place to appreciate what does not exist on facebook and other exploitative commercial
+   environments.

 8. idea mill:
-* if software development is a main activity to be encouraged among the users, provide a forum for saying "here's an idea; who wants to develop it?"
-    * this could happen somewhere on the [forum](https://forum.tilde.team) (which would also need some love from the devs)
-* this would allow people to find co-developers, or to allow non-devs to give devs good ideas.

+* if software development is a main activity to be encouraged among the users, provide a forum for saying "here's an
+  idea; who wants to develop it?"
+    * this could happen somewhere on the [forum](https://forum.tilde.team) (which would also need some love from the
+      devs)
+* this would allow people to find co-developers, or to allow non-devs to give devs good ideas.

 ## future plans

 * ldap auth
-* nextcloud?
-* onlyoffice
-* mumble/teamspeak
+* nextcloud? ✅
+* onlyoffice ✅
+* mumble/teamspeak ✅
 * ~ben shouldn't be the single point of failure. need a way to pass command to another admin if i go MIA.

-
 ## to do

 * come up with a community charter
-* terms of use
+* terms of use ✅
 * aup
 * better documentation
--- a/wiki/pages/gopher.md
+++ b/wiki/pages/gopher.md
@ -4,11 +4,11 @@ published: true
 title: gopher
 description: gopher server and proxy
 category:
-    - main
+- guides
+- services
+- publishing
 ---

-# gopher
-
 the [gopher protocol](http://en.wikipedia.org/wiki/Gopher_(protocol)) was 
 created in 1991. it didn't survive long due to [draconic licensing](
    http://www.nic.funet.fi/pub/vms/networking/gopher/gopher-software-licensing-policy.ancient).
--- a/wiki/pages/irc.md
+++ b/wiki/pages/irc.md
@ -3,18 +3,19 @@ author: ~ben
 published: true
 title: irc
 description: irc information
-category: 
-    - main
+category:
+- guides
+- technical
+- beginners
 ---

-# [tildeverse irc](https://tilde.chat)
-
 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).
+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/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
 - team.tilde.chat port 6697 with ssl

@ -39,40 +40,42 @@ location (`~/.weechat/relay_socket`). to get started using it, follow these step
 1. in weechat:
    * `/relay add unix.weechat %h/relay_socket`
    * `/set relay.network.password mysupersecretpassword` - don't use this password
-        of course. note that you might already have this set.
+      of course. note that you might already have this set.

-1. at your shell:
+2. at your shell:
    * `chmod o+rw ~/.weechat/relay_socket` - note that other members of the team group
-        are not included in the granted permissions. this allows nginx to connect
-        to your socket on your behalf
+      are not included in the granted permissions. this allows nginx to connect
+      to your socket on your behalf. you will need to do this every time you start
+      weechat as the socket doesn't exist until weechat starts up.

-1. in your relay client:
+3. in your relay client:
    * glowing-bear:
        - $user.ttm.sh
        - port 443
        - your relay password

-    * weechat-android:
+    * [weechat-android](https://github.com/ubergeek42/weechat-android) and [lith](https://github.com/lithapp/lith):
        - connection type: websocket (ssl)
        - websocket path: weechat
        - relay host: $user.ttm.sh
        - relay port: 443
        - your relay password
-	- (if you get "Error: Could not connect using WebSocket", check to be sure
-	   ~/ and ~/.weechat have at least o+rx permissions so nginx can reach
-	   ~/.weechat/relay_socket)

-## znc 
+    - (if you get "Error: Could not connect using WebSocket", check to be sure
+      ~/ and ~/.weechat have at least o+rx permissions so nginx can reach
+      ~/.weechat/relay_socket)
+
+## znc

 the system znc authenticates using your shell password (same as with email and
-[nextcloud](https://cloud.tilde.team). reach out to an admin on irc or send an
-email to [sudoers@tilde.team](mailto:sudoers@tilde.team).
+[nextcloud](https://cloud.tilde.team)). reach out to an admin on irc or
+email [sudoers@tilde.team](mailto:sudoers@tilde.team).

-the webadmin interface is available at [znc.tilde.team](https://znc.tilde.team).
+the web interface is available at [znc.tilde.team](https://znc.tilde.team).

 client connections are on port 6699 with ssl.

-you can add network connections (up to 10) via webadmin or via a direct client
+you can add network connections (up to 10) via web or via a direct client
 connection.

 see the [znc wiki](https://wiki.znc.in/Connecting_to_ZNC) for more information.
--- a/wiki/pages/learning-opportunities.md
+++ b/wiki/pages/learning-opportunities.md
@ -3,15 +3,15 @@ author: ~cmccabe
 published: true
 title: learning opportunities
 description: a list of code challenges, internships, and other resources to support learning by tilde.team members
-category: education 
-    - main
+category:
+- guides
+- beginners
 ---

-# Learning Opportunities
-
 ## Coding Challenge Websites

-There are many coding challenge websites on the Internet today. below are a few of them. the tilde.team shell is a great place to work on solutions to the challenges. 
+There are many coding challenge websites on the Internet today. below are a few of them. the tilde.team shell is a great
+place to work on solutions to the challenges.

 Please, just be mindful of efficient coding practices while working on these.

@ -19,9 +19,18 @@ Please, just be mindful of efficient coding practices while working on these.
 * [Project Euler](https://projecteuler.net/)
 * [Advent Of Code](https://adventofcode.com/)

+## Security Challenge Websites
+
+These challenges focus primarily on practicing various computer security principles
+
+* [Hack The Box](https://www.hackthebox.eu/)
+* [Embedded Security CTF](https://microcorruption.com/)
+* [OverTheWire](https://overthewire.org/wargames/)
+* [Cryptopals](https://cryptopals.com/)
+
 ## Internships and Other Developmental Opportunities

-### Formlabs 
+### Formlabs

 * [https://formlabs.com/company/careers/job/82446/apply/](https://formlabs.com/company/careers/job/82446/apply/)

@ -29,4 +38,5 @@ Please, just be mindful of efficient coding practices while working on these.

 ## This Page Is Built Based On Your Input!

-If you know of other internships, opportunities, or other (good) code challenge sites, submit a pull request for this page, or mention it to an admin on IRC.
+If you know of other internships, opportunities, or other (good) code challenge sites, submit a pull request for this
+page, or mention it to an admin on IRC.
--- a/Show More
+++ b/Show More