diff --git a/i2p2www/pages/global/footer.html b/i2p2www/pages/global/footer.html
index 9b0537ae..47b3135d 100644
--- a/i2p2www/pages/global/footer.html
+++ b/i2p2www/pages/global/footer.html
@@ -8,18 +8,18 @@
diff --git a/i2p2www/pages/site/faq.html b/i2p2www/pages/site/faq.html
index 35209067..58197f13 100644
--- a/i2p2www/pages/site/faq.html
+++ b/i2p2www/pages/site/faq.html
@@ -673,14 +673,14 @@ There is an outproxy guide available on our forums,
{%- endtrans %}
-{% trans %}I2P strives to be safe in it's default configuration for all users. In most, possibly all countries, anonymizing
-software and strong encryption are not illegal to possess or use.{% endtrans %}
-
-{% trans %} It may be dangerous to use I2P in what the project calls "Strict Countries" where the law may not be clear on anonymizing software and where risks are judged to be fairly high. Most I2P peers are not in those strict countries and the ones that are are placed in "Hidden Mode" where they interact with the rest of the network in more limited ways, so that they are less visible to network observers. Structurally, taking over a single peer, or even a fairly large group of peers, with a subpoena is not an effective way to deanonymizing anybody else's traffic.
-{% endtrans %}
Before you use I2P, use Basic Computer Hygiene Always! Apply your OS vendor provided software updates in a prompt manner. Be aware of the state of your firewall and anti-virus status if you use one. Always get your software from authentic sources.
+{% trans %}I2P strives to be safe in it's default configuration for all users.{% endtrans %}
+
+{% trans %} It may be dangerous to use I2P in what the project calls "Strict Countries" where the law may not be clear on anonymizing software and where risks are judged to be fairly high. Most I2P peers are not in those strict countries and the ones that are, are placed in "Hidden Mode" where they interact with the rest of the network in more limited ways, so that they are less visible to network observers.
+{% endtrans %}
+
diff --git a/i2p2www/pages/site/index.html b/i2p2www/pages/site/index.html
index 40f055ae..c3e3fcd2 100644
--- a/i2p2www/pages/site/index.html
+++ b/i2p2www/pages/site/index.html
@@ -5,7 +5,7 @@
{% block content_outer %}
-
{{ _('What does I2P do for you?') }}
+
{{ _('Welcome to the Invisible Internet') }}
{% trans %}The Invisible Internet is a privacy by design, people-powered network. It is a truly free and anonymizing Internet alternative. Get I2P.
{% endtrans %}
{% trans version=ver() %}Get I2P {{ version }}{% endtrans %}
@@ -19,44 +19,30 @@
activity, location and your identity. The software ships with a router that connects you to the
network and applications for sharing, communicating and building. {%- endtrans %}
-
{% trans %}I2P Cares about Privacy{% endtrans %}
+
{% trans %}I2P Cares About Privacy{% endtrans %}
- - {% trans %}The Invisible Internet values privacy and consent. It is about your choice to share,
- your platform to own, and the connections you want to make. It is privacy by design, plain, simple
- and truly free. Additionally I2P offers resistance to analysis and blocking by censors.{%- endtrans %}
- - {% trans %}I2P hides the server from the user and the user from the server. All I2P traffic is
- internal to the I2P network. It does not connect you with the internet, but it is a layer on top of
- the Internet. It uses encrypted, nested tunnels between you and your peers to assure that no one can
- see where traffic is coming from, where it is going or what the contents are. {%- endtrans %}
-
+ - {% trans %}I2P hides the server from the user and the user from the server. All I2P traffic is internal to the I2P network. Traffic inside I2P does not interact with the Internet directly. It is a layer on top of the Internet. It uses encrypted unidirectional tunnels between you and your peers. No one can see where traffic is coming from, where it is going, or what the contents are. Additionally I2P offers resistance to pattern recognition and blocking by censors. Because the network relies on peers to route traffic, location blocking is also reduced.{%- endtrans %}
-
{% trans %}Read more…{% endtrans %}
+
Peer-to-Peer
+
Everyday, people use the I2P network to connect with other people without the worry of being tracked or their data being collected. In some cases people rely on the network when they cannot safely communicate or while doing sensitive work. The network is P2P - people powered, and always growing. Learn more about the Protocol Stack.
+
+
Privacy and Security By Design
+
I2P has created transport protocols that resist DPI censorship, and continuously improves its end to end encryption.
+ Read the I2P Transport Overview
+
+
Built For Communication
+
I2P has an application layer with easy to use API’s for creating your own privacy - aware apps.
+
-
{% trans %}Conferences Calendar 2020{% endtrans %}
-
I2P Developers will be visiting these conferences this year:
-
Upcoming:
-
- - Conference attendance is limited at this time due to COVID-19, and
- many conferences have been postponed or canceled. This section will
- be updated when the situation becomes clearer.
-
-
Past:
-
- - Chaos Communications Congress (December 27-30 2019, Leipzig, Germany)
- - Our Networks Conference (September 20-22 2019, Toronto, Canada)
- - DEF CON 27 (August 8-11 2019, Las Vegas, Nevada)
- - USENIX FOCI (August 13, 2019, Santa Clara, California)
- - Internet Freedom Festival (April 1-5 2019, Valencia, Spain)
- - RightsCon (June 11-14 2019, Tunis, Tunisia)
-
-
