content/features/index.en.md

@@ -29,15 +29,9 @@ menu:
                 <img src="lists.png" alt="Lists"/>
             </div>
             <div class="column is-half">
-                <h2>Lists</h2>
+                <h2>Stay organized</h2>
             
-                <p>First things first: Vikunja can create lists. And yes, you can add tasks to a list. But it can do so much more 
-                <i>(or at least, it will be able to do a lot more at <a href="#roadmap">some point</a>)</i>.</p>
-                
-                <h2>Namespaces</h2>
-                
-                <p>A... what? A namespace is something like a group of lists. Every list is part of a particular namespace which you can then share
-                or simply use as a method to keep track of multiple lists more easily.</p>
+                <p>Organize your tasks in lists, organize lists in namespaces.</p>
                 
                 <h2>Tasks</h2>
                 <p>Tasks are not only simple tasks. You can let Vikunja remind you of tasks when they're due. 
@@ -52,17 +46,19 @@ menu:
 
 <div class="columns">
             <div class="column is-half">
-                <h2>Sharing</h2>
+                <h2>Collaboration</h2>
             
                 <p>
                 Ever wished you could just share that grocery list with your roomate instead of having to send dozens of texts on your way to the supermarket?
-                   With Vikunja, you can. Simply share a list or a namespace with all its lists to another user.
+                   With Vikunja, you can. Simply share a list (or a namespace with all its lists) to another user.
                    Don't want your roommate to add new things to the grocery list and only do the shopping? 
-                   You can also share a list with <i>read-only</i> access!</p>
-                   
+                   You can also share a list with <i>read-only</i> access!
+                </p>   
                 <p>
                  Planning a bigger thing? You can use teams to share a list or namespace with multiple people at a time!
                 </p>
+                
+                <p>Share links</p>
             </div>
             <div class="column theimage">
                 <img src="sharing-user.png" alt="Sharing with a user" style="margin-top:3em"/>
@@ -71,7 +67,7 @@ menu:
 
 <div class="columns">
     <div class="column theimage">
-        <img src="task-label.png" alt="Sharing with a user" style="margin-top:3em"/>
+        <img src="tasks.png" alt="Sharing with a user" style="margin-top:3em"/>
     </div>
     <div class="column is-half">
         <h3>Labels</h3>
@@ -86,10 +82,13 @@ menu:
     </div>
 </div>
 
+### Task attachments
+
+### Task relations
+
 ### CalDAV
 
-Ever discovered that web app with all its great features, but somewhat... not good to use? Not to say [our app](https://vikunja.io/download) is not easy to
-use - but you don't have to use it! Vikunja comes with a calDAV-integration which lets you use the tools you already use and love.
+Vikunja comes with a calDAV-integration which lets you use the tools you already use and love.
 
 </div>
 </div>
@@ -118,7 +117,7 @@ use - but you don't have to use it! Vikunja comes with a calDAV-integration whic
 <p>Also, did I mention "the cloud"? Vikunja syncs across all your devices, no matter if you created a task on the mobile app or on your laptop, enabling
 you to continue where you left off.
 <br/>
-<small style="color:#636363">* We don't have any stable hosted instances of Vikunja available, yet.</small>
+<small style="color:#636363">* Hosted instances of Vikunja will be available very soon!</small>
 
 </p>
 
@@ -142,8 +141,6 @@ you to continue where you left off.
 But of course, there's more to come! Take a look at this list of things we've planned to add:
 
 * Get all your tasks for an interval (day/month/period)
-* Attachments on tasks
-* More sharing features: Share via a world-readable link with or without password, like Nextcloud
 * More views for tasks
   * Calendar view
   * Gantt-Chart
@@ -153,7 +150,6 @@ But of course, there's more to come! Take a look at this list of things we've pl
 * Performace statistics - Get an overview and beautiful charts about what you got done this month
 * Activity feeds - Get a quick overview about who did what
 * Bulk-edit multiple tasks at once
-* Team-efforts - Requiring a task to be marked as done by multiple members until it's done
 * [Even more!](https://my.vikunja.cloud/share/QFyzYEmEYfSyQfTOmIRSwLUpkFjboaBqQCnaPmWd/auth)
 
 </div>