diff --git a/themes/enhanced/app_languages.php b/themes/enhanced/app_languages.php
index fe1cd383a1..8fe9a863cf 100644
--- a/themes/enhanced/app_languages.php
+++ b/themes/enhanced/app_languages.php
@@ -1,17 +1,17 @@
 <?php
 	// Theme
-	$text['title-domains']['en-us'] = "Domains";
-	$text['title-domains']['es-cl'] = "Dominios";
-	$text['title-domains']['pt-pt'] = "Domínios";
-	$text['title-domains']['fr-fr'] = "Domaines";
+	$text['theme-title-domains']['en-us'] = "Domains";
+	$text['theme-title-domains']['es-cl'] = "Dominios";
+	$text['theme-title-domains']['pt-pt'] = "Domínios";
+	$text['theme-title-domains']['fr-fr'] = "Domaines";
 
-	$text['button-close']['en-us'] = "Close";
-	$text['button-close']['es-cl'] = "Cerca";
-	$text['button-close']['pt-pt'] = "Perto";
-	$text['button-close']['fr-fr'] = "Proche";
+	$text['theme-button-close']['en-us'] = "Close";
+	$text['theme-button-close']['es-cl'] = "Cerca";
+	$text['theme-button-close']['pt-pt'] = "Perto";
+	$text['theme-button-close']['fr-fr'] = "Proche";
 
-	$text['label-search']['en-us'] = "Search...";
-	$text['label-search']['es-cl'] = "Buscar...";
-	$text['label-search']['pt-pt'] = "Pesquisa...";
-	$text['label-search']['fr-fr'] = "Recherche...";
+	$text['theme-label-search']['en-us'] = "Search...";
+	$text['theme-label-search']['es-cl'] = "Buscar...";
+	$text['theme-label-search']['pt-pt'] = "Pesquisa...";
+	$text['theme-label-search']['fr-fr'] = "Recherche...";
 ?>
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 7cddad4f22..c4db2c0625 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -889,10 +889,10 @@ legend {
 		<div id="domains_container">
 			<div id="domains_block">
 				<div id="domains_header">
-					<input id="domains_hide" type="button" class="btn" style="float: right" value="<?php echo $text['button-close']; ?>">
-					<b style="color: #000;"><?php echo $text['title-domains']; ?></b>
+					<input id="domains_hide" type="button" class="btn" style="float: right" value="<?php echo $text['theme-button-close']; ?>">
+					<b style="color: #000;"><?php echo $text['theme-title-domains']; ?></b>
 					<br><br>
-					<input type="text" id="domain_filter" class="formfld" style="min-width: 100%; width: 100%;" placeholder="<?php echo $text['label-search']; ?>" onkeyup="domain_search(this.value);">
+					<input type="text" id="domain_filter" class="formfld" style="min-width: 100%; width: 100%;" placeholder="<?php echo $text['theme-label-search']; ?>" onkeyup="domain_search(this.value);">
 				</div>
 				<div id="domains_list">
 					<?php