diff --git a/images/apple-touch-icon.png b/images/apple-touch-icon.png
deleted file mode 100755
index 45fa4e7..0000000
Binary files a/images/apple-touch-icon.png and /dev/null differ
diff --git a/images/fav/android-chrome-192x192.png b/images/fav/android-chrome-192x192.png
new file mode 100755
index 0000000..e5c312a
Binary files /dev/null and b/images/fav/android-chrome-192x192.png differ
diff --git a/images/fav/apple-touch-icon-114x114.png b/images/fav/apple-touch-icon-114x114.png
new file mode 100755
index 0000000..742ee2b
Binary files /dev/null and b/images/fav/apple-touch-icon-114x114.png differ
diff --git a/images/fav/apple-touch-icon-120x120.png b/images/fav/apple-touch-icon-120x120.png
new file mode 100755
index 0000000..ac8a742
Binary files /dev/null and b/images/fav/apple-touch-icon-120x120.png differ
diff --git a/images/fav/apple-touch-icon-144x144.png b/images/fav/apple-touch-icon-144x144.png
new file mode 100755
index 0000000..bda42ec
Binary files /dev/null and b/images/fav/apple-touch-icon-144x144.png differ
diff --git a/images/fav/apple-touch-icon-152x152.png b/images/fav/apple-touch-icon-152x152.png
new file mode 100755
index 0000000..2c83c4a
Binary files /dev/null and b/images/fav/apple-touch-icon-152x152.png differ
diff --git a/images/fav/apple-touch-icon-180x180.png b/images/fav/apple-touch-icon-180x180.png
new file mode 100755
index 0000000..c650add
Binary files /dev/null and b/images/fav/apple-touch-icon-180x180.png differ
diff --git a/images/fav/apple-touch-icon-57x57.png b/images/fav/apple-touch-icon-57x57.png
new file mode 100755
index 0000000..b241977
Binary files /dev/null and b/images/fav/apple-touch-icon-57x57.png differ
diff --git a/images/fav/apple-touch-icon-60x60.png b/images/fav/apple-touch-icon-60x60.png
new file mode 100755
index 0000000..36ab339
Binary files /dev/null and b/images/fav/apple-touch-icon-60x60.png differ
diff --git a/images/fav/apple-touch-icon-72x72.png b/images/fav/apple-touch-icon-72x72.png
new file mode 100755
index 0000000..031994b
Binary files /dev/null and b/images/fav/apple-touch-icon-72x72.png differ
diff --git a/images/fav/apple-touch-icon-76x76.png b/images/fav/apple-touch-icon-76x76.png
new file mode 100755
index 0000000..697f8a0
Binary files /dev/null and b/images/fav/apple-touch-icon-76x76.png differ
diff --git a/images/fav/favicon-32x32.png b/images/fav/favicon-32x32.png
new file mode 100755
index 0000000..5799ce8
Binary files /dev/null and b/images/fav/favicon-32x32.png differ
diff --git a/images/fav/favicon-96x96.png b/images/fav/favicon-96x96.png
new file mode 100755
index 0000000..12cdec1
Binary files /dev/null and b/images/fav/favicon-96x96.png differ
diff --git a/images/fav/largetile.png b/images/fav/largetile.png
new file mode 100755
index 0000000..736b2d3
Binary files /dev/null and b/images/fav/largetile.png differ
diff --git a/images/fav/mediumtile.png b/images/fav/mediumtile.png
new file mode 100755
index 0000000..a15ab65
Binary files /dev/null and b/images/fav/mediumtile.png differ
diff --git a/images/fav/smalltile.png b/images/fav/smalltile.png
new file mode 100755
index 0000000..1862472
Binary files /dev/null and b/images/fav/smalltile.png differ
diff --git a/images/fav/widetile.png b/images/fav/widetile.png
new file mode 100644
index 0000000..065f597
Binary files /dev/null and b/images/fav/widetile.png differ
diff --git a/images/favicon.ico b/images/favicon.ico
index 8b9616a..1d51774 100755
Binary files a/images/favicon.ico and b/images/favicon.ico differ
diff --git a/lang/af/lang.php b/lang/af/lang.php
deleted file mode 100755
index 127ac30..0000000
--- a/lang/af/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Afrikaans language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Bespreking';
-$lang['back_to_article'] = 'Terug na die artikel';
-$lang['userpage']        = 'Gebruikersbladsy';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/ar/lang.php b/lang/ar/lang.php
deleted file mode 100755
index d5c10bb..0000000
--- a/lang/ar/lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Arabic language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'نقاش';
-$lang['back_to_article'] = 'عودة إلى المقالة';
-//العودة إلى المقال
-$lang['userpage']        = 'صفحة مستخدم';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/az/lang.php b/lang/az/lang.php
deleted file mode 100755
index ea94e87..0000000
--- a/lang/az/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Azerbaijani language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Müzakirə';
-$lang['back_to_article'] = 'Geri makalenin'; // Məqalədə qayıt
-$lang['userpage']      = 'İstifadəçi səhifəsi';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/bg/lang.php b/lang/bg/lang.php
deleted file mode 100755
index 039b07a..0000000
--- a/lang/bg/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Bulgarian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Беседа';
-$lang['back_to_article'] = 'Обратно към статията';
-$lang['userpage']        = 'Потребител';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/ca/lang.php b/lang/ca/lang.php
deleted file mode 100755
index 3ed0be7..0000000
--- a/lang/ca/lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Catalan language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Discussió';
-$lang['back_to_article'] = 'Tornar al article';
-$lang['userpage']        = "Pàgina d'usuari";
-
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/cs/lang.php b/lang/cs/lang.php
deleted file mode 100755
index d4e0ef3..0000000
--- a/lang/cs/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Czech language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Diskuse';
-$lang['back_to_article'] = 'Zpet na clánek';
-$lang['userpage']        = 'Uživatelova stránka';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/da/lang.php b/lang/da/lang.php
deleted file mode 100755
index 1837ab5..0000000
--- a/lang/da/lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Danish language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Diskussion';
-$lang['back_to_article'] = 'Tilbage til artiklen';
-$lang['userpage']        = 'Brugerside';
-
-//Setup VIM: ex: et ts=2 :
-
diff --git a/lang/de/lang.php b/lang/de/lang.php
index 1a41f34..985b545 100755
--- a/lang/de/lang.php
+++ b/lang/de/lang.php
@@ -5,8 +5,12 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  */
 
-$lang['discussion']        = 'Diskussion';
-$lang['back_to_article']   = 'Zurück zum Artikel';
-$lang['userpage']          = 'Benutzer-Seite';
+$lang['direct_prefix']          = 'Direkt';
+$lang['direct_content_main']    = 'Hauptinhalt dieser Seite';
+$lang['direct_menu_main']       = 'Hauptmenü';
+
+$lang['discussion']             = 'Diskussion';
+$lang['back_to_article']        = 'Zurück zum Artikel';
+$lang['userpage']               = 'Benutzer-Seite';
 
 //Setup VIM: ex: et ts=2 :
diff --git a/lang/el/lang.php b/lang/el/lang.php
deleted file mode 100755
index 135e0a1..0000000
--- a/lang/el/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Greek language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Συζήτηση';
-$lang['back_to_article'] = 'Πίσω στα άρθρα';
-$lang['userpage']        = 'Σελίδα χρήστη';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/en/lang.php b/lang/en/lang.php
index 7097f18..dfa6c36 100755
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -4,10 +4,14 @@
  *
  */
 
-$lang['discussion']        = 'Discussion';
-$lang['back_to_article']   = 'Back to article';
-$lang['userpage']          = 'User page';
-$lang['__existing__']      = 'The color for links to existing pages';
-$lang['__missing__']       = 'The color for links to non-existing pages';
-$lang['__site_width__']    = 'The width of the full site (can be any length unit: %, px, em, ...)';
-$lang['__sidebar_width__'] = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)';
+$lang['direct_prefix']          = 'jump to';
+$lang['direct_content_main']    = 'main content';
+$lang['direct_menu_main']       = 'main menu';
+
+$lang['discussion']             = 'Discussion';
+$lang['back_to_article']        = 'Back to article';
+$lang['userpage']               = 'User page';
+$lang['__existing__']           = 'The color for links to existing pages';
+$lang['__missing__']            = 'The color for links to non-existing pages';
+$lang['__site_width__']         = 'The width of the full site (can be any length unit: %, px, em, ...)';
+$lang['__sidebar_width__']      = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)';
diff --git a/lang/eo/lang.php b/lang/eo/lang.php
deleted file mode 100755
index cc63739..0000000
--- a/lang/eo/lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Esperantiga dosiero
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']   = 'Diskuto';
-$lang['userpage']     = 'Pago de uzanto';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/es/lang.php b/lang/es/lang.php
deleted file mode 100755
index d949b3f..0000000
--- a/lang/es/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Spanish language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Discusión';
-$lang['back_to_article'] = 'Volver al artículo';
-$lang['userpage']        = 'Página de usuario';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/et/lang.php b/lang/et/lang.php
deleted file mode 100755
index f6223b7..0000000
--- a/lang/et/lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Estonian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Arutelu';
-$lang['back_to_article'] = 'Tagasi artikli';
-$lang['userpage']        = 'Kasutaja leht';
-
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/eu/lang.php b/lang/eu/lang.php
deleted file mode 100755
index a711270..0000000
--- a/lang/eu/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Basque language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Eztabaida';
-$lang['back_to_article'] = 'Bueltatu';
-$lang['userpage']        = 'Lankide orrialdea';//Erabiltzaile orrialdea
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/fa/lang.php b/lang/fa/lang.php
deleted file mode 100755
index 23caa26..0000000
--- a/lang/fa/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Persian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'بحث';
-$lang['back_to_article'] = 'برگشت به مقاله';
-$lang['userpage']        = 'صفحهٔ کاربر';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/fi/lang.php b/lang/fi/lang.php
deleted file mode 100755
index f64555b..0000000
--- a/lang/fi/lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Finnish language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Keskustelu';
-$lang['back_to_article'] = 'Takaisin artikkeliin';
-$lang['userpage']        = 'Käyttäjäsivu';
-
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/fo/lang.php b/lang/fo/lang.php
deleted file mode 100755
index 4e3d7d2..0000000
--- a/lang/fo/lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Faroese language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']   = 'Kjak';
-$lang['userpage']     = 'Brúkarasíða';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/fr/lang.php b/lang/fr/lang.php
deleted file mode 100755
index fa01076..0000000
--- a/lang/fr/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * French language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Discussion';
-$lang['back_to_article'] = "Retour à l'article";
-$lang['userpage']        = 'Page utilisateur';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
deleted file mode 100755
index 1fb60b8..0000000
--- a/lang/fr/settings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Fichier de langue française pour la config.
- * 
- */
-
-$lang['discussionPage']   = 'Page de discussion (effacer désactive les discussions)';
-$lang['userPage']         = 'Page utilisateur (effacer désactive les pages utilisateurs)';
-$lang['hideTools']        = 'Masquer les outils aux visiteurs anonymes ?';
diff --git a/lang/gl/lang.php b/lang/gl/lang.php
deleted file mode 100755
index 4b8fbff..0000000
--- a/lang/gl/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Galician language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Conversa';
-$lang['back_to_article'] = 'Voltar ao artigo';
-$lang['userpage']        = 'Páxina de usuario';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/he/lang.php b/lang/he/lang.php
deleted file mode 100755
index c6a7f55..0000000
--- a/lang/he/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Hebrew language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'שיחה';
-$lang['back_to_article'] = 'חזור אל המאמר';
-$lang['userpage']          = 'דף משתמש';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/hi/lang.php b/lang/hi/lang.php
deleted file mode 100755
index 2983959..0000000
--- a/lang/hi/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Hindi language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'चर्चा';
-$lang['back_to_article'] = 'वापस लेख करने के लिए';
-$lang['userpage']        = 'सदस्य';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/hr/lang.php b/lang/hr/lang.php
deleted file mode 100755
index cd8ba36..0000000
--- a/lang/hr/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Croatian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Razgovor';
-$lang['back_to_article'] = 'Natrag na clanak';
-$lang['userpage']        = 'Stranica suradnika';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/hu/lang.php b/lang/hu/lang.php
deleted file mode 100755
index 2227e3b..0000000
--- a/lang/hu/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Hungarian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Vitalap';
-$lang['back_to_article'] = 'Vissza a cikket';
-$lang['userpage']        = 'Szerkesztoi lap';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/ia/lang.php b/lang/ia/lang.php
deleted file mode 100755
index 7a86ad4..0000000
--- a/lang/ia/lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Interlingua language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Discussion';
-$lang['userpage']        = 'Pagina de usator';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/id/lang.php b/lang/id/lang.php
deleted file mode 100755
index 7c0d809..0000000
--- a/lang/id/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Indonesian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Pembicaraan';
-$lang['back_to_article'] = 'Kembali ke artikel';
-$lang['userpage']        = 'Pengguna';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/is/lang.php b/lang/is/lang.php
deleted file mode 100755
index 1a23cd9..0000000
--- a/lang/is/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Icelandic language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Spjall';
-$lang['back_to_article'] = 'Til baka á greinar';
-$lang['userpage']        = 'Notandi';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/it/lang.php b/lang/it/lang.php
deleted file mode 100755
index f33da80..0000000
--- a/lang/it/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Italian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Discussione';
-$lang['back_to_article'] = 'Torna all\'articolo';
-$lang['userpage']        = 'Pagina utente';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/ja/lang.php b/lang/ja/lang.php
deleted file mode 100755
index 23f65ab..0000000
--- a/lang/ja/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Japanese language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = '議論';
-$lang['back_to_article'] = '戻る記事へ';
-$lang['userpage']        = '利用者ページ';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/km/lang.php b/lang/km/lang.php
deleted file mode 100755
index 32de380..0000000
--- a/lang/km/lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Khmer language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'ការពិភាក្សា';
-$lang['userpage']        = 'ទំព័រអ្នកប្រើប្រាស់';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/ko/lang.php b/lang/ko/lang.php
deleted file mode 100755
index 265c416..0000000
--- a/lang/ko/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Korean language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']   = '토론';
-$lang['back_to_article'] = '위로 기사';
-$lang['userpage']       = '사용자 문서';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/la/lang.php b/lang/la/lang.php
deleted file mode 100755
index 9f2fddf..0000000
--- a/lang/la/lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Latin language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Disputatio';
-$lang['userpage']        = 'Pagina usoris';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/lb/lang.php b/lang/lb/lang.php
deleted file mode 100755
index ebf0afa..0000000
--- a/lang/lb/lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Luxembourgish language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Diskussioun';
-$lang['userpage']        = 'Benotzersäit';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/lt/lang.php b/lang/lt/lang.php
deleted file mode 100755
index 91eca48..0000000
--- a/lang/lt/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Lithuanian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Aptarimas';
-$lang['back_to_article'] = 'Atgal i straipsni';
-$lang['userpage']        = 'Naudotojo puslapis';
-
-//Setup VIM: ex: et ts=2 :
\ No newline at end of file
diff --git a/lang/lv/lang.php b/lang/lv/lang.php
deleted file mode 100755
index c083bca..0000000
--- a/lang/lv/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Latvian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
-*/
-
-$lang['discussion']      = 'Diskusija';
-$lang['back_to_article'] = 'Atpakaļ uz rakstu';
-$lang['userpage']        = 'Lietotāja lapa';
-
-//Setup VIM: ex: et ts=2 :
\ No newline at end of file
diff --git a/lang/mg/lang.php b/lang/mg/lang.php
deleted file mode 100755
index 0ba0d57..0000000
--- a/lang/mg/lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Malagasy language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Dinika';
-$lang['userpage']        = 'Pejy ny mpikambana';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/mk/lang.php b/lang/mk/lang.php
deleted file mode 100755
index 2be3a69..0000000
--- a/lang/mk/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Macedonian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Разговор';
-$lang['back_to_article'] = 'Назад кон статијата';
-$lang['userpage']        = 'Корисник';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/mr/lang.php b/lang/mr/lang.php
deleted file mode 100755
index d72013b..0000000
--- a/lang/mr/lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Marathi language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'चर्चा';
-$lang['userpage']        = 'सदस्य पान';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/ne/lang.php b/lang/ne/lang.php
deleted file mode 100755
index 6d1b8bc..0000000
--- a/lang/ne/lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Nepali language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'वार्तालाप';
-$lang['userpage']        = 'प्रयोगकर्ता पृष्ठ';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/nl/lang.php b/lang/nl/lang.php
deleted file mode 100755
index c6d9e3e..0000000
--- a/lang/nl/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Dutch language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Overleg';
-$lang['back_to_article'] = 'Terug naar artikel';
-$lang['userpage']        = 'Gebruikerspagina';
-
-//Setup VIM: ex: et ts=2 :
\ No newline at end of file
diff --git a/lang/no/lang.php b/lang/no/lang.php
deleted file mode 100755
index 111e571..0000000
--- a/lang/no/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Norwegian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Diskusjon';
-$lang['back_to_article'] = 'Tilbake til artikkelen';
-$lang['userpage']        = 'Brukerside';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/pl/lang.php b/lang/pl/lang.php
deleted file mode 100755
index 32f0d8c..0000000
--- a/lang/pl/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Polish language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Dyskusja';
-$lang['back_to_article'] = 'Powrót do artykułu';
-$lang['userpage']        = 'Strona użytkownika';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/pt-br/lang.php b/lang/pt-br/lang.php
deleted file mode 100755
index 4d6d4dd..0000000
--- a/lang/pt-br/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Brazilian Portuguese language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Discussão';
-$lang['back_to_article'] = 'Voltar ao artigo';
-$lang['userpage']        = 'Página de usuário';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/pt/lang.php b/lang/pt/lang.php
deleted file mode 100755
index d11ef9a..0000000
--- a/lang/pt/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Portuguese language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Discussão';
-$lang['back_to_article'] = 'Voltar ao artigo';
-$lang['userpage']        = 'Página de utilizador';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/ro/lang.php b/lang/ro/lang.php
deleted file mode 100755
index 15b01a6..0000000
--- a/lang/ro/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Romanian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Discuție';
-$lang['back_to_article'] = 'Înapoi la articol';
-$lang['userpage']        = 'Pagină de utilizator';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/ru/lang.php b/lang/ru/lang.php
deleted file mode 100755
index 6cb17d3..0000000
--- a/lang/ru/lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Russian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     Aleksandr Selivanov <alexgearbox@gmail.com>
- */
-
-$lang['discussion']      = 'Обсуждение';
-$lang['back_to_article'] = 'Назад к статье';
-$lang['userpage']        = 'Участник';
diff --git a/lang/ru/settings.php b/lang/ru/settings.php
deleted file mode 100755
index 76b54f1..0000000
--- a/lang/ru/settings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Russian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     Aleksandr Selivanov <alexgearbox@gmail.com>
- */
-
-$lang['discussionPage']   = 'Страница обсуждения (оставьте поле пустым для отключения обсуждений)'; //default -- discussion:@ID@
-$lang['userPage']         = 'Страница пользователя (оставьте поле пустым для отключения страниц пользователей)'; //default -- user:@USER@:
-$lang['hideTools']        = 'Скрывать инструменты гостям?';
diff --git a/lang/sk/lang.php b/lang/sk/lang.php
deleted file mode 100755
index 9113c64..0000000
--- a/lang/sk/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Slovak language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Diskusia';
-$lang['back_to_article'] = 'Späť na článok';
-$lang['userpage']        = 'Stránka používateľa';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/sl/lang.php b/lang/sl/lang.php
deleted file mode 100755
index 94a7ddd..0000000
--- a/lang/sl/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Slovenian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Pogovor';
-$lang['back_to_article'] = 'Nazaj na članek';
-$lang['userpage']        = 'Uporabniška stran';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/sq/lang.php b/lang/sq/lang.php
deleted file mode 100755
index 236d7d5..0000000
--- a/lang/sq/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Albanian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Diskutimet';
-$lang['back_to_article'] = 'Kthehu tek artikulli';
-$lang['userpage']        = 'Përdoruesi';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/sr/lang.php b/lang/sr/lang.php
deleted file mode 100755
index 1212cff..0000000
--- a/lang/sr/lang.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * Serbian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']              = 'Разговор';
diff --git a/lang/sv/lang.php b/lang/sv/lang.php
deleted file mode 100755
index 262a818..0000000
--- a/lang/sv/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Swedish language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Diskussion';
-$lang['back_to_article'] = 'Tillbaka till artikeln';
-$lang['userpage']        = 'Användarsida';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/th/lang.php b/lang/th/lang.php
deleted file mode 100755
index 9c0de5f..0000000
--- a/lang/th/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Thai language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'อภิปราย';
-$lang['back_to_article'] = 'กลับไปที่บทความ';
-$lang['userpage']        = 'หน้าผู้ใช้';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/tr/lang.php b/lang/tr/lang.php
deleted file mode 100755
index f003271..0000000
--- a/lang/tr/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Turkish language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Tartışma';
-$lang['back_to_article'] = 'Geri makalenin';
-$lang['userpage']        = 'Kullanıcı sayfası';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/uk/lang.php b/lang/uk/lang.php
deleted file mode 100755
index e2ae7dd..0000000
--- a/lang/uk/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Ukrainian language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Обговорення';
-$lang['back_to_article'] = 'Назад до статті';
-$lang['userpage']        = 'Сторінка користувача';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/vi/lang.php b/lang/vi/lang.php
deleted file mode 100755
index b7bae02..0000000
--- a/lang/vi/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Vietnamese language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = 'Thảo luận';
-$lang['back_to_article'] = 'Trở lại bài viết';
-$lang['userpage']        = 'Thành viên';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/zh-tw/lang.php b/lang/zh-tw/lang.php
deleted file mode 100755
index 72c5813..0000000
--- a/lang/zh-tw/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Chinese (Traditional) language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = '討論';
-$lang['back_to_article'] = '回到文章';
-$lang['userpage']        = '用戶頁面'; // 使用者頁面
-
-//Setup VIM: ex: et ts=2 :
diff --git a/lang/zh/lang.php b/lang/zh/lang.php
deleted file mode 100755
index c95d985..0000000
--- a/lang/zh/lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Chinese (Simplified) language file
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-$lang['discussion']      = '讨论';
-$lang['back_to_article'] = '回到文章';
-$lang['userpage']        = '用户页面';
-
-//Setup VIM: ex: et ts=2 :
diff --git a/main.php b/main.php
index bde0c15..50f55d7 100755
--- a/main.php
+++ b/main.php
@@ -24,20 +24,26 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
 
 <?php
 
-/* + + + + + + + + + + + + + +  meta and link relations  + + + + + + + + + + + + + + */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* meta and link relations */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 ?>
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <?php tpl_metaheaders() ?>
 <?php
 
-/* + + + + + + + + + + + + + +  IE8 support HTML5 / media queries  + + + + + + + + + */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* IE8 support HTML5 / media queries */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 ?>
 <!--[if lt IE 9]><script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script><![endif]-->
 
 <?php
 
-/* + + + + + + + + + + + + + + page title  + + + + + + + + + + + + + + + + + + + + + */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* page title */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 ?>
 <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]</title>
 
@@ -45,30 +51,101 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
 
 <?php
 
-/* + + + + + + + + + + + + + +  favicons   + + + + + + + + + + + + + + + + + + + + + */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* favicons */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 ?>
-<?php echo tpl_favicon(array('favicon', 'mobile')) ?> <?php /* DokuWiki: favicon.ico, apple-touch-icon.png  */ ?>
-<?php /* FIXME: additional favicons */ ?>
+<?php echo tpl_favicon(array('favicon')) ?> <?php /* DokuWiki: favicon.ico  */ ?>
 
+<link rel="apple-touch-icon" sizes="57x57" href="<?php echo tpl_getMediaFile(array(':wiki:apple-touch-icon-57x57.png', 'images/fav/apple-touch-icon-57x57.png')); ?>">
+<link rel="apple-touch-icon" sizes="60x60" href="<?php echo tpl_getMediaFile(array(':wiki:apple-touch-icon-60x60.png', 'images/fav/apple-touch-icon-60x60.png')); ?>">
+<link rel="apple-touch-icon" sizes="72x72" href="<?php echo tpl_getMediaFile(array(':wiki:apple-touch-icon-72x72.png', 'images/fav/apple-touch-icon-72x72.png')); ?>">
+<link rel="apple-touch-icon" sizes="76x76" href="<?php echo tpl_getMediaFile(array(':wiki:apple-touch-icon-76x76.png', 'images/fav/apple-touch-icon-76x76.png')); ?>">
+<link rel="apple-touch-icon" sizes="114x114" href="<?php echo tpl_getMediaFile(array(':wiki:apple-touch-icon-114x114.png', 'images/fav/apple-touch-icon-114x114.png')); ?>">
+<link rel="apple-touch-icon" sizes="120x120" href="<?php echo tpl_getMediaFile(array(':wiki:apple-touch-icon-120x120.png', 'images/fav/apple-touch-icon-120x120.png')); ?>">
+<link rel="apple-touch-icon" sizes="144x144" href="<?php echo tpl_getMediaFile(array(':wiki:apple-touch-icon-144x144.png', 'images/fav/apple-touch-icon-144x144.png')); ?>">
+<link rel="apple-touch-icon" sizes="152x152" href="<?php echo tpl_getMediaFile(array(':wiki:apple-touch-icon-152x152.png', 'images/fav/apple-touch-icon-152x152.png')); ?>">
+<link rel="apple-touch-icon" sizes="180x180" href="<?php echo tpl_getMediaFile(array(':wiki:apple-touch-icon-180x180.png', 'images/fav/apple-touch-icon-180x180.png')); ?>">
+
+<link rel="icon" type="image/png" href="<?php echo tpl_getMediaFile(array(':wiki:favicon-32x32.png', 'images/fav/favicon-32x32.png')); ?>" sizes="32x32">
+<link rel="icon" type="image/png" href="<?php echo tpl_getMediaFile(array(':wiki:favicon-96x96.png', 'images/fav/favicon-96x96.png')); ?>" sizes="96x96">
+<link rel="icon" type="image/png" href="<?php echo tpl_getMediaFile(array(':wiki:android-chrome-192x192.png', 'images/fav/android-chrome-192x192.png')); ?>" sizes="192x192">
+
+<meta name="msapplication-square70x70logo" content="<?php echo tpl_getMediaFile(array(':wiki:smalltile.png', 'images/fav/smalltile.png')); ?>" />
+<meta name="msapplication-square150x150logo" content="<?php echo tpl_getMediaFile(array(':wiki:mediumtile.png', 'images/fav/mediumtile.png')); ?>" />
+<meta name="msapplication-wide310x150logo" content="<?php echo tpl_getMediaFile(array(':wiki:widetile.png', 'images/fav/widetile.png')); ?>" />
+<meta name="msapplication-square310x310logo" content="<?php echo tpl_getMediaFile(array(':wiki:largetile.png', 'images/fav/largetile.png')); ?>" />
 <?php
 
-/* + + + + + + + + + + + + + +  Include Hook: meta.html  + + + + + + + + + + + + + + */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Include Hook: meta.html */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 ?>
 <?php tpl_includeFile('meta.html') ?>
 </head>
-<body>
+<?php /* #dokuwiki__top used as anchor for "back to top" button/link links */ ?>
+<body id="dokuwiki__top" class="<?php echo tpl_classes(); ?>">
 
 
-    <?php /* the "dokuwiki__top" id is needed somewhere at the top, because that's where the "back to top" button/link links to */ ?>
-    <?php /* tpl_classes() provides useful CSS classes; if you choose not to use it, the 'dokuwiki' class at least
-             should always be in one of the surrounding elements (e.g. plugins and templates depend on it) */ ?>
-    <div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?> <?php
-        echo ($showSidebar) ? 'hasSidebar' : ''; ?>">
-        <?php html_msgarea() /* occasional error and info messages on top of the page */ ?>
-        <?php tpl_includeFile('header.html') ?>
+    <div id="dokuwiki__site">
+        <?php
 
-        <!-- ********** HEADER ********** -->
-        <div id="dokuwiki__header"><div class="pad">
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* nav-direct */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+        ?>
+
+        <div id="dokuwiki_direct" class="nav-direct no-print">
+            <div class="container">
+                <div class="row">
+                    <div class="col-xs-12">
+
+                        <p>
+                            <span class="sr-out"><?php echo tpl_getLang('direct_prefix'); ?>: </span>
+                            <span class="skip">
+                                <a href="#content"><?php echo tpl_getLang('direct_content_main'); ?></a><span class="sr-out"> /</span>
+                                <a href="#nav-main"><?php echo tpl_getLang('direct_menu_main');  ?></a>
+                            </span>
+                        </p>
+
+                    </div><!-- .col -->
+                </div><!-- .row -->
+            </div><!-- .container -->
+        </div><!-- .nav-direct -->
+
+
+        <div class="page-wrapper <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>">
+            <?php
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Message AREA */
+/* FIXME: position of error + info messages. Does it have to be on top of the page? */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+            html_msgarea();
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Include Hook: header.html */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+            tpl_includeFile('header.html');
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* MagicMatcher */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+            ?>
+
+            <div id="dokuwiki_magic-matcher" class="magic-matcher no-print">
+                <div class="container">
+                </div><!-- .container -->
+            </div><!-- .magic-matcher -->
+            <?php
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Header */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+            ?>
+
+            <div id="dokuwiki__header" class="header no-print">
+                <div class="container">
+                </div><!-- .container -->
 
             <div class="headings">
                 <h1><?php tpl_link(wl(),$conf['title'],'accesskey="h" title="[H]"') ?></h1>