diff --git a/config/autoload.php b/config/autoload.php
index 6f56a50..97ce0aa 100644
--- a/config/autoload.php
+++ b/config/autoload.php
@@ -3,11 +3,9 @@
 /**
  * Contao Open Source CMS
  *
- * Copyright (c) 2005-2014 Leo Feyer
+ * Copyright (c) 2005-2015 Leo Feyer
  *
- * @package Tags
- * @link    https://contao.org
- * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
+ * @license LGPL-3.0+
  */
 
 
@@ -63,18 +61,18 @@
  */
 TemplateLoader::addFiles(array
 (
-	'event_default_tags'     => 'system/modules/tags/templates',
+	'event_default_tags'     => 'system/modules/tags/templates/events',
 	'event_full_tags'        => 'system/modules/tags/templates/events',
 	'event_list_tags'        => 'system/modules/tags/templates/events',
-	'mod_article_tags'       => 'system/modules/tags/templates',
-	'mod_global_articlelist' => 'system/modules/tags/templates',
-	'mod_tag_contentlist'    => 'system/modules/tags/templates',
-	'mod_tag_listbycategory' => 'system/modules/tags/templates',
-	'mod_tagcloud'           => 'system/modules/tags/templates',
-	'mod_tagscope'           => 'system/modules/tags/templates',
-	'news_full_tags'         => 'system/modules/tags/templates',
-	'taglist'                => 'system/modules/tags/templates',
-	'tags_feed'              => 'system/modules/tags/templates',
-	'tags_inserttag'         => 'system/modules/tags/templates',
-	'tags_used'              => 'system/modules/tags/templates',
+	'mod_article_tags'       => 'system/modules/tags/templates/modules',
+	'mod_global_articlelist' => 'system/modules/tags/templates/modules',
+	'mod_tag_contentlist'    => 'system/modules/tags/templates/modules',
+	'mod_tag_listbycategory' => 'system/modules/tags/templates/modules',
+	'mod_tagcloud'           => 'system/modules/tags/templates/modules',
+	'mod_tagscope'           => 'system/modules/tags/templates/modules',
+	'news_full_tags'         => 'system/modules/tags/templates/news',
+	'taglist'                => 'system/modules/tags/templates/tags',
+	'tags_feed'              => 'system/modules/tags/templates/tags',
+	'tags_inserttag'         => 'system/modules/tags/templates/tags',
+	'tags_used'              => 'system/modules/tags/templates/tags',
 ));
diff --git a/elements/ContentGalleryTags.php b/elements/ContentGalleryTags.php
index 725756c..a779aba 100644
--- a/elements/ContentGalleryTags.php
+++ b/elements/ContentGalleryTags.php
@@ -13,47 +13,12 @@
 class ContentGalleryTags extends ContentGallery
 {
 	/**
-	 * Return if there are no files
-	 * @return string
+	 * Generate the content element
 	 */
-	public function generate()
+	public function compile()
 	{
-		// Use the home directory of the current user as file source
-		if ($this->useHomeDir && FE_USER_LOGGED_IN)
-		{
-			$this->import('FrontendUser', 'User');
-
-			if ($this->User->assignDir && $this->User->homeDir)
-			{
-				$this->multiSRC = array($this->User->homeDir);
-			}
-		}
-		else
-		{
-			$this->multiSRC = deserialize($this->multiSRC);
-		}
-
-		// Return if there are no files
-		if (!is_array($this->multiSRC) || empty($this->multiSRC))
-		{
-			return '';
-		}
-
 		$newMultiSRC = array();
 
-		// Get the file entries from the database
-		$this->objFiles = \FilesModel::findMultipleByUuids($this->multiSRC);
-
-		if ($this->objFiles === null)
-		{
-			if (!\Validator::isUuid($this->multiSRC[0]))
-			{
-				return '<p class="error">'.$GLOBALS['TL_LANG']['ERR']['version2format'].'</p>';
-			}
-
-			return '';
-		}
-
 		if ((strlen(\Input::get('tag')) && (!$this->tag_ignore)) || (strlen($this->tag_filter)))
 		{
 			$tagids = array();
@@ -112,25 +77,12 @@ public function generate()
 			}
 			$this->multiSRC = $newMultiSRC;
 			$this->objFiles = \FilesModel::findMultipleByUuids($this->multiSRC);
-		}
-
-		// Return if there are no files
-		if (!is_array($this->multiSRC) || empty($this->multiSRC))
-		{
-			return '';
-		}
-
-		if ($this->objFiles === null)
-		{
-			if (!\Validator::isUuid($this->multiSRC[0]))
+			if ($this->objFiles === null)
 			{
-				return '<p class="error">'.$GLOBALS['TL_LANG']['ERR']['version2format'].'</p>';
+				return '';
 			}
-
-			return '';
 		}
-
-		return parent::generate();
+		parent::compile();
 	}
 	
 	protected function getFilterTags()
diff --git a/modules/ModuleEventReaderTags.php b/modules/ModuleEventReaderTags.php
index 8a68af3..8ae7c9e 100644
--- a/modules/ModuleEventReaderTags.php
+++ b/modules/ModuleEventReaderTags.php
@@ -30,6 +30,7 @@ class ModuleEventReaderTags extends \ModuleEventReader
 	 */
 	protected function compile()
 	{
+		/** @var \PageModel $objPage */
 		global $objPage;
 
 		$this->Template->event = '';
@@ -39,16 +40,11 @@ protected function compile()
 		// Get the current event
 		$objEvent = \CalendarEventsModel::findPublishedByParentAndIdOrAlias(\Input::get('events'), $this->cal_calendar);
 
-		if ($objEvent === null)
+		if (null === $objEvent)
 		{
-			// Do not index or cache the page
-			$objPage->noSearch = 1;
-			$objPage->cache = 0;
-
-			// Send a 404 header
-			header('HTTP/1.1 404 Not Found');
-			$this->Template->event = '<p class="error">' . sprintf($GLOBALS['TL_LANG']['MSC']['invalidPage'], \Input::get('events')) . '</p>';
-			return;
+			/** @var \PageError404 $objHandler */
+			$objHandler = new $GLOBALS['TL_PTY']['error_404']();
+			$objHandler->generate($objPage->id);
 		}
 
 		// Overwrite the page title (see #2853 and #4955)
@@ -127,17 +123,18 @@ protected function compile()
 		{
 			$size = deserialize($this->imgSize);
 
-			if ($size[0] > 0 || $size[1] > 0)
+			if ($size[0] > 0 || $size[1] > 0 || is_numeric($size[2]))
 			{
 				$objEvent->size = $this->imgSize;
 			}
 		}
 
+		/** @var \FrontendTemplate|object $objTemplate */
 		$objTemplate = new \FrontendTemplate($this->cal_template);
 		$objTemplate->setData($objEvent->row());
 
 		$objTemplate->date = $date;
-		$objTemplate->start = $intStartTime;
+		$objTemplate->begin = $intStartTime;
 		$objTemplate->end = $intEndTime;
 		$objTemplate->class = ($objEvent->cssClass != '') ? ' ' . $objEvent->cssClass : '';
 		$objTemplate->recurring = $recurring;
@@ -151,7 +148,7 @@ protected function compile()
 		{
 			while ($objElement->next())
 			{
-				$objTemplate->details .= $this->getContentElement($objElement->id);
+				$objTemplate->details .= $this->getContentElement($objElement->current());
 			}
 		}
 
@@ -187,7 +184,7 @@ protected function compile()
 			$this->addEnclosuresToTemplate($objTemplate, $objEvent->row());
 		}
 
-		////////// CHANGES BY ModuleEventlistTags
+		////////// CHANGES BY ModuleEventReaderTags
 		$objTemplate->showTags = $this->event_showtags;
 		if ($this->event_showtags)
 		{
@@ -199,7 +196,7 @@ protected function compile()
 			$objTemplate->tags = $tags;
 			$objTemplate->taglist = $taglist;
 		}
-		////////// CHANGES BY ModuleEventlistTags
+		////////// CHANGES BY ModuleEventReaderTags
 
 		$this->Template->event = $objTemplate->parse();
 
@@ -207,9 +204,11 @@ protected function compile()
 		if ($objEvent->noComments || !in_array('comments', \ModuleLoader::getActive()))
 		{
 			$this->Template->allowComments = false;
+
 			return;
 		}
 
+		/** @var \CalendarModel $objCalendar */
 		$objCalendar = $objEvent->getRelated('pid');
 		$this->Template->allowComments = $objCalendar->allowComments;
 
