diff --git a/acptemplate/__headerLogo.tpl b/acptemplate/__headerLogo.tpl
new file mode 100644
index 0000000..69c62f5
--- /dev/null
+++ b/acptemplate/__headerLogo.tpl
@@ -0,0 +1 @@
+{if $__chat->isActiveApplication()}<img src="{$__wcf->getPath('chat')}images/chatLogo.png" style="width: 246px; height: 90px;" alt="" />{/if}
\ No newline at end of file
diff --git a/acptemplate/__softwareVersions.tpl b/acptemplate/__softwareVersions.tpl
new file mode 100644
index 0000000..b5dd0fb
--- /dev/null
+++ b/acptemplate/__softwareVersions.tpl
@@ -0,0 +1,4 @@
+<dl>
+	<dt>{lang}wcf.acp.index.system.software.chatVersion{/lang}</dt>
+	<dd>{$__chat->getPackage()->packageVersion}</dd>
+</dl>
\ No newline at end of file
diff --git a/template/__headerLogo.tpl b/template/__headerLogo.tpl
new file mode 100644
index 0000000..26b916c
--- /dev/null
+++ b/template/__headerLogo.tpl
@@ -0,0 +1 @@
+{if $__chat->isActiveApplication()}{if !$__wcf->getStyleHandler()->getStyle()->getPageLogo()}<img src="{$__wcf->getPath('chat')}images/chatLogo.png" style="width: 246px; height: 90px;" alt="" />{/if}{/if}
\ No newline at end of file
diff --git a/templateListener.xml b/templateListener.xml
index 24abf35..849a748 100644
--- a/templateListener.xml
+++ b/templateListener.xml
@@ -12,24 +12,21 @@
 			<environment>user</environment>
 			<templatename>header</templatename>
 			<eventname>headerLogo</eventname>
-			<templatecode><![CDATA[{if $__chat->isActiveApplication()}{if !$__wcf->getStyleHandler()->getStyle()->getPageLogo()}<img src="{$__wcf->getPath('chat')}images/chatLogo.png" style="width: 246px; height: 90px;" alt="" />{/if}{/if}]]></templatecode>
+			<templatecode><![CDATA[{include file='__headerLogo' application='chat'}]]></templatecode>
 		</templatelistener>
 		
 		<templatelistener name="headerLogo">
 			<environment>admin</environment>
 			<templatename>header</templatename>
 			<eventname>headerLogo</eventname>
-			<templatecode><![CDATA[{if $__chat->isActiveApplication()}<img src="{$__wcf->getPath('chat')}images/chatLogo.png" style="width: 246px; height: 90px;" alt="" />{/if}]]></templatecode>
+			<templatecode><![CDATA[{include file='__headerLogo' application='wbb'}]]></templatecode>
 		</templatelistener>
 		
 		<templatelistener name="softwareVersions">
 			<environment>admin</environment>
 			<templatename>index</templatename>
 			<eventname>softwareVersions</eventname>
-			<templatecode><![CDATA[<dl>
-	<dt>{lang}wcf.acp.index.system.software.chatVersion{/lang}</dt>
-	<dd>{$__chat->getPackage()->packageVersion}</dd>
-</dl>]]></templatecode>
+			<templatecode><![CDATA[{include file='__softwareVersions' application='wbb'}]]></templatecode>
 		</templatelistener>
 	</import>
 </data>
\ No newline at end of file