diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index 76d38e26a..f06b684cf 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -798,6 +798,15 @@ class e_menu_layout
 		$head = array();
 		$foot = array();
 
+		if(isset($LAYOUT) && (isset($HEADER) || isset($FOOTER)))
+		{
+			$fallbackLan = "This theme is using deprecated elements. All [x]HEADER and [x]FOOTER variables should be removed from theme.php."; // DO NOT TRANSLATE!
+			$warningLan = $tp->lanVars(deftrue('MENLAN_60',$fallbackLan),'$');
+			echo "<div class='alert alert-danger'>".$warningLan."</div>";
+
+		}
+
+
 
 		if(isset($LAYOUT) && is_array($LAYOUT)) // $LAYOUT is a combined $HEADER,$FOOTER.
 		{
diff --git a/e107_languages/English/admin/lan_menus.php b/e107_languages/English/admin/lan_menus.php
index b2be3e047..18e5dd8af 100644
--- a/e107_languages/English/admin/lan_menus.php
+++ b/e107_languages/English/admin/lan_menus.php
@@ -75,6 +75,7 @@ define("MENLAN_57", "Drag-and-Drop Menus");
 define("MENLAN_58", "The Menu-Manager allows you to place and arrange your menus within your theme template. Hover over the sub-areas to modify existing menu items.");
 
 define("MENLAN_59", "Area [x]");
+define("MENLAN_60", "This theme is using deprecated elements. All [x]HEADER and [x]FOOTER variables should be removed from theme.php.");