@@ -235,6 +234,7 @@ protected function compile()
 		// Notify the author
 		if ($objCalendar->notify != 'notify_admin')
 		{
+			/** @var \UserModel $objAuthor */
 			if (($objAuthor = $objEvent->getRelated('author')) !== null && $objAuthor->email != '')
 			{
 				$arrNotifies[] = $objAuthor->email;
diff --git a/modules/ModuleEventlistTags.php b/modules/ModuleEventlistTags.php
index 4c8735b..9088e79 100644
--- a/modules/ModuleEventlistTags.php
+++ b/modules/ModuleEventlistTags.php
@@ -94,24 +94,30 @@ protected function getAllEvents($arrCalendars, $intStart, $intEnd)
 	 */
 	protected function compile()
 	{
+		/** @var \PageModel $objPage */
 		global $objPage;
+
 		$blnClearInput = false;
 
+		$intYear = \Input::get('year');
+		$intMonth = \Input::get('month');
+		$intDay = \Input::get('day');
+
 		// Jump to the current period
 		if (!isset($_GET['year']) && !isset($_GET['month']) && !isset($_GET['day']))
 		{
 			switch ($this->cal_format)
 			{
 				case 'cal_year':
-					\Input::setGet('year', date('Y'));
+					$intYear = date('Y');
 					break;
 
 				case 'cal_month':
-					\Input::setGet('month', date('Ym'));
+					$intMonth = date('Ym');
 					break;
 
 				case 'cal_day':
-					\Input::setGet('day', date('Ymd'));
+					$intDay = date('Ymd');
 					break;
 			}
 
@@ -120,31 +126,37 @@ protected function compile()
 
 		$blnDynamicFormat = (!$this->cal_ignoreDynamic && in_array($this->cal_format, array('cal_day', 'cal_month', 'cal_year')));
 
-		// Display year
-		if ($blnDynamicFormat && \Input::get('year'))
-		{
-			$this->Date = new \Date(\Input::get('year'), 'Y');
-			$this->cal_format = 'cal_year';
-			$this->headline .= ' ' . date('Y', $this->Date->tstamp);
-		}
-		// Display month
-		elseif ($blnDynamicFormat && \Input::get('month'))
+		// Create the date object
+		try
 		{
-			$this->Date = new \Date(\Input::get('month'), 'Ym');
-			$this->cal_format = 'cal_month';
-			$this->headline .= ' ' . \Date::parse('F Y', $this->Date->tstamp);
-		}
-		// Display day
-		elseif ($blnDynamicFormat && \Input::get('day'))
-		{
-			$this->Date = new \Date(\Input::get('day'), 'Ymd');
-			$this->cal_format = 'cal_day';
-			$this->headline .= ' ' . \Date::parse($objPage->dateFormat, $this->Date->tstamp);
+			if ($blnDynamicFormat && $intYear)
+			{
+				$this->Date = new \Date($intYear, 'Y');
+				$this->cal_format = 'cal_year';
+				$this->headline .= ' ' . date('Y', $this->Date->tstamp);
+			}
+			elseif ($blnDynamicFormat && $intMonth)
+			{
+				$this->Date = new \Date($intMonth, 'Ym');
+				$this->cal_format = 'cal_month';
+				$this->headline .= ' ' . \Date::parse('F Y', $this->Date->tstamp);
+			}
+			elseif ($blnDynamicFormat && $intDay)
+			{
+				$this->Date = new \Date($intDay, 'Ymd');
+				$this->cal_format = 'cal_day';
+				$this->headline .= ' ' . \Date::parse($objPage->dateFormat, $this->Date->tstamp);
+			}
+			else
+			{
+				$this->Date = new \Date();
+			}
 		}
-		// Display all events or upcoming/past events
-		else
+		catch (\OutOfBoundsException $e)
 		{
-			$this->Date = new \Date();
+			/** @var \PageError404 $objHandler */
+			$objHandler = new $GLOBALS['TL_PTY']['error_404']();
+			$objHandler->generate($objPage->id);
 		}
 
 		list($strBegin, $strEnd, $strEmpty) = $this->getDatesFromFormat($this->Date, $this->cal_format);
@@ -203,24 +215,20 @@ protected function compile()
 		if ($this->perPage > 0)
 		{
 			$id = 'page_e' . $this->id;
-			$page = \Input::get($id) ?: 1;
+			$page = (\Input::get($id) !== null) ? \Input::get($id) : 1;
 
 			// Do not index or cache the page if the page number is outside the range
 			if ($page < 1 || $page > max(ceil($total/$this->perPage), 1))
 			{
-				global $objPage;
-				$objPage->noSearch = 1;
-				$objPage->cache = 0;
-
-				// Send a 404 header
-				header('HTTP/1.1 404 Not Found');
-				return;
+				/** @var \PageError404 $objHandler */
+				$objHandler = new $GLOBALS['TL_PTY']['error_404']();
+				$objHandler->generate($objPage->id);
 			}
 
 			$offset = ($page - 1) * $this->perPage;
 			$limit = min($this->perPage + $offset, $total);
 
-			$objPagination = new \Pagination($total, $this->perPage, $GLOBALS['TL_CONFIG']['maxPaginationLinks'], $id);
+			$objPagination = new \Pagination($total, $this->perPage, \Config::get('maxPaginationLinks'), $id);
 			$this->Template->pagination = $objPagination->generate("\n  ");
 		}
 
@@ -237,7 +245,7 @@ protected function compile()
 		{
 			$size = deserialize($this->imgSize);
 
-			if ($size[0] > 0 || $size[1] > 0)
+			if ($size[0] > 0 || $size[1] > 0 || is_numeric($size[2]))
 			{
 				$imgSize = $this->imgSize;
 			}
@@ -255,6 +263,7 @@ protected function compile()
 				$blnIsLastEvent = true;
 			}
 
+			/** @var \FrontendTemplate|object $objTemplate */
 			$objTemplate = new \FrontendTemplate($this->cal_template);
 			$objTemplate->setData($event);
 
@@ -282,11 +291,12 @@ protected function compile()
 				$objTemplate->details = $event['teaser'];
 			}
 
-			// Add template variables
+			// Add the template variables
 			$objTemplate->classList = $event['class'] . ((($headerCount % 2) == 0) ? ' even' : ' odd') . (($headerCount == 0) ? ' first' : '') . ($blnIsLastEvent ? ' last' : '') . ' cal_' . $event['parent'];
 			$objTemplate->classUpcoming = $event['class'] . ((($eventCount % 2) == 0) ? ' even' : ' odd') . (($eventCount == 0) ? ' first' : '') . ((($offset + $eventCount + 1) >= $limit) ? ' last' : '') . ' cal_' . $event['parent'];
 			$objTemplate->readMore = specialchars(sprintf($GLOBALS['TL_LANG']['MSC']['readMore'], $event['title']));
 			$objTemplate->more = $GLOBALS['TL_LANG']['MSC']['more'];
+			$objTemplate->locationLabel = $GLOBALS['TL_LANG']['MSC']['location'];
 
 			// Short view
 			if ($this->cal_noSpan)
@@ -405,30 +415,6 @@ protected function compile()
 		////////// CHANGES BY ModuleEventlistTags
 	}
 
-	/**
-	 * Read tags from database
-	 * @return string
-	 */
-	protected function getFilterTags()
-	{
-		if (strlen($this->tag_filter))
-		{
-			$tags = preg_split("/,/", $this->tag_filter);
-			$placeholders = array();
-			foreach ($tags as $tag)
-			{
-				array_push($placeholders, '?');
-			}
-			array_push($tags, 'tl_calendar_events');
-			return $this->Database->prepare("SELECT tid FROM tl_tag WHERE tag IN (" . join($placeholders, ',') . ") AND from_table = ? ORDER BY tag ASC")
-				->execute($tags)
-				->fetchEach('tid');
-		}
-		else
-		{
-			return array();
-		}
-	}
 }
 
 ?>
\ No newline at end of file
diff --git a/modules/ModuleFaqListTags.php b/modules/ModuleFaqListTags.php
index 09a0445..9560f07 100644
--- a/modules/ModuleFaqListTags.php
+++ b/modules/ModuleFaqListTags.php
@@ -43,7 +43,7 @@ class ModuleFaqListTags extends \ModuleFaqList
 {
 
 	/**
-	 * Generate module
+	 * Generate the module
 	 */
 	protected function compile()
 	{
@@ -84,6 +84,7 @@ protected function compile()
 		if ($objFaq === null)
 		{
 			$this->Template->faq = array();
+
 			return;
 		}
 
@@ -93,12 +94,15 @@ protected function compile()
 		while ($objFaq->next())
 		{
 			$arrTemp = $objFaq->row();
-
 			$arrTemp['title'] = specialchars($objFaq->question, true);
 			$arrTemp['href'] = $this->generateFaqLink($objFaq);
 
+			/** @var \FaqCategoryModel $objPid */
+			$objPid = $objFaq->getRelated('pid');
+
 			$arrFaq[$objFaq->pid]['items'][] = $arrTemp;
-			$arrFaq[$objFaq->pid]['headline'] = $objFaq->getRelated('pid')->headline;
+			$arrFaq[$objFaq->pid]['headline'] = $objPid->headline;
+			$arrFaq[$objFaq->pid]['title'] = $objPid->title;
 		}
 
 		$arrFaq = array_values(array_filter($arrFaq));
@@ -122,6 +126,7 @@ protected function compile()
 
 		$this->Template->faq = $arrFaq;
 	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/modules/ModuleNewsArchiveTags.php b/modules/ModuleNewsArchiveTags.php
index 8d4445f..c584f55 100644
--- a/modules/ModuleNewsArchiveTags.php
+++ b/modules/ModuleNewsArchiveTags.php
@@ -71,6 +71,7 @@ protected function getFilterTags()
 	 */
 	protected function compileFromParent($arrIds)
 	{
+		/** @var \PageModel $objPage */
 		global $objPage;
 
 		$limit = null;
@@ -102,41 +103,44 @@ protected function compileFromParent($arrIds)
 			}
 		}
 
-		// Display year
-		if ($intYear)
+		// Create the date object
+		try
 		{
-			$strDate = $intYear;
-			$objDate = new \Date($strDate, 'Y');
-			$intBegin = $objDate->yearBegin;
-			$intEnd = $objDate->yearEnd;
-			$this->headline .= ' ' . date('Y', $objDate->tstamp);
-		}
-
-		// Display month
-		elseif ($intMonth)
-		{
-			$strDate = $intMonth;
-			$objDate = new \Date($strDate, 'Ym');
-			$intBegin = $objDate->monthBegin;
-			$intEnd = $objDate->monthEnd;
-			$this->headline .= ' ' . \Date::parse('F Y', $objDate->tstamp);
-		}
-
-		// Display day
-		elseif ($intDay)
-		{
-			$strDate = $intDay;
-			$objDate = new \Date($strDate, 'Ymd');
-			$intBegin = $objDate->dayBegin;
-			$intEnd = $objDate->dayEnd;
-			$this->headline .= ' ' . \Date::parse($objPage->dateFormat, $objDate->tstamp);
+			if ($intYear)
+			{
+				$strDate = $intYear;
+				$objDate = new \Date($strDate, 'Y');
+				$intBegin = $objDate->yearBegin;
+				$intEnd = $objDate->yearEnd;
+				$this->headline .= ' ' . date('Y', $objDate->tstamp);
+			}
+			elseif ($intMonth)
+			{
+				$strDate = $intMonth;
+				$objDate = new \Date($strDate, 'Ym');
+				$intBegin = $objDate->monthBegin;
+				$intEnd = $objDate->monthEnd;
+				$this->headline .= ' ' . \Date::parse('F Y', $objDate->tstamp);
+			}
+			elseif ($intDay)
+			{
+				$strDate = $intDay;
+				$objDate = new \Date($strDate, 'Ymd');
+				$intBegin = $objDate->dayBegin;
+				$intEnd = $objDate->dayEnd;
+				$this->headline .= ' ' . \Date::parse($objPage->dateFormat, $objDate->tstamp);
+			}
+			elseif ($this->news_jumpToCurrent == 'all_items')
+			{
+				$intBegin = 0;
+				$intEnd = time();
+			}
 		}
-
-		// Show all items
-		elseif ($this->news_jumpToCurrent == 'all_items')
+		catch (\OutOfBoundsException $e)
 		{
-			$intBegin = 0;
-			$intEnd = time();
+			/** @var \PageError404 $objHandler */
+			$objHandler = new $GLOBALS['TL_PTY']['error_404']();
+			#$objHandler->generate($objPage->id);
 		}
 
 		$this->Template->articles = array();
@@ -153,18 +157,14 @@ protected function compileFromParent($arrIds)
 
 				// Get the current page
 				$id = 'page_a' . $this->id;
-				$page = \Input::get($id) ?: 1;
+				$page = (\Input::get($id) !== null) ? \Input::get($id) : 1;
 
 				// Do not index or cache the page if the page number is outside the range
 				if ($page < 1 || $page > max(ceil($total/$this->perPage), 1))
 				{
-					global $objPage;
-					$objPage->noSearch = 1;
-					$objPage->cache = 0;
-
-					// Send a 404 header
-					header('HTTP/1.1 404 Not Found');
-					return;
+					/** @var \PageError404 $objHandler */
+					$objHandler = new $GLOBALS['TL_PTY']['error_404']();
+					$objHandler->generate($objPage->id);
 				}
 
 				// Set limit and offset
diff --git a/modules/ModuleNewsListTags.php b/modules/ModuleNewsListTags.php
index 2aabae1..82c913f 100644
--- a/modules/ModuleNewsListTags.php
+++ b/modules/ModuleNewsListTags.php
@@ -61,8 +61,8 @@ protected function getFilterTags()
 	 */
 	protected function compileFromParent($arrIds)
 	{
-		$offset = intval($this->skipFirst);
 		$limit = null;
+		$offset = intval($this->skipFirst);
 
 		// Maximum number of items
 		if ($this->numberOfItems > 0)
@@ -108,18 +108,17 @@ protected function compileFromParent($arrIds)
 
 			// Get the current page
 			$id = 'page_n' . $this->id;
-			$page = \Input::get($id) ?: 1;
+			$page = (\Input::get($id) !== null) ? \Input::get($id) : 1;
 
 			// Do not index or cache the page if the page number is outside the range
 			if ($page < 1 || $page > max(ceil($total/$this->perPage), 1))
 			{
+				/** @var \PageModel $objPage */
 				global $objPage;
-				$objPage->noSearch = 1;
-				$objPage->cache = 0;
 
-				// Send a 404 header
-				header('HTTP/1.1 404 Not Found');
-				return;
+				/** @var \PageError404 $objHandler */
+				$objHandler = new $GLOBALS['TL_PTY']['error_404']();
+				$objHandler->generate($objPage->id);
 			}
 
 			// Set limit and offset
@@ -155,7 +154,6 @@ protected function compileFromParent($arrIds)
 		}
 
 		$this->Template->archives = $this->news_archives;
-		
 		// new code for tags
 		$relatedlist = (strlen(\Input::get('related'))) ? preg_split("/,/", \Input::get('related')) : array();
 		$headlinetags = array();
diff --git a/modules/ModuleTagCloud.php b/modules/ModuleTagCloud.php
index 208549b..c232767 100644
--- a/modules/ModuleTagCloud.php
+++ b/modules/ModuleTagCloud.php
@@ -155,10 +155,6 @@ protected function showTags()
 			{
 				$this->arrTags[$idx]['tag_class'] .= ' active';
 			}
-			if (in_array($tag['tag_name'], (strlen(\Input::get('related'))) ? preg_split("/,/", \Input::get('related')) : array()))
-			{
-				$this->arrTags[$idx]['tag_class'] .= ' related';
-			}
 			if ($this->checkForArticleOnPage)
 			{
 				global $objPage;
diff --git a/templates/events/event_default_tags.html5 b/templates/events/event_default_tags.html5
new file mode 100644
index 0000000..9c9885b
--- /dev/null
+++ b/templates/events/event_default_tags.html5
@@ -0,0 +1,57 @@
+
+<div class="event block<?php echo $this->class; ?>">
+
+<h1><?php echo $this->title; ?></h1>
+
+<p class="info"><?php echo $this->date; ?></p>
+<?php if ($this->recurring): ?>
+
+<p class="recurring"><?php echo $this->recurring; if ($this->until): ?> <?php echo $this->until; endif; ?>.</p>
+<?php endif; ?>
+
+<div class="ce_text">
+<?php if (!$this->addBefore): ?>
+
+<?php echo $this->details; ?>
+<?php endif; ?>
+<?php if ($this->addImage): ?>
+
+<figure class="image_container<?php echo $this->floatClass; ?>"<?php if ($this->margin || $this->float): ?> style="<?php echo trim($this->margin . $this->float); ?>"<?php endif; ?>>
+<?php if ($this->href): ?>
+<a href="<?php echo $this->href; ?>"<?php echo $this->attributes; ?> title="<?php echo $this->alt; ?>">
+<?php endif; ?>
+<img src="<?php echo $this->src; ?>"<?php echo $this->imgSize; ?> alt="<?php echo $this->alt; ?>">
+<?php if ($this->href): ?>
+</a>
+<?php endif; ?>
+<?php if ($this->caption): ?>
+<figcaption class="caption"><?php echo $this->caption; ?></figcaption>
+<?php endif; ?>
+</figure>
+<?php endif; ?>
+<?php if ($this->addBefore): ?>
+
+<?php echo $this->details; ?>
+<?php endif; ?>
+
+</div>
+<?php if ($this->enclosure): ?>
+
+<div class="enclosure">
+<?php foreach ($this->enclosure as $enclosure): ?>
+<p><img src="<?php echo $enclosure['icon']; ?>" width="18" height="18" alt="<?php echo $enclosure['mime']; ?>" class="mime_icon"> <a href="<?php echo $enclosure['href']; ?>" title="<?php echo $enclosure['title']; ?>"><?php echo $enclosure['link']; ?> <span class="size">(<?php echo $enclosure['filesize']; ?>)</span></a></p>
+<?php endforeach; ?>
+</div>
+<?php endif; ?>
+
+<?php if ($this->showTags): ?>
+
+<?php if (count($this->tags)): ?>
+<ul class="tag-chain">
+<?php $counter = 0; foreach ($this->tags as $tag): ?>
+<li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->tags)-1) echo ' last'; ?>"><?php echo $tag; ?></li>
+<?php $counter++; endforeach; ?>
+</ul>
+<?php endif; ?>
+<?php endif; ?>
+</div>
diff --git a/templates/events/event_default_tags.xhtml b/templates/events/event_default_tags.xhtml
new file mode 100644
index 0000000..6dfee2e
--- /dev/null
+++ b/templates/events/event_default_tags.xhtml
@@ -0,0 +1,57 @@
+
+<div class="event block<?php echo $this->class; ?>">
+
+<h1><?php echo $this->title; ?></h1>
+
+<p class="info"><?php echo $this->date; ?></p>
+<?php if ($this->recurring): ?>
+
+<p class="recurring"><?php echo $this->recurring; if ($this->until): ?> <?php echo $this->until; endif; ?>.</p>
+<?php endif; ?>
+
+<div class="ce_text">
+<?php if (!$this->addBefore): ?>
+
+<?php echo $this->details; ?>
+<?php endif; ?>
+<?php if ($this->addImage): ?>
+
+<div class="image_container<?php echo $this->floatClass; ?>"<?php if ($this->margin || $this->float): ?> style="<?php echo trim($this->margin . $this->float); ?>"<?php endif; ?>>
+<?php if ($this->href): ?>
+<a href="<?php echo $this->href; ?>"<?php echo $this->attributes; ?> title="<?php echo $this->alt; ?>">
+<?php endif; ?>
+<img src="<?php echo $this->src; ?>"<?php echo $this->imgSize; ?> alt="<?php echo $this->alt; ?>" />
+<?php if ($this->href): ?>
+</a>
+<?php endif; ?>
+<?php if ($this->caption): ?>
+<div class="caption"><?php echo $this->caption; ?></div>
+<?php endif; ?>
+</div>
+<?php endif; ?>
+<?php if ($this->addBefore): ?>
+
+<?php echo $this->details; ?>
+<?php endif; ?>
+
+</div>
+<?php if ($this->enclosure): ?>
+
+<div class="enclosure">
+<?php foreach ($this->enclosure as $enclosure): ?>
+<p><img src="<?php echo $enclosure['icon']; ?>" width="18" height="18" alt="<?php echo $enclosure['mime']; ?>" class="mime_icon" /> <a href="<?php echo $enclosure['href']; ?>" title="<?php echo $enclosure['title']; ?>"><?php echo $enclosure['link']; ?> <span class="size">(<?php echo $enclosure['filesize']; ?>)</span></a></p>
+<?php endforeach; ?>
+</div>
+<?php endif; ?>
+
+<?php if ($this->showTags): ?>
+
+<?php if (count($this->tags)): ?>
+<ul class="tag-chain">
+<?php $counter = 0; foreach ($this->tags as $tag): ?>
+<li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->tags)-1) echo ' last'; ?>"><?php echo $tag; ?></li>
+<?php $counter++; endforeach; ?>
+</ul>
+<?php endif; ?>
+<?php endif; ?>
+</div>
diff --git a/templates/events/event_full_tags.html5 b/templates/events/event_full_tags.html5
index 323d748..c89c806 100644
--- a/templates/events/event_full_tags.html5
+++ b/templates/events/event_full_tags.html5
@@ -1,42 +1,41 @@
 
-<div class="event layout_full block<?php echo $this->class; ?>">
+<div class="event layout_full block<?= $this->class ?>">
 
-  <h1><?php echo $this->title; ?></h1>
-  <p class="info"><?php echo $this->date; ?></p>
+  <h1><?= $this->title ?></h1>
+  <p class="info"><?= $this->date ?></p>
 
   <?php if ($this->recurring): ?>
-    <p class="recurring"><?php echo $this->recurring; if ($this->until): ?> <?php echo $this->until; endif; ?>.</p>
+    <p class="recurring"><?= $this->recurring ?><?php if ($this->until) echo ' ' . $this->until; ?>.</p>
   <?php endif; ?>
 
   <?php if ($this->details): ?>
-    <?php echo $this->details; ?>
+    <?= $this->details ?>
   <?php else: ?>
     <div class="ce_text block">
-      <?php echo $this->teaser; ?>
+      <?= $this->teaser ?>
     </div>
   <?php endif; ?>
 
   <?php if ($this->location): ?>
-    <p class="location"><?php echo $this->locationLabel; ?>: <?php echo $this->location; ?></p>
+    <p class="location"><?= $this->locationLabel ?>: <?= $this->location ?></p>
   <?php endif; ?>
 
   <?php if ($this->enclosure): ?>
     <div class="enclosure">
       <?php foreach ($this->enclosure as $enclosure): ?>
-        <p><img src="<?php echo $enclosure['icon']; ?>" width="18" height="18" alt="<?php echo $enclosure['mime']; ?>" class="mime_icon"> <a href="<?php echo $enclosure['href']; ?>" title="<?php echo $enclosure['title']; ?>"><?php echo $enclosure['link']; ?> <span class="size">(<?php echo $enclosure['filesize']; ?>)</span></a></p>
+        <p><img src="<?= $enclosure['icon'] ?>" width="18" height="18" alt="<?= $enclosure['mime'] ?>" class="mime_icon"> <a href="<?= $enclosure['href'] ?>" title="<?= $enclosure['title'] ?>"><?= $enclosure['link'] ?> <span class="size">(<?= $enclosure['filesize'] ?>)</span></a></p>
       <?php endforeach; ?>
     </div>
   <?php endif; ?>
 
-	<?php if ($this->showTags): ?>
-
-	<?php if (count($this->taglist)): ?>
-	<ul class="tag-chain">
-	<?php $counter = 0; foreach ($this->taglist as $tag): ?>
-	<li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->taglist)-1) echo ' last'; ?><?php if ($this->showTagClass) echo ' ' . $tag['class']; ?>"><?php echo $tag['url']; ?></li>
-	<?php $counter++; endforeach; ?>
-	</ul>
-	<?php endif; ?>
-	<?php endif; ?>
+  <?php if ($this->showTags): ?>
+    <?php if (count($this->taglist)): ?>
+      <ul class="tag-chain">
+      <?php $counter = 0; foreach ($this->taglist as $tag): ?>
+        <li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->taglist)-1) echo ' last'; ?><?php if ($this->showTagClass) echo ' ' . $tag['class']; ?>"><?php echo $tag['url']; ?></li>
+      <?php $counter++; endforeach; ?>
+      </ul>
+    <?php endif; ?>
+  <?php endif; ?>
 
 </div>
diff --git a/templates/events/event_full_tags.xhtml b/templates/events/event_full_tags.xhtml
index a931b01..e7d8232 100644
--- a/templates/events/event_full_tags.xhtml
+++ b/templates/events/event_full_tags.xhtml
@@ -1,42 +1,41 @@
 
-<div class="event layout_full block<?php echo $this->class; ?>">
+<div class="event layout_full block<?= $this->class ?>">
 
-  <h1><?php echo $this->title; ?></h1>
-  <p class="info"><?php echo $this->date; ?></p>
+  <h1><?= $this->title ?></h1>
+  <p class="info"><?= $this->date ?></p>
 
   <?php if ($this->recurring): ?>
-    <p class="recurring"><?php echo $this->recurring; if ($this->until): ?> <?php echo $this->until; endif; ?>.</p>
+    <p class="recurring"><?= $this->recurring ?><?php if ($this->until) echo ' ' . $this->until; ?>.</p>
   <?php endif; ?>
 
   <?php if ($this->details): ?>
-    <?php echo $this->details; ?>
+    <?= $this->details ?>
   <?php else: ?>
     <div class="ce_text block">
-      <?php echo $this->teaser; ?>
+      <?= $this->teaser ?>
     </div>
   <?php endif; ?>
 
   <?php if ($this->location): ?>
-    <p class="location"><?php echo $this->locationLabel; ?>: <?php echo $this->location; ?></p>
+    <p class="location"><?= $this->locationLabel ?>: <?= $this->location ?></p>
   <?php endif; ?>
 
   <?php if ($this->enclosure): ?>
     <div class="enclosure">
       <?php foreach ($this->enclosure as $enclosure): ?>
-        <p><img src="<?php echo $enclosure['icon']; ?>" width="18" height="18" alt="<?php echo $enclosure['mime']; ?>" class="mime_icon" /> <a href="<?php echo $enclosure['href']; ?>" title="<?php echo $enclosure['title']; ?>"><?php echo $enclosure['link']; ?> <span class="size">(<?php echo $enclosure['filesize']; ?>)</span></a></p>
+        <p><img src="<?= $enclosure['icon'] ?>" width="18" height="18" alt="<?= $enclosure['mime'] ?>" class="mime_icon" /> <a href="<?= $enclosure['href'] ?>" title="<?= $enclosure['title'] ?>"><?= $enclosure['link'] ?> <span class="size">(<?= $enclosure['filesize'] ?>)</span></a></p>
       <?php endforeach; ?>
     </div>
   <?php endif; ?>
 
-	<?php if ($this->showTags): ?>
-
-	<?php if (count($this->taglist)): ?>
-	<ul class="tag-chain">
-	<?php $counter = 0; foreach ($this->taglist as $tag): ?>
-	<li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->taglist)-1) echo ' last'; ?><?php if ($this->showTagClass) echo ' ' . $tag['class']; ?>"><?php echo $tag['url']; ?></li>
-	<?php $counter++; endforeach; ?>
-	</ul>
-	<?php endif; ?>
-	<?php endif; ?>
+  <?php if ($this->showTags): ?>
+    <?php if (count($this->taglist)): ?>
+      <ul class="tag-chain">
+      <?php $counter = 0; foreach ($this->taglist as $tag): ?>
+        <li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->taglist)-1) echo ' last'; ?><?php if ($this->showTagClass) echo ' ' . $tag['class']; ?>"><?php echo $tag['url']; ?></li>
+      <?php $counter++; endforeach; ?>
+      </ul>
+    <?php endif; ?>
+  <?php endif; ?>
 
 </div>
diff --git a/templates/events/event_list_tags.html5 b/templates/events/event_list_tags.html5
index fc12785..23ad29a 100644
--- a/templates/events/event_list_tags.html5
+++ b/templates/events/event_list_tags.html5
@@ -1,30 +1,30 @@
 
 <?php if ($this->header): ?>
-  <div class="header<?php echo $this->classHeader; ?>">
-    <time datetime="<?php echo $this->datetime; ?>" class="date"><?php echo $this->firstDate; ?></time><?php if ($this->firstDay): ?> <span class="day">(<?php echo $this->firstDay; ?>)</span><?php endif; ?>
+  <div class="header<?= $this->classHeader ?>">
+    <time datetime="<?= $this->datetime ?>" class="date"><?= $this->firstDate ?></time><?php if ($this->firstDay): ?> <span class="day">(<?= $this->firstDay ?>)</span><?php endif; ?>
   </div>
 <?php endif; ?>
 
-<div class="event layout_list<?php echo $this->classList; ?>">
+<div class="event layout_list<?= $this->classList ?>">
 
-  <h2><a href="<?php echo $this->href; ?>" title="<?php echo $this->title; ?> (<?php if ($this->day): echo $this->day; ?>, <?php endif; echo $this->date; if ($this->time): ?>, <?php echo $this->time; endif; ?>)"<?php echo $this->target; ?>><?php echo $this->link; ?></a></h2>
+  <h2><a href="<?= $this->href ?>" title="<?= $this->title ?> (<?php if ($this->day) echo $this->day . ', '; ?><?= $this->date ?><?php if ($this->time) echo ', ' . $this->time; ?>)"<?= $this->target ?>><?= $this->link ?></a></h2>
 
   <?php if ($this->time || $this->span): ?>
-    <p class="time"><?php echo $this->time . $this->span; ?></p>
+    <p class="time"><?= $this->time . $this->span ?></p>
   <?php endif; ?>
 
-  <div class="ce_text">
-    <?php echo $this->details; ?>
+  <div class="ce_text block">
+    <?= $this->details ?>
   </div>
 
-	<?php if ($this->showTags): ?>
+  <?php if ($this->showTags): ?>
+    <?php if (count($this->taglist)): ?>
+      <ul class="tag-chain">
+      <?php $counter = 0; foreach ($this->taglist as $tag): ?>
+        <li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->taglist)-1) echo ' last'; ?><?php if ($this->showTagClass) echo ' ' . $tag['class']; ?>"><?php echo $tag['url']; ?></li>
+      <?php $counter++; endforeach; ?>
+      </ul>
+    <?php endif; ?>
+  <?php endif; ?>
 
-	<?php if (count($this->taglist)): ?>
-	<ul class="tag-chain">
-	<?php $counter = 0; foreach ($this->taglist as $tag): ?>
-	<li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->taglist)-1) echo ' last'; ?><?php if ($this->showTagClass) echo ' ' . $tag['class']; ?>"><?php echo $tag['url']; ?></li>
-	<?php $counter++; endforeach; ?>
-	</ul>
-	<?php endif; ?>
-	<?php endif; ?>
 </div>
diff --git a/templates/events/event_list_tags.xhtml b/templates/events/event_list_tags.xhtml
index 6379ca4..39403fd 100644
--- a/templates/events/event_list_tags.xhtml
+++ b/templates/events/event_list_tags.xhtml
@@ -1,31 +1,30 @@
 
 <?php if ($this->header): ?>
-  <div class="header<?php echo $this->classHeader; ?>">
-    <span class="date"><?php echo $this->firstDate; ?></span><?php if ($this->firstDay): ?> <span class="day">(<?php echo $this->firstDay; ?>)</span><?php endif; ?>
+  <div class="header<?= $this->classHeader ?>">
+    <span class="date"><?= $this->firstDate ?></span><?php if ($this->firstDay): ?> <span class="day">(<?= $this->firstDay ?>)</span><?php endif; ?>
   </div>
 <?php endif; ?>
 
-<div class="event layout_list<?php echo $this->classList; ?>">
+<div class="event layout_list<?= $this->classList ?>">
 
-  <h2><a href="<?php echo $this->href; ?>" title="<?php echo $this->title; ?> (<?php if ($this->day): echo $this->day; ?>, <?php endif; echo $this->date; if ($this->time): ?>, <?php echo $this->time; endif; ?>)"<?php echo $this->target; ?>><?php echo $this->link; ?></a></h2>
+  <h2><a href="<?= $this->href ?>" title="<?= $this->title ?> (<?php if ($this->day) echo $this->day . ', '; ?><?= $this->date ?><?php if ($this->time) echo ', ' . $this->time; ?>)"<?= $this->target ?>><?= $this->link ?></a></h2>
 
   <?php if ($this->time || $this->span): ?>
-    <p class="time"><?php echo $this->time . $this->span; ?></p>
+    <p class="time"><?= $this->time . $this->span ?></p>
   <?php endif; ?>
 
-  <div class="ce_text">
-    <?php echo $this->details; ?>
+  <div class="ce_text block">
+    <?= $this->details ?>
   </div>
 
-	<?php if ($this->showTags): ?>
-
-	<?php if (count($this->taglist)): ?>
-	<ul class="tag-chain">
-	<?php $counter = 0; foreach ($this->taglist as $tag): ?>
-	<li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->taglist)-1) echo ' last'; ?><?php if ($this->showTagClass) echo ' ' . $tag['class']; ?>"><?php echo $tag['url']; ?></li>
-	<?php $counter++; endforeach; ?>
-	</ul>
-	<?php endif; ?>
-	<?php endif; ?>
+  <?php if ($this->showTags): ?>
+    <?php if (count($this->taglist)): ?>
+      <ul class="tag-chain">
+      <?php $counter = 0; foreach ($this->taglist as $tag): ?>
+        <li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->taglist)-1) echo ' last'; ?><?php if ($this->showTagClass) echo ' ' . $tag['class']; ?>"><?php echo $tag['url']; ?></li>
+      <?php $counter++; endforeach; ?>
+      </ul>
+    <?php endif; ?>
+  <?php endif; ?>
 
 </div>
diff --git a/templates/modules/mod_article_tags.html5 b/templates/modules/mod_article_tags.html5
new file mode 100644
index 0000000..3682551
--- /dev/null
+++ b/templates/modules/mod_article_tags.html5
@@ -0,0 +1,53 @@
+
+<div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+
+  <?php if ($this->printable): ?>
+    <!-- indexer::stop -->
+    <div class="pdf_link">
+
+      <?php if ($this->printButton): ?>
+        <a href="<?= $this->print ?>" rel="nofollow" title="<?= $this->printTitle ?>" onclick="window.print();return false"><img src="<?= TL_FILES_URL ?>assets/contao/images/print.gif" width="16" height="16" alt=""></a>
+      <?php endif; ?>
+
+      <?php if ($this->pdfButton): ?>
+        <a href="<?= $this->href ?>" rel="nofollow" title="<?= $this->pdfTitle ?>"><img src="<?= TL_FILES_URL ?>assets/contao/images/pdf.gif" width="16" height="16" alt=""></a>
+      <?php endif; ?>
+
+      <?php if ($this->facebookButton): ?>
+        <a href="share/?p=facebook&amp;u=<?= $this->encUrl ?>&amp;t=<?= $this->encTitle ?>" rel="nofollow" title="<?= $this->facebookTitle ?>" onclick="window.open(this.href,'','width=640,height=380,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?= TL_FILES_URL ?>assets/contao/images/facebook.gif" width="16" height="16" alt=""></a>
+      <?php endif; ?>
+
+      <?php if ($this->twitterButton): ?>
+        <a href="share/?p=twitter&amp;u=<?= $this->encUrl ?>&amp;t=<?= $this->encTitle ?>" rel="nofollow" title="<?= $this->twitterTitle ?>" onclick="window.open(this.href,'','width=640,height=380,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?= TL_FILES_URL ?>assets/contao/images/twitter.gif" width="16" height="16" alt=""></a>
+      <?php endif; ?>
+
+      <?php if ($this->gplusButton): ?>
+        <a href="share/?p=gplus&amp;u=<?= $this->encUrl ?>&amp;t=<?= $this->encTitle ?>" rel="nofollow" title="<?= $this->gplusTitle ?>" onclick="window.open(this.href,'','width=600,height=200,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?= TL_FILES_URL ?>assets/contao/images/gplus.gif" width="16" height="16" alt=""></a>
+      <?php endif; ?>
+
+    </div>
+    <!-- indexer::continue -->
+  <?php endif; ?>
+
+  <?= implode('', $this->elements) ?>
+
+  <?php if ($this->show_tags): ?>
+    <div class="tags-article">
+    <?php if (count($this->tags)): ?>
+      <ul class="tag-chain">
+      <?php $counter = 0; foreach ($this->tags as $tag): ?>
+        <li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->tags)-1) echo ' last'; ?>"><?php if (strlen($tag['url'])): ?><a href="<?php echo $tag['url']; ?>" alt="<?php echo htmlspecialchars($tag['tag']) . ' (' . $tag['tagcount'] . ')' ?>" title="<?php echo htmlspecialchars($tag['tag']) . ' (' . $tag['tagcount'] . ')' ?>"><?php endif; ?><?php echo $tag['tag']; ?><?php if (strlen($tag['url'])): ?></a><?php endif; ?></li>
+      <?php $counter++; endforeach; ?>
+      </ul>
+    <?php endif; ?>
+  </div>
+  <?php endif; ?>
+
+  <?php if ($this->backlink): ?>
+    <!-- indexer::stop -->
+    <p class="back"><a href="<?= $this->backlink ?>" title="<?= $this->back ?>"><?= $this->back ?></a></p>
+    <!-- indexer::continue -->
+  <?php endif; ?>
+
+</div>
+
diff --git a/templates/modules/mod_article_tags.xhtml b/templates/modules/mod_article_tags.xhtml
new file mode 100644
index 0000000..323b75b
--- /dev/null
+++ b/templates/modules/mod_article_tags.xhtml
@@ -0,0 +1,52 @@
+
+<div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+
+  <?php if ($this->printable): ?>
+    <!-- indexer::stop -->
+    <div class="pdf_link">
+
+      <?php if ($this->printButton): ?>
+        <a href="<?= $this->print ?>" rel="nofollow" title="<?= $this->printTitle ?>" onclick="window.print();return false"><img src="<?= TL_FILES_URL ?>assets/contao/images/print.gif" width="16" height="16" alt="" /></a>
+      <?php endif; ?>
+
+      <?php if ($this->pdfButton): ?>
+        <a href="<?= $this->href ?>" rel="nofollow" title="<?= $this->pdfTitle ?>"><img src="<?= TL_FILES_URL ?>assets/contao/images/pdf.gif" width="16" height="16" alt="" /></a>
+      <?php endif; ?>
+
+      <?php if ($this->facebookButton): ?>
+        <a href="share/?p=facebook&amp;u=<?= $this->encUrl ?>&amp;t=<?= $this->encTitle ?>" rel="nofollow" title="<?= $this->facebookTitle ?>" onclick="window.open(this.href,'','width=640,height=380,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?= TL_FILES_URL ?>assets/contao/images/facebook.gif" width="16" height="16" alt="" /></a>
+      <?php endif; ?>
+
+      <?php if ($this->twitterButton): ?>
+        <a href="share/?p=twitter&amp;u=<?= $this->encUrl ?>&amp;t=<?= $this->encTitle ?>" rel="nofollow" title="<?= $this->twitterTitle ?>" onclick="window.open(this.href,'','width=640,height=380,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?= TL_FILES_URL ?>assets/contao/images/twitter.gif" width="16" height="16" alt="" /></a>
+      <?php endif; ?>
+
+      <?php if ($this->gplusButton): ?>
+        <a href="share/?p=gplus&amp;u=<?= $this->encUrl ?>&amp;t=<?= $this->encTitle ?>" rel="nofollow" title="<?= $this->gplusTitle ?>" onclick="window.open(this.href,'','width=600,height=200,modal=yes,left=100,top=50,location=no,menubar=no,resizable=yes,scrollbars=yes,status=no,toolbar=no');return false"><img src="<?= TL_FILES_URL ?>assets/contao/images/gplus.gif" width="16" height="16" alt="" /></a>
+      <?php endif; ?>
+
+    </div>
+    <!-- indexer::continue -->
+  <?php endif; ?>
+
+  <?= implode('', $this->elements) ?>
+
+  <?php if ($this->show_tags): ?>
+    <div class="tags-article">
+    <?php if (count($this->tags)): ?>
+      <ul class="tag-chain">
+      <?php $counter = 0; foreach ($this->tags as $tag): ?>
+        <li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->tags)-1) echo ' last'; ?>"><?php if (strlen($tag['url'])): ?><a href="<?php echo $tag['url']; ?>" alt="<?php echo htmlspecialchars($tag['tag']) . ' (' . $tag['tagcount'] . ')' ?>" title="<?php echo htmlspecialchars($tag['tag']) . ' (' . $tag['tagcount'] . ')' ?>"><?php endif; ?><?php echo $tag['tag']; ?><?php if (strlen($tag['url'])): ?></a><?php endif; ?></li>
+      <?php $counter++; endforeach; ?>
+      </ul>
+    <?php endif; ?>
+  </div>
+  <?php endif; ?>
+
+  <?php if ($this->backlink): ?>
+    <!-- indexer::stop -->
+    <p class="back"><a href="<?= $this->backlink ?>" title="<?= $this->back ?>"><?= $this->back ?></a></p>
+    <!-- indexer::continue -->
+  <?php endif; ?>
+
+</div>
diff --git a/templates/modules/mod_global_articlelist.html5 b/templates/modules/mod_global_articlelist.html5
new file mode 100644
index 0000000..d3f30ae
--- /dev/null
+++ b/templates/modules/mod_global_articlelist.html5
@@ -0,0 +1,20 @@
+<div class="<?php echo $this->class; ?> block"<?php echo $this->cssID; ?><?php if ($this->style): ?> style="<?php echo $this->style; ?>"<?php endif; ?>>
+<?php if ($this->headline || count($this->tags_activetags)): ?>
+<<?php echo $this->hl; ?>><?php echo (strlen($this->headline)) ? $this->headline : join($this->tags_activetags, "+"); ?> <?php if (count($this->articles)): ?>(<?php echo count($this->articles); ?>)<?php endif; ?></<?php echo $this->hl; ?>>
+<?php endif; ?>
+<?php if (count($this->articles)): ?>
+<ul>
+<?php foreach ($this->articles as $article): ?>
+  <li>
+		<?php echo $article['content']; ?>
+<?php if ($this->showTags): ?>
+		<?php echo $article['tags']; ?>
+<?php endif; ?>
+	</li>
+<?php endforeach; ?>
+</ul>
+<?php else: ?>
+<p class="empty"><?php echo $this->empty; ?></p>
+<?php endif; ?>
+
+</div>
diff --git a/templates/modules/mod_global_articlelist.xhtml b/templates/modules/mod_global_articlelist.xhtml
new file mode 100644
index 0000000..d3f30ae
--- /dev/null
+++ b/templates/modules/mod_global_articlelist.xhtml
@@ -0,0 +1,20 @@
+<div class="<?php echo $this->class; ?> block"<?php echo $this->cssID; ?><?php if ($this->style): ?> style="<?php echo $this->style; ?>"<?php endif; ?>>
+<?php if ($this->headline || count($this->tags_activetags)): ?>
+<<?php echo $this->hl; ?>><?php echo (strlen($this->headline)) ? $this->headline : join($this->tags_activetags, "+"); ?> <?php if (count($this->articles)): ?>(<?php echo count($this->articles); ?>)<?php endif; ?></<?php echo $this->hl; ?>>
+<?php endif; ?>
+<?php if (count($this->articles)): ?>
+<ul>
+<?php foreach ($this->articles as $article): ?>
+  <li>
+		<?php echo $article['content']; ?>
+<?php if ($this->showTags): ?>
+		<?php echo $article['tags']; ?>
+<?php endif; ?>
+	</li>
+<?php endforeach; ?>
+</ul>
+<?php else: ?>
+<p class="empty"><?php echo $this->empty; ?></p>
+<?php endif; ?>
+
+</div>
diff --git a/templates/modules/mod_tag_contentlist.html5 b/templates/modules/mod_tag_contentlist.html5
new file mode 100644
index 0000000..e021c01
--- /dev/null
+++ b/templates/modules/mod_tag_contentlist.html5
@@ -0,0 +1,32 @@
+<div class="<?php echo $this->class; ?> block"<?php echo $this->cssID; ?><?php if ($this->style): ?> style="<?php echo $this->style; ?>"<?php endif; ?>>
+<?php if ($this->headline): ?>
+<<?php echo $this->hl; ?>><?php echo $this->headline; ?></<?php echo $this->hl; ?>>
+<?php endif; ?>
+<?php if (count($this->pages)): ?>
+<ul>
+<?php foreach ($this->pages as $page): ?>
+	<li>
+		{{link::<?php echo $page['alias']; ?>}}
+	</li>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+<?php if (count($this->articles)): ?>
+<ul>
+<?php foreach ($this->articles as $article): ?>
+	<li>
+		{{article::<?php echo $article['alias']; ?>}}
+	</li>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+<?php if (count($this->contentElements)): ?>
+<ul>
+<?php foreach ($this->contentElements as $cte): ?>
+	<div>
+		{{insert_content::<?php echo $cte['id']; ?>}}
+	</div>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+</div>
diff --git a/templates/modules/mod_tag_contentlist.xhtml b/templates/modules/mod_tag_contentlist.xhtml
new file mode 100644
index 0000000..e021c01
--- /dev/null
+++ b/templates/modules/mod_tag_contentlist.xhtml
@@ -0,0 +1,32 @@
+<div class="<?php echo $this->class; ?> block"<?php echo $this->cssID; ?><?php if ($this->style): ?> style="<?php echo $this->style; ?>"<?php endif; ?>>
+<?php if ($this->headline): ?>
+<<?php echo $this->hl; ?>><?php echo $this->headline; ?></<?php echo $this->hl; ?>>
+<?php endif; ?>
+<?php if (count($this->pages)): ?>
+<ul>
+<?php foreach ($this->pages as $page): ?>
+	<li>
+		{{link::<?php echo $page['alias']; ?>}}
+	</li>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+<?php if (count($this->articles)): ?>
+<ul>
+<?php foreach ($this->articles as $article): ?>
+	<li>
+		{{article::<?php echo $article['alias']; ?>}}
+	</li>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+<?php if (count($this->contentElements)): ?>
+<ul>
+<?php foreach ($this->contentElements as $cte): ?>
+	<div>
+		{{insert_content::<?php echo $cte['id']; ?>}}
+	</div>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+</div>
diff --git a/templates/modules/mod_tag_listbycategory.html5 b/templates/modules/mod_tag_listbycategory.html5
new file mode 100644
index 0000000..62f3311
--- /dev/null
+++ b/templates/modules/mod_tag_listbycategory.html5
@@ -0,0 +1,35 @@
+<div class="<?php echo $this->class; ?> block"<?php echo $this->cssID; ?><?php if ($this->style): ?> style="<?php echo $this->style; ?>"<?php endif; ?>>
+<?php if ($this->headline): ?>
+<<?php echo $this->hl; ?>><?php echo $this->headline; ?></<?php echo $this->hl; ?>>
+<?php endif; ?>
+<?php if (count($this->news)): ?>
+<h3><?php echo $this->lngNews; ?></h3>
+<ul>
+<?php foreach ($this->news as $article): ?>
+	<li>
+		{{news::<?php echo $article['alias']; ?>}}
+	</li>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+<?php if (count($this->events)): ?>
+<h3><?php echo $this->lngEvents; ?></h3>
+<ul>
+<?php foreach ($this->events as $event): ?>
+	<li>
+		{{event::<?php echo $event['alias']; ?>}}
+	</li>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+<?php if (count($this->pages)): ?>
+<h3><?php echo $this->lngPages; ?></h3>
+<ul>
+<?php foreach ($this->pages as $page): ?>
+	<li>
+		{{link::<?php echo $page['alias']; ?>}}
+	</li>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+</div>
diff --git a/templates/modules/mod_tag_listbycategory.xhtml b/templates/modules/mod_tag_listbycategory.xhtml
new file mode 100644
index 0000000..62f3311
--- /dev/null
+++ b/templates/modules/mod_tag_listbycategory.xhtml
@@ -0,0 +1,35 @@
+<div class="<?php echo $this->class; ?> block"<?php echo $this->cssID; ?><?php if ($this->style): ?> style="<?php echo $this->style; ?>"<?php endif; ?>>
+<?php if ($this->headline): ?>
+<<?php echo $this->hl; ?>><?php echo $this->headline; ?></<?php echo $this->hl; ?>>
+<?php endif; ?>
+<?php if (count($this->news)): ?>
+<h3><?php echo $this->lngNews; ?></h3>
+<ul>
+<?php foreach ($this->news as $article): ?>
+	<li>
+		{{news::<?php echo $article['alias']; ?>}}
+	</li>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+<?php if (count($this->events)): ?>
+<h3><?php echo $this->lngEvents; ?></h3>
+<ul>
+<?php foreach ($this->events as $event): ?>
+	<li>
+		{{event::<?php echo $event['alias']; ?>}}
+	</li>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+<?php if (count($this->pages)): ?>
+<h3><?php echo $this->lngPages; ?></h3>
+<ul>
+<?php foreach ($this->pages as $page): ?>
+	<li>
+		{{link::<?php echo $page['alias']; ?>}}
+	</li>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+</div>
diff --git a/templates/modules/mod_tagcloud.html5 b/templates/modules/mod_tagcloud.html5
new file mode 100644
index 0000000..2fe1b8e
--- /dev/null
+++ b/templates/modules/mod_tagcloud.html5
@@ -0,0 +1,37 @@
+<!-- indexer::stop -->
+<div class="<?php echo $this->class; ?> block tagcloud"<?php echo $this->cssID; ?><?php if ($this->style): ?> style="<?php echo $this->style; ?>"<?php endif; ?>>
+<?php if ($this->headline): ?>
+<<?php echo $this->hl; ?>><?php echo $this->headline; ?></<?php echo $this->hl; ?>>
+<?php endif; ?>
+<?php if (strlen($this->empty_url) && $this->selectedtags > 0): ?>
+<div class="reset"><a href="<?php echo $this->empty_url; ?>"><?php echo $this->lngEmpty; ?></a></div>
+<?php endif; ?>
+<?php if (count($this->relatedtags)): ?>
+<h3><span id="related" class="toggle-button <?php echo (($this->expandedRelated) ? "" : "yes"); ?> off" onclick="TagCloudRequest.toggleTagCloud($(this), '<?php echo $this->pageID; ?>')"><?php echo $this->strRelatedTags; ?></span></h3>
+<ul class="related"<?php echo (($this->topten && !$this->expandedRelated) ? ' style="display: none;"' : ''); ?>>
+<?php foreach ($this->relatedtags as $tag): ?>
+	<li><?php if (strlen($this->jumpTo)): ?><a href="<?php echo $tag['tag_url']; ?>" title="<?php echo $tag['tag_name'] . ' (' . $tag['tag_count'] . ')'; ?>"><span class="reltext"><?php endif; ?>+<?php echo $tag['tag_name']; ?><?php if (strlen($this->jumpTo)): ?></span><span class="relcount"><?php echo $tag['tag_count']; ?></span></a><?php endif; ?></li>
+<?php endforeach; ?>
+</ul>
+<div style="clear: both;"></div>
+<?php endif; ?>
+
+<?php if ($this->topten): ?>
+<h3><span id="topten" class="toggle-button <?php echo (($this->expandedTopTen) ? "" : "yes"); ?> off" onclick="TagCloudRequest.toggleTagCloud($(this), '<?php echo $this->pageID; ?>')"><?php echo $this->strTopTenTags; ?></span></h3>
+<ul class="cloud"<?php echo ((!$this->expandedTopTen) ? ' style="display: none;"' : ''); ?>>
+<?php foreach ($this->toptentags as $tag): ?>
+	<li class="<?php echo $tag['tag_class']; ?>"><?php if (strlen($this->jumpTo)): ?><a href="<?php echo $tag['tag_url']; ?>" title="<?php echo $tag['tag_name'] . ' (' . $tag['tag_count'] . ')'; ?>"><?php endif; ?><?php echo $tag['tag_name']; ?><?php if (strlen($this->jumpTo)): ?></a><?php endif; ?></li>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+
+<?php if (($this->topten) || (count($this->relatedtags))): ?>
+<h3><span id="alltags" class="toggle-button <?php echo (($this->expandedAll) ? "" : "yes"); ?> off" onclick="TagCloudRequest.toggleTagCloud($(this), '<?php echo $this->pageID; ?>')"><?php echo $this->strAllTags; ?> (<?php echo $this->tagcount; ?>)</span></h3>
+<?php endif; ?>
+<ul class="cloud"<?php echo (($this->topten && !$this->expandedAll) ? ' style="display: none;"' : ''); ?>>
+<?php foreach ($this->tags as $tag): ?>
+	<li class="<?php echo $tag['tag_class']; ?>"><?php if (strlen($this->jumpTo)): ?><a href="<?php echo $tag['tag_url']; ?>" title="<?php echo $tag['tag_name'] . ' (' . $tag['tag_count'] . ')'; ?>"><?php endif; ?><?php echo $tag['tag_name']; ?><?php if (strlen($this->jumpTo)): ?></a><?php endif; ?></li>
+<?php endforeach; ?>
+</ul>
+</div>
+<!-- indexer::continue -->
\ No newline at end of file
diff --git a/templates/modules/mod_tagcloud.xhtml b/templates/modules/mod_tagcloud.xhtml
new file mode 100644
index 0000000..2fe1b8e
--- /dev/null
+++ b/templates/modules/mod_tagcloud.xhtml
@@ -0,0 +1,37 @@
+<!-- indexer::stop -->
+<div class="<?php echo $this->class; ?> block tagcloud"<?php echo $this->cssID; ?><?php if ($this->style): ?> style="<?php echo $this->style; ?>"<?php endif; ?>>
+<?php if ($this->headline): ?>
+<<?php echo $this->hl; ?>><?php echo $this->headline; ?></<?php echo $this->hl; ?>>
+<?php endif; ?>
+<?php if (strlen($this->empty_url) && $this->selectedtags > 0): ?>
+<div class="reset"><a href="<?php echo $this->empty_url; ?>"><?php echo $this->lngEmpty; ?></a></div>
+<?php endif; ?>
+<?php if (count($this->relatedtags)): ?>
+<h3><span id="related" class="toggle-button <?php echo (($this->expandedRelated) ? "" : "yes"); ?> off" onclick="TagCloudRequest.toggleTagCloud($(this), '<?php echo $this->pageID; ?>')"><?php echo $this->strRelatedTags; ?></span></h3>
+<ul class="related"<?php echo (($this->topten && !$this->expandedRelated) ? ' style="display: none;"' : ''); ?>>
+<?php foreach ($this->relatedtags as $tag): ?>
+	<li><?php if (strlen($this->jumpTo)): ?><a href="<?php echo $tag['tag_url']; ?>" title="<?php echo $tag['tag_name'] . ' (' . $tag['tag_count'] . ')'; ?>"><span class="reltext"><?php endif; ?>+<?php echo $tag['tag_name']; ?><?php if (strlen($this->jumpTo)): ?></span><span class="relcount"><?php echo $tag['tag_count']; ?></span></a><?php endif; ?></li>
+<?php endforeach; ?>
+</ul>
+<div style="clear: both;"></div>
+<?php endif; ?>
+
+<?php if ($this->topten): ?>
+<h3><span id="topten" class="toggle-button <?php echo (($this->expandedTopTen) ? "" : "yes"); ?> off" onclick="TagCloudRequest.toggleTagCloud($(this), '<?php echo $this->pageID; ?>')"><?php echo $this->strTopTenTags; ?></span></h3>
+<ul class="cloud"<?php echo ((!$this->expandedTopTen) ? ' style="display: none;"' : ''); ?>>
+<?php foreach ($this->toptentags as $tag): ?>
+	<li class="<?php echo $tag['tag_class']; ?>"><?php if (strlen($this->jumpTo)): ?><a href="<?php echo $tag['tag_url']; ?>" title="<?php echo $tag['tag_name'] . ' (' . $tag['tag_count'] . ')'; ?>"><?php endif; ?><?php echo $tag['tag_name']; ?><?php if (strlen($this->jumpTo)): ?></a><?php endif; ?></li>
+<?php endforeach; ?>
+</ul>
+<?php endif; ?>
+
+<?php if (($this->topten) || (count($this->relatedtags))): ?>
+<h3><span id="alltags" class="toggle-button <?php echo (($this->expandedAll) ? "" : "yes"); ?> off" onclick="TagCloudRequest.toggleTagCloud($(this), '<?php echo $this->pageID; ?>')"><?php echo $this->strAllTags; ?> (<?php echo $this->tagcount; ?>)</span></h3>
+<?php endif; ?>
+<ul class="cloud"<?php echo (($this->topten && !$this->expandedAll) ? ' style="display: none;"' : ''); ?>>
+<?php foreach ($this->tags as $tag): ?>
+	<li class="<?php echo $tag['tag_class']; ?>"><?php if (strlen($this->jumpTo)): ?><a href="<?php echo $tag['tag_url']; ?>" title="<?php echo $tag['tag_name'] . ' (' . $tag['tag_count'] . ')'; ?>"><?php endif; ?><?php echo $tag['tag_name']; ?><?php if (strlen($this->jumpTo)): ?></a><?php endif; ?></li>
+<?php endforeach; ?>
+</ul>
+</div>
+<!-- indexer::continue -->
\ No newline at end of file
diff --git a/templates/modules/mod_tagscope.html5 b/templates/modules/mod_tagscope.html5
new file mode 100644
index 0000000..151859c
--- /dev/null
+++ b/templates/modules/mod_tagscope.html5
@@ -0,0 +1,23 @@
+<div class="<?php echo $this->class; ?> block"<?php echo $this->cssID; ?> id="tagscope">
+	<ul>
+		<li class="reset"><div class="inner"><a href="<?php echo $this->empty_url; ?>"><?php echo $this->lngTags; ?></a></div></li>
+<?php if (count($this->arrTags)): ?>
+		<li class="tags">
+			<ul>
+<?php foreach ($this->arrTags as $idx => $tag): ?>
+				<li class="tag<?php if ($idx == 1) echo ' first'; ?><?php if ($idx == count($this->arrTags)-1) echo ' last'; ?>">
+					<div class="inner">
+						<a class="onlytag" href="<?php echo $this->tag_urls[$tag]; ?>"><?php echo $tag; ?></a>
+						<a class="removetag" href="<?php echo $this->delete_urls[$tag]; ?>"><span>[x]</span></a>
+					</div>
+				</li>
+<?php endforeach; ?>
+			</ul>
+		</li>
+<?php endif; ?>
+		<!--li class="count">
+			<strong><em><span class="tagcount">2</span></em> <span class="tagdesc">Bookmarks</span></strong>
+		</li-->
+	</ul>
+</div>
+<div style="clear: both;"></div>
diff --git a/templates/modules/mod_tagscope.xhtml b/templates/modules/mod_tagscope.xhtml
new file mode 100644
index 0000000..151859c
--- /dev/null
+++ b/templates/modules/mod_tagscope.xhtml
@@ -0,0 +1,23 @@
+<div class="<?php echo $this->class; ?> block"<?php echo $this->cssID; ?> id="tagscope">
+	<ul>
+		<li class="reset"><div class="inner"><a href="<?php echo $this->empty_url; ?>"><?php echo $this->lngTags; ?></a></div></li>
+<?php if (count($this->arrTags)): ?>
+		<li class="tags">
+			<ul>
+<?php foreach ($this->arrTags as $idx => $tag): ?>
+				<li class="tag<?php if ($idx == 1) echo ' first'; ?><?php if ($idx == count($this->arrTags)-1) echo ' last'; ?>">
+					<div class="inner">
+						<a class="onlytag" href="<?php echo $this->tag_urls[$tag]; ?>"><?php echo $tag; ?></a>
+						<a class="removetag" href="<?php echo $this->delete_urls[$tag]; ?>"><span>[x]</span></a>
+					</div>
+				</li>
+<?php endforeach; ?>
+			</ul>
+		</li>
+<?php endif; ?>
+		<!--li class="count">
+			<strong><em><span class="tagcount">2</span></em> <span class="tagdesc">Bookmarks</span></strong>
+		</li-->
+	</ul>
+</div>
+<div style="clear: both;"></div>
diff --git a/templates/news/news_full_tags.html5 b/templates/news/news_full_tags.html5
new file mode 100644
index 0000000..c43a083
--- /dev/null
+++ b/templates/news/news_full_tags.html5
@@ -0,0 +1,40 @@
+
+<div class="layout_full block<?= $this->class ?>">
+
+  <h1><?= $this->newsHeadline ?></h1>
+
+  <?php if ($this->hasMetaFields): ?>
+    <p class="info"><time datetime="<?= $this->datetime ?>"><?= $this->date ?></time> <?= $this->author ?> <?= $this->commentCount ?></p>
+  <?php endif; ?>
+
+  <?php if ($this->hasSubHeadline): ?>
+    <h2><?= $this->subHeadline ?></h2>
+  <?php endif; ?>
+
+  <?php if ($this->text): ?>
+    <?= $this->text ?>
+  <?php else: ?>
+    <div class="ce_text block">
+      <?= $this->teaser ?>
+    </div>
+  <?php endif; ?>
+
+  <?php if ($this->enclosure): ?>
+    <div class="enclosure">
+      <?php foreach ($this->enclosure as $enclosure): ?>
+        <p><img src="<?= $enclosure['icon'] ?>" width="18" height="18" alt="<?= $enclosure['mime'] ?>" class="mime_icon"> <a href="<?= $enclosure['href'] ?>" title="<?= $enclosure['title'] ?>"><?= $enclosure['link'] ?> <span class="size">(<?= $enclosure['filesize'] ?>)</span></a></p>
+      <?php endforeach; ?>
+    </div>
+  <?php endif; ?>
+
+  <?php if ($this->showTags): ?>
+    <?php if (count($this->taglist)): ?>
+      <ul class="tag-chain">
+      <?php $counter = 0; foreach ($this->taglist as $tag): ?>
+        <li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->taglist)-1) echo ' last'; ?><?php if ($this->showTagClass) echo ' ' . $tag['class']; ?>"><?php echo $tag['url']; ?></li>
+      <?php $counter++; endforeach; ?>
+      </ul>
+    <?php endif; ?>
+  <?php endif; ?>
+
+</div>
diff --git a/templates/news/news_full_tags.xhtml b/templates/news/news_full_tags.xhtml
new file mode 100644
index 0000000..f4e9bd4
--- /dev/null
+++ b/templates/news/news_full_tags.xhtml
@@ -0,0 +1,40 @@
+
+<div class="layout_full block<?= $this->class ?>">
+
+  <h1><?= $this->newsHeadline ?></h1>
+
+  <?php if ($this->hasMetaFields): ?>
+    <p class="info"><?= $this->date ?> <?= $this->author ?> <?= $this->commentCount ?></p>
+  <?php endif; ?>
+
+  <?php if ($this->hasSubHeadline): ?>
+    <h2><?= $this->subHeadline ?></h2>
+  <?php endif; ?>
+
+  <?php if ($this->text): ?>
+    <?= $this->text ?>
+  <?php else: ?>
+    <div class="ce_text block">
+      <?= $this->teaser ?>
+    </div>
+  <?php endif; ?>
+
+  <?php if ($this->enclosure): ?>
+    <div class="enclosure">
+      <?php foreach ($this->enclosure as $enclosure): ?>
+        <p><img src="<?= $enclosure['icon'] ?>" width="18" height="18" alt="<?= $enclosure['mime'] ?>" class="mime_icon" /> <a href="<?= $enclosure['href'] ?>" title="<?= $enclosure['title'] ?>"><?= $enclosure['link'] ?> <span class="size">(<?= $enclosure['filesize'] ?>)</span></a></p>
+      <?php endforeach; ?>
+    </div>
+  <?php endif; ?>
+
+  <?php if ($this->showTags): ?>
+    <?php if (count($this->taglist)): ?>
+      <ul class="tag-chain">
+      <?php $counter = 0; foreach ($this->taglist as $tag): ?>
+        <li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->taglist)-1) echo ' last'; ?><?php if ($this->showTagClass) echo ' ' . $tag['class']; ?>"><?php echo $tag['url']; ?></li>
+      <?php $counter++; endforeach; ?>
+      </ul>
+    <?php endif; ?>
+  <?php endif; ?>
+
+</div>
diff --git a/templates/tags/taglist.html5 b/templates/tags/taglist.html5
new file mode 100644
index 0000000..e7f0abc
--- /dev/null
+++ b/templates/tags/taglist.html5
@@ -0,0 +1,10 @@
+<?php if ($this->showTags): ?>
+
+<?php if (count($this->tags)): ?>
+<ul class="tag-chain">
+<?php $counter = 0; foreach ($this->tags as $tag): ?>
+<li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->tags)-1) echo ' last'; ?>"><?php echo $tag; ?></li>
+<?php $counter++; endforeach; ?>
+</ul>
+<?php endif; ?>
+<?php endif; ?>
diff --git a/templates/tags/taglist.xhtml b/templates/tags/taglist.xhtml
new file mode 100644
index 0000000..e7f0abc
--- /dev/null
+++ b/templates/tags/taglist.xhtml
@@ -0,0 +1,10 @@
+<?php if ($this->showTags): ?>
+
+<?php if (count($this->tags)): ?>
+<ul class="tag-chain">
+<?php $counter = 0; foreach ($this->tags as $tag): ?>
+<li class="tag-chain-item<?php if ($counter == 0) echo ' first'; ?><?php if ($counter == count($this->tags)-1) echo ' last'; ?>"><?php echo $tag; ?></li>
+<?php $counter++; endforeach; ?>
+</ul>
+<?php endif; ?>
+<?php endif; ?>
diff --git a/templates/tags/tags_feed.html5 b/templates/tags/tags_feed.html5
new file mode 100644
index 0000000..43c797a
--- /dev/null
+++ b/templates/tags/tags_feed.html5
@@ -0,0 +1,5 @@
+<ul class="tagged">
+<?php foreach ($this->tags as $tag): ?>
+	<li><?php if (strlen($this->url)): ?><a href="<?php echo $this->url; ?>"><?php endif; ?><?php echo $tag['tag']; ?><?php if (strlen($this->url)): ?></a><?php endif; ?></li>
+<?php endforeach; ?>
+</ul>
\ No newline at end of file
diff --git a/templates/tags/tags_feed.xhtml b/templates/tags/tags_feed.xhtml
new file mode 100644
index 0000000..43c797a
--- /dev/null
+++ b/templates/tags/tags_feed.xhtml
@@ -0,0 +1,5 @@
+<ul class="tagged">
+<?php foreach ($this->tags as $tag): ?>
+	<li><?php if (strlen($this->url)): ?><a href="<?php echo $this->url; ?>"><?php endif; ?><?php echo $tag['tag']; ?><?php if (strlen($this->url)): ?></a><?php endif; ?></li>
+<?php endforeach; ?>
+</ul>
\ No newline at end of file
diff --git a/templates/tags/tags_inserttag.html5 b/templates/tags/tags_inserttag.html5
new file mode 100644
index 0000000..2b0829d
--- /dev/null
+++ b/templates/tags/tags_inserttag.html5
@@ -0,0 +1,5 @@
+<ul class="tagged">
+<?php foreach ($this->tags as $tag): ?>
+	<li><?php if (strlen($tag['url'])): ?><a href="<?php echo $tag['url']; ?>" alt="<?php echo htmlspecialchars($tag['tag']) . ' (' . $tag['tagcount'] . ')' ?>" title="<?php echo htmlspecialchars($tag['tag']) . ' (' . $tag['tagcount'] . ')' ?>"><?php endif; ?><?php echo $tag['tag']; ?><?php if (strlen($tag['url'])): ?></a><?php endif; ?></li>
+<?php endforeach; ?>
+</ul>
\ No newline at end of file
diff --git a/templates/tags/tags_inserttag.xhtml b/templates/tags/tags_inserttag.xhtml
new file mode 100644
index 0000000..2b0829d
--- /dev/null
+++ b/templates/tags/tags_inserttag.xhtml
@@ -0,0 +1,5 @@
+<ul class="tagged">
+<?php foreach ($this->tags as $tag): ?>
+	<li><?php if (strlen($tag['url'])): ?><a href="<?php echo $tag['url']; ?>" alt="<?php echo htmlspecialchars($tag['tag']) . ' (' . $tag['tagcount'] . ')' ?>" title="<?php echo htmlspecialchars($tag['tag']) . ' (' . $tag['tagcount'] . ')' ?>"><?php endif; ?><?php echo $tag['tag']; ?><?php if (strlen($tag['url'])): ?></a><?php endif; ?></li>
+<?php endforeach; ?>
+</ul>
\ No newline at end of file
diff --git a/templates/tags/tags_used.html5 b/templates/tags/tags_used.html5
new file mode 100644
index 0000000..24dff98
--- /dev/null
+++ b/templates/tags/tags_used.html5
@@ -0,0 +1 @@
+<?php $counter = 0; ?>(<?php foreach ($this->tags as $tag): ?><?php $counter++; echo $tag; ?><?php if (count($this->tags) != $counter): ?>+<?php endif; ?><?php endforeach; ?>)
\ No newline at end of file
diff --git a/templates/tags/tags_used.xhtml b/templates/tags/tags_used.xhtml
new file mode 100644
index 0000000..24dff98
--- /dev/null
+++ b/templates/tags/tags_used.xhtml
@@ -0,0 +1 @@
+<?php $counter = 0; ?>(<?php foreach ($this->tags as $tag): ?><?php $counter++; echo $tag; ?><?php if (count($this->tags) != $counter): ?>+<?php endif; ?><?php endforeach; ?>)
\ No newline at end of file