diff --git a/doc/BBCode.md b/doc/BBCode.md
index 7068f16911..fe7c1481f6 100644
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@@ -1,146 +1,154 @@
-Friendica BBCode tags reference
-========================
-
-* [Home](help)
-
-Inline
------
-
-
-<pre>[b]bold[/b]</pre> : <strong>bold</strong>
-
-<pre>[i]italic[/i]</pre> : <em>italic</em>
-
-<pre>[u]underlined[/u]</pre> : <u>underlined</u>
-
-<pre>[s]strike[/s]</pre> : <strike>strike</strike>
-
-<pre>[color=red]red[/color]</pre> : <span style="color:  red;">red</span>
-
-<pre>[url=http://www.friendica.com]Friendica[/url]</pre> : <a href="http://www.friendica.com" target="external-link">Friendica</a>
-
-<pre>[img]http://friendica.com/sites/default/files/friendika-32.png[/img]</pre> : <img src="http://friendica.com/sites/default/files/friendika-32.png" alt="Immagine/foto">
-
-<pre>[size=xx-small]small text[/size]</pre> : <span style="font-size: xx-small;">small text</span>
-
-<pre>[size=xx-large]big text[/size]</pre> : <span style="font-size: xx-large;">big text</span>
-
-<pre>[size=20]exact size[/size] (size can be any number, in pixel)</pre> :  <span style="font-size: 20px;">exact size</span>
-
-
-
-
-
-
-
-Block
------
-
-<pre>[code]code[/code]</pre>
-
-<code>code</code>
-
-<p style="clear:both;">&nbsp;</p>
-
-<pre>[quote]quote[/quote]</pre>
-
-<blockquote>quote</blockquote>
-
-<p style="clear:both;">&nbsp;</p>
-
-<pre>[quote=Author]Author? Me? No, no, no...[/quote]</pre>
-
-<strong class="author">Author wrote:</strong><blockquote>Author? Me? No, no, no...</blockquote>
-
-<p style="clear:both;">&nbsp;</p>
-
-<pre>[center]centered text[/center]</pre>
-
-<div style="text-align:center;">centered text</div>
-
-<p style="clear:both;">&nbsp;</p>
-
-**Table**
-<pre>[table border=1]
- [tr] 
-   [th]Tables now[/th]
- [/tr]
- [tr]
-   [td]Have headers[/td]
- [/tr]
-[/table]</pre>
-
-<table border="1"><tbody><tr><th>Tables now</th></tr><tr><td>Have headers</td></tr></tbody></table>
-
-<p style="clear:both;">&nbsp;</p>
-
-**List**
-
-<pre>[list]
- [*] First list element
- [*] Second list element
-[/list]</pre>
-<ul class="listbullet" style="list-style-type: circle;">
-<li> First list element<br>
-</li>
-<li> Second list element</li>
-</ul>
-
-[list] is equivalent to [ul] (unordered list). 
-
-[ol] can be used instead of [list] to show an ordered list:
-
-<pre>[ol]
- [*] First list element
- [*] Second list element
-[/ol]</pre>
-<ul class="listdecimal" style="list-style-type: decimal;"><li> First list element<br></li><li> Second list element</li></ul>
-
-For more options on ordered lists, you can define the style of numeration on [list] argument:
-<pre>[list=1]</pre> : decimal
-
-<pre>[list=i]</pre> : lover case roman
-
-<pre>[list=I]</pre> : upper case roman
-
-<pre>[list=a]</pre> : lover case alphabetic
-
-<pre>[list=A] </pre> : upper case alphabetic
-
-
-
-
-Embed
-------
-
-You can embed video, audio and more in a message.
-
-<pre>[video]url[/video]</pre>
-<pre>[audio]url[/audio]</pre>
-
-Where *url* can be an url to youtube, vimeo, soundcloud, or other sites wich supports oembed or opengraph specifications.
-*url* can be also full url to an ogg  file. HTML5 tag will be used to show it.
-
-<pre>[url]*url*[/url]</pre>
-
-If *url* supports oembed or opengraph specifications the embedded object will be shown (eg, documents from scribd).
-Page title with a link to *url* will be shown.
-
-Map
----
-
-<pre>[map]address[/map]</pre>
-<pre>[map=lat,long]</pre>
-
-You can embed maps from coordinates or addresses. 
-This require "openstreetmap" addon version 1.3 or newer.
-
-
-Special
--------
-
-If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:
-
-<pre>[noparse][b]bold[/b][/noparse]</pre> : [b]bold[/b]
-
-
+Friendica BBCode tags reference
+========================
+
+* [Home](help)
+
+Inline
+-----
+
+
+<pre>[b]bold[/b]</pre> : <strong>bold</strong>
+
+<pre>[i]italic[/i]</pre> : <em>italic</em>
+
+<pre>[u]underlined[/u]</pre> : <u>underlined</u>
+
+<pre>[s]strike[/s]</pre> : <strike>strike</strike>
+
+<pre>[color=red]red[/color]</pre> : <span style="color:  red;">red</span>
+
+<pre>[url=http://www.friendica.com]Friendica[/url]</pre> : <a href="http://www.friendica.com" target="external-link">Friendica</a>
+
+<pre>[img]http://friendica.com/sites/default/files/friendika-32.png[/img]</pre> : <img src="http://friendica.com/sites/default/files/friendika-32.png" alt="Immagine/foto">
+
+<pre>[size=xx-small]small text[/size]</pre> : <span style="font-size: xx-small;">small text</span>
+
+<pre>[size=xx-large]big text[/size]</pre> : <span style="font-size: xx-large;">big text</span>
+
+<pre>[size=20]exact size[/size] (size can be any number, in pixel)</pre> :  <span style="font-size: 20px;">exact size</span>
+
+
+
+
+
+
+
+Block
+-----
+
+<pre>[code]code[/code]</pre>
+
+<code>code</code>
+
+<p style="clear:both;">&nbsp;</p>
+
+<pre>[quote]quote[/quote]</pre>
+
+<blockquote>quote</blockquote>
+
+<p style="clear:both;">&nbsp;</p>
+
+<pre>[quote=Author]Author? Me? No, no, no...[/quote]</pre>
+
+<strong class="author">Author wrote:</strong><blockquote>Author? Me? No, no, no...</blockquote>
+
+<p style="clear:both;">&nbsp;</p>
+
+<pre>[center]centered text[/center]</pre>
+
+<div style="text-align:center;">centered text</div>
+
+<p style="clear:both;">&nbsp;</p>
+
+<pre>You should not read any further if you want to be surprised.[spoiler]There is a happy end.[/spoiler]</pre>
+
+You should not read any further if you want to be surprised.<br />*click to open/close*
+
+(The text between thhe opening and the closing of the spoiler tag will be visible once the link is clicked. So *"There is a happy end."* wont be visible until the spoiler is uncovered.)
+
+<p style="clear:both;">&nbsp;</p>
+
+**Table**
+<pre>[table border=1]
+ [tr] 
+   [th]Tables now[/th]
+ [/tr]
+ [tr]
+   [td]Have headers[/td]
+ [/tr]
+[/table]</pre>
+
+<table border="1"><tbody><tr><th>Tables now</th></tr><tr><td>Have headers</td></tr></tbody></table>
+
+<p style="clear:both;">&nbsp;</p>
+
+**List**
+
+<pre>[list]
+ [*] First list element
+ [*] Second list element
+[/list]</pre>
+<ul class="listbullet" style="list-style-type: circle;">
+<li> First list element<br>
+</li>
+<li> Second list element</li>
+</ul>
+
+[list] is equivalent to [ul] (unordered list). 
+
+[ol] can be used instead of [list] to show an ordered list:
+
+<pre>[ol]
+ [*] First list element
+ [*] Second list element
+[/ol]</pre>
+<ul class="listdecimal" style="list-style-type: decimal;"><li> First list element<br></li><li> Second list element</li></ul>
+
+For more options on ordered lists, you can define the style of numeration on [list] argument:
+<pre>[list=1]</pre> : decimal
+
+<pre>[list=i]</pre> : lover case roman
+
+<pre>[list=I]</pre> : upper case roman
+
+<pre>[list=a]</pre> : lover case alphabetic
+
+<pre>[list=A] </pre> : upper case alphabetic
+
+
+
+
+Embed
+------
+
+You can embed video, audio and more in a message.
+
+<pre>[video]url[/video]</pre>
+<pre>[audio]url[/audio]</pre>
+
+Where *url* can be an url to youtube, vimeo, soundcloud, or other sites wich supports oembed or opengraph specifications.
+*url* can be also full url to an ogg  file. HTML5 tag will be used to show it.
+
+<pre>[url]*url*[/url]</pre>
+
+If *url* supports oembed or opengraph specifications the embedded object will be shown (eg, documents from scribd).
+Page title with a link to *url* will be shown.
+
+Map
+---
+
+<pre>[map]address[/map]</pre>
+<pre>[map=lat,long]</pre>
+
+You can embed maps from coordinates or addresses. 
+This require "openstreetmap" addon version 1.3 or newer.
+
+
+Special
+-------
+
+If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:
+
+<pre>[noparse][b]bold[/b][/noparse]</pre> : [b]bold[/b]
+
+
diff --git a/doc/Home.md b/doc/Home.md
index dd63f10953..ff991e3d2a 100644
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -11,6 +11,7 @@ Friendica Documentation and Resources
 	* [Comment, sort and delete posts](help/Text_comment)
 	* [Profiles](help/Profiles)
 	* [Accesskey reference](help/Accesskeys
+    * [Events](help/events)
 * You and other users
 	* [Connectors](help/Connectors)
 	* [Making Friends](help/Making-Friends)
@@ -41,6 +42,7 @@ Friendica Documentation and Resources
 * [How to translate Friendica](help/translations)
 * [Bugs and Issues](help/Bugs-and-Issues)
 * [Plugin Development](help/Plugins)
+* [Theme Development](help/themes)
 * [Smarty 3 Templates](help/smarty3-templates)
 
 **External Resources**
diff --git a/doc/de/BBCode.md b/doc/de/BBCode.md
index dc8bf85d54..d3e205f0fa 100644
--- a/doc/de/BBCode.md
+++ b/doc/de/BBCode.md
@@ -1,139 +1,155 @@
 Referenz der Friendica BBCode Tags
-========================
-
-* [Zur Startseite der Hilfe](help)
-
-Inline Tags
------
-
-
+========================
+
+* [Zur Startseite der Hilfe](help)
+
+Inline Tags
+-----
+
+
 <pre>[b]fett[/b]</pre> : <strong>fett</strong>
-
+
 <pre>[i]kursiv[/i]</pre> : <em>kursiv</em>
-
+
 <pre>[u]unterstrichen[/u]</pre> : <u>unterstrichen</u>
-
+
 <pre>[s]durchgestrichen[/s]</pre> : <strike>durchgestrichen</strike>
-
+
 <pre>[color=red]rot[/color]</pre> : <span style="color:  red;">rot</span>
-
+
 <pre>[url=http://www.friendica.com]Friendica[/url]</pre> : <a href="http://www.friendica.com" target="external-link">Friendica</a>
-
+
 <pre>[img]http://friendica.com/sites/default/files/friendika-32.png[/img]</pre> : <img src="http://friendica.com/sites/default/files/friendika-32.png" alt="Immagine/foto">
-
+
 <pre>[size=xx-small]kleiner Text[/size]</pre> : <span style="font-size: xx-small;">kleiner Text</span>
-
+
 <pre>[size=xx-large]gro&szlig; Text[/size]</pre> : <span style="font-size: xx-large;">gro&szlig;er Text</span>
-
+
 <pre>[size=20]exakte Textgr&ouml;&szlig;e[/size] (Textgr&ouml;&szlig;e kann jede Zahl sein, in Pixeln)</pre> :  <span style="font-size: 20px;">exakte Gr&ouml;&szlig;e</span>
-
-
-
-
-
-
-
-Block Tags
------
-
-<pre>[code]Code[/code]</pre>
-
-<code>Code</code>
-
-<p style="clear:both;">&nbsp;</p>
-
-<pre>[quote]Zitat[/quote]</pre>
-
-<blockquote>Zitat</blockquote>
-
-<p style="clear:both;">&nbsp;</p>
-
-<pre>[quote=Autor]Der Autor? Ich? Nein, nein, nein...[/quote]</pre>
-
-<strong class="author">Autor hat geschrieben:</strong><blockquote>Der Autor?  Ich? Nein, nein, nein...</blockquote>
-
-<p style="clear:both;">&nbsp;</p>
-
-<pre>[center]zentrierter Text[/center]</pre>
-
-<div style="text-align:center;">zentrierter Text</div>
-
-<p style="clear:both;">&nbsp;</p>
-
-**Tabelle**
-<pre>[table border=1]
- [tr] 
-   [th]Tabellenzeile[/th]
- [/tr]
- [tr]
-   [td]haben &Uuml;berschriften[/td]
- [/tr]
-[/table]</pre>
-
-<table border="1"><tbody><tr><th>Tabellenzeile</th></tr><tr><td>haben &Uuml;berschriften</td></tr></tbody></table>
-
-<p style="clear:both;">&nbsp;</p>
-
-**Listen**
-
-<pre>[list]
- [*] Erstes Listenelement
- [*] Zweites Listenelement
-[/list]</pre>
-<ul class="listbullet" style="list-style-type: circle;">
-<li> Erstes Listenelement<br>
-</li>
-<li> Zweites Listenelement</li>
-</ul>
-
-[list] ist Equivalent zu [ul] (unsortierte Liste). 
-
-[ol] kann anstelle von [list] verwendet werden um eine sortierte Liste zu erzeugen:
-
-<pre>[ol]
- [*] Erstes Listenelement
- [*] Zweites Listenelement
-[/ol]</pre>
-<ul class="listdecimal" style="list-style-type: decimal;"><li>Erstes Listenelement<br></li><li> Zweites Listenelement</li></ul>
-
-F&uuml;r weitere Optionen von sortierten Listen kann man den Stil der Numerierung der Liste definieren:
-<pre>[list=1]</pre> : dezimal
-
-<pre>[list=i]</pre> : r&ouml;misch, Kleinbuchstaben
-
-<pre>[list=I]</pre> : r&ouml;misch, Gro&szlig;buchstaben
-
-<pre>[list=a]</pre> : alphabetisch, Kleinbuchstaben
-
-<pre>[list=A] </pre> : alphabethisch, Gro&szlig;buchstaben
-
-
-
-
-Einbettung von Inhalten
-------
-
-Man kann viele Dinge, z.B. Video und Audio Dateine, in Nachrichten einbetten.
-
-<pre>[video]url[/video]</pre>
-<pre>[audio]url[/audio]</pre>
-
-Wobei die *url* von youtube, vimeo, soundcloud oder einer anderen Seite stammen kann die die oembed oder opengraph Spezifikationen unterst&uuml;tzt.  
+
+
+
+
+
+
+
+Block Tags
+-----
+
+<pre>[code]Code[/code]</pre>
+
+<code>Code</code>
+
+<p style="clear:both;">&nbsp;</p>
+
+<pre>[quote]Zitat[/quote]</pre>
+
+<blockquote>Zitat</blockquote>
+
+<p style="clear:both;">&nbsp;</p>
+
+<pre>[quote=Autor]Der Autor? Ich? Nein, nein, nein...[/quote]</pre>
+
+<strong class="author">Autor hat geschrieben:</strong><blockquote>Der Autor?  Ich? Nein, nein, nein...</blockquote>
+
+<p style="clear:both;">&nbsp;</p>
+
+<pre>[center]zentrierter Text[/center]</pre>
+
+<div style="text-align:center;">zentrierter Text</div>
+
+<p style="clear:both;">&nbsp;</p>
+
+<pre>Wer überrascht werden möchte sollte nicht weiter lesen.[spoiler]Es gibt ein Happy End.[/spoiler]</pre>
+
+Wer überrascht werden möchte sollte nicht weiter lesen.<br />*klicken zum öffnen/schließen*
+
+(Der Text zweischen dem öffnenden und dem schließenden Teil des spoiler Tags wird nicht angezeigt, bis der Link angeklickt wurde. In dem Fall wird *"Es gibt ein Happy End."* also erst angezeigt, wenn der Spoiler verraten wird.)
+
+<p style="clear:both;">&nbsp;</p>
+
+**Tabelle**
+<pre>[table border=1]
+ [tr] 
+   [th]Tabellenzeile[/th]
+ [/tr]
+ [tr]
+   [td]haben &Uuml;berschriften[/td]
+ [/tr]
+[/table]</pre>
+
+<table border="1"><tbody><tr><th>Tabellenzeile</th></tr><tr><td>haben &Uuml;berschriften</td></tr></tbody></table>
+
+<p style="clear:both;">&nbsp;</p>
+
+**Listen**
+
+<pre>[list]
+ [*] Erstes Listenelement
+ [*] Zweites Listenelement
+[/list]</pre>
+<ul class="listbullet" style="list-style-type: circle;">
+<li> Erstes Listenelement<br>
+</li>
+<li> Zweites Listenelement</li>
+</ul>
+
+[list] ist Equivalent zu [ul] (unsortierte Liste). 
+
+[ol] kann anstelle von [list] verwendet werden um eine sortierte Liste zu erzeugen:
+
+<pre>[ol]
+ [*] Erstes Listenelement
+ [*] Zweites Listenelement
+[/ol]</pre>
+<ul class="listdecimal" style="list-style-type: decimal;"><li>Erstes Listenelement<br></li><li> Zweites Listenelement</li></ul>
+
+F&uuml;r weitere Optionen von sortierten Listen kann man den Stil der Numerierung der Liste definieren:
+<pre>[list=1]</pre> : dezimal
+
+<pre>[list=i]</pre> : r&ouml;misch, Kleinbuchstaben
+
+<pre>[list=I]</pre> : r&ouml;misch, Gro&szlig;buchstaben
+
+<pre>[list=a]</pre> : alphabetisch, Kleinbuchstaben
+
+<pre>[list=A] </pre> : alphabethisch, Gro&szlig;buchstaben
+
+
+
+
+Einbettung von Inhalten
+------
+
+Man kann viele Dinge, z.B. Video und Audio Dateine, in Nachrichten einbetten.
+
+<pre>[video]url[/video]</pre>
+<pre>[audio]url[/audio]</pre>
+
+Wobei die *url* von youtube, vimeo, soundcloud oder einer anderen Seite stammen kann die die oembed oder opengraph Spezifikationen unterst&uuml;tzt.
 Au&szlig;erdem kann *url* die genaue url zu einer ogg Datei sein, die dann per HTML5 eingebunden wird.
-
-<pre>[url]*url*[/url]</pre>
-
+
+<pre>[url]*url*[/url]</pre>
+
 Wenn *url* entweder oembed oder opengraph unterstützt wird das eingebettete
 Objekt (z.B. ein Dokument von scribd) eingebunden.
 Der Titel der Seite mit einem Link zur *url* wird ebenfalls angezeigt.
-
-
-
-Spezielle Tags
--------
-
+
+Um eine Karte in einen Beitrag einzubinden, muss das *openstreetmap* Addon aktiviert werden. Ist dies der Fall, kann mit
+
+<pre>[map]Broadway 26, New York[/map]</pre>
+
+eine Karte von [OpenStreetmap](http://openstreetmap.org) eingebettet werden. Zur Identifikation des Ortes können entweder seine Koordinaten in der Form
+
+<pre>[map=lat,long]</pre>
+
+oder eine Adresse in obiger Form verwendet werden.
+
+Spezielle Tags
+-------
+
 Wenn Du &uuml;ber BBCode Tags in einer Nachricht schreiben m&ouml;chtest, kannst Du [noparse], [nobb] oder [pre] verwenden um den BBCode Tags vor der Evaluierung zu sch&uuml;tzen:
-
-<pre>[noparse][b]fett[/b][/noparse]</pre> : [b]fett[/b]
-
-
+
+<pre>[noparse][b]fett[/b][/noparse]</pre> : [b]fett[/b]
+
+
diff --git a/doc/de/Home.md b/doc/de/Home.md
index 64982c392f..561809d6ce 100644
--- a/doc/de/Home.md
+++ b/doc/de/Home.md
@@ -11,6 +11,7 @@ Friendica - Dokumentation und Ressourcen
 	* [Beiträge kommentieren, einordnen und löschen](help/Text_comment)
 	* [Profile](help/Profiles)
 	* [Referenz der Accesskeys](help/Accesskeys)
+    * [Veranstaltungen](help/events) (EN)
 * Du und andere Nutzer
 	* [Konnektoren (Connectors)](help/Connectors)
 	* [Freunde finden](help/Making-Friends)
@@ -37,6 +38,16 @@ Friendica - Dokumentation und Ressourcen
 * [Twitter/GNU Social API Functions](help/api) (EN)
 * [Translation of Friendica](help/translations) (EN)
 
+**Entwickler Dokumentation**
+
+* [Where to get started?](help/Developers-Intro)
+* [Help on Github](help/Github)
+* [Help on Vagrant](help/Vagrant)
+* [How to translate Friendica](help/translations)
+* [Bugs and Issues](help/Bugs-and-Issues)
+* [Plugin Development](help/Plugins)
+* [Theme Development](help/themes)
+* [Smarty 3 Templates](help/smarty3-templates)
 
 **Externe Ressourcen**
 
diff --git a/doc/events.md b/doc/events.md
new file mode 100644
index 0000000000..abb4576871
--- /dev/null
+++ b/doc/events.md
@@ -0,0 +1,61 @@
+# Events
+
+* [Home](help)
+
+A special form of postings are events.
+The events you and your contacts share can be found at [/events](/events) on your node.
+To get there go to your wall and follow the tab "events"
+Depending on the theme you are using, there might be an additional link from the navigation menu to this page.
+
+## Event Overview
+
+The overview page shows the calendar of the current month, plus eventually some days in the beginning and the end.
+Listed are all events for this month you created, or your contacts have shared with you.
+This includes birthday reminders for contacts who share their birthday with you.
+
+From the controls, you can switch between month/week/day view.
+Flip through the view forwards and backwards.
+And return to *today*.
+
+To create a new event, you can either follow the link "Create New Event" or make a double click on the desired box in the calendarium for when the event should take place.
+
+With a click on an existing event a pop-up box will be opened which shows you the event.
+From there you can edit the event or view the event at the source link, if you are the one who created the event.
+
+## Create a new Event
+
+Following one of the methods mentioned above you reach a form to enter the event data.
+Fields marked with a *** have to be filled.
+
+* **Event Starts**: enter the date/time of the start of the event here
+* **Event Finishes**: enter the finishing date/time for the event here
+
+When you click in one of these fields a pop-up will be opened that allows you to pick the day and the time.
+If you double clicked on the day box in the calendarium these fields will be pre-filled for you.
+The finishing date/time has to be after the beginning date/time of the event.
+But you don't have to specify it.
+If the event is open-end or the finishing date/time does not matter, just select the box below the two first fields.
+
+* **Adjust for viewer timezone**: If you check this box, the beginning and finisching times will automatically converted to the local time according to the timezone setting
+
+This might prevent too early birthday wishes, or the panic attac that you have forgotten the birthday from your buddy at the other end of the world.
+And similar events.
+
+* **Title**: a title for the event
+* **Description**: a longer description for the event
+* **Location**: the location the event will took place
+
+These three fields describe your events.
+In the descirption and location field you can use BBCode to format the text.
+
+* **Share this event**: when this box is checked the ACL will be shown to let you select with whom you wish to share the event. This works just like the controls of any other posting.
+
+When you *Share* the event it will be posted to your wall with the access permissions you've selected.
+But before you do, you can also *preview* the event in a pop-up box.
+
+### Addons
+
+#### OpenStreetMap
+
+If this addon is activated on you friendica node, the content of the location field will be mathced with the identification service of OSM when you submit the event.
+Should OSM find anything matching, a map for the location will be embedded automatically at the end of the events view.
diff --git a/doc/themes.md b/doc/themes.md
new file mode 100644
index 0000000000..add44c776b
--- /dev/null
+++ b/doc/themes.md
@@ -0,0 +1,291 @@
+# Themes
+
+* [Home](help)
+
+To change the look of friendica you have to touch the themes.
+The current default theme is [duepunto zero](https://github.com/friendica/friendica/tree/master/view/theme/duepuntozero) but there are numerous others.
+Have a look at [friendica-themes.com](http://friendica-themes.com) for an overview of the existing themes.
+In case none of them suits your needs, there are several ways to change a theme.
+If you need help theming, there is a forum @[ftdevs@friendica.eu](https://friendica.eu/profile/ftdevs) where you can ask theme specific questions and present your themes.
+
+So, how to work on the UI of friendica.
+
+You can either directly edit an existing theme.
+But you might loose your changes when the theme is updated by the friendica team.
+
+If you are almost happy with an existing theme, the easiest way to cover your needs is to create a new theme, inheritating most of the properties of the parent theme and change just minor stuff.
+The below for a more detailed description of theme heritage.
+
+Some themes also allow users to select *variants* of the theme.
+Those theme variants most often contain an additional [CSS](https://en.wikipedia.org/wiki/CSS) file to override some styling of the default theme values.
+From the themes in the main repository *duepunto zero* and *vier* are using this methods for variations.
+Quattro is using a slightly different approach.
+
+Third you can start your theme from scratch.
+Which is the most complex way to change friendicas look.
+But it leaves you the most freedom.
+So below for a *detailed* description and the meaning of some special files.
+
+### Styling
+
+If you want to change the styling of a theme, have a look at the themes CSS file.
+In most cases, you can found these in
+
+    /view/theme/**your-theme-name**/style.css
+
+sometimes, there is also a file called style.php in the theme directory.
+This is only needed if the theme allowes the user to change certain things of the theme dynamically.
+Say the font size or set a background image.
+
+### Templates
+
+If you want to change the structure of the theme, you need to change the templates used by the theme.
+Friendica themes are using [SMARTY3](http://www.smarty.net/) for templating.
+The default template can be found in
+
+    /view/templates
+
+if you want to override any template within your theme create your version of the template in
+
+    /view/theme/**your-theme-name**/templates
+
+any template that exists there will be used instead of the default one.
+
+### Javascript
+
+The same rule applies to the JavaScript files found in
+
+    /js
+
+they will be overwritten by files in
+
+    /view/theme/**your-theme-name**/js.
+
+## Expand an existing Theme
+
+### Theme Variations
+
+Many themes are more *theme families* then only one theme.
+*duepunto zero* and *vier* allow easily to add new theme variation.
+We will go through the process of creating a new variation for *duepunto zero*.
+The same  (well almost, some names change) procedure applies to the *vier* theme.
+And similar steps are needed for *quattro* but this theme is using [lessc](http://lesscss.org/#docs) to maintaine the CSS files..
+
+In
+
+    /view/theme/duepuntozero/deriv
+
+you find a couple of CSS files that define color derivations from the duepunto theme.
+These resemble some of the now as unsupported marked themes, that were inherited by the duepunto theme.
+Darkzero and Easter Bunny for example.
+
+The selection of the colorset is done in a combination of a template for a new form in the settings and aome functions in the theme.php file.
+The template (theme_settings.tpl)
+
+    {{include file="field_select.tpl" field=$colorset}}
+    <div class="settings-submit-wrapper">
+        <input type="submit" value="{{$submit}}" class="settings-submit" name="duepuntozero-settings-submit" />
+    </div>
+
+defines a formular consisting of a [select](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/select) pull-down which contains all aviable variants and s submit button.
+See the documentation about [SMARTY3 templates](/help/snarty3-templates.md) for a summary of friendica specific blocks other then the select element.
+But we don't really need to change anything at the template itself.
+
+The template alone wont work though.
+You make friendica aware of its existance and tell it how to use the template file, by defining a config.php file.
+It needs to define at lest the following functions
+
+* theme_content
+* theme_post
+
+and may also define functions for the admin interface
+
+* theme_admin
+* theme_admin_post.
+
+theme_content and theme_admin are used to make the form available in the settings, repectively the admin panel.
+The _post functions handle the processing of the send form, in this case they save to selected variand in friendicas database.
+
+To make your own variation appear in the menu, all you need to do is to create a new CSS file in the deriv directoy and include it in the array in the config.php:
+
+    $colorset = array(
+        'default'=>t('default'),
+        'greenzero'=>t('greenzero'),
+        'purplezero'=>t('purplezero'),
+        'easterbunny'=>t('easterbunny'),
+        'darkzero'=>t('darkzero'),
+        'comix'=>t('comix'),
+        'slackr'=>t('slackr'),
+    );
+
+the 1st part of the line is the name of the CSS file (without the .css) the 2nd part is the common name of the variant.
+Calling the t() function with the common name makes the string translateable.
+The selected 1st part will be saved in the database by the theme_post function.
+
+    function theme_post(&$a){
+        // non local users shall not pass
+        if(! local_user())
+            return;
+        // if the one specific submit button was pressed then proceed
+        if (isset($_POST['duepuntozero-settings-submit'])){
+            // and save the selection key into the personal config of the user
+            set_pconfig(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
+        }
+    }
+
+Now that this information is set in the database, what should friendica do with it?
+For this, have a look at the theme.php file of the *duepunto zero*.
+There you'll find somethink alike
+
+        $colorset = get_pconfig( local_user(), 'duepuntozero','colorset');
+        if (!$colorset)
+            $colorset = get_config('duepuntozero', 'colorset');
+        if ($colorset) {
+            if ($colorset == 'greenzero')
+                $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/greenzero.css" type="text/css" media="screen" />'."\n";
+            /* some more variants */
+        }
+
+which tells friendica to get the personal config of a user.
+Check if it is set and if not look for the global config.
+And finally if a config for the colorset was found, apply it by adding a link to the CSS file into the HTML header of the page.
+So you'll just need to add a if selection, fitting your variant keyword and link to the CSS file of it.
+
+Done.
+Now you can use the variant on your system.
+But remember once the theme.php or the config.php you have to readd your variant to them.
+If you think your color variation could be benifical for other friendica users as well, feel free to generate a pull request at github so we can include your work into the repository.
+
+### Inheritation
+
+Say, you like the duepuntozero but you want to have the content of the outer columns  left and right exchanged.
+That would be not a color variation as shown above.
+Instead we will create a new theme, duepuntozero_lr, inherit the properties of duepuntozero and make small changes to the underlying php files.
+
+So create a directory called duepunto_lr and create a file called theme.php with your favorite text editor.
+The content of this file should be something like
+
+    <?php
+    /* meta informations for the theme, see below */
+    function duepuntozero_lr_init(&$a) {
+        $a-> theme_info = array(
+            'extends' => 'duepuntozero'.
+        );
+        set_template_engine($a, 'smarty3');
+        /* and more stuff e.g. the JavaScript function for the header */
+    }
+
+Next take the default.php file found in the /view direcotry and exchange the aside and right_aside elements.
+So the central part of the file now looks like this:
+
+    <body>
+        <?php if(x($page,'nav')) echo $page['nav']; ?>
+        <aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
+        <section><?php if(x($page,'content')) echo $page['content']; ?>
+                <div id="page-footer"></div>
+        </section>
+        <right_aside><?php if(x($page,'aside')) echo $page['aside']; ?></right_aside>
+        <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+    </body>
+
+Finally we need a style.css file, inheriting the definitions from the parent theme and containing out changes for the new theme.
+***Note***:You need to create the style.css and at lest import the base CSS file from the parent theme.
+
+    @import url('../duepuntozero/style.css');
+
+Done.
+But I agree it is not really useful at this state.
+Nevertheless, to use it, you just need to activate in the admin panel.
+That done, you can select it in the settings like any other activated theme.
+
+## Creating a Theme from Scratch
+
+Keep patient.
+Basically what you have to do is identifying which template you have to change so it looks more like what you want.
+Adopt the CSS of the theme accordingly.
+And iterate the process until you have the theme the way you want it.
+
+*Use the source Luke.* and don't hesitate to ask in @[ftdevs](https://friendica.eu/profile/ftdevs) or @[helpers](https://helpers.pyxis.uberspace.de/profile/helpers).
+
+## Special Files
+
+### unsupported
+
+If a file with this name (which might be empty) exists in the theme directory, the theme is marked as *unsupported*.
+An unsupported theme may not be selected by a user in the settings.
+Users who are already using it wont notice anything.
+
+### README(.md)
+
+The contents of this file, with or without the .md which indicates [Markdown](https://daringfireball.net/projects/markdown/) syntax, will be displayed at most repository hosting services and in the theme page within the admin panel of friendica.
+
+This file should contain information you want to let others know about your theme.
+
+### screenshot.[png|jpg]
+
+If you want to have a preview image of your theme displayed in the settings you should take a screenshot and save it with this name.
+Supported formats are PNG and JPEG.
+
+### theme.php
+
+This is the main definition file of the theme.
+In the header of that file, some meta information are stored.
+For example, have a look at the theme.php of the *quattro* theme:
+
+    <?php
+    /**
+     * Name: Quattro
+     * Version: 0.6
+     * Author: Fabio <http://kirgroup.com/profile/fabrixxm>
+     * Maintainer: Fabio <http://kirgroup.com/profile/fabrixxm>
+     * Maintainer: Tobias <https://f.diekershoff.de/profile/tobias>
+     */
+
+You see the definition of the themes name, it's version and the initial author of the theme.
+These three information should be listed.
+If the original author is not anymore working on the theme, but a maintainer has taken over, the maintainer should be listed as well.
+The information from the theme header will be displayed in the admin panelö.
+
+Next crucial part of the theme.php file is a definition of an init function.
+The name of the function is <theme-name>_init.
+So in the case of quattro it is
+
+    function quattro_init(&$a) {
+      $a->theme_info = array();
+      set_template_engine($a, 'smarty3');
+    }
+
+Here we have set the basic theme information, in this case they are empthy.
+But the array needs to be set.
+And we have set the template engine that should be used by friendica for this theme.
+At the moment you should use the *smarty3* engine.
+There once was a friendica specific templating engine as well but that is not used anymore.
+If you like to use another templating engine, please implement it.
+
+When you want to inherit stuff from another theme you have to *announce* this in the theme_info:
+
+    $a->theme_info = array(
+      'extends' => 'duepuntozero',
+    );
+
+which declares *duepuntozero* as parent of the theme.
+
+If you want to add something to the HTML header of the theme, one way to do so is by adding it to the theme.php file.
+To do so, add something alike
+
+    $a->page['htmlhead'] .= <<< EOT
+    /* stuff you want to add to the header */
+    EOT;
+
+The $a variable holds the friendica application.
+So you can access the properties of this friendica session from the theme.php file as well.
+
+### default.php
+
+This file covers the structure of the underlying HTML layout.
+The default file is in
+
+    /view/default.php
+
+if you want to change it, say adding a 4th column for banners of your favourite FLOSS projects, place a new default.php file in your theme directory.
+As with the theme.php file, you can use the properties of the $a variable with holds the friendica application to decide what content is displayed.
\ No newline at end of file