diff --git a/less/chats.less b/less/chats.less
index c4fac2f..8053212 100644
--- a/less/chats.less
+++ b/less/chats.less
@@ -16,7 +16,7 @@
 		padding-bottom: 0px;
 	}
 
-	[widget-area="header"], [widget-area="footer"] {
+	[data-widget-area="header"], [data-widget-area="footer"] {
 		display: none;
 	}
 }
diff --git a/templates/categories.tpl b/templates/categories.tpl
index e8e26ea..f96a1b8 100644
--- a/templates/categories.tpl
+++ b/templates/categories.tpl
@@ -1,5 +1,5 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<div widget-area="header">
+<div data-widget-area="header">
 	{{{each widgets.header}}}
 	{{widgets.header.html}}
 	{{{end}}}
@@ -13,13 +13,13 @@
 			{{{end}}}
 		</ul>
 	</div>
-	<div widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
+	<div data-widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
 		{{{each widgets.sidebar}}}
 		{{widgets.sidebar.html}}
 		{{{end}}}
 	</div>
 </div>
-<div widget-area="footer">
+<div data-widget-area="footer">
 	{{{each widgets.footer}}}
 	{{widgets.footer.html}}
 	{{{end}}}
diff --git a/templates/category.tpl b/templates/category.tpl
index 0f6370f..65aa3c9 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -1,5 +1,5 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<div widget-area="header">
+<div data-widget-area="header">
 	{{{each widgets.header}}}
 	{{widgets.header.html}}
 	{{{end}}}
@@ -49,13 +49,13 @@
 			<!-- IMPORT partials/paginator.tpl -->
 		<!-- ENDIF config.usePagination -->
 	</div>
-	<div widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
+	<div data-widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
 		{{{each widgets.sidebar}}}
 		{{widgets.sidebar.html}}
 		{{{end}}}
 	</div>
 </div>
-<div widget-area="footer">
+<div data-widget-area="footer">
 	{{{each widgets.footer}}}
 	{{widgets.footer.html}}
 	{{{end}}}
diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl
index 55f9569..a99f17b 100644
--- a/templates/groups/details.tpl
+++ b/templates/groups/details.tpl
@@ -227,7 +227,7 @@
 			</div>
 		</div>
 		<!-- ENDIF group.isOwner -->
-		<div widget-area="left">
+		<div data-widget-area="left">
 			{{{each widgets.left}}}
 			{{widgets.left.html}}
 			{{{end}}}
@@ -240,7 +240,7 @@
 			<!-- ENDIF !posts.length -->
 			<!-- IMPORT partials/posts_list.tpl -->
 		</div>
-		<div widget-area="right">
+		<div data-widget-area="right">
 			{{{each widgets.right}}}
 			{{widgets.right.html}}
 			{{{end}}}
diff --git a/templates/groups/list.tpl b/templates/groups/list.tpl
index 9c2f26a..b5c5807 100644
--- a/templates/groups/list.tpl
+++ b/templates/groups/list.tpl
@@ -1,5 +1,5 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<div widget-area="header">
+<div data-widget-area="header">
 	{{{each widgets.header}}}
 	{{widgets.header.html}}
 	{{{end}}}
@@ -43,4 +43,4 @@
 		</div>
 		<!-- ENDIF groups.length -->
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/popular.tpl b/templates/popular.tpl
index cac06e2..4f7363f 100644
--- a/templates/popular.tpl
+++ b/templates/popular.tpl
@@ -1,5 +1,5 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<div widget-area="header">
+<div data-widget-area="header">
 	{{{each widgets.header}}}
 	{{widgets.header.html}}
 	{{{end}}}
@@ -56,4 +56,4 @@
 			<!-- IMPORT partials/paginator.tpl -->
 		<!-- ENDIF config.usePagination -->
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/recent.tpl b/templates/recent.tpl
index 73cc565..47af6a3 100644
--- a/templates/recent.tpl
+++ b/templates/recent.tpl
@@ -1,5 +1,5 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<div widget-area="header">
+<div data-widget-area="header">
 	{{{each widgets.header}}}
 	{{widgets.header.html}}
 	{{{end}}}
@@ -46,4 +46,4 @@
 			<!-- IMPORT partials/paginator.tpl -->
 		<!-- ENDIF config.usePagination -->
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/tags.tpl b/templates/tags.tpl
index fc203fb..9bdfe31 100644
--- a/templates/tags.tpl
+++ b/templates/tags.tpl
@@ -1,5 +1,5 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<div widget-area="header">
+<div data-widget-area="header">
 	{{{each widgets.header}}}
 	{{widgets.header.html}}
 	{{{end}}}
diff --git a/templates/top.tpl b/templates/top.tpl
index 3bd6aef..f7e161d 100644
--- a/templates/top.tpl
+++ b/templates/top.tpl
@@ -1,5 +1,5 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<div widget-area="header">
+<div data-widget-area="header">
 	{{{each widgets.header}}}
 	{{widgets.header.html}}
 	{{{end}}}
@@ -56,4 +56,4 @@
 			<!-- IMPORT partials/paginator.tpl -->
 		<!-- ENDIF config.usePagination -->
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/topic.tpl b/templates/topic.tpl
index d965082..6751dc0 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -1,5 +1,5 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<div widget-area="header">
+<div data-widget-area="header">
 	{{{each widgets.header}}}
 	{{widgets.header.html}}
 	{{{end}}}
@@ -76,13 +76,14 @@
 			</div>
 		</div>
 	</div>
-	<div widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
+	<div data-widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
 		{{{each widgets.sidebar}}}
 		{{widgets.sidebar.html}}
 		{{{end}}}
 	</div>
 </div>
-<div widget-area="footer">
+
+<div data-widget-area="footer">
 	{{{each widgets.footer}}}
 	{{widgets.footer.html}}
 	{{{end}}}
diff --git a/templates/unread.tpl b/templates/unread.tpl
index 501ece0..5fa1ed3 100644
--- a/templates/unread.tpl
+++ b/templates/unread.tpl
@@ -1,5 +1,5 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<div widget-area="header">
+<div data-widget-area="header">
 	{{{each widgets.header}}}
 	{{widgets.header.html}}
 	{{{end}}}
diff --git a/templates/users.tpl b/templates/users.tpl
index 449e357..3f31489 100644
--- a/templates/users.tpl
+++ b/templates/users.tpl
@@ -1,5 +1,6 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<div widget-area="header">
+
+<div data-widget-area="header">
 	{{{each widgets.header}}}
 	{{widgets.header.html}}
 	{{{end}}}