diff --git a/.gitignore b/.gitignore
index d402ae2..076bd80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 /data/config/production/config.php
 /_dev/
 /conlite/plugins/pluginmanager/_src/
-/.project
\ No newline at end of file
+/.project
+/_api/
\ No newline at end of file
diff --git a/conlite/classes/cHTML5/class.chtml.php b/conlite/classes/cHTML5/class.chtml.php
index 7ab8e8f..ac91df0 100644
--- a/conlite/classes/cHTML5/class.chtml.php
+++ b/conlite/classes/cHTML5/class.chtml.php
@@ -6,17 +6,13 @@
  * Description:
  *  Base Class for all cHTML Elements
  * 
- * @package Core
- * @subpackage cHTML
- * @version $Rev$
+ * @package ConLite\Core\cHTML5
  * @since 2.0
  * @author Ortwin Pinke <o.pinke@conlite.org>
  * @copyright (c) 2012, conlite.org
  * @license http://www.gnu.de/documents/gpl.en.html GPL v3 (english version)
  * @license http://www.gnu.de/documents/gpl.de.html GPL v3 (deutsche Version)
  * @link http://www.conlite.org ConLite.org
- * 
- * $Id$
  */
 
 // security check
diff --git a/conlite/classes/cHTML5/class.chtml5.button.php b/conlite/classes/cHTML5/class.chtml5.button.php
index 48f03d2..d0c0cb4 100644
--- a/conlite/classes/cHTML5/class.chtml5.button.php
+++ b/conlite/classes/cHTML5/class.chtml5.button.php
@@ -6,17 +6,13 @@
  * Description:
  *  cHTML Meta
  * 
- * @package Core
- * @subpackage cHTML
- * @version $Rev$
+ * @package ConLite\Core\cHTML5
  * @since 2.0
  * @author Ortwin Pinke <o.pinke@conlite.org>
  * @copyright (c) 2015, conlite.org
  * @license http://www.gnu.de/documents/gpl.en.html GPL v3 (english version)
  * @license http://www.gnu.de/documents/gpl.de.html GPL v3 (deutsche Version)
  * @link http://www.conlite.org ConLite.org
- * 
- * $Id$
  */
 
 // security check
diff --git a/conlite/classes/cHTML5/class.chtml5.list.element.php b/conlite/classes/cHTML5/class.chtml5.list.element.php
index 030e503..499d58a 100644
--- a/conlite/classes/cHTML5/class.chtml5.list.element.php
+++ b/conlite/classes/cHTML5/class.chtml5.list.element.php
@@ -7,17 +7,13 @@
  * Description:
  *  cHTML List Element
  * 
- * @package Core
- * @subpackage cHTML
- * @version $Rev$
+ * @package ConLite\Core\cHTML5
  * @since 2.0
  * @author Ortwin Pinke <o.pinke@conlite.org>
  * @copyright (c) 2015, conlite.org
  * @license http://www.gnu.de/documents/gpl.en.html GPL v3 (english version)
  * @license http://www.gnu.de/documents/gpl.de.html GPL v3 (deutsche Version)
  * @link http://www.conlite.org ConLite.org
- * 
- * $Id$
  */
 // security check
 defined('CON_FRAMEWORK') or die('Illegal call');
diff --git a/conlite/classes/cHTML5/class.chtml5.list.php b/conlite/classes/cHTML5/class.chtml5.list.php
index 6505ffc..122f3fe 100644
--- a/conlite/classes/cHTML5/class.chtml5.list.php
+++ b/conlite/classes/cHTML5/class.chtml5.list.php
@@ -6,17 +6,13 @@
  * Description:
  *  cHTML List
  * 
- * @package Core
- * @subpackage cHTML
- * @version $Rev$
+ * @package ConLite\Core\cHTML5
  * @since 2.0
  * @author Ortwin Pinke <o.pinke@conlite.org>
  * @copyright (c) 2015, conlite.org
  * @license http://www.gnu.de/documents/gpl.en.html GPL v3 (english version)
  * @license http://www.gnu.de/documents/gpl.de.html GPL v3 (deutsche Version)
  * @link http://www.conlite.org ConLite.org
- * 
- * $Id$
  */
 
 // security check
diff --git a/conlite/classes/cHTML5/class.chtml5.meta.php b/conlite/classes/cHTML5/class.chtml5.meta.php
index 2132b68..3a372f9 100644
--- a/conlite/classes/cHTML5/class.chtml5.meta.php
+++ b/conlite/classes/cHTML5/class.chtml5.meta.php
@@ -6,17 +6,13 @@
  * Description:
  *  cHTML Meta
  * 
- * @package Core
- * @subpackage cHTML
- * @version $Rev$
+ * @package ConLite\Core\cHTML5
  * @since 2.0
  * @author Ortwin Pinke <o.pinke@conlite.org>
  * @copyright (c) 2015, conlite.org
  * @license http://www.gnu.de/documents/gpl.en.html GPL v3 (english version)
  * @license http://www.gnu.de/documents/gpl.de.html GPL v3 (deutsche Version)
  * @link http://www.conlite.org ConLite.org
- * 
- * $Id$
  */
 
 // security check
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
new file mode 100644
index 0000000..5935fdb
--- /dev/null
+++ b/phpdoc.dist.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpdoc>
+    <title>API-Doc ConLite 2.1.1</title>
+  <parser>
+    <target>_api</target>
+  </parser>
+  <transformer>
+    <target>_api</target>
+  </transformer>
+  <files>
+    <directory>conlib</directory>
+    <directory>conlite</directory>
+  </files>
+  <transformations>
+    <template name="responsive-twig" />
+</transformations>
+</phpdoc>
\ No newline at end of file
diff --git a/setup/data/tables.txt b/setup/data/tables.txt
index f6520d7..0b80474 100644
--- a/setup/data/tables.txt
+++ b/setup/data/tables.txt
@@ -291,8 +291,8 @@
 "mod_translations";"original";"text";"NO";"";"";"";""
 "mod_translations";"translation";"text";"NO";"";"";"";""
 "nav_main";"idnavm";"int(10)";"NO";"PRI";"0";"";"1"
-"nav_main";"location";"varchar(255)";"NO";"";"";"";""
 "nav_main";"name";"varchar(255)";"NO";"";"";"";""
+"nav_main";"location";"varchar(255)";"NO";"";"";"";""
 "nav_sub";"idnavs";"int(10)";"NO";"PRI";"0";"";"1"
 "nav_sub";"idnavm";"int(10)";"NO";"";"0";"";""
 "nav_sub";"idarea";"int(10)";"NO";"";"0";"";""