diff --git a/.gitignore b/.gitignore
index 8ed8060..070a20f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ dss.radio
 
 api_env
 web_env
+radio_env
diff --git a/.ropeproject/globalnames b/.ropeproject/globalnames
index c2b5132..add4d5a 100644
Binary files a/.ropeproject/globalnames and b/.ropeproject/globalnames differ
diff --git a/cleanup.sh b/cleanup.sh
old mode 100644
new mode 100755
diff --git a/docker-compose.yml b/docker-compose.yml
index a3344f3..426edb9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,7 +57,7 @@ api:
 web:
     image: fergalmoran/dss.web
     #build: ./dss.web
-    env_file: 
+    env_file:
         - ./web_env
     restart: always
     links:
@@ -76,7 +76,10 @@ icecast:
     ports:
         - 8000:8000
 radio:
-    build: dss.radio/
+    image: fergalmoran/dss.radio
+    env_file:
+        - ./radio_env
+    #build: dss.radio/
     ports:
         - "8888:8888"
     links:
diff --git a/icecast/etc/icecast2/admin/listclients.xsl b/icecast/etc/icecast2/admin/listclients.xsl
index fa5a77d..2fb7fe9 100644
--- a/icecast/etc/icecast2/admin/listclients.xsl
+++ b/icecast/etc/icecast2/admin/listclients.xsl
@@ -1,101 +1,101 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
-<xsl:template match = "/icestats" >
-<html>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<h2>Icecast2 Admin</h2>
-<br />
-
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-	<table border="0" cellpadding="1" cellspacing="3">
-	<tr>        
-	    <td align="center">
-	        <a class="nav" href="stats.xsl">Admin Home</a>
-		    <a class="nav" href="listmounts.xsl">List Mountpoints</a>
-        	<a class="nav" href="moveclients.xsl">Move Listeners</a>
-        	<a class="nav" href="/status.xsl">Index</a>
-	    </td></tr>
-	</table>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-
-
-
-<h1>Listener Stats</h1>
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<xsl:for-each select="source">
-<div class="streamheader">
-    <table cellspacing="0" cellpadding="0" >
-        <colgroup align="left" />
-        <colgroup align="right" width="300" />
-        <tr>
-            <td><h3>Mount Point <xsl:value-of select="@mount" /></h3></td>
-            <xsl:choose>
-                <xsl:when test="authenticator">
-                    <td align="right"><a class="auth" href="/auth.xsl">Login</a></td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td align="right">
-                        <a href="{@mount}.m3u">M3U</a>
-                        <a href="{@mount}.xspf">XSPF</a></td>
-                </xsl:otherwise>
-            </xsl:choose>
-    </tr></table>
-</div>
-
-<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
-	<tr>        
-	    <td align="center">
-			<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a>
-        	<a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a>
-			<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a>
-        	<a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
-	    </td></tr>
-	</table>
-<br />
-<table cellspacing="0" cellpadding="5" border="1" bordercolor="#C0C0C0" >
-		<tr>
-				<td ><center><b>IP</b></center></td>
-				<td ><center><b>Seconds Connected</b></center></td>
-				<td ><center><b>User Agent</b></center></td>
-				<td ><center><b>Action</b></center></td>
-		</tr>
-<xsl:variable name = "themount" ><xsl:value-of select="@mount" /></xsl:variable>
-<xsl:for-each select="listener">
-		<tr>
-				<td align="center"><xsl:value-of select="IP" /><xsl:if test="username"> (<xsl:value-of select="username" />)</xsl:if></td>
-				<td align="center"><xsl:value-of select="Connected" /></td>
-				<td align="center"><xsl:value-of select="UserAgent" /></td>
-				<td align="center"><a href="killclient.xsl?mount={$themount}&amp;id={ID}">Kick</a></td>
-		</tr>
-</xsl:for-each>
-</table>
-<br />
-<br />
-</xsl:for-each>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-</div>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
+<xsl:template match = "/icestats" >
+<html>
+<head>
+<title>Icecast Streaming Media Server</title>
+<link rel="stylesheet" type="text/css" href="/style.css" />
+</head>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<h2>Icecast2 Admin</h2>
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+	<table border="0" cellpadding="1" cellspacing="3">
+	<tr>        
+	    <td align="center">
+	        <a class="nav" href="stats.xsl">Admin Home</a>
+		    <a class="nav" href="listmounts.xsl">List Mountpoints</a>
+        	<a class="nav" href="moveclients.xsl">Move Listeners</a>
+        	<a class="nav" href="/status.xsl">Index</a>
+	    </td></tr>
+	</table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+
+
+<h1>Listener Stats</h1>
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<xsl:for-each select="source">
+<div class="streamheader">
+    <table cellspacing="0" cellpadding="0" >
+        <colgroup align="left" />
+        <colgroup align="right" width="300" />
+        <tr>
+            <td><h3>Mount Point <xsl:value-of select="@mount" /></h3></td>
+            <xsl:choose>
+                <xsl:when test="authenticator">
+                    <td align="right"><a class="auth" href="/auth.xsl">Login</a></td>
+                </xsl:when>
+                <xsl:otherwise>
+                    <td align="right">
+                        <a href="{@mount}.m3u">M3U</a>
+                        <a href="{@mount}.xspf">XSPF</a></td>
+                </xsl:otherwise>
+            </xsl:choose>
+    </tr></table>
+</div>
+
+<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
+	<tr>        
+	    <td align="center">
+			<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a>
+        	<a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a>
+			<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a>
+        	<a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
+	    </td></tr>
+	</table>
+<br />
+<table cellspacing="0" cellpadding="5" border="1" bordercolor="#C0C0C0" >
+		<tr>
+				<td ><center><b>IP</b></center></td>
+				<td ><center><b>Seconds Connected</b></center></td>
+				<td ><center><b>User Agent</b></center></td>
+				<td ><center><b>Action</b></center></td>
+		</tr>
+<xsl:variable name = "themount" ><xsl:value-of select="@mount" /></xsl:variable>
+<xsl:for-each select="listener">
+		<tr>
+				<td align="center"><xsl:value-of select="IP" /><xsl:if test="username"> (<xsl:value-of select="username" />)</xsl:if></td>
+				<td align="center"><xsl:value-of select="Connected" /></td>
+				<td align="center"><xsl:value-of select="UserAgent" /></td>
+				<td align="center"><a href="killclient.xsl?mount={$themount}&amp;id={ID}">Kick</a></td>
+		</tr>
+</xsl:for-each>
+</table>
+<br />
+<br />
+</xsl:for-each>
+<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/icecast/etc/icecast2/admin/listmounts.xsl b/icecast/etc/icecast2/admin/listmounts.xsl
index 2028bbc..23f9276 100644
--- a/icecast/etc/icecast2/admin/listmounts.xsl
+++ b/icecast/etc/icecast2/admin/listmounts.xsl
@@ -1,84 +1,84 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
-<xsl:template match = "/icestats" >
-<html>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<h2>Icecast2 Admin</h2>
-<br />
-
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-	<table border="0" cellpadding="1" cellspacing="3">
-	<tr>        
-	    <td align="center">
-	        <a class="nav" href="stats.xsl">Admin Home</a>
-		    <a class="nav" href="listmounts.xsl">List Mountpoints</a>
-        	<a class="nav" href="moveclients.xsl">Move Listeners</a>
-        	<a class="nav" href="/status.xsl">Index</a>
-	    </td></tr>
-	</table>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-
-
-<h1>Active Mountpoints</h1>
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<xsl:for-each select="source">
-<div class="streamheader">
-    <table cellspacing="0" cellpadding="0" >
-        <colgroup align="left" />
-        <colgroup align="right" width="300" />
-        <tr>
-            <td><h3>Mount Point <xsl:value-of select="@mount" /></h3></td>
-            <xsl:choose>
-                <xsl:when test="authenticator">
-                    <td align="right"><a class="auth" href="/auth.xsl">Login</a></td>
-                </xsl:when>
-                <xsl:otherwise>
-                    <td align="right">
-                        <a href="{@mount}.m3u">M3U</a>
-                        <a href="{@mount}.xspf">XSPF</a></td>
-                </xsl:otherwise>
-            </xsl:choose>
-    </tr></table>
-</div>
-
-<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
-	<tr>        
-	    <td align="center">
-			<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a>
-        	<a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a>
-			<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a>
-        	<a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
-                <xsl:if test="authenticator"><a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
-	    </td></tr>
-	</table>
-<br />
-<p><xsl:value-of select="listeners" /> Listener(s)</p>
-<br></br>
-</xsl:for-each>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-</div>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
+<xsl:template match = "/icestats" >
+<html>
+<head>
+<title>Icecast Streaming Media Server</title>
+<link rel="stylesheet" type="text/css" href="/style.css" />
+</head>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<h2>Icecast2 Admin</h2>
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+	<table border="0" cellpadding="1" cellspacing="3">
+	<tr>        
+	    <td align="center">
+	        <a class="nav" href="stats.xsl">Admin Home</a>
+		    <a class="nav" href="listmounts.xsl">List Mountpoints</a>
+        	<a class="nav" href="moveclients.xsl">Move Listeners</a>
+        	<a class="nav" href="/status.xsl">Index</a>
+	    </td></tr>
+	</table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+
+<h1>Active Mountpoints</h1>
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<xsl:for-each select="source">
+<div class="streamheader">
+    <table cellspacing="0" cellpadding="0" >
+        <colgroup align="left" />
+        <colgroup align="right" width="300" />
+        <tr>
+            <td><h3>Mount Point <xsl:value-of select="@mount" /></h3></td>
+            <xsl:choose>
+                <xsl:when test="authenticator">
+                    <td align="right"><a class="auth" href="/auth.xsl">Login</a></td>
+                </xsl:when>
+                <xsl:otherwise>
+                    <td align="right">
+                        <a href="{@mount}.m3u">M3U</a>
+                        <a href="{@mount}.xspf">XSPF</a></td>
+                </xsl:otherwise>
+            </xsl:choose>
+    </tr></table>
+</div>
+
+<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
+	<tr>        
+	    <td align="center">
+			<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a>
+        	<a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a>
+			<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a>
+        	<a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
+                <xsl:if test="authenticator"><a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
+	    </td></tr>
+	</table>
+<br />
+<p><xsl:value-of select="listeners" /> Listener(s)</p>
+<br></br>
+</xsl:for-each>
+<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/icecast/etc/icecast2/admin/manageauth.xsl b/icecast/etc/icecast2/admin/manageauth.xsl
index 25a3610..4c1ab9d 100644
--- a/icecast/etc/icecast2/admin/manageauth.xsl
+++ b/icecast/etc/icecast2/admin/manageauth.xsl
@@ -1,98 +1,98 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
-<xsl:template match = "/icestats" >
-<html>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<h2>Icecast2 Admin</h2>
-<br />
-
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-	<table border="0" cellpadding="1" cellspacing="3">
-	<tr>        
-	    <td align="center">
-	        <a class="nav" href="stats.xsl">Admin Home</a>
-		    <a class="nav" href="listmounts.xsl">List Mountpoints</a>
-        	<a class="nav" href="moveclients.xsl">Move Listeners</a>
-        	<a class="nav" href="/status.xsl">Index</a>
-	    </td></tr>
-	</table>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<xsl:for-each select="iceresponse">
-<xsl:value-of select="message" /> 
-</xsl:for-each>
-<xsl:for-each select="source">
-<h3>
-<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
-(<xsl:value-of select="@mount" />)</h3>
-	<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
-	<tr>        
-	    <td align="center">
-			<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a>
-        	<a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a>
-			<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a>
-        	<a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
-	    </td></tr>
-	</table>
-<br></br>
-<form method="GET" action="manageauth.xsl">
-<table cellpadding="2" cellspacing="4" border="0" >
-		<tr>
-				<td ><b>User Id</b></td>
-				<td ></td>
-		</tr>
-<xsl:variable name = "themount" ><xsl:value-of select="@mount" /></xsl:variable>
-<xsl:for-each select="User">
-		<tr>
-				<td><xsl:value-of select="username" /></td>
-				<td><a class="nav2" href="manageauth.xsl?mount={$themount}&amp;username={username}&amp;action=delete">delete</a></td>
-		</tr>
-</xsl:for-each>
-</table>
-<table cellpadding="2" cellspacing="4" border="0" >
-		<tr>
-				<td ><b>User Id</b></td>
-				<td ><b>Password</b></td>
-		</tr>
-		<tr>
-				<td ><input type="text" name="username" /></td>
-				<td ><input type="text" name="password" /></td>
-		</tr>
-		<tr>
-				<td colspan="2"><input type="Submit" name="Submit" value="Add New User" /></td>
-		</tr>
-</table>
-<input type="hidden" name="mount" value="{@mount}"/>
-<input type="hidden" name="action" value="add"/>
-</form>
-<br />
-<br />
-</xsl:for-each>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-</div>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
+<xsl:template match = "/icestats" >
+<html>
+<head>
+<title>Icecast Streaming Media Server</title>
+<link rel="stylesheet" type="text/css" href="/style.css" />
+</head>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<h2>Icecast2 Admin</h2>
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+	<table border="0" cellpadding="1" cellspacing="3">
+	<tr>        
+	    <td align="center">
+	        <a class="nav" href="stats.xsl">Admin Home</a>
+		    <a class="nav" href="listmounts.xsl">List Mountpoints</a>
+        	<a class="nav" href="moveclients.xsl">Move Listeners</a>
+        	<a class="nav" href="/status.xsl">Index</a>
+	    </td></tr>
+	</table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<xsl:for-each select="iceresponse">
+<xsl:value-of select="message" /> 
+</xsl:for-each>
+<xsl:for-each select="source">
+<h3>
+<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
+(<xsl:value-of select="@mount" />)</h3>
+	<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
+	<tr>        
+	    <td align="center">
+			<a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a>
+        	<a class="nav2" href="moveclients.xsl?mount={@mount}">Move Listeners</a>
+			<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a>
+        	<a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
+	    </td></tr>
+	</table>
+<br></br>
+<form method="GET" action="manageauth.xsl">
+<table cellpadding="2" cellspacing="4" border="0" >
+		<tr>
+				<td ><b>User Id</b></td>
+				<td ></td>
+		</tr>
+<xsl:variable name = "themount" ><xsl:value-of select="@mount" /></xsl:variable>
+<xsl:for-each select="User">
+		<tr>
+				<td><xsl:value-of select="username" /></td>
+				<td><a class="nav2" href="manageauth.xsl?mount={$themount}&amp;username={username}&amp;action=delete">delete</a></td>
+		</tr>
+</xsl:for-each>
+</table>
+<table cellpadding="2" cellspacing="4" border="0" >
+		<tr>
+				<td ><b>User Id</b></td>
+				<td ><b>Password</b></td>
+		</tr>
+		<tr>
+				<td ><input type="text" name="username" /></td>
+				<td ><input type="text" name="password" /></td>
+		</tr>
+		<tr>
+				<td colspan="2"><input type="Submit" name="Submit" value="Add New User" /></td>
+		</tr>
+</table>
+<input type="hidden" name="mount" value="{@mount}"/>
+<input type="hidden" name="action" value="add"/>
+</form>
+<br />
+<br />
+</xsl:for-each>
+<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/icecast/etc/icecast2/admin/moveclients.xsl b/icecast/etc/icecast2/admin/moveclients.xsl
index 43112f1..99a8a9e 100644
--- a/icecast/etc/icecast2/admin/moveclients.xsl
+++ b/icecast/etc/icecast2/admin/moveclients.xsl
@@ -1,63 +1,63 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
-<xsl:template match = "/icestats" >
-<html>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<h2>Icecast2 Admin</h2>
-<br />
-
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-	<table border="0" cellpadding="1" cellspacing="3">
-	<tr>        
-	    <td align="center">
-	        <a class="nav" href="stats.xsl">Admin Home</a>
-		    <a class="nav" href="listmounts.xsl">List Mountpoints</a>
-        	<a class="nav" href="moveclients.xsl">Move Listeners</a>
-        	<a class="nav" href="/status.xsl">Index</a>
-	    </td></tr>
-	</table>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-
-<xsl:variable name = "currentmount" ><xsl:value-of select="current_source" /></xsl:variable>
-<h1>Moving Listeners From (<xsl:value-of select="current_source" />)</h1>
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<h3>Move to which mountpoint ?</h3>
-<xsl:for-each select="source">
-	<table border="0" cellpadding="1" cellspacing="5" >
-	<tr>        
-		<td>Move from (<xsl:copy-of select="$currentmount" />) to (<xsl:value-of select="@mount" />)</td>
-		<td><xsl:value-of select="listeners" /> Listeners</td>
-		<td><a class="nav2" href="moveclients.xsl?mount={$currentmount}&amp;destination={@mount}">Move Clients</a></td>
-	</tr>        
-	</table>
-<br />
-<br />
-</xsl:for-each>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-</div>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
+<xsl:template match = "/icestats" >
+<html>
+<head>
+<title>Icecast Streaming Media Server</title>
+<link rel="stylesheet" type="text/css" href="/style.css" />
+</head>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<h2>Icecast2 Admin</h2>
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+	<table border="0" cellpadding="1" cellspacing="3">
+	<tr>        
+	    <td align="center">
+	        <a class="nav" href="stats.xsl">Admin Home</a>
+		    <a class="nav" href="listmounts.xsl">List Mountpoints</a>
+        	<a class="nav" href="moveclients.xsl">Move Listeners</a>
+        	<a class="nav" href="/status.xsl">Index</a>
+	    </td></tr>
+	</table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+<xsl:variable name = "currentmount" ><xsl:value-of select="current_source" /></xsl:variable>
+<h1>Moving Listeners From (<xsl:value-of select="current_source" />)</h1>
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<h3>Move to which mountpoint ?</h3>
+<xsl:for-each select="source">
+	<table border="0" cellpadding="1" cellspacing="5" >
+	<tr>        
+		<td>Move from (<xsl:copy-of select="$currentmount" />) to (<xsl:value-of select="@mount" />)</td>
+		<td><xsl:value-of select="listeners" /> Listeners</td>
+		<td><a class="nav2" href="moveclients.xsl?mount={$currentmount}&amp;destination={@mount}">Move Clients</a></td>
+	</tr>        
+	</table>
+<br />
+<br />
+</xsl:for-each>
+<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</body>
+</html>
+
+</xsl:template>
+</xsl:stylesheet>
diff --git a/icecast/etc/icecast2/admin/response.xsl b/icecast/etc/icecast2/admin/response.xsl
index c75af8d..6c584b4 100644
--- a/icecast/etc/icecast2/admin/response.xsl
+++ b/icecast/etc/icecast2/admin/response.xsl
@@ -1,56 +1,56 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
-<xsl:template match = "/iceresponse" >
-<html>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<img align="left" src="/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
-<br />
-
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-	<table border="0" cellpadding="1" cellspacing="3">
-	<tr>        
-	    <td align="center">
-	        <a class="nav" href="stats.xsl">Admin Home</a> |
-		    <a class="nav" href="listmounts.xsl">List Mountpoints</a> | 
-        	<a class="nav" href="moveclients.xsl">Move Listeners</a> | 
-        	<a class="nav" href="/status.xsl">Index</a>
-	    </td></tr>
-	</table>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-
-<h1>Icecast Server Response</h1>
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<h3>Response</h3>
-<xsl:for-each select="/iceresponse">
-Message : <xsl:value-of select="message" /><br></br>
-Return Code: <xsl:value-of select="return" /><br></br>
-</xsl:for-each>
-<br />
-<br />
-</div>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
+<xsl:template match = "/iceresponse" >
+<html>
+<head>
+<title>Icecast Streaming Media Server</title>
+<link rel="stylesheet" type="text/css" href="/style.css" />
+</head>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<img align="left" src="/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+	<table border="0" cellpadding="1" cellspacing="3">
+	<tr>        
+	    <td align="center">
+	        <a class="nav" href="stats.xsl">Admin Home</a> |
+		    <a class="nav" href="listmounts.xsl">List Mountpoints</a> | 
+        	<a class="nav" href="moveclients.xsl">Move Listeners</a> | 
+        	<a class="nav" href="/status.xsl">Index</a>
+	    </td></tr>
+	</table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+<h1>Icecast Server Response</h1>
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<h3>Response</h3>
+<xsl:for-each select="/iceresponse">
+Message : <xsl:value-of select="message" /><br></br>
+Return Code: <xsl:value-of select="return" /><br></br>
+</xsl:for-each>
+<br />
+<br />
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</body>
+</html>
+
+</xsl:template>
+</xsl:stylesheet>
diff --git a/icecast/etc/icecast2/admin/stats.xsl b/icecast/etc/icecast2/admin/stats.xsl
index a3cc614..e09f249 100644
--- a/icecast/etc/icecast2/admin/stats.xsl
+++ b/icecast/etc/icecast2/admin/stats.xsl
@@ -1,124 +1,124 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
-<xsl:template match = "/icestats" >
-<html>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<h2>Icecast2 Admin</h2>
-<br />
-<!--header menu -->
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-	<table border="0" cellpadding="1" cellspacing="3">
-	<tr>        
-	    <td align="center">
-	        <a class="nav" href="stats.xsl">Admin Home</a>
-		    <a class="nav" href="listmounts.xsl">List Mountpoints</a>
-        	<a class="nav" href="moveclients.xsl">Move Listeners</a>
-        	<a class="nav" href="/status.xsl">Index</a>
-	    </td></tr>
-	</table>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-<!--end header menu -->
-
-<!--global server stats-->
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<h3>Global Server Stats</h3>
-<table border="0" cellpadding="4">
-<xsl:for-each select="/icestats">
-<xsl:for-each select="*">
-<xsl:if test = "name()!='source'"> 
-<tr>
-	<td width="130"><xsl:value-of select="name()" /></td>
-	<td class="streamdata"><xsl:value-of select="." /></td>
-</tr>
-</xsl:if>
-</xsl:for-each>
-</xsl:for-each>
-</table>
-</div>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-<!--end global server stats-->
-
-<!--mount point stats-->
-<xsl:for-each select="source">
-<xsl:if test = "listeners!=''"> 
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-    <div class="streamheader">
-        <table cellspacing="0" cellpadding="0" >
-            <colgroup align="left" />
-            <colgroup align="right" width="300" />
-            <tr>
-                <td><h3>Mount Point <xsl:value-of select="@mount" /></h3></td>
-                <xsl:choose>
-                    <xsl:when test="authenticator">
-                        <td align="right"><a class="auth" href="/auth.xsl">Login</a></td>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <td align="right">
-                            <a href="{@mount}.m3u">M3U</a>
-                            <a href="{@mount}.xspf">XSPF</a></td>
-                    </xsl:otherwise>
-                </xsl:choose>
-        </tr></table>
-    </div>
-	<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
-	<tr>        
-	    <td align="center">
-		    <a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a>
-        	<a class="nav2" href="moveclients.xsl?mount={@mount}">Move MountPoints</a>
-        	<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a>
-        	<a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
-                <xsl:if test="authenticator"><a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
-	    </td></tr>
-	</table>
-<br />
-<table cellpadding="5" cellspacing="0" border="0">
-	<xsl:for-each select="*">
-	<tr>
-		<td width="130"><xsl:value-of select="name()" /></td>
-		<td class="streamdata"><xsl:value-of select="." /></td>
-	</tr>
-	</xsl:for-each>
-</table>
-</div>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-</xsl:if>
-</xsl:for-each>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-
-
-<!--end mount point stats-->
-<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
+<xsl:template match = "/icestats" >
+<html>
+<head>
+<title>Icecast Streaming Media Server</title>
+<link rel="stylesheet" type="text/css" href="/style.css" />
+</head>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<h2>Icecast2 Admin</h2>
+<br />
+<!--header menu -->
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+	<table border="0" cellpadding="1" cellspacing="3">
+	<tr>        
+	    <td align="center">
+	        <a class="nav" href="stats.xsl">Admin Home</a>
+		    <a class="nav" href="listmounts.xsl">List Mountpoints</a>
+        	<a class="nav" href="moveclients.xsl">Move Listeners</a>
+        	<a class="nav" href="/status.xsl">Index</a>
+	    </td></tr>
+	</table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+<!--end header menu -->
+
+<!--global server stats-->
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<h3>Global Server Stats</h3>
+<table border="0" cellpadding="4">
+<xsl:for-each select="/icestats">
+<xsl:for-each select="*">
+<xsl:if test = "name()!='source'"> 
+<tr>
+	<td width="130"><xsl:value-of select="name()" /></td>
+	<td class="streamdata"><xsl:value-of select="." /></td>
+</tr>
+</xsl:if>
+</xsl:for-each>
+</xsl:for-each>
+</table>
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+<!--end global server stats-->
+
+<!--mount point stats-->
+<xsl:for-each select="source">
+<xsl:if test = "listeners!=''"> 
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+    <div class="streamheader">
+        <table cellspacing="0" cellpadding="0" >
+            <colgroup align="left" />
+            <colgroup align="right" width="300" />
+            <tr>
+                <td><h3>Mount Point <xsl:value-of select="@mount" /></h3></td>
+                <xsl:choose>
+                    <xsl:when test="authenticator">
+                        <td align="right"><a class="auth" href="/auth.xsl">Login</a></td>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <td align="right">
+                            <a href="{@mount}.m3u">M3U</a>
+                            <a href="{@mount}.xspf">XSPF</a></td>
+                    </xsl:otherwise>
+                </xsl:choose>
+        </tr></table>
+    </div>
+	<table border="0" cellpadding="1" cellspacing="5" bgcolor="444444">
+	<tr>        
+	    <td align="center">
+		    <a class="nav2" href="listclients.xsl?mount={@mount}">List Clients</a>
+        	<a class="nav2" href="moveclients.xsl?mount={@mount}">Move MountPoints</a>
+        	<a class="nav2" href="updatemetadata.xsl?mount={@mount}">Update Metadata</a>
+        	<a class="nav2" href="killsource.xsl?mount={@mount}">Kill Source</a>
+                <xsl:if test="authenticator"><a class="nav2" href="manageauth.xsl?mount={@mount}">Manage Authentication</a></xsl:if>
+	    </td></tr>
+	</table>
+<br />
+<table cellpadding="5" cellspacing="0" border="0">
+	<xsl:for-each select="*">
+	<tr>
+		<td width="130"><xsl:value-of select="name()" /></td>
+		<td class="streamdata"><xsl:value-of select="." /></td>
+	</tr>
+	</xsl:for-each>
+</table>
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+</xsl:if>
+</xsl:for-each>
+<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
+
+
+<!--end mount point stats-->
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/icecast/etc/icecast2/admin/updatemetadata.xsl b/icecast/etc/icecast2/admin/updatemetadata.xsl
index 55bde7c..0d86aa5 100644
--- a/icecast/etc/icecast2/admin/updatemetadata.xsl
+++ b/icecast/etc/icecast2/admin/updatemetadata.xsl
@@ -1,67 +1,67 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
-<xsl:template match = "/icestats" >
-<html>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="/style.css" />
-</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<h2>Icecast2 Admin</h2>
-<br />
-
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-	<table border="0" cellpadding="1" cellspacing="3">
-	<tr>        
-	    <td align="center">
-	        <a class="nav" href="stats.xsl">Admin Home</a>
-		    <a class="nav" href="listmounts.xsl">List Mountpoints</a>
-        	<a class="nav" href="moveclients.xsl">Move Listeners</a>
-        	<a class="nav" href="/status.xsl">Index</a>
-	    </td></tr>
-	</table>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-
-<h1>Update Metadata</h1>
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<xsl:for-each select="source">
-<h3>
-<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
-(<xsl:value-of select="@mount" />)</h3>
-
-<form method="GET" action="/admin/metadata.xsl">
-<table border="0" cellpadding="4">
-<tr><td>Metadata : <input type="text" name="song"/></td></tr>
-<tr><td><input type="Submit" value="Update"/></td></tr>
-</table>
-<input type="hidden" name="mount" value="{@mount}"/>
-<input type="hidden" name="mode" value="updinfo"/>
-<input type="hidden" name="charset" value="UTF-8"/>
-</form>
-
-<br />
-<br />
-</xsl:for-each>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-</div>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
+<xsl:template match = "/icestats" >
+<html>
+<head>
+<title>Icecast Streaming Media Server</title>
+<link rel="stylesheet" type="text/css" href="/style.css" />
+</head>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<h2>Icecast2 Admin</h2>
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+	<table border="0" cellpadding="1" cellspacing="3">
+	<tr>        
+	    <td align="center">
+	        <a class="nav" href="stats.xsl">Admin Home</a>
+		    <a class="nav" href="listmounts.xsl">List Mountpoints</a>
+        	<a class="nav" href="moveclients.xsl">Move Listeners</a>
+        	<a class="nav" href="/status.xsl">Index</a>
+	    </td></tr>
+	</table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+<h1>Update Metadata</h1>
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<xsl:for-each select="source">
+<h3>
+<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
+(<xsl:value-of select="@mount" />)</h3>
+
+<form method="GET" action="/admin/metadata.xsl">
+<table border="0" cellpadding="4">
+<tr><td>Metadata : <input type="text" name="song"/></td></tr>
+<tr><td><input type="Submit" value="Update"/></td></tr>
+</table>
+<input type="hidden" name="mount" value="{@mount}"/>
+<input type="hidden" name="mode" value="updinfo"/>
+<input type="hidden" name="charset" value="UTF-8"/>
+</form>
+
+<br />
+<br />
+</xsl:for-each>
+<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/icecast/etc/icecast2/icecast.xml b/icecast/etc/icecast2/icecast.xml
index c2a6d22..8c5835a 100644
--- a/icecast/etc/icecast2/icecast.xml
+++ b/icecast/etc/icecast2/icecast.xml
@@ -1,174 +1,174 @@
-<icecast>
-    <limits>
-        <clients>1000</clients>
-        <sources>42</sources>
-        <threadpool>5</threadpool>
-        <queue-size>524288</queue-size>
-        <client-timeout>30</client-timeout>
-        <header-timeout>15</header-timeout>
-        <source-timeout>10</source-timeout>
-        <!-- If enabled, this will provide a burst of data when a client 
-             first connects, thereby significantly reducing the startup 
-             time for listeners that do substantial buffering. However,
-             it also significantly increases latency between the source
-             client and listening client.  For low-latency setups, you
-             might want to disable this. -->
-        <burst-on-connect>1</burst-on-connect>
-        <!-- same as burst-on-connect, but this allows for being more
-             specific on how much to burst. Most people won't need to
-             change from the default 64k. Applies to all mountpoints  -->
-        <burst-size>65535</burst-size>
-    </limits>
-
-    <authentication>
-        <!-- Sources log in with username 'source' -->
-        <source-password>hackme</source-password>
-        <!-- Relays log in username 'relay' -->
-        <relay-password>hackme</relay-password>
-
-        <!-- Admin logs in with the username given below -->
-        <admin-user>admin</admin-user>
-        <admin-password>hackme</admin-password>
-    </authentication>
-
-    <!-- set the mountpoint for a shoutcast source to use, the default if not
-         specified is /stream but you can change it here if an alternative is
-         wanted or an extension is required
-    <shoutcast-mount>/live.nsv</shoutcast-mount>
-    -->
-
-    <!-- Uncomment this if you want directory listings -->
-    <!--
-    <directory>
-        <yp-url-timeout>15</yp-url-timeout>
-        <yp-url>http://dir.xiph.org/cgi-bin/yp-cgi</yp-url>
-    </directory>
-     -->
-
-    <!-- This is the hostname other people will use to connect to your server.
-    It affects mainly the urls generated by Icecast for playlists and yp
-    listings. -->
-    <hostname>localhost</hostname>
-
-    <!-- You may have multiple <listener> elements -->
-    <listen-socket>
-        <port>8000</port>
-        <!-- <bind-address>127.0.0.1</bind-address> -->
-        <!-- <shoutcast-mount>/stream</shoutcast-mount> -->
-    </listen-socket>
-    <!--
-    <listen-socket>
-        <port>8001</port>
-    </listen-socket>
-    -->
-
-    <!--<master-server>127.0.0.1</master-server>-->
-    <!--<master-server-port>8001</master-server-port>-->
-    <!--<master-update-interval>120</master-update-interval>-->
-    <!--<master-password>hackme</master-password>-->
-
-    <!-- setting this makes all relays on-demand unless overridden, this is
-         useful for master relays which do not have <relay> definitions here.
-         The default is 0 -->
-    <!--<relays-on-demand>1</relays-on-demand>-->
-
-    <!--
-    <relay>
-        <server>127.0.0.1</server>
-        <port>8001</port>
-        <mount>/example.ogg</mount>
-        <local-mount>/different.ogg</local-mount>
-        <on-demand>0</on-demand>
-
-        <relay-shoutcast-metadata>0</relay-shoutcast-metadata>
-    </relay>
-    -->
-
-    <!-- Only define a <mount> section if you want to use advanced options,
-         like alternative usernames or passwords
-    <mount>
-        <mount-name>/example-complex.ogg</mount-name>
-
-        <username>othersource</username>
-        <password>hackmemore</password>
-
-        <max-listeners>1</max-listeners>
-        <dump-file>/tmp/dump-example1.ogg</dump-file>
-        <burst-size>65536</burst-size>
-        <fallback-mount>/example2.ogg</fallback-mount>
-        <fallback-override>1</fallback-override>
-        <fallback-when-full>1</fallback-when-full>
-        <intro>/example_intro.ogg</intro>
-        <hidden>1</hidden>
-        <no-yp>1</no-yp>
-        <authentication type="htpasswd">
-                <option name="filename" value="myauth"/>
-                <option name="allow_duplicate_users" value="0"/>
-        </authentication>
-        <on-connect>/home/icecast/bin/stream-start</on-connect>
-        <on-disconnect>/home/icecast/bin/stream-stop</on-disconnect>
-    </mount>
-
-    <mount>
-        <mount-name>/auth_example.ogg</mount-name>
-        <authentication type="url">
-            <option name="mount_add"       value="http://myauthserver.net/notify_mount.php"/>
-            <option name="mount_remove"    value="http://myauthserver.net/notify_mount.php"/>
-            <option name="listener_add"    value="http://myauthserver.net/notify_listener.php"/>
-            <option name="listener_remove" value="http://myauthserver.net/notify_listener.php"/>
-        </authentication>
-    </mount>
-
-    -->
-
-    <fileserve>1</fileserve>
-
-    <paths>
-		<!-- basedir is only used if chroot is enabled -->
-        <basedir>/usr/share/icecast2</basedir>
-
-        <!-- Note that if <chroot> is turned on below, these paths must both
-             be relative to the new root, not the original root -->
-        <logdir>/var/log/icecast2</logdir>
-        <webroot>/usr/share/icecast2/web</webroot>
-        <adminroot>/usr/share/icecast2/admin</adminroot>
-        <!-- <pidfile>/usr/share/icecast2/icecast.pid</pidfile> -->
-
-        <!-- Aliases: treat requests for 'source' path as being for 'dest' path
-             May be made specific to a port or bound address using the "port"
-             and "bind-address" attributes.
-          -->
-        <!--
-        <alias source="/foo" dest="/bar"/>
-          -->
-        <!-- Aliases: can also be used for simple redirections as well,
-             this example will redirect all requests for http://server:port/ to
-             the status page
-          -->
-        <alias source="/" dest="/status.xsl"/>
-    </paths>
-
-    <logging>
-        <accesslog>access.log</accesslog>
-        <errorlog>error.log</errorlog>
-        <!-- <playlistlog>playlist.log</playlistlog> -->
-      	<loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
-      	<logsize>10000</logsize> <!-- Max size of a logfile -->
-        <!-- If logarchive is enabled (1), then when logsize is reached
-             the logfile will be moved to [error|access|playlist].log.DATESTAMP,
-             otherwise it will be moved to [error|access|playlist].log.old.
-             Default is non-archive mode (i.e. overwrite)
-        -->
-        <!-- <logarchive>1</logarchive> -->
-    </logging>
-
-    <security>
-        <chroot>0</chroot>
-        <!--
-        <changeowner>
-            <user>nobody</user>
-            <group>nogroup</group>
-        </changeowner>
-        -->
-    </security>
-</icecast>
+<icecast>
+    <limits>
+        <clients>1000</clients>
+        <sources>42</sources>
+        <threadpool>5</threadpool>
+        <queue-size>524288</queue-size>
+        <client-timeout>30</client-timeout>
+        <header-timeout>15</header-timeout>
+        <source-timeout>10</source-timeout>
+        <!-- If enabled, this will provide a burst of data when a client 
+             first connects, thereby significantly reducing the startup 
+             time for listeners that do substantial buffering. However,
+             it also significantly increases latency between the source
+             client and listening client.  For low-latency setups, you
+             might want to disable this. -->
+        <burst-on-connect>1</burst-on-connect>
+        <!-- same as burst-on-connect, but this allows for being more
+             specific on how much to burst. Most people won't need to
+             change from the default 64k. Applies to all mountpoints  -->
+        <burst-size>65535</burst-size>
+    </limits>
+
+    <authentication>
+        <!-- Sources log in with username 'source' -->
+        <source-password>hackme</source-password>
+        <!-- Relays log in username 'relay' -->
+        <relay-password>hackme</relay-password>
+
+        <!-- Admin logs in with the username given below -->
+        <admin-user>admin</admin-user>
+        <admin-password>hackme</admin-password>
+    </authentication>
+
+    <!-- set the mountpoint for a shoutcast source to use, the default if not
+         specified is /stream but you can change it here if an alternative is
+         wanted or an extension is required
+    <shoutcast-mount>/live.nsv</shoutcast-mount>
+    -->
+
+    <!-- Uncomment this if you want directory listings -->
+    <!--
+    <directory>
+        <yp-url-timeout>15</yp-url-timeout>
+        <yp-url>http://dir.xiph.org/cgi-bin/yp-cgi</yp-url>
+    </directory>
+     -->
+
+    <!-- This is the hostname other people will use to connect to your server.
+    It affects mainly the urls generated by Icecast for playlists and yp
+    listings. -->
+    <hostname>localhost</hostname>
+
+    <!-- You may have multiple <listener> elements -->
+    <listen-socket>
+        <port>8000</port>
+        <!-- <bind-address>127.0.0.1</bind-address> -->
+        <!-- <shoutcast-mount>/stream</shoutcast-mount> -->
+    </listen-socket>
+    <!--
+    <listen-socket>
+        <port>8001</port>
+    </listen-socket>
+    -->
+
+    <!--<master-server>127.0.0.1</master-server>-->
+    <!--<master-server-port>8001</master-server-port>-->
+    <!--<master-update-interval>120</master-update-interval>-->
+    <!--<master-password>hackme</master-password>-->
+
+    <!-- setting this makes all relays on-demand unless overridden, this is
+         useful for master relays which do not have <relay> definitions here.
+         The default is 0 -->
+    <!--<relays-on-demand>1</relays-on-demand>-->
+
+    <!--
+    <relay>
+        <server>127.0.0.1</server>
+        <port>8001</port>
+        <mount>/example.ogg</mount>
+        <local-mount>/different.ogg</local-mount>
+        <on-demand>0</on-demand>
+
+        <relay-shoutcast-metadata>0</relay-shoutcast-metadata>
+    </relay>
+    -->
+
+    <!-- Only define a <mount> section if you want to use advanced options,
+         like alternative usernames or passwords
+    <mount>
+        <mount-name>/example-complex.ogg</mount-name>
+
+        <username>othersource</username>
+        <password>hackmemore</password>
+
+        <max-listeners>1</max-listeners>
+        <dump-file>/tmp/dump-example1.ogg</dump-file>
+        <burst-size>65536</burst-size>
+        <fallback-mount>/example2.ogg</fallback-mount>
+        <fallback-override>1</fallback-override>
+        <fallback-when-full>1</fallback-when-full>
+        <intro>/example_intro.ogg</intro>
+        <hidden>1</hidden>
+        <no-yp>1</no-yp>
+        <authentication type="htpasswd">
+                <option name="filename" value="myauth"/>
+                <option name="allow_duplicate_users" value="0"/>
+        </authentication>
+        <on-connect>/home/icecast/bin/stream-start</on-connect>
+        <on-disconnect>/home/icecast/bin/stream-stop</on-disconnect>
+    </mount>
+
+    <mount>
+        <mount-name>/auth_example.ogg</mount-name>
+        <authentication type="url">
+            <option name="mount_add"       value="http://myauthserver.net/notify_mount.php"/>
+            <option name="mount_remove"    value="http://myauthserver.net/notify_mount.php"/>
+            <option name="listener_add"    value="http://myauthserver.net/notify_listener.php"/>
+            <option name="listener_remove" value="http://myauthserver.net/notify_listener.php"/>
+        </authentication>
+    </mount>
+
+    -->
+
+    <fileserve>1</fileserve>
+
+    <paths>
+		<!-- basedir is only used if chroot is enabled -->
+        <basedir>/usr/share/icecast2</basedir>
+
+        <!-- Note that if <chroot> is turned on below, these paths must both
+             be relative to the new root, not the original root -->
+        <logdir>/var/log/icecast2</logdir>
+        <webroot>/usr/share/icecast2/web</webroot>
+        <adminroot>/usr/share/icecast2/admin</adminroot>
+        <!-- <pidfile>/usr/share/icecast2/icecast.pid</pidfile> -->
+
+        <!-- Aliases: treat requests for 'source' path as being for 'dest' path
+             May be made specific to a port or bound address using the "port"
+             and "bind-address" attributes.
+          -->
+        <!--
+        <alias source="/foo" dest="/bar"/>
+          -->
+        <!-- Aliases: can also be used for simple redirections as well,
+             this example will redirect all requests for http://server:port/ to
+             the status page
+          -->
+        <alias source="/" dest="/status.xsl"/>
+    </paths>
+
+    <logging>
+        <accesslog>access.log</accesslog>
+        <errorlog>error.log</errorlog>
+        <!-- <playlistlog>playlist.log</playlistlog> -->
+      	<loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+      	<logsize>10000</logsize> <!-- Max size of a logfile -->
+        <!-- If logarchive is enabled (1), then when logsize is reached
+             the logfile will be moved to [error|access|playlist].log.DATESTAMP,
+             otherwise it will be moved to [error|access|playlist].log.old.
+             Default is non-archive mode (i.e. overwrite)
+        -->
+        <!-- <logarchive>1</logarchive> -->
+    </logging>
+
+    <security>
+        <chroot>0</chroot>
+        <!--
+        <changeowner>
+            <user>nobody</user>
+            <group>nogroup</group>
+        </changeowner>
+        -->
+    </security>
+</icecast>
diff --git a/icecast/etc/icecast2/web/auth.xsl b/icecast/etc/icecast2/web/auth.xsl
index cc3fc79..0d8c97e 100644
--- a/icecast/etc/icecast2/web/auth.xsl
+++ b/icecast/etc/icecast2/web/auth.xsl
@@ -1,57 +1,57 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
-<xsl:template match = "/icestats" >
-<html>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<table border="0" width="100%%">
-<tr>
-<td width="50"></td>
-<td>
-<h2>Authorization Page</h2>
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<xsl:for-each select="source">
-<xsl:choose>
-<xsl:when test="listeners">
-<xsl:if test="authenticator">
-<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
-<h3>(<xsl:value-of select="@mount" />)</h3>
-<form method="GET" action="/admin/buildm3u">
-<table border="0" cellpadding="4">
-<tr><td>Username : <input type="text" name="username"/></td></tr>
-<tr><td>Password : <input type="password" name="password"/></td></tr>
-<tr><td><input type="Submit" value="Login"/></td></tr>
-</table>
-<input type="hidden" name="mount" value="{@mount}"/>
-</form>
-</xsl:if>
-</xsl:when>
-<xsl:otherwise>
-<h3><xsl:value-of select="@mount" /> - Not Connected</h3>
-</xsl:otherwise>
-</xsl:choose>
-<br></br>
-<br></br>
-</xsl:for-each>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-</div>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br></br><br></br>
-</td>
-<td width="25"></td></tr>
-</table>
-<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
+<xsl:template match = "/icestats" >
+<html>
+<head>
+<title>Icecast Streaming Media Server</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<table border="0" width="100%%">
+<tr>
+<td width="50"></td>
+<td>
+<h2>Authorization Page</h2>
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<xsl:for-each select="source">
+<xsl:choose>
+<xsl:when test="listeners">
+<xsl:if test="authenticator">
+<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
+<h3>(<xsl:value-of select="@mount" />)</h3>
+<form method="GET" action="/admin/buildm3u">
+<table border="0" cellpadding="4">
+<tr><td>Username : <input type="text" name="username"/></td></tr>
+<tr><td>Password : <input type="password" name="password"/></td></tr>
+<tr><td><input type="Submit" value="Login"/></td></tr>
+</table>
+<input type="hidden" name="mount" value="{@mount}"/>
+</form>
+</xsl:if>
+</xsl:when>
+<xsl:otherwise>
+<h3><xsl:value-of select="@mount" /> - Not Connected</h3>
+</xsl:otherwise>
+</xsl:choose>
+<br></br>
+<br></br>
+</xsl:for-each>
+<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br></br><br></br>
+</td>
+<td width="25"></td></tr>
+</table>
+<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/icecast/etc/icecast2/web/server_version.xsl b/icecast/etc/icecast2/web/server_version.xsl
index 5fd5c5f..bcf610b 100644
--- a/icecast/etc/icecast2/web/server_version.xsl
+++ b/icecast/etc/icecast2/web/server_version.xsl
@@ -1,91 +1,91 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
-<xsl:template match = "/icestats" >
-<html>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<h2>Server Information</h2>
-<br />
-<!--index header menu -->
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<table border="0" width="100%" id="table1" cellspacing="0" cellpadding="4">
-	<tr>
-		<td bgcolor="#656565">
-	    <a class="nav" href="admin/">Administration</a>
-		<a class="nav" href="status.xsl">Server Status</a>
-		<a class="nav" href="server_version.xsl">Version</a></td>
-	</tr>
-</table>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-<!--end index header menu -->
-
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-<h3>Server Information</h3>
-<table border="0" cellpadding="4">
-<xsl:for-each select="/icestats">
-<tr>
-	<td width="130">Location</td>
-	<td class="streamdata"><xsl:value-of select="location" /></td>
-</tr>
-<tr>
-	<td width="130">Admin</td>
-	<td class="streamdata"><xsl:value-of select="admin" /></td>
-</tr>
-<tr>
-    <td width="130">Host</td>
-    <td class="streamdata"><xsl:value-of select="host" /></td>
-</tr>
-<tr>
-    <td width="130">Version</td>
-    <td class="streamdata"><xsl:value-of select="server_id" /></td>
-</tr>
-</xsl:for-each>
-<tr>
-	<td width="130">Download</td>
-	<td class="streamdata"><a class="nav" target="_blank" href="http://icecast.org/download.php">icecast.org</a></td>
-</tr>
-<tr>
-	<td width="130">Subversion</td>
-	<td class="streamdata"><a class="nav" target="_blank" href="http://icecast.org/svn.php">click here</a></td>
-</tr>
-<tr>
-	<td width="130">Documentation</td>
-	<td class="streamdata"><a class="nav" target="_blank" href="http://icecast.org/docs.php">click here</a></td>
-</tr>
-<tr>
-	<td width="130">Stream Directory </td>
-	<td class="streamdata"><a class="nav" target="_blank" href="http://dir.xiph.org/index.php">dir.xiph.org</a></td>
-</tr>
-<tr>
-	<td width="130">Community</td>
-	<td class="streamdata"><a class="nav" target="_blank" href="http://forum.icecast.org/">forum.icecast.org</a></td>
-</tr>
-</table>
-</div>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-
-<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
+<xsl:template match = "/icestats" >
+<html>
+<head>
+<title>Icecast Streaming Media Server</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<h2>Server Information</h2>
+<br />
+<!--index header menu -->
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<table border="0" width="100%" id="table1" cellspacing="0" cellpadding="4">
+	<tr>
+		<td bgcolor="#656565">
+	    <a class="nav" href="admin/">Administration</a>
+		<a class="nav" href="status.xsl">Server Status</a>
+		<a class="nav" href="server_version.xsl">Version</a></td>
+	</tr>
+</table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+<!--end index header menu -->
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<h3>Server Information</h3>
+<table border="0" cellpadding="4">
+<xsl:for-each select="/icestats">
+<tr>
+	<td width="130">Location</td>
+	<td class="streamdata"><xsl:value-of select="location" /></td>
+</tr>
+<tr>
+	<td width="130">Admin</td>
+	<td class="streamdata"><xsl:value-of select="admin" /></td>
+</tr>
+<tr>
+    <td width="130">Host</td>
+    <td class="streamdata"><xsl:value-of select="host" /></td>
+</tr>
+<tr>
+    <td width="130">Version</td>
+    <td class="streamdata"><xsl:value-of select="server_id" /></td>
+</tr>
+</xsl:for-each>
+<tr>
+	<td width="130">Download</td>
+	<td class="streamdata"><a class="nav" target="_blank" href="http://icecast.org/download.php">icecast.org</a></td>
+</tr>
+<tr>
+	<td width="130">Subversion</td>
+	<td class="streamdata"><a class="nav" target="_blank" href="http://icecast.org/svn.php">click here</a></td>
+</tr>
+<tr>
+	<td width="130">Documentation</td>
+	<td class="streamdata"><a class="nav" target="_blank" href="http://icecast.org/docs.php">click here</a></td>
+</tr>
+<tr>
+	<td width="130">Stream Directory </td>
+	<td class="streamdata"><a class="nav" target="_blank" href="http://dir.xiph.org/index.php">dir.xiph.org</a></td>
+</tr>
+<tr>
+	<td width="130">Community</td>
+	<td class="streamdata"><a class="nav" target="_blank" href="http://forum.icecast.org/">forum.icecast.org</a></td>
+</tr>
+</table>
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/icecast/etc/icecast2/web/status.xsl b/icecast/etc/icecast2/web/status.xsl
index caa932f..b7049a2 100644
--- a/icecast/etc/icecast2/web/status.xsl
+++ b/icecast/etc/icecast2/web/status.xsl
@@ -1,122 +1,122 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
-<xsl:template match = "/icestats" >
-<html>
-<head>
-<title>Icecast Streaming Media Server</title>
-<link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<h2>Icecast2 Status</h2>
-<br />
-<!--index header menu -->
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<table border="0" width="100%" id="table1" cellspacing="0" cellpadding="4">
-	<tr>
-		<td bgcolor="#656565">
-		<a class="nav" href="admin/">Administration</a>
-		<a class="nav" href="status.xsl">Server Status</a>
-		<a class="nav" href="server_version.xsl">Version</a></td>
-	</tr>
-</table>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-<!--end index header menu -->
-<!--mount point stats-->
-<xsl:for-each select="source">
-<xsl:choose>
-<xsl:when test="listeners">
-<div class="roundcont">
-<div class="roundtop">
-<img src="/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<div class="newscontent">
-    <div class="streamheader">
-        <table cellspacing="0" cellpadding="0">
-            <colgroup align="left" />
-            <colgroup align="right" width="300" />
-            <tr>
-                <td><h3>Mount Point <xsl:value-of select="@mount" /></h3></td>
-                <xsl:choose>
-                    <xsl:when test="authenticator">
-                        <td align="right"><a class="auth" href="/auth.xsl">Login</a></td>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <td align="right"> <a href="{@mount}.m3u">M3U</a> <a href="{@mount}.xspf">XSPF</a></td>
-                    </xsl:otherwise>
-                </xsl:choose>
-        </tr></table>
-    </div>
-
-<table border="0" cellpadding="4">
-<xsl:if test="server_name">
-<tr><td>Stream Title:</td><td class="streamdata"> <xsl:value-of select="server_name" /></td></tr>
-</xsl:if>
-<xsl:if test="server_description">
-<tr><td>Stream Description:</td><td class="streamdata"> <xsl:value-of select="server_description" /></td></tr>
-</xsl:if>
-<xsl:if test="server_type">
-<tr><td>Content Type:</td><td class="streamdata"><xsl:value-of select="server_type" /></td></tr>
-</xsl:if>
-<xsl:if test="stream_start">
-<tr><td>Mount started:</td><td class="streamdata"><xsl:value-of select="stream_start" /></td></tr>
-</xsl:if>
-<xsl:if test="bitrate">
-<tr><td>Bitrate:</td><td class="streamdata"> <xsl:value-of select="bitrate" /></td></tr>
-</xsl:if>
-<xsl:if test="quality">
-<tr><td>Quality:</td><td class="streamdata"> <xsl:value-of select="quality" /></td></tr>
-</xsl:if>
-<xsl:if test="video_quality">
-<tr><td>Video Quality:</td><td class="streamdata"> <xsl:value-of select="video_quality" /></td></tr>
-</xsl:if>
-<xsl:if test="frame_size">
-<tr><td>Framesize:</td><td class="streamdata"> <xsl:value-of select="frame_size" /></td></tr>
-</xsl:if>
-<xsl:if test="frame_rate">
-<tr><td>Framerate:</td><td class="streamdata"> <xsl:value-of select="frame_rate" /></td></tr>
-</xsl:if>
-<xsl:if test="listeners">
-<tr><td>Current Listeners:</td><td class="streamdata"> <xsl:value-of select="listeners" /></td></tr>
-</xsl:if>
-<xsl:if test="listener_peak">
-<tr><td>Peak Listeners:</td><td class="streamdata"> <xsl:value-of select="listener_peak" /></td></tr>
-</xsl:if>
-<xsl:if test="genre">
-<tr><td>Stream Genre:</td><td class="streamdata"> <xsl:value-of select="genre" /></td></tr>
-</xsl:if>
-<xsl:if test="server_url">
-<tr><td>Stream URL:</td><td class="streamdata"> <a target="_blank" href="{server_url}"><xsl:value-of select="server_url" /></a></td></tr>
-</xsl:if>
-<tr><td>Current Song:</td><td class="streamdata"> 
-<xsl:if test="artist"><xsl:value-of select="artist" /> - </xsl:if><xsl:value-of select="title" /></td></tr>
-</table>
-</div>
-<div class="roundbottom">
-<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-</xsl:when>
-<xsl:otherwise>
-<h3><xsl:value-of select="@mount" /> - Not Connected</h3>
-</xsl:otherwise>
-</xsl:choose>
-
-</xsl:for-each>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-
-
-<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div>
-</body>
-</html>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="html" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
+<xsl:template match = "/icestats" >
+<html>
+<head>
+<title>Icecast Streaming Media Server</title>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
+<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<h2>Icecast2 Status</h2>
+<br />
+<!--index header menu -->
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<table border="0" width="100%" id="table1" cellspacing="0" cellpadding="4">
+	<tr>
+		<td bgcolor="#656565">
+		<a class="nav" href="admin/">Administration</a>
+		<a class="nav" href="status.xsl">Server Status</a>
+		<a class="nav" href="server_version.xsl">Version</a></td>
+	</tr>
+</table>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+<!--end index header menu -->
+<!--mount point stats-->
+<xsl:for-each select="source">
+<xsl:choose>
+<xsl:when test="listeners">
+<div class="roundcont">
+<div class="roundtop">
+<img src="/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+    <div class="streamheader">
+        <table cellspacing="0" cellpadding="0">
+            <colgroup align="left" />
+            <colgroup align="right" width="300" />
+            <tr>
+                <td><h3>Mount Point <xsl:value-of select="@mount" /></h3></td>
+                <xsl:choose>
+                    <xsl:when test="authenticator">
+                        <td align="right"><a class="auth" href="/auth.xsl">Login</a></td>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <td align="right"> <a href="{@mount}.m3u">M3U</a> <a href="{@mount}.xspf">XSPF</a></td>
+                    </xsl:otherwise>
+                </xsl:choose>
+        </tr></table>
+    </div>
+
+<table border="0" cellpadding="4">
+<xsl:if test="server_name">
+<tr><td>Stream Title:</td><td class="streamdata"> <xsl:value-of select="server_name" /></td></tr>
+</xsl:if>
+<xsl:if test="server_description">
+<tr><td>Stream Description:</td><td class="streamdata"> <xsl:value-of select="server_description" /></td></tr>
+</xsl:if>
+<xsl:if test="server_type">
+<tr><td>Content Type:</td><td class="streamdata"><xsl:value-of select="server_type" /></td></tr>
+</xsl:if>
+<xsl:if test="stream_start">
+<tr><td>Mount started:</td><td class="streamdata"><xsl:value-of select="stream_start" /></td></tr>
+</xsl:if>
+<xsl:if test="bitrate">
+<tr><td>Bitrate:</td><td class="streamdata"> <xsl:value-of select="bitrate" /></td></tr>
+</xsl:if>
+<xsl:if test="quality">
+<tr><td>Quality:</td><td class="streamdata"> <xsl:value-of select="quality" /></td></tr>
+</xsl:if>
+<xsl:if test="video_quality">
+<tr><td>Video Quality:</td><td class="streamdata"> <xsl:value-of select="video_quality" /></td></tr>
+</xsl:if>
+<xsl:if test="frame_size">
+<tr><td>Framesize:</td><td class="streamdata"> <xsl:value-of select="frame_size" /></td></tr>
+</xsl:if>
+<xsl:if test="frame_rate">
+<tr><td>Framerate:</td><td class="streamdata"> <xsl:value-of select="frame_rate" /></td></tr>
+</xsl:if>
+<xsl:if test="listeners">
+<tr><td>Current Listeners:</td><td class="streamdata"> <xsl:value-of select="listeners" /></td></tr>
+</xsl:if>
+<xsl:if test="listener_peak">
+<tr><td>Peak Listeners:</td><td class="streamdata"> <xsl:value-of select="listener_peak" /></td></tr>
+</xsl:if>
+<xsl:if test="genre">
+<tr><td>Stream Genre:</td><td class="streamdata"> <xsl:value-of select="genre" /></td></tr>
+</xsl:if>
+<xsl:if test="server_url">
+<tr><td>Stream URL:</td><td class="streamdata"> <a target="_blank" href="{server_url}"><xsl:value-of select="server_url" /></a></td></tr>
+</xsl:if>
+<tr><td>Current Song:</td><td class="streamdata"> 
+<xsl:if test="artist"><xsl:value-of select="artist" /> - </xsl:if><xsl:value-of select="title" /></td></tr>
+</table>
+</div>
+<div class="roundbottom">
+<img src="/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+</xsl:when>
+<xsl:otherwise>
+<h3><xsl:value-of select="@mount" /> - Not Connected</h3>
+</xsl:otherwise>
+</xsl:choose>
+
+</xsl:for-each>
+<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
+
+
+<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/icecast/etc/icecast2/web/status2.xsl b/icecast/etc/icecast2/web/status2.xsl
index 3f44d3b..689dbef 100644
--- a/icecast/etc/icecast2/web/status2.xsl
+++ b/icecast/etc/icecast2/web/status2.xsl
@@ -1,12 +1,12 @@
-<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
-<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
-<xsl:template match = "/icestats" >
-<pre>
-MountPoint,Connections,Stream Name,Current Listeners,Description,Currently Playing,Stream URL 
-Global,Client:<xsl:value-of select="connections" /> Source: <xsl:value-of select="source_connections" />,,<xsl:value-of select="listeners" />,,
-<xsl:for-each select="source">
-<xsl:value-of select="@mount" />,,<xsl:value-of select="name" />,<xsl:value-of select="listeners" />,<xsl:value-of select="description" />,<xsl:value-of select="artist" /> - <xsl:value-of select="title" />,<xsl:value-of select="url" />
-</xsl:for-each>
-</pre>
-</xsl:template>
-</xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
+<xsl:template match = "/icestats" >
+<pre>
+MountPoint,Connections,Stream Name,Current Listeners,Description,Currently Playing,Stream URL 
+Global,Client:<xsl:value-of select="connections" /> Source: <xsl:value-of select="source_connections" />,,<xsl:value-of select="listeners" />,,
+<xsl:for-each select="source">
+<xsl:value-of select="@mount" />,,<xsl:value-of select="name" />,<xsl:value-of select="listeners" />,<xsl:value-of select="description" />,<xsl:value-of select="artist" /> - <xsl:value-of select="title" />,<xsl:value-of select="url" />
+</xsl:for-each>
+</pre>
+</xsl:template>
+</xsl:stylesheet>
diff --git a/icecast/start.sh b/icecast/start.sh
old mode 100644
new mode 100755
diff --git a/postgres/scaffold_db.sh b/postgres/scaffold_db.sh
old mode 100644
new mode 100755
diff --git a/rebuild.sh b/rebuild.sh
old mode 100644
new mode 100755

Location
Admin
Host
Version
Download	icecast.org
Subversion	click here
Documentation	click here
Stream Directory	dir.xiph.org
Community	forum.icecast.org
Stream Title:
Stream Description:
Content Type:
Mount started:
Bitrate:
Quality:
Video Quality:
Framesize:
Framerate:
Current Listeners:
Peak Listeners:
Stream Genre:
Stream URL:
Current Song:	- -