diff --git a/i2p2www/pages/site/about/intro.html b/i2p2www/pages/site/about/intro.html
index 130ac8e9a71b2ab189f6946f0bd780f15a57e6fb..b5228c887e6d2c49554a36ad1c1ae749238d9710 100644
--- a/i2p2www/pages/site/about/intro.html
+++ b/i2p2www/pages/site/about/intro.html
@@ -50,48 +50,82 @@ More details about how I2P works are <a href="{{ docs }}">available</a>.
<h2>{{ _('What can you do with it?') }}</h2>
-<p>{% trans i2ptunnel=site_url('docs/api/i2ptunnel') -%}
-Within the I2P network, applications are not restricted in how they can
-communicate - those that typically use UDP can make use of the base I2P
-functionality, and those that typically use TCP can use the TCP-like streaming
-library. We have a generic TCP/I2P bridge application
-("<a href="{{ i2ptunnel }}">I2PTunnel</a>") that enables people to forward TCP streams
-into the I2P network as well as to receive streams out of the network and
-forward them towards a specific TCP/IP address.
-{%- endtrans %}</p>
-
-<p>{% trans bittorrent='http://www.bittorrent.com/',
-freenet='https://freenetproject.org/',
-mnet='https://en.wikipedia.org/wiki/Mnet_%28Computer_program%29',
-livejournal='http://www.livejournal.com/' -%}
-I2PTunnel is currently used to let people run their own anonymous website
-("eepsite") by running a normal webserver and pointing an I2PTunnel 'server'
-at it, which people can access anonymously over I2P with a normal web browser
-by running an I2PTunnel HTTP proxy ("eepproxy"). In addition, we use the same
-technique to run an anonymous IRC network (where the IRC server is hosted
-anonymously, and standard IRC clients use an I2PTunnel to contact it). There
-are other application development efforts going on as well, such as one to
-build an optimized swarming file transfer application (a la
-<a href="{{ bittorrent }}">BitTorrent</a>), a
-distributed data store (a la <a href="{{ freenet }}">Freenet</a> /
-<a href="{{ mnet }}">MNet</a>), and a blogging system (a fully
-distributed <a href="{{ livejournal }}">LiveJournal</a>), but those are
-not ready for use yet.
-{%- endtrans %}</p>
-
-<p>{% trans squid='http://www.squid-cache.org/' -%}
-I2P is not inherently an "outproxy" network - the client you send a message
-to is the cryptographic identifier, not some IP address, so the message must
-be addressed to someone running I2P. However, it is possible for that client
-to be an outproxy, allowing you to anonymously make use of their Internet
-connection. To demonstrate this, the "eepproxy" will accept normal non-I2P
-URLs (e.g. "http://www.i2p.net") and forward them to a specific destination
-that runs a <a href="{{ squid }}">squid</a> HTTP proxy, allowing
-simple anonymous browsing of the normal web. Simple outproxies like that are
-not viable in the long run for several reasons (including the cost of running
-one as well as the anonymity and security issues they introduce), but in
-certain circumstances the technique could be appropriate.
-{%- endtrans %}</p>
+<p>{% trans %}When you install the I2P software made available at geti2p.net, you are
+actually installing an I2P router and an accompanying bundle of basic
+applications. The I2P Java distribution is the first I2P software gateway and
+has been actively developed since 2001.{%- endtrans %}</p>
+<p>{% trans %}The applications are made available through a webUI, which listens at
+127.0.0.1:7657, and the main page of which is called the “Router Console,”
+where you monitor the health of your connection to the network and access
+applications that to use on the network.{%- endtrans %}</p>
+<h3>{% trans %}What is included:{%- endtrans %}</h3>
+<p>{% trans %}<strong>The Set Up Wizard</strong>: When you download the
+I2P software, a set up wizard will guide you through a few configuration steps
+while your router is making its first connections to the network. This happens
+the same way that your home router connects you to the Internet. During the set
+up process, you will be given the option to test your bandwidth and set your
+bandwidth limits in order to ensure a good connection as a network peer.{%- endtrans %}</p>
+<p>{% trans %}<strong>The I2P Router Console</strong>: Here is where you can see your
+network connections and information about your router. You will be able to see how many peers you
+have, and other information that will help if you need to troubleshoot. You can
+stop and start the router as well. You will see the applications that the
+software includes, as well as links to some community forums and sites on the
+I2P network. You will receive news when there is a a new software release, and
+will be able to download the latest version here as well. Additionally, you can
+find shortcuts to other available applications. The console is customizable and
+includes a default light theme with a dark theme option.{%- endtrans %}</p>
+<p>{% trans %}<strong>SusiMail</strong>: SusiMail is a secure email client. It is primarily
+intended for use with Postman’s email servers inside of the I2P network . It
+is designed to avoid leaking information about email use to other networks.
+SusiMail is bridged so it can send and receive email from the internet as well.
+Occasionally you may see some services like Gmail classifying it as spam, which
+you can correct in your Internet email service providers settings.{%- endtrans %}</p>
+<p>{% trans bittorrent='http://www.bittorrent.com/' -%}<strong><a href="{{ bittorrent }}">I2PSnark</a></strong>: Snark is an I2P network only BitTorrent client.
+It never makes a connection to a peer over any other network.{%- endtrans %}</p>
+<p>{% trans addressbook='docs/naming' -%}<strong><a href="{{ addressbook }}">The AddressBook</a></strong>: This is a locally-defined list of
+human-readable addresses ( ie: i2p-projekt.i2p) and corresponding I2P addresses.(udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v4jna.b32.i2p) It integrates with other applications to
+allow you to use those human-readable addresses in place of those I2P
+addresses. It is more similar to a hosts file or a contact list than a network
+database or a DNS service. There is no recognized global namespace, you decide
+what any given .i2p domain maps to in the end.{%- endtrans %}</p>
+<p><strong>The QR Code Generator</strong>: Besides the Addressbook, I2P
+addresses can be shared by converting them into QR codes and scanning them with
+a camera. This is especially useful for Android devices.</p>
+<p>{% trans i2ptunnel=site_url('docs/api/i2ptunnel') -%}<strong><a href="{{ i2ptunnel }}">I2P Hidden Services Manager</a></strong> This is a general-purpose
+adapter for forwarding services ( ie SSH ) into I2P and proxying client
+requests to and from I2P. It provides a variety of “Tunnel Types” which are
+able able to do advance filtering of traffic before it reaches I2P.{%- endtrans %}</p>
+<h3>{% trans %}Applications Outside I2P to use with I2P{%- endtrans %}</h3>
+<p>{% trans browser=site_url('about/browser-config') %}<strong><a href="{{ browser }}">Mozilla Firefox</a></strong>: A web browser with advanced privacy and
+security features, this is the best browser to configure to browse I2P
+sites.{%- endtrans %}</p>
+<p>{% trans browser=site_url('about/browser-config') %}<strong><a href="{{ browser }}">Chromium</a></strong>: A web browser developed by Google that is the
+Open-Source base of Google Chrome, this is sometimes used as an alternative to
+Firefox.{%- endtrans %}</p>
+<p>{% trans %}<strong><a href="https://biglybt.com">BiglyBT</a></strong>: A Feature-Rich bittorrent client including I2P
+support and the unique ability to “Bridge” regular torrents in-to I2P so
+people can download them anonymously.{%- endtrans %}</p>
+<p><strong>OpenSSH</strong>: OpenSSH is a popular program used by systems
+administrators to remotely administer a server, or to provide “Shell”
+accounts for users on the server.</p>
+<p>{% trans git=site_url('docs/applications/git'), gitlab=site_url('docs/applications/gitlab') %}<strong><a href="{{ git }}">Git</a>/<a href="{{ gitlab}}">Gitlab</a></strong>: Git is a source-code control tool which is
+distributed, and often recommends a fork-first workflow. Hosting source code on
+I2P is an important activity, so Gitlab-specific instructions are available for
+all to use.{%- endtrans %}</p>
+<p>{% trans %}<strong>Debian and Ubuntu GNU/Linux</strong>: It is possible to obtain
+packages for Debian and Ubuntu GNU/Linux over I2P using <a href="https://i2pgit.org/idk/apt-transport-i2p">apt-transport-i2p</a> and
+<a href="https://i2pgit.org/idk/apt-transport-i2phttp">apt-transport-i2phttp</a>. In the future, a bittorrent-based transport may also be
+developed. {%- endtrans %}</p>
+<h3>{% trans %} Applications for Developers to create new things{%- endtrans %}</h3>
+<p>{% trans sam=site_url('docs/api/sam') %}<strong><a href="{{ sam }}">The SAM API Bridge</a></strong>: The SAM API is a language-independent
+API for writing applications that are I2P-native by communicating with the
+local I2P router. It can provide Streaming-like capabilities, Anonymous
+Datagrams, or Repliable Datagrams.{%- endtrans %}</p>
+<p>{% trans bob=site_url('docs/api/bob') %}<strong><a href="{{ bob }}">The BOB API Bridge</a></strong>: This is a deprecated technology, BOB
+users should migrate to SAM if it is possible for them to do so.{%- endtrans %}</p>
+<p>{% trans i2cp=site_url('docs/protocol/i2cp') %}<strong><a href="{{ i2cp }}">The I2CP API</a></strong>: Not strictly an application, this is how Java
+applications communicate with the I2P router to set up tunnels, generate and
+manage keys, and communicate with other peers on the network.{%- endtrans %}</p>
<p>{% trans team=site_url('about/team'), volunteer=site_url('get-involved'),
licenses=site_url('get-involved/develop/licenses'), sam=site_url('docs/api/sam'),