diff --git a/system/templates/tables.headline.html.twig b/system/templates/tables.headline.html.twig
index 89a77813..6b47630a 100644
--- a/system/templates/tables.headline.html.twig
+++ b/system/templates/tables.headline.html.twig
@@ -1,24 +1,14 @@
-<div class="TableContainer">
-	<div class="CaptionContainer">
-		<div class="CaptionInnerContainer">
-			<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-			<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-			<div class="Text" >{{ title|raw }}</div>
-			<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-			<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-			<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-		</div>
-	</div>
-	<table class="Table5" cellpadding="0" cellspacing="0" style="background-color: {{ config.lightborder }}">
-		<tr>
-			<td>
-				<div class="InnerTableContainer">
-					{{ content|raw }}
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>
+<table border="0" cellspacing="1" cellpadding="4" width="100%">
+	<thead>
+	<tr bgcolor="{{ config.vdarkborder }}">
+		<td colspan="3" class="white"><b>{{ title|raw }}</b></td>
+	</tr>
+	</thead>
+	<tbody>
+	<tr style="background-color: {% if background is not null %}{{ background }}{% else %}{{ config.lightborder }}{% endif %}">
+		<td>
+			{{ content|raw }}
+		</td>
+	</tr>
+	</tbody>
+</table>
diff --git a/templates/tibiacom/tables.headline.html.twig b/templates/tibiacom/tables.headline.html.twig
new file mode 100644
index 00000000..5db3dedb
--- /dev/null
+++ b/templates/tibiacom/tables.headline.html.twig
@@ -0,0 +1,24 @@
+<div class="TableContainer">
+	<div class="CaptionContainer">
+		<div class="CaptionInnerContainer">
+			<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+			<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+			<div class="Text" >{{ title|raw }}</div>
+			<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+			<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+			<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+		</div>
+	</div>
+	<table class="{% if tableClass is not null %}{{ tableClass }}{% else %}Table3{% endif %}" cellpadding="0" cellspacing="0" style="background-color: {% if background is not null %}{{ background }}{% else %}{{ config.lightborder }}{% endif %}">
+		<tr>
+			<td>
+				<div class="InnerTableContainer">
+					{{ content|raw }}
+				</div>
+			</td>
+		</tr>
+	</table>
+</div>