diff --git a/.maintenance.example b/.maintenance.example
index a4de49a3..3cf43109 100644
--- a/.maintenance.example
+++ b/.maintenance.example
@@ -4,6 +4,9 @@
* This example redirect your visitors to a default maintenance information page hosted in ampache.org
*/
+header("Access-Control-Allow-Origin: *");
+header("Access-Control-Allow-Methods: GET, POST");
+
$domain = $_SERVER['HTTP_HOST'];
if (empty($domain)) {
$domain = $_SERVER['SERVER_NAME'];
diff --git a/templates/error_page.inc.php b/templates/error_page.inc.php
index a10981ce..f18098c1 100644
--- a/templates/error_page.inc.php
+++ b/templates/error_page.inc.php
@@ -26,6 +26,7 @@
dir="">
+
<?php echo( T_("Ampache error page"));?>
diff --git a/templates/header.inc.php b/templates/header.inc.php
index 59f61b16..44fbac72 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -31,6 +31,7 @@ $_SESSION['login'] = false;
+
diff --git a/templates/install_header.inc.php b/templates/install_header.inc.php
index 79f23449..1b791d85 100644
--- a/templates/install_header.inc.php
+++ b/templates/install_header.inc.php
@@ -26,6 +26,7 @@
+
diff --git a/templates/show_big_art.inc.php b/templates/show_big_art.inc.php
index a1237d27..a6b6579e 100644
--- a/templates/show_big_art.inc.php
+++ b/templates/show_big_art.inc.php
@@ -25,6 +25,7 @@ $htmllang = str_replace("_","-",AmpConfig::get('lang'));
+
<?php echo AmpConfig::get('site_title'); ?> - <?php echo T_("Album Art"); ?>
diff --git a/templates/show_denied.inc.php b/templates/show_denied.inc.php
index b60fe586..22ed2daa 100644
--- a/templates/show_denied.inc.php
+++ b/templates/show_denied.inc.php
@@ -23,6 +23,7 @@
+
Ampache -- Debug Page
diff --git a/templates/show_login_form.inc.php b/templates/show_login_form.inc.php
index e4c472ce..8b757135 100644
--- a/templates/show_login_form.inc.php
+++ b/templates/show_login_form.inc.php
@@ -37,6 +37,7 @@ define('TABLE_RENDERED', 1);
+
diff --git a/templates/show_lostpassword_form.inc.php b/templates/show_lostpassword_form.inc.php
index de515591..60b11cfe 100644
--- a/templates/show_lostpassword_form.inc.php
+++ b/templates/show_lostpassword_form.inc.php
@@ -33,6 +33,7 @@ is_rtl(AmpConfig::get('lang')) ? $dir = 'rtl' : $dir = 'ltr';
+
diff --git a/templates/show_registration_confirmation.inc.php b/templates/show_registration_confirmation.inc.php
index 683f4408..b98cab64 100644
--- a/templates/show_registration_confirmation.inc.php
+++ b/templates/show_registration_confirmation.inc.php
@@ -28,6 +28,7 @@ $_SESSION['login'] = true;
+
<?php echo AmpConfig::get('site_title'); ?> - <?php echo T_('Registration'); ?>
diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php
index 3cc68975..fa68af6d 100644
--- a/templates/show_test.inc.php
+++ b/templates/show_test.inc.php
@@ -23,6 +23,7 @@
+
Ampache -- Debug Page
diff --git a/templates/show_test_config.inc.php b/templates/show_test_config.inc.php
index fbd6ea26..d375efb3 100644
--- a/templates/show_test_config.inc.php
+++ b/templates/show_test_config.inc.php
@@ -23,6 +23,7 @@
+
Ampache -- Config Debug Page
diff --git a/templates/show_user_activate.inc.php b/templates/show_user_activate.inc.php
index 938258f4..5b52c481 100644
--- a/templates/show_user_activate.inc.php
+++ b/templates/show_user_activate.inc.php
@@ -26,6 +26,7 @@ $web_path = AmpConfig::get('web_path');
+
<?php echo AmpConfig::get('site_title'); ?> - <?php echo T_('Registration'); ?>
diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php
index d2c0090e..ee25f8cd 100644
--- a/templates/show_user_registration.inc.php
+++ b/templates/show_user_registration.inc.php
@@ -32,6 +32,7 @@ $_SESSION['login'] = true;
+
<?php echo AmpConfig::get('site_title'); ?> - <?php echo T_('Registration'); ?>
diff --git a/templates/show_web_player.inc.php b/templates/show_web_player.inc.php
index 3eda9da6..cb9ef1e7 100644
--- a/templates/show_web_player.inc.php
+++ b/templates/show_web_player.inc.php
@@ -28,6 +28,7 @@ header('Expires: ' . gmdate(DATE_RFC1123, time()-1));
+
<?php echo AmpConfig::get('site_title'); ?>
diff --git a/update.php b/update.php
index dac92339..1ea1581f 100644
--- a/update.php
+++ b/update.php
@@ -55,6 +55,7 @@ $htmllang = str_replace("_","-",AmpConfig::get('lang'));
+
Ampache :: For the love of Music - Update
diff --git a/upnp/index.php b/upnp/index.php
index 21283c44..8b65d0aa 100644
--- a/upnp/index.php
+++ b/upnp/index.php
@@ -15,6 +15,7 @@ if (($_GET['btnSend']) || ($_GET['btnSendAuto'])) {
+