4 files changed, 24 insertions, 25 deletions
diff --git a/templates/cgi/debian/footer.html b/templates/cgi/debian/footer.html
index 887979fde..5bf349452 100644
--- a/templates/cgi/debian/footer.html
+++ b/templates/cgi/debian/footer.html
@@ -1,14 +1,14 @@
       <hr>
 
       <footer>
-        <a href="http://live.debian.net/devel/live-build/">live-build</a> VERSION <a class="muted pull-right" href="http://live.debian.net/project/legal/">Legal Information</a></p>
+        <a href="http://live-systems.org/devel/live-build/">live-build</a> VERSION <a class="muted pull-right" href="http://live-systems.org/project/legal/">Legal Information</a></p>
       </footer>
 
     </div> <!-- /container -->
 
     <!-- Le javascript -->
-    <script src="http://live.debian.net/stuff/jquery/jquery.min.js"></script>
-    <script src="http://live.debian.net/stuff/bootstrap/js/bootstrap.min.js"></script>
+    <script src="http://live-systems.org/stuff/jquery/jquery.min.js"></script>
+    <script src="http://live-systems.org/stuff/bootstrap/js/bootstrap.min.js"></script>
 
   </body>
 </html>
diff --git a/templates/cgi/debian/form.html b/templates/cgi/debian/form.html
index cfc443762..1a2a9026e 100644
--- a/templates/cgi/debian/form.html
+++ b/templates/cgi/debian/form.html
@@ -1,5 +1,5 @@
 
-<h3>Submit your parameters (<b>working</b> email address is required) to generate your very own Debian Live system.</h3>
+<h3>Submit your parameters (<b>working</b> email address is required) to generate your very own live system.</h3>
 
 <form action="live-build" method="get">
 
@@ -186,11 +186,11 @@
 		</tr>
 		<tr>
 			<td><label for="Iso_Preparer">--iso-preparer:</label> </td>
-			<td><input id="Iso_Preparer" name="iso_preparer" maxlength="128" size="50" type="text" value="live-build; http://packages.qa.debian.org/live-build" /></td>
+			<td><input id="Iso_Preparer" name="iso_preparer" maxlength="128" size="50" type="text" value="live-build; http://live-systems.org/devel/live-build/" /></td>
 		</tr>
 		<tr>
 			<td><label for="Iso_Publisher">--iso-publisher:</label> </td>
-			<td><input id="Iso_Publisher" name="iso_publisher" maxlength="128" size="50" type="text" value="Debian Live project; http://live.debian.net/; debian-live@lists.debian.org" /></td>
+			<td><input id="Iso_Publisher" name="iso_publisher" maxlength="128" size="50" type="text" value="Live Systems project; http://live-systems.org/; debian-live@lists.debian.org" /></td>
 		</tr>
 		<tr>
 			<td><label for="Iso_Volume">--iso-volume:</label> </td>
diff --git a/templates/cgi/debian/header.html b/templates/cgi/debian/header.html
index 58fe8df07..3a4513734 100644
--- a/templates/cgi/debian/header.html
+++ b/templates/cgi/debian/header.html
@@ -2,14 +2,13 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Debian Live - Live Debian Systems!</title>
+    <title>Live Systems</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="Debian Live - Live Debian Systems!">
-    <meta name="author" content="Debian Live <debian-live@lists.debian.org>">
-    <meta name="keywords" content="Debian, Live, Systems">
+    <meta name="description" content="Live Systems">
+    <meta name="author" content="Live Systems Project <debian-live@lists.debian.org>">
 
     <!-- Le styles -->
-    <link href="http://live.debian.net/stuff/spacelab/bootstrap.min.css" rel="stylesheet">
+    <link href="http://live-systems.org/stuff/spacelab/bootstrap.min.css" rel="stylesheet">
     <style type="text/css">
       body {
         padding-top: 60px;
@@ -38,19 +37,19 @@
       }
     </script>
 
-    <link href="http://live.debian.net/stuff/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet">
+    <link href="http://live-systems.org/stuff/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet">
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
-      <script src="http://live.debian.net/stuff/html5shiv/html5shiv.min.js"></script>
+      <script src="http://live-systems.org/stuff/html5shiv/html5shiv.min.js"></script>
     <![endif]-->
 
     <!-- Fav and touch icons -->
-    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="http://live.debian.net/stuff/images/logo-144.png">
-    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="http://live.debian.net/stuff/images/logo-114.png">
-      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="http://live.debian.net/stuff/images/logo-72.png">
-                    <link rel="apple-touch-icon-precomposed" href="http://live.debian.net/stuff/images/logo-57.png">
-                                   <link rel="shortcut icon" href="http://live.debian.net/stuff/images/logo-16.png">
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="http://live-systems.org/stuff/images/logo-144.png">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="http://live-systems.org/stuff/images/logo-114.png">
+      <link rel="apple-touch-icon-precomposed" sizes="72x72" href="http://live-systems.org/stuff/images/logo-72.png">
+                    <link rel="apple-touch-icon-precomposed" href="http://live-systems.org/stuff/images/logo-57.png">
+                                   <link rel="shortcut icon" href="http://live-systems.org/stuff/images/logo-16.png">
   </head>
 
   <body>
@@ -63,11 +62,11 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </a>
-          <a class="brand" href="/">Debian Live</a>
+          <a class="brand" href="/">Live Systems</a>
           <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="active"><a href="http://live-build.debian.net/">Build</a></li>
-              <li><a href="http://live.debian.net/">WWW</a></li>
+              <li><a href="http://live-systems.org/">WWW</a></li>
             </ul>
           </div><!--/.nav-collapse -->
         </div>
diff --git a/templates/cgi/debian/mail.txt b/templates/cgi/debian/mail.txt
index 1b52405c6..c4ecc4b38 100644
--- a/templates/cgi/debian/mail.txt
+++ b/templates/cgi/debian/mail.txt
@@ -1,10 +1,10 @@
-Subject: Debian Live, live-build web-frontend - Build BUILD
-From: Debian Live live-build web-frontend <debian-live@lists.debian.org>
+Subject: Live Systems, live-build web-frontend - Build BUILD
+From: Live Systems live-build web-frontend <debian-live@lists.debian.org>
 To: EMAIL
 
 Hi,
 
-This is live-build web-frontend <http://live-build.debian.net/> of the Debian Live project <http://live.debian.net/>.
+This is live-build web-frontend <http://live-build.debian.net/> of the Live Systems project <http://live-systems.org/>.
 
 Your build BUILD was started DATE_START and ended DATE_END with status 'STATUS'.
 
@@ -12,7 +12,7 @@ You can see the log file and download the image from <SERVER/BUILD/>.
 
 Note that builds are removed after 24 hours.
 
-Feedback about all Debian Live matters can be sent to our mailinglist at debian-live@lists.debian.org (no subscription required).
+Feedback about all Live Systems matters can be sent to our mailinglist at debian-live@lists.debian.org (no subscription required).
 
 Have fun,
-The Debian Live Team
+The Live Systems Team