home and about page

pages/01.home/_about/fullbar.en.md

@@ -9,3 +9,5 @@ body_classes: modular
 <br>
 ## Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.
 **No tracking, no ads, no profiling, no data mining!**
+
+<br>

pages/01.home/_donatebutton/fullbar.en.md

@@ -8,4 +8,4 @@ body_classes: modular
 ---
 
 <br>
-<a class="button button2" href="https://disroot.org/en/donate">SUPPORT US</a>
+<a class="button button1" href="https://disroot.org/en/donate">SUPPORT US</a>

pages/01.home/_donation/2col.en.md

@@ -5,12 +5,14 @@ wider_column: left
 fontcolor: '#1e5a5e'
 ---
 
+
 ![](premium.png?class=reward) **Disroot** relies on donations and support from its community and users of services. If you would like to keep the project going and help create space for potential new disrooters, please use any of the methods available to make a financial contribution. [Domain linking](/services/email#alias) is available for regular supporters.
 
 You can also collaborate by buying [extra email storage](/services/email#storage) space and/or [extra cloud storage](/services/nextcloud#storage) space.
 
 ---
 
+
 <div class="donate">
 
 <a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Donate using Liberapay" src="donate/_donate/lp_button.png" /></a>

pages/01.home/_signup/fullbar.en.md

@@ -1,11 +1,11 @@
 ---
 title: Sign up
-bgcolor: '#8EB726'
-fontcolor: '#FFF'
+bgcolor: '#c2cfb7'
+fontcolor: '#1f5c60'
 text_align: center
 padding: 20px
 body_classes: modular
 ---
 
 <br>
-<a class="button button1" href="https://user.disroot.org/pwm/public/newuser/">SIGN UP</a>
+<a class="button button2" href="https://user.disroot.org/pwm/public/newuser/">SIGN UP</a>

pages/02.about/_about-who-and-why/2col.en.md

@@ -3,20 +3,23 @@ title: Email
 bgcolor: '#1F5C60'
 fontcolor: '#FFFFFF'
 body_classes: modular
-wider_column: right
----
-
-<a class="button button1" href="/mission-statement">Read our mission statement</a>
-
+wider_column: none
 ---
 
 **Disroot** is a project that was born from the personal need to communicate, share and organize ourselves within our circles through tools that met a series of fundamental criteria for us: they had to be **open**, **decentralized**, **federated** and above all **respectful** towards **freedom** and **privacy**. None of the most popular solutions complied with them, but in our search we found some very interesting projects that did. And since we thought that they should be available to all those with similar ethical principles, we decided not only to group these applications and share them with others, but also to manage them according to those values. That's how **Disroot** started.
 
-
 The project is based in Amsterdam, was founded by **Muppeth** and **Antilopa** in 2015, it is maintained by volunteers and relies on the support of its community. Between 2017 and 2018, a group of members started to get very actively involved and to collaborate very closely. In 2019, two of them, **Fede** and **Meaz**, officially became part of the Core Team that manages the platform. Two years later, in 2021, **Avg_Joe** joined the tasks and responsibilities.
 
+<br>
+
+---
 
 **Disroot** aims to change the way people are used to interact on the web. We want to encourage and show them not only that there are open and ethical alternatives but also that it is the only possible way to break free from the *walled gardens* proposed and promoted by proprietary software and corporations, either through our platform, others that have similar values and goals or even their own projects.
 
 
 We are convinced that we can build together a truly independent network, focused on the benefit of the people and not on their exploitation.
+
+<br><br>
+
+<a class="button button1" href="/mission-statement">Read our mission statement</a>
+

pages/02.about/_core-team/fullbar.en.md

@@ -1,10 +1,11 @@
 ---
 title: 'Green bar'
-bgcolor: '#8EB726'
+bgcolor: '#c2cfb7'
 fontcolor: '#1F5C60'
 text_align: center
 ---
 
+<br>
 
 ## Disroot Team
 

pages/02.about/_greenenergy/2col.en.md

@@ -1,12 +1,11 @@
 ---
-title: Online-donation
+title: Green-energy
 bgcolor: '#1F5C60'
 wider_column: left
 fontcolor: '#ffffff'
 ---
 
+<br>
+
+<a href="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" target=_blank><img src="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" alt="This website is hosted Green - checked by thegreenwebfoundation.org" style="height:120px"></a>
 Disroot servers are hosted in a data-center using renewable energy.
-
----
-
-<a href="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" target=_blank><img src="https://api.thegreenwebfoundation.org/greencheckimage/disroot.org?nocache=true" alt="This website is hosted Green - checked by thegreenwebfoundation.org" style="height:100px"></a>

pages/02.about/_privacy/2col.en.md

@@ -1,11 +1,29 @@
 ---
 title: privacy
 fontcolor: '#555'
-wider_column: left
+wider_column: none
 bgcolor: '#fff'
 
 ---
 
+<br>
+
+# Federation and Decentralization
+
+Most internet services are run from centralized point owned and run by corporations. These store private data of their users and analyze it using advanced algorithms in order to create accurate profiles of their 'users'. This information is often used to exploit the people for the sake of advertisers. Information can also be obtained by governmental institutions or by malicious hackers. Data can be removed without warning due to dubious reasons or regional censorship policies.
+
+A decentralized service can reside on multiple machines, owned by different individuals, companies or organization. With federation protocols those instances can interact and form one network of many nodes (servers hosting similar services). One might be able to shut down one node but never the entire network. In such a setup censorship is practically impossible.
+
+Think of how we use E-mail; you can choose any service provider or set up your own, and still exchange emails with people using another email provider. E-mail is built upon a decentralized and federated protocol.
+
+These two principals, together, sets up the backdrop for a huge network that depends on a rather simple infrastructure and relatively low costs. Any machine can become a server and be an equal participant in the network. From a small desktop computer at your home to a dedicated server or racks with multiple servers. This approach provides the possibility to create the biggest user owned global network - just as the Internet was intended to be.
+
+We do not wish for **Disroot** to become one centralized entity but rather a part of a larger community - one node out of many. We hope others will be inspired to create more projects with similar intentions.
+
+---
+
+<br>
+
 # Privacy
 
 Software can be created and shaped into anything. Every button, every color and every link that we see and use on the web was put there by someone. When we use the applications provided for us, we mostly don't see - and sometimes don't care about - much of what happens behind the interface we use. We connect with other people, we store our files, organize meetings and festivals, send emails or chat for hours and it all happens magically.
@@ -17,6 +35,8 @@ Your files on the cloud are encrypted with your user password, every bin-paste a
 
 ---
 
-<br>
-![](priv1.jpg?lightbox=1024)
-![](priv2.jpg?lightbox=1024)
+# Transparency and openness
+
+At **Disroot** we use 100% free and open source software. This means that the source code (the way the software operates) is publicly accessible. Anyone is able to contribute improvements or adjustments to the software and it can be audited and controlled at any moment - no hidden back-doors or other malicious malware.
+
+We want to be fully transparent and open towards people using our services and therefore we publish information about the current state of the project, the financial status, our plans and ideas. We would also like to hear your suggestions and feedback so we can deliver the best experience possible to all **Disrooters**.

pages/02.about/modular.en.md

@@ -9,9 +9,7 @@ content:
         custom:
             - _about-who-and-why
             - _core-team
-            - _federation
             - _privacy
-            - _transparency
             - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg