diff --git a/ajaxui/ajaxui.c b/ajaxui/ajaxui.c
deleted file mode 100644
index 5340b82e..00000000
--- a/ajaxui/ajaxui.c
+++ /dev/null
@@ -1,686 +0,0 @@
-/*
- *  tvheadend, AJAX / HTML user interface
- *  Copyright (C) 2008 Andreas Öman
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "tvhead.h"
-#include "http.h"
-#include "ajaxui.h"
-#include "ajaxui_mailbox.h"
-#include "dispatch.h"
-
-#include "obj/ajaxui.cssh"
-
-#include "obj/prototype.jsh"
-#include "obj/builder.jsh"
-#include "obj/controls.jsh"
-#include "obj/dragdrop.jsh"
-#include "obj/effects.jsh"
-#include "obj/scriptaculous.jsh"
-#include "obj/slider.jsh"
-
-#include "obj/tvheadend.jsh"
-
-#include "obj/sbbody_l.gifh"
-#include "obj/sbbody_r.gifh"
-#include "obj/sbhead_l.gifh"
-#include "obj/sbhead_r.gifh"
-
-#include "obj/mapped.pngh"
-#include "obj/unmapped.pngh"
-
-
-extern const char *htsversion;
-
-const char *ajax_tabnames[] = {
-  [AJAX_TAB_CHANNELS]      = "Channels",
-  [AJAX_TAB_RECORDER]      = "Recorder",
-  [AJAX_TAB_CONFIGURATION] = "Configuration",
-  [AJAX_TAB_ABOUT]         = "About",
-};
-
-
-const char *
-ajaxui_escape_apostrophe(const char *content)
-{
-  static char buf[2000];
-  int i = 0;
-
-  while(i < sizeof(buf) - 2 && *content) {
-    if(*content == '\'')
-      buf[i++] = '\\';
-    buf[i++] = *content++;
-  }
-  buf[i] = 0;
-  return buf;
-}
-
-
-/**
- *
- */
-void
-ajax_generate_select_functions(htsbuf_queue_t *hq, const char *fprefix,
-			       char **selvector)
-{
-  int n;
-
-  htsbuf_qprintf(hq, "<script type=\"text/javascript\">\r\n"
-	      "//<![CDATA[\r\n");
-  
-  /* Select all */
-  htsbuf_qprintf(hq, "%s_sel_all = function() {\r\n", fprefix);
-  for(n = 0; selvector[n] != NULL; n++)
-    htsbuf_qprintf(hq, "$('sel_%s').checked = true;\r\n", selvector[n]);
-  htsbuf_qprintf(hq, "}\r\n");
-
-  /* Select none */
-  htsbuf_qprintf(hq, "%s_sel_none = function() {\r\n", fprefix);
-  for(n = 0; selvector[n] != NULL; n++)
-    htsbuf_qprintf(hq, "$('sel_%s').checked = false;\r\n", selvector[n]);
-  htsbuf_qprintf(hq, "}\r\n");
-
-  /* Invert selection */
-  htsbuf_qprintf(hq, "%s_sel_invert = function() {\r\n", fprefix);
-  for(n = 0; selvector[n] != NULL; n++)
-    htsbuf_qprintf(hq, "$('sel_%s').checked = !$('sel_%s').checked;\r\n",
-		selvector[n], selvector[n]);
-  htsbuf_qprintf(hq, "}\r\n");
-
-  /* Invoke AJAX call containing all selected elements */
-  htsbuf_qprintf(hq, 
-	      "%s_sel_do = function(op, arg1, arg2, check) {\r\n"
-	      "if(check == true && !confirm(\"Are you sure?\")) {return;}\r\n"
-	      "var h = new Hash();\r\n"
-	      "h.set('arg1', arg1);\r\n"
-	      "h.set('arg2', arg2);\r\n", fprefix
-	      );
-  
-  for(n = 0; selvector[n] != NULL; n++)
-    htsbuf_qprintf(hq, 
-		"if($('sel_%s').checked) {h.set('%s', 'selected') }\r\n",
-		selvector[n], selvector[n]);
-  htsbuf_qprintf(hq, " new Ajax.Request('/ajax/' + op, "
-	      "{parameters: h});\r\n");
-  htsbuf_qprintf(hq, "}\r\n");
-  htsbuf_qprintf(hq, 
-	      "\r\n//]]>\r\n"
-	      "</script>\r\n");
-}
-
-
-/**
- * AJAX table
- */
-void
-ajax_table_top(ajax_table_t *t, http_connection_t *hc, htsbuf_queue_t *hq,
-	       const char *names[], int weights[])
-{
-  int n = 0, i, tw = 0;
-  while(names[n]) {
-    tw += weights[n];
-    n++;
-  }
-  assert(n <= 20);
-
-  t->columns = n;
-
-  memset(t, 0, sizeof(ajax_table_t));
-
-  t->hq = hq;
-
-  for(i = 0; i < n; i++)
-    t->csize[i] = 100 * weights[i] / tw;
-
-  htsbuf_qprintf(hq, "<div style=\"padding-right: 20px\">");
-
-  htsbuf_qprintf(hq, "<div style=\"overflow: auto; width: 100%%\">");
-  
-  for(i = 0; i < n; i++)
-    htsbuf_qprintf(hq, "<div style=\"float: left; width: %d%%\">%s</div>",
-		t->csize[i], *names[i] ? names[i]: "&nbsp;");
-  htsbuf_qprintf(hq, "</div></div><hr><div class=\"normaltable\">\r\n");
-}
-
-/**
- * AJAX table new row
- */
-void
-ajax_table_row_start(ajax_table_t *t, const char *id)
-{
-  t->rowid = id;
-  t->rowcol = !t->rowcol;
-  htsbuf_qprintf(t->hq, "%s<div style=\"%soverflow: auto; width: 100%\">",
-	      t->inrow ? "</div>\r\n" : "",
-	      t->rowcol ? "background: #fff; " : "");
-  t->inrow = 1;
-  t->curcol = 0;
-}
-
-/**
- * AJAX table new row
- */
-void
-ajax_table_subrow_start(ajax_table_t *t)
-{
-  htsbuf_qprintf(t->hq, "<div style=\"overflow: auto; width: 100%\">");
-  t->curcol = 0;
-}
-
-
-/**
- * AJAX table new row
- */
-void
-ajax_table_subrow_end(ajax_table_t *t)
-{
-  htsbuf_qprintf(t->hq, "</div>");
-  t->curcol = 0;
-}
-
-
-/**
- * AJAX table new row
- */
-void
-ajax_table_details_start(ajax_table_t *t)
-{
-  assert(t->inrow == 1);
-  t->inrow = 0;
-  /* Extra info */
-  htsbuf_qprintf(t->hq, "</div><div id=\"details_%s\" style=\"%sdisplay: none\">",
-	      t->rowid, t->rowcol ? "background: #fff; " : "");
-}
-
-/**
- * AJAX table new row
- */
-void
-ajax_table_details_end(ajax_table_t *t)
-{
-  /* Extra info */
-  htsbuf_qprintf(t->hq, "</div>");
-}
-
-
-/**
- * AJAX table cell
- */
-void
-ajax_table_cell(ajax_table_t *t, const char *id, const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-
-  if(t->rowid && id) {
-    htsbuf_qprintf(t->hq, "<div id=\"%s_%s\"", id, t->rowid);
-  } else {
-    htsbuf_qprintf(t->hq, "<div");
-  }
-  htsbuf_qprintf(t->hq,
-	      " style=\"float: left; width: %d%%\">", t->csize[t->curcol]);
-  t->curcol++;
-  if(t->curcol == 20)
-    abort();
-
-  if(fmt == NULL)
-    htsbuf_qprintf(t->hq, "&nbsp;");
-  else
-    htsbuf_vqprintf(t->hq, fmt, ap);
-
-  va_end(ap);
-  htsbuf_qprintf(t->hq, "</div>");
-}
-
-/**
- * AJAX table cell for toggling display of more details
- */
-void
-ajax_table_cell_detail_toggler(ajax_table_t *t)
-{
-  ajax_table_cell(t, NULL,
-		  "<a id=\"toggle_details_%s\" href=\"javascript:void(0)\" "
-		  "onClick=\"showhide('details_%s')\" >"
-		  "More</a>",
-		  t->rowid, t->rowid);
-}
-
-/**
- * AJAX table cell for selecting row
- */
-void
-ajax_table_cell_checkbox(ajax_table_t *t)
-{
-  ajax_table_cell(t, NULL,
-		  "<input id=\"sel_%s\" type=\"checkbox\" class=\"nicebox\">",
-		  t->rowid);
-}
-
-/**
- * AJAX table footer
- */
-void
-ajax_table_bottom(ajax_table_t *t)
-{
-  htsbuf_qprintf(t->hq, "%s</div>", t->inrow ? "</div>" : "");
-}
-
-/**
- * AJAX box start
- */
-void
-ajax_box_begin(htsbuf_queue_t *hq, ajax_box_t type,
-	       const char *id, const char *style, const char *title)
-{
-  char id0[100], style0[100];
-  
-  if(id != NULL)
-    snprintf(id0, sizeof(id0), "id=\"%s\" ", id);
-  else
-    id0[0] = 0;
-
-  if(style != NULL)
-    snprintf(style0, sizeof(style0), "style=\"%s\" ", style);
-  else
-    style0[0] = 0;
-
-
-  switch(type) {
-  case AJAX_BOX_SIDEBOX:
-    htsbuf_qprintf(hq,
-		"<div class=\"sidebox\">"
-		"<div class=\"boxhead\"><h2>%s</h2></div>\r\n"
-		"  <div class=\"boxbody\" %s%s>",
-		title, id0, style0);
-    break;
-
-  case AJAX_BOX_FILLED:
-    htsbuf_qprintf(hq, 
-		"<div style=\"margin: 3px\">"
-		"<b class=\"filledbox\">"
-		"<b class=\"filledbox1\"><b></b></b>"
-		"<b class=\"filledbox2\"><b></b></b>"
-		"<b class=\"filledbox3\"></b>"
-		"<b class=\"filledbox4\"></b>"
-		"<b class=\"filledbox5\"></b></b>"
-		"<div class=\"filledboxfg\" %s%s>\r\n",
-		id0, style0);
-    break;
-
-  case AJAX_BOX_BORDER:
-   htsbuf_qprintf(hq, 
-		"<div style=\"margin: 3px\">"
-		"<b class=\"borderbox\">"
-		"<b class=\"borderbox1\"><b></b></b>"
-		"<b class=\"borderbox2\"><b></b></b>"
-		"<b class=\"borderbox3\"></b></b>"
-		"<div class=\"borderboxfg\" %s%s>\r\n",
-		id0, style0);
-
-    break;
-  }
-}
-
-/**
- * AJAX box end
- */
-void
-ajax_box_end(htsbuf_queue_t *hq, ajax_box_t type)
-{
-  switch(type) {
-  case AJAX_BOX_SIDEBOX:
-    htsbuf_qprintf(hq,"</div></div>");
-    break;
-    
-  case AJAX_BOX_FILLED:
-    htsbuf_qprintf(hq,
-		"</div>"
-		"<b class=\"filledbox\">"
-		"<b class=\"filledbox5\"></b>"
-		"<b class=\"filledbox4\"></b>"
-		"<b class=\"filledbox3\"></b>"
-		"<b class=\"filledbox2\"><b></b></b>"
-		"<b class=\"filledbox1\"><b></b></b></b>"
-		"</div>\r\n");
-    break;
-
- case AJAX_BOX_BORDER:
-    htsbuf_qprintf(hq,
-		"</div>"
-		"<b class=\"borderbox\">"
-		"<b class=\"borderbox3\"></b>"
-		"<b class=\"borderbox2\"><b></b></b>"
-		"<b class=\"borderbox1\"><b></b></b></b>"
-		"</div>\r\n");
-    break;
- 
-  }
-}
-
-/**
- *
- */
-void
-ajax_js(htsbuf_queue_t *hq, const char *fmt, ...)
-{
-  va_list ap;
-
-  htsbuf_qprintf(hq, 
-	      "<script type=\"text/javascript\">\r\n"
-	      "//<![CDATA[\r\n");
-
-  va_start(ap, fmt);
-  htsbuf_vqprintf(hq, fmt, ap);
-  va_end(ap);
-
-  htsbuf_qprintf(hq, 
-	      "\r\n//]]>\r\n"
-	      "</script>\r\n");
-}
-
-
-
-/**
- * Based on the given char[] array, generate a menu bar
- */
-void
-ajax_menu_bar_from_array(htsbuf_queue_t *hq, const char *name, 
-			 const char **vec, int num, int cur)
-{
-  int i;
- 
-  htsbuf_qprintf(hq, "<ul class=\"menubar\">");
-
-  for(i = 0; i < num; i++) {
-    htsbuf_qprintf(hq,
-		"<li%s>"
-		"<a href=\"javascript:switchtab('%s', '%d')\">%s</a>"
-		"</li>",
-		cur == i ? " style=\"font-weight:bold;\"" : "", name,
-		i, vec[i]);
-  }
-  htsbuf_qprintf(hq, "</ul>");
-}
-
-
-/**
- *
- */
-void
-ajax_a_jsfuncf(htsbuf_queue_t *hq, const char *innerhtml, const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-
-  htsbuf_qprintf(hq, "<a href=\"javascript:void(0)\" onClick=\"javascript:");
-  htsbuf_vqprintf(hq, fmt, ap);
-  htsbuf_qprintf(hq, "\">%s</a>", innerhtml);
-}
-
-/**
- *
- */
-void
-ajax_button(htsbuf_queue_t *hq, const char *caption, const char *code, ...)
-{
-  va_list ap;
-  va_start(ap, code);
-
-  htsbuf_qprintf(hq, "<input type=\"button\" value=\"%s\" onClick=\"",
-	      caption);
-  htsbuf_vqprintf(hq, code, ap);
-  htsbuf_qprintf(hq, "\">");
-}
-
-
-
-/*
- * Titlebar AJAX page
- */
-static int
-ajax_page_titlebar(http_connection_t *hc, http_reply_t *hr, 
-		   const char *remain, void *opaque)
-{
-  if(remain == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  ajax_menu_bar_from_array(&hr->hr_q, "top", 
-			   ajax_tabnames, AJAX_TABS, atoi(remain));
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-
-/**
- * About
- */
-static int
-ajax_about_tab(http_connection_t *hc, http_reply_t *hr)
-{
-  htsbuf_queue_t *hq = &hr->hr_q;
-  
-  htsbuf_qprintf(hq, "<center>");
-  htsbuf_qprintf(hq, "<div style=\"padding: auto; width: 400px\">");
-
-  ajax_box_begin(hq, AJAX_BOX_SIDEBOX, NULL, NULL, "About");
-
-  htsbuf_qprintf(hq, "<div style=\"text-align: center\">");
-
-  htsbuf_qprintf(hq, 
-	      "<p>HTS / Tvheadend</p>"
-	      "<p>(c) 2006-2008 Andreas \303\226man</p>"
-	      "<p>Latest release and information is available at:</p>"
-	      "<p><a href=\"http://www.lonelycoder.com/hts/\">"
-	      "http://www.lonelycoder.com/hts/</a></p>"
-	      "<p>&nbsp;</p>"
-	      "<p>This webinterface is powered by</p>"
-	      "<p><a href=\"http://www.prototypejs.org/\">Prototype</a>"
-	      " and "
-	      "<a href=\"http://script.aculo.us/\">script.aculo.us</a>"
-	      "</p>"
-	      "<p>&nbsp;</p>"
-	      "<p>Media formats and codecs by</p>"
-	      "<p><a href=\"http://www.ffmpeg.org/\">FFmpeg</a></p>"
-	      );
-
-  htsbuf_qprintf(hq, "</div>");
-  ajax_box_end(hq, AJAX_BOX_SIDEBOX);
-  htsbuf_qprintf(hq, "</div>");
-  htsbuf_qprintf(hq, "</center>");
-
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-
-/*
- * Tab AJAX page
- *
- * Find the 'tab' id and continue with tab specific code
- */
-static int
-ajax_page_tab(http_connection_t *hc, http_reply_t *hr, 
-	      const char *remain, void *opaque)
-{
-  int tab;
-
-  if(remain == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  tab = atoi(remain);
-
-  switch(tab) {
-  case AJAX_TAB_CHANNELS:
-    return ajax_channelgroup_tab(hc, hr);
-
-  case AJAX_TAB_CONFIGURATION:
-    return ajax_config_tab(hc, hr);
-
-  case AJAX_TAB_ABOUT:
-    return ajax_about_tab(hc, hr);
-
-  default:
-    return HTTP_STATUS_NOT_FOUND;
-  }
-  return 0;
-}
-
-
-
-/*
- * Root page
- */
-static int
-ajax_page_root(http_connection_t *hc, http_reply_t *hr, 
-	       const char *remain, void *opaque)
-{
-  htsbuf_queue_t *hq = &hr->hr_q;
-
-  htsbuf_qprintf(hq, 
-	      "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\r\n"
-	      "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">"
-	      /*
-	      "<!DOCTYPE html "
-	      "PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\r\n"
-	      "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">"
-	      */
-	      "\r\n"
-	      "<html xmlns=\"http://www.w3.org/1999/xhtml\" "
-	      "xml:lang=\"en\" lang=\"en\">"
-	      "<head>"
-	      "<title>HTS/Tvheadend</title>"
-	      "<meta http-equiv=\"Content-Type\" "
-	      "content=\"text/html; charset=utf-8\">\r\n"
-	      "<link href=\"/ajax/ajaxui.css\" rel=\"stylesheet\" "
-	      "type=\"text/css\">\r\n"
-	      "<script src=\"/ajax/prototype.js\" type=\"text/javascript\">"
-	      "</script>\r\n"
-	      "<script src=\"/ajax/effects.js\" type=\"text/javascript\">"
-	      "</script>\r\n"
-	      "<script src=\"/ajax/dragdrop.js\" type=\"text/javascript\">"
-	      "</script>\r\n"
-	      "<script src=\"/ajax/controls.js\" type=\"text/javascript\">"
-	      "</script>\r\n"
-	      "<script src=\"/ajax/tvheadend.js\" type=\"text/javascript\">"
-	      "</script>\r\n"
-	      "</head>"
-	      "<body>");
-
-
-  htsbuf_qprintf(hq, "<div style=\"overflow: auto; width: 100%\">");
-
-  htsbuf_qprintf(hq, "<div style=\"float: left; width: 100%\">");
-
-  ajax_box_begin(hq, AJAX_BOX_FILLED, NULL, NULL, NULL);
-
-  htsbuf_qprintf(hq,
-	      "<div style=\"width: 100%%; overflow: hidden\">"
-	      "<div style=\"float: left; width: 30%%\">"
-	      "Tvheadend (%s)"
-	      "</div>"
-	      "<div style=\"float: left; width: 40%%\" id=\"topmenu\"></div>"
-	      "<div style=\"float: left; width: 30%%; text-align: right\">"
-	      "&nbsp;"
-	      "</div>"
-	      "</div>",
-	      htsversion);
-
-  ajax_mailbox_start(hq);
-
-  ajax_box_end(hq, AJAX_BOX_FILLED);
-
-  htsbuf_qprintf(hq, "<div id=\"topdeck\"></div>");
-  
-  ajax_js(hq, "switchtab('top', '0')");
-#if 0
-  htsbuf_qprintf(hq, "</div><div style=\"float: left; width: 20%\">");
-
-  ajax_box_begin(hq, AJAX_BOX_SIDEBOX, "statusbox", NULL, "System status");
-  ajax_box_end(hq, AJAX_BOX_SIDEBOX);
-#endif
-  htsbuf_qprintf(hq, "</div></div></body></html>");
-
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-/**
- * AJAX user interface
- */
-void
-ajaxui_start(void)
-{
-  http_path_add("/ajax/index.html",           NULL, ajax_page_root,
-		ACCESS_WEB_INTERFACE);
-
-  http_path_add("/ajax/topmenu",              NULL, ajax_page_titlebar,
-		ACCESS_WEB_INTERFACE);
-
-  http_path_add("/ajax/toptab",               NULL, ajax_page_tab,
-		ACCESS_WEB_INTERFACE);
-
-  /* Stylesheet */
-  http_resource_add("/ajax/ajaxui.css", embedded_ajaxui,
-		    sizeof(embedded_ajaxui), "text/css", "gzip");
-
-#define ADD_JS_RESOURCE(path, name) \
-  http_resource_add(path, name, sizeof(name), "text/javascript", "gzip")
-
-  /* Prototype */
-  ADD_JS_RESOURCE("/ajax/prototype.js",          embedded_prototype);
-
-  /* Scriptaculous */
-  ADD_JS_RESOURCE("/ajax/builder.js",            embedded_builder);
-  ADD_JS_RESOURCE("/ajax/controls.js",           embedded_controls);
-  ADD_JS_RESOURCE("/ajax/dragdrop.js",           embedded_dragdrop);
-  ADD_JS_RESOURCE("/ajax/effects.js",            embedded_effects);
-  ADD_JS_RESOURCE("/ajax/scriptaculous.js",      embedded_scriptaculous);
-  ADD_JS_RESOURCE("/ajax/slider.js",             embedded_slider);
-
-  /* Tvheadend */
-  ADD_JS_RESOURCE("/ajax/tvheadend.js",          embedded_tvheadend);
-
-  /* Embedded images */
-  http_resource_add("/sidebox/sbbody-l.gif", embedded_sbbody_l,
-		    sizeof(embedded_sbbody_l), "image/gif", NULL);
-  http_resource_add("/sidebox/sbbody-r.gif", embedded_sbbody_r,
-		    sizeof(embedded_sbbody_r), "image/gif", NULL);
-  http_resource_add("/sidebox/sbhead-l.gif", embedded_sbhead_l,
-		    sizeof(embedded_sbhead_l), "image/gif", NULL);
-  http_resource_add("/sidebox/sbhead-r.gif", embedded_sbhead_r,
-		    sizeof(embedded_sbhead_r), "image/gif", NULL);
-
-  http_resource_add("/gfx/unmapped.png", embedded_unmapped,
-		    sizeof(embedded_unmapped), "image/png", NULL);
-
-  http_resource_add("/gfx/mapped.png", embedded_mapped,
-		    sizeof(embedded_mapped), "image/png", NULL);
-
-  ajax_mailbox_init();
-  ajax_channels_init();
-  ajax_config_init();
-  ajax_config_transport_init();
-}
diff --git a/ajaxui/ajaxui.css b/ajaxui/ajaxui.css
deleted file mode 100644
index 84dd96b6..00000000
--- a/ajaxui/ajaxui.css
+++ /dev/null
@@ -1,329 +0,0 @@
-body {
-  font:       11px Lucida Grande, Verdana, Arial, Helvetica, sans serif;
-}
-select {
-  font:       11px Lucida Grande, Verdana, Arial, Helvetica, sans serif;
-}
-input {
-  font:       11px Lucida Grande, Verdana, Arial, Helvetica, sans serif;
-}
-
-
-a, a:hover, a:visited, a:active { 
-  color: #aa6600;
-}
-
-img { border: 0; }
-
-.draglist {
-   margin:0;
-   padding:0;
-   list-style-type: none;
- }
-.draglist li {
-   margin:0;
-   padding:0px;
-   cursor:move;
- }
- 
-
-
-.normallist {
-   margin:0;
-   margin-top:10px;
-   padding:0;
-   list-style-type: none;
- }
-.normallist li {
-   margin:0;
-   padding:0px;
- }
- 
-/**
- * Input classes
- */
-
-.nicebox {
-  margin: 1px;
-  padding: 0px;
-  border: 0px;
-  width: 11px;
-  height: 11px;
-}
-
-
-/**
- * Misc classes
- */
-
-.event3 {
- height: 42px
-
-}
-
-.compact {
- float: left;
- height: 100%;
- overflow: hidden;
-}
-
-.fullrow {
- overflow: auto;
- width: 100%;
- height: 14px;
-}
-
-.cell_100_center {
- margin-top: 2px;
- margin-bottom: 2px;
- width: 100%;
- text-align: center;
-}
-
-.cell_50 {
- margin-top: 2px;
- margin-bottom: 2px;
- float: left;
- width: 50%;
-}
-
-.cell_20 {
- margin-top: 2px;
- margin-bottom: 2px;
- float: left;
- width: 20%;
-}
-
-.normaltable {
-   height: 300px;
-   overflow: auto;
-   overflow-y: scroll;
-   overflow-x: hidden;
- }
-
-.iconbackdrop {
-	background: #fff;
-	height: 64px;
-	width:  64px;
-	float: left;
-	margin: 2px;
-	text-align: center;
-	margin-right: 4px;
-}
-
-.infoprefix {
-	float: left;
-	width: 50px;
-	text-align: right;
-}
-
-.infoprefixwide {
- 	padding-right: 5px;
-	float: left;
-	width: 100px;
-	text-align: right;
-}
-
-.infoprefixwidefat {
- 	padding-right: 5px;
-	float: left;
-	width: 100px;
-	text-align: right;
-	margin-top: 4px;
-}
-
-
-.infoprefixwidewidefat {
- 	padding-right: 5px;
-	float: left;
-	width: 130px;
-	text-align: right;
-	margin-top: 4px;
-}
-
-.pidheader {
-  float: left;
-  text-decoration: underline;
-}
-
-
-
-.chgroupaction {
-  text-align: right;
-}
-
-
-/**
- *  Box with round edges
- */
-.filledbox {
-  display:block;
-}
-
-.filledbox * {
-  display:block;
-  height:1px;
-  overflow:hidden;
-  font-size:.01em;
-  background:#dddddd;
-}
-
-.filledbox1 {
-  margin-left:3px;
-  margin-right:3px;
-  padding-left:1px;
-  padding-right:1px;
-  border-left:1px solid #f0f0f0;
-  border-right:1px solid #f0f0f0;
-  background:#e5e5e5;
-}
-
-.filledbox2 {
-  margin-left:1px;
-  margin-right:1px;
-  padding-right:1px;
-  padding-left:1px;
-  border-left:1px solid #fbfbfb;
-  border-right:1px solid #fbfbfb;
-  background:#e3e3e3;
-}
-
-.filledbox3 {
-  margin-left:1px;
-  margin-right:1px;
-  border-left:1px solid #e3e3e3;
-  border-right:1px solid #e3e3e3;
-}
-
-.filledbox4 {
-  border-left:1px solid #f0f0f0;
-  border-right:1px solid #f0f0f0;
-}
-
-.filledbox5 {
-  border-left:1px solid #e5e5e5;
-  border-right:1px solid #e5e5e5;
-}
-
-.filledboxfg {
-  padding-left:5px;
-  padding-right:5px;
-  background:#dddddd;
-}
-
-
-
-
-
-/**
- * Box with rounded edges
- */
-.borderbox {
-  display:block;
-}
-
-.borderbox * {
-  display:block;
-  height:1px;
-  overflow:hidden;
-  font-size:.01em;
-}
-
-.borderbox1 {
-  margin-left:4px;
-  margin-right:4px;
-  padding-left:1px;
-  padding-right:1px;
-  background: #000000;
-  border-left:1px  solid #000;
-  border-right:1px solid #000;
-}
-
-.borderbox2 {
-  margin-left:2px;
-  margin-right:2px;
-  padding-right:1px;
-  padding-left:1px;
-  border-left:2px  solid #000;
-  border-right:2px solid #000;
-}
-
-.borderbox3 {
-  margin-left:1px;
-  margin-right:1px;
-  border-left:1px  solid #000;
-  border-right:1px solid #000;
-}
-
-
-.borderboxfg {
-  border-left:1px solid  #000;
-  border-right:1px solid #000;
-  padding-left:5px;
-  padding-right:5px;
-}
-
-
-
-/**
- * Menubar
- */
-
-.menubar {
-  margin: 0px;
-  padding: 0px;
-  text-align: center;
-  height: 15px;
-}
-
-.menubar li {
- margin-left: 5px;
- margin-right: 5px;
- display: inline;
- list-style-type: none;
-}
-
-.menubar a {
- color: #000000;
- text-decoration: none;
-}
-
-
-
-
-
-/**
- * Sidebox
- *
- * from http://www.vertexwerks.com/tests/sidebox/
- */
-
-/* Show only to IE PC \*/
-* html .boxhead h2 {height: 1%;} /* For IE 5 PC */
-
-.sidebox {
-	margin: 0 auto; /* center for now */
-	background: url(/sidebox/sbbody-r.gif) no-repeat bottom right;
-	font-size: 100%;
-}
-.boxhead {
-	background: url(/sidebox/sbhead-r.gif) no-repeat top right;
-	margin: 0;
-	padding: 0;
-	text-align: center;
-}
-.boxhead h2 {
-	background: url(/sidebox/sbhead-l.gif) no-repeat top left;
-	margin: 0;
-	padding: 22px 30px 5px;
-	color: white; 
-	font-weight: bold; 
-	font-size: 1.4em; 
-	line-height: 1em;
-	text-shadow: rgba(0,0,0,.4) 0px 2px 5px; /* Safari-only, but cool */
-}
-.boxbody {
-	background: url(/sidebox/sbbody-l.gif) no-repeat bottom left;
-	margin: 0;
-	padding: 5px 30px 31px;
-}
diff --git a/ajaxui/ajaxui.h b/ajaxui/ajaxui.h
deleted file mode 100644
index 3f59d859..00000000
--- a/ajaxui/ajaxui.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *  tvheadend, AJAX user interface
- *  Copyright (C) 2007 Andreas Öman
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <htmlui://www.gnu.org/licenses/>.
- */
-
-#ifndef AJAXUI_H_
-#define AJAXUI_H_
-
-#include "access.h"
-
-#define AJAX_ACCESS_CONFIG (ACCESS_WEB_INTERFACE | ACCESS_ADMIN)
-#define AJAX_ACCESS_ACCESSCTRL \
- (ACCESS_WEB_INTERFACE | ACCESS_ADMIN | ACCESS_ADMIN_ACCESS)
-
-typedef enum {
-  AJAX_BOX_FILLED,
-  AJAX_BOX_SIDEBOX,
-  AJAX_BOX_BORDER,
-} ajax_box_t;
-
-
-void ajax_box_begin(htsbuf_queue_t *q, ajax_box_t type,
-		    const char *id, const char *style, const char *title);
-
-void ajax_box_end(htsbuf_queue_t *q, ajax_box_t type);
-
-
-
-typedef struct {
-  int columns;
-  int curcol;
-  
-  int inrow;
-  const char *rowid;
-
-  int csize[20];
-  htsbuf_queue_t *hq;
-  int rowcol;
-} ajax_table_t;
-
-void ajax_table_top(ajax_table_t *t, http_connection_t *hc, htsbuf_queue_t *q,
-		    const char *names[], int weights[]);
-void ajax_table_row_start(ajax_table_t *t, const char *id);
-void ajax_table_cell(ajax_table_t *t, const char *id, const char *fmt, ...);
-void ajax_table_bottom(ajax_table_t *t);
-void ajax_table_cell_detail_toggler(ajax_table_t *t);
-void ajax_table_cell_checkbox(ajax_table_t *t);
-void ajax_table_details_start(ajax_table_t *t);
-void ajax_table_details_end(ajax_table_t *t);
-void ajax_table_subrow_start(ajax_table_t *t);
-void ajax_table_subrow_end(ajax_table_t *t);
-
-
-
-
-void ajax_js(htsbuf_queue_t *q, const char *fmt, ...);
-
-
-TAILQ_HEAD(ajax_menu_entry_queue, ajax_menu_entry);
-
-#define AJAX_TAB_CHANNELS      0
-#define AJAX_TAB_RECORDER      1
-#define AJAX_TAB_CONFIGURATION 2
-#define AJAX_TAB_ABOUT         3
-#define AJAX_TABS              4
-
-
-void ajax_mailbox_init(void);
-void ajaxui_start(void);
-void ajax_channels_init(void);
-void ajax_config_init(void);
-
-void ajax_menu_bar_from_array(htsbuf_queue_t *q, const char *name, 
-			      const char **vec, int num, int cur);
-
-int ajax_channelgroup_tab(http_connection_t *hc, http_reply_t *hr);
-int ajax_config_tab(http_connection_t *hc, http_reply_t *hr);
-
-int ajax_config_channels_tab(http_connection_t *hc, http_reply_t *hr);
-void ajax_config_channels_init(void);
-
-int ajax_config_dvb_tab(http_connection_t *hc, http_reply_t *hr);
-void ajax_config_dvb_init(void);
-
-int ajax_config_xmltv_tab(http_connection_t *hc, http_reply_t *hr);
-void ajax_config_xmltv_init(void);
-
-int ajax_config_access_tab(http_connection_t *hc, http_reply_t *hr);
-void ajax_config_access_init(void);
-
-int ajax_config_cwc_tab(http_connection_t *hc, http_reply_t *hr);
-void ajax_config_cwc_init(void);
-
-void ajax_config_transport_init(void);
-
-int ajax_transport_build_list(http_connection_t *hc, htsbuf_queue_t *q,
-			      struct th_transport_tree *tlist,
-			      int ntransports);
-
-const char *ajaxui_escape_apostrophe(const char *content);
-void ajax_generate_select_functions(htsbuf_queue_t *q, const char *fprefix,
-				    char **selvector);
-
-void ajax_a_jsfuncf(htsbuf_queue_t *q, const char *innerhtml,
-		    const char *fmt, ...);
-
-void ajax_button(htsbuf_queue_t *q, 
-		 const char *caption, const char *code, ...);
-
-void ajax_transport_build_mapper_state(char *buf, size_t siz,
-				       th_transport_t *t, int mapped);
-
-
-#endif /* AJAXUI_H_ */
diff --git a/ajaxui/ajaxui_channels.c b/ajaxui/ajaxui_channels.c
deleted file mode 100644
index 4e1b9dcc..00000000
--- a/ajaxui/ajaxui_channels.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- *  tvheadend, AJAX / HTML user interface
- *  Copyright (C) 2008 Andreas Öman
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-#include "tvhead.h"
-#include "http.h"
-#include "ajaxui.h"
-#include "channels.h"
-#include "epg.h"
-
-static void
-ajax_channelgroupmenu_content(htsbuf_queue_t *tq, int current)
-{
-  channel_group_t *tcg;
-
-  htsbuf_qprintf(tq, "<ul class=\"menubar\">");
-
-  TAILQ_FOREACH(tcg, &all_channel_groups, tcg_global_link) {
-    if(tcg->tcg_hidden)
-      continue;
-
-    if(current < 1)
-      current = tcg->tcg_tag;
-
-    htsbuf_qprintf(tq,
-		"<li%s>"
-		"<a href=\"javascript:switchtab('channelgroup', '%d')\">%s</a>"
-		"</li>",
-		current == tcg->tcg_tag ? " style=\"font-weight:bold;\"" : "",
-		tcg->tcg_tag, tcg->tcg_name);
-  }
-  htsbuf_qprintf(tq, "</ul>");  
-}
-
-
-/*
- * Channelgroup menu bar
- */
-static int
-ajax_channelgroup_menu(http_connection_t *hc, http_reply_t *hr, 
-		       const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  
-  if(remain == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  ajax_channelgroupmenu_content(tq, atoi(remain));
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-static void
-ajax_output_event(htsbuf_queue_t *tq, event_t *e, int flags, int color)
-{
-  struct tm a, b;
-  time_t stop;
-
-  htsbuf_qprintf(tq, "<div class=\"fullrow\"%s>",
-	      color ? "style=\"background: #fff\" " : "");
-
-  localtime_r(&e->e_start, &a);
-  stop = e->e_start + e->e_duration;
-  localtime_r(&stop, &b);
-  
-  htsbuf_qprintf(tq, 
-	      "<div class=\"compact\" style=\"width: 35%%\">"
-	      "%02d:%02d-%02d:%02d"
-	      "</div>",
-	      a.tm_hour, a.tm_min, b.tm_hour, b.tm_min);
- 
-  htsbuf_qprintf(tq, 
-	      "<div class=\"compact\" style=\"width: 65%%\">"
-	      "%s"
-	      "</div>",
-	      e->e_title);
-    
-  htsbuf_qprintf(tq, "</div>");
-}
-
-
-static void
-ajax_list_events(htsbuf_queue_t *tq, channel_t *ch, int lines)
-{
-  event_t *e;
-  int i;
-
-  e = epg_event_find_current_or_upcoming(ch);
-
-  for(i = 0; i < 3 && e != NULL; i++) {
-    ajax_output_event(tq, e, 0, !(i & 1));
-    e = TAILQ_NEXT(e, e_channel_link);
-  }
-}
-
-
-/*
- * Display a list of all channels within the given group
- *
- * Group is given by 'tag' as an ASCII string in remain
- */
-static int
-ajax_channel_tab(http_connection_t *hc, http_reply_t *hr,
-		 const char *remain, void *opaque)
-{
-  
-  htsbuf_queue_t *tq = &hr->hr_q;
-  channel_t *ch;
-  channel_group_t *tcg;
-  char dispname[20];
-  struct sockaddr_in *si;
-  int nchs = 0;
-
-  if(remain == NULL || (tcg = channel_group_by_tag(atoi(remain))) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  TAILQ_FOREACH(ch, &tcg->tcg_channels, ch_group_link) {
-    if(LIST_FIRST(&ch->ch_transports) == NULL)
-      continue;
-
-    nchs++;
-
-    htsbuf_qprintf(tq, "<div style=\"float:left; width: 25%%\">");
-
-    snprintf(dispname, sizeof(dispname), "%s", ch->ch_name);
-    strcpy(dispname + sizeof(dispname) - 4, "...");
-
-    ajax_box_begin(tq, AJAX_BOX_SIDEBOX, NULL, NULL, dispname);
-
-    /* inner */
-
-    htsbuf_qprintf(tq, 
-		"<div style=\"width: 100%%; overflow: hidden; height:36px\">");
-
-    htsbuf_qprintf(tq, 
-		"<div style=\"float: left; height:32px; width:32px; "
-		"margin: 2px\">");
-
-    if(ch->ch_icon != NULL) {
-      htsbuf_qprintf(tq, "<img src=\"%s\" style=\"width:32px\">",
-		  ch->ch_icon);
-    }
-
-    htsbuf_qprintf(tq, "</div>");
-
-    htsbuf_qprintf(tq, "<div style=\"float:left; text-align: right\">");
-
-    si = (struct sockaddr_in *)&hc->hc_tcp_session.tcp_self_addr;
-
-    htsbuf_qprintf(tq,
-		"<a href=\"rtsp://%s:%d/%s\">Stream</a>",
-		inet_ntoa(si->sin_addr), ntohs(si->sin_port),
-		ch->ch_sname);
-
-    htsbuf_qprintf(tq, "</div>");
-    htsbuf_qprintf(tq, "</div>");
-
-
-    htsbuf_qprintf(tq, "<div id=\"events%d\" style=\"height:42px\">", ch->ch_tag);
-    ajax_list_events(tq, ch, 3);
-    htsbuf_qprintf(tq, "</div>");
-
-    ajax_box_end(tq, AJAX_BOX_SIDEBOX);
-    htsbuf_qprintf(tq, "</div>");
-  }
-
-  if(nchs == 0)
-    htsbuf_qprintf(tq, "<div style=\"text-align: center; font-weight: bold\">"
-		"No channels in this group</div>");
-
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-
-
-
-/*
- * Channel (group)s AJAX page
- *
- * This is the top level menu for this c-file
- */
-int
-ajax_channelgroup_tab(http_connection_t *hc, http_reply_t *hr)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-
-  ajax_box_begin(tq, AJAX_BOX_FILLED, "channelgroupmenu", NULL, NULL);
-  ajax_box_end(tq, AJAX_BOX_FILLED);
-
-  htsbuf_qprintf(tq, "<div id=\"channelgroupdeck\"></div>");
-
-  htsbuf_qprintf(tq,
-	      "<script type=\"text/javascript\">"
-	      "switchtab('channelgroup', '0')"
-	      "</script>");
-
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-
-/**
- *
- */
-void
-ajax_channels_init(void)
-{
-  http_path_add("/ajax/channelgroupmenu",    NULL, ajax_channelgroup_menu,
-		ACCESS_WEB_INTERFACE);
-  http_path_add("/ajax/channelgrouptab",     NULL, ajax_channel_tab,
-		ACCESS_WEB_INTERFACE);
-
-}
diff --git a/ajaxui/ajaxui_config.c b/ajaxui/ajaxui_config.c
deleted file mode 100644
index 9397bf72..00000000
--- a/ajaxui/ajaxui_config.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *  tvheadend, AJAX / HTML user interface
- *  Copyright (C) 2008 Andreas Öman
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "tvhead.h"
-#include "http.h"
-#include "ajaxui.h"
-#include "channels.h"
-
-
-#define AJAX_CONFIG_TAB_CHANNELS 0
-#define AJAX_CONFIG_TAB_DVB      1
-#define AJAX_CONFIG_TAB_XMLTV    2
-#define AJAX_CONFIG_TAB_CWC      3
-#define AJAX_CONFIG_TAB_ACCESS   4
-#define AJAX_CONFIG_TABS         5
-
-const char *ajax_config_tabnames[] = {
-  [AJAX_CONFIG_TAB_CHANNELS]      = "Channels & Groups",
-  [AJAX_CONFIG_TAB_DVB]           = "DVB adapters",
-  [AJAX_CONFIG_TAB_XMLTV]         = "XML-TV",
-  [AJAX_CONFIG_TAB_CWC]           = "Code-word Client",
-  [AJAX_CONFIG_TAB_ACCESS]        = "Access control",
-};
-
-
-/*
- * Titlebar AJAX page
- */
-static int
-ajax_config_menu(http_connection_t *hc, http_reply_t *hr, 
-		 const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  
-  if(remain == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  ajax_menu_bar_from_array(tq, "config", 
-			   ajax_config_tabnames, AJAX_CONFIG_TABS,
-			   atoi(remain));
-  http_output_html(hc, hr);
-  return 0;
-}
-
-/*
- * Tab AJAX page
- *
- * Switch to different tabs
- */
-static int
-ajax_config_dispatch(http_connection_t *hc, http_reply_t *hr,
-		     const char *remain, void *opaque)
-{
-  int tab;
-
-  if(remain == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  tab = atoi(remain);
-
-  switch(tab) {
-  case AJAX_CONFIG_TAB_CHANNELS:
-    return ajax_config_channels_tab(hc, hr);
-  case AJAX_CONFIG_TAB_DVB:
-    return ajax_config_dvb_tab(hc, hr);
-  case AJAX_CONFIG_TAB_XMLTV:
-    return ajax_config_xmltv_tab(hc, hr);
-  case AJAX_CONFIG_TAB_CWC:
-    return ajax_config_cwc_tab(hc, hr);
-  case AJAX_CONFIG_TAB_ACCESS:
-    return ajax_config_access_tab(hc, hr);
-
-  default:
-    return HTTP_STATUS_NOT_FOUND;
-  }
-  return 0;
-}
-
-
-
-
-/*
- * Config root menu AJAX page
- *
- * This is the top level menu for this c-file
- */
-int
-ajax_config_tab(http_connection_t *hc, http_reply_t *hr)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-
-  ajax_box_begin(tq, AJAX_BOX_FILLED, "configmenu", NULL, NULL);
-  ajax_box_end(tq, AJAX_BOX_FILLED);
-
-  htsbuf_qprintf(tq, "<div id=\"configdeck\"></div>");
-
-  htsbuf_qprintf(tq,
-	      "<script type=\"text/javascript\">"
-	      "switchtab('config', '0')"
-	      "</script>");
-  
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-
-/**
- *
- */
-void
-ajax_config_init(void)
-{
-  http_path_add("/ajax/configmenu",          NULL, ajax_config_menu,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/configtab",           NULL, ajax_config_dispatch,
-		AJAX_ACCESS_CONFIG);
-
-  ajax_config_channels_init();
-  ajax_config_dvb_init();
-  ajax_config_xmltv_init();
-  ajax_config_access_init();
-  ajax_config_cwc_init();
-}
diff --git a/ajaxui/ajaxui_config_access.c b/ajaxui/ajaxui_config_access.c
deleted file mode 100644
index f908b159..00000000
--- a/ajaxui/ajaxui_config_access.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- *  tvheadend, AJAX / HTML user interface
- *  Copyright (C) 2008 Andreas Öman
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _GNU_SOURCE
-
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "tvhead.h"
-#include "http.h"
-#include "ajaxui.h"
-#include "channels.h"
-#include "psi.h"
-#include "transports.h"
-
-#include "ajaxui_mailbox.h"
-
-
-static struct strtab accesstypetab[] = {
-  { "stream",  ACCESS_STREAMING },
-  { "rec",     ACCESS_RECORDER_VIEW },
-  { "recedit", ACCESS_RECORDER_CHANGE },
-  { "admin",   ACCESS_ADMIN },
-  { "webui",   ACCESS_WEB_INTERFACE },
-  { "access",  ACCESS_ADMIN_ACCESS },
-};
-
-
-/**
- * Access configuration
- */
-int
-ajax_config_access_tab(http_connection_t *hc, http_reply_t *hr)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-
-  if(access_verify(hc->hc_username, hc->hc_password,
-		(struct sockaddr *)&hc->hc_tcp_session.tcp_peer_addr,
-		   AJAX_ACCESS_ACCESSCTRL))
-    return HTTP_STATUS_UNAUTHORIZED;
-
-  htsbuf_qprintf(tq, "<div style=\"overflow: auto; width: 100%\">");
-
-  ajax_box_begin(tq, AJAX_BOX_SIDEBOX, NULL, NULL, "Access control");
-
-  htsbuf_qprintf(tq, "<div id=\"alist\"></div>");
-  
-  ajax_js(tq,  
-	  "new Ajax.Updater('alist', '/ajax/accesslist', "
-	  "{method: 'get', evalScripts: true});");
-
-  htsbuf_qprintf(tq, "<hr><div style=\"overflow: auto; width: 100%\">");
-
-  htsbuf_qprintf(tq,
-	      "<div style=\"height: 20px;\">"
-	      "<div style=\"float: left; margin-right: 4px\">"
-	      "<input type=\"text\" id=\"newuser\">"
-	      "<input type=\"button\" value=\"Add\" "
-	      "onClick=\"new Ajax.Request('/ajax/accessadd', "
-	      "{parameters: {name: $F('newuser')}, method: 'post'})\">"
-	      "</div>"
-	      "</div>");
-
-  htsbuf_qprintf(tq, "</div>\r\n");
-  
-  ajax_box_end(tq, AJAX_BOX_SIDEBOX);
-  
-  htsbuf_qprintf(tq, "</div>");
-  http_output_html(hc, hr);
-  return 0;
-}
-
-static void
-ajax_access_checkbox(ajax_table_t *ta, access_entry_t *ae, int mask,
-		     const char *n)
-{
-  ajax_table_cell(ta, NULL,
-		  "<input %stype=\"checkbox\" class=\"nicebox\" "
-		  "onChange=\"new Ajax.Request('/ajax/accesschange/%d', "
-		  "{parameters: {entry: '%s', checked: this.checked}})\">",
-		  ae->ae_rights & mask ? "checked " : "",
-		  ae->ae_tally, n);
-}
-
-
-/**
- *
- */
-static int
-ajax_accesslist(http_connection_t *hc, http_reply_t *hr, 
-		const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  access_entry_t *ae;
-  ajax_table_t ta;
-  char id[100];
-
-  ajax_table_top(&ta, hc, tq,
-		 (const char *[]){"User or Prefix", 
-				    "Password",
-				    "Streaming",
-				    "Recorder",
-				    "Recorder edit",
-				    "Admin",
-				    "Web UI",
-				    "Accessedit",
-				    "",
-				    NULL}, 
-		 (int[]){2, 2, 1, 1, 1, 1, 1, 1, 1, 1});
-
-  TAILQ_FOREACH(ae, &access_entries, ae_link) {
-    snprintf(id, sizeof(id), "%d", ae->ae_tally);
-    ajax_table_row_start(&ta, id);
-
-    ajax_table_cell(&ta, NULL, "%s", ae->ae_title);
-    if(access_is_prefix(ae)) {
-      ajax_table_cell(&ta, NULL, "%s", "n/a");
-    } else {
-      ajax_table_cell(&ta, "password",
-		      "<a href=\"javascript:void(0)\" "
-		      "onClick=\"makedivinput('password_%d', "
-		      "'/ajax/accesssetpw/%d')\">"
-		      "%s</a>",
-		      ae->ae_tally, ae->ae_tally,
-		      ae->ae_password != NULL ? "Change..." : "Set...");
-    }
-
-    ajax_access_checkbox(&ta, ae, ACCESS_STREAMING, "stream");
-    ajax_access_checkbox(&ta, ae, ACCESS_RECORDER_VIEW, "rec");
-    ajax_access_checkbox(&ta, ae, ACCESS_RECORDER_CHANGE, "recedit");
-
-    ajax_access_checkbox(&ta, ae, ACCESS_ADMIN, "admin");
-    ajax_access_checkbox(&ta, ae, ACCESS_WEB_INTERFACE, "webui");
-    ajax_access_checkbox(&ta, ae, ACCESS_ADMIN_ACCESS, "access");
-    
-
-    ajax_table_cell(&ta, NULL,
-		    "<a href=\"javascript:void(0)\" "
-		    "onClick=\"dellistentry('/ajax/accessdel', '%d', '%s')\">"
-		    "Delete...</a>",
-		    ae->ae_tally, ae->ae_title);
-  }
-
-  ajax_table_bottom(&ta);
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-/**
- *
- */
-static int
-ajax_accessadd(http_connection_t *hc, http_reply_t *hr, 
-	       const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  access_entry_t *ae;
-  const char *t;
-
-  if((t = http_arg_get(&hc->hc_req_args, "name")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  htsbuf_qprintf(tq, "$('newuser').clear();\r\n");
-
-  if(t == NULL || strlen(t) < 1 || strchr(t, '\'') || strchr(t, '"')) {
-    htsbuf_qprintf(tq, "alert('Invalid username');\r\n");
-  } else {
-    ae = access_add(t);
-    if(ae == NULL) {
-      htsbuf_qprintf(tq, "alert('Invalid prefix');\r\n");
-    } else {
-      htsbuf_qprintf(tq, 
-		  "new Ajax.Updater('alist', '/ajax/accesslist', "
-		"{method: 'get', evalScripts: true});\r\n");
-    }
-  }
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-
-  return 0;
-}
-
-/**
- *
- */
-static int
-ajax_accesschange(http_connection_t *hc, http_reply_t *hr, 
-		  const char *remain, void *opaque)
-{
-  //  htsbuf_queue_t *tq = &hr->hr_tq;
-  access_entry_t *ae;
-  const char *e, *c;
-  int bit;
-
-  if(remain == NULL || (ae = access_by_id(atoi(remain))) == NULL) 
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if((e = http_arg_get(&hc->hc_req_args, "entry")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if((bit = str2val(e, accesstypetab)) < 0)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if((c = http_arg_get(&hc->hc_req_args, "checked")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if(!strcasecmp(c, "false")) {
-    ae->ae_rights &= ~bit;
-  } else if(!strcasecmp(c, "true")) {
-    ae->ae_rights |= bit;
-  } else {
-    return HTTP_STATUS_BAD_REQUEST;
-  }
-
-  access_save();
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  return 0;
-}
-
-
-/**
- *
- */
-static int
-ajax_accessdel(http_connection_t *hc, http_reply_t *hr, 
-		  const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  access_entry_t *ae;
-  const char *e;
-
-  if((e = http_arg_get(&hc->hc_req_args, "id")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if((ae = access_by_id(atoi(e))) == NULL) 
-    return HTTP_STATUS_BAD_REQUEST;
-
-  access_delete(ae);
-
-  htsbuf_qprintf(tq, 
-	      "new Ajax.Updater('alist', '/ajax/accesslist', "
-	      "{method: 'get', evalScripts: true});\r\n");
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  return 0;
-}
-
-
-
-/**
- *
- */
-static int
-ajax_accesssetpw(http_connection_t *hc, http_reply_t *hr, 
-		  const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  access_entry_t *ae;
-  const char *e;
-
-  if(remain == NULL || (ae = access_by_id(atoi(remain))) == NULL) 
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if((e = http_arg_get(&hc->hc_req_args, "value")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  free(ae->ae_password);
-  ae->ae_password = strdup(e);
-
-  access_save();
-  
-  htsbuf_qprintf(tq, 
-	      "$('password_%d').innerHTML= '"
-	      "<a href=\"javascript:void(0)\" "
-	      "onClick=\"makedivinput(\\'password_%d\\', "
-	      "\\'/ajax/accesssetpw/%d\\')\">"
-	      "%s</a>';",
-	      ae->ae_tally, ae->ae_tally, ae->ae_tally, "Change...");
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  return 0;
-}
-
-
-/**
- *
- */
-void
-ajax_config_access_init(void)
-{
-  http_path_add("/ajax/accesslist" ,      NULL, ajax_accesslist,
-		AJAX_ACCESS_ACCESSCTRL);
-  http_path_add("/ajax/accessadd" ,       NULL, ajax_accessadd,
-		AJAX_ACCESS_ACCESSCTRL);
-  http_path_add("/ajax/accesschange" ,    NULL, ajax_accesschange,
-		AJAX_ACCESS_ACCESSCTRL);
-  http_path_add("/ajax/accessdel" ,       NULL, ajax_accessdel,
-		AJAX_ACCESS_ACCESSCTRL);
-  http_path_add("/ajax/accesssetpw" ,     NULL, ajax_accesssetpw,
-		AJAX_ACCESS_ACCESSCTRL);
-}
diff --git a/ajaxui/ajaxui_config_channels.c b/ajaxui/ajaxui_config_channels.c
deleted file mode 100644
index 309c63b2..00000000
--- a/ajaxui/ajaxui_config_channels.c
+++ /dev/null
@@ -1,755 +0,0 @@
-/*
- *  tvheadend, AJAX / HTML user interface
- *  Copyright (C) 2008 Andreas Öman
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "tvhead.h"
-#include "http.h"
-#include "ajaxui.h"
-#include "channels.h"
-
-
-
-/**
- * Render a channel group widget
- */
-static void
-ajax_chgroup_build(htsbuf_queue_t *tq, channel_group_t *tcg)
-{
-  htsbuf_qprintf(tq, "<li id=\"chgrp_%d\">", tcg->tcg_tag);
-  
-  ajax_box_begin(tq, AJAX_BOX_BORDER, NULL, NULL, NULL);
-  
-  htsbuf_qprintf(tq, "<div style=\"overflow: auto; width: 100%\">");
-  
-  htsbuf_qprintf(tq,
-	      "<div style=\"float: left; width: 60%\">"
-	      "<a href=\"javascript:void(0)\" "
-	      "onClick=\"$('cheditortab').innerHTML=''; "
-	      "new Ajax.Updater('groupeditortab', "
-	      "'/ajax/chgroup_editor/%d', "
-	      "{method: 'get', evalScripts: true})\" >"
-	      "%s</a></div>",
-	      tcg->tcg_tag, tcg->tcg_name);
-
-
-  if(tcg != defgroup) {
-    htsbuf_qprintf(tq,
-		"<div style=\"float: left; width: 40%\" "
-		"class=\"chgroupaction\">"
-		"<a href=\"javascript:void(0)\" "
-		"onClick=\"dellistentry('/ajax/chgroup_del','%d', '%s');\""
-		">Delete</a></div>",
-		tcg->tcg_tag, tcg->tcg_name);
-  }
-  
-
-  htsbuf_qprintf(tq, "</div>");
-  ajax_box_end(tq, AJAX_BOX_BORDER);
-  htsbuf_qprintf(tq, "</li>");
-}
-
-/**
- * Update order of channel groups
- */
-static int
-ajax_chgroup_updateorder(http_connection_t *hc, http_reply_t *hr, 
-			 const char *remain, void *opaque)
-{
-  channel_group_t *tcg;
-  htsbuf_queue_t *tq = &hr->hr_q;
-  http_arg_t *ra;
-
-  TAILQ_FOREACH(ra, &hc->hc_req_args, link) {
-    if(strcmp(ra->key, "channelgrouplist[]") ||
-       (tcg = channel_group_by_tag(atoi(ra->val))) == NULL)
-      continue;
-    
-    TAILQ_REMOVE(&all_channel_groups, tcg, tcg_global_link);
-    TAILQ_INSERT_TAIL(&all_channel_groups, tcg, tcg_global_link);
-  }
-
-  channel_group_settings_write();
-
-  htsbuf_qprintf(tq, "<span id=\"updatedok\">Updated on server</span>");
-  ajax_js(tq, "Effect.Fade('updatedok')");
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-
-/**
- * Add a new channel group
- */
-static int
-ajax_chgroup_add(http_connection_t *hc, http_reply_t *hr, 
-		 const char *remain, void *opaque)
-{
-  channel_group_t *tcg;
-  htsbuf_queue_t *tq = &hr->hr_q;
-  const char *name;
-  
-  if((name = http_arg_get(&hc->hc_req_args, "name")) != NULL) {
-
-    TAILQ_FOREACH(tcg, &all_channel_groups, tcg_global_link)
-      if(!strcmp(name, tcg->tcg_name))
-	break;
-
-    if(tcg == NULL) {
-      tcg = channel_group_find(name, 1);
-
-      ajax_chgroup_build(tq, tcg);
-
-      /* We must recreate the Sortable object */
-
-      ajax_js(tq, "Sortable.destroy(\"channelgrouplist\")");
-
-      ajax_js(tq, "Sortable.create(\"channelgrouplist\", "
-	      "{onUpdate:function(){updatelistonserver("
-	      "'channelgrouplist', "
-	      "'/ajax/chgroup_updateorder', "
-	      "'list-info'"
-	      ")}});");
-    }
-  }
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-
-/**
- * Delete a channel group
- */
-static int
-ajax_chgroup_del(http_connection_t *hc, http_reply_t *hr, 
-		 const char *remain, void *opaque)
-{
-  channel_group_t *tcg;
-  htsbuf_queue_t *tq = &hr->hr_q;
-  const char *id;
-  
-  if((id = http_arg_get(&hc->hc_req_args, "id")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if((tcg = channel_group_by_tag(atoi(id))) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  htsbuf_qprintf(tq, "$('chgrp_%d').remove();", tcg->tcg_tag);
-  http_output(hc, hr, "text/javascript; charset=UTF-8", NULL, 0);
-
-  channel_group_destroy(tcg);
-  return 0;
-}
-
-
-
-/**
- * Channel group & channel configuration
- */
-int
-ajax_config_channels_tab(http_connection_t *hc, http_reply_t *hr)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  channel_group_t *tcg;
-
-  htsbuf_qprintf(tq, "<div style=\"float: left; width: 30%\">");
-
-  ajax_box_begin(tq, AJAX_BOX_SIDEBOX, "channelgroups",
-		 NULL, "Channel groups");
-
-  htsbuf_qprintf(tq, "<div style=\"height:15px; text-align:center\" "
-	      "id=\"list-info\"></div>");
-   
-  htsbuf_qprintf(tq, "<ul id=\"channelgrouplist\" class=\"draglist\">");
-
-  TAILQ_FOREACH(tcg, &all_channel_groups, tcg_global_link) {
-    if(tcg->tcg_hidden)
-      continue;
-    ajax_chgroup_build(tq, tcg);
-  }
-
-  htsbuf_qprintf(tq, "</ul>");
- 
-  ajax_js(tq, "Sortable.create(\"channelgrouplist\", "
-	  "{onUpdate:function(){updatelistonserver("
-	  "'channelgrouplist', "
-	  "'/ajax/chgroup_updateorder', "
-	  "'list-info'"
-	  ")}});");
-
-  /**
-   * Add new group
-   */
-
-  htsbuf_qprintf(tq, "<hr>");
-
-  ajax_box_begin(tq, AJAX_BOX_BORDER, NULL, NULL, NULL);
-
-  htsbuf_qprintf(tq,
-	      "<div style=\"height: 25px\">"
-	      "<div style=\"float: left\">"
-	      "<input type=\"text\" id=\"newchgrp\">"
-	      "</div>"
-	      "<div style=\"float: right\">"
-	      "<input type=\"button\" value=\"Add\" "
-	      "onClick=\"javascript:addlistentry_by_widget("
-	      "'channelgrouplist', 'chgroup_add', 'newchgrp');\">"
-	      "</div></div>");
-    
-  ajax_box_end(tq, AJAX_BOX_BORDER);
-    
-  ajax_box_end(tq, AJAX_BOX_SIDEBOX);
-  htsbuf_qprintf(tq, "</div>");
-
-  htsbuf_qprintf(tq, 
-	      "<div id=\"groupeditortab\" "
-	      "style=\"overflow: auto; float: left; width: 30%\"></div>");
-
-  htsbuf_qprintf(tq, 
-	      "<div id=\"cheditortab\" "
-	      "style=\"overflow: auto; float: left; width: 40%\"></div>");
-
-  http_output_html(hc, hr);
-  return 0;
-}
-
-/**
- * Display all channels within the group
- */
-static int
-ajax_chgroup_editor(http_connection_t *hc, http_reply_t *hr,
-		    const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  channel_t *ch;
-  channel_group_t *tcg, *tcg2;
-  th_transport_t *t;
-  char buf[10];
-  int nsources;
-  ajax_table_t ta;
-
-  if(remain == NULL || (tcg = channel_group_by_tag(atoi(remain))) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  htsbuf_qprintf(tq, "<script type=\"text/javascript\">\r\n"
-	      "//<![CDATA[\r\n");
-  
-  /* Select all */
-  htsbuf_qprintf(tq, "select_all = function() {\r\n");
-  TAILQ_FOREACH(ch, &tcg->tcg_channels, ch_group_link) {
-    htsbuf_qprintf(tq, 
-		"$('sel_%d').checked = true;\r\n",
-		ch->ch_tag);
-  }
-  htsbuf_qprintf(tq, "}\r\n");
-
-  /* Select none */
-  htsbuf_qprintf(tq, "select_none = function() {\r\n");
-  TAILQ_FOREACH(ch, &tcg->tcg_channels, ch_group_link) {
-    htsbuf_qprintf(tq, 
-		"$('sel_%d').checked = false;\r\n",
-		ch->ch_tag);
-  }
-  htsbuf_qprintf(tq, "}\r\n");
-
-  /* Invert selection */
-  htsbuf_qprintf(tq, "select_invert = function() {\r\n");
-  TAILQ_FOREACH(ch, &tcg->tcg_channels, ch_group_link) {
-    htsbuf_qprintf(tq, 
-		"$('sel_%d').checked = !$('sel_%d').checked;\r\n",
-		ch->ch_tag, ch->ch_tag);
-  }
-  htsbuf_qprintf(tq, "}\r\n");
-
-  /* Invert selection */
-  htsbuf_qprintf(tq, "select_sources = function() {\r\n");
-  TAILQ_FOREACH(ch, &tcg->tcg_channels, ch_group_link) {
-    htsbuf_qprintf(tq, 
-		"$('sel_%d').checked = %s;\r\n",
-		ch->ch_tag, LIST_FIRST(&ch->ch_transports) ? "true" : "false");
-  }
-  htsbuf_qprintf(tq, "}\r\n");
-
-
-
-  /* Invoke AJAX call containing all selected elements */
-  htsbuf_qprintf(tq, 
-	      "select_do = function(op, arg1, arg2, check) {\r\n"
-	      "if(check == true && !confirm(\"Are you sure?\")) {return;}\r\n"
-	      "var h = new Hash();\r\n"
-	      "h.set('arg1', arg1);\r\n"
-	      "h.set('arg2', arg2);\r\n"
-	      );
-  
-  TAILQ_FOREACH(ch, &tcg->tcg_channels, ch_group_link) {
-    htsbuf_qprintf(tq, 
-		"if($('sel_%d').checked) {h.set('%d', 'selected') }\r\n",
-		ch->ch_tag, ch->ch_tag);
-  }
-
-  htsbuf_qprintf(tq, " new Ajax.Request('/ajax/chop/' + op, "
-	      "{parameters: h});\r\n");
-  htsbuf_qprintf(tq, "}\r\n");
-
-
-  htsbuf_qprintf(tq, 
-	      "\r\n//]]>\r\n"
-	      "</script>\r\n");
-
-
-  ajax_box_begin(tq, AJAX_BOX_SIDEBOX, NULL, NULL, tcg->tcg_name);
-
-  ajax_table_top(&ta, hc, tq, (const char *[])
-		 {"Channelname", "Sources", "", NULL},
-		 (int[]){8,2,1});
-
-  TAILQ_FOREACH(ch, &tcg->tcg_channels, ch_group_link) {
-    snprintf(buf, sizeof(buf), "%d", ch->ch_tag);
-    ajax_table_row_start(&ta, buf);
-
-    nsources = 0;
-
-    LIST_FOREACH(t, &ch->ch_transports, tht_ch_link)
-      nsources++;
-
-    ajax_table_cell(&ta, NULL,
-		    "<a href=\"javascript:void(0)\" "
-		    "onclick=\"new Ajax.Updater('cheditortab', "
-		    "'/ajax/cheditor/%d', {method: 'get'})\""
-		    ">%s</a>", ch->ch_tag, ch->ch_name);
-
-    ajax_table_cell(&ta, NULL, "%d", nsources);
-    ajax_table_cell_checkbox(&ta);
-  }
-  ajax_table_bottom(&ta);
-
-  htsbuf_qprintf(tq, "<hr>\r\n");
-  htsbuf_qprintf(tq, "<div style=\"text-align: center; "
-	      "overflow: auto; width: 100%\">");
-
-  ajax_button(tq, "Select all", "select_all()");
-  ajax_button(tq, "Select none", "select_none()");
-  ajax_button(tq, "Invert selection", "select_invert()");
-  ajax_button(tq, "Select channels with sources", "select_sources()");
-  htsbuf_qprintf(tq, "</div>\r\n");
-
-  htsbuf_qprintf(tq, "<hr>\r\n");
-
-  htsbuf_qprintf(tq, "<div style=\"text-align: center; "
-	      "overflow: auto; width: 100%\">");
-  
-  ajax_button(tq,
-	      "Delete all selected...", 
-	      "select_do('delete', '%d', 0, true);", tcg->tcg_tag);
-  
-  htsbuf_qprintf(tq,
-	      "<select id=\"movetarget\" "
-	      "onChange=\"select_do('changegroup', "
-	      "$('movetarget').value, '%d', false)\">", tcg->tcg_tag);
-  htsbuf_qprintf(tq, 
-	      "<option value="">Move selected channels to group:</option>");
-
-  TAILQ_FOREACH(tcg2, &all_channel_groups, tcg_global_link) {
-    if(tcg2->tcg_hidden || tcg == tcg2)
-      continue;
-    htsbuf_qprintf(tq, "<option value=\"%d\">%s</option>",
-		tcg2->tcg_tag, tcg2->tcg_name);
-  }
-  htsbuf_qprintf(tq, "</select></div>");
-  htsbuf_qprintf(tq, "</div>");
-  htsbuf_qprintf(tq, "</div>");
-  ajax_box_end(tq, AJAX_BOX_SIDEBOX);
-
-
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-/**
- *
- */
-static struct strtab sourcetypetab[] = {
-  { "DVB",        TRANSPORT_DVB },
-  { "V4L",        TRANSPORT_V4L },
-  { "IPTV",       TRANSPORT_IPTV },
-  { "AVgen",      TRANSPORT_AVGEN },
-  { "File",       TRANSPORT_STREAMEDFILE },
-};
-
-
-static struct strtab cdlongname[] = {
-  { "None",                  COMMERCIAL_DETECT_NONE },
-  { "Swedish TV4 Teletext",  COMMERCIAL_DETECT_TTP192 },
-};
-
-/**
- * Display all channels within the group
- */
-static int
-ajax_cheditor(http_connection_t *hc, http_reply_t *hr,
-	      const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  channel_t *ch, *ch2;
-  channel_group_t *chg;
-  th_transport_t *t;
-  const char *s;
-  int i;
-
-  if(remain == NULL || (ch = channel_by_tag(atoi(remain))) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  ajax_box_begin(tq, AJAX_BOX_SIDEBOX, NULL, NULL, ch->ch_name);
-  
-  if(ch->ch_icon != NULL) {
-    htsbuf_qprintf(tq, 
-		"<div style=\"width: 100%; text-align:center\">"
-		"<img src=\"%s\"></div>", ch->ch_icon);
-  }
-  
-  htsbuf_qprintf(tq, "<div>Sources:</div>");
-
-  LIST_FOREACH(t, &ch->ch_transports, tht_ch_link) {
-    ajax_box_begin(tq, AJAX_BOX_BORDER, NULL, NULL, NULL);
-    htsbuf_qprintf(tq, "<div style=\"overflow: auto; width: 100%\">");
-    htsbuf_qprintf(tq, "<div style=\"float: left; width: 13%%\">%s</div>",
-		val2str(t->tht_type, sourcetypetab) ?: "???");
-    htsbuf_qprintf(tq, "<div style=\"float: left; width: 87%%\">\"%s\"%s</div>",
-		t->tht_svcname, t->tht_scrambled ? " - (scrambled)" : "");
-    s = t->tht_sourcename ? t->tht_sourcename(t) : NULL;
-
-    htsbuf_qprintf(tq, "</div><div style=\"overflow: auto; width: 100%\">");
-
-    htsbuf_qprintf(tq,
-		"<div style=\"float: left; width: 13%%\">"
-		"<input %stype=\"checkbox\" class=\"nicebox\" "
-		"onClick=\"new Ajax.Request('/ajax/transport_chdisable/%s', "
-		"{parameters: {enabled: this.checked}});\">"
-		"</div>", t->tht_disabled ? "" : "checked ",
-		t->tht_identifier);
-
-    if(s != NULL)
-      htsbuf_qprintf(tq, "<div style=\"float: left; width: 87%%\">%s</div>",
-		  s);
-
-    htsbuf_qprintf(tq, "</div>");
-
-    ajax_box_end(tq, AJAX_BOX_BORDER);
-  }
-
-  htsbuf_qprintf(tq, "<hr>\r\n");
-
-  htsbuf_qprintf(tq, "<div style=\"overflow: auto; width:100%%\">");
-
-  htsbuf_qprintf(tq, 
-	      "<input type=\"button\" value=\"Rename...\" "
-	      "onClick=\"channel_rename('%d', '%s')\">",
-	      ch->ch_tag, ch->ch_name);
-
-  htsbuf_qprintf(tq, 
-	      "<input type=\"button\" value=\"Delete...\" "
-	      "onClick=\"channel_delete('%d', '%s')\">",
-	      ch->ch_tag, ch->ch_name);
-
-  htsbuf_qprintf(tq,
-	      "<select "
-	      "onChange=\"channel_merge('%d', this.value);\">",
-	      ch->ch_tag);
-  
-  htsbuf_qprintf(tq, "<option value=\"n\">Merge to channel:</option>");
-
-  
-  TAILQ_FOREACH(chg, &all_channel_groups, tcg_global_link) {
-    TAILQ_FOREACH(ch2, &chg->tcg_channels, ch_group_link) {
-      if(ch2 != ch)
-	htsbuf_qprintf(tq, "<option value=\"%d\">%s</option>",
-		    ch2->ch_tag, ch2->ch_name);
-    }
-  }
-  
-  htsbuf_qprintf(tq, "</select>");
-  htsbuf_qprintf(tq, "</div>");
-  htsbuf_qprintf(tq, "<hr>\r\n");
-
-  htsbuf_qprintf(tq,
-	      "<div class=\"infoprefixwidewidefat\">"
-	      "Commercial detection:</div>"
-	      "<div>"
-	      "<select "
-	      "onChange=\"new Ajax.Request('/ajax/chsetcomdetect/%d', "
-	      "{parameters: {how: this.value}});\">",
-	      ch->ch_tag);
-
-  for(i = 0; i < sizeof(cdlongname) / sizeof(cdlongname[0]); i++) {
-    htsbuf_qprintf(tq, "<option %svalue=%d>%s</option>",
-		cdlongname[i].val == ch->ch_commercial_detection ? 
-		"selected " : "",
-		cdlongname[i].val, cdlongname[i].str);
-  }
-  htsbuf_qprintf(tq, "</select></div>");
-  htsbuf_qprintf(tq, "</div>");
-
-
-  ajax_box_end(tq, AJAX_BOX_SIDEBOX);
-  http_output_html(hc, hr);
-  return 0;
-}
-
-/**
- * Change group for channel(s)
- */
-static int
-ajax_changegroup(http_connection_t *hc, http_reply_t *hr,
-		 const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  channel_t *ch;
-  channel_group_t *tcg;
-  http_arg_t *ra;
-  const char *s;
-  const char *curgrp;
-
-  if((s = http_arg_get(&hc->hc_req_args, "arg1")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if((curgrp = http_arg_get(&hc->hc_req_args, "arg2")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  tcg = channel_group_by_tag(atoi(s));
-  if(tcg == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  TAILQ_FOREACH(ra, &hc->hc_req_args, link) {
-    if(strcmp(ra->val, "selected"))
-      continue;
-    
-    if((ch = channel_by_tag(atoi(ra->key))) != NULL)
-      channel_set_group(ch, tcg);
-  }
-
-  htsbuf_qprintf(tq,
-	      "$('cheditortab').innerHTML=''; "
-	      "new Ajax.Updater('groupeditortab', "
-	      "'/ajax/chgroup_editor/%s', "
-	      "{method: 'get', evalScripts: true});", curgrp);
-  
-  http_output(hc, hr, "text/javascript; charset=UTF-8", NULL, 0);
-  return 0;
-}
-
-/**
- * Change commercial detection type for channel(s)
- */
-static int
-ajax_chsetcomdetect(http_connection_t *hc, http_reply_t *hr,
-		    const char *remain, void *opaque)
-{
-  channel_t *ch;
-  const char *s;
-
-  if(remain == NULL || (ch = channel_by_tag(atoi(remain))) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-  
-  if((s = http_arg_get(&hc->hc_req_args, "how")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-  
-  ch->ch_commercial_detection = atoi(s);
-
-  channel_settings_write(ch);
-  http_output(hc, hr, "text/javascript; charset=UTF-8", NULL, 0);
-  return 0;
-}
-
-
-/**
- * Rename a channel
- */
-static int
-ajax_chrename(http_connection_t *hc, http_reply_t *hr,
-	      const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  channel_t *ch;
-  const char *s;
-
-  if(remain == NULL || (ch = channel_by_tag(atoi(remain))) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-  
-  if((s = http_arg_get(&hc->hc_req_args, "newname")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if(channel_rename(ch, s)) {
-    htsbuf_qprintf(tq, "alert('Channel already exist');");
-  } else {
-    htsbuf_qprintf(tq, 
-		"new Ajax.Updater('groupeditortab', "
-		"'/ajax/chgroup_editor/%d', "
-		"{method: 'get', evalScripts: true});\r\n",
-		ch->ch_group->tcg_tag);
- 
-    htsbuf_qprintf(tq, 
-		"new Ajax.Updater('cheditortab', "
-		"'/ajax/cheditor/%d', "
-		"{method: 'get', evalScripts: true});\r\n",
-		ch->ch_tag);
-  }
-
-  http_output(hc, hr, "text/javascript; charset=UTF-8", NULL, 0);
-  return 0;
-}
-
-
-/**
- * Delete channel
- */
-static int
-ajax_chdelete(http_connection_t *hc, http_reply_t *hr,
-	      const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  channel_t *ch;
-  channel_group_t *tcg;
-
-  if(remain == NULL || (ch = channel_by_tag(atoi(remain))) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-  
-  tcg = ch->ch_group;
-  
-  channel_delete(ch);
-
-  htsbuf_qprintf(tq, 
-	      "new Ajax.Updater('groupeditortab', "
-	      "'/ajax/chgroup_editor/%d', "
-	      "{method: 'get', evalScripts: true});\r\n",
-	      tcg->tcg_tag);
- 
-  htsbuf_qprintf(tq, "$('cheditortab').innerHTML='';\r\n");
-
-  http_output(hc, hr, "text/javascript; charset=UTF-8", NULL, 0);
-  return 0;
-}
-
-/**
- * Merge channel
- */
-static int
-ajax_chmerge(http_connection_t *hc, http_reply_t *hr,
-	     const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  channel_t *src, *dst;
-  channel_group_t *tcg;
-  const char *s;
-
-  if(remain == NULL || (src = channel_by_tag(atoi(remain))) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-  
-  if((s = http_arg_get(&hc->hc_req_args, "dst")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-  
-  if((dst = channel_by_tag(atoi(s))) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  tcg = src->ch_group;
-  channel_merge(dst, src);
-
-  htsbuf_qprintf(tq, 
-	      "new Ajax.Updater('groupeditortab', "
-	      "'/ajax/chgroup_editor/%d', "
-	      "{method: 'get', evalScripts: true});\r\n",
-	      tcg->tcg_tag);
- 
-  htsbuf_qprintf(tq, "$('cheditortab').innerHTML='';\r\n");
-
-  http_output(hc, hr, "text/javascript; charset=UTF-8", NULL, 0);
-  return 0;
-}
-
-/**
- * Change group for channel(s)
- */
-static int
-ajax_chdeletemulti(http_connection_t *hc, http_reply_t *hr,
-		   const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  channel_t *ch;
-  http_arg_t *ra;
-  const char *curgrp;
-
-  if((curgrp = http_arg_get(&hc->hc_req_args, "arg1")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  TAILQ_FOREACH(ra, &hc->hc_req_args, link) {
-    if(strcmp(ra->val, "selected"))
-      continue;
-    
-    if((ch = channel_by_tag(atoi(ra->key))) != NULL)
-      channel_delete(ch);
-  }
-
-  htsbuf_qprintf(tq,
-	      "$('cheditortab').innerHTML=''; "
-	      "new Ajax.Updater('groupeditortab', "
-	      "'/ajax/chgroup_editor/%s', "
-	      "{method: 'get', evalScripts: true});", curgrp);
-  
-  http_output(hc, hr, "text/javascript; charset=UTF-8", NULL, 0);
-  return 0;
-}
-
-
-
-/**
- *
- */
-void
-ajax_config_channels_init(void)
-{
-  http_path_add("/ajax/chgroup_add"        , NULL, ajax_chgroup_add,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/chgroup_del"        , NULL, ajax_chgroup_del,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/chgroup_updateorder", NULL, ajax_chgroup_updateorder,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/chgroup_editor",      NULL, ajax_chgroup_editor,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/cheditor",            NULL, ajax_cheditor,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/chop/changegroup",    NULL, ajax_changegroup,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/chsetcomdetect",      NULL, ajax_chsetcomdetect,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/chrename",            NULL, ajax_chrename,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/chdelete",            NULL, ajax_chdelete,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/chmerge",             NULL, ajax_chmerge,
-		AJAX_ACCESS_CONFIG);
- http_path_add("/ajax/chop/delete",          NULL, ajax_chdeletemulti,
-		AJAX_ACCESS_CONFIG);
-
-}
diff --git a/ajaxui/ajaxui_config_cwc.c b/ajaxui/ajaxui_config_cwc.c
deleted file mode 100644
index 33163d59..00000000
--- a/ajaxui/ajaxui_config_cwc.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- *  tvheadend, AJAX / HTML user interface
- *  Copyright (C) 2008 Andreas Öman
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _GNU_SOURCE
-
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "tvhead.h"
-#include "http.h"
-#include "ajaxui.h"
-#include "cwc.h"
-/**
- * CWC configuration
- */
-int
-ajax_config_cwc_tab(http_connection_t *hc, http_reply_t *hr)
-{
-  htsbuf_queue_t *q = &hr->hr_q;
-
-  ajax_box_begin(q, AJAX_BOX_SIDEBOX, NULL, NULL, "Code-word Client");
-
-  htsbuf_qprintf(q, "<div id=\"cwclist\"></div>");
-  
-  ajax_js(q,  
-	  "new Ajax.Updater('cwclist', '/ajax/cwclist', "
-	  "{method: 'get', evalScripts: true});");
-
-  htsbuf_qprintf(q, "<hr><div style=\"overflow: auto; width: 100%\">");
-
- htsbuf_qprintf(q,
-	      "<div class=\"cell_100\">"
-	      "<div class=\"infoprefixwidewidefat\">Hostname:</div>"
-	      "<div>"
-	      "<input  type=\"text\" size=40 id=\"hostname\">"
-	      "</div></div>");
-
- htsbuf_qprintf(q,
-	      "<div class=\"cell_100\">"
-	      "<div class=\"infoprefixwidewidefat\">Port:</div>"
-	      "<div>"
-	      "<input  type=\"text\" id=\"port\">"
-	      "</div></div>");
-
-
-  htsbuf_qprintf(q,
-	      "<div class=\"cell_100\">"
-	      "<div class=\"infoprefixwidewidefat\">Username:</div>"
-	      "<div>"
-	      "<input  type=\"text\" id=\"username\">"
-	      "</div></div>");
-
-  htsbuf_qprintf(q,
-	      "<div class=\"cell_100\">"
-	      "<div class=\"infoprefixwidewidefat\">Password:</div>"
-	      "<div>"
-	      "<input  type=\"password\" id=\"password\">"
-	      "</div></div>");
-
-  htsbuf_qprintf(q,
-	      "<div class=\"cell_100\">"
-	      "<div class=\"infoprefixwidewidefat\">DES-key:</div>"
-	      "<div>"
-	      "<input  type=\"text\" size=50 id=\"deskey\">"
-	      "</div></div>");
-
-  htsbuf_qprintf(q,
-	      "<br>"
-	      "<input type=\"button\" value=\"Add new server entry\" "
-	      "onClick=\"new Ajax.Request('/ajax/cwcadd', "
-	      "{parameters: {"
-	      "'hostname': $F('hostname'), "
-	      "'port': $F('port'), "
-	      "'username': $F('username'), "
-	      "'password': $F('password'), "
-	      "'deskey': $F('deskey') "
-	      "}})"
-	      "\">");
-
-  htsbuf_qprintf(q, "</div>\r\n");
-  
-  ajax_box_end(q, AJAX_BOX_SIDEBOX);
-  
-  htsbuf_qprintf(q, "</div>");
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-/**
- *
- */
-static int
-ajax_cwclist(http_connection_t *hc, http_reply_t *hr, 
-	    const char *remain, void *opaque)
-{
-  htsbuf_queue_t *q = &hr->hr_q;
-  ajax_table_t ta;
-  cwc_t *cwc;
-  char id[20];
-
-  ajax_table_top(&ta, hc, q,
-		 (const char *[]){"Code-word Server",
-				   "Username",
-		                   "Enabled",
-		                   "Status",
-		                   "",
-				    NULL}, 
-		 (int[]){3, 2, 1, 12, 1});
-
-  TAILQ_FOREACH(cwc, &cwcs, cwc_link) {
-    snprintf(id, sizeof(id), "cwc_%d", cwc->cwc_id);
-    ajax_table_row_start(&ta, id);
-
-    ajax_table_cell(&ta, NULL, "%s:%d",
-		    cwc->cwc_tcp_session.tcp_hostname,
-		    cwc->cwc_tcp_session.tcp_port);
-
-    ajax_table_cell(&ta, NULL, "%s", cwc->cwc_username);
-
-    ajax_table_cell(&ta, NULL, 
-		    "<input %stype=\"checkbox\" class=\"nicebox\" "
-		    "onChange=\"new Ajax.Request('/ajax/cwcchange', "
-		    "{parameters: {checked: this.checked, id: %d}})\">",
-		    cwc->cwc_tcp_session.tcp_enabled
-		    ? "checked " : "", cwc->cwc_id);
-
-    ajax_table_cell(&ta, "status", cwc_status_to_text(cwc));
-
-    ajax_table_cell(&ta, NULL,
-		    "<a href=\"javascript:void(0)\" "
-		    "onClick=\"dellistentry('/ajax/cwcdel', '%d', '%s')\">"
-		    "Delete...</a>",
-		    cwc->cwc_id, cwc->cwc_tcp_session.tcp_hostname);
-  }
-
-  ajax_table_bottom(&ta);
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-/**
- *
- */
-static int
-ajax_cwcadd(http_connection_t *hc, http_reply_t *hr, 
-	    const char *remain, void *opaque)
-{
-  htsbuf_queue_t *q = &hr->hr_q;
-  const char *errtxt;
-
-  errtxt = cwc_add(http_arg_get(&hc->hc_req_args, "hostname"),
-		   http_arg_get(&hc->hc_req_args, "port"),
-		   http_arg_get(&hc->hc_req_args, "username"),
-		   http_arg_get(&hc->hc_req_args, "password"),
-		   http_arg_get(&hc->hc_req_args, "deskey"),
-		   "1", 1, 1);
-
-  if(errtxt != NULL) {
-    htsbuf_qprintf(q, "alert('%s');", errtxt);
-  } else {
-    
-    htsbuf_qprintf(q, "$('hostname').clear();\r\n");
-    htsbuf_qprintf(q, "$('port').clear();\r\n");
-    htsbuf_qprintf(q, "$('username').clear();\r\n");
-    htsbuf_qprintf(q, "$('password').clear();\r\n");
-    htsbuf_qprintf(q, "$('deskey').clear();\r\n");
-    htsbuf_qprintf(q, 
-		"new Ajax.Updater('cwclist', '/ajax/cwclist', "
-		"{method: 'get', evalScripts: true});");
-  }
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-
-  return 0;
-}
-
-
-/**
- *
- */
-static int
-ajax_cwcdel(http_connection_t *hc, http_reply_t *hr, 
-	    const char *remain, void *opaque)
-{
-  htsbuf_queue_t *q = &hr->hr_q;
-  const char *txt;
-  cwc_t *cwc;
-
-  if((txt = http_arg_get(&hc->hc_req_args, "id")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if((cwc = cwc_find(atoi(txt))) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  cwc_delete(cwc);
-  htsbuf_qprintf(q, 
-	      "new Ajax.Updater('cwclist', '/ajax/cwclist', "
-	      "{method: 'get', evalScripts: true});");
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  return 0;
-}
-
-/**
- *
- */
-static int
-ajax_cwcchange(http_connection_t *hc, http_reply_t *hr, 
-	    const char *remain, void *opaque)
-{
-  //  htsbuf_queue_t *q = &hr->hr_q;
-  const char *txt;
-  cwc_t *cwc;
-
-  if((txt = http_arg_get(&hc->hc_req_args, "id")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if((cwc = cwc_find(atoi(txt))) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if((txt = http_arg_get(&hc->hc_req_args, "checked")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  cwc_set_enable(cwc, !strcmp(txt, "true"));
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  return 0;
-}
-
-
-/**
- *
- */
-void
-ajax_config_cwc_init(void)
-{
-  http_path_add("/ajax/cwclist" ,      NULL, ajax_cwclist,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/cwcadd" ,       NULL, ajax_cwcadd,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/cwcdel" ,       NULL, ajax_cwcdel,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/cwcchange" ,       NULL, ajax_cwcchange,
-		AJAX_ACCESS_CONFIG);
-}
diff --git a/ajaxui/ajaxui_config_dvb.c b/ajaxui/ajaxui_config_dvb.c
deleted file mode 100644
index 8da3a784..00000000
--- a/ajaxui/ajaxui_config_dvb.c
+++ /dev/null
@@ -1,1059 +0,0 @@
-/*
- *  tvheadend, AJAX / HTML user interface
- *  Copyright (C) 2008 Andreas Öman
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _GNU_SOURCE
-
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <linux/dvb/frontend.h>
-
-#include "tvhead.h"
-#include "http.h"
-#include "ajaxui.h"
-#include "channels.h"
-#include "dvb.h"
-#include "dvb_support.h"
-#include "dvb_muxconfig.h"
-#include "psi.h"
-#include "transports.h"
-#include "dispatch.h"
-
-#include "ajaxui_mailbox.h"
-
-
-static void
-add_option(htsbuf_queue_t *tq, int bol, const char *name)
-{
-  if(bol)
-    htsbuf_qprintf(tq, "<option>%s</option>", name);
-}
-
-/**
- *
- */
-static const char *
-nicenum(unsigned int v)
-{
-  static char buf[4][30];
-  static int ptr;
-  char *x;
-  ptr = (ptr + 1) & 3;
-  x = buf[ptr];
-
-  if(v < 1000)
-    snprintf(x, 30, "%d", v);
-  else if(v < 1000000)
-    snprintf(x, 30, "%d,%03d", v / 1000, v % 1000);
-  else if(v < 1000000000)
-    snprintf(x, 30, "%d,%03d,%03d", 
-	     v / 1000000, (v % 1000000) / 1000, v % 1000);
-  else 
-    snprintf(x, 30, "%d,%03d,%03d,%03d", 
-	     v / 1000000000, (v % 1000000000) / 1000000,
-	     (v % 1000000) / 1000, v % 1000);
-  return x;
-}
-
-
-
-static void
-tdmi_displayname(th_dvb_mux_instance_t *tdmi, char *buf, size_t len)
-{
-  int f = tdmi->tdmi_fe_params.frequency;
-
-  if(tdmi->tdmi_adapter->tda_type == FE_QPSK) {
-    snprintf(buf, len, "%s kHz %s", nicenum(f),
-	     dvb_polarisation_to_str(tdmi->tdmi_polarisation));
-  } else {
-    snprintf(buf, len, "%s kHz", nicenum(f / 1000));
-  }
-}
-
-/*
- * Adapter summary
- */
-static int
-ajax_adaptersummary(http_connection_t *hc, http_reply_t *hr, 
-		    const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  th_dvb_adapter_t *tda;
-  char dispname[20];
-
-  if(remain == NULL || (tda = dvb_adapter_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  snprintf(dispname, sizeof(dispname), "%s", tda->tda_displayname);
-  strcpy(dispname + sizeof(dispname) - 4, "...");
-
-  ajax_box_begin(tq, AJAX_BOX_SIDEBOX, NULL, NULL, dispname);
-
-  htsbuf_qprintf(tq, "<div class=\"infoprefix\">Device:</div>"
-	      "<div>%s</div>",
-	      tda->tda_rootpath ?: "<b><i>Not present</i></b>");
-  htsbuf_qprintf(tq, "<div class=\"infoprefix\">Type:</div>"
-	      "<div>%s</div>", 
-	      dvb_adaptertype_to_str(tda->tda_type));
- 
-  htsbuf_qprintf(tq, "<div style=\"text-align: center\">"
-	      "<a href=\"javascript:void(0);\" "
-	      "onClick=\"new Ajax.Updater('dvbadaptereditor', "
-	      "'/ajax/dvbadaptereditor/%s', "
-	      "{method: 'get', evalScripts: true})\""
-	      "\">Edit</a></div>", tda->tda_identifier);
-  ajax_box_end(tq, AJAX_BOX_SIDEBOX);
-
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-/**
- * DVB configuration
- */
-int
-ajax_config_dvb_tab(http_connection_t *hc, http_reply_t *hr)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  th_dvb_adapter_t *tda;
-
-  htsbuf_qprintf(tq, "<div style=\"overflow: auto; width: 100%\">");
-
-  if(TAILQ_FIRST(&dvb_adapters) == NULL) {
-    htsbuf_qprintf(tq, "<div style=\"text-align: center; font-weight: bold\">"
-		"No adapters found</div>");
-  }
-
-
-  TAILQ_FOREACH(tda, &dvb_adapters, tda_global_link) {
-
-    htsbuf_qprintf(tq, "<div id=\"summary_%s\" "
-		"style=\"float:left; width: 250px\"></div>",
-		tda->tda_identifier);
-
-    ajax_js(tq, "new Ajax.Updater('summary_%s', "
-	    "'/ajax/dvbadaptersummary/%s', {method: 'get'})",
-	    tda->tda_identifier, tda->tda_identifier);
-
-  }
-  htsbuf_qprintf(tq, "</div>");
-  htsbuf_qprintf(tq, "<div id=\"dvbadaptereditor\"></div>");
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-
-/**
- * DVB adapter editor pane
- */
-static int
-ajax_adaptereditor(http_connection_t *hc, http_reply_t *hr, 
-		   const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  th_dvb_adapter_t *tda, *tda2;
-  const char *s;
-
-  if(remain == NULL || (tda = dvb_adapter_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  ajax_box_begin(tq, AJAX_BOX_FILLED, NULL, NULL, NULL);
-
-  htsbuf_qprintf(tq, 
-	      "<div id=\"adaptername_%s\" "
-	      "style=\"text-align: center; font-weight: bold\">%s</div>",
-	      tda->tda_identifier, tda->tda_displayname);
-  
-  ajax_box_end(tq, AJAX_BOX_FILLED);
-
-  /* Type */
-
-  htsbuf_qprintf(tq, "<div style=\"overflow: auto; width:100%%\">");
-
-  htsbuf_qprintf(tq, "<div style=\"float: left; width:45%%\">");
-
-  htsbuf_qprintf(tq, "<div class=\"infoprefixwide\">Model:</div>"
-	      "<div>%s (%s)</div>", 
-	      tda->tda_fe_info ? tda->tda_fe_info->name : "<Unknown>",
-	      dvb_adaptertype_to_str(tda->tda_type));
-  
-
-
-  if(tda->tda_fe_info != NULL) {
-
-    s = tda->tda_type == FE_QPSK ? "kHz" : "Hz";
-    htsbuf_qprintf(tq, "<div class=\"infoprefixwide\">Freq. Range:</div>"
-		"<div>%s - %s %s, in steps of %s %s</div>",
-		nicenum(tda->tda_fe_info->frequency_min),
-		nicenum(tda->tda_fe_info->frequency_max),
-		s,
-		nicenum(tda->tda_fe_info->frequency_stepsize),
-		s);
-
-
-    if(tda->tda_fe_info->symbol_rate_min) {
-      htsbuf_qprintf(tq, "<div class=\"infoprefixwide\">Symbolrate:</div>"
-		  "<div>%s - %s Baud</div>",
-		  nicenum(tda->tda_fe_info->symbol_rate_min),
-		  nicenum(tda->tda_fe_info->symbol_rate_max));
-    }
-    /* Capabilities */
-    //  htsbuf_qprintf(tq, "<div class=\"infoprefixwide\">Capabilities:</div>");
-  }
-
-  htsbuf_qprintf(tq, "</div>");
-
-  htsbuf_qprintf(tq, "<div style=\"float: left; width:55%%\">");
-
-  htsbuf_qprintf(tq, "<div style=\"overflow: auto; width:100%%\">");
-
-  htsbuf_qprintf(tq, 
-	      "<input type=\"button\" value=\"Rename adapter...\" "
-	      "onClick=\"dvb_adapter_rename('%s', '%s');\">",
-	      tda->tda_identifier, tda->tda_displayname);
-
-  if(tda->tda_rootpath == NULL) {
-    htsbuf_qprintf(tq, 
-		"<input type=\"button\" value=\"Delete adapter...\" "
-		"onClick=\"dvb_adapter_delete('%s', '%s');\">",
-		tda->tda_identifier, tda->tda_displayname);
-  }
-
-  //  htsbuf_qprintf(tq, "</div>");
-
-  /* Clone adapter */
-
-  //  htsbuf_qprintf(tq, "<div style=\"overflow: auto; width:100%%\">");
-  htsbuf_qprintf(tq,
-	      "<select "
-	      "onChange=\"new Ajax.Request('/ajax/dvbadapterclone/%s', "
-	      "{parameters: { source: this.value }})\">",
-	      tda->tda_identifier);
-  
-  htsbuf_qprintf(tq, "<option value=\"n\">Clone settings from adapter:</option>");
-
-  TAILQ_FOREACH(tda2, &dvb_adapters, tda_global_link) {
-    if(tda2 == tda || tda2->tda_type != tda->tda_type)
-      continue;
-
-    htsbuf_qprintf(tq, "<option value=\"%s\">%s (%s)</option>",
-		tda2->tda_identifier, tda2->tda_displayname,
-		tda2->tda_rootpath ?: "not present");
-  }
-  
-  htsbuf_qprintf(tq, "</select></div>");
-  htsbuf_qprintf(tq, "</div>");
-
-  htsbuf_qprintf(tq, "</div>");
-
-  htsbuf_qprintf(tq, "</div>");
-
-  /* Muxes and transports */
-
-
-  htsbuf_qprintf(tq, "<div style=\"float: left; width:45%\">");
-
-  ajax_box_begin(tq, AJAX_BOX_SIDEBOX, NULL, NULL, "Multiplexes");
-
-  htsbuf_qprintf(tq, "<div id=\"dvbmuxlist_%s\"></div>",
-	      tda->tda_identifier);
-
-  ajax_js(tq, 
-	  "new Ajax.Updater('dvbmuxlist_%s', "
-	  "'/ajax/dvbadaptermuxlist/%s', {method: 'get', evalScripts: true})",
-	  tda->tda_identifier, tda->tda_identifier);
-
-  ajax_box_end(tq, AJAX_BOX_SIDEBOX);
-  htsbuf_qprintf(tq, "</div>");
-
-  /* Div for displaying services */
-
-  htsbuf_qprintf(tq, "<div id=\"servicepane\" style=\"float: left; width:55%\">");
-  htsbuf_qprintf(tq, "</div>");
-
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-/**
- * DVB adapter add mux
- */
-static int
-ajax_adapteraddmux(http_connection_t *hc, http_reply_t *hr, 
-		   const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  th_dvb_adapter_t *tda;
-  int caps;
-  int fetype;
-  char params[400];
-  int n, type;
-  const char *networkname;
-
-  if(remain == NULL || (tda = dvb_adapter_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  if(tda->tda_fe_info == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  caps   = tda->tda_fe_info->caps;
-  fetype = tda->tda_fe_info->type;
-
-  snprintf(params, sizeof(params), "Add new %s mux on \"%s\"", 
-	   dvb_adaptertype_to_str(tda->tda_fe_info->type),
-	   tda->tda_displayname);
-
-  ajax_box_begin(tq, AJAX_BOX_SIDEBOX, NULL, NULL, params);
-
-  /* Manual configuration */
-
-  htsbuf_qprintf(tq,
-	      "<div style=\"text-align: center; font-weight: bold\">"
-	      "Manual configuartion</div>");
-
-  htsbuf_qprintf(tq,
-	      "<div class=\"cell_50\">"
-	      "<div class=\"infoprefixwidewidefat\">Frequency (%s):</div>"
-	      "<div>"
-	      "<input type=\"text\" id=\"freq\">"
-	      "</div></div>",
-	      fetype == FE_QPSK ? "kHz" : "Hz");
-
-  snprintf(params, sizeof(params), 
-	   "freq: $F('freq')");
-
-  /* Symbolrate */
-
-  if(fetype == FE_QAM || fetype == FE_QPSK) {
- 
-    htsbuf_qprintf(tq,
-		"<div class=\"cell_50\">"
-		"<div class=\"infoprefixwidewidefat\">Symbolrate:</div>"
-		"<div>"
-		"<input  type=\"text\" id=\"symrate\">"
-		"</div></div>");
-
-    snprintf(params + strlen(params), sizeof(params) - strlen(params), 
-	     ", symrate: $F('symrate')");
-  }
-
-  /* Bandwidth */
-
-  if(fetype == FE_OFDM) {
-    htsbuf_qprintf(tq,
-		"<div class=\"cell_50\">"
-		"<div class=\"infoprefixwidewidefat\">Bandwidth:</div>"
-		"<div><select id=\"bw\">");
-
-    add_option(tq, caps & FE_CAN_BANDWIDTH_AUTO, "AUTO");
-    add_option(tq, 1                           , "8MHz");
-    add_option(tq, 1                           , "7MHz");
-    add_option(tq, 1                           , "6MHz");
-    htsbuf_qprintf(tq, "</select></div></div>");
-
-    snprintf(params + strlen(params), sizeof(params) - strlen(params), 
-	     ", bw: $F('bw')");
-  }
-
-
-  /* Constellation */
-
-
-  if(fetype == FE_QAM || fetype == FE_OFDM) {
-    htsbuf_qprintf(tq,
-		"<div class=\"cell_50\">"
-		"<div class=\"infoprefixwidewidefat\">Constellation:</div>"
-		"<div><select id=\"const\">");
-
-    add_option(tq, caps & FE_CAN_QAM_AUTO,  "AUTO");
-    add_option(tq, caps & FE_CAN_QPSK,      "QPSK");
-    add_option(tq, caps & FE_CAN_QAM_16,    "QAM16");
-    add_option(tq, caps & FE_CAN_QAM_32,    "QAM32");
-    add_option(tq, caps & FE_CAN_QAM_64,    "QAM64");
-    add_option(tq, caps & FE_CAN_QAM_128,   "QAM128");
-    add_option(tq, caps & FE_CAN_QAM_256,   "QAM256");
-
-    htsbuf_qprintf(tq, "</select></div></div>");
-
-    snprintf(params + strlen(params), sizeof(params) - strlen(params), 
-	     ", const: $F('const')");
-  }
-
-
-  /* FEC */
-
-  if(fetype == FE_QAM || fetype == FE_QPSK) {
-    htsbuf_qprintf(tq,
-		"<div class=\"cell_50\">"
-		"<div class=\"infoprefixwidewidefat\">FEC:</div>"
-		"<div><select id=\"fec\">");
-
-    add_option(tq, caps & FE_CAN_FEC_AUTO,  "AUTO");
-    add_option(tq, caps & FE_CAN_FEC_1_2,   "1/2");
-    add_option(tq, caps & FE_CAN_FEC_2_3,   "2/3");
-    add_option(tq, caps & FE_CAN_FEC_3_4,   "3/4");
-    add_option(tq, caps & FE_CAN_FEC_4_5,   "4/5");
-    add_option(tq, caps & FE_CAN_FEC_5_6,   "5/6");
-    add_option(tq, caps & FE_CAN_FEC_6_7,   "6/7");
-    add_option(tq, caps & FE_CAN_FEC_7_8,   "7/8");
-    add_option(tq, caps & FE_CAN_FEC_8_9,   "8/9");
-    htsbuf_qprintf(tq, "</select></div></div>");
-
-    snprintf(params + strlen(params), sizeof(params) - strlen(params), 
-	     ", fec: $F('fec')");
-  }
-
-  if(fetype == FE_QPSK) {
-    htsbuf_qprintf(tq,
-		"<div class=\"cell_50\">"
-		"<div class=\"infoprefixwidewidefat\">Polarisation:</div>"
-		"<div><select id=\"pol\">");
-
-    add_option(tq, 1,  "Vertical");
-    add_option(tq, 1,  "Horizontal");
-    htsbuf_qprintf(tq, "</select></div></div>");
-
-    snprintf(params + strlen(params), sizeof(params) - strlen(params), 
-	     ", pol: $F('pol')");
-    
-
-  }
-
-
-  if(fetype == FE_OFDM) {
-    htsbuf_qprintf(tq,
-		"<div class=\"cell_50\">"
-		"<div class=\"infoprefixwidewidefat\">Transmission mode:</div>"
-		"<div><select id=\"tmode\">");
-    
-    add_option(tq, caps & FE_CAN_TRANSMISSION_MODE_AUTO, "AUTO");
-    add_option(tq, 1                                   , "2k");
-    add_option(tq, 1                                   , "8k");
-    htsbuf_qprintf(tq, "</select></div></div>");
-
-    snprintf(params + strlen(params), sizeof(params) - strlen(params), 
-	     ", tmode: $F('tmode')");
-
-    htsbuf_qprintf(tq,
-		"<div class=\"cell_50\">"
-		"<div class=\"infoprefixwidewidefat\">Guard interval:</div>"
-		"<div><select id=\"guard\">");
-    
-    add_option(tq, caps & FE_CAN_GUARD_INTERVAL_AUTO, "AUTO");
-    add_option(tq, 1                                , "1/32");
-    add_option(tq, 1                                , "1/16");
-    add_option(tq, 1                                , "1/8");
-    add_option(tq, 1                                , "1/4");
-    htsbuf_qprintf(tq, "</select></div></div>");
-
-    snprintf(params + strlen(params), sizeof(params) - strlen(params), 
-	     ", guard: $F('guard')");
-
-
-
-    htsbuf_qprintf(tq,
-		"<div class=\"cell_50\">"
-		"<div class=\"infoprefixwidewidefat\">Hierarchy:</div>"
-		"<div><select id=\"hier\">");
-    
-    add_option(tq, caps & FE_CAN_HIERARCHY_AUTO, "AUTO");
-    add_option(tq, 1                           , "1");
-    add_option(tq, 1                           , "2");
-    add_option(tq, 1                           , "4");
-    add_option(tq, 1                           , "NONE");
-    htsbuf_qprintf(tq, "</select></div></div>");
-
-
-    snprintf(params + strlen(params), sizeof(params) - strlen(params), 
-	     ", hier: $F('hier')");
-
-
-
-    htsbuf_qprintf(tq,
-		"<div class=\"cell_50\">"
-		"<div class=\"infoprefixwidewidefat\">FEC Hi:</div>"
-		"<div><select id=\"fechi\">");
-    
-    add_option(tq, caps & FE_CAN_FEC_AUTO,  "AUTO");
-    add_option(tq, caps & FE_CAN_FEC_1_2,   "1/2");
-    add_option(tq, caps & FE_CAN_FEC_2_3,   "2/3");
-    add_option(tq, caps & FE_CAN_FEC_3_4,   "3/4");
-    add_option(tq, caps & FE_CAN_FEC_4_5,   "4/5");
-    add_option(tq, caps & FE_CAN_FEC_5_6,   "5/6");
-    add_option(tq, caps & FE_CAN_FEC_6_7,   "6/7");
-    add_option(tq, caps & FE_CAN_FEC_7_8,   "7/8");
-    add_option(tq, caps & FE_CAN_FEC_8_9,   "8/9");
-    htsbuf_qprintf(tq, "</select></div></div>");
-
-    snprintf(params + strlen(params), sizeof(params) - strlen(params), 
-	     ", fechi: $F('fechi')");
-
-
-    htsbuf_qprintf(tq,
-		"<div class=\"cell_50\">"
-		"<div class=\"infoprefixwidewidefat\">FEC Low:</div>"
-		"<div><select id=\"feclo\">");
-    
-    add_option(tq, caps & FE_CAN_FEC_AUTO,  "AUTO");
-    add_option(tq, caps & FE_CAN_FEC_1_2,   "1/2");
-    add_option(tq, caps & FE_CAN_FEC_2_3,   "2/3");
-    add_option(tq, caps & FE_CAN_FEC_3_4,   "3/4");
-    add_option(tq, caps & FE_CAN_FEC_4_5,   "4/5");
-    add_option(tq, caps & FE_CAN_FEC_5_6,   "5/6");
-    add_option(tq, caps & FE_CAN_FEC_6_7,   "6/7");
-    add_option(tq, caps & FE_CAN_FEC_7_8,   "7/8");
-    add_option(tq, caps & FE_CAN_FEC_8_9,   "8/9");
-    htsbuf_qprintf(tq, "</select></div></div>");
-
-    snprintf(params + strlen(params), sizeof(params) - strlen(params), 
-	     ", feclo: $F('feclo')");
-  }
-
-  htsbuf_qprintf(tq,
-	      "<br>"
-	      "<div style=\"text-align: center\">"
-	      "<input type=\"button\" value=\"Add manually configured mux\" "
-	      "onClick=\"new Ajax.Request('/ajax/dvbadaptercreatemux/%s', "
-	      "{parameters: {%s}})"
-	      "\">"
-	      "</div>", tda->tda_identifier, params);
-
-  /*
-   * Preconfigured
-   */
-
-  htsbuf_qprintf(tq,
-	      "<hr>"
-	      "<div style=\"text-align: center; font-weight: bold\">"
-	      "Preconfigured network</div>");
-
-  htsbuf_qprintf(tq,
-	      "<div style=\"text-align: center\">"
-	      "<select id=\"network\" "
-	      "onChange=\"new Ajax.Updater('networkinfo', "
-	      "'/ajax/dvbnetworkinfo/' + this.value)\""
-	      ">");
-
-  htsbuf_qprintf(tq, "<option>Select a network</option>");
-
-  n = 0;
-  while((type = dvb_mux_preconf_get(n, &networkname, NULL)) >= 0) {
- 
-    if(type == fetype)
-      htsbuf_qprintf(tq, "<option value=%d>%s</option>", n, networkname);
-    n++;
-  }
-  htsbuf_qprintf(tq, "</select></div>");
-
-  htsbuf_qprintf(tq,
-	      "<div class=\"cell_100_center\" id=\"networkinfo\"></div>");
-
-  htsbuf_qprintf(tq,
-	      "<br>"
-	      "<div style=\"text-align: center\">"
-	      "<input type=\"button\" value=\"Add preconfigured network\" "
-	      "onClick=\"new Ajax.Updater('addnetwork', "
-	      "'/ajax/dvbadapteraddnetwork/%s', "
-	      "{evalScripts: true, parameters: "
-	      "{'network': $('network').value}})"
-	      "\">"
-	      "</div>", tda->tda_identifier, params);
-
-  ajax_box_end(tq, AJAX_BOX_SIDEBOX);
-
-  http_output_html(hc, hr);
-  return 0;
-}
-
-/**
- * DVB adapter create mux (come here on POST after addmux query)
- */
-static int
-ajax_adaptercreatemux(http_connection_t *hc, http_reply_t *hr, 
-		      const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq;
-  th_dvb_adapter_t *tda;
-  const char *v;
-
-  if(remain == NULL || (tda = dvb_adapter_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  v = dvb_mux_create_str(tda,
-			 "65535",
-			 NULL,
-			 http_arg_get(&hc->hc_req_args, "freq"),
-			 http_arg_get(&hc->hc_req_args, "symrate"),
-			 http_arg_get(&hc->hc_req_args, "const"),
-			 http_arg_get(&hc->hc_req_args, "fec"),
-			 http_arg_get(&hc->hc_req_args, "fechi"),
-			 http_arg_get(&hc->hc_req_args, "feclo"),
-			 http_arg_get(&hc->hc_req_args, "bw"),
-			 http_arg_get(&hc->hc_req_args, "tmode"),
-			 http_arg_get(&hc->hc_req_args, "guard"),
-			 http_arg_get(&hc->hc_req_args, "hier"),
-			 http_arg_get(&hc->hc_req_args, "pol"),
-			 http_arg_get(&hc->hc_req_args, "port"), 1);
-
-
-  tq = &hr->hr_q;
-
-  if(v != NULL)
-    htsbuf_qprintf(tq, "alert('%s');\r\n", v);
-
-  htsbuf_qprintf(tq, 
-	      "$('servicepane').innerHTML='';\r\n");
-
-  htsbuf_qprintf(tq, 
-	      "new Ajax.Updater('dvbmuxlist_%s', "
-	      "'/ajax/dvbadaptermuxlist/%s', "
-	      "{method: 'get', evalScripts: true});\r\n",
-	      tda->tda_identifier, tda->tda_identifier);
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  return 0;
-}
-
-
-/**
- * Return a list of all muxes on the given adapter
- */
-static int
-ajax_adaptermuxlist(http_connection_t *hc, http_reply_t *hr,
-		    const char *remain, void *opaque)
-{
-  ajax_table_t ta;
-  th_dvb_mux_instance_t *tdmi;
-  htsbuf_queue_t *tq = &hr->hr_q;
-  th_dvb_adapter_t *tda;
-  char buf[200];
-  int fetype, n, m;
-  th_transport_t *t;
-  int nmuxes = 0;
-  char **selvector;
-
-  if(remain == NULL || (tda = dvb_adapter_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  fetype = tda->tda_type;
-
-  /* List of muxes */
-  
-  nmuxes = tda->tda_muxes.entries;
-  
-  if(nmuxes == 0) {
-    htsbuf_qprintf(tq, "<div style=\"text-align: center\">"
-		"No muxes configured</div>");
-  } else {
-
-
-    selvector = alloca(sizeof(char *) * (nmuxes + 1));
-    n = 0;
-    RB_FOREACH(tdmi, &tda->tda_muxes, tdmi_adapter_link)
-      selvector[n++] = tdmi->tdmi_identifier;
-    selvector[n] = NULL;
-
-    ajax_generate_select_functions(tq, "mux", selvector);
-
-    ajax_table_top(&ta, hc, tq,
-		   (const char *[])
-    {"Freq", "Status", "Quality", "State", "Name", "Services", "", NULL},
-		   (int[])
-    {16,12,7,8,16,8,2});
-
-    RB_FOREACH(tdmi, &tda->tda_muxes, tdmi_adapter_link) {
-
-      tdmi_displayname(tdmi, buf, sizeof(buf));
-
-      ajax_table_row_start(&ta, tdmi->tdmi_identifier);
-
-      ajax_table_cell(&ta, NULL,
-		      "<a href=\"javascript:void(0);\" "
-		      "onClick=\"new Ajax.Updater('servicepane', "
-		      "'/ajax/dvbmuxeditor/%s', "
-		      "{method: 'get', evalScripts: true})\""
-		      ">%s</a>",
-		      tdmi->tdmi_identifier, buf);
-
-      ajax_table_cell(&ta, "status", "%s", dvb_mux_status(tdmi, 0));
-      ajax_table_cell(&ta, "qual", "%d%%",
-		      dvb_quality_to_percent(tdmi->tdmi_quality));
-      ajax_table_cell(&ta, "state", "%s", dvb_mux_state(tdmi));
-      ajax_table_cell(&ta, "name", "%s", tdmi->tdmi_network ?: "Unknown");
-
-      n = m = 0;
-      LIST_FOREACH(t, &tdmi->tdmi_transports, tht_mux_link) {
-	n++;
-	if(transport_is_available(t))
-	  m++;
-      }
-      ajax_table_cell(&ta, "nsvc", "%d / %d", m, n);
-      ajax_table_cell_checkbox(&ta);
-    }
-    
-    ajax_table_row_start(&ta, NULL);
-    
-    ajax_table_cell(&ta, NULL,
-		    "<a href=\"javascript:void(0);\" "
-		    "onClick=\"new Ajax.Updater('servicepane', "
-		    "'/ajax/dvbmuxall/%s', "
-		    "{method: 'get', evalScripts: true})\""
-		    ">All</a>", tda->tda_identifier);
-
-    ajax_table_bottom(&ta);
-
-    htsbuf_qprintf(tq, "<hr><div style=\"overflow: auto; width: 100%\">");
-
-    ajax_button(tq, "Select all",  "mux_sel_all()");
-    ajax_button(tq, "Select none", "mux_sel_none()");
-    ajax_button(tq, "Delete selected...", 
-		   "mux_sel_do('dvbadapterdelmux/%s', '', '', true)",
-		   tda->tda_identifier);
-    htsbuf_qprintf(tq, "</div>\r\n");
-  }
-  if(tda->tda_fe_info != NULL) {
-    htsbuf_qprintf(tq, "<hr><div style=\"overflow: auto; width: 100%\">");
-
-    ajax_button(tq, "Add new mux...",  
-		"new Ajax.Updater('servicepane', "
-		"'/ajax/dvbadapteraddmux/%s', "
-		"{method: 'get', evalScripts: true})\"",
-		tda->tda_identifier);
-    htsbuf_qprintf(tq, "</div>\r\n");
-  }
-  http_output_html(hc, hr);
-  return 0;
-}
-
-/**
- *
- */
-static int
-dvbsvccmp(th_transport_t *a, th_transport_t *b)
-{
-  if(a->tht_dvb_mux_instance == b->tht_dvb_mux_instance)
-    return a->tht_dvb_service_id - b->tht_dvb_service_id;
-  
-  return a->tht_dvb_mux_instance->tdmi_fe_params.frequency - 
-    b->tht_dvb_mux_instance->tdmi_fe_params.frequency;
-}
-
-/**
- * Display detailes about a mux
- */
-static int
-ajax_dvbmuxeditor(http_connection_t *hc, http_reply_t *hr, 
-		  const char *remain, void *opaque)
-{
-  th_dvb_mux_instance_t *tdmi;
-  htsbuf_queue_t *tq = &hr->hr_q;
-  char buf[1000];
-  th_transport_t *t;
-  struct th_transport_tree tree;
-  int n = 0;
-
-  if(remain == NULL || (tdmi = dvb_mux_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  tdmi_displayname(tdmi, buf, sizeof(buf));
-
-  RB_INIT(&tree);
-
-  LIST_FOREACH(t, &tdmi->tdmi_transports, tht_mux_link) {
-    if(transport_is_available(t)) {
-      RB_INSERT_SORTED(&tree, t, tht_tmp_link, dvbsvccmp);
-      n++;
-    }
-  }
-
-  ajax_box_begin(tq, AJAX_BOX_SIDEBOX, NULL, NULL, buf);
-  ajax_transport_build_list(hc, tq, &tree, n);
-  ajax_box_end(tq, AJAX_BOX_SIDEBOX);
-
-  http_output_html(hc, hr);
-  return 0;
-}
-
-/**
- * Display all transports on an adapter
- */
-static int
-ajax_dvbmuxall(http_connection_t *hc, http_reply_t *hr, 
-	       const char *remain, void *opaque)
-{
-  th_dvb_adapter_t *tda;
-  th_dvb_mux_instance_t *tdmi;
-  htsbuf_queue_t *tq = &hr->hr_q;
-  th_transport_t *t;
-  struct th_transport_tree tree;
-  int n = 0;
-  char buf[100];
-
-  if(remain == NULL || (tda = dvb_adapter_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  snprintf(buf, sizeof(buf), "All services on %s\n", tda->tda_displayname); 
-
-  RB_INIT(&tree);
-
-  RB_FOREACH(tdmi, &tda->tda_muxes, tdmi_adapter_link) {
-    LIST_FOREACH(t, &tdmi->tdmi_transports, tht_mux_link) {
-      if(transport_is_available(t)) {
-	RB_INSERT_SORTED(&tree, t, tht_tmp_link, dvbsvccmp);
-	n++;
-      }
-    }
-  }
-
-  ajax_box_begin(tq, AJAX_BOX_SIDEBOX, NULL, NULL, buf);
-  ajax_transport_build_list(hc, tq, &tree, n);
-  ajax_box_end(tq, AJAX_BOX_SIDEBOX);
-
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-/**
- * Delete muxes on an adapter
- */
-static int
-ajax_adapterdelmux(http_connection_t *hc, http_reply_t *hr, 
-		   const char *remain, void *opaque)
-{
-  th_dvb_adapter_t *tda;
-  th_dvb_mux_instance_t *tdmi;
-  htsbuf_queue_t *tq = &hr->hr_q;
-  http_arg_t *ra;
-
-  if(remain == NULL || (tda = dvb_adapter_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  TAILQ_FOREACH(ra, &hc->hc_req_args, link) {
-    if(strcmp(ra->val, "selected"))
-      continue;
-
-    if((tdmi = dvb_mux_find_by_identifier(ra->key)) == NULL)
-      continue;
-
-    dvb_mux_destroy(tdmi);
-  }
- 
-  htsbuf_qprintf(tq,
-	      "new Ajax.Updater('dvbadaptereditor', "
-	      "'/ajax/dvbadaptereditor/%s', "
-	      "{method: 'get', evalScripts: true});",
-	      tda->tda_identifier);
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  return 0;
-}
-
-/**
- * Rename adapter
- */
-static int
-ajax_adapterrename(http_connection_t *hc, http_reply_t *hr, 
-		   const char *remain, void *opaque)
-{
-  th_dvb_adapter_t *tda;
-
-  htsbuf_queue_t *tq = &hr->hr_q;
-  const char *s;
-
-  if(remain == NULL || (tda = dvb_adapter_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  if((s = http_arg_get(&hc->hc_req_args, "newname")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  free(tda->tda_displayname);
-  tda->tda_displayname = strdup(s);
-  dvb_tda_save(tda);
- 
-  htsbuf_qprintf(tq,
-	      "$('adaptername_%s').innerHTML='%s';",
-	      tda->tda_identifier, tda->tda_displayname);
-
-  htsbuf_qprintf(tq,
-	      "new Ajax.Updater('summary_%s', "
-	      "'/ajax/dvbadaptersummary/%s', {method: 'get'})",
-	    tda->tda_identifier, tda->tda_identifier);
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  return 0;
-}
-
-
-/**
- * Rename adapter
- */
-static int
-ajax_dvbnetworkinfo(http_connection_t *hc, http_reply_t *hr, 
-		    const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  const char *s;
-
-  if(remain == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  if(dvb_mux_preconf_get(atoi(remain), NULL, &s) >= 0)
-    htsbuf_qprintf(tq, "%s", s);
-
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-
-
-/**
- * Rename adapter
- */
-static int
-ajax_dvbadapteraddnetwork(http_connection_t *hc, http_reply_t *hr, 
-			  const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  const char *s;
-  th_dvb_adapter_t *tda;
-
-
-  if(remain == NULL || (tda = dvb_adapter_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  if((s = http_arg_get(&hc->hc_req_args, "network")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-
-  dvb_mux_preconf_add(tda, atoi(s));
-
-  htsbuf_qprintf(tq, 
-	      "$('servicepane').innerHTML='';\r\n");
-
-  htsbuf_qprintf(tq, 
-	      "new Ajax.Updater('dvbmuxlist_%s', "
-	      "'/ajax/dvbadaptermuxlist/%s', "
-	      "{method: 'get', evalScripts: true});\r\n",
-	      tda->tda_identifier, tda->tda_identifier);
-
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  return 0;
-}
-
-/**
- * Clone adapter
- */
-static int
-ajax_dvbadapterclone(http_connection_t *hc, http_reply_t *hr, 
-		     const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  th_dvb_adapter_t *src, *dst;
-  const char *s;
-
-  if(remain == NULL || (dst = dvb_adapter_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-  
-  if((s = http_arg_get(&hc->hc_req_args, "source")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if((src = dvb_adapter_find_by_identifier(s)) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  printf("Clone from %s to %s\n", src->tda_displayname, dst->tda_displayname);
-
-  dvb_tda_clone(dst, src);
-
-  htsbuf_qprintf(tq, "new Ajax.Updater('dvbadaptereditor', "
-	      "'/ajax/dvbadaptereditor/%s', "
-	      "{method: 'get', evalScripts: true});\r\n",
-	      dst->tda_identifier);
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  return 0;
-}
-
-
-/**
- * Delete adapter
- */
-static int
-ajax_dvbadapterdelete(http_connection_t *hc, http_reply_t *hr, 
-		      const char *remain, void *opaque)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  th_dvb_adapter_t *tda;
-
-  if(remain == NULL || (tda = dvb_adapter_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  htsbuf_qprintf(tq, "var o = $('summary_%s'); o.parentNode.removeChild(o);\r\n",
-	      tda->tda_identifier);
-  htsbuf_qprintf(tq, "$('dvbadaptereditor').innerHTML ='';\r\n");
-
-  dvb_tda_destroy(tda);
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  return 0;
-}
-
-
-/**
- *
- */
-void
-ajax_config_dvb_init(void)
-{
-  http_path_add("/ajax/dvbadaptermuxlist"   , NULL, ajax_adaptermuxlist,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/dvbadaptersummary"   , NULL, ajax_adaptersummary,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/dvbadapterrename"    , NULL, ajax_adapterrename,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/dvbadaptereditor",     NULL, ajax_adaptereditor,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/dvbadapteraddmux",     NULL, ajax_adapteraddmux,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/dvbadapterdelmux",     NULL, ajax_adapterdelmux,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/dvbadaptercreatemux",  NULL, ajax_adaptercreatemux,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/dvbmuxeditor",         NULL, ajax_dvbmuxeditor,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/dvbmuxall",            NULL, ajax_dvbmuxall,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/dvbnetworkinfo",       NULL, ajax_dvbnetworkinfo,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/dvbadapteraddnetwork", NULL, ajax_dvbadapteraddnetwork,
-		AJAX_ACCESS_CONFIG);
- http_path_add("/ajax/dvbadapterclone",       NULL, ajax_dvbadapterclone,
-		AJAX_ACCESS_CONFIG);
- http_path_add("/ajax/dvbadapterdelete",      NULL, ajax_dvbadapterdelete,
-		AJAX_ACCESS_CONFIG);
-
-}
diff --git a/ajaxui/ajaxui_config_transport.c b/ajaxui/ajaxui_config_transport.c
deleted file mode 100644
index a6f357a3..00000000
--- a/ajaxui/ajaxui_config_transport.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- *  tvheadend, AJAX / HTML user interface
- *  Copyright (C) 2008 Andreas Öman
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _GNU_SOURCE
-
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "tvhead.h"
-#include "http.h"
-#include "ajaxui.h"
-#include "channels.h"
-#include "psi.h"
-#include "transports.h"
-#include "serviceprobe.h"
-
-
-/**
- * 
- */
-int
-ajax_transport_build_list(http_connection_t *hc, htsbuf_queue_t *tq,
-			  struct th_transport_tree *tlist, int numtransports)
-{
-  th_transport_t *t;
-  ajax_table_t ta;
-
-  htsbuf_qprintf(tq, "<script type=\"text/javascript\">\r\n"
-	      "//<![CDATA[\r\n");
-  
-  /* Select all */
-  htsbuf_qprintf(tq, "select_all = function() {\r\n");
-  RB_FOREACH(t, tlist, tht_tmp_link) {
-    htsbuf_qprintf(tq, 
-		"$('sel_%s').checked = true;\r\n",
-		t->tht_identifier);
-  }
-  htsbuf_qprintf(tq, "}\r\n");
-
-  /* Select none */
-  htsbuf_qprintf(tq, "select_none = function() {\r\n");
-  RB_FOREACH(t, tlist, tht_tmp_link) {
-    htsbuf_qprintf(tq, 
-		"$('sel_%s').checked = false;\r\n",
-		t->tht_identifier);
-  }
-  htsbuf_qprintf(tq, "}\r\n");
-
-  /* Invert selection */
-  htsbuf_qprintf(tq, "select_invert = function() {\r\n");
-  RB_FOREACH(t, tlist, tht_tmp_link) {
-    htsbuf_qprintf(tq, 
-		"$('sel_%s').checked = !$('sel_%s').checked;\r\n",
-		t->tht_identifier, t->tht_identifier);
-  }
-  htsbuf_qprintf(tq, "}\r\n");
-
-  /* Select TV transports */
-  htsbuf_qprintf(tq, "select_tv = function() {\r\n");
-  RB_FOREACH(t, tlist, tht_tmp_link) {
-    htsbuf_qprintf(tq, 
-		"$('sel_%s').checked = %s;\r\n",
-		t->tht_identifier, 
-		transport_is_tv(t) ? "true" : "false");
-  }
-  htsbuf_qprintf(tq, "}\r\n");
-
-  /* Select unscrambled TV transports */
-  htsbuf_qprintf(tq, "select_tv_nocrypt = function() {\r\n");
-  RB_FOREACH(t, tlist, tht_tmp_link) {
-    htsbuf_qprintf(tq, 
-		"$('sel_%s').checked = %s;\r\n",
-		t->tht_identifier, 
-		transport_is_tv(t) && !t->tht_scrambled ? "true" : "false");
-  }
-  htsbuf_qprintf(tq, "}\r\n");
-
-  /* Perform the given op on all transprots */
-  htsbuf_qprintf(tq, "selected_do = function(op) {\r\n"
-	      "var h = new Hash();\r\n"
-	      );
-
-  RB_FOREACH(t, tlist, tht_tmp_link) {
-    htsbuf_qprintf(tq, 
-		"if($('sel_%s').checked) {h.set('%s', 'selected') }\r\n",
-		t->tht_identifier, t->tht_identifier);
-  }
-
-  htsbuf_qprintf(tq, " new Ajax.Request('/ajax/transport_op/' + op, "
-	      "{parameters: h});\r\n");
-  htsbuf_qprintf(tq, "}\r\n");
-
-  htsbuf_qprintf(tq, 
-	      "\r\n//]]>\r\n"
-	      "</script>\r\n");
-
-  /* Top */
-
-  htsbuf_qprintf(tq, "<form id=\"transports\">");
-
-  ajax_table_top(&ta, hc, tq,
-		 (const char *[]){"Last status", "Crypto",
-				    "Type", "Source service",
-				    "", "Target channel", "", NULL},
-		 (int[]){8,4,4,12,3,12,1});
-
-  RB_FOREACH(t, tlist, tht_tmp_link) {
-    ajax_table_row_start(&ta, t->tht_identifier);
-
-    ajax_table_cell(&ta, "status", 
-		    transport_status_to_text(t->tht_last_status));
-    ajax_table_cell(&ta, NULL, "%s", t->tht_scrambled ? "Yes" : "No");
-    ajax_table_cell(&ta, NULL, "%s", transport_servicetype_txt(t));
-    ajax_table_cell(&ta, NULL, "%s", t->tht_svcname ?: "");
-
-    ajax_table_cell(&ta, NULL, 
-		    "<a href=\"javascript:void(0)\" "
-		    "onClick=\"new Ajax.Request('/ajax/transport_op/toggle', "
-		    "{parameters: {'%s': 'selected'}})\">"
-		    "<img id=\"map_%s\" src=\"/gfx/%smapped.png\"></a>",
-		    t->tht_identifier, t->tht_identifier,
-		    t->tht_ch ? "" : "un");
-
-    if(t->tht_ch == NULL) {
-      /* Unmapped */
-      ajax_table_cell(&ta, "chname", 
-		      "<a href=\"javascript:void(0)\" "
-		      "onClick=\"tentative_chname('chname%s', "
-		      "'/ajax/transport_rename_channel/%s', '%s')\">"
-		      "%s</a>",
-		      t->tht_identifier, t->tht_identifier,
-		      t->tht_chname, t->tht_chname);
-    } else {
-      ajax_table_cell(&ta, "chname", "%s", t->tht_ch->ch_name);
-    }
-
-    ajax_table_cell_checkbox(&ta);
-  }
-
-  ajax_table_bottom(&ta);
-
-  htsbuf_qprintf(tq, "<hr>\r\n");
-
-  htsbuf_qprintf(tq, "<div style=\"overflow: auto; width: 100%\">");
-
-  ajax_button(tq, "Select all",  "select_all()");
-  ajax_button(tq, "Select none",  "select_none()");
-
-  //  htsbuf_qprintf(tq, "</div>\r\n");
-  //htsbuf_qprintf(tq, "<div style=\"overflow: auto; width: 100%\">");
-
-  ajax_button(tq, "Map selected",   "selected_do('map');");
-  ajax_button(tq, "Unmap selected", "selected_do('unmap');");
-  ajax_button(tq, "Test and map selected", "selected_do('probe');");
-  htsbuf_qprintf(tq, "</div>");
-
-  htsbuf_qprintf(tq, "</form>");
-  return 0;
-}
-
-/**
- *  Rename of unmapped channel
- */
-static int
-ajax_transport_rename_channel(http_connection_t *hc, http_reply_t *hr,
-			      const char *remain, void *opaque)
-{
-  th_transport_t *t;
-  const char *newname;
-  htsbuf_queue_t *tq = &hr->hr_q;
-
-  if(remain == NULL || (t = transport_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  if((newname = http_arg_get(&hc->hc_req_args, "newname")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  free((void *)t->tht_chname);
-  t->tht_chname = strdup(newname);
-
-  ajax_a_jsfuncf(tq, newname,
-		 "tentative_chname('chname_%s', "
-		 "'/ajax/transport_rename_channel/%s', '%s')",
-		 t->tht_identifier, t->tht_identifier, newname);
-       
-  http_output_html(hc, hr);
-  t->tht_config_change(t);
-  return 0;
-}
-
-
-/**
- *
- */
-void
-ajax_transport_build_mapper_state(char *buf, size_t siz, th_transport_t *t,
-				  int mapped)
-{
-  if(mapped) {
-    snprintf(buf, siz,
-	     "$('chname_%s').innerHTML='%s';\n\r"
-	     "$('map_%s').src='/gfx/mapped.png';\n\r",
-		t->tht_identifier, t->tht_ch->ch_name,
-		t->tht_identifier);
-  } else {
-    snprintf(buf, siz,
-	     "$('chname_%s').innerHTML='"
-	     "<a href=\"javascript:void(0)\" "
-	     "onClick=\"javascript:tentative_chname(\\'chname_%s\\', "
-	     "\\'/ajax/transport_rename_channel/%s\\', \\'%s\\')\">%s</a>"
-	     "';\n\r"
-	     "$('map_%s').src='/gfx/unmapped.png';\n\r",
-	     t->tht_identifier, t->tht_identifier, t->tht_identifier,
-	     t->tht_chname, t->tht_chname, t->tht_identifier);
-  }
-}
-
-
-/**
- *
- */
-static void
-ajax_map_unmap_channel(th_transport_t *t, htsbuf_queue_t *tq, int map)
-{
-  char buf[1000];
-
-  if(map)
-    transport_map_channel(t, NULL);
-  else
-    transport_unmap_channel(t);
-
-  ajax_transport_build_mapper_state(buf, sizeof(buf), t, map);
-  htsbuf_qprintf(tq, "%s", buf);
-}
-
-
-/**
- *
- */
-static int
-ajax_transport_op(http_connection_t *hc, http_reply_t *hr, 
-		  const char *remain, void *opaque)
-{
-  th_transport_t *t;
-  htsbuf_queue_t *tq = &hr->hr_q;
-  const char *op = remain;
-  http_arg_t *ra;
-
-  if(op == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-  
-  TAILQ_FOREACH(ra, &hc->hc_req_args, link) {
-    if(strcmp(ra->val, "selected"))
-      continue;
-
-    if((t = transport_find_by_identifier(ra->key)) == NULL)
-      continue;
-
-    if(!strcmp(op, "toggle")) {
-      ajax_map_unmap_channel(t, tq, t->tht_ch ? 0 : 1);
-    } else if(!strcmp(op, "map") && t->tht_ch == NULL) {
-      ajax_map_unmap_channel(t, tq, 1);
-    } else if(!strcmp(op, "unmap") && t->tht_ch != NULL) {
-      ajax_map_unmap_channel(t, tq, 0);
-    } else if(!strcmp(op, "probe")) {
-      serviceprobe_add(t);
-      continue;
-    }
-    t->tht_config_change(t);
-  }
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-
-  return 0;
-}
-
-
-/**
- *
- */
-static int
-ajax_transport_chdisable(http_connection_t *hc, http_reply_t *hr, 
-			 const char *remain, void *opaque)
-{
-  th_transport_t *t;
-  const char *s;
-
-  if(remain == NULL || (t = transport_find_by_identifier(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  if((s = http_arg_get(&hc->hc_req_args, "enabled")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  t->tht_disabled = !strcasecmp(s, "false");
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  t->tht_config_change(t);
-  return 0;
-}
-
-
-/**
- *
- */
-void
-ajax_config_transport_init(void)
-{
-  http_path_add("/ajax/transport_rename_channel", NULL,
-		ajax_transport_rename_channel,
-		AJAX_ACCESS_CONFIG);
-
-  http_path_add("/ajax/transport_op", NULL,
-		ajax_transport_op,
-		AJAX_ACCESS_CONFIG);
-
-  http_path_add("/ajax/transport_chdisable", NULL,
-		ajax_transport_chdisable,
-		AJAX_ACCESS_CONFIG);
-
-}
diff --git a/ajaxui/ajaxui_config_xmltv.c b/ajaxui/ajaxui_config_xmltv.c
deleted file mode 100644
index d5f96e14..00000000
--- a/ajaxui/ajaxui_config_xmltv.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- *  tvheadend, AJAX / HTML user interface
- *  Copyright (C) 2008 Andreas Öman
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _GNU_SOURCE
-
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "tvhead.h"
-#include "http.h"
-#include "ajaxui.h"
-#include "channels.h"
-#include "epg_xmltv.h"
-#include "psi.h"
-#include "transports.h"
-
-#include "ajaxui_mailbox.h"
-
-
-
-/**
- * XMLTV configuration
- */
-int
-ajax_config_xmltv_tab(http_connection_t *hc, http_reply_t *hr)
-{
-  htsbuf_queue_t *tq = &hr->hr_q;
-  xmltv_grabber_t *xg;
-  int ngrabbers = 0;
-  ajax_table_t ta;
-
-  htsbuf_qprintf(tq, "<div style=\"overflow: auto; width: 100%\">");
-
-  switch(xmltv_globalstatus) {
-  default:
-    htsbuf_qprintf(tq, "<p style=\"text-align: center; font-weight: bold\">"
-		"XMLTV subsystem is not yet fully initialized, please retry "
-		"in a few seconds</p></div>");
-    http_output_html(hc, hr);
-    return 0;
-
-  case XMLTVSTATUS_FIND_GRABBERS_NOT_FOUND:
-    htsbuf_qprintf(tq, "<p style=\"text-align: center; font-weight: bold\">"
-		"XMLTV subsystem can not initialize</p>"
-		"<p style=\"text-align: center\">"
-		"Make sure that the 'tv_find_grabbers' executable is in "
-		"the system path</p></div>");
-    http_output_html(hc, hr);
-    return 0;
-
-  case XMLTVSTATUS_RUNNING:
-    break;
-  }
-
-  htsbuf_qprintf(tq, "<div style=\"float: left; width:45%\">");
-
-  ajax_box_begin(tq, AJAX_BOX_SIDEBOX, NULL, NULL, "XMLTV grabbers");
-
-  LIST_FOREACH(xg, &xmltv_grabbers, xg_link)
-    ngrabbers++;
-
-  ajax_table_top(&ta, hc, tq,
-		 (const char *[]){"Grabber", "Status", NULL},
-		 (int[]){4,2});
-
-  LIST_FOREACH(xg, &xmltv_grabbers, xg_link) {
-
-    ajax_table_row_start(&ta, xg->xg_identifier);
-    ajax_table_cell(&ta, NULL,
-	     "<a href=\"javascript:void(0);\" "
-	     "onClick=\"new Ajax.Updater('grabberpane', "
-	     "'/ajax/xmltvgrabber/%s', {method: 'get', evalScripts: true})\""
-	     ">%s</a>", xg->xg_identifier, xg->xg_title);
-
-    ajax_table_cell(&ta, "status", xmltv_grabber_status(xg));
-  }
-  ajax_table_bottom(&ta);
-
-  ajax_box_end(tq, AJAX_BOX_SIDEBOX);
-
-  htsbuf_qprintf(tq, "</div>"
-	      "<div id=\"grabberpane\" style=\"float: left; width:55%\">"
-	      "</div>");
-
-  htsbuf_qprintf(tq, "</div>");
-  http_output_html(hc, hr);
-  return 0;
-}
-
-/**
- * Generate displaylisting
- */
-static void
-xmltv_grabber_chlist(htsbuf_queue_t *tq, xmltv_grabber_t *xg)
-{
-  xmltv_channel_t *xc;
-  channel_group_t *tcg;
-  channel_t *ch;
-
-  htsbuf_qprintf(tq,
-	      "<div style=\"overflow: auto; height: 450px\">");
-
-  TAILQ_FOREACH(xc, &xg->xg_channels, xc_link) {
-
-    htsbuf_qprintf(tq,
-		"<div style=\"overflow: auto; width: 100%%\">");
-
-    htsbuf_qprintf(tq, "<div class=\"iconbackdrop\">");
-    if(xc->xc_icon_url != NULL) {
-      htsbuf_qprintf(tq,
-		  "<img style=\"border: 0px;\" src=\"%s\" height=62px\">",
-		  xc->xc_icon_url);
-    } else {
-      htsbuf_qprintf(tq,
-		  "<div style=\"margin-top: 20px; text-align: center\">"
-		  "No icon</div>");
-    }
-    htsbuf_qprintf(tq, "</div>"); /* iconbackdrop */
-
-
-    htsbuf_qprintf(tq,
-		"<div class=\"infoprefixwide\">Name:</div>"
-		"<div>%s (%s)</div>", xc->xc_displayname, xc->xc_name);
-
-    htsbuf_qprintf(tq,
-		"<div class=\"infoprefixwide\">Auto mapper:</div>"
-		"<div>%s</div>", xc->xc_bestmatch ?: "(no channel)");
-
-    htsbuf_qprintf(tq,
-		"<div class=\"infoprefixwidefat\">Channel:</div>"
-		"<select class=\"textinput\" "
-		"onChange=\"new Ajax.Request('/ajax/xmltvgrabberchmap/%s', "
-		"{parameters: { xmltvch: '%s', channel: this.value }})\">",
-		xg->xg_identifier, xc->xc_name);
-
-    htsbuf_qprintf(tq, "<option value=\"auto\">Automatic mapper</option>",
-		!xc->xc_disabled && xc->xc_channel == NULL ? " selected" : "");
-
-    htsbuf_qprintf(tq, "<option value=\"none\"%s>No channel</option>",
-		xc->xc_disabled ? " selected" : "");
- 
-    TAILQ_FOREACH(tcg, &all_channel_groups, tcg_global_link) {
-      if(tcg->tcg_hidden)
-	continue;
-
-      TAILQ_FOREACH(ch, &tcg->tcg_channels, ch_group_link) {
-	if(LIST_FIRST(&ch->ch_transports) == NULL)
-	  continue;
-
-	htsbuf_qprintf(tq, "<option value=\"%d\"%s>%s</option>",
-		    ch->ch_tag,
-		    !strcmp(ch->ch_name, xc->xc_channel ?: "")
-		    ? " selected " : "",  ch->ch_name);
-      }
-    }
-    htsbuf_qprintf(tq, "</select>");
-    htsbuf_qprintf(tq, "</div><hr>\r\n");
-  }
-  htsbuf_qprintf(tq, "</div>");
-}
-
-
-/**
- * Display detailes about a grabber
- */
-static int
-ajax_xmltvgrabber(http_connection_t *hc, http_reply_t *hr, 
-		  const char *remain, void *opaque)
-{
-  xmltv_grabber_t *xg;
-  htsbuf_queue_t *tq = &hr->hr_q;
-
-
-  if(remain == NULL || (xg = xmltv_grabber_find(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  ajax_box_begin(tq, AJAX_BOX_SIDEBOX, NULL, NULL, xg->xg_title);
-  
-  htsbuf_qprintf(tq,"<div id=\"details_%s\">", xg->xg_identifier);
-
-  if(xg->xg_enabled == 0) {
-    htsbuf_qprintf(tq,
-		"<p>This grabber is currently not enabled, click "
-		"<a href=\"javascript:void(0);\" "
-		"onClick=\"new Ajax.Request('/ajax/xmltvgrabbermode/%s', "
-		"{parameters: {'mode': 'enable'}})\">here</a> "
-		"to enable it</p>");
-  } else if(xg->xg_status == XMLTV_GRAB_OK) {
-    xmltv_grabber_chlist(tq, xg);
-  } else {
-    htsbuf_qprintf(tq, "<p>%s</p>", xmltv_grabber_status_long(xg));
-  }
-
-  htsbuf_qprintf(tq,"</div>");
-
-  ajax_box_end(tq, AJAX_BOX_SIDEBOX);
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-
-/**
- * Enable / Disable a grabber
- */
-static int
-ajax_xmltvgrabbermode(http_connection_t *hc, http_reply_t *hr, 
-		      const char *remain, void *opaque)
-{
-  xmltv_grabber_t *xg;
-  htsbuf_queue_t *tq = &hr->hr_q;
-
-  if(remain == NULL || (xg = xmltv_grabber_find(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  xmltv_grabber_enable(xg);
-
-  htsbuf_qprintf(tq,"$('details_%s').innerHTML='Please wait...';",
-	      xg->xg_identifier);
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  return 0;
-}
-
-
-
-/**
- * Enable / Disable a grabber
- */
-static int
-ajax_xmltvgrabberlist(http_connection_t *hc, http_reply_t *hr, 
-		      const char *remain, void *opaque)
-{
-  xmltv_grabber_t *xg;
-  htsbuf_queue_t *tq = &hr->hr_q;
-
-  if(remain == NULL || (xg = xmltv_grabber_find(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  xmltv_grabber_chlist(tq, xg);
-
-  http_output_html(hc, hr);
-  return 0;
-}
-
-
-/**
- * Change mapping of a channel for a grabber
- */
-static int
-ajax_xmltvgrabberchmap(http_connection_t *hc, http_reply_t *hr, 
-		       const char *remain, void *opaque)
-{
-  xmltv_grabber_t *xg;
-  xmltv_channel_t *xc;
-  const char *xmltvname;
-  const char *chname;
-  channel_t *ch;
-  //  htsbuf_queue_t *tq = &hr->hr_tq;
-  
-  if(remain == NULL || (xg = xmltv_grabber_find(remain)) == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  if((xmltvname = http_arg_get(&hc->hc_req_args, "xmltvch")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  if((chname = http_arg_get(&hc->hc_req_args, "channel")) == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  TAILQ_FOREACH(xc, &xg->xg_channels, xc_link)
-    if(!strcmp(xc->xc_name, xmltvname))
-      break;
-
-  if(xc == NULL)
-    return HTTP_STATUS_BAD_REQUEST;
-
-  pthread_mutex_lock(&xg->xg_mutex);
-
-  free(xc->xc_channel);
-  xc->xc_channel = NULL;
-  xc->xc_disabled = 0;
-    
-  if(!strcmp(chname, "none")) {
-    xc->xc_disabled = 1;
-  } else if(!strcmp(chname, "auto")) {
-  } else if((ch = channel_by_tag(atoi(chname))) != NULL) {
-    xc->xc_disabled = 0;
-    xc->xc_channel = strdup(ch->ch_name);
-  }
-  pthread_mutex_unlock(&xg->xg_mutex);
-
-  xmltv_config_save();
-
-  http_output(hc, hr, "text/javascript; charset=UTF8", NULL, 0);
-  return 0;
-}
-
-
-
-/**
- *
- */
-void
-ajax_config_xmltv_init(void)
-{
-  http_path_add("/ajax/xmltvgrabber" ,      NULL, ajax_xmltvgrabber,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/xmltvgrabbermode" ,  NULL, ajax_xmltvgrabbermode,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/xmltvgrabberlist" ,  NULL, ajax_xmltvgrabberlist,
-		AJAX_ACCESS_CONFIG);
-  http_path_add("/ajax/xmltvgrabberchmap" , NULL, ajax_xmltvgrabberchmap,
-		AJAX_ACCESS_CONFIG);
-
-}
diff --git a/ajaxui/ajaxui_mailbox.c b/ajaxui/ajaxui_mailbox.c
deleted file mode 100644
index f43203c2..00000000
--- a/ajaxui/ajaxui_mailbox.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- *  tvheadend, AJAX / HTML Mailboxes
- *  Copyright (C) 2008 Andreas Öman
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <pthread.h>
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <libavutil/md5.h>
-
-#include "tvhead.h"
-#include "dispatch.h"
-#include "http.h"
-#include "ajaxui.h"
-#include "transports.h"
-#include "epg_xmltv.h"
-#include "dvb_support.h"
-#include "ajaxui_mailbox.h"
-#include "cwc.h"
-
-#define MAILBOX_UNUSED_TIMEOUT      15
-#define MAILBOX_EMPTY_REPLY_TIMEOUT 10
-
-
-//#define mbdebug(fmt...) printf(fmt);
-#define mbdebug(fmt...)
-
-
-static LIST_HEAD(, ajaxui_mailbox) mailboxes;
-
-int mailbox_tally;
-
-TAILQ_HEAD(ajaxui_letter_queue, ajaxui_letter);
-
-typedef struct ajaxui_letter {
-  TAILQ_ENTRY(ajaxui_letter) al_link;
-  char *al_payload_a;
-  char *al_payload_b;
-} ajaxui_letter_t;
-
-
-typedef struct ajaxui_mailbox {
-  LIST_ENTRY(ajaxui_mailbox) amb_link;
-
-  char *amb_boxid; /* an md5hash */
-
-  dtimer_t amb_timer;
-
-  http_reply_t *amb_hr; /* Pending request */
-
-  struct ajaxui_letter_queue amb_letters;
-
-} ajaxui_mailbox_t;
-
-
-/**
- *
- */
-static void
-al_destroy(ajaxui_mailbox_t *amb, ajaxui_letter_t *al)
-{
-  TAILQ_REMOVE(&amb->amb_letters, al, al_link);
-  free(al->al_payload_a);
-  free(al->al_payload_b);
-  free(al);
-}
-
-
-/**
- *
- */
-static void
-amb_destroy(ajaxui_mailbox_t *amb)
-{
-  ajaxui_letter_t *al;
-
-  mbdebug("mailbox[%s]: destroyed\n", amb->amb_boxid);
-
-  while((al = TAILQ_FIRST(&amb->amb_letters)) != NULL)
-    al_destroy(amb, al);
-
-  LIST_REMOVE(amb, amb_link);
-
-  dtimer_disarm(&amb->amb_timer);
-
-  free(amb->amb_boxid);
-  free(amb);
-}
-
-
-
-/**
- *
- */
-static void
-ajax_mailbox_unused(void *opaque, int64_t now)
-{
-  ajaxui_mailbox_t *amb = opaque;
-  assert(amb->amb_hr == NULL);
-  amb_destroy(amb);
-}
-
-/**
- *
- */
-static void
-ajax_mailbox_connection_lost(http_reply_t *hr, void *opaque)
-{
-  ajaxui_mailbox_t *amb = opaque;
-  assert(hr == amb->amb_hr);
-  amb_destroy(amb);
-}
-
-
-
-/**
- *
- */
-static ajaxui_mailbox_t *
-ajax_mailbox_create(const char *id)
-{
-  ajaxui_mailbox_t *amb = calloc(1, sizeof(ajaxui_mailbox_t));
-
-  amb->amb_boxid = strdup(id);
-
-  mailbox_tally++;
-
-  LIST_INSERT_HEAD(&mailboxes, amb, amb_link);
-
-  TAILQ_INIT(&amb->amb_letters);
-
-  dtimer_arm(&amb->amb_timer, ajax_mailbox_unused, amb,
-	     MAILBOX_UNUSED_TIMEOUT);
-  return amb;
-}
-
-/**
- *
- */
-void
-ajax_mailbox_start(htsbuf_queue_t *hq)
-{
-  struct timeval tv;
-  uint8_t sum[16];
-  char id[33];
-  int i;
-  struct AVMD5 *ctx;
-
-  ctx = alloca(av_md5_size);
-
-  gettimeofday(&tv, NULL);
-
-  av_md5_init(ctx);
-  av_md5_update(ctx, (void *)&tv, sizeof(tv));
-  av_md5_update(ctx, (void *)&mailbox_tally, sizeof(uint32_t));
-  av_md5_final(ctx, sum);
-
-  for(i = 0; i < 16; i++) {
-    id[i * 2 + 0] = "0123456789abcdef"[sum[i] >> 4];
-    id[i * 2 + 1] = "0123456789abcdef"[sum[i] & 15];
-  }
-  id[32] = 0;
-
-  mbdebug("Generated mailbox %s\n", id);
-
-  ajax_mailbox_create(id);
-  ajax_js(hq, "mailboxquery('%s')", id);
-}
-
-
-/**
- *
- */
-static void
-ajax_mailbox_reply(ajaxui_mailbox_t *amb, http_reply_t *hr)
-{
-  ajaxui_letter_t *al;
-
-  /* Modify the hidden element (as described in ajax_mailbox_start()), 
-     if this div no longer exist, the rest of the javascript will bail
-     out and we will not be reloaded */
-
-  mbdebug("mailbox[%s]: sending reply\n", amb->amb_boxid);
-
-  while((al = TAILQ_FIRST(&amb->amb_letters)) != NULL) {
-    htsbuf_qprintf(&hr->hr_q, "try {\r\n");
-    htsbuf_qprintf(&hr->hr_q, "%s%s",
-		   al->al_payload_a, al->al_payload_b ?: "");
-    mbdebug("\t%s%s", al->al_payload_a, al->al_payload_b ?: "");
-
-    htsbuf_qprintf(&hr->hr_q, "}\r\n"
-		"catch(err) {}\r\n");
-    al_destroy(amb, al);
-  }
-
-  htsbuf_qprintf(&hr->hr_q, "mailboxquery('%s');\r\n", amb->amb_boxid);
-
-  http_output(hr->hr_connection, hr, "text/javascript", NULL, 0);
-  amb->amb_hr = NULL;
-
-  /* Arm a timer in case the browser won't call back */
-  dtimer_arm(&amb->amb_timer, ajax_mailbox_unused, amb,
-	     MAILBOX_UNUSED_TIMEOUT);
-}
-
-/**
- *
- */
-static void
-ajax_mailbox_empty_reply(void *opaque, int64_t now)
-{
-  ajaxui_mailbox_t *amb = opaque;
-  http_reply_t *hr = amb->amb_hr;
-
-  ajax_mailbox_reply(amb, hr);
-  http_continue(hr->hr_connection);
-}
-
-
-/**
- * Poll callback
- *
- * Prepare the mailbox for reply
- */
-static int
-ajax_mailbox_poll(http_connection_t *hc, http_reply_t *hr, 
-		  const char *remain, void *opaque)
-{
-  ajaxui_mailbox_t *amb;
-
-  if(remain == NULL)
-    return HTTP_STATUS_NOT_FOUND;
-
-  mbdebug("mailbox[%s]: Incomming request ... ", remain);
-
-  LIST_FOREACH(amb, &mailboxes, amb_link)
-    if(!strcmp(amb->amb_boxid, remain))
-      break;
-
-  if(amb == NULL) {
-    amb = ajax_mailbox_create(remain);
-    mbdebug("creating mailbox ... ");
-  }
-
-  if(amb->amb_hr != NULL) {
-    mbdebug("mailbox already processing\n");
-    return 409;
-  }
-  if(TAILQ_FIRST(&amb->amb_letters) != NULL) {
-    /* Pending letters, direct reply */
-    mbdebug("direct reply\n");
-    ajax_mailbox_reply(amb, hr);
-    return 0;
-  }
-
-  mbdebug("nothing in queue, waiting\n");
-
-  amb->amb_hr = hr;
-
-  hr->hr_opaque = amb;
-  hr->hr_destroy = ajax_mailbox_connection_lost;
-
-  dtimer_arm(&amb->amb_timer, ajax_mailbox_empty_reply, amb,
-	     MAILBOX_EMPTY_REPLY_TIMEOUT);
-  return 0;
-}
-
-
-/**
- *
- */
-void
-ajax_mailbox_init(void)
-{
-  http_path_add("/ajax/mailbox",  NULL, ajax_mailbox_poll,
-		ACCESS_WEB_INTERFACE);
-}
-
-
-/**
- * Delayed delivery of mailbox replies
- */
-static void
-ajax_mailbox_deliver(void *opaque, int64_t now)
-{
-  ajaxui_mailbox_t *amb = opaque;
-  http_connection_t *hc;
-
-  hc = amb->amb_hr->hr_connection;
-  ajax_mailbox_reply(amb, amb->amb_hr);
-  http_continue(hc);
-}
-
-/**
- *
- */
-static void
-ajax_mailbox_add_to_subscription(const char *subscription, 
-				 const char *content_a, const char *content_b)
-{
-  ajaxui_mailbox_t *amb;
-  ajaxui_letter_t *al;
-
-  LIST_FOREACH(amb, &mailboxes, amb_link) {
-
-    /* Avoid inserting the same message twice */
-
-    TAILQ_FOREACH(al, &amb->amb_letters, al_link) {
-      if(!strcmp(al->al_payload_a, content_a))
-	break;
-    }
-
-    if(al == NULL) {
-
-      al = malloc(sizeof(ajaxui_letter_t));
-      al->al_payload_a = strdup(content_a);
-    } else {
-      /* Already exist, just move to tail */
-
-      TAILQ_REMOVE(&amb->amb_letters, al, al_link);
-      free(al->al_payload_b);
-    }
-
-    al->al_payload_b = content_b ? strdup(content_b) : NULL;
-
-    TAILQ_INSERT_TAIL(&amb->amb_letters, al, al_link);
-
-    if(amb->amb_hr != NULL)
-      dtimer_arm_hires(&amb->amb_timer, ajax_mailbox_deliver, amb, 
-		       getclock_hires() + 100000);
-  }
-}
-
-
-
-/**
- *
- */
-static void
-ajax_mailbox_update_div(const char *subscription, const char *prefix,
-			const char *postfix, const char *content)
-{
-  char buf_a[500];
-  char buf_b[500];
-
-  content = ajaxui_escape_apostrophe(content);
-
-  snprintf(buf_a, sizeof(buf_a), "$('%s_%s').innerHTML=", prefix, postfix);
-  snprintf(buf_b, sizeof(buf_b), "'%s';\n\r", content);
-
-  ajax_mailbox_add_to_subscription(subscription, buf_a, buf_b);
-}
-
-
-
-static void
-ajax_mailbox_reload_div(const char *subscription, const char *prefix,
-			const char *postfix, const char *url)
-{
-  char buf[1000];
-
-  snprintf(buf, sizeof(buf), "new Ajax.Updater('%s_%s', '%s', "
-	   "{method: 'get', evalScripts: true});\r\n",
-	   prefix, postfix, url);
-
-  ajax_mailbox_add_to_subscription(subscription, buf, NULL);
-}
-
-
-
-void
-ajax_mailbox_tdmi_state_change(th_dvb_mux_instance_t *tdmi)
-{
-  ajax_mailbox_update_div(tdmi->tdmi_adapter->tda_identifier,
-			  "state", tdmi->tdmi_identifier,
-			  dvb_mux_state(tdmi));
-}
-
-void
-ajax_mailbox_tdmi_qual_change(th_dvb_mux_instance_t *tdmi)
-{
-  char buf[10];
-  snprintf(buf, sizeof(buf), "%d%%",
-	   dvb_quality_to_percent(tdmi->tdmi_quality));
-  ajax_mailbox_update_div(tdmi->tdmi_adapter->tda_identifier,
-			  "qual", tdmi->tdmi_identifier,
-			  buf);
-}
-
-
-void
-ajax_mailbox_tdmi_name_change(th_dvb_mux_instance_t *tdmi)
-{
-  ajax_mailbox_update_div(tdmi->tdmi_adapter->tda_identifier,
-			  "name", tdmi->tdmi_identifier,
-			  tdmi->tdmi_network ?: "<noname>");
-}
-
-
-void
-ajax_mailbox_tdmi_status_change(th_dvb_mux_instance_t *tdmi)
-{
-  ajax_mailbox_update_div(tdmi->tdmi_adapter->tda_identifier,
-			  "status", tdmi->tdmi_identifier,
-			  tdmi->tdmi_last_status);
-}
-
-void
-ajax_mailbox_tdmi_services_change(th_dvb_mux_instance_t *tdmi)
-{
-  th_transport_t *t;
-  char buf[20];
-  int n, m;
-
-  n = m = 0;
-  LIST_FOREACH(t, &tdmi->tdmi_transports, tht_mux_link) {
-    n++;
-    if(transport_is_available(t))
-      m++;
-  }
-  snprintf(buf, sizeof(buf), "%d / %d", m, n);
-   
-  ajax_mailbox_update_div(tdmi->tdmi_adapter->tda_identifier,
-			  "nsvc", tdmi->tdmi_identifier,
-			  buf);
-}
-
-
-void
-ajax_mailbox_tda_change(th_dvb_adapter_t *tda)
-{
-  char buf[500];
-
-  snprintf(buf, sizeof(buf), "/ajax/dvbadaptermuxlist/%s",
-	   tda->tda_identifier);
-
-  ajax_mailbox_reload_div(tda->tda_identifier,
-			  "dvbmuxlist", tda->tda_identifier,
-			  buf);
-}
-
-
-void
-ajax_mailbox_xmltv_grabber_status_change(xmltv_grabber_t *xg)
-{
-  char buf[500];
-
-  ajax_mailbox_update_div("xmltvgrabbers",
-			  "status", xg->xg_identifier,
-			  xmltv_grabber_status(xg));
-
-
-  if(xg->xg_status == XMLTV_GRAB_OK) {
-    snprintf(buf, sizeof(buf), "/ajax/xmltvgrabberlist/%s", xg->xg_identifier);
-    ajax_mailbox_reload_div("xmltvgrabbers",
-			    "details", xg->xg_identifier,
-			    buf);
-  } else {
-    ajax_mailbox_update_div(xg->xg_identifier,
-			    "details", xg->xg_identifier,
-			    xmltv_grabber_status_long(xg));
-  }
-}
-
-
-
-void
-ajax_mailbox_transport_status_change(struct th_transport *t)
-{
-  ajax_mailbox_update_div("xmltvgrabbers",
-			  "status", t->tht_identifier,
-			  transport_status_to_text(t->tht_last_status));
-}
-
-
-
-
-void
-ajax_mailbox_cwc_status_change(struct cwc *cwc)
-{
-  char id[20];
-  snprintf(id, sizeof(id), "cwc_%d", cwc->cwc_id);
-
-  ajax_mailbox_update_div("cwc", "status", id, cwc_status_to_text(cwc));
-}
diff --git a/ajaxui/ajaxui_mailbox.h b/ajaxui/ajaxui_mailbox.h
deleted file mode 100644
index 5bf3a992..00000000
--- a/ajaxui/ajaxui_mailbox.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  tvheadend, AJAX user interface
- *  Copyright (C) 2007 Andreas Öman
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <htmlui://www.gnu.org/licenses/>.
- */
-
-#ifndef AJAXUI_MAILBOX_H_
-#define AJAXUI_MAILBOX_H_
-
-#include <libhts/htsbuf.h>
-
-void ajax_mailbox_tdmi_state_change(th_dvb_mux_instance_t *tdmi);
-
-void ajax_mailbox_tdmi_qual_change(th_dvb_mux_instance_t *tdmi);
-
-void ajax_mailbox_tdmi_name_change(th_dvb_mux_instance_t *tdmi);
-
-void ajax_mailbox_tdmi_status_change(th_dvb_mux_instance_t *tdmi);
-
-void ajax_mailbox_tdmi_services_change(th_dvb_mux_instance_t *tdmi);
-
-void ajax_mailbox_tda_change(th_dvb_adapter_t *tda);
-
-void ajax_mailbox_start(htsbuf_queue_t *hq);
-
-struct xmltv_grabber;
-
-void ajax_mailbox_xmltv_grabber_status_change(struct xmltv_grabber *xg);
-
-struct th_transport;
-void ajax_mailbox_transport_status_change(struct th_transport *t);
-
-struct cwc;
-void ajax_mailbox_cwc_status_change(struct cwc *cwc);
-
-#endif /* AJAXUI_MAILBOX_H_ */
diff --git a/ajaxui/images/mapped.png b/ajaxui/images/mapped.png
deleted file mode 100644
index a4494940..00000000
Binary files a/ajaxui/images/mapped.png and /dev/null differ
diff --git a/ajaxui/images/sbbody_l.gif b/ajaxui/images/sbbody_l.gif
deleted file mode 100644
index a7adf2d3..00000000
Binary files a/ajaxui/images/sbbody_l.gif and /dev/null differ
diff --git a/ajaxui/images/sbbody_r.gif b/ajaxui/images/sbbody_r.gif
deleted file mode 100644
index 51c4b9fe..00000000
Binary files a/ajaxui/images/sbbody_r.gif and /dev/null differ
diff --git a/ajaxui/images/sbhead_l.gif b/ajaxui/images/sbhead_l.gif
deleted file mode 100644
index 1f4ab9b8..00000000
Binary files a/ajaxui/images/sbhead_l.gif and /dev/null differ
diff --git a/ajaxui/images/sbhead_r.gif b/ajaxui/images/sbhead_r.gif
deleted file mode 100644
index 2401d2a9..00000000
Binary files a/ajaxui/images/sbhead_r.gif and /dev/null differ
diff --git a/ajaxui/images/unmapped.png b/ajaxui/images/unmapped.png
deleted file mode 100644
index 0f2f7388..00000000
Binary files a/ajaxui/images/unmapped.png and /dev/null differ
diff --git a/ajaxui/prototype/prototype.js b/ajaxui/prototype/prototype.js
deleted file mode 100644
index 33ec9d9e..00000000
--- a/ajaxui/prototype/prototype.js
+++ /dev/null
@@ -1,4236 +0,0 @@
-/*  Prototype JavaScript framework, version 1.6.0.2
- *  (c) 2005-2007 Sam Stephenson
- *
- *  Prototype is freely distributable under the terms of an MIT-style license.
- *  For details, see the Prototype web site: http://www.prototypejs.org/
- *
- *--------------------------------------------------------------------------*/
-
-var Prototype = {
-  Version: '1.6.0.2',
-
-  Browser: {
-    IE:     !!(window.attachEvent && !window.opera),
-    Opera:  !!window.opera,
-    WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
-    Gecko:  navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1,
-    MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/)
-  },
-
-  BrowserFeatures: {
-    XPath: !!document.evaluate,
-    ElementExtensions: !!window.HTMLElement,
-    SpecificElementExtensions:
-      document.createElement('div').__proto__ &&
-      document.createElement('div').__proto__ !==
-        document.createElement('form').__proto__
-  },
-
-  ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
-  JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
-
-  emptyFunction: function() { },
-  K: function(x) { return x }
-};
-
-if (Prototype.Browser.MobileSafari)
-  Prototype.BrowserFeatures.SpecificElementExtensions = false;
-
-
-/* Based on Alex Arnell's inheritance implementation. */
-var Class = {
-  create: function() {
-    var parent = null, properties = $A(arguments);
-    if (Object.isFunction(properties[0]))
-      parent = properties.shift();
-
-    function klass() {
-      this.initialize.apply(this, arguments);
-    }
-
-    Object.extend(klass, Class.Methods);
-    klass.superclass = parent;
-    klass.subclasses = [];
-
-    if (parent) {
-      var subclass = function() { };
-      subclass.prototype = parent.prototype;
-      klass.prototype = new subclass;
-      parent.subclasses.push(klass);
-    }
-
-    for (var i = 0; i < properties.length; i++)
-      klass.addMethods(properties[i]);
-
-    if (!klass.prototype.initialize)
-      klass.prototype.initialize = Prototype.emptyFunction;
-
-    klass.prototype.constructor = klass;
-
-    return klass;
-  }
-};
-
-Class.Methods = {
-  addMethods: function(source) {
-    var ancestor   = this.superclass && this.superclass.prototype;
-    var properties = Object.keys(source);
-
-    if (!Object.keys({ toString: true }).length)
-      properties.push("toString", "valueOf");
-
-    for (var i = 0, length = properties.length; i < length; i++) {
-      var property = properties[i], value = source[property];
-      if (ancestor && Object.isFunction(value) &&
-          value.argumentNames().first() == "$super") {
-        var method = value, value = Object.extend((function(m) {
-          return function() { return ancestor[m].apply(this, arguments) };
-        })(property).wrap(method), {
-          valueOf:  function() { return method },
-          toString: function() { return method.toString() }
-        });
-      }
-      this.prototype[property] = value;
-    }
-
-    return this;
-  }
-};
-
-var Abstract = { };
-
-Object.extend = function(destination, source) {
-  for (var property in source)
-    destination[property] = source[property];
-  return destination;
-};
-
-Object.extend(Object, {
-  inspect: function(object) {
-    try {
-      if (Object.isUndefined(object)) return 'undefined';
-      if (object === null) return 'null';
-      return object.inspect ? object.inspect() : String(object);
-    } catch (e) {
-      if (e instanceof RangeError) return '...';
-      throw e;
-    }
-  },
-
-  toJSON: function(object) {
-    var type = typeof object;
-    switch (type) {
-      case 'undefined':
-      case 'function':
-      case 'unknown': return;
-      case 'boolean': return object.toString();
-    }
-
-    if (object === null) return 'null';
-    if (object.toJSON) return object.toJSON();
-    if (Object.isElement(object)) return;
-
-    var results = [];
-    for (var property in object) {
-      var value = Object.toJSON(object[property]);
-      if (!Object.isUndefined(value))
-        results.push(property.toJSON() + ': ' + value);
-    }
-
-    return '{' + results.join(', ') + '}';
-  },
-
-  toQueryString: function(object) {
-    return $H(object).toQueryString();
-  },
-
-  toHTML: function(object) {
-    return object && object.toHTML ? object.toHTML() : String.interpret(object);
-  },
-
-  keys: function(object) {
-    var keys = [];
-    for (var property in object)
-      keys.push(property);
-    return keys;
-  },
-
-  values: function(object) {
-    var values = [];
-    for (var property in object)
-      values.push(object[property]);
-    return values;
-  },
-
-  clone: function(object) {
-    return Object.extend({ }, object);
-  },
-
-  isElement: function(object) {
-    return object && object.nodeType == 1;
-  },
-
-  isArray: function(object) {
-    return object != null && typeof object == "object" &&
-      'splice' in object && 'join' in object;
-  },
-
-  isHash: function(object) {
-    return object instanceof Hash;
-  },
-
-  isFunction: function(object) {
-    return typeof object == "function";
-  },
-
-  isString: function(object) {
-    return typeof object == "string";
-  },
-
-  isNumber: function(object) {
-    return typeof object == "number";
-  },
-
-  isUndefined: function(object) {
-    return typeof object == "undefined";
-  }
-});
-
-Object.extend(Function.prototype, {
-  argumentNames: function() {
-    var names = this.toString().match(/^[\s\(]*function[^(]*\((.*?)\)/)[1].split(",").invoke("strip");
-    return names.length == 1 && !names[0] ? [] : names;
-  },
-
-  bind: function() {
-    if (arguments.length < 2 && Object.isUndefined(arguments[0])) return this;
-    var __method = this, args = $A(arguments), object = args.shift();
-    return function() {
-      return __method.apply(object, args.concat($A(arguments)));
-    }
-  },
-
-  bindAsEventListener: function() {
-    var __method = this, args = $A(arguments), object = args.shift();
-    return function(event) {
-      return __method.apply(object, [event || window.event].concat(args));
-    }
-  },
-
-  curry: function() {
-    if (!arguments.length) return this;
-    var __method = this, args = $A(arguments);
-    return function() {
-      return __method.apply(this, args.concat($A(arguments)));
-    }
-  },
-
-  delay: function() {
-    var __method = this, args = $A(arguments), timeout = args.shift() * 1000;
-    return window.setTimeout(function() {
-      return __method.apply(__method, args);
-    }, timeout);
-  },
-
-  wrap: function(wrapper) {
-    var __method = this;
-    return function() {
-      return wrapper.apply(this, [__method.bind(this)].concat($A(arguments)));
-    }
-  },
-
-  methodize: function() {
-    if (this._methodized) return this._methodized;
-    var __method = this;
-    return this._methodized = function() {
-      return __method.apply(null, [this].concat($A(arguments)));
-    };
-  }
-});
-
-Function.prototype.defer = Function.prototype.delay.curry(0.01);
-
-Date.prototype.toJSON = function() {
-  return '"' + this.getUTCFullYear() + '-' +
-    (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
-    this.getUTCDate().toPaddedString(2) + 'T' +
-    this.getUTCHours().toPaddedString(2) + ':' +
-    this.getUTCMinutes().toPaddedString(2) + ':' +
-    this.getUTCSeconds().toPaddedString(2) + 'Z"';
-};
-
-var Try = {
-  these: function() {
-    var returnValue;
-
-    for (var i = 0, length = arguments.length; i < length; i++) {
-      var lambda = arguments[i];
-      try {
-        returnValue = lambda();
-        break;
-      } catch (e) { }
-    }
-
-    return returnValue;
-  }
-};
-
-RegExp.prototype.match = RegExp.prototype.test;
-
-RegExp.escape = function(str) {
-  return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
-};
-
-/*--------------------------------------------------------------------------*/
-
-var PeriodicalExecuter = Class.create({
-  initialize: function(callback, frequency) {
-    this.callback = callback;
-    this.frequency = frequency;
-    this.currentlyExecuting = false;
-
-    this.registerCallback();
-  },
-
-  registerCallback: function() {
-    this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
-  },
-
-  execute: function() {
-    this.callback(this);
-  },
-
-  stop: function() {
-    if (!this.timer) return;
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-
-  onTimerEvent: function() {
-    if (!this.currentlyExecuting) {
-      try {
-        this.currentlyExecuting = true;
-        this.execute();
-      } finally {
-        this.currentlyExecuting = false;
-      }
-    }
-  }
-});
-Object.extend(String, {
-  interpret: function(value) {
-    return value == null ? '' : String(value);
-  },
-  specialChar: {
-    '\b': '\\b',
-    '\t': '\\t',
-    '\n': '\\n',
-    '\f': '\\f',
-    '\r': '\\r',
-    '\\': '\\\\'
-  }
-});
-
-Object.extend(String.prototype, {
-  gsub: function(pattern, replacement) {
-    var result = '', source = this, match;
-    replacement = arguments.callee.prepareReplacement(replacement);
-
-    while (source.length > 0) {
-      if (match = source.match(pattern)) {
-        result += source.slice(0, match.index);
-        result += String.interpret(replacement(match));
-        source  = source.slice(match.index + match[0].length);
-      } else {
-        result += source, source = '';
-      }
-    }
-    return result;
-  },
-
-  sub: function(pattern, replacement, count) {
-    replacement = this.gsub.prepareReplacement(replacement);
-    count = Object.isUndefined(count) ? 1 : count;
-
-    return this.gsub(pattern, function(match) {
-      if (--count < 0) return match[0];
-      return replacement(match);
-    });
-  },
-
-  scan: function(pattern, iterator) {
-    this.gsub(pattern, iterator);
-    return String(this);
-  },
-
-  truncate: function(length, truncation) {
-    length = length || 30;
-    truncation = Object.isUndefined(truncation) ? '...' : truncation;
-    return this.length > length ?
-      this.slice(0, length - truncation.length) + truncation : String(this);
-  },
-
-  strip: function() {
-    return this.replace(/^\s+/, '').replace(/\s+$/, '');
-  },
-
-  stripTags: function() {
-    return this.replace(/<\/?[^>]+>/gi, '');
-  },
-
-  stripScripts: function() {
-    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
-  },
-
-  extractScripts: function() {
-    var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
-    var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
-    return (this.match(matchAll) || []).map(function(scriptTag) {
-      return (scriptTag.match(matchOne) || ['', ''])[1];
-    });
-  },
-
-  evalScripts: function() {
-    return this.extractScripts().map(function(script) { return eval(script) });
-  },
-
-  escapeHTML: function() {
-    var self = arguments.callee;
-    self.text.data = this;
-    return self.div.innerHTML;
-  },
-
-  unescapeHTML: function() {
-    var div = new Element('div');
-    div.innerHTML = this.stripTags();
-    return div.childNodes[0] ? (div.childNodes.length > 1 ?
-      $A(div.childNodes).inject('', function(memo, node) { return memo+node.nodeValue }) :
-      div.childNodes[0].nodeValue) : '';
-  },
-
-  toQueryParams: function(separator) {
-    var match = this.strip().match(/([^?#]*)(#.*)?$/);
-    if (!match) return { };
-
-    return match[1].split(separator || '&').inject({ }, function(hash, pair) {
-      if ((pair = pair.split('='))[0]) {
-        var key = decodeURIComponent(pair.shift());
-        var value = pair.length > 1 ? pair.join('=') : pair[0];
-        if (value != undefined) value = decodeURIComponent(value);
-
-        if (key in hash) {
-          if (!Object.isArray(hash[key])) hash[key] = [hash[key]];
-          hash[key].push(value);
-        }
-        else hash[key] = value;
-      }
-      return hash;
-    });
-  },
-
-  toArray: function() {
-    return this.split('');
-  },
-
-  succ: function() {
-    return this.slice(0, this.length - 1) +
-      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
-  },
-
-  times: function(count) {
-    return count < 1 ? '' : new Array(count + 1).join(this);
-  },
-
-  camelize: function() {
-    var parts = this.split('-'), len = parts.length;
-    if (len == 1) return parts[0];
-
-    var camelized = this.charAt(0) == '-'
-      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
-      : parts[0];
-
-    for (var i = 1; i < len; i++)
-      camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
-
-    return camelized;
-  },
-
-  capitalize: function() {
-    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
-  },
-
-  underscore: function() {
-    return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
-  },
-
-  dasherize: function() {
-    return this.gsub(/_/,'-');
-  },
-
-  inspect: function(useDoubleQuotes) {
-    var escapedString = this.gsub(/[\x00-\x1f\\]/, function(match) {
-      var character = String.specialChar[match[0]];
-      return character ? character : '\\u00' + match[0].charCodeAt().toPaddedString(2, 16);
-    });
-    if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
-    return "'" + escapedString.replace(/'/g, '\\\'') + "'";
-  },
-
-  toJSON: function() {
-    return this.inspect(true);
-  },
-
-  unfilterJSON: function(filter) {
-    return this.sub(filter || Prototype.JSONFilter, '#{1}');
-  },
-
-  isJSON: function() {
-    var str = this;
-    if (str.blank()) return false;
-    str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
-    return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
-  },
-
-  evalJSON: function(sanitize) {
-    var json = this.unfilterJSON();
-    try {
-      if (!sanitize || json.isJSON()) return eval('(' + json + ')');
-    } catch (e) { }
-    throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
-  },
-
-  include: function(pattern) {
-    return this.indexOf(pattern) > -1;
-  },
-
-  startsWith: function(pattern) {
-    return this.indexOf(pattern) === 0;
-  },
-
-  endsWith: function(pattern) {
-    var d = this.length - pattern.length;
-    return d >= 0 && this.lastIndexOf(pattern) === d;
-  },
-
-  empty: function() {
-    return this == '';
-  },
-
-  blank: function() {
-    return /^\s*$/.test(this);
-  },
-
-  interpolate: function(object, pattern) {
-    return new Template(this, pattern).evaluate(object);
-  }
-});
-
-if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
-  escapeHTML: function() {
-    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-  },
-  unescapeHTML: function() {
-    return this.stripTags().replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
-  }
-});
-
-String.prototype.gsub.prepareReplacement = function(replacement) {
-  if (Object.isFunction(replacement)) return replacement;
-  var template = new Template(replacement);
-  return function(match) { return template.evaluate(match) };
-};
-
-String.prototype.parseQuery = String.prototype.toQueryParams;
-
-Object.extend(String.prototype.escapeHTML, {
-  div:  document.createElement('div'),
-  text: document.createTextNode('')
-});
-
-String.prototype.escapeHTML.div.appendChild(String.prototype.escapeHTML.text);
-
-var Template = Class.create({
-  initialize: function(template, pattern) {
-    this.template = template.toString();
-    this.pattern = pattern || Template.Pattern;
-  },
-
-  evaluate: function(object) {
-    if (Object.isFunction(object.toTemplateReplacements))
-      object = object.toTemplateReplacements();
-
-    return this.template.gsub(this.pattern, function(match) {
-      if (object == null) return '';
-
-      var before = match[1] || '';
-      if (before == '\\') return match[2];
-
-      var ctx = object, expr = match[3];
-      var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/;
-      match = pattern.exec(expr);
-      if (match == null) return before;
-
-      while (match != null) {
-        var comp = match[1].startsWith('[') ? match[2].gsub('\\\\]', ']') : match[1];
-        ctx = ctx[comp];
-        if (null == ctx || '' == match[3]) break;
-        expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
-        match = pattern.exec(expr);
-      }
-
-      return before + String.interpret(ctx);
-    });
-  }
-});
-Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
-
-var $break = { };
-
-var Enumerable = {
-  each: function(iterator, context) {
-    var index = 0;
-    try {
-      this._each(function(value) {
-        iterator.call(context, value, index++);
-      });
-    } catch (e) {
-      if (e != $break) throw e;
-    }
-    return this;
-  },
-
-  eachSlice: function(number, iterator, context) {
-    var index = -number, slices = [], array = this.toArray();
-    if (number < 1) return array;
-    while ((index += number) < array.length)
-      slices.push(array.slice(index, index+number));
-    return slices.collect(iterator, context);
-  },
-
-  all: function(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var result = true;
-    this.each(function(value, index) {
-      result = result && !!iterator.call(context, value, index);
-      if (!result) throw $break;
-    });
-    return result;
-  },
-
-  any: function(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var result = false;
-    this.each(function(value, index) {
-      if (result = !!iterator.call(context, value, index))
-        throw $break;
-    });
-    return result;
-  },
-
-  collect: function(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var results = [];
-    this.each(function(value, index) {
-      results.push(iterator.call(context, value, index));
-    });
-    return results;
-  },
-
-  detect: function(iterator, context) {
-    var result;
-    this.each(function(value, index) {
-      if (iterator.call(context, value, index)) {
-        result = value;
-        throw $break;
-      }
-    });
-    return result;
-  },
-
-  findAll: function(iterator, context) {
-    var results = [];
-    this.each(function(value, index) {
-      if (iterator.call(context, value, index))
-        results.push(value);
-    });
-    return results;
-  },
-
-  grep: function(filter, iterator, context) {
-    iterator = iterator || Prototype.K;
-    var results = [];
-
-    if (Object.isString(filter))
-      filter = new RegExp(filter);
-
-    this.each(function(value, index) {
-      if (filter.match(value))
-        results.push(iterator.call(context, value, index));
-    });
-    return results;
-  },
-
-  include: function(object) {
-    if (Object.isFunction(this.indexOf))
-      if (this.indexOf(object) != -1) return true;
-
-    var found = false;
-    this.each(function(value) {
-      if (value == object) {
-        found = true;
-        throw $break;
-      }
-    });
-    return found;
-  },
-
-  inGroupsOf: function(number, fillWith) {
-    fillWith = Object.isUndefined(fillWith) ? null : fillWith;
-    return this.eachSlice(number, function(slice) {
-      while(slice.length < number) slice.push(fillWith);
-      return slice;
-    });
-  },
-
-  inject: function(memo, iterator, context) {
-    this.each(function(value, index) {
-      memo = iterator.call(context, memo, value, index);
-    });
-    return memo;
-  },
-
-  invoke: function(method) {
-    var args = $A(arguments).slice(1);
-    return this.map(function(value) {
-      return value[method].apply(value, args);
-    });
-  },
-
-  max: function(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var result;
-    this.each(function(value, index) {
-      value = iterator.call(context, value, index);
-      if (result == null || value >= result)
-        result = value;
-    });
-    return result;
-  },
-
-  min: function(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var result;
-    this.each(function(value, index) {
-      value = iterator.call(context, value, index);
-      if (result == null || value < result)
-        result = value;
-    });
-    return result;
-  },
-
-  partition: function(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var trues = [], falses = [];
-    this.each(function(value, index) {
-      (iterator.call(context, value, index) ?
-        trues : falses).push(value);
-    });
-    return [trues, falses];
-  },
-
-  pluck: function(property) {
-    var results = [];
-    this.each(function(value) {
-      results.push(value[property]);
-    });
-    return results;
-  },
-
-  reject: function(iterator, context) {
-    var results = [];
-    this.each(function(value, index) {
-      if (!iterator.call(context, value, index))
-        results.push(value);
-    });
-    return results;
-  },
-
-  sortBy: function(iterator, context) {
-    return this.map(function(value, index) {
-      return {
-        value: value,
-        criteria: iterator.call(context, value, index)
-      };
-    }).sort(function(left, right) {
-      var a = left.criteria, b = right.criteria;
-      return a < b ? -1 : a > b ? 1 : 0;
-    }).pluck('value');
-  },
-
-  toArray: function() {
-    return this.map();
-  },
-
-  zip: function() {
-    var iterator = Prototype.K, args = $A(arguments);
-    if (Object.isFunction(args.last()))
-      iterator = args.pop();
-
-    var collections = [this].concat(args).map($A);
-    return this.map(function(value, index) {
-      return iterator(collections.pluck(index));
-    });
-  },
-
-  size: function() {
-    return this.toArray().length;
-  },
-
-  inspect: function() {
-    return '#<Enumerable:' + this.toArray().inspect() + '>';
-  }
-};
-
-Object.extend(Enumerable, {
-  map:     Enumerable.collect,
-  find:    Enumerable.detect,
-  select:  Enumerable.findAll,
-  filter:  Enumerable.findAll,
-  member:  Enumerable.include,
-  entries: Enumerable.toArray,
-  every:   Enumerable.all,
-  some:    Enumerable.any
-});
-function $A(iterable) {
-  if (!iterable) return [];
-  if (iterable.toArray) return iterable.toArray();
-  var length = iterable.length || 0, results = new Array(length);
-  while (length--) results[length] = iterable[length];
-  return results;
-}
-
-if (Prototype.Browser.WebKit) {
-  $A = function(iterable) {
-    if (!iterable) return [];
-    if (!(Object.isFunction(iterable) && iterable == '[object NodeList]') &&
-        iterable.toArray) return iterable.toArray();
-    var length = iterable.length || 0, results = new Array(length);
-    while (length--) results[length] = iterable[length];
-    return results;
-  };
-}
-
-Array.from = $A;
-
-Object.extend(Array.prototype, Enumerable);
-
-if (!Array.prototype._reverse) Array.prototype._reverse = Array.prototype.reverse;
-
-Object.extend(Array.prototype, {
-  _each: function(iterator) {
-    for (var i = 0, length = this.length; i < length; i++)
-      iterator(this[i]);
-  },
-
-  clear: function() {
-    this.length = 0;
-    return this;
-  },
-
-  first: function() {
-    return this[0];
-  },
-
-  last: function() {
-    return this[this.length - 1];
-  },
-
-  compact: function() {
-    return this.select(function(value) {
-      return value != null;
-    });
-  },
-
-  flatten: function() {
-    return this.inject([], function(array, value) {
-      return array.concat(Object.isArray(value) ?
-        value.flatten() : [value]);
-    });
-  },
-
-  without: function() {
-    var values = $A(arguments);
-    return this.select(function(value) {
-      return !values.include(value);
-    });
-  },
-
-  reverse: function(inline) {
-    return (inline !== false ? this : this.toArray())._reverse();
-  },
-
-  reduce: function() {
-    return this.length > 1 ? this : this[0];
-  },
-
-  uniq: function(sorted) {
-    return this.inject([], function(array, value, index) {
-      if (0 == index || (sorted ? array.last() != value : !array.include(value)))
-        array.push(value);
-      return array;
-    });
-  },
-
-  intersect: function(array) {
-    return this.uniq().findAll(function(item) {
-      return array.detect(function(value) { return item === value });
-    });
-  },
-
-  clone: function() {
-    return [].concat(this);
-  },
-
-  size: function() {
-    return this.length;
-  },
-
-  inspect: function() {
-    return '[' + this.map(Object.inspect).join(', ') + ']';
-  },
-
-  toJSON: function() {
-    var results = [];
-    this.each(function(object) {
-      var value = Object.toJSON(object);
-      if (!Object.isUndefined(value)) results.push(value);
-    });
-    return '[' + results.join(', ') + ']';
-  }
-});
-
-// use native browser JS 1.6 implementation if available
-if (Object.isFunction(Array.prototype.forEach))
-  Array.prototype._each = Array.prototype.forEach;
-
-if (!Array.prototype.indexOf) Array.prototype.indexOf = function(item, i) {
-  i || (i = 0);
-  var length = this.length;
-  if (i < 0) i = length + i;
-  for (; i < length; i++)
-    if (this[i] === item) return i;
-  return -1;
-};
-
-if (!Array.prototype.lastIndexOf) Array.prototype.lastIndexOf = function(item, i) {
-  i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
-  var n = this.slice(0, i).reverse().indexOf(item);
-  return (n < 0) ? n : i - n - 1;
-};
-
-Array.prototype.toArray = Array.prototype.clone;
-
-function $w(string) {
-  if (!Object.isString(string)) return [];
-  string = string.strip();
-  return string ? string.split(/\s+/) : [];
-}
-
-if (Prototype.Browser.Opera){
-  Array.prototype.concat = function() {
-    var array = [];
-    for (var i = 0, length = this.length; i < length; i++) array.push(this[i]);
-    for (var i = 0, length = arguments.length; i < length; i++) {
-      if (Object.isArray(arguments[i])) {
-        for (var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
-          array.push(arguments[i][j]);
-      } else {
-        array.push(arguments[i]);
-      }
-    }
-    return array;
-  };
-}
-Object.extend(Number.prototype, {
-  toColorPart: function() {
-    return this.toPaddedString(2, 16);
-  },
-
-  succ: function() {
-    return this + 1;
-  },
-
-  times: function(iterator) {
-    $R(0, this, true).each(iterator);
-    return this;
-  },
-
-  toPaddedString: function(length, radix) {
-    var string = this.toString(radix || 10);
-    return '0'.times(length - string.length) + string;
-  },
-
-  toJSON: function() {
-    return isFinite(this) ? this.toString() : 'null';
-  }
-});
-
-$w('abs round ceil floor').each(function(method){
-  Number.prototype[method] = Math[method].methodize();
-});
-function $H(object) {
-  return new Hash(object);
-};
-
-var Hash = Class.create(Enumerable, (function() {
-
-  function toQueryPair(key, value) {
-    if (Object.isUndefined(value)) return key;
-    return key + '=' + encodeURIComponent(String.interpret(value));
-  }
-
-  return {
-    initialize: function(object) {
-      this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
-    },
-
-    _each: function(iterator) {
-      for (var key in this._object) {
-        var value = this._object[key], pair = [key, value];
-        pair.key = key;
-        pair.value = value;
-        iterator(pair);
-      }
-    },
-
-    set: function(key, value) {
-      return this._object[key] = value;
-    },
-
-    get: function(key) {
-      return this._object[key];
-    },
-
-    unset: function(key) {
-      var value = this._object[key];
-      delete this._object[key];
-      return value;
-    },
-
-    toObject: function() {
-      return Object.clone(this._object);
-    },
-
-    keys: function() {
-      return this.pluck('key');
-    },
-
-    values: function() {
-      return this.pluck('value');
-    },
-
-    index: function(value) {
-      var match = this.detect(function(pair) {
-        return pair.value === value;
-      });
-      return match && match.key;
-    },
-
-    merge: function(object) {
-      return this.clone().update(object);
-    },
-
-    update: function(object) {
-      return new Hash(object).inject(this, function(result, pair) {
-        result.set(pair.key, pair.value);
-        return result;
-      });
-    },
-
-    toQueryString: function() {
-      return this.inject([], function(results, pair) {
-        var key = encodeURIComponent(pair.key), values = pair.value;
-
-        if (values && typeof values == 'object') {
-          if (Object.isArray(values))
-            return results.concat(values.map(toQueryPair.curry(key)));
-        } else results.push(toQueryPair(key, values));
-        return results;
-      }).join('&');
-    },
-
-    inspect: function() {
-      return '#<Hash:{' + this.map(function(pair) {
-        return pair.map(Object.inspect).join(': ');
-      }).join(', ') + '}>';
-    },
-
-    toJSON: function() {
-      return Object.toJSON(this.toObject());
-    },
-
-    clone: function() {
-      return new Hash(this);
-    }
-  }
-})());
-
-Hash.prototype.toTemplateReplacements = Hash.prototype.toObject;
-Hash.from = $H;
-var ObjectRange = Class.create(Enumerable, {
-  initialize: function(start, end, exclusive) {
-    this.start = start;
-    this.end = end;
-    this.exclusive = exclusive;
-  },
-
-  _each: function(iterator) {
-    var value = this.start;
-    while (this.include(value)) {
-      iterator(value);
-      value = value.succ();
-    }
-  },
-
-  include: function(value) {
-    if (value < this.start)
-      return false;
-    if (this.exclusive)
-      return value < this.end;
-    return value <= this.end;
-  }
-});
-
-var $R = function(start, end, exclusive) {
-  return new ObjectRange(start, end, exclusive);
-};
-
-var Ajax = {
-  getTransport: function() {
-    return Try.these(
-      function() {return new XMLHttpRequest()},
-      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
-      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
-    ) || false;
-  },
-
-  activeRequestCount: 0
-};
-
-Ajax.Responders = {
-  responders: [],
-
-  _each: function(iterator) {
-    this.responders._each(iterator);
-  },
-
-  register: function(responder) {
-    if (!this.include(responder))
-      this.responders.push(responder);
-  },
-
-  unregister: function(responder) {
-    this.responders = this.responders.without(responder);
-  },
-
-  dispatch: function(callback, request, transport, json) {
-    this.each(function(responder) {
-      if (Object.isFunction(responder[callback])) {
-        try {
-          responder[callback].apply(responder, [request, transport, json]);
-        } catch (e) { }
-      }
-    });
-  }
-};
-
-Object.extend(Ajax.Responders, Enumerable);
-
-Ajax.Responders.register({
-  onCreate:   function() { Ajax.activeRequestCount++ },
-  onComplete: function() { Ajax.activeRequestCount-- }
-});
-
-Ajax.Base = Class.create({
-  initialize: function(options) {
-    this.options = {
-      method:       'post',
-      asynchronous: true,
-      contentType:  'application/x-www-form-urlencoded',
-      encoding:     'UTF-8',
-      parameters:   '',
-      evalJSON:     true,
-      evalJS:       true
-    };
-    Object.extend(this.options, options || { });
-
-    this.options.method = this.options.method.toLowerCase();
-
-    if (Object.isString(this.options.parameters))
-      this.options.parameters = this.options.parameters.toQueryParams();
-    else if (Object.isHash(this.options.parameters))
-      this.options.parameters = this.options.parameters.toObject();
-  }
-});
-
-Ajax.Request = Class.create(Ajax.Base, {
-  _complete: false,
-
-  initialize: function($super, url, options) {
-    $super(options);
-    this.transport = Ajax.getTransport();
-    this.request(url);
-  },
-
-  request: function(url) {
-    this.url = url;
-    this.method = this.options.method;
-    var params = Object.clone(this.options.parameters);
-
-    if (!['get', 'post'].include(this.method)) {
-      // simulate other verbs over post
-      params['_method'] = this.method;
-      this.method = 'post';
-    }
-
-    this.parameters = params;
-
-    if (params = Object.toQueryString(params)) {
-      // when GET, append parameters to URL
-      if (this.method == 'get')
-        this.url += (this.url.include('?') ? '&' : '?') + params;
-      else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent))
-        params += '&_=';
-    }
-
-    try {
-      var response = new Ajax.Response(this);
-      if (this.options.onCreate) this.options.onCreate(response);
-      Ajax.Responders.dispatch('onCreate', this, response);
-
-      this.transport.open(this.method.toUpperCase(), this.url,
-        this.options.asynchronous);
-
-      if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1);
-
-      this.transport.onreadystatechange = this.onStateChange.bind(this);
-      this.setRequestHeaders();
-
-      this.body = this.method == 'post' ? (this.options.postBody || params) : null;
-      this.transport.send(this.body);
-
-      /* Force Firefox to handle ready state 4 for synchronous requests */
-      if (!this.options.asynchronous && this.transport.overrideMimeType)
-        this.onStateChange();
-
-    }
-    catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  onStateChange: function() {
-    var readyState = this.transport.readyState;
-    if (readyState > 1 && !((readyState == 4) && this._complete))
-      this.respondToReadyState(this.transport.readyState);
-  },
-
-  setRequestHeaders: function() {
-    var headers = {
-      'X-Requested-With': 'XMLHttpRequest',
-      'X-Prototype-Version': Prototype.Version,
-      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
-    };
-
-    if (this.method == 'post') {
-      headers['Content-type'] = this.options.contentType +
-        (this.options.encoding ? '; charset=' + this.options.encoding : '');
-
-      /* Force "Connection: close" for older Mozilla browsers to work
-       * around a bug where XMLHttpRequest sends an incorrect
-       * Content-length header. See Mozilla Bugzilla #246651.
-       */
-      if (this.transport.overrideMimeType &&
-          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
-            headers['Connection'] = 'close';
-    }
-
-    // user-defined headers
-    if (typeof this.options.requestHeaders == 'object') {
-      var extras = this.options.requestHeaders;
-
-      if (Object.isFunction(extras.push))
-        for (var i = 0, length = extras.length; i < length; i += 2)
-          headers[extras[i]] = extras[i+1];
-      else
-        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
-    }
-
-    for (var name in headers)
-      this.transport.setRequestHeader(name, headers[name]);
-  },
-
-  success: function() {
-    var status = this.getStatus();
-    return !status || (status >= 200 && status < 300);
-  },
-
-  getStatus: function() {
-    try {
-      return this.transport.status || 0;
-    } catch (e) { return 0 }
-  },
-
-  respondToReadyState: function(readyState) {
-    var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this);
-
-    if (state == 'Complete') {
-      try {
-        this._complete = true;
-        (this.options['on' + response.status]
-         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
-         || Prototype.emptyFunction)(response, response.headerJSON);
-      } catch (e) {
-        this.dispatchException(e);
-      }
-
-      var contentType = response.getHeader('Content-type');
-      if (this.options.evalJS == 'force'
-          || (this.options.evalJS && this.isSameOrigin() && contentType
-          && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
-        this.evalResponse();
-    }
-
-    try {
-      (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON);
-      Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON);
-    } catch (e) {
-      this.dispatchException(e);
-    }
-
-    if (state == 'Complete') {
-      // avoid memory leak in MSIE: clean up
-      this.transport.onreadystatechange = Prototype.emptyFunction;
-    }
-  },
-
-  isSameOrigin: function() {
-    var m = this.url.match(/^\s*https?:\/\/[^\/]*/);
-    return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({
-      protocol: location.protocol,
-      domain: document.domain,
-      port: location.port ? ':' + location.port : ''
-    }));
-  },
-
-  getHeader: function(name) {
-    try {
-      return this.transport.getResponseHeader(name) || null;
-    } catch (e) { return null }
-  },
-
-  evalResponse: function() {
-    try {
-      return eval((this.transport.responseText || '').unfilterJSON());
-    } catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  dispatchException: function(exception) {
-    (this.options.onException || Prototype.emptyFunction)(this, exception);
-    Ajax.Responders.dispatch('onException', this, exception);
-  }
-});
-
-Ajax.Request.Events =
-  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
-
-Ajax.Response = Class.create({
-  initialize: function(request){
-    this.request = request;
-    var transport  = this.transport  = request.transport,
-        readyState = this.readyState = transport.readyState;
-
-    if((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
-      this.status       = this.getStatus();
-      this.statusText   = this.getStatusText();
-      this.responseText = String.interpret(transport.responseText);
-      this.headerJSON   = this._getHeaderJSON();
-    }
-
-    if(readyState == 4) {
-      var xml = transport.responseXML;
-      this.responseXML  = Object.isUndefined(xml) ? null : xml;
-      this.responseJSON = this._getResponseJSON();
-    }
-  },
-
-  status:      0,
-  statusText: '',
-
-  getStatus: Ajax.Request.prototype.getStatus,
-
-  getStatusText: function() {
-    try {
-      return this.transport.statusText || '';
-    } catch (e) { return '' }
-  },
-
-  getHeader: Ajax.Request.prototype.getHeader,
-
-  getAllHeaders: function() {
-    try {
-      return this.getAllResponseHeaders();
-    } catch (e) { return null }
-  },
-
-  getResponseHeader: function(name) {
-    return this.transport.getResponseHeader(name);
-  },
-
-  getAllResponseHeaders: function() {
-    return this.transport.getAllResponseHeaders();
-  },
-
-  _getHeaderJSON: function() {
-    var json = this.getHeader('X-JSON');
-    if (!json) return null;
-    json = decodeURIComponent(escape(json));
-    try {
-      return json.evalJSON(this.request.options.sanitizeJSON ||
-        !this.request.isSameOrigin());
-    } catch (e) {
-      this.request.dispatchException(e);
-    }
-  },
-
-  _getResponseJSON: function() {
-    var options = this.request.options;
-    if (!options.evalJSON || (options.evalJSON != 'force' &&
-      !(this.getHeader('Content-type') || '').include('application/json')) ||
-        this.responseText.blank())
-          return null;
-    try {
-      return this.responseText.evalJSON(options.sanitizeJSON ||
-        !this.request.isSameOrigin());
-    } catch (e) {
-      this.request.dispatchException(e);
-    }
-  }
-});
-
-Ajax.Updater = Class.create(Ajax.Request, {
-  initialize: function($super, container, url, options) {
-    this.container = {
-      success: (container.success || container),
-      failure: (container.failure || (container.success ? null : container))
-    };
-
-    options = Object.clone(options);
-    var onComplete = options.onComplete;
-    options.onComplete = (function(response, json) {
-      this.updateContent(response.responseText);
-      if (Object.isFunction(onComplete)) onComplete(response, json);
-    }).bind(this);
-
-    $super(url, options);
-  },
-
-  updateContent: function(responseText) {
-    var receiver = this.container[this.success() ? 'success' : 'failure'],
-        options = this.options;
-
-    if (!options.evalScripts) responseText = responseText.stripScripts();
-    if (!$(receiver)) this.stop();
-
-    if (receiver = $(receiver)) {
-      if (options.insertion) {
-        if (Object.isString(options.insertion)) {
-          var insertion = { }; insertion[options.insertion] = responseText;
-          receiver.insert(insertion);
-        }
-        else options.insertion(receiver, responseText);
-      }
-      else receiver.update(responseText);
-    }
-  }
-});
-
-Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
-  initialize: function($super, container, url, options) {
-    $super(options);
-    this.onComplete = this.options.onComplete;
-
-    this.frequency = (this.options.frequency || 2);
-    this.decay = (this.options.decay || 1);
-
-    this.updater = { };
-    this.container = container;
-    this.url = url;
-
-    this.start();
-  },
-
-  start: function() {
-    this.options.onComplete = this.updateComplete.bind(this);
-    this.onTimerEvent();
-  },
-
-  stop: function() {
-    this.updater.options.onComplete = undefined;
-    clearTimeout(this.timer);
-    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
-  },
-
-  updateComplete: function(response) {
-    if (this.options.decay) {
-      this.decay = (response.responseText == this.lastText ?
-        this.decay * this.options.decay : 1);
-
-      this.lastText = response.responseText;
-    }
-    this.timer = this.onTimerEvent.bind(this).delay(this.decay * this.frequency);
-  },
-
-  onTimerEvent: function() {
-    this.updater = new Ajax.Updater(this.container, this.url, this.options);
-  }
-});
-function $(element) {
-  if (arguments.length > 1) {
-    for (var i = 0, elements = [], length = arguments.length; i < length; i++)
-      elements.push($(arguments[i]));
-    return elements;
-  }
-  if (Object.isString(element))
-    element = document.getElementById(element);
-  return Element.extend(element);
-}
-
-if (Prototype.BrowserFeatures.XPath) {
-  document._getElementsByXPath = function(expression, parentElement) {
-    var results = [];
-    var query = document.evaluate(expression, $(parentElement) || document,
-      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-    for (var i = 0, length = query.snapshotLength; i < length; i++)
-      results.push(Element.extend(query.snapshotItem(i)));
-    return results;
-  };
-}
-
-/*--------------------------------------------------------------------------*/
-
-if (!window.Node) var Node = { };
-
-if (!Node.ELEMENT_NODE) {
-  // DOM level 2 ECMAScript Language Binding
-  Object.extend(Node, {
-    ELEMENT_NODE: 1,
-    ATTRIBUTE_NODE: 2,
-    TEXT_NODE: 3,
-    CDATA_SECTION_NODE: 4,
-    ENTITY_REFERENCE_NODE: 5,
-    ENTITY_NODE: 6,
-    PROCESSING_INSTRUCTION_NODE: 7,
-    COMMENT_NODE: 8,
-    DOCUMENT_NODE: 9,
-    DOCUMENT_TYPE_NODE: 10,
-    DOCUMENT_FRAGMENT_NODE: 11,
-    NOTATION_NODE: 12
-  });
-}
-
-(function() {
-  var element = this.Element;
-  this.Element = function(tagName, attributes) {
-    attributes = attributes || { };
-    tagName = tagName.toLowerCase();
-    var cache = Element.cache;
-    if (Prototype.Browser.IE && attributes.name) {
-      tagName = '<' + tagName + ' name="' + attributes.name + '">';
-      delete attributes.name;
-      return Element.writeAttribute(document.createElement(tagName), attributes);
-    }
-    if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName));
-    return Element.writeAttribute(cache[tagName].cloneNode(false), attributes);
-  };
-  Object.extend(this.Element, element || { });
-  if (element) this.Element.prototype = element.prototype;
-}).call(window);
-
-Element.cache = { };
-
-Element.Methods = {
-  visible: function(element) {
-    return $(element).style.display != 'none';
-  },
-
-  toggle: function(element) {
-    element = $(element);
-    Element[Element.visible(element) ? 'hide' : 'show'](element);
-    return element;
-  },
-
-  hide: function(element) {
-    $(element).style.display = 'none';
-    return element;
-  },
-
-  show: function(element) {
-    $(element).style.display = '';
-    return element;
-  },
-
-  remove: function(element) {
-    element = $(element);
-    element.parentNode.removeChild(element);
-    return element;
-  },
-
-  update: function(element, content) {
-    element = $(element);
-    if (content && content.toElement) content = content.toElement();
-    if (Object.isElement(content)) return element.update().insert(content);
-    content = Object.toHTML(content);
-    element.innerHTML = content.stripScripts();
-    content.evalScripts.bind(content).defer();
-    return element;
-  },
-
-  replace: function(element, content) {
-    element = $(element);
-    if (content && content.toElement) content = content.toElement();
-    else if (!Object.isElement(content)) {
-      content = Object.toHTML(content);
-      var range = element.ownerDocument.createRange();
-      range.selectNode(element);
-      content.evalScripts.bind(content).defer();
-      content = range.createContextualFragment(content.stripScripts());
-    }
-    element.parentNode.replaceChild(content, element);
-    return element;
-  },
-
-  insert: function(element, insertions) {
-    element = $(element);
-
-    if (Object.isString(insertions) || Object.isNumber(insertions) ||
-        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
-          insertions = {bottom:insertions};
-
-    var content, insert, tagName, childNodes;
-
-    for (var position in insertions) {
-      content  = insertions[position];
-      position = position.toLowerCase();
-      insert = Element._insertionTranslations[position];
-
-      if (content && content.toElement) content = content.toElement();
-      if (Object.isElement(content)) {
-        insert(element, content);
-        continue;
-      }
-
-      content = Object.toHTML(content);
-
-      tagName = ((position == 'before' || position == 'after')
-        ? element.parentNode : element).tagName.toUpperCase();
-
-      childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
-
-      if (position == 'top' || position == 'after') childNodes.reverse();
-      childNodes.each(insert.curry(element));
-
-      content.evalScripts.bind(content).defer();
-    }
-
-    return element;
-  },
-
-  wrap: function(element, wrapper, attributes) {
-    element = $(element);
-    if (Object.isElement(wrapper))
-      $(wrapper).writeAttribute(attributes || { });
-    else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes);
-    else wrapper = new Element('div', wrapper);
-    if (element.parentNode)
-      element.parentNode.replaceChild(wrapper, element);
-    wrapper.appendChild(element);
-    return wrapper;
-  },
-
-  inspect: function(element) {
-    element = $(element);
-    var result = '<' + element.tagName.toLowerCase();
-    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
-      var property = pair.first(), attribute = pair.last();
-      var value = (element[property] || '').toString();
-      if (value) result += ' ' + attribute + '=' + value.inspect(true);
-    });
-    return result + '>';
-  },
-
-  recursivelyCollect: function(element, property) {
-    element = $(element);
-    var elements = [];
-    while (element = element[property])
-      if (element.nodeType == 1)
-        elements.push(Element.extend(element));
-    return elements;
-  },
-
-  ancestors: function(element) {
-    return $(element).recursivelyCollect('parentNode');
-  },
-
-  descendants: function(element) {
-    return $(element).select("*");
-  },
-
-  firstDescendant: function(element) {
-    element = $(element).firstChild;
-    while (element && element.nodeType != 1) element = element.nextSibling;
-    return $(element);
-  },
-
-  immediateDescendants: function(element) {
-    if (!(element = $(element).firstChild)) return [];
-    while (element && element.nodeType != 1) element = element.nextSibling;
-    if (element) return [element].concat($(element).nextSiblings());
-    return [];
-  },
-
-  previousSiblings: function(element) {
-    return $(element).recursivelyCollect('previousSibling');
-  },
-
-  nextSiblings: function(element) {
-    return $(element).recursivelyCollect('nextSibling');
-  },
-
-  siblings: function(element) {
-    element = $(element);
-    return element.previousSiblings().reverse().concat(element.nextSiblings());
-  },
-
-  match: function(element, selector) {
-    if (Object.isString(selector))
-      selector = new Selector(selector);
-    return selector.match($(element));
-  },
-
-  up: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(element.parentNode);
-    var ancestors = element.ancestors();
-    return Object.isNumber(expression) ? ancestors[expression] :
-      Selector.findElement(ancestors, expression, index);
-  },
-
-  down: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return element.firstDescendant();
-    return Object.isNumber(expression) ? element.descendants()[expression] :
-      element.select(expression)[index || 0];
-  },
-
-  previous: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
-    var previousSiblings = element.previousSiblings();
-    return Object.isNumber(expression) ? previousSiblings[expression] :
-      Selector.findElement(previousSiblings, expression, index);
-  },
-
-  next: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
-    var nextSiblings = element.nextSiblings();
-    return Object.isNumber(expression) ? nextSiblings[expression] :
-      Selector.findElement(nextSiblings, expression, index);
-  },
-
-  select: function() {
-    var args = $A(arguments), element = $(args.shift());
-    return Selector.findChildElements(element, args);
-  },
-
-  adjacent: function() {
-    var args = $A(arguments), element = $(args.shift());
-    return Selector.findChildElements(element.parentNode, args).without(element);
-  },
-
-  identify: function(element) {
-    element = $(element);
-    var id = element.readAttribute('id'), self = arguments.callee;
-    if (id) return id;
-    do { id = 'anonymous_element_' + self.counter++ } while ($(id));
-    element.writeAttribute('id', id);
-    return id;
-  },
-
-  readAttribute: function(element, name) {
-    element = $(element);
-    if (Prototype.Browser.IE) {
-      var t = Element._attributeTranslations.read;
-      if (t.values[name]) return t.values[name](element, name);
-      if (t.names[name]) name = t.names[name];
-      if (name.include(':')) {
-        return (!element.attributes || !element.attributes[name]) ? null :
-         element.attributes[name].value;
-      }
-    }
-    return element.getAttribute(name);
-  },
-
-  writeAttribute: function(element, name, value) {
-    element = $(element);
-    var attributes = { }, t = Element._attributeTranslations.write;
-
-    if (typeof name == 'object') attributes = name;
-    else attributes[name] = Object.isUndefined(value) ? true : value;
-
-    for (var attr in attributes) {
-      name = t.names[attr] || attr;
-      value = attributes[attr];
-      if (t.values[attr]) name = t.values[attr](element, value);
-      if (value === false || value === null)
-        element.removeAttribute(name);
-      else if (value === true)
-        element.setAttribute(name, name);
-      else element.setAttribute(name, value);
-    }
-    return element;
-  },
-
-  getHeight: function(element) {
-    return $(element).getDimensions().height;
-  },
-
-  getWidth: function(element) {
-    return $(element).getDimensions().width;
-  },
-
-  classNames: function(element) {
-    return new Element.ClassNames(element);
-  },
-
-  hasClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    var elementClassName = element.className;
-    return (elementClassName.length > 0 && (elementClassName == className ||
-      new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName)));
-  },
-
-  addClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    if (!element.hasClassName(className))
-      element.className += (element.className ? ' ' : '') + className;
-    return element;
-  },
-
-  removeClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    element.className = element.className.replace(
-      new RegExp("(^|\\s+)" + className + "(\\s+|$)"), ' ').strip();
-    return element;
-  },
-
-  toggleClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    return element[element.hasClassName(className) ?
-      'removeClassName' : 'addClassName'](className);
-  },
-
-  // removes whitespace-only text node children
-  cleanWhitespace: function(element) {
-    element = $(element);
-    var node = element.firstChild;
-    while (node) {
-      var nextNode = node.nextSibling;
-      if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
-        element.removeChild(node);
-      node = nextNode;
-    }
-    return element;
-  },
-
-  empty: function(element) {
-    return $(element).innerHTML.blank();
-  },
-
-  descendantOf: function(element, ancestor) {
-    element = $(element), ancestor = $(ancestor);
-    var originalAncestor = ancestor;
-
-    if (element.compareDocumentPosition)
-      return (element.compareDocumentPosition(ancestor) & 8) === 8;
-
-    if (element.sourceIndex && !Prototype.Browser.Opera) {
-      var e = element.sourceIndex, a = ancestor.sourceIndex,
-       nextAncestor = ancestor.nextSibling;
-      if (!nextAncestor) {
-        do { ancestor = ancestor.parentNode; }
-        while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode);
-      }
-      if (nextAncestor && nextAncestor.sourceIndex)
-       return (e > a && e < nextAncestor.sourceIndex);
-    }
-
-    while (element = element.parentNode)
-      if (element == originalAncestor) return true;
-    return false;
-  },
-
-  scrollTo: function(element) {
-    element = $(element);
-    var pos = element.cumulativeOffset();
-    window.scrollTo(pos[0], pos[1]);
-    return element;
-  },
-
-  getStyle: function(element, style) {
-    element = $(element);
-    style = style == 'float' ? 'cssFloat' : style.camelize();
-    var value = element.style[style];
-    if (!value) {
-      var css = document.defaultView.getComputedStyle(element, null);
-      value = css ? css[style] : null;
-    }
-    if (style == 'opacity') return value ? parseFloat(value) : 1.0;
-    return value == 'auto' ? null : value;
-  },
-
-  getOpacity: function(element) {
-    return $(element).getStyle('opacity');
-  },
-
-  setStyle: function(element, styles) {
-    element = $(element);
-    var elementStyle = element.style, match;
-    if (Object.isString(styles)) {
-      element.style.cssText += ';' + styles;
-      return styles.include('opacity') ?
-        element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : element;
-    }
-    for (var property in styles)
-      if (property == 'opacity') element.setOpacity(styles[property]);
-      else
-        elementStyle[(property == 'float' || property == 'cssFloat') ?
-          (Object.isUndefined(elementStyle.styleFloat) ? 'cssFloat' : 'styleFloat') :
-            property] = styles[property];
-
-    return element;
-  },
-
-  setOpacity: function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1 || value === '') ? '' :
-      (value < 0.00001) ? 0 : value;
-    return element;
-  },
-
-  getDimensions: function(element) {
-    element = $(element);
-    var display = element.getStyle('display');
-    if (display != 'none' && display != null) // Safari bug
-      return {width: element.offsetWidth, height: element.offsetHeight};
-
-    // All *Width and *Height properties give 0 on elements with display none,
-    // so enable the element temporarily
-    var els = element.style;
-    var originalVisibility = els.visibility;
-    var originalPosition = els.position;
-    var originalDisplay = els.display;
-    els.visibility = 'hidden';
-    els.position = 'absolute';
-    els.display = 'block';
-    var originalWidth = element.clientWidth;
-    var originalHeight = element.clientHeight;
-    els.display = originalDisplay;
-    els.position = originalPosition;
-    els.visibility = originalVisibility;
-    return {width: originalWidth, height: originalHeight};
-  },
-
-  makePositioned: function(element) {
-    element = $(element);
-    var pos = Element.getStyle(element, 'position');
-    if (pos == 'static' || !pos) {
-      element._madePositioned = true;
-      element.style.position = 'relative';
-      // Opera returns the offset relative to the positioning context, when an
-      // element is position relative but top and left have not been defined
-      if (window.opera) {
-        element.style.top = 0;
-        element.style.left = 0;
-      }
-    }
-    return element;
-  },
-
-  undoPositioned: function(element) {
-    element = $(element);
-    if (element._madePositioned) {
-      element._madePositioned = undefined;
-      element.style.position =
-        element.style.top =
-        element.style.left =
-        element.style.bottom =
-        element.style.right = '';
-    }
-    return element;
-  },
-
-  makeClipping: function(element) {
-    element = $(element);
-    if (element._overflow) return element;
-    element._overflow = Element.getStyle(element, 'overflow') || 'auto';
-    if (element._overflow !== 'hidden')
-      element.style.overflow = 'hidden';
-    return element;
-  },
-
-  undoClipping: function(element) {
-    element = $(element);
-    if (!element._overflow) return element;
-    element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
-    element._overflow = null;
-    return element;
-  },
-
-  cumulativeOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  positionedOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-      if (element) {
-        if (element.tagName.toUpperCase() == 'BODY') break;
-        var p = Element.getStyle(element, 'position');
-        if (p !== 'static') break;
-      }
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  absolutize: function(element) {
-    element = $(element);
-    if (element.getStyle('position') == 'absolute') return element;
-    // Position.prepare(); // To be done manually by Scripty when it needs it.
-
-    var offsets = element.positionedOffset();
-    var top     = offsets[1];
-    var left    = offsets[0];
-    var width   = element.clientWidth;
-    var height  = element.clientHeight;
-
-    element._originalLeft   = left - parseFloat(element.style.left  || 0);
-    element._originalTop    = top  - parseFloat(element.style.top || 0);
-    element._originalWidth  = element.style.width;
-    element._originalHeight = element.style.height;
-
-    element.style.position = 'absolute';
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.width  = width + 'px';
-    element.style.height = height + 'px';
-    return element;
-  },
-
-  relativize: function(element) {
-    element = $(element);
-    if (element.getStyle('position') == 'relative') return element;
-    // Position.prepare(); // To be done manually by Scripty when it needs it.
-
-    element.style.position = 'relative';
-    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
-    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
-
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.height = element._originalHeight;
-    element.style.width  = element._originalWidth;
-    return element;
-  },
-
-  cumulativeScrollOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.scrollTop  || 0;
-      valueL += element.scrollLeft || 0;
-      element = element.parentNode;
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  getOffsetParent: function(element) {
-    if (element.offsetParent) return $(element.offsetParent);
-    if (element == document.body) return $(element);
-
-    while ((element = element.parentNode) && element != document.body)
-      if (Element.getStyle(element, 'position') != 'static')
-        return $(element);
-
-    return $(document.body);
-  },
-
-  viewportOffset: function(forElement) {
-    var valueT = 0, valueL = 0;
-
-    var element = forElement;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-
-      // Safari fix
-      if (element.offsetParent == document.body &&
-        Element.getStyle(element, 'position') == 'absolute') break;
-
-    } while (element = element.offsetParent);
-
-    element = forElement;
-    do {
-      if (!Prototype.Browser.Opera || element.tagName.toUpperCase() == 'BODY') {
-        valueT -= element.scrollTop  || 0;
-        valueL -= element.scrollLeft || 0;
-      }
-    } while (element = element.parentNode);
-
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  clonePosition: function(element, source) {
-    var options = Object.extend({
-      setLeft:    true,
-      setTop:     true,
-      setWidth:   true,
-      setHeight:  true,
-      offsetTop:  0,
-      offsetLeft: 0
-    }, arguments[2] || { });
-
-    // find page position of source
-    source = $(source);
-    var p = source.viewportOffset();
-
-    // find coordinate system to use
-    element = $(element);
-    var delta = [0, 0];
-    var parent = null;
-    // delta [0,0] will do fine with position: fixed elements,
-    // position:absolute needs offsetParent deltas
-    if (Element.getStyle(element, 'position') == 'absolute') {
-      parent = element.getOffsetParent();
-      delta = parent.viewportOffset();
-    }
-
-    // correct by body offsets (fixes Safari)
-    if (parent == document.body) {
-      delta[0] -= document.body.offsetLeft;
-      delta[1] -= document.body.offsetTop;
-    }
-
-    // set position
-    if (options.setLeft)   element.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
-    if (options.setTop)    element.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
-    if (options.setWidth)  element.style.width = source.offsetWidth + 'px';
-    if (options.setHeight) element.style.height = source.offsetHeight + 'px';
-    return element;
-  }
-};
-
-Element.Methods.identify.counter = 1;
-
-Object.extend(Element.Methods, {
-  getElementsBySelector: Element.Methods.select,
-  childElements: Element.Methods.immediateDescendants
-});
-
-Element._attributeTranslations = {
-  write: {
-    names: {
-      className: 'class',
-      htmlFor:   'for'
-    },
-    values: { }
-  }
-};
-
-if (Prototype.Browser.Opera) {
-  Element.Methods.getStyle = Element.Methods.getStyle.wrap(
-    function(proceed, element, style) {
-      switch (style) {
-        case 'left': case 'top': case 'right': case 'bottom':
-          if (proceed(element, 'position') === 'static') return null;
-        case 'height': case 'width':
-          // returns '0px' for hidden elements; we want it to return null
-          if (!Element.visible(element)) return null;
-
-          // returns the border-box dimensions rather than the content-box
-          // dimensions, so we subtract padding and borders from the value
-          var dim = parseInt(proceed(element, style), 10);
-
-          if (dim !== element['offset' + style.capitalize()])
-            return dim + 'px';
-
-          var properties;
-          if (style === 'height') {
-            properties = ['border-top-width', 'padding-top',
-             'padding-bottom', 'border-bottom-width'];
-          }
-          else {
-            properties = ['border-left-width', 'padding-left',
-             'padding-right', 'border-right-width'];
-          }
-          return properties.inject(dim, function(memo, property) {
-            var val = proceed(element, property);
-            return val === null ? memo : memo - parseInt(val, 10);
-          }) + 'px';
-        default: return proceed(element, style);
-      }
-    }
-  );
-
-  Element.Methods.readAttribute = Element.Methods.readAttribute.wrap(
-    function(proceed, element, attribute) {
-      if (attribute === 'title') return element.title;
-      return proceed(element, attribute);
-    }
-  );
-}
-
-else if (Prototype.Browser.IE) {
-  // IE doesn't report offsets correctly for static elements, so we change them
-  // to "relative" to get the values, then change them back.
-  Element.Methods.getOffsetParent = Element.Methods.getOffsetParent.wrap(
-    function(proceed, element) {
-      element = $(element);
-      // IE throws an error if element is not in document
-      try { element.offsetParent }
-      catch(e) { return $(document.body) }
-      var position = element.getStyle('position');
-      if (position !== 'static') return proceed(element);
-      element.setStyle({ position: 'relative' });
-      var value = proceed(element);
-      element.setStyle({ position: position });
-      return value;
-    }
-  );
-
-  $w('positionedOffset viewportOffset').each(function(method) {
-    Element.Methods[method] = Element.Methods[method].wrap(
-      function(proceed, element) {
-        element = $(element);
-        try { element.offsetParent }
-        catch(e) { return Element._returnOffset(0,0) }
-        var position = element.getStyle('position');
-        if (position !== 'static') return proceed(element);
-        // Trigger hasLayout on the offset parent so that IE6 reports
-        // accurate offsetTop and offsetLeft values for position: fixed.
-        var offsetParent = element.getOffsetParent();
-        if (offsetParent && offsetParent.getStyle('position') === 'fixed')
-          offsetParent.setStyle({ zoom: 1 });
-        element.setStyle({ position: 'relative' });
-        var value = proceed(element);
-        element.setStyle({ position: position });
-        return value;
-      }
-    );
-  });
-
-  Element.Methods.cumulativeOffset = Element.Methods.cumulativeOffset.wrap(
-    function(proceed, element) {
-      try { element.offsetParent }
-      catch(e) { return Element._returnOffset(0,0) }
-      return proceed(element);
-    }
-  );
-
-  Element.Methods.getStyle = function(element, style) {
-    element = $(element);
-    style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
-    var value = element.style[style];
-    if (!value && element.currentStyle) value = element.currentStyle[style];
-
-    if (style == 'opacity') {
-      if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
-        if (value[1]) return parseFloat(value[1]) / 100;
-      return 1.0;
-    }
-
-    if (value == 'auto') {
-      if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
-        return element['offset' + style.capitalize()] + 'px';
-      return null;
-    }
-    return value;
-  };
-
-  Element.Methods.setOpacity = function(element, value) {
-    function stripAlpha(filter){
-      return filter.replace(/alpha\([^\)]*\)/gi,'');
-    }
-    element = $(element);
-    var currentStyle = element.currentStyle;
-    if ((currentStyle && !currentStyle.hasLayout) ||
-      (!currentStyle && element.style.zoom == 'normal'))
-        element.style.zoom = 1;
-
-    var filter = element.getStyle('filter'), style = element.style;
-    if (value == 1 || value === '') {
-      (filter = stripAlpha(filter)) ?
-        style.filter = filter : style.removeAttribute('filter');
-      return element;
-    } else if (value < 0.00001) value = 0;
-    style.filter = stripAlpha(filter) +
-      'alpha(opacity=' + (value * 100) + ')';
-    return element;
-  };
-
-  Element._attributeTranslations = {
-    read: {
-      names: {
-        'class': 'className',
-        'for':   'htmlFor'
-      },
-      values: {
-        _getAttr: function(element, attribute) {
-          return element.getAttribute(attribute, 2);
-        },
-        _getAttrNode: function(element, attribute) {
-          var node = element.getAttributeNode(attribute);
-          return node ? node.value : "";
-        },
-        _getEv: function(element, attribute) {
-          attribute = element.getAttribute(attribute);
-          return attribute ? attribute.toString().slice(23, -2) : null;
-        },
-        _flag: function(element, attribute) {
-          return $(element).hasAttribute(attribute) ? attribute : null;
-        },
-        style: function(element) {
-          return element.style.cssText.toLowerCase();
-        },
-        title: function(element) {
-          return element.title;
-        }
-      }
-    }
-  };
-
-  Element._attributeTranslations.write = {
-    names: Object.extend({
-      cellpadding: 'cellPadding',
-      cellspacing: 'cellSpacing'
-    }, Element._attributeTranslations.read.names),
-    values: {
-      checked: function(element, value) {
-        element.checked = !!value;
-      },
-
-      style: function(element, value) {
-        element.style.cssText = value ? value : '';
-      }
-    }
-  };
-
-  Element._attributeTranslations.has = {};
-
-  $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
-      'encType maxLength readOnly longDesc frameBorder').each(function(attr) {
-    Element._attributeTranslations.write.names[attr.toLowerCase()] = attr;
-    Element._attributeTranslations.has[attr.toLowerCase()] = attr;
-  });
-
-  (function(v) {
-    Object.extend(v, {
-      href:        v._getAttr,
-      src:         v._getAttr,
-      type:        v._getAttr,
-      action:      v._getAttrNode,
-      disabled:    v._flag,
-      checked:     v._flag,
-      readonly:    v._flag,
-      multiple:    v._flag,
-      onload:      v._getEv,
-      onunload:    v._getEv,
-      onclick:     v._getEv,
-      ondblclick:  v._getEv,
-      onmousedown: v._getEv,
-      onmouseup:   v._getEv,
-      onmouseover: v._getEv,
-      onmousemove: v._getEv,
-      onmouseout:  v._getEv,
-      onfocus:     v._getEv,
-      onblur:      v._getEv,
-      onkeypress:  v._getEv,
-      onkeydown:   v._getEv,
-      onkeyup:     v._getEv,
-      onsubmit:    v._getEv,
-      onreset:     v._getEv,
-      onselect:    v._getEv,
-      onchange:    v._getEv
-    });
-  })(Element._attributeTranslations.read.values);
-}
-
-else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) {
-  Element.Methods.setOpacity = function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1) ? 0.999999 :
-      (value === '') ? '' : (value < 0.00001) ? 0 : value;
-    return element;
-  };
-}
-
-else if (Prototype.Browser.WebKit) {
-  Element.Methods.setOpacity = function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1 || value === '') ? '' :
-      (value < 0.00001) ? 0 : value;
-
-    if (value == 1)
-      if(element.tagName.toUpperCase() == 'IMG' && element.width) {
-        element.width++; element.width--;
-      } else try {
-        var n = document.createTextNode(' ');
-        element.appendChild(n);
-        element.removeChild(n);
-      } catch (e) { }
-
-    return element;
-  };
-
-  // Safari returns margins on body which is incorrect if the child is absolutely
-  // positioned.  For performance reasons, redefine Element#cumulativeOffset for
-  // KHTML/WebKit only.
-  Element.Methods.cumulativeOffset = function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      if (element.offsetParent == document.body)
-        if (Element.getStyle(element, 'position') == 'absolute') break;
-
-      element = element.offsetParent;
-    } while (element);
-
-    return Element._returnOffset(valueL, valueT);
-  };
-}
-
-if (Prototype.Browser.IE || Prototype.Browser.Opera) {
-  // IE and Opera are missing .innerHTML support for TABLE-related and SELECT elements
-  Element.Methods.update = function(element, content) {
-    element = $(element);
-
-    if (content && content.toElement) content = content.toElement();
-    if (Object.isElement(content)) return element.update().insert(content);
-
-    content = Object.toHTML(content);
-    var tagName = element.tagName.toUpperCase();
-
-    if (tagName in Element._insertionTranslations.tags) {
-      $A(element.childNodes).each(function(node) { element.removeChild(node) });
-      Element._getContentFromAnonymousElement(tagName, content.stripScripts())
-        .each(function(node) { element.appendChild(node) });
-    }
-    else element.innerHTML = content.stripScripts();
-
-    content.evalScripts.bind(content).defer();
-    return element;
-  };
-}
-
-if ('outerHTML' in document.createElement('div')) {
-  Element.Methods.replace = function(element, content) {
-    element = $(element);
-
-    if (content && content.toElement) content = content.toElement();
-    if (Object.isElement(content)) {
-      element.parentNode.replaceChild(content, element);
-      return element;
-    }
-
-    content = Object.toHTML(content);
-    var parent = element.parentNode, tagName = parent.tagName.toUpperCase();
-
-    if (Element._insertionTranslations.tags[tagName]) {
-      var nextSibling = element.next();
-      var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
-      parent.removeChild(element);
-      if (nextSibling)
-        fragments.each(function(node) { parent.insertBefore(node, nextSibling) });
-      else
-        fragments.each(function(node) { parent.appendChild(node) });
-    }
-    else element.outerHTML = content.stripScripts();
-
-    content.evalScripts.bind(content).defer();
-    return element;
-  };
-}
-
-Element._returnOffset = function(l, t) {
-  var result = [l, t];
-  result.left = l;
-  result.top = t;
-  return result;
-};
-
-Element._getContentFromAnonymousElement = function(tagName, html) {
-  var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
-  if (t) {
-    div.innerHTML = t[0] + html + t[1];
-    t[2].times(function() { div = div.firstChild });
-  } else div.innerHTML = html;
-  return $A(div.childNodes);
-};
-
-Element._insertionTranslations = {
-  before: function(element, node) {
-    element.parentNode.insertBefore(node, element);
-  },
-  top: function(element, node) {
-    element.insertBefore(node, element.firstChild);
-  },
-  bottom: function(element, node) {
-    element.appendChild(node);
-  },
-  after: function(element, node) {
-    element.parentNode.insertBefore(node, element.nextSibling);
-  },
-  tags: {
-    TABLE:  ['<table>',                '</table>',                   1],
-    TBODY:  ['<table><tbody>',         '</tbody></table>',           2],
-    TR:     ['<table><tbody><tr>',     '</tr></tbody></table>',      3],
-    TD:     ['<table><tbody><tr><td>', '</td></tr></tbody></table>', 4],
-    SELECT: ['<select>',               '</select>',                  1]
-  }
-};
-
-(function() {
-  Object.extend(this.tags, {
-    THEAD: this.tags.TBODY,
-    TFOOT: this.tags.TBODY,
-    TH:    this.tags.TD
-  });
-}).call(Element._insertionTranslations);
-
-Element.Methods.Simulated = {
-  hasAttribute: function(element, attribute) {
-    attribute = Element._attributeTranslations.has[attribute] || attribute;
-    var node = $(element).getAttributeNode(attribute);
-    return node && node.specified;
-  }
-};
-
-Element.Methods.ByTag = { };
-
-Object.extend(Element, Element.Methods);
-
-if (!Prototype.BrowserFeatures.ElementExtensions &&
-    document.createElement('div').__proto__) {
-  window.HTMLElement = { };
-  window.HTMLElement.prototype = document.createElement('div').__proto__;
-  Prototype.BrowserFeatures.ElementExtensions = true;
-}
-
-Element.extend = (function() {
-  if (Prototype.BrowserFeatures.SpecificElementExtensions)
-    return Prototype.K;
-
-  var Methods = { }, ByTag = Element.Methods.ByTag;
-
-  var extend = Object.extend(function(element) {
-    if (!element || element._extendedByPrototype ||
-        element.nodeType != 1 || element == window) return element;
-
-    var methods = Object.clone(Methods),
-      tagName = element.tagName.toUpperCase(), property, value;
-
-    // extend methods for specific tags
-    if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
-
-    for (property in methods) {
-      value = methods[property];
-      if (Object.isFunction(value) && !(property in element))
-        element[property] = value.methodize();
-    }
-
-    element._extendedByPrototype = Prototype.emptyFunction;
-    return element;
-
-  }, {
-    refresh: function() {
-      // extend methods for all tags (Safari doesn't need this)
-      if (!Prototype.BrowserFeatures.ElementExtensions) {
-        Object.extend(Methods, Element.Methods);
-        Object.extend(Methods, Element.Methods.Simulated);
-      }
-    }
-  });
-
-  extend.refresh();
-  return extend;
-})();
-
-Element.hasAttribute = function(element, attribute) {
-  if (element.hasAttribute) return element.hasAttribute(attribute);
-  return Element.Methods.Simulated.hasAttribute(element, attribute);
-};
-
-Element.addMethods = function(methods) {
-  var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
-
-  if (!methods) {
-    Object.extend(Form, Form.Methods);
-    Object.extend(Form.Element, Form.Element.Methods);
-    Object.extend(Element.Methods.ByTag, {
-      "FORM":     Object.clone(Form.Methods),
-      "INPUT":    Object.clone(Form.Element.Methods),
-      "SELECT":   Object.clone(Form.Element.Methods),
-      "TEXTAREA": Object.clone(Form.Element.Methods)
-    });
-  }
-
-  if (arguments.length == 2) {
-    var tagName = methods;
-    methods = arguments[1];
-  }
-
-  if (!tagName) Object.extend(Element.Methods, methods || { });
-  else {
-    if (Object.isArray(tagName)) tagName.each(extend);
-    else extend(tagName);
-  }
-
-  function extend(tagName) {
-    tagName = tagName.toUpperCase();
-    if (!Element.Methods.ByTag[tagName])
-      Element.Methods.ByTag[tagName] = { };
-    Object.extend(Element.Methods.ByTag[tagName], methods);
-  }
-
-  function copy(methods, destination, onlyIfAbsent) {
-    onlyIfAbsent = onlyIfAbsent || false;
-    for (var property in methods) {
-      var value = methods[property];
-      if (!Object.isFunction(value)) continue;
-      if (!onlyIfAbsent || !(property in destination))
-        destination[property] = value.methodize();
-    }
-  }
-
-  function findDOMClass(tagName) {
-    var klass;
-    var trans = {
-      "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
-      "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
-      "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
-      "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
-      "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
-      "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
-      "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
-      "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
-      "FrameSet", "IFRAME": "IFrame"
-    };
-    if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
-    if (window[klass]) return window[klass];
-    klass = 'HTML' + tagName + 'Element';
-    if (window[klass]) return window[klass];
-    klass = 'HTML' + tagName.capitalize() + 'Element';
-    if (window[klass]) return window[klass];
-
-    window[klass] = { };
-    window[klass].prototype = document.createElement(tagName).__proto__;
-    return window[klass];
-  }
-
-  if (F.ElementExtensions) {
-    copy(Element.Methods, HTMLElement.prototype);
-    copy(Element.Methods.Simulated, HTMLElement.prototype, true);
-  }
-
-  if (F.SpecificElementExtensions) {
-    for (var tag in Element.Methods.ByTag) {
-      var klass = findDOMClass(tag);
-      if (Object.isUndefined(klass)) continue;
-      copy(T[tag], klass.prototype);
-    }
-  }
-
-  Object.extend(Element, Element.Methods);
-  delete Element.ByTag;
-
-  if (Element.extend.refresh) Element.extend.refresh();
-  Element.cache = { };
-};
-
-document.viewport = {
-  getDimensions: function() {
-    var dimensions = { };
-    var B = Prototype.Browser;
-    $w('width height').each(function(d) {
-      var D = d.capitalize();
-      dimensions[d] = (B.WebKit && !document.evaluate) ? self['inner' + D] :
-        (B.Opera) ? document.body['client' + D] : document.documentElement['client' + D];
-    });
-    return dimensions;
-  },
-
-  getWidth: function() {
-    return this.getDimensions().width;
-  },
-
-  getHeight: function() {
-    return this.getDimensions().height;
-  },
-
-  getScrollOffsets: function() {
-    return Element._returnOffset(
-      window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft,
-      window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop);
-  }
-};
-/* Portions of the Selector class are derived from Jack Slocum's DomQuery,
- * part of YUI-Ext version 0.40, distributed under the terms of an MIT-style
- * license.  Please see http://www.yui-ext.com/ for more information. */
-
-var Selector = Class.create({
-  initialize: function(expression) {
-    this.expression = expression.strip();
-    this.compileMatcher();
-  },
-
-  shouldUseXPath: function() {
-    if (!Prototype.BrowserFeatures.XPath) return false;
-
-    var e = this.expression;
-
-    // Safari 3 chokes on :*-of-type and :empty
-    if (Prototype.Browser.WebKit &&
-     (e.include("-of-type") || e.include(":empty")))
-      return false;
-
-    // XPath can't do namespaced attributes, nor can it read
-    // the "checked" property from DOM nodes
-    if ((/(\[[\w-]*?:|:checked)/).test(this.expression))
-      return false;
-
-    return true;
-  },
-
-  compileMatcher: function() {
-    if (this.shouldUseXPath())
-      return this.compileXPathMatcher();
-
-    var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
-        c = Selector.criteria, le, p, m;
-
-    if (Selector._cache[e]) {
-      this.matcher = Selector._cache[e];
-      return;
-    }
-
-    this.matcher = ["this.matcher = function(root) {",
-                    "var r = root, h = Selector.handlers, c = false, n;"];
-
-    while (e && le != e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        p = ps[i];
-        if (m = e.match(p)) {
-          this.matcher.push(Object.isFunction(c[i]) ? c[i](m) :
-            new Template(c[i]).evaluate(m));
-          e = e.replace(m[0], '');
-          break;
-        }
-      }
-    }
-
-    this.matcher.push("return h.unique(n);\n}");
-    eval(this.matcher.join('\n'));
-    Selector._cache[this.expression] = this.matcher;
-  },
-
-  compileXPathMatcher: function() {
-    var e = this.expression, ps = Selector.patterns,
-        x = Selector.xpath, le, m;
-
-    if (Selector._cache[e]) {
-      this.xpath = Selector._cache[e]; return;
-    }
-
-    this.matcher = ['.//*'];
-    while (e && le != e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        if (m = e.match(ps[i])) {
-          this.matcher.push(Object.isFunction(x[i]) ? x[i](m) :
-            new Template(x[i]).evaluate(m));
-          e = e.replace(m[0], '');
-          break;
-        }
-      }
-    }
-
-    this.xpath = this.matcher.join('');
-    Selector._cache[this.expression] = this.xpath;
-  },
-
-  findElements: function(root) {
-    root = root || document;
-    if (this.xpath) return document._getElementsByXPath(this.xpath, root);
-    return this.matcher(root);
-  },
-
-  match: function(element) {
-    this.tokens = [];
-
-    var e = this.expression, ps = Selector.patterns, as = Selector.assertions;
-    var le, p, m;
-
-    while (e && le !== e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        p = ps[i];
-        if (m = e.match(p)) {
-          // use the Selector.assertions methods unless the selector
-          // is too complex.
-          if (as[i]) {
-            this.tokens.push([i, Object.clone(m)]);
-            e = e.replace(m[0], '');
-          } else {
-            // reluctantly do a document-wide search
-            // and look for a match in the array
-            return this.findElements(document).include(element);
-          }
-        }
-      }
-    }
-
-    var match = true, name, matches;
-    for (var i = 0, token; token = this.tokens[i]; i++) {
-      name = token[0], matches = token[1];
-      if (!Selector.assertions[name](element, matches)) {
-        match = false; break;
-      }
-    }
-
-    return match;
-  },
-
-  toString: function() {
-    return this.expression;
-  },
-
-  inspect: function() {
-    return "#<Selector:" + this.expression.inspect() + ">";
-  }
-});
-
-Object.extend(Selector, {
-  _cache: { },
-
-  xpath: {
-    descendant:   "//*",
-    child:        "/*",
-    adjacent:     "/following-sibling::*[1]",
-    laterSibling: '/following-sibling::*',
-    tagName:      function(m) {
-      if (m[1] == '*') return '';
-      return "[local-name()='" + m[1].toLowerCase() +
-             "' or local-name()='" + m[1].toUpperCase() + "']";
-    },
-    className:    "[contains(concat(' ', @class, ' '), ' #{1} ')]",
-    id:           "[@id='#{1}']",
-    attrPresence: function(m) {
-      m[1] = m[1].toLowerCase();
-      return new Template("[@#{1}]").evaluate(m);
-    },
-    attr: function(m) {
-      m[1] = m[1].toLowerCase();
-      m[3] = m[5] || m[6];
-      return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
-    },
-    pseudo: function(m) {
-      var h = Selector.xpath.pseudos[m[1]];
-      if (!h) return '';
-      if (Object.isFunction(h)) return h(m);
-      return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
-    },
-    operators: {
-      '=':  "[@#{1}='#{3}']",
-      '!=': "[@#{1}!='#{3}']",
-      '^=': "[starts-with(@#{1}, '#{3}')]",
-      '$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
-      '*=': "[contains(@#{1}, '#{3}')]",
-      '~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
-      '|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
-    },
-    pseudos: {
-      'first-child': '[not(preceding-sibling::*)]',
-      'last-child':  '[not(following-sibling::*)]',
-      'only-child':  '[not(preceding-sibling::* or following-sibling::*)]',
-      'empty':       "[count(*) = 0 and (count(text()) = 0 or translate(text(), ' \t\r\n', '') = '')]",
-      'checked':     "[@checked]",
-      'disabled':    "[@disabled]",
-      'enabled':     "[not(@disabled)]",
-      'not': function(m) {
-        var e = m[6], p = Selector.patterns,
-            x = Selector.xpath, le, v;
-
-        var exclusion = [];
-        while (e && le != e && (/\S/).test(e)) {
-          le = e;
-          for (var i in p) {
-            if (m = e.match(p[i])) {
-              v = Object.isFunction(x[i]) ? x[i](m) : new Template(x[i]).evaluate(m);
-              exclusion.push("(" + v.substring(1, v.length - 1) + ")");
-              e = e.replace(m[0], '');
-              break;
-            }
-          }
-        }
-        return "[not(" + exclusion.join(" and ") + ")]";
-      },
-      'nth-child':      function(m) {
-        return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) + 1) ", m);
-      },
-      'nth-last-child': function(m) {
-        return Selector.xpath.pseudos.nth("(count(./following-sibling::*) + 1) ", m);
-      },
-      'nth-of-type':    function(m) {
-        return Selector.xpath.pseudos.nth("position() ", m);
-      },
-      'nth-last-of-type': function(m) {
-        return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
-      },
-      'first-of-type':  function(m) {
-        m[6] = "1"; return Selector.xpath.pseudos['nth-of-type'](m);
-      },
-      'last-of-type':   function(m) {
-        m[6] = "1"; return Selector.xpath.pseudos['nth-last-of-type'](m);
-      },
-      'only-of-type':   function(m) {
-        var p = Selector.xpath.pseudos; return p['first-of-type'](m) + p['last-of-type'](m);
-      },
-      nth: function(fragment, m) {
-        var mm, formula = m[6], predicate;
-        if (formula == 'even') formula = '2n+0';
-        if (formula == 'odd')  formula = '2n+1';
-        if (mm = formula.match(/^(\d+)$/)) // digit only
-          return '[' + fragment + "= " + mm[1] + ']';
-        if (mm = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
-          if (mm[1] == "-") mm[1] = -1;
-          var a = mm[1] ? Number(mm[1]) : 1;
-          var b = mm[2] ? Number(mm[2]) : 0;
-          predicate = "[((#{fragment} - #{b}) mod #{a} = 0) and " +
-          "((#{fragment} - #{b}) div #{a} >= 0)]";
-          return new Template(predicate).evaluate({
-            fragment: fragment, a: a, b: b });
-        }
-      }
-    }
-  },
-
-  criteria: {
-    tagName:      'n = h.tagName(n, r, "#{1}", c);      c = false;',
-    className:    'n = h.className(n, r, "#{1}", c);    c = false;',
-    id:           'n = h.id(n, r, "#{1}", c);           c = false;',
-    attrPresence: 'n = h.attrPresence(n, r, "#{1}", c); c = false;',
-    attr: function(m) {
-      m[3] = (m[5] || m[6]);
-      return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}", c); c = false;').evaluate(m);
-    },
-    pseudo: function(m) {
-      if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
-      return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m);
-    },
-    descendant:   'c = "descendant";',
-    child:        'c = "child";',
-    adjacent:     'c = "adjacent";',
-    laterSibling: 'c = "laterSibling";'
-  },
-
-  patterns: {
-    // combinators must be listed first
-    // (and descendant needs to be last combinator)
-    laterSibling: /^\s*~\s*/,
-    child:        /^\s*>\s*/,
-    adjacent:     /^\s*\+\s*/,
-    descendant:   /^\s/,
-
-    // selectors follow
-    tagName:      /^\s*(\*|[\w\-]+)(\b|$)?/,
-    id:           /^#([\w\-\*]+)(\b|$)/,
-    className:    /^\.([\w\-\*]+)(\b|$)/,
-    pseudo:
-/^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s|[:+~>]))/,
-    attrPresence: /^\[((?:[\w]+:)?[\w]+)\]/,
-    attr:         /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/
-  },
-
-  // for Selector.match and Element#match
-  assertions: {
-    tagName: function(element, matches) {
-      return matches[1].toUpperCase() == element.tagName.toUpperCase();
-    },
-
-    className: function(element, matches) {
-      return Element.hasClassName(element, matches[1]);
-    },
-
-    id: function(element, matches) {
-      return element.id === matches[1];
-    },
-
-    attrPresence: function(element, matches) {
-      return Element.hasAttribute(element, matches[1]);
-    },
-
-    attr: function(element, matches) {
-      var nodeValue = Element.readAttribute(element, matches[1]);
-      return nodeValue && Selector.operators[matches[2]](nodeValue, matches[5] || matches[6]);
-    }
-  },
-
-  handlers: {
-    // UTILITY FUNCTIONS
-    // joins two collections
-    concat: function(a, b) {
-      for (var i = 0, node; node = b[i]; i++)
-        a.push(node);
-      return a;
-    },
-
-    // marks an array of nodes for counting
-    mark: function(nodes) {
-      var _true = Prototype.emptyFunction;
-      for (var i = 0, node; node = nodes[i]; i++)
-        node._countedByPrototype = _true;
-      return nodes;
-    },
-
-    unmark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-        node._countedByPrototype = undefined;
-      return nodes;
-    },
-
-    // mark each child node with its position (for nth calls)
-    // "ofType" flag indicates whether we're indexing for nth-of-type
-    // rather than nth-child
-    index: function(parentNode, reverse, ofType) {
-      parentNode._countedByPrototype = Prototype.emptyFunction;
-      if (reverse) {
-        for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
-          var node = nodes[i];
-          if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
-        }
-      } else {
-        for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
-          if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
-      }
-    },
-
-    // filters out duplicates and extends all nodes
-    unique: function(nodes) {
-      if (nodes.length == 0) return nodes;
-      var results = [], n;
-      for (var i = 0, l = nodes.length; i < l; i++)
-        if (!(n = nodes[i])._countedByPrototype) {
-          n._countedByPrototype = Prototype.emptyFunction;
-          results.push(Element.extend(n));
-        }
-      return Selector.handlers.unmark(results);
-    },
-
-    // COMBINATOR FUNCTIONS
-    descendant: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        h.concat(results, node.getElementsByTagName('*'));
-      return results;
-    },
-
-    child: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        for (var j = 0, child; child = node.childNodes[j]; j++)
-          if (child.nodeType == 1 && child.tagName != '!') results.push(child);
-      }
-      return results;
-    },
-
-    adjacent: function(nodes) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        var next = this.nextElementSibling(node);
-        if (next) results.push(next);
-      }
-      return results;
-    },
-
-    laterSibling: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        h.concat(results, Element.nextSiblings(node));
-      return results;
-    },
-
-    nextElementSibling: function(node) {
-      while (node = node.nextSibling)
-        if (node.nodeType == 1) return node;
-      return null;
-    },
-
-    previousElementSibling: function(node) {
-      while (node = node.previousSibling)
-        if (node.nodeType == 1) return node;
-      return null;
-    },
-
-    // TOKEN FUNCTIONS
-    tagName: function(nodes, root, tagName, combinator) {
-      var uTagName = tagName.toUpperCase();
-      var results = [], h = Selector.handlers;
-      if (nodes) {
-        if (combinator) {
-          // fastlane for ordinary descendant combinators
-          if (combinator == "descendant") {
-            for (var i = 0, node; node = nodes[i]; i++)
-              h.concat(results, node.getElementsByTagName(tagName));
-            return results;
-          } else nodes = this[combinator](nodes);
-          if (tagName == "*") return nodes;
-        }
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.tagName.toUpperCase() === uTagName) results.push(node);
-        return results;
-      } else return root.getElementsByTagName(tagName);
-    },
-
-    id: function(nodes, root, id, combinator) {
-      var targetNode = $(id), h = Selector.handlers;
-      if (!targetNode) return [];
-      if (!nodes && root == document) return [targetNode];
-      if (nodes) {
-        if (combinator) {
-          if (combinator == 'child') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (targetNode.parentNode == node) return [targetNode];
-          } else if (combinator == 'descendant') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (Element.descendantOf(targetNode, node)) return [targetNode];
-          } else if (combinator == 'adjacent') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (Selector.handlers.previousElementSibling(targetNode) == node)
-                return [targetNode];
-          } else nodes = h[combinator](nodes);
-        }
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node == targetNode) return [targetNode];
-        return [];
-      }
-      return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : [];
-    },
-
-    className: function(nodes, root, className, combinator) {
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      return Selector.handlers.byClassName(nodes, root, className);
-    },
-
-    byClassName: function(nodes, root, className) {
-      if (!nodes) nodes = Selector.handlers.descendant([root]);
-      var needle = ' ' + className + ' ';
-      for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
-        nodeClassName = node.className;
-        if (nodeClassName.length == 0) continue;
-        if (nodeClassName == className || (' ' + nodeClassName + ' ').include(needle))
-          results.push(node);
-      }
-      return results;
-    },
-
-    attrPresence: function(nodes, root, attr, combinator) {
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      var results = [];
-      for (var i = 0, node; node = nodes[i]; i++)
-        if (Element.hasAttribute(node, attr)) results.push(node);
-      return results;
-    },
-
-    attr: function(nodes, root, attr, value, operator, combinator) {
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      var handler = Selector.operators[operator], results = [];
-      for (var i = 0, node; node = nodes[i]; i++) {
-        var nodeValue = Element.readAttribute(node, attr);
-        if (nodeValue === null) continue;
-        if (handler(nodeValue, value)) results.push(node);
-      }
-      return results;
-    },
-
-    pseudo: function(nodes, name, value, root, combinator) {
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      return Selector.pseudos[name](nodes, value, root);
-    }
-  },
-
-  pseudos: {
-    'first-child': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        if (Selector.handlers.previousElementSibling(node)) continue;
-          results.push(node);
-      }
-      return results;
-    },
-    'last-child': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        if (Selector.handlers.nextElementSibling(node)) continue;
-          results.push(node);
-      }
-      return results;
-    },
-    'only-child': function(nodes, value, root) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
-          results.push(node);
-      return results;
-    },
-    'nth-child':        function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root);
-    },
-    'nth-last-child':   function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, true);
-    },
-    'nth-of-type':      function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, false, true);
-    },
-    'nth-last-of-type': function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, true, true);
-    },
-    'first-of-type':    function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, "1", root, false, true);
-    },
-    'last-of-type':     function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, "1", root, true, true);
-    },
-    'only-of-type':     function(nodes, formula, root) {
-      var p = Selector.pseudos;
-      return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
-    },
-
-    // handles the an+b logic
-    getIndices: function(a, b, total) {
-      if (a == 0) return b > 0 ? [b] : [];
-      return $R(1, total).inject([], function(memo, i) {
-        if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
-        return memo;
-      });
-    },
-
-    // handles nth(-last)-child, nth(-last)-of-type, and (first|last)-of-type
-    nth: function(nodes, formula, root, reverse, ofType) {
-      if (nodes.length == 0) return [];
-      if (formula == 'even') formula = '2n+0';
-      if (formula == 'odd')  formula = '2n+1';
-      var h = Selector.handlers, results = [], indexed = [], m;
-      h.mark(nodes);
-      for (var i = 0, node; node = nodes[i]; i++) {
-        if (!node.parentNode._countedByPrototype) {
-          h.index(node.parentNode, reverse, ofType);
-          indexed.push(node.parentNode);
-        }
-      }
-      if (formula.match(/^\d+$/)) { // just a number
-        formula = Number(formula);
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.nodeIndex == formula) results.push(node);
-      } else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
-        if (m[1] == "-") m[1] = -1;
-        var a = m[1] ? Number(m[1]) : 1;
-        var b = m[2] ? Number(m[2]) : 0;
-        var indices = Selector.pseudos.getIndices(a, b, nodes.length);
-        for (var i = 0, node, l = indices.length; node = nodes[i]; i++) {
-          for (var j = 0; j < l; j++)
-            if (node.nodeIndex == indices[j]) results.push(node);
-        }
-      }
-      h.unmark(nodes);
-      h.unmark(indexed);
-      return results;
-    },
-
-    'empty': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        // IE treats comments as element nodes
-        if (node.tagName == '!' || (node.firstChild && !node.innerHTML.match(/^\s*$/))) continue;
-        results.push(node);
-      }
-      return results;
-    },
-
-    'not': function(nodes, selector, root) {
-      var h = Selector.handlers, selectorType, m;
-      var exclusions = new Selector(selector).findElements(root);
-      h.mark(exclusions);
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!node._countedByPrototype) results.push(node);
-      h.unmark(exclusions);
-      return results;
-    },
-
-    'enabled': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!node.disabled) results.push(node);
-      return results;
-    },
-
-    'disabled': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (node.disabled) results.push(node);
-      return results;
-    },
-
-    'checked': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (node.checked) results.push(node);
-      return results;
-    }
-  },
-
-  operators: {
-    '=':  function(nv, v) { return nv == v; },
-    '!=': function(nv, v) { return nv != v; },
-    '^=': function(nv, v) { return nv.startsWith(v); },
-    '$=': function(nv, v) { return nv.endsWith(v); },
-    '*=': function(nv, v) { return nv.include(v); },
-    '~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); },
-    '|=': function(nv, v) { return ('-' + nv.toUpperCase() + '-').include('-' + v.toUpperCase() + '-'); }
-  },
-
-  split: function(expression) {
-    var expressions = [];
-    expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
-      expressions.push(m[1].strip());
-    });
-    return expressions;
-  },
-
-  matchElements: function(elements, expression) {
-    var matches = $$(expression), h = Selector.handlers;
-    h.mark(matches);
-    for (var i = 0, results = [], element; element = elements[i]; i++)
-      if (element._countedByPrototype) results.push(element);
-    h.unmark(matches);
-    return results;
-  },
-
-  findElement: function(elements, expression, index) {
-    if (Object.isNumber(expression)) {
-      index = expression; expression = false;
-    }
-    return Selector.matchElements(elements, expression || '*')[index || 0];
-  },
-
-  findChildElements: function(element, expressions) {
-    expressions = Selector.split(expressions.join(','));
-    var results = [], h = Selector.handlers;
-    for (var i = 0, l = expressions.length, selector; i < l; i++) {
-      selector = new Selector(expressions[i].strip());
-      h.concat(results, selector.findElements(element));
-    }
-    return (l > 1) ? h.unique(results) : results;
-  }
-});
-
-if (Prototype.Browser.IE) {
-  Object.extend(Selector.handlers, {
-    // IE returns comment nodes on getElementsByTagName("*").
-    // Filter them out.
-    concat: function(a, b) {
-      for (var i = 0, node; node = b[i]; i++)
-        if (node.tagName !== "!") a.push(node);
-      return a;
-    },
-
-    // IE improperly serializes _countedByPrototype in (inner|outer)HTML.
-    unmark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-        node.removeAttribute('_countedByPrototype');
-      return nodes;
-    }
-  });
-}
-
-function $$() {
-  return Selector.findChildElements(document, $A(arguments));
-}
-var Form = {
-  reset: function(form) {
-    $(form).reset();
-    return form;
-  },
-
-  serializeElements: function(elements, options) {
-    if (typeof options != 'object') options = { hash: !!options };
-    else if (Object.isUndefined(options.hash)) options.hash = true;
-    var key, value, submitted = false, submit = options.submit;
-
-    var data = elements.inject({ }, function(result, element) {
-      if (!element.disabled && element.name) {
-        key = element.name; value = $(element).getValue();
-        if (value != null && (element.type != 'submit' || (!submitted &&
-            submit !== false && (!submit || key == submit) && (submitted = true)))) {
-          if (key in result) {
-            // a key is already present; construct an array of values
-            if (!Object.isArray(result[key])) result[key] = [result[key]];
-            result[key].push(value);
-          }
-          else result[key] = value;
-        }
-      }
-      return result;
-    });
-
-    return options.hash ? data : Object.toQueryString(data);
-  }
-};
-
-Form.Methods = {
-  serialize: function(form, options) {
-    return Form.serializeElements(Form.getElements(form), options);
-  },
-
-  getElements: function(form) {
-    return $A($(form).getElementsByTagName('*')).inject([],
-      function(elements, child) {
-        if (Form.Element.Serializers[child.tagName.toLowerCase()])
-          elements.push(Element.extend(child));
-        return elements;
-      }
-    );
-  },
-
-  getInputs: function(form, typeName, name) {
-    form = $(form);
-    var inputs = form.getElementsByTagName('input');
-
-    if (!typeName && !name) return $A(inputs).map(Element.extend);
-
-    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
-      var input = inputs[i];
-      if ((typeName && input.type != typeName) || (name && input.name != name))
-        continue;
-      matchingInputs.push(Element.extend(input));
-    }
-
-    return matchingInputs;
-  },
-
-  disable: function(form) {
-    form = $(form);
-    Form.getElements(form).invoke('disable');
-    return form;
-  },
-
-  enable: function(form) {
-    form = $(form);
-    Form.getElements(form).invoke('enable');
-    return form;
-  },
-
-  findFirstElement: function(form) {
-    var elements = $(form).getElements().findAll(function(element) {
-      return 'hidden' != element.type && !element.disabled;
-    });
-    var firstByIndex = elements.findAll(function(element) {
-      return element.hasAttribute('tabIndex') && element.tabIndex >= 0;
-    }).sortBy(function(element) { return element.tabIndex }).first();
-
-    return firstByIndex ? firstByIndex : elements.find(function(element) {
-      return ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
-    });
-  },
-
-  focusFirstElement: function(form) {
-    form = $(form);
-    form.findFirstElement().activate();
-    return form;
-  },
-
-  request: function(form, options) {
-    form = $(form), options = Object.clone(options || { });
-
-    var params = options.parameters, action = form.readAttribute('action') || '';
-    if (action.blank()) action = window.location.href;
-    options.parameters = form.serialize(true);
-
-    if (params) {
-      if (Object.isString(params)) params = params.toQueryParams();
-      Object.extend(options.parameters, params);
-    }
-
-    if (form.hasAttribute('method') && !options.method)
-      options.method = form.method;
-
-    return new Ajax.Request(action, options);
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-Form.Element = {
-  focus: function(element) {
-    $(element).focus();
-    return element;
-  },
-
-  select: function(element) {
-    $(element).select();
-    return element;
-  }
-};
-
-Form.Element.Methods = {
-  serialize: function(element) {
-    element = $(element);
-    if (!element.disabled && element.name) {
-      var value = element.getValue();
-      if (value != undefined) {
-        var pair = { };
-        pair[element.name] = value;
-        return Object.toQueryString(pair);
-      }
-    }
-    return '';
-  },
-
-  getValue: function(element) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    return Form.Element.Serializers[method](element);
-  },
-
-  setValue: function(element, value) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    Form.Element.Serializers[method](element, value);
-    return element;
-  },
-
-  clear: function(element) {
-    $(element).value = '';
-    return element;
-  },
-
-  present: function(element) {
-    return $(element).value != '';
-  },
-
-  activate: function(element) {
-    element = $(element);
-    try {
-      element.focus();
-      if (element.select && (element.tagName.toLowerCase() != 'input' ||
-          !['button', 'reset', 'submit'].include(element.type)))
-        element.select();
-    } catch (e) { }
-    return element;
-  },
-
-  disable: function(element) {
-    element = $(element);
-    element.blur();
-    element.disabled = true;
-    return element;
-  },
-
-  enable: function(element) {
-    element = $(element);
-    element.disabled = false;
-    return element;
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-var Field = Form.Element;
-var $F = Form.Element.Methods.getValue;
-
-/*--------------------------------------------------------------------------*/
-
-Form.Element.Serializers = {
-  input: function(element, value) {
-    switch (element.type.toLowerCase()) {
-      case 'checkbox':
-      case 'radio':
-        return Form.Element.Serializers.inputSelector(element, value);
-      default:
-        return Form.Element.Serializers.textarea(element, value);
-    }
-  },
-
-  inputSelector: function(element, value) {
-    if (Object.isUndefined(value)) return element.checked ? element.value : null;
-    else element.checked = !!value;
-  },
-
-  textarea: function(element, value) {
-    if (Object.isUndefined(value)) return element.value;
-    else element.value = value;
-  },
-
-  select: function(element, index) {
-    if (Object.isUndefined(index))
-      return this[element.type == 'select-one' ?
-        'selectOne' : 'selectMany'](element);
-    else {
-      var opt, value, single = !Object.isArray(index);
-      for (var i = 0, length = element.length; i < length; i++) {
-        opt = element.options[i];
-        value = this.optionValue(opt);
-        if (single) {
-          if (value == index) {
-            opt.selected = true;
-            return;
-          }
-        }
-        else opt.selected = index.include(value);
-      }
-    }
-  },
-
-  selectOne: function(element) {
-    var index = element.selectedIndex;
-    return index >= 0 ? this.optionValue(element.options[index]) : null;
-  },
-
-  selectMany: function(element) {
-    var values, length = element.length;
-    if (!length) return null;
-
-    for (var i = 0, values = []; i < length; i++) {
-      var opt = element.options[i];
-      if (opt.selected) values.push(this.optionValue(opt));
-    }
-    return values;
-  },
-
-  optionValue: function(opt) {
-    // extend element because hasAttribute may not be native
-    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.TimedObserver = Class.create(PeriodicalExecuter, {
-  initialize: function($super, element, frequency, callback) {
-    $super(callback, frequency);
-    this.element   = $(element);
-    this.lastValue = this.getValue();
-  },
-
-  execute: function() {
-    var value = this.getValue();
-    if (Object.isString(this.lastValue) && Object.isString(value) ?
-        this.lastValue != value : String(this.lastValue) != String(value)) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  }
-});
-
-Form.Element.Observer = Class.create(Abstract.TimedObserver, {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.Observer = Class.create(Abstract.TimedObserver, {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.EventObserver = Class.create({
-  initialize: function(element, callback) {
-    this.element  = $(element);
-    this.callback = callback;
-
-    this.lastValue = this.getValue();
-    if (this.element.tagName.toLowerCase() == 'form')
-      this.registerFormCallbacks();
-    else
-      this.registerCallback(this.element);
-  },
-
-  onElementEvent: function() {
-    var value = this.getValue();
-    if (this.lastValue != value) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  },
-
-  registerFormCallbacks: function() {
-    Form.getElements(this.element).each(this.registerCallback, this);
-  },
-
-  registerCallback: function(element) {
-    if (element.type) {
-      switch (element.type.toLowerCase()) {
-        case 'checkbox':
-        case 'radio':
-          Event.observe(element, 'click', this.onElementEvent.bind(this));
-          break;
-        default:
-          Event.observe(element, 'change', this.onElementEvent.bind(this));
-          break;
-      }
-    }
-  }
-});
-
-Form.Element.EventObserver = Class.create(Abstract.EventObserver, {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.EventObserver = Class.create(Abstract.EventObserver, {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-if (!window.Event) var Event = { };
-
-Object.extend(Event, {
-  KEY_BACKSPACE: 8,
-  KEY_TAB:       9,
-  KEY_RETURN:   13,
-  KEY_ESC:      27,
-  KEY_LEFT:     37,
-  KEY_UP:       38,
-  KEY_RIGHT:    39,
-  KEY_DOWN:     40,
-  KEY_DELETE:   46,
-  KEY_HOME:     36,
-  KEY_END:      35,
-  KEY_PAGEUP:   33,
-  KEY_PAGEDOWN: 34,
-  KEY_INSERT:   45,
-
-  cache: { },
-
-  relatedTarget: function(event) {
-    var element;
-    switch(event.type) {
-      case 'mouseover': element = event.fromElement; break;
-      case 'mouseout':  element = event.toElement;   break;
-      default: return null;
-    }
-    return Element.extend(element);
-  }
-});
-
-Event.Methods = (function() {
-  var isButton;
-
-  if (Prototype.Browser.IE) {
-    var buttonMap = { 0: 1, 1: 4, 2: 2 };
-    isButton = function(event, code) {
-      return event.button == buttonMap[code];
-    };
-
-  } else if (Prototype.Browser.WebKit) {
-    isButton = function(event, code) {
-      switch (code) {
-        case 0: return event.which == 1 && !event.metaKey;
-        case 1: return event.which == 1 && event.metaKey;
-        default: return false;
-      }
-    };
-
-  } else {
-    isButton = function(event, code) {
-      return event.which ? (event.which === code + 1) : (event.button === code);
-    };
-  }
-
-  return {
-    isLeftClick:   function(event) { return isButton(event, 0) },
-    isMiddleClick: function(event) { return isButton(event, 1) },
-    isRightClick:  function(event) { return isButton(event, 2) },
-
-    element: function(event) {
-      var node = Event.extend(event).target;
-      return Element.extend(node.nodeType == Node.TEXT_NODE ? node.parentNode : node);
-    },
-
-    findElement: function(event, expression) {
-      var element = Event.element(event);
-      if (!expression) return element;
-      var elements = [element].concat(element.ancestors());
-      return Selector.findElement(elements, expression, 0);
-    },
-
-    pointer: function(event) {
-      var docElement = document.documentElement, body = document.body;
-      return {
-        x: event.pageX || (event.clientX +
-          (docElement.scrollLeft || body.scrollLeft) -
-          (docElement.clientLeft || 0)),
-        y: event.pageY || (event.clientY +
-          (docElement.scrollTop || body.scrollTop) -
-          (docElement.clientTop || 0))
-      };
-    },
-
-    pointerX: function(event) { return Event.pointer(event).x },
-    pointerY: function(event) { return Event.pointer(event).y },
-
-    stop: function(event) {
-      Event.extend(event);
-      event.preventDefault();
-      event.stopPropagation();
-      event.stopped = true;
-    }
-  };
-})();
-
-Event.extend = (function() {
-  var methods = Object.keys(Event.Methods).inject({ }, function(m, name) {
-    m[name] = Event.Methods[name].methodize();
-    return m;
-  });
-
-  if (Prototype.Browser.IE) {
-    Object.extend(methods, {
-      stopPropagation: function() { this.cancelBubble = true },
-      preventDefault:  function() { this.returnValue = false },
-      inspect: function() { return "[object Event]" }
-    });
-
-    return function(event) {
-      if (!event) return false;
-      if (event._extendedByPrototype) return event;
-
-      event._extendedByPrototype = Prototype.emptyFunction;
-      var pointer = Event.pointer(event);
-      Object.extend(event, {
-        target: event.srcElement,
-        relatedTarget: Event.relatedTarget(event),
-        pageX:  pointer.x,
-        pageY:  pointer.y
-      });
-      return Object.extend(event, methods);
-    };
-
-  } else {
-    Event.prototype = Event.prototype || document.createEvent("HTMLEvents").__proto__;
-    Object.extend(Event.prototype, methods);
-    return Prototype.K;
-  }
-})();
-
-Object.extend(Event, (function() {
-  var cache = Event.cache;
-
-  function getEventID(element) {
-    if (element._prototypeEventID) return element._prototypeEventID[0];
-    arguments.callee.id = arguments.callee.id || 1;
-    return element._prototypeEventID = [++arguments.callee.id];
-  }
-
-  function getDOMEventName(eventName) {
-    if (eventName && eventName.include(':')) return "dataavailable";
-    return eventName;
-  }
-
-  function getCacheForID(id) {
-    return cache[id] = cache[id] || { };
-  }
-
-  function getWrappersForEventName(id, eventName) {
-    var c = getCacheForID(id);
-    return c[eventName] = c[eventName] || [];
-  }
-
-  function createWrapper(element, eventName, handler) {
-    var id = getEventID(element);
-    var c = getWrappersForEventName(id, eventName);
-    if (c.pluck("handler").include(handler)) return false;
-
-    var wrapper = function(event) {
-      if (!Event || !Event.extend ||
-        (event.eventName && event.eventName != eventName))
-          return false;
-
-      Event.extend(event);
-      handler.call(element, event);
-    };
-
-    wrapper.handler = handler;
-    c.push(wrapper);
-    return wrapper;
-  }
-
-  function findWrapper(id, eventName, handler) {
-    var c = getWrappersForEventName(id, eventName);
-    return c.find(function(wrapper) { return wrapper.handler == handler });
-  }
-
-  function destroyWrapper(id, eventName, handler) {
-    var c = getCacheForID(id);
-    if (!c[eventName]) return false;
-    c[eventName] = c[eventName].without(findWrapper(id, eventName, handler));
-  }
-
-  function destroyCache() {
-    for (var id in cache)
-      for (var eventName in cache[id])
-        cache[id][eventName] = null;
-  }
-
-  if (window.attachEvent) {
-    window.attachEvent("onunload", destroyCache);
-  }
-
-  return {
-    observe: function(element, eventName, handler) {
-      element = $(element);
-      var name = getDOMEventName(eventName);
-
-      var wrapper = createWrapper(element, eventName, handler);
-      if (!wrapper) return element;
-
-      if (element.addEventListener) {
-        element.addEventListener(name, wrapper, false);
-      } else {
-        element.attachEvent("on" + name, wrapper);
-      }
-
-      return element;
-    },
-
-    stopObserving: function(element, eventName, handler) {
-      element = $(element);
-      var id = getEventID(element), name = getDOMEventName(eventName);
-
-      if (!handler && eventName) {
-        getWrappersForEventName(id, eventName).each(function(wrapper) {
-          element.stopObserving(eventName, wrapper.handler);
-        });
-        return element;
-
-      } else if (!eventName) {
-        Object.keys(getCacheForID(id)).each(function(eventName) {
-          element.stopObserving(eventName);
-        });
-        return element;
-      }
-
-      var wrapper = findWrapper(id, eventName, handler);
-      if (!wrapper) return element;
-
-      if (element.removeEventListener) {
-        element.removeEventListener(name, wrapper, false);
-      } else {
-        element.detachEvent("on" + name, wrapper);
-      }
-
-      destroyWrapper(id, eventName, handler);
-
-      return element;
-    },
-
-    fire: function(element, eventName, memo) {
-      element = $(element);
-      if (element == document && document.createEvent && !element.dispatchEvent)
-        element = document.documentElement;
-
-      var event;
-      if (document.createEvent) {
-        event = document.createEvent("HTMLEvents");
-        event.initEvent("dataavailable", true, true);
-      } else {
-        event = document.createEventObject();
-        event.eventType = "ondataavailable";
-      }
-
-      event.eventName = eventName;
-      event.memo = memo || { };
-
-      if (document.createEvent) {
-        element.dispatchEvent(event);
-      } else {
-        element.fireEvent(event.eventType, event);
-      }
-
-      return Event.extend(event);
-    }
-  };
-})());
-
-Object.extend(Event, Event.Methods);
-
-Element.addMethods({
-  fire:          Event.fire,
-  observe:       Event.observe,
-  stopObserving: Event.stopObserving
-});
-
-Object.extend(document, {
-  fire:          Element.Methods.fire.methodize(),
-  observe:       Element.Methods.observe.methodize(),
-  stopObserving: Element.Methods.stopObserving.methodize(),
-  loaded:        false
-});
-
-(function() {
-  /* Support for the DOMContentLoaded event is based on work by Dan Webb,
-     Matthias Miller, Dean Edwards and John Resig. */
-
-  var timer;
-
-  function fireContentLoadedEvent() {
-    if (document.loaded) return;
-    if (timer) window.clearInterval(timer);
-    document.fire("dom:loaded");
-    document.loaded = true;
-  }
-
-  if (document.addEventListener) {
-    if (Prototype.Browser.WebKit) {
-      timer = window.setInterval(function() {
-        if (/loaded|complete/.test(document.readyState))
-          fireContentLoadedEvent();
-      }, 0);
-
-      Event.observe(window, "load", fireContentLoadedEvent);
-
-    } else {
-      document.addEventListener("DOMContentLoaded",
-        fireContentLoadedEvent, false);
-    }
-
-  } else {
-    document.write("<script id=__onDOMContentLoaded defer src=//:><\/script>");
-    $("__onDOMContentLoaded").onreadystatechange = function() {
-      if (this.readyState == "complete") {
-        this.onreadystatechange = null;
-        fireContentLoadedEvent();
-      }
-    };
-  }
-})();
-/*------------------------------- DEPRECATED -------------------------------*/
-
-Hash.toQueryString = Object.toQueryString;
-
-var Toggle = { display: Element.toggle };
-
-Element.Methods.childOf = Element.Methods.descendantOf;
-
-var Insertion = {
-  Before: function(element, content) {
-    return Element.insert(element, {before:content});
-  },
-
-  Top: function(element, content) {
-    return Element.insert(element, {top:content});
-  },
-
-  Bottom: function(element, content) {
-    return Element.insert(element, {bottom:content});
-  },
-
-  After: function(element, content) {
-    return Element.insert(element, {after:content});
-  }
-};
-
-var $continue = new Error('"throw $continue" is deprecated, use "return" instead');
-
-// This should be moved to script.aculo.us; notice the deprecated methods
-// further below, that map to the newer Element methods.
-var Position = {
-  // set to true if needed, warning: firefox performance problems
-  // NOT neeeded for page scrolling, only if draggable contained in
-  // scrollable elements
-  includeScrollOffsets: false,
-
-  // must be called before calling withinIncludingScrolloffset, every time the
-  // page is scrolled
-  prepare: function() {
-    this.deltaX =  window.pageXOffset
-                || document.documentElement.scrollLeft
-                || document.body.scrollLeft
-                || 0;
-    this.deltaY =  window.pageYOffset
-                || document.documentElement.scrollTop
-                || document.body.scrollTop
-                || 0;
-  },
-
-  // caches x/y coordinate pair to use with overlap
-  within: function(element, x, y) {
-    if (this.includeScrollOffsets)
-      return this.withinIncludingScrolloffsets(element, x, y);
-    this.xcomp = x;
-    this.ycomp = y;
-    this.offset = Element.cumulativeOffset(element);
-
-    return (y >= this.offset[1] &&
-            y <  this.offset[1] + element.offsetHeight &&
-            x >= this.offset[0] &&
-            x <  this.offset[0] + element.offsetWidth);
-  },
-
-  withinIncludingScrolloffsets: function(element, x, y) {
-    var offsetcache = Element.cumulativeScrollOffset(element);
-
-    this.xcomp = x + offsetcache[0] - this.deltaX;
-    this.ycomp = y + offsetcache[1] - this.deltaY;
-    this.offset = Element.cumulativeOffset(element);
-
-    return (this.ycomp >= this.offset[1] &&
-            this.ycomp <  this.offset[1] + element.offsetHeight &&
-            this.xcomp >= this.offset[0] &&
-            this.xcomp <  this.offset[0] + element.offsetWidth);
-  },
-
-  // within must be called directly before
-  overlap: function(mode, element) {
-    if (!mode) return 0;
-    if (mode == 'vertical')
-      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
-        element.offsetHeight;
-    if (mode == 'horizontal')
-      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
-        element.offsetWidth;
-  },
-
-  // Deprecation layer -- use newer Element methods now (1.5.2).
-
-  cumulativeOffset: Element.Methods.cumulativeOffset,
-
-  positionedOffset: Element.Methods.positionedOffset,
-
-  absolutize: function(element) {
-    Position.prepare();
-    return Element.absolutize(element);
-  },
-
-  relativize: function(element) {
-    Position.prepare();
-    return Element.relativize(element);
-  },
-
-  realOffset: Element.Methods.cumulativeScrollOffset,
-
-  offsetParent: Element.Methods.getOffsetParent,
-
-  page: Element.Methods.viewportOffset,
-
-  clone: function(source, target, options) {
-    options = options || { };
-    return Element.clonePosition(target, source, options);
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-if (!document.getElementsByClassName) document.getElementsByClassName = function(instanceMethods){
-  function iter(name) {
-    return name.blank() ? null : "[contains(concat(' ', @class, ' '), ' " + name + " ')]";
-  }
-
-  instanceMethods.getElementsByClassName = Prototype.BrowserFeatures.XPath ?
-  function(element, className) {
-    className = className.toString().strip();
-    var cond = /\s/.test(className) ? $w(className).map(iter).join('') : iter(className);
-    return cond ? document._getElementsByXPath('.//*' + cond, element) : [];
-  } : function(element, className) {
-    className = className.toString().strip();
-    var elements = [], classNames = (/\s/.test(className) ? $w(className) : null);
-    if (!classNames && !className) return elements;
-
-    var nodes = $(element).getElementsByTagName('*');
-    className = ' ' + className + ' ';
-
-    for (var i = 0, child, cn; child = nodes[i]; i++) {
-      if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) ||
-          (classNames && classNames.all(function(name) {
-            return !name.toString().blank() && cn.include(' ' + name + ' ');
-          }))))
-        elements.push(Element.extend(child));
-    }
-    return elements;
-  };
-
-  return function(className, parentElement) {
-    return $(parentElement || document.body).getElementsByClassName(className);
-  };
-}(Element.Methods);
-
-/*--------------------------------------------------------------------------*/
-
-Element.ClassNames = Class.create();
-Element.ClassNames.prototype = {
-  initialize: function(element) {
-    this.element = $(element);
-  },
-
-  _each: function(iterator) {
-    this.element.className.split(/\s+/).select(function(name) {
-      return name.length > 0;
-    })._each(iterator);
-  },
-
-  set: function(className) {
-    this.element.className = className;
-  },
-
-  add: function(classNameToAdd) {
-    if (this.include(classNameToAdd)) return;
-    this.set($A(this).concat(classNameToAdd).join(' '));
-  },
-
-  remove: function(classNameToRemove) {
-    if (!this.include(classNameToRemove)) return;
-    this.set($A(this).without(classNameToRemove).join(' '));
-  },
-
-  toString: function() {
-    return $A(this).join(' ');
-  }
-};
-
-Object.extend(Element.ClassNames.prototype, Enumerable);
-
-/*--------------------------------------------------------------------------*/
-
-Element.addMethods();
\ No newline at end of file
diff --git a/ajaxui/scriptaculous/builder.js b/ajaxui/scriptaculous/builder.js
deleted file mode 100644
index 83019994..00000000
--- a/ajaxui/scriptaculous/builder.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// script.aculo.us builder.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-var Builder = {
-  NODEMAP: {
-    AREA: 'map',
-    CAPTION: 'table',
-    COL: 'table',
-    COLGROUP: 'table',
-    LEGEND: 'fieldset',
-    OPTGROUP: 'select',
-    OPTION: 'select',
-    PARAM: 'object',
-    TBODY: 'table',
-    TD: 'table',
-    TFOOT: 'table',
-    TH: 'table',
-    THEAD: 'table',
-    TR: 'table'
-  },
-  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
-  //       due to a Firefox bug
-  node: function(elementName) {
-    elementName = elementName.toUpperCase();
-    
-    // try innerHTML approach
-    var parentTag = this.NODEMAP[elementName] || 'div';
-    var parentElement = document.createElement(parentTag);
-    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
-      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
-    } catch(e) {}
-    var element = parentElement.firstChild || null;
-      
-    // see if browser added wrapping tags
-    if(element && (element.tagName.toUpperCase() != elementName))
-      element = element.getElementsByTagName(elementName)[0];
-    
-    // fallback to createElement approach
-    if(!element) element = document.createElement(elementName);
-    
-    // abort if nothing could be created
-    if(!element) return;
-
-    // attributes (or text)
-    if(arguments[1])
-      if(this._isStringOrNumber(arguments[1]) ||
-        (arguments[1] instanceof Array) ||
-        arguments[1].tagName) {
-          this._children(element, arguments[1]);
-        } else {
-          var attrs = this._attributes(arguments[1]);
-          if(attrs.length) {
-            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
-              parentElement.innerHTML = "<" +elementName + " " +
-                attrs + "></" + elementName + ">";
-            } catch(e) {}
-            element = parentElement.firstChild || null;
-            // workaround firefox 1.0.X bug
-            if(!element) {
-              element = document.createElement(elementName);
-              for(attr in arguments[1]) 
-                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
-            }
-            if(element.tagName.toUpperCase() != elementName)
-              element = parentElement.getElementsByTagName(elementName)[0];
-          }
-        } 
-
-    // text, or array of children
-    if(arguments[2])
-      this._children(element, arguments[2]);
-
-     return element;
-  },
-  _text: function(text) {
-     return document.createTextNode(text);
-  },
-
-  ATTR_MAP: {
-    'className': 'class',
-    'htmlFor': 'for'
-  },
-
-  _attributes: function(attributes) {
-    var attrs = [];
-    for(attribute in attributes)
-      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
-          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'&quot;') + '"');
-    return attrs.join(" ");
-  },
-  _children: function(element, children) {
-    if(children.tagName) {
-      element.appendChild(children);
-      return;
-    }
-    if(typeof children=='object') { // array can hold nodes and text
-      children.flatten().each( function(e) {
-        if(typeof e=='object')
-          element.appendChild(e)
-        else
-          if(Builder._isStringOrNumber(e))
-            element.appendChild(Builder._text(e));
-      });
-    } else
-      if(Builder._isStringOrNumber(children))
-        element.appendChild(Builder._text(children));
-  },
-  _isStringOrNumber: function(param) {
-    return(typeof param=='string' || typeof param=='number');
-  },
-  build: function(html) {
-    var element = this.node('div');
-    $(element).update(html.strip());
-    return element.down();
-  },
-  dump: function(scope) { 
-    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope 
-  
-    var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
-      "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
-      "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
-      "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
-      "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
-      "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
-  
-    tags.each( function(tag){ 
-      scope[tag] = function() { 
-        return Builder.node.apply(Builder, [tag].concat($A(arguments)));  
-      } 
-    });
-  }
-}
diff --git a/ajaxui/scriptaculous/controls.js b/ajaxui/scriptaculous/controls.js
deleted file mode 100644
index 5012cb81..00000000
--- a/ajaxui/scriptaculous/controls.js
+++ /dev/null
@@ -1,965 +0,0 @@
-// script.aculo.us controls.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
-//           (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
-// Contributors:
-//  Richard Livsey
-//  Rahul Bhargava
-//  Rob Wills
-// 
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-// Autocompleter.Base handles all the autocompletion functionality 
-// that's independent of the data source for autocompletion. This
-// includes drawing the autocompletion menu, observing keyboard
-// and mouse events, and similar.
-//
-// Specific autocompleters need to provide, at the very least, 
-// a getUpdatedChoices function that will be invoked every time
-// the text inside the monitored textbox changes. This method 
-// should get the text for which to provide autocompletion by
-// invoking this.getToken(), NOT by directly accessing
-// this.element.value. This is to allow incremental tokenized
-// autocompletion. Specific auto-completion logic (AJAX, etc)
-// belongs in getUpdatedChoices.
-//
-// Tokenized incremental autocompletion is enabled automatically
-// when an autocompleter is instantiated with the 'tokens' option
-// in the options parameter, e.g.:
-// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' });
-// will incrementally autocomplete with a comma as the token.
-// Additionally, ',' in the above example can be replaced with
-// a token array, e.g. { tokens: [',', '\n'] } which
-// enables autocompletion on multiple tokens. This is most 
-// useful when one of the tokens is \n (a newline), as it 
-// allows smart autocompletion after linebreaks.
-
-if(typeof Effect == 'undefined')
-  throw("controls.js requires including script.aculo.us' effects.js library");
-
-var Autocompleter = { }
-Autocompleter.Base = Class.create({
-  baseInitialize: function(element, update, options) {
-    element          = $(element)
-    this.element     = element; 
-    this.update      = $(update);  
-    this.hasFocus    = false; 
-    this.changed     = false; 
-    this.active      = false; 
-    this.index       = 0;     
-    this.entryCount  = 0;
-    this.oldElementValue = this.element.value;
-
-    if(this.setOptions)
-      this.setOptions(options);
-    else
-      this.options = options || { };
-
-    this.options.paramName    = this.options.paramName || this.element.name;
-    this.options.tokens       = this.options.tokens || [];
-    this.options.frequency    = this.options.frequency || 0.4;
-    this.options.minChars     = this.options.minChars || 1;
-    this.options.onShow       = this.options.onShow || 
-      function(element, update){ 
-        if(!update.style.position || update.style.position=='absolute') {
-          update.style.position = 'absolute';
-          Position.clone(element, update, {
-            setHeight: false, 
-            offsetTop: element.offsetHeight
-          });
-        }
-        Effect.Appear(update,{duration:0.15});
-      };
-    this.options.onHide = this.options.onHide || 
-      function(element, update){ new Effect.Fade(update,{duration:0.15}) };
-
-    if(typeof(this.options.tokens) == 'string') 
-      this.options.tokens = new Array(this.options.tokens);
-    // Force carriage returns as token delimiters anyway
-    if (!this.options.tokens.include('\n'))
-      this.options.tokens.push('\n');
-
-    this.observer = null;
-    
-    this.element.setAttribute('autocomplete','off');
-
-    Element.hide(this.update);
-
-    Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
-    Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
-  },
-
-  show: function() {
-    if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
-    if(!this.iefix && 
-      (Prototype.Browser.IE) &&
-      (Element.getStyle(this.update, 'position')=='absolute')) {
-      new Insertion.After(this.update, 
-       '<iframe id="' + this.update.id + '_iefix" '+
-       'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
-       'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
-      this.iefix = $(this.update.id+'_iefix');
-    }
-    if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
-  },
-  
-  fixIEOverlapping: function() {
-    Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
-    this.iefix.style.zIndex = 1;
-    this.update.style.zIndex = 2;
-    Element.show(this.iefix);
-  },
-
-  hide: function() {
-    this.stopIndicator();
-    if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update);
-    if(this.iefix) Element.hide(this.iefix);
-  },
-
-  startIndicator: function() {
-    if(this.options.indicator) Element.show(this.options.indicator);
-  },
-
-  stopIndicator: function() {
-    if(this.options.indicator) Element.hide(this.options.indicator);
-  },
-
-  onKeyPress: function(event) {
-    if(this.active)
-      switch(event.keyCode) {
-       case Event.KEY_TAB:
-       case Event.KEY_RETURN:
-         this.selectEntry();
-         Event.stop(event);
-       case Event.KEY_ESC:
-         this.hide();
-         this.active = false;
-         Event.stop(event);
-         return;
-       case Event.KEY_LEFT:
-       case Event.KEY_RIGHT:
-         return;
-       case Event.KEY_UP:
-         this.markPrevious();
-         this.render();
-         Event.stop(event);
-         return;
-       case Event.KEY_DOWN:
-         this.markNext();
-         this.render();
-         Event.stop(event);
-         return;
-      }
-     else 
-       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || 
-         (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
-
-    this.changed = true;
-    this.hasFocus = true;
-
-    if(this.observer) clearTimeout(this.observer);
-      this.observer = 
-        setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
-  },
-
-  activate: function() {
-    this.changed = false;
-    this.hasFocus = true;
-    this.getUpdatedChoices();
-  },
-
-  onHover: function(event) {
-    var element = Event.findElement(event, 'LI');
-    if(this.index != element.autocompleteIndex) 
-    {
-        this.index = element.autocompleteIndex;
-        this.render();
-    }
-    Event.stop(event);
-  },
-  
-  onClick: function(event) {
-    var element = Event.findElement(event, 'LI');
-    this.index = element.autocompleteIndex;
-    this.selectEntry();
-    this.hide();
-  },
-  
-  onBlur: function(event) {
-    // needed to make click events working
-    setTimeout(this.hide.bind(this), 250);
-    this.hasFocus = false;
-    this.active = false;     
-  }, 
-  
-  render: function() {
-    if(this.entryCount > 0) {
-      for (var i = 0; i < this.entryCount; i++)
-        this.index==i ? 
-          Element.addClassName(this.getEntry(i),"selected") : 
-          Element.removeClassName(this.getEntry(i),"selected");
-      if(this.hasFocus) { 
-        this.show();
-        this.active = true;
-      }
-    } else {
-      this.active = false;
-      this.hide();
-    }
-  },
-  
-  markPrevious: function() {
-    if(this.index > 0) this.index--
-      else this.index = this.entryCount-1;
-    this.getEntry(this.index).scrollIntoView(true);
-  },
-  
-  markNext: function() {
-    if(this.index < this.entryCount-1) this.index++
-      else this.index = 0;
-    this.getEntry(this.index).scrollIntoView(false);
-  },
-  
-  getEntry: function(index) {
-    return this.update.firstChild.childNodes[index];
-  },
-  
-  getCurrentEntry: function() {
-    return this.getEntry(this.index);
-  },
-  
-  selectEntry: function() {
-    this.active = false;
-    this.updateElement(this.getCurrentEntry());
-  },
-
-  updateElement: function(selectedElement) {
-    if (this.options.updateElement) {
-      this.options.updateElement(selectedElement);
-      return;
-    }
-    var value = '';
-    if (this.options.select) {
-      var nodes = $(selectedElement).select('.' + this.options.select) || [];
-      if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
-    } else
-      value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
-    
-    var bounds = this.getTokenBounds();
-    if (bounds[0] != -1) {
-      var newValue = this.element.value.substr(0, bounds[0]);
-      var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/);
-      if (whitespace)
-        newValue += whitespace[0];
-      this.element.value = newValue + value + this.element.value.substr(bounds[1]);
-    } else {
-      this.element.value = value;
-    }
-    this.oldElementValue = this.element.value;
-    this.element.focus();
-    
-    if (this.options.afterUpdateElement)
-      this.options.afterUpdateElement(this.element, selectedElement);
-  },
-
-  updateChoices: function(choices) {
-    if(!this.changed && this.hasFocus) {
-      this.update.innerHTML = choices;
-      Element.cleanWhitespace(this.update);
-      Element.cleanWhitespace(this.update.down());
-
-      if(this.update.firstChild && this.update.down().childNodes) {
-        this.entryCount = 
-          this.update.down().childNodes.length;
-        for (var i = 0; i < this.entryCount; i++) {
-          var entry = this.getEntry(i);
-          entry.autocompleteIndex = i;
-          this.addObservers(entry);
-        }
-      } else { 
-        this.entryCount = 0;
-      }
-
-      this.stopIndicator();
-      this.index = 0;
-      
-      if(this.entryCount==1 && this.options.autoSelect) {
-        this.selectEntry();
-        this.hide();
-      } else {
-        this.render();
-      }
-    }
-  },
-
-  addObservers: function(element) {
-    Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this));
-    Event.observe(element, "click", this.onClick.bindAsEventListener(this));
-  },
-
-  onObserverEvent: function() {
-    this.changed = false;   
-    this.tokenBounds = null;
-    if(this.getToken().length>=this.options.minChars) {
-      this.getUpdatedChoices();
-    } else {
-      this.active = false;
-      this.hide();
-    }
-    this.oldElementValue = this.element.value;
-  },
-
-  getToken: function() {
-    var bounds = this.getTokenBounds();
-    return this.element.value.substring(bounds[0], bounds[1]).strip();
-  },
-
-  getTokenBounds: function() {
-    if (null != this.tokenBounds) return this.tokenBounds;
-    var value = this.element.value;
-    if (value.strip().empty()) return [-1, 0];
-    var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue);
-    var offset = (diff == this.oldElementValue.length ? 1 : 0);
-    var prevTokenPos = -1, nextTokenPos = value.length;
-    var tp;
-    for (var index = 0, l = this.options.tokens.length; index < l; ++index) {
-      tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1);
-      if (tp > prevTokenPos) prevTokenPos = tp;
-      tp = value.indexOf(this.options.tokens[index], diff + offset);
-      if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp;
-    }
-    return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]);
-  }
-});
-
-Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) {
-  var boundary = Math.min(newS.length, oldS.length);
-  for (var index = 0; index < boundary; ++index)
-    if (newS[index] != oldS[index])
-      return index;
-  return boundary;
-};
-
-Ajax.Autocompleter = Class.create(Autocompleter.Base, {
-  initialize: function(element, update, url, options) {
-    this.baseInitialize(element, update, options);
-    this.options.asynchronous  = true;
-    this.options.onComplete    = this.onComplete.bind(this);
-    this.options.defaultParams = this.options.parameters || null;
-    this.url                   = url;
-  },
-
-  getUpdatedChoices: function() {
-    this.startIndicator();
-    
-    var entry = encodeURIComponent(this.options.paramName) + '=' + 
-      encodeURIComponent(this.getToken());
-
-    this.options.parameters = this.options.callback ?
-      this.options.callback(this.element, entry) : entry;
-
-    if(this.options.defaultParams) 
-      this.options.parameters += '&' + this.options.defaultParams;
-    
-    new Ajax.Request(this.url, this.options);
-  },
-
-  onComplete: function(request) {
-    this.updateChoices(request.responseText);
-  }
-});
-
-// The local array autocompleter. Used when you'd prefer to
-// inject an array of autocompletion options into the page, rather
-// than sending out Ajax queries, which can be quite slow sometimes.
-//
-// The constructor takes four parameters. The first two are, as usual,
-// the id of the monitored textbox, and id of the autocompletion menu.
-// The third is the array you want to autocomplete from, and the fourth
-// is the options block.
-//
-// Extra local autocompletion options:
-// - choices - How many autocompletion choices to offer
-//
-// - partialSearch - If false, the autocompleter will match entered
-//                    text only at the beginning of strings in the 
-//                    autocomplete array. Defaults to true, which will
-//                    match text at the beginning of any *word* in the
-//                    strings in the autocomplete array. If you want to
-//                    search anywhere in the string, additionally set
-//                    the option fullSearch to true (default: off).
-//
-// - fullSsearch - Search anywhere in autocomplete array strings.
-//
-// - partialChars - How many characters to enter before triggering
-//                   a partial match (unlike minChars, which defines
-//                   how many characters are required to do any match
-//                   at all). Defaults to 2.
-//
-// - ignoreCase - Whether to ignore case when autocompleting.
-//                 Defaults to true.
-//
-// It's possible to pass in a custom function as the 'selector' 
-// option, if you prefer to write your own autocompletion logic.
-// In that case, the other options above will not apply unless
-// you support them.
-
-Autocompleter.Local = Class.create(Autocompleter.Base, {
-  initialize: function(element, update, array, options) {
-    this.baseInitialize(element, update, options);
-    this.options.array = array;
-  },
-
-  getUpdatedChoices: function() {
-    this.updateChoices(this.options.selector(this));
-  },
-
-  setOptions: function(options) {
-    this.options = Object.extend({
-      choices: 10,
-      partialSearch: true,
-      partialChars: 2,
-      ignoreCase: true,
-      fullSearch: false,
-      selector: function(instance) {
-        var ret       = []; // Beginning matches
-        var partial   = []; // Inside matches
-        var entry     = instance.getToken();
-        var count     = 0;
-
-        for (var i = 0; i < instance.options.array.length &&  
-          ret.length < instance.options.choices ; i++) { 
-
-          var elem = instance.options.array[i];
-          var foundPos = instance.options.ignoreCase ? 
-            elem.toLowerCase().indexOf(entry.toLowerCase()) : 
-            elem.indexOf(entry);
-
-          while (foundPos != -1) {
-            if (foundPos == 0 && elem.length != entry.length) { 
-              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + 
-                elem.substr(entry.length) + "</li>");
-              break;
-            } else if (entry.length >= instance.options.partialChars && 
-              instance.options.partialSearch && foundPos != -1) {
-              if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
-                partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
-                  elem.substr(foundPos, entry.length) + "</strong>" + elem.substr(
-                  foundPos + entry.length) + "</li>");
-                break;
-              }
-            }
-
-            foundPos = instance.options.ignoreCase ? 
-              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : 
-              elem.indexOf(entry, foundPos + 1);
-
-          }
-        }
-        if (partial.length)
-          ret = ret.concat(partial.slice(0, instance.options.choices - ret.length))
-        return "<ul>" + ret.join('') + "</ul>";
-      }
-    }, options || { });
-  }
-});
-
-// AJAX in-place editor and collection editor
-// Full rewrite by Christophe Porteneuve <tdd@tddsworld.com> (April 2007).
-
-// Use this if you notice weird scrolling problems on some browsers,
-// the DOM might be a bit confused when this gets called so do this
-// waits 1 ms (with setTimeout) until it does the activation
-Field.scrollFreeActivate = function(field) {
-  setTimeout(function() {
-    Field.activate(field);
-  }, 1);
-}
-
-Ajax.InPlaceEditor = Class.create({
-  initialize: function(element, url, options) {
-    this.url = url;
-    this.element = element = $(element);
-    this.prepareOptions();
-    this._controls = { };
-    arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!!
-    Object.extend(this.options, options || { });
-    if (!this.options.formId && this.element.id) {
-      this.options.formId = this.element.id + '-inplaceeditor';
-      if ($(this.options.formId))
-        this.options.formId = '';
-    }
-    if (this.options.externalControl)
-      this.options.externalControl = $(this.options.externalControl);
-    if (!this.options.externalControl)
-      this.options.externalControlOnly = false;
-    this._originalBackground = this.element.getStyle('background-color') || 'transparent';
-    this.element.title = this.options.clickToEditText;
-    this._boundCancelHandler = this.handleFormCancellation.bind(this);
-    this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this);
-    this._boundFailureHandler = this.handleAJAXFailure.bind(this);
-    this._boundSubmitHandler = this.handleFormSubmission.bind(this);
-    this._boundWrapperHandler = this.wrapUp.bind(this);
-    this.registerListeners();
-  },
-  checkForEscapeOrReturn: function(e) {
-    if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return;
-    if (Event.KEY_ESC == e.keyCode)
-      this.handleFormCancellation(e);
-    else if (Event.KEY_RETURN == e.keyCode)
-      this.handleFormSubmission(e);
-  },
-  createControl: function(mode, handler, extraClasses) {
-    var control = this.options[mode + 'Control'];
-    var text = this.options[mode + 'Text'];
-    if ('button' == control) {
-      var btn = document.createElement('input');
-      btn.type = 'submit';
-      btn.value = text;
-      btn.className = 'editor_' + mode + '_button';
-      if ('cancel' == mode)
-        btn.onclick = this._boundCancelHandler;
-      this._form.appendChild(btn);
-      this._controls[mode] = btn;
-    } else if ('link' == control) {
-      var link = document.createElement('a');
-      link.href = '#';
-      link.appendChild(document.createTextNode(text));
-      link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler;
-      link.className = 'editor_' + mode + '_link';
-      if (extraClasses)
-        link.className += ' ' + extraClasses;
-      this._form.appendChild(link);
-      this._controls[mode] = link;
-    }
-  },
-  createEditField: function() {
-    var text = (this.options.loadTextURL ? this.options.loadingText : this.getText());
-    var fld;
-    if (1 >= this.options.rows && !/\r|\n/.test(this.getText())) {
-      fld = document.createElement('input');
-      fld.type = 'text';
-      var size = this.options.size || this.options.cols || 0;
-      if (0 < size) fld.size = size;
-    } else {
-      fld = document.createElement('textarea');
-      fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows);
-      fld.cols = this.options.cols || 40;
-    }
-    fld.name = this.options.paramName;
-    fld.value = text; // No HTML breaks conversion anymore
-    fld.className = 'editor_field';
-    if (this.options.submitOnBlur)
-      fld.onblur = this._boundSubmitHandler;
-    this._controls.editor = fld;
-    if (this.options.loadTextURL)
-      this.loadExternalText();
-    this._form.appendChild(this._controls.editor);
-  },
-  createForm: function() {
-    var ipe = this;
-    function addText(mode, condition) {
-      var text = ipe.options['text' + mode + 'Controls'];
-      if (!text || condition === false) return;
-      ipe._form.appendChild(document.createTextNode(text));
-    };
-    this._form = $(document.createElement('form'));
-    this._form.id = this.options.formId;
-    this._form.addClassName(this.options.formClassName);
-    this._form.onsubmit = this._boundSubmitHandler;
-    this.createEditField();
-    if ('textarea' == this._controls.editor.tagName.toLowerCase())
-      this._form.appendChild(document.createElement('br'));
-    if (this.options.onFormCustomization)
-      this.options.onFormCustomization(this, this._form);
-    addText('Before', this.options.okControl || this.options.cancelControl);
-    this.createControl('ok', this._boundSubmitHandler);
-    addText('Between', this.options.okControl && this.options.cancelControl);
-    this.createControl('cancel', this._boundCancelHandler, 'editor_cancel');
-    addText('After', this.options.okControl || this.options.cancelControl);
-  },
-  destroy: function() {
-    if (this._oldInnerHTML)
-      this.element.innerHTML = this._oldInnerHTML;
-    this.leaveEditMode();
-    this.unregisterListeners();
-  },
-  enterEditMode: function(e) {
-    if (this._saving || this._editing) return;
-    this._editing = true;
-    this.triggerCallback('onEnterEditMode');
-    if (this.options.externalControl)
-      this.options.externalControl.hide();
-    this.element.hide();
-    this.createForm();
-    this.element.parentNode.insertBefore(this._form, this.element);
-    if (!this.options.loadTextURL)
-      this.postProcessEditField();
-    if (e) Event.stop(e);
-  },
-  enterHover: function(e) {
-    if (this.options.hoverClassName)
-      this.element.addClassName(this.options.hoverClassName);
-    if (this._saving) return;
-    this.triggerCallback('onEnterHover');
-  },
-  getText: function() {
-    return this.element.innerHTML;
-  },
-  handleAJAXFailure: function(transport) {
-    this.triggerCallback('onFailure', transport);
-    if (this._oldInnerHTML) {
-      this.element.innerHTML = this._oldInnerHTML;
-      this._oldInnerHTML = null;
-    }
-  },
-  handleFormCancellation: function(e) {
-    this.wrapUp();
-    if (e) Event.stop(e);
-  },
-  handleFormSubmission: function(e) {
-    var form = this._form;
-    var value = $F(this._controls.editor);
-    this.prepareSubmission();
-    var params = this.options.callback(form, value) || '';
-    if (Object.isString(params))
-      params = params.toQueryParams();
-    params.editorId = this.element.id;
-    if (this.options.htmlResponse) {
-      var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
-      Object.extend(options, {
-        parameters: params,
-        onComplete: this._boundWrapperHandler,
-        onFailure: this._boundFailureHandler
-      });
-      new Ajax.Updater({ success: this.element }, this.url, options);
-    } else {
-      var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-      Object.extend(options, {
-        parameters: params,
-        onComplete: this._boundWrapperHandler,
-        onFailure: this._boundFailureHandler
-      });
-      new Ajax.Request(this.url, options);
-    }
-    if (e) Event.stop(e);
-  },
-  leaveEditMode: function() {
-    this.element.removeClassName(this.options.savingClassName);
-    this.removeForm();
-    this.leaveHover();
-    this.element.style.backgroundColor = this._originalBackground;
-    this.element.show();
-    if (this.options.externalControl)
-      this.options.externalControl.show();
-    this._saving = false;
-    this._editing = false;
-    this._oldInnerHTML = null;
-    this.triggerCallback('onLeaveEditMode');
-  },
-  leaveHover: function(e) {
-    if (this.options.hoverClassName)
-      this.element.removeClassName(this.options.hoverClassName);
-    if (this._saving) return;
-    this.triggerCallback('onLeaveHover');
-  },
-  loadExternalText: function() {
-    this._form.addClassName(this.options.loadingClassName);
-    this._controls.editor.disabled = true;
-    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-    Object.extend(options, {
-      parameters: 'editorId=' + encodeURIComponent(this.element.id),
-      onComplete: Prototype.emptyFunction,
-      onSuccess: function(transport) {
-        this._form.removeClassName(this.options.loadingClassName);
-        var text = transport.responseText;
-        if (this.options.stripLoadedTextTags)
-          text = text.stripTags();
-        this._controls.editor.value = text;
-        this._controls.editor.disabled = false;
-        this.postProcessEditField();
-      }.bind(this),
-      onFailure: this._boundFailureHandler
-    });
-    new Ajax.Request(this.options.loadTextURL, options);
-  },
-  postProcessEditField: function() {
-    var fpc = this.options.fieldPostCreation;
-    if (fpc)
-      $(this._controls.editor)['focus' == fpc ? 'focus' : 'activate']();
-  },
-  prepareOptions: function() {
-    this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions);
-    Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks);
-    [this._extraDefaultOptions].flatten().compact().each(function(defs) {
-      Object.extend(this.options, defs);
-    }.bind(this));
-  },
-  prepareSubmission: function() {
-    this._saving = true;
-    this.removeForm();
-    this.leaveHover();
-    this.showSaving();
-  },
-  registerListeners: function() {
-    this._listeners = { };
-    var listener;
-    $H(Ajax.InPlaceEditor.Listeners).each(function(pair) {
-      listener = this[pair.value].bind(this);
-      this._listeners[pair.key] = listener;
-      if (!this.options.externalControlOnly)
-        this.element.observe(pair.key, listener);
-      if (this.options.externalControl)
-        this.options.externalControl.observe(pair.key, listener);
-    }.bind(this));
-  },
-  removeForm: function() {
-    if (!this._form) return;
-    this._form.remove();
-    this._form = null;
-    this._controls = { };
-  },
-  showSaving: function() {
-    this._oldInnerHTML = this.element.innerHTML;
-    this.element.innerHTML = this.options.savingText;
-    this.element.addClassName(this.options.savingClassName);
-    this.element.style.backgroundColor = this._originalBackground;
-    this.element.show();
-  },
-  triggerCallback: function(cbName, arg) {
-    if ('function' == typeof this.options[cbName]) {
-      this.options[cbName](this, arg);
-    }
-  },
-  unregisterListeners: function() {
-    $H(this._listeners).each(function(pair) {
-      if (!this.options.externalControlOnly)
-        this.element.stopObserving(pair.key, pair.value);
-      if (this.options.externalControl)
-        this.options.externalControl.stopObserving(pair.key, pair.value);
-    }.bind(this));
-  },
-  wrapUp: function(transport) {
-    this.leaveEditMode();
-    // Can't use triggerCallback due to backward compatibility: requires
-    // binding + direct element
-    this._boundComplete(transport, this.element);
-  }
-});
-
-Object.extend(Ajax.InPlaceEditor.prototype, {
-  dispose: Ajax.InPlaceEditor.prototype.destroy
-});
-
-Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
-  initialize: function($super, element, url, options) {
-    this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions;
-    $super(element, url, options);
-  },
-
-  createEditField: function() {
-    var list = document.createElement('select');
-    list.name = this.options.paramName;
-    list.size = 1;
-    this._controls.editor = list;
-    this._collection = this.options.collection || [];
-    if (this.options.loadCollectionURL)
-      this.loadCollection();
-    else
-      this.checkForExternalText();
-    this._form.appendChild(this._controls.editor);
-  },
-
-  loadCollection: function() {
-    this._form.addClassName(this.options.loadingClassName);
-    this.showLoadingText(this.options.loadingCollectionText);
-    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-    Object.extend(options, {
-      parameters: 'editorId=' + encodeURIComponent(this.element.id),
-      onComplete: Prototype.emptyFunction,
-      onSuccess: function(transport) {
-        var js = transport.responseText.strip();
-        if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
-          throw 'Server returned an invalid collection representation.';
-        this._collection = eval(js);
-        this.checkForExternalText();
-      }.bind(this),
-      onFailure: this.onFailure
-    });
-    new Ajax.Request(this.options.loadCollectionURL, options);
-  },
-
-  showLoadingText: function(text) {
-    this._controls.editor.disabled = true;
-    var tempOption = this._controls.editor.firstChild;
-    if (!tempOption) {
-      tempOption = document.createElement('option');
-      tempOption.value = '';
-      this._controls.editor.appendChild(tempOption);
-      tempOption.selected = true;
-    }
-    tempOption.update((text || '').stripScripts().stripTags());
-  },
-
-  checkForExternalText: function() {
-    this._text = this.getText();
-    if (this.options.loadTextURL)
-      this.loadExternalText();
-    else
-      this.buildOptionList();
-  },
-
-  loadExternalText: function() {
-    this.showLoadingText(this.options.loadingText);
-    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-    Object.extend(options, {
-      parameters: 'editorId=' + encodeURIComponent(this.element.id),
-      onComplete: Prototype.emptyFunction,
-      onSuccess: function(transport) {
-        this._text = transport.responseText.strip();
-        this.buildOptionList();
-      }.bind(this),
-      onFailure: this.onFailure
-    });
-    new Ajax.Request(this.options.loadTextURL, options);
-  },
-
-  buildOptionList: function() {
-    this._form.removeClassName(this.options.loadingClassName);
-    this._collection = this._collection.map(function(entry) {
-      return 2 === entry.length ? entry : [entry, entry].flatten();
-    });
-    var marker = ('value' in this.options) ? this.options.value : this._text;
-    var textFound = this._collection.any(function(entry) {
-      return entry[0] == marker;
-    }.bind(this));
-    this._controls.editor.update('');
-    var option;
-    this._collection.each(function(entry, index) {
-      option = document.createElement('option');
-      option.value = entry[0];
-      option.selected = textFound ? entry[0] == marker : 0 == index;
-      option.appendChild(document.createTextNode(entry[1]));
-      this._controls.editor.appendChild(option);
-    }.bind(this));
-    this._controls.editor.disabled = false;
-    Field.scrollFreeActivate(this._controls.editor);
-  }
-});
-
-//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! ****
-//**** This only  exists for a while,  in order to  let ****
-//**** users adapt to  the new API.  Read up on the new ****
-//**** API and convert your code to it ASAP!            ****
-
-Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) {
-  if (!options) return;
-  function fallback(name, expr) {
-    if (name in options || expr === undefined) return;
-    options[name] = expr;
-  };
-  fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' :
-    options.cancelLink == options.cancelButton == false ? false : undefined)));
-  fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' :
-    options.okLink == options.okButton == false ? false : undefined)));
-  fallback('highlightColor', options.highlightcolor);
-  fallback('highlightEndColor', options.highlightendcolor);
-};
-
-Object.extend(Ajax.InPlaceEditor, {
-  DefaultOptions: {
-    ajaxOptions: { },
-    autoRows: 3,                                // Use when multi-line w/ rows == 1
-    cancelControl: 'link',                      // 'link'|'button'|false
-    cancelText: 'cancel',
-    clickToEditText: 'Click to edit',
-    externalControl: null,                      // id|elt
-    externalControlOnly: false,
-    fieldPostCreation: 'activate',              // 'activate'|'focus'|false
-    formClassName: 'inplaceeditor-form',
-    formId: null,                               // id|elt
-    highlightColor: '#ffff99',
-    highlightEndColor: '#ffffff',
-    hoverClassName: '',
-    htmlResponse: true,
-    loadingClassName: 'inplaceeditor-loading',
-    loadingText: 'Loading...',
-    okControl: 'button',                        // 'link'|'button'|false
-    okText: 'ok',
-    paramName: 'value',
-    rows: 1,                                    // If 1 and multi-line, uses autoRows
-    savingClassName: 'inplaceeditor-saving',
-    savingText: 'Saving...',
-    size: 0,
-    stripLoadedTextTags: false,
-    submitOnBlur: false,
-    textAfterControls: '',
-    textBeforeControls: '',
-    textBetweenControls: ''
-  },
-  DefaultCallbacks: {
-    callback: function(form) {
-      return Form.serialize(form);
-    },
-    onComplete: function(transport, element) {
-      // For backward compatibility, this one is bound to the IPE, and passes
-      // the element directly.  It was too often customized, so we don't break it.
-      new Effect.Highlight(element, {
-        startcolor: this.options.highlightColor, keepBackgroundImage: true });
-    },
-    onEnterEditMode: null,
-    onEnterHover: function(ipe) {
-      ipe.element.style.backgroundColor = ipe.options.highlightColor;
-      if (ipe._effect)
-        ipe._effect.cancel();
-    },
-    onFailure: function(transport, ipe) {
-      alert('Error communication with the server: ' + transport.responseText.stripTags());
-    },
-    onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls.
-    onLeaveEditMode: null,
-    onLeaveHover: function(ipe) {
-      ipe._effect = new Effect.Highlight(ipe.element, {
-        startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor,
-        restorecolor: ipe._originalBackground, keepBackgroundImage: true
-      });
-    }
-  },
-  Listeners: {
-    click: 'enterEditMode',
-    keydown: 'checkForEscapeOrReturn',
-    mouseover: 'enterHover',
-    mouseout: 'leaveHover'
-  }
-});
-
-Ajax.InPlaceCollectionEditor.DefaultOptions = {
-  loadingCollectionText: 'Loading options...'
-};
-
-// Delayed observer, like Form.Element.Observer, 
-// but waits for delay after last key input
-// Ideal for live-search fields
-
-Form.Element.DelayedObserver = Class.create({
-  initialize: function(element, delay, callback) {
-    this.delay     = delay || 0.5;
-    this.element   = $(element);
-    this.callback  = callback;
-    this.timer     = null;
-    this.lastValue = $F(this.element); 
-    Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
-  },
-  delayedListener: function(event) {
-    if(this.lastValue == $F(this.element)) return;
-    if(this.timer) clearTimeout(this.timer);
-    this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000);
-    this.lastValue = $F(this.element);
-  },
-  onTimerEvent: function() {
-    this.timer = null;
-    this.callback(this.element, $F(this.element));
-  }
-});
diff --git a/ajaxui/scriptaculous/dragdrop.js b/ajaxui/scriptaculous/dragdrop.js
deleted file mode 100644
index bf429c26..00000000
--- a/ajaxui/scriptaculous/dragdrop.js
+++ /dev/null
@@ -1,974 +0,0 @@
-// script.aculo.us dragdrop.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
-// 
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-if(Object.isUndefined(Effect))
-  throw("dragdrop.js requires including script.aculo.us' effects.js library");
-
-var Droppables = {
-  drops: [],
-
-  remove: function(element) {
-    this.drops = this.drops.reject(function(d) { return d.element==$(element) });
-  },
-
-  add: function(element) {
-    element = $(element);
-    var options = Object.extend({
-      greedy:     true,
-      hoverclass: null,
-      tree:       false
-    }, arguments[1] || { });
-
-    // cache containers
-    if(options.containment) {
-      options._containers = [];
-      var containment = options.containment;
-      if(Object.isArray(containment)) {
-        containment.each( function(c) { options._containers.push($(c)) });
-      } else {
-        options._containers.push($(containment));
-      }
-    }
-    
-    if(options.accept) options.accept = [options.accept].flatten();
-
-    Element.makePositioned(element); // fix IE
-    options.element = element;
-
-    this.drops.push(options);
-  },
-  
-  findDeepestChild: function(drops) {
-    deepest = drops[0];
-      
-    for (i = 1; i < drops.length; ++i)
-      if (Element.isParent(drops[i].element, deepest.element))
-        deepest = drops[i];
-    
-    return deepest;
-  },
-
-  isContained: function(element, drop) {
-    var containmentNode;
-    if(drop.tree) {
-      containmentNode = element.treeNode; 
-    } else {
-      containmentNode = element.parentNode;
-    }
-    return drop._containers.detect(function(c) { return containmentNode == c });
-  },
-  
-  isAffected: function(point, element, drop) {
-    return (
-      (drop.element!=element) &&
-      ((!drop._containers) ||
-        this.isContained(element, drop)) &&
-      ((!drop.accept) ||
-        (Element.classNames(element).detect( 
-          function(v) { return drop.accept.include(v) } ) )) &&
-      Position.within(drop.element, point[0], point[1]) );
-  },
-
-  deactivate: function(drop) {
-    if(drop.hoverclass)
-      Element.removeClassName(drop.element, drop.hoverclass);
-    this.last_active = null;
-  },
-
-  activate: function(drop) {
-    if(drop.hoverclass)
-      Element.addClassName(drop.element, drop.hoverclass);
-    this.last_active = drop;
-  },
-
-  show: function(point, element) {
-    if(!this.drops.length) return;
-    var drop, affected = [];
-    
-    this.drops.each( function(drop) {
-      if(Droppables.isAffected(point, element, drop))
-        affected.push(drop);
-    });
-        
-    if(affected.length>0)
-      drop = Droppables.findDeepestChild(affected);
-
-    if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
-    if (drop) {
-      Position.within(drop.element, point[0], point[1]);
-      if(drop.onHover)
-        drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
-      
-      if (drop != this.last_active) Droppables.activate(drop);
-    }
-  },
-
-  fire: function(event, element) {
-    if(!this.last_active) return;
-    Position.prepare();
-
-    if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
-      if (this.last_active.onDrop) {
-        this.last_active.onDrop(element, this.last_active.element, event); 
-        return true; 
-      }
-  },
-
-  reset: function() {
-    if(this.last_active)
-      this.deactivate(this.last_active);
-  }
-}
-
-var Draggables = {
-  drags: [],
-  observers: [],
-  
-  register: function(draggable) {
-    if(this.drags.length == 0) {
-      this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
-      this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
-      this.eventKeypress  = this.keyPress.bindAsEventListener(this);
-      
-      Event.observe(document, "mouseup", this.eventMouseUp);
-      Event.observe(document, "mousemove", this.eventMouseMove);
-      Event.observe(document, "keypress", this.eventKeypress);
-    }
-    this.drags.push(draggable);
-  },
-  
-  unregister: function(draggable) {
-    this.drags = this.drags.reject(function(d) { return d==draggable });
-    if(this.drags.length == 0) {
-      Event.stopObserving(document, "mouseup", this.eventMouseUp);
-      Event.stopObserving(document, "mousemove", this.eventMouseMove);
-      Event.stopObserving(document, "keypress", this.eventKeypress);
-    }
-  },
-  
-  activate: function(draggable) {
-    if(draggable.options.delay) { 
-      this._timeout = setTimeout(function() { 
-        Draggables._timeout = null; 
-        window.focus(); 
-        Draggables.activeDraggable = draggable; 
-      }.bind(this), draggable.options.delay); 
-    } else {
-      window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
-      this.activeDraggable = draggable;
-    }
-  },
-  
-  deactivate: function() {
-    this.activeDraggable = null;
-  },
-  
-  updateDrag: function(event) {
-    if(!this.activeDraggable) return;
-    var pointer = [Event.pointerX(event), Event.pointerY(event)];
-    // Mozilla-based browsers fire successive mousemove events with
-    // the same coordinates, prevent needless redrawing (moz bug?)
-    if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
-    this._lastPointer = pointer;
-    
-    this.activeDraggable.updateDrag(event, pointer);
-  },
-  
-  endDrag: function(event) {
-    if(this._timeout) { 
-      clearTimeout(this._timeout); 
-      this._timeout = null; 
-    }
-    if(!this.activeDraggable) return;
-    this._lastPointer = null;
-    this.activeDraggable.endDrag(event);
-    this.activeDraggable = null;
-  },
-  
-  keyPress: function(event) {
-    if(this.activeDraggable)
-      this.activeDraggable.keyPress(event);
-  },
-  
-  addObserver: function(observer) {
-    this.observers.push(observer);
-    this._cacheObserverCallbacks();
-  },
-  
-  removeObserver: function(element) {  // element instead of observer fixes mem leaks
-    this.observers = this.observers.reject( function(o) { return o.element==element });
-    this._cacheObserverCallbacks();
-  },
-  
-  notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
-    if(this[eventName+'Count'] > 0)
-      this.observers.each( function(o) {
-        if(o[eventName]) o[eventName](eventName, draggable, event);
-      });
-    if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
-  },
-  
-  _cacheObserverCallbacks: function() {
-    ['onStart','onEnd','onDrag'].each( function(eventName) {
-      Draggables[eventName+'Count'] = Draggables.observers.select(
-        function(o) { return o[eventName]; }
-      ).length;
-    });
-  }
-}
-
-/*--------------------------------------------------------------------------*/
-
-var Draggable = Class.create({
-  initialize: function(element) {
-    var defaults = {
-      handle: false,
-      reverteffect: function(element, top_offset, left_offset) {
-        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
-        new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur,
-          queue: {scope:'_draggable', position:'end'}
-        });
-      },
-      endeffect: function(element) {
-        var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
-        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, 
-          queue: {scope:'_draggable', position:'end'},
-          afterFinish: function(){ 
-            Draggable._dragging[element] = false 
-          }
-        }); 
-      },
-      zindex: 1000,
-      revert: false,
-      quiet: false,
-      scroll: false,
-      scrollSensitivity: 20,
-      scrollSpeed: 15,
-      snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
-      delay: 0
-    };
-    
-    if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
-      Object.extend(defaults, {
-        starteffect: function(element) {
-          element._opacity = Element.getOpacity(element);
-          Draggable._dragging[element] = true;
-          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); 
-        }
-      });
-    
-    var options = Object.extend(defaults, arguments[1] || { });
-
-    this.element = $(element);
-    
-    if(options.handle && Object.isString(options.handle))
-      this.handle = this.element.down('.'+options.handle, 0);
-    
-    if(!this.handle) this.handle = $(options.handle);
-    if(!this.handle) this.handle = this.element;
-    
-    if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
-      options.scroll = $(options.scroll);
-      this._isScrollChild = Element.childOf(this.element, options.scroll);
-    }
-
-    Element.makePositioned(this.element); // fix IE    
-
-    this.options  = options;
-    this.dragging = false;   
-
-    this.eventMouseDown = this.initDrag.bindAsEventListener(this);
-    Event.observe(this.handle, "mousedown", this.eventMouseDown);
-    
-    Draggables.register(this);
-  },
-  
-  destroy: function() {
-    Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
-    Draggables.unregister(this);
-  },
-  
-  currentDelta: function() {
-    return([
-      parseInt(Element.getStyle(this.element,'left') || '0'),
-      parseInt(Element.getStyle(this.element,'top') || '0')]);
-  },
-  
-  initDrag: function(event) {
-    if(!Object.isUndefined(Draggable._dragging[this.element]) &&
-      Draggable._dragging[this.element]) return;
-    if(Event.isLeftClick(event)) {    
-      // abort on form elements, fixes a Firefox issue
-      var src = Event.element(event);
-      if((tag_name = src.tagName.toUpperCase()) && (
-        tag_name=='INPUT' ||
-        tag_name=='SELECT' ||
-        tag_name=='OPTION' ||
-        tag_name=='BUTTON' ||
-        tag_name=='TEXTAREA')) return;
-        
-      var pointer = [Event.pointerX(event), Event.pointerY(event)];
-      var pos     = Position.cumulativeOffset(this.element);
-      this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
-      
-      Draggables.activate(this);
-      Event.stop(event);
-    }
-  },
-  
-  startDrag: function(event) {
-    this.dragging = true;
-    if(!this.delta)
-      this.delta = this.currentDelta();
-    
-    if(this.options.zindex) {
-      this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
-      this.element.style.zIndex = this.options.zindex;
-    }
-    
-    if(this.options.ghosting) {
-      this._clone = this.element.cloneNode(true);
-      this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
-      if (!this.element._originallyAbsolute)
-        Position.absolutize(this.element);
-      this.element.parentNode.insertBefore(this._clone, this.element);
-    }
-    
-    if(this.options.scroll) {
-      if (this.options.scroll == window) {
-        var where = this._getWindowScroll(this.options.scroll);
-        this.originalScrollLeft = where.left;
-        this.originalScrollTop = where.top;
-      } else {
-        this.originalScrollLeft = this.options.scroll.scrollLeft;
-        this.originalScrollTop = this.options.scroll.scrollTop;
-      }
-    }
-    
-    Draggables.notify('onStart', this, event);
-        
-    if(this.options.starteffect) this.options.starteffect(this.element);
-  },
-  
-  updateDrag: function(event, pointer) {
-    if(!this.dragging) this.startDrag(event);
-    
-    if(!this.options.quiet){
-      Position.prepare();
-      Droppables.show(pointer, this.element);
-    }
-    
-    Draggables.notify('onDrag', this, event);
-    
-    this.draw(pointer);
-    if(this.options.change) this.options.change(this);
-    
-    if(this.options.scroll) {
-      this.stopScrolling();
-      
-      var p;
-      if (this.options.scroll == window) {
-        with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
-      } else {
-        p = Position.page(this.options.scroll);
-        p[0] += this.options.scroll.scrollLeft + Position.deltaX;
-        p[1] += this.options.scroll.scrollTop + Position.deltaY;
-        p.push(p[0]+this.options.scroll.offsetWidth);
-        p.push(p[1]+this.options.scroll.offsetHeight);
-      }
-      var speed = [0,0];
-      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
-      if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
-      if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
-      if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
-      this.startScrolling(speed);
-    }
-    
-    // fix AppleWebKit rendering
-    if(Prototype.Browser.WebKit) window.scrollBy(0,0);
-    
-    Event.stop(event);
-  },
-  
-  finishDrag: function(event, success) {
-    this.dragging = false;
-    
-    if(this.options.quiet){
-      Position.prepare();
-      var pointer = [Event.pointerX(event), Event.pointerY(event)];
-      Droppables.show(pointer, this.element);
-    }
-
-    if(this.options.ghosting) {
-      if (!this.element._originallyAbsolute)
-        Position.relativize(this.element);
-      delete this.element._originallyAbsolute;
-      Element.remove(this._clone);
-      this._clone = null;
-    }
-
-    var dropped = false; 
-    if(success) { 
-      dropped = Droppables.fire(event, this.element); 
-      if (!dropped) dropped = false; 
-    }
-    if(dropped && this.options.onDropped) this.options.onDropped(this.element);
-    Draggables.notify('onEnd', this, event);
-
-    var revert = this.options.revert;
-    if(revert && Object.isFunction(revert)) revert = revert(this.element);
-    
-    var d = this.currentDelta();
-    if(revert && this.options.reverteffect) {
-      if (dropped == 0 || revert != 'failure')
-        this.options.reverteffect(this.element,
-          d[1]-this.delta[1], d[0]-this.delta[0]);
-    } else {
-      this.delta = d;
-    }
-
-    if(this.options.zindex)
-      this.element.style.zIndex = this.originalZ;
-
-    if(this.options.endeffect) 
-      this.options.endeffect(this.element);
-      
-    Draggables.deactivate(this);
-    Droppables.reset();
-  },
-  
-  keyPress: function(event) {
-    if(event.keyCode!=Event.KEY_ESC) return;
-    this.finishDrag(event, false);
-    Event.stop(event);
-  },
-  
-  endDrag: function(event) {
-    if(!this.dragging) return;
-    this.stopScrolling();
-    this.finishDrag(event, true);
-    Event.stop(event);
-  },
-  
-  draw: function(point) {
-    var pos = Position.cumulativeOffset(this.element);
-    if(this.options.ghosting) {
-      var r   = Position.realOffset(this.element);
-      pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
-    }
-    
-    var d = this.currentDelta();
-    pos[0] -= d[0]; pos[1] -= d[1];
-    
-    if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
-      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
-      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
-    }
-    
-    var p = [0,1].map(function(i){ 
-      return (point[i]-pos[i]-this.offset[i]) 
-    }.bind(this));
-    
-    if(this.options.snap) {
-      if(Object.isFunction(this.options.snap)) {
-        p = this.options.snap(p[0],p[1],this);
-      } else {
-      if(Object.isArray(this.options.snap)) {
-        p = p.map( function(v, i) {
-          return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this))
-      } else {
-        p = p.map( function(v) {
-          return (v/this.options.snap).round()*this.options.snap }.bind(this))
-      }
-    }}
-    
-    var style = this.element.style;
-    if((!this.options.constraint) || (this.options.constraint=='horizontal'))
-      style.left = p[0] + "px";
-    if((!this.options.constraint) || (this.options.constraint=='vertical'))
-      style.top  = p[1] + "px";
-    
-    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
-  },
-  
-  stopScrolling: function() {
-    if(this.scrollInterval) {
-      clearInterval(this.scrollInterval);
-      this.scrollInterval = null;
-      Draggables._lastScrollPointer = null;
-    }
-  },
-  
-  startScrolling: function(speed) {
-    if(!(speed[0] || speed[1])) return;
-    this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
-    this.lastScrolled = new Date();
-    this.scrollInterval = setInterval(this.scroll.bind(this), 10);
-  },
-  
-  scroll: function() {
-    var current = new Date();
-    var delta = current - this.lastScrolled;
-    this.lastScrolled = current;
-    if(this.options.scroll == window) {
-      with (this._getWindowScroll(this.options.scroll)) {
-        if (this.scrollSpeed[0] || this.scrollSpeed[1]) {
-          var d = delta / 1000;
-          this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] );
-        }
-      }
-    } else {
-      this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
-      this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
-    }
-    
-    Position.prepare();
-    Droppables.show(Draggables._lastPointer, this.element);
-    Draggables.notify('onDrag', this);
-    if (this._isScrollChild) {
-      Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
-      Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
-      Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
-      if (Draggables._lastScrollPointer[0] < 0)
-        Draggables._lastScrollPointer[0] = 0;
-      if (Draggables._lastScrollPointer[1] < 0)
-        Draggables._lastScrollPointer[1] = 0;
-      this.draw(Draggables._lastScrollPointer);
-    }
-    
-    if(this.options.change) this.options.change(this);
-  },
-  
-  _getWindowScroll: function(w) {
-    var T, L, W, H;
-    with (w.document) {
-      if (w.document.documentElement && documentElement.scrollTop) {
-        T = documentElement.scrollTop;
-        L = documentElement.scrollLeft;
-      } else if (w.document.body) {
-        T = body.scrollTop;
-        L = body.scrollLeft;
-      }
-      if (w.innerWidth) {
-        W = w.innerWidth;
-        H = w.innerHeight;
-      } else if (w.document.documentElement && documentElement.clientWidth) {
-        W = documentElement.clientWidth;
-        H = documentElement.clientHeight;
-      } else {
-        W = body.offsetWidth;
-        H = body.offsetHeight
-      }
-    }
-    return { top: T, left: L, width: W, height: H };
-  }
-});
-
-Draggable._dragging = { };
-
-/*--------------------------------------------------------------------------*/
-
-var SortableObserver = Class.create({
-  initialize: function(element, observer) {
-    this.element   = $(element);
-    this.observer  = observer;
-    this.lastValue = Sortable.serialize(this.element);
-  },
-  
-  onStart: function() {
-    this.lastValue = Sortable.serialize(this.element);
-  },
-  
-  onEnd: function() {
-    Sortable.unmark();
-    if(this.lastValue != Sortable.serialize(this.element))
-      this.observer(this.element)
-  }
-});
-
-var Sortable = {
-  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
-  
-  sortables: { },
-  
-  _findRootElement: function(element) {
-    while (element.tagName.toUpperCase() != "BODY") {  
-      if(element.id && Sortable.sortables[element.id]) return element;
-      element = element.parentNode;
-    }
-  },
-
-  options: function(element) {
-    element = Sortable._findRootElement($(element));
-    if(!element) return;
-    return Sortable.sortables[element.id];
-  },
-  
-  destroy: function(element){
-    var s = Sortable.options(element);
-    
-    if(s) {
-      Draggables.removeObserver(s.element);
-      s.droppables.each(function(d){ Droppables.remove(d) });
-      s.draggables.invoke('destroy');
-      
-      delete Sortable.sortables[s.element.id];
-    }
-  },
-
-  create: function(element) {
-    element = $(element);
-    var options = Object.extend({ 
-      element:     element,
-      tag:         'li',       // assumes li children, override with tag: 'tagname'
-      dropOnEmpty: false,
-      tree:        false,
-      treeTag:     'ul',
-      overlap:     'vertical', // one of 'vertical', 'horizontal'
-      constraint:  'vertical', // one of 'vertical', 'horizontal', false
-      containment: element,    // also takes array of elements (or id's); or false
-      handle:      false,      // or a CSS class
-      only:        false,
-      delay:       0,
-      hoverclass:  null,
-      ghosting:    false,
-      quiet:       false, 
-      scroll:      false,
-      scrollSensitivity: 20,
-      scrollSpeed: 15,
-      format:      this.SERIALIZE_RULE,
-      
-      // these take arrays of elements or ids and can be 
-      // used for better initialization performance
-      elements:    false,
-      handles:     false,
-      
-      onChange:    Prototype.emptyFunction,
-      onUpdate:    Prototype.emptyFunction
-    }, arguments[1] || { });
-
-    // clear any old sortable with same element
-    this.destroy(element);
-
-    // build options for the draggables
-    var options_for_draggable = {
-      revert:      true,
-      quiet:       options.quiet,
-      scroll:      options.scroll,
-      scrollSpeed: options.scrollSpeed,
-      scrollSensitivity: options.scrollSensitivity,
-      delay:       options.delay,
-      ghosting:    options.ghosting,
-      constraint:  options.constraint,
-      handle:      options.handle };
-
-    if(options.starteffect)
-      options_for_draggable.starteffect = options.starteffect;
-
-    if(options.reverteffect)
-      options_for_draggable.reverteffect = options.reverteffect;
-    else
-      if(options.ghosting) options_for_draggable.reverteffect = function(element) {
-        element.style.top  = 0;
-        element.style.left = 0;
-      };
-
-    if(options.endeffect)
-      options_for_draggable.endeffect = options.endeffect;
-
-    if(options.zindex)
-      options_for_draggable.zindex = options.zindex;
-
-    // build options for the droppables  
-    var options_for_droppable = {
-      overlap:     options.overlap,
-      containment: options.containment,
-      tree:        options.tree,
-      hoverclass:  options.hoverclass,
-      onHover:     Sortable.onHover
-    }
-    
-    var options_for_tree = {
-      onHover:      Sortable.onEmptyHover,
-      overlap:      options.overlap,
-      containment:  options.containment,
-      hoverclass:   options.hoverclass
-    }
-
-    // fix for gecko engine
-    Element.cleanWhitespace(element); 
-
-    options.draggables = [];
-    options.droppables = [];
-
-    // drop on empty handling
-    if(options.dropOnEmpty || options.tree) {
-      Droppables.add(element, options_for_tree);
-      options.droppables.push(element);
-    }
-
-    (options.elements || this.findElements(element, options) || []).each( function(e,i) {
-      var handle = options.handles ? $(options.handles[i]) :
-        (options.handle ? $(e).select('.' + options.handle)[0] : e); 
-      options.draggables.push(
-        new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
-      Droppables.add(e, options_for_droppable);
-      if(options.tree) e.treeNode = element;
-      options.droppables.push(e);      
-    });
-    
-    if(options.tree) {
-      (Sortable.findTreeElements(element, options) || []).each( function(e) {
-        Droppables.add(e, options_for_tree);
-        e.treeNode = element;
-        options.droppables.push(e);
-      });
-    }
-
-    // keep reference
-    this.sortables[element.id] = options;
-
-    // for onupdate
-    Draggables.addObserver(new SortableObserver(element, options.onUpdate));
-
-  },
-
-  // return all suitable-for-sortable elements in a guaranteed order
-  findElements: function(element, options) {
-    return Element.findChildren(
-      element, options.only, options.tree ? true : false, options.tag);
-  },
-  
-  findTreeElements: function(element, options) {
-    return Element.findChildren(
-      element, options.only, options.tree ? true : false, options.treeTag);
-  },
-
-  onHover: function(element, dropon, overlap) {
-    if(Element.isParent(dropon, element)) return;
-
-    if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) {
-      return;
-    } else if(overlap>0.5) {
-      Sortable.mark(dropon, 'before');
-      if(dropon.previousSibling != element) {
-        var oldParentNode = element.parentNode;
-        element.style.visibility = "hidden"; // fix gecko rendering
-        dropon.parentNode.insertBefore(element, dropon);
-        if(dropon.parentNode!=oldParentNode) 
-          Sortable.options(oldParentNode).onChange(element);
-        Sortable.options(dropon.parentNode).onChange(element);
-      }
-    } else {
-      Sortable.mark(dropon, 'after');
-      var nextElement = dropon.nextSibling || null;
-      if(nextElement != element) {
-        var oldParentNode = element.parentNode;
-        element.style.visibility = "hidden"; // fix gecko rendering
-        dropon.parentNode.insertBefore(element, nextElement);
-        if(dropon.parentNode!=oldParentNode) 
-          Sortable.options(oldParentNode).onChange(element);
-        Sortable.options(dropon.parentNode).onChange(element);
-      }
-    }
-  },
-  
-  onEmptyHover: function(element, dropon, overlap) {
-    var oldParentNode = element.parentNode;
-    var droponOptions = Sortable.options(dropon);
-        
-    if(!Element.isParent(dropon, element)) {
-      var index;
-      
-      var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
-      var child = null;
-            
-      if(children) {
-        var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
-        
-        for (index = 0; index < children.length; index += 1) {
-          if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
-            offset -= Element.offsetSize (children[index], droponOptions.overlap);
-          } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) {
-            child = index + 1 < children.length ? children[index + 1] : null;
-            break;
-          } else {
-            child = children[index];
-            break;
-          }
-        }
-      }
-      
-      dropon.insertBefore(element, child);
-      
-      Sortable.options(oldParentNode).onChange(element);
-      droponOptions.onChange(element);
-    }
-  },
-
-  unmark: function() {
-    if(Sortable._marker) Sortable._marker.hide();
-  },
-
-  mark: function(dropon, position) {
-    // mark on ghosting only
-    var sortable = Sortable.options(dropon.parentNode);
-    if(sortable && !sortable.ghosting) return; 
-
-    if(!Sortable._marker) {
-      Sortable._marker = 
-        ($('dropmarker') || Element.extend(document.createElement('DIV'))).
-          hide().addClassName('dropmarker').setStyle({position:'absolute'});
-      document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
-    }    
-    var offsets = Position.cumulativeOffset(dropon);
-    Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
-    
-    if(position=='after')
-      if(sortable.overlap == 'horizontal') 
-        Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
-      else
-        Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
-    
-    Sortable._marker.show();
-  },
-  
-  _tree: function(element, options, parent) {
-    var children = Sortable.findElements(element, options) || [];
-  
-    for (var i = 0; i < children.length; ++i) {
-      var match = children[i].id.match(options.format);
-
-      if (!match) continue;
-      
-      var child = {
-        id: encodeURIComponent(match ? match[1] : null),
-        element: element,
-        parent: parent,
-        children: [],
-        position: parent.children.length,
-        container: $(children[i]).down(options.treeTag)
-      }
-      
-      /* Get the element containing the children and recurse over it */
-      if (child.container)
-        this._tree(child.container, options, child)
-      
-      parent.children.push (child);
-    }
-
-    return parent; 
-  },
-
-  tree: function(element) {
-    element = $(element);
-    var sortableOptions = this.options(element);
-    var options = Object.extend({
-      tag: sortableOptions.tag,
-      treeTag: sortableOptions.treeTag,
-      only: sortableOptions.only,
-      name: element.id,
-      format: sortableOptions.format
-    }, arguments[1] || { });
-    
-    var root = {
-      id: null,
-      parent: null,
-      children: [],
-      container: element,
-      position: 0
-    }
-    
-    return Sortable._tree(element, options, root);
-  },
-
-  /* Construct a [i] index for a particular node */
-  _constructIndex: function(node) {
-    var index = '';
-    do {
-      if (node.id) index = '[' + node.position + ']' + index;
-    } while ((node = node.parent) != null);
-    return index;
-  },
-
-  sequence: function(element) {
-    element = $(element);
-    var options = Object.extend(this.options(element), arguments[1] || { });
-    
-    return $(this.findElements(element, options) || []).map( function(item) {
-      return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
-    });
-  },
-
-  setSequence: function(element, new_sequence) {
-    element = $(element);
-    var options = Object.extend(this.options(element), arguments[2] || { });
-    
-    var nodeMap = { };
-    this.findElements(element, options).each( function(n) {
-        if (n.id.match(options.format))
-            nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
-        n.parentNode.removeChild(n);
-    });
-   
-    new_sequence.each(function(ident) {
-      var n = nodeMap[ident];
-      if (n) {
-        n[1].appendChild(n[0]);
-        delete nodeMap[ident];
-      }
-    });
-  },
-  
-  serialize: function(element) {
-    element = $(element);
-    var options = Object.extend(Sortable.options(element), arguments[1] || { });
-    var name = encodeURIComponent(
-      (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
-    
-    if (options.tree) {
-      return Sortable.tree(element, arguments[1]).children.map( function (item) {
-        return [name + Sortable._constructIndex(item) + "[id]=" + 
-                encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
-      }).flatten().join('&');
-    } else {
-      return Sortable.sequence(element, arguments[1]).map( function(item) {
-        return name + "[]=" + encodeURIComponent(item);
-      }).join('&');
-    }
-  }
-}
-
-// Returns true if child is contained within element
-Element.isParent = function(child, element) {
-  if (!child.parentNode || child == element) return false;
-  if (child.parentNode == element) return true;
-  return Element.isParent(child.parentNode, element);
-}
-
-Element.findChildren = function(element, only, recursive, tagName) {   
-  if(!element.hasChildNodes()) return null;
-  tagName = tagName.toUpperCase();
-  if(only) only = [only].flatten();
-  var elements = [];
-  $A(element.childNodes).each( function(e) {
-    if(e.tagName && e.tagName.toUpperCase()==tagName &&
-      (!only || (Element.classNames(e).detect(function(v) { return only.include(v) }))))
-        elements.push(e);
-    if(recursive) {
-      var grandchildren = Element.findChildren(e, only, recursive, tagName);
-      if(grandchildren) elements.push(grandchildren);
-    }
-  });
-
-  return (elements.length>0 ? elements.flatten() : []);
-}
-
-Element.offsetSize = function (element, type) {
-  return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
-}
diff --git a/ajaxui/scriptaculous/effects.js b/ajaxui/scriptaculous/effects.js
deleted file mode 100644
index b8c0259f..00000000
--- a/ajaxui/scriptaculous/effects.js
+++ /dev/null
@@ -1,1122 +0,0 @@
-// script.aculo.us effects.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-// Contributors:
-//  Justin Palmer (http://encytemedia.com/)
-//  Mark Pilgrim (http://diveintomark.org/)
-//  Martin Bialasinki
-// 
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/ 
-
-// converts rgb() and #xxx to #xxxxxx format,  
-// returns self (or first argument) if not convertable  
-String.prototype.parseColor = function() {  
-  var color = '#';
-  if (this.slice(0,4) == 'rgb(') {  
-    var cols = this.slice(4,this.length-1).split(',');  
-    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);  
-  } else {  
-    if (this.slice(0,1) == '#') {  
-      if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();  
-      if (this.length==7) color = this.toLowerCase();  
-    }  
-  }  
-  return (color.length==7 ? color : (arguments[0] || this));  
-};
-
-/*--------------------------------------------------------------------------*/
-
-Element.collectTextNodes = function(element) {  
-  return $A($(element).childNodes).collect( function(node) {
-    return (node.nodeType==3 ? node.nodeValue : 
-      (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
-  }).flatten().join('');
-};
-
-Element.collectTextNodesIgnoreClass = function(element, className) {  
-  return $A($(element).childNodes).collect( function(node) {
-    return (node.nodeType==3 ? node.nodeValue : 
-      ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? 
-        Element.collectTextNodesIgnoreClass(node, className) : ''));
-  }).flatten().join('');
-};
-
-Element.setContentZoom = function(element, percent) {
-  element = $(element);  
-  element.setStyle({fontSize: (percent/100) + 'em'});   
-  if (Prototype.Browser.WebKit) window.scrollBy(0,0);
-  return element;
-};
-
-Element.getInlineOpacity = function(element){
-  return $(element).style.opacity || '';
-};
-
-Element.forceRerendering = function(element) {
-  try {
-    element = $(element);
-    var n = document.createTextNode(' ');
-    element.appendChild(n);
-    element.removeChild(n);
-  } catch(e) { }
-};
-
-/*--------------------------------------------------------------------------*/
-
-var Effect = {
-  _elementDoesNotExistError: {
-    name: 'ElementDoesNotExistError',
-    message: 'The specified DOM element does not exist, but is required for this effect to operate'
-  },
-  Transitions: {
-    linear: Prototype.K,
-    sinoidal: function(pos) {
-      return (-Math.cos(pos*Math.PI)/2) + 0.5;
-    },
-    reverse: function(pos) {
-      return 1-pos;
-    },
-    flicker: function(pos) {
-      var pos = ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
-      return pos > 1 ? 1 : pos;
-    },
-    wobble: function(pos) {
-      return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
-    },
-    pulse: function(pos, pulses) { 
-      pulses = pulses || 5; 
-      return (
-        ((pos % (1/pulses)) * pulses).round() == 0 ? 
-              ((pos * pulses * 2) - (pos * pulses * 2).floor()) : 
-          1 - ((pos * pulses * 2) - (pos * pulses * 2).floor())
-        );
-    },
-    spring: function(pos) { 
-      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); 
-    },
-    none: function(pos) {
-      return 0;
-    },
-    full: function(pos) {
-      return 1;
-    }
-  },
-  DefaultOptions: {
-    duration:   1.0,   // seconds
-    fps:        100,   // 100= assume 66fps max.
-    sync:       false, // true for combining
-    from:       0.0,
-    to:         1.0,
-    delay:      0.0,
-    queue:      'parallel'
-  },
-  tagifyText: function(element) {
-    var tagifyStyle = 'position:relative';
-    if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
-    
-    element = $(element);
-    $A(element.childNodes).each( function(child) {
-      if (child.nodeType==3) {
-        child.nodeValue.toArray().each( function(character) {
-          element.insertBefore(
-            new Element('span', {style: tagifyStyle}).update(
-              character == ' ' ? String.fromCharCode(160) : character), 
-              child);
-        });
-        Element.remove(child);
-      }
-    });
-  },
-  multiple: function(element, effect) {
-    var elements;
-    if (((typeof element == 'object') || 
-        Object.isFunction(element)) && 
-       (element.length))
-      elements = element;
-    else
-      elements = $(element).childNodes;
-      
-    var options = Object.extend({
-      speed: 0.1,
-      delay: 0.0
-    }, arguments[2] || { });
-    var masterDelay = options.delay;
-
-    $A(elements).each( function(element, index) {
-      new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay }));
-    });
-  },
-  PAIRS: {
-    'slide':  ['SlideDown','SlideUp'],
-    'blind':  ['BlindDown','BlindUp'],
-    'appear': ['Appear','Fade']
-  },
-  toggle: function(element, effect) {
-    element = $(element);
-    effect = (effect || 'appear').toLowerCase();
-    var options = Object.extend({
-      queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
-    }, arguments[2] || { });
-    Effect[element.visible() ? 
-      Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
-  }
-};
-
-Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;
-
-/* ------------- core effects ------------- */
-
-Effect.ScopedQueue = Class.create(Enumerable, {
-  initialize: function() {
-    this.effects  = [];
-    this.interval = null;    
-  },
-  _each: function(iterator) {
-    this.effects._each(iterator);
-  },
-  add: function(effect) {
-    var timestamp = new Date().getTime();
-    
-    var position = Object.isString(effect.options.queue) ? 
-      effect.options.queue : effect.options.queue.position;
-    
-    switch(position) {
-      case 'front':
-        // move unstarted effects after this effect  
-        this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
-            e.startOn  += effect.finishOn;
-            e.finishOn += effect.finishOn;
-          });
-        break;
-      case 'with-last':
-        timestamp = this.effects.pluck('startOn').max() || timestamp;
-        break;
-      case 'end':
-        // start effect after last queued effect has finished
-        timestamp = this.effects.pluck('finishOn').max() || timestamp;
-        break;
-    }
-    
-    effect.startOn  += timestamp;
-    effect.finishOn += timestamp;
-
-    if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
-      this.effects.push(effect);
-    
-    if (!this.interval)
-      this.interval = setInterval(this.loop.bind(this), 15);
-  },
-  remove: function(effect) {
-    this.effects = this.effects.reject(function(e) { return e==effect });
-    if (this.effects.length == 0) {
-      clearInterval(this.interval);
-      this.interval = null;
-    }
-  },
-  loop: function() {
-    var timePos = new Date().getTime();
-    for(var i=0, len=this.effects.length;i<len;i++) 
-      this.effects[i] && this.effects[i].loop(timePos);
-  }
-});
-
-Effect.Queues = {
-  instances: $H(),
-  get: function(queueName) {
-    if (!Object.isString(queueName)) return queueName;
-    
-    return this.instances.get(queueName) ||
-      this.instances.set(queueName, new Effect.ScopedQueue());
-  }
-};
-Effect.Queue = Effect.Queues.get('global');
-
-Effect.Base = Class.create({
-  position: null,
-  start: function(options) {
-    function codeForEvent(options,eventName){
-      return (
-        (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') +
-        (options[eventName] ? 'this.options.'+eventName+'(this);' : '')
-      );
-    }
-    if (options && options.transition === false) options.transition = Effect.Transitions.linear;
-    this.options      = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { });
-    this.currentFrame = 0;
-    this.state        = 'idle';
-    this.startOn      = this.options.delay*1000;
-    this.finishOn     = this.startOn+(this.options.duration*1000);
-    this.fromToDelta  = this.options.to-this.options.from;
-    this.totalTime    = this.finishOn-this.startOn;
-    this.totalFrames  = this.options.fps*this.options.duration;
-    
-    eval('this.render = function(pos){ '+
-      'if (this.state=="idle"){this.state="running";'+
-      codeForEvent(this.options,'beforeSetup')+
-      (this.setup ? 'this.setup();':'')+ 
-      codeForEvent(this.options,'afterSetup')+
-      '};if (this.state=="running"){'+
-      'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+
-      'this.position=pos;'+
-      codeForEvent(this.options,'beforeUpdate')+
-      (this.update ? 'this.update(pos);':'')+
-      codeForEvent(this.options,'afterUpdate')+
-      '}}');
-    
-    this.event('beforeStart');
-    if (!this.options.sync)
-      Effect.Queues.get(Object.isString(this.options.queue) ? 
-        'global' : this.options.queue.scope).add(this);
-  },
-  loop: function(timePos) {
-    if (timePos >= this.startOn) {
-      if (timePos >= this.finishOn) {
-        this.render(1.0);
-        this.cancel();
-        this.event('beforeFinish');
-        if (this.finish) this.finish(); 
-        this.event('afterFinish');
-        return;  
-      }
-      var pos   = (timePos - this.startOn) / this.totalTime,
-          frame = (pos * this.totalFrames).round();
-      if (frame > this.currentFrame) {
-        this.render(pos);
-        this.currentFrame = frame;
-      }
-    }
-  },
-  cancel: function() {
-    if (!this.options.sync)
-      Effect.Queues.get(Object.isString(this.options.queue) ? 
-        'global' : this.options.queue.scope).remove(this);
-    this.state = 'finished';
-  },
-  event: function(eventName) {
-    if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
-    if (this.options[eventName]) this.options[eventName](this);
-  },
-  inspect: function() {
-    var data = $H();
-    for(property in this)
-      if (!Object.isFunction(this[property])) data.set(property, this[property]);
-    return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
-  }
-});
-
-Effect.Parallel = Class.create(Effect.Base, {
-  initialize: function(effects) {
-    this.effects = effects || [];
-    this.start(arguments[1]);
-  },
-  update: function(position) {
-    this.effects.invoke('render', position);
-  },
-  finish: function(position) {
-    this.effects.each( function(effect) {
-      effect.render(1.0);
-      effect.cancel();
-      effect.event('beforeFinish');
-      if (effect.finish) effect.finish(position);
-      effect.event('afterFinish');
-    });
-  }
-});
-
-Effect.Tween = Class.create(Effect.Base, {
-  initialize: function(object, from, to) {
-    object = Object.isString(object) ? $(object) : object;
-    var args = $A(arguments), method = args.last(), 
-      options = args.length == 5 ? args[3] : null;
-    this.method = Object.isFunction(method) ? method.bind(object) :
-      Object.isFunction(object[method]) ? object[method].bind(object) : 
-      function(value) { object[method] = value };
-    this.start(Object.extend({ from: from, to: to }, options || { }));
-  },
-  update: function(position) {
-    this.method(position);
-  }
-});
-
-Effect.Event = Class.create(Effect.Base, {
-  initialize: function() {
-    this.start(Object.extend({ duration: 0 }, arguments[0] || { }));
-  },
-  update: Prototype.emptyFunction
-});
-
-Effect.Opacity = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    // make this work on IE on elements without 'layout'
-    if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
-      this.element.setStyle({zoom: 1});
-    var options = Object.extend({
-      from: this.element.getOpacity() || 0.0,
-      to:   1.0
-    }, arguments[1] || { });
-    this.start(options);
-  },
-  update: function(position) {
-    this.element.setOpacity(position);
-  }
-});
-
-Effect.Move = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      x:    0,
-      y:    0,
-      mode: 'relative'
-    }, arguments[1] || { });
-    this.start(options);
-  },
-  setup: function() {
-    this.element.makePositioned();
-    this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
-    this.originalTop  = parseFloat(this.element.getStyle('top')  || '0');
-    if (this.options.mode == 'absolute') {
-      this.options.x = this.options.x - this.originalLeft;
-      this.options.y = this.options.y - this.originalTop;
-    }
-  },
-  update: function(position) {
-    this.element.setStyle({
-      left: (this.options.x  * position + this.originalLeft).round() + 'px',
-      top:  (this.options.y  * position + this.originalTop).round()  + 'px'
-    });
-  }
-});
-
-// for backwards compatibility
-Effect.MoveBy = function(element, toTop, toLeft) {
-  return new Effect.Move(element, 
-    Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
-};
-
-Effect.Scale = Class.create(Effect.Base, {
-  initialize: function(element, percent) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      scaleX: true,
-      scaleY: true,
-      scaleContent: true,
-      scaleFromCenter: false,
-      scaleMode: 'box',        // 'box' or 'contents' or { } with provided values
-      scaleFrom: 100.0,
-      scaleTo:   percent
-    }, arguments[2] || { });
-    this.start(options);
-  },
-  setup: function() {
-    this.restoreAfterFinish = this.options.restoreAfterFinish || false;
-    this.elementPositioning = this.element.getStyle('position');
-    
-    this.originalStyle = { };
-    ['top','left','width','height','fontSize'].each( function(k) {
-      this.originalStyle[k] = this.element.style[k];
-    }.bind(this));
-      
-    this.originalTop  = this.element.offsetTop;
-    this.originalLeft = this.element.offsetLeft;
-    
-    var fontSize = this.element.getStyle('font-size') || '100%';
-    ['em','px','%','pt'].each( function(fontSizeType) {
-      if (fontSize.indexOf(fontSizeType)>0) {
-        this.fontSize     = parseFloat(fontSize);
-        this.fontSizeType = fontSizeType;
-      }
-    }.bind(this));
-    
-    this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
-    
-    this.dims = null;
-    if (this.options.scaleMode=='box')
-      this.dims = [this.element.offsetHeight, this.element.offsetWidth];
-    if (/^content/.test(this.options.scaleMode))
-      this.dims = [this.element.scrollHeight, this.element.scrollWidth];
-    if (!this.dims)
-      this.dims = [this.options.scaleMode.originalHeight,
-                   this.options.scaleMode.originalWidth];
-  },
-  update: function(position) {
-    var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
-    if (this.options.scaleContent && this.fontSize)
-      this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
-    this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
-  },
-  finish: function(position) {
-    if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
-  },
-  setDimensions: function(height, width) {
-    var d = { };
-    if (this.options.scaleX) d.width = width.round() + 'px';
-    if (this.options.scaleY) d.height = height.round() + 'px';
-    if (this.options.scaleFromCenter) {
-      var topd  = (height - this.dims[0])/2;
-      var leftd = (width  - this.dims[1])/2;
-      if (this.elementPositioning == 'absolute') {
-        if (this.options.scaleY) d.top = this.originalTop-topd + 'px';
-        if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
-      } else {
-        if (this.options.scaleY) d.top = -topd + 'px';
-        if (this.options.scaleX) d.left = -leftd + 'px';
-      }
-    }
-    this.element.setStyle(d);
-  }
-});
-
-Effect.Highlight = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { });
-    this.start(options);
-  },
-  setup: function() {
-    // Prevent executing on elements not in the layout flow
-    if (this.element.getStyle('display')=='none') { this.cancel(); return; }
-    // Disable background image during the effect
-    this.oldStyle = { };
-    if (!this.options.keepBackgroundImage) {
-      this.oldStyle.backgroundImage = this.element.getStyle('background-image');
-      this.element.setStyle({backgroundImage: 'none'});
-    }
-    if (!this.options.endcolor)
-      this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
-    if (!this.options.restorecolor)
-      this.options.restorecolor = this.element.getStyle('background-color');
-    // init color calculations
-    this._base  = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
-    this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this));
-  },
-  update: function(position) {
-    this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
-      return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
-  },
-  finish: function() {
-    this.element.setStyle(Object.extend(this.oldStyle, {
-      backgroundColor: this.options.restorecolor
-    }));
-  }
-});
-
-Effect.ScrollTo = function(element) {
-  var options = arguments[1] || { },
-    scrollOffsets = document.viewport.getScrollOffsets(),
-    elementOffsets = $(element).cumulativeOffset(),
-    max = (window.height || document.body.scrollHeight) - document.viewport.getHeight();  
-
-  if (options.offset) elementOffsets[1] += options.offset;
-
-  return new Effect.Tween(null,
-    scrollOffsets.top,
-    elementOffsets[1] > max ? max : elementOffsets[1],
-    options,
-    function(p){ scrollTo(scrollOffsets.left, p.round()) }
-  );
-};
-
-/* ------------- combination effects ------------- */
-
-Effect.Fade = function(element) {
-  element = $(element);
-  var oldOpacity = element.getInlineOpacity();
-  var options = Object.extend({
-    from: element.getOpacity() || 1.0,
-    to:   0.0,
-    afterFinishInternal: function(effect) { 
-      if (effect.options.to!=0) return;
-      effect.element.hide().setStyle({opacity: oldOpacity}); 
-    }
-  }, arguments[1] || { });
-  return new Effect.Opacity(element,options);
-};
-
-Effect.Appear = function(element) {
-  element = $(element);
-  var options = Object.extend({
-  from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0),
-  to:   1.0,
-  // force Safari to render floated elements properly
-  afterFinishInternal: function(effect) {
-    effect.element.forceRerendering();
-  },
-  beforeSetup: function(effect) {
-    effect.element.setOpacity(effect.options.from).show(); 
-  }}, arguments[1] || { });
-  return new Effect.Opacity(element,options);
-};
-
-Effect.Puff = function(element) {
-  element = $(element);
-  var oldStyle = { 
-    opacity: element.getInlineOpacity(), 
-    position: element.getStyle('position'),
-    top:  element.style.top,
-    left: element.style.left,
-    width: element.style.width,
-    height: element.style.height
-  };
-  return new Effect.Parallel(
-   [ new Effect.Scale(element, 200, 
-      { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), 
-     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], 
-     Object.extend({ duration: 1.0, 
-      beforeSetupInternal: function(effect) {
-        Position.absolutize(effect.effects[0].element)
-      },
-      afterFinishInternal: function(effect) {
-         effect.effects[0].element.hide().setStyle(oldStyle); }
-     }, arguments[1] || { })
-   );
-};
-
-Effect.BlindUp = function(element) {
-  element = $(element);
-  element.makeClipping();
-  return new Effect.Scale(element, 0,
-    Object.extend({ scaleContent: false, 
-      scaleX: false, 
-      restoreAfterFinish: true,
-      afterFinishInternal: function(effect) {
-        effect.element.hide().undoClipping();
-      } 
-    }, arguments[1] || { })
-  );
-};
-
-Effect.BlindDown = function(element) {
-  element = $(element);
-  var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, 100, Object.extend({ 
-    scaleContent: false, 
-    scaleX: false,
-    scaleFrom: 0,
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-    afterSetup: function(effect) {
-      effect.element.makeClipping().setStyle({height: '0px'}).show(); 
-    },  
-    afterFinishInternal: function(effect) {
-      effect.element.undoClipping();
-    }
-  }, arguments[1] || { }));
-};
-
-Effect.SwitchOff = function(element) {
-  element = $(element);
-  var oldOpacity = element.getInlineOpacity();
-  return new Effect.Appear(element, Object.extend({
-    duration: 0.4,
-    from: 0,
-    transition: Effect.Transitions.flicker,
-    afterFinishInternal: function(effect) {
-      new Effect.Scale(effect.element, 1, { 
-        duration: 0.3, scaleFromCenter: true,
-        scaleX: false, scaleContent: false, restoreAfterFinish: true,
-        beforeSetup: function(effect) { 
-          effect.element.makePositioned().makeClipping();
-        },
-        afterFinishInternal: function(effect) {
-          effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
-        }
-      })
-    }
-  }, arguments[1] || { }));
-};
-
-Effect.DropOut = function(element) {
-  element = $(element);
-  var oldStyle = {
-    top: element.getStyle('top'),
-    left: element.getStyle('left'),
-    opacity: element.getInlineOpacity() };
-  return new Effect.Parallel(
-    [ new Effect.Move(element, {x: 0, y: 100, sync: true }), 
-      new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
-    Object.extend(
-      { duration: 0.5,
-        beforeSetup: function(effect) {
-          effect.effects[0].element.makePositioned(); 
-        },
-        afterFinishInternal: function(effect) {
-          effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
-        } 
-      }, arguments[1] || { }));
-};
-
-Effect.Shake = function(element) {
-  element = $(element);
-  var options = Object.extend({
-    distance: 20,
-    duration: 0.5
-  }, arguments[1] || {});
-  var distance = parseFloat(options.distance);
-  var split = parseFloat(options.duration) / 10.0;
-  var oldStyle = {
-    top: element.getStyle('top'),
-    left: element.getStyle('left') };
-    return new Effect.Move(element,
-      { x:  distance, y: 0, duration: split, afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
-        effect.element.undoPositioned().setStyle(oldStyle);
-  }}) }}) }}) }}) }}) }});
-};
-
-Effect.SlideDown = function(element) {
-  element = $(element).cleanWhitespace();
-  // SlideDown need to have the content of the element wrapped in a container element with fixed height!
-  var oldInnerBottom = element.down().getStyle('bottom');
-  var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, 100, Object.extend({ 
-    scaleContent: false, 
-    scaleX: false, 
-    scaleFrom: window.opera ? 0 : 1,
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-    afterSetup: function(effect) {
-      effect.element.makePositioned();
-      effect.element.down().makePositioned();
-      if (window.opera) effect.element.setStyle({top: ''});
-      effect.element.makeClipping().setStyle({height: '0px'}).show(); 
-    },
-    afterUpdateInternal: function(effect) {
-      effect.element.down().setStyle({bottom:
-        (effect.dims[0] - effect.element.clientHeight) + 'px' }); 
-    },
-    afterFinishInternal: function(effect) {
-      effect.element.undoClipping().undoPositioned();
-      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
-    }, arguments[1] || { })
-  );
-};
-
-Effect.SlideUp = function(element) {
-  element = $(element).cleanWhitespace();
-  var oldInnerBottom = element.down().getStyle('bottom');
-  var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, window.opera ? 0 : 1,
-   Object.extend({ scaleContent: false, 
-    scaleX: false, 
-    scaleMode: 'box',
-    scaleFrom: 100,
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-    afterSetup: function(effect) {
-      effect.element.makePositioned();
-      effect.element.down().makePositioned();
-      if (window.opera) effect.element.setStyle({top: ''});
-      effect.element.makeClipping().show();
-    },  
-    afterUpdateInternal: function(effect) {
-      effect.element.down().setStyle({bottom:
-        (effect.dims[0] - effect.element.clientHeight) + 'px' });
-    },
-    afterFinishInternal: function(effect) {
-      effect.element.hide().undoClipping().undoPositioned();
-      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom});
-    }
-   }, arguments[1] || { })
-  );
-};
-
-// Bug in opera makes the TD containing this element expand for a instance after finish 
-Effect.Squish = function(element) {
-  return new Effect.Scale(element, window.opera ? 1 : 0, { 
-    restoreAfterFinish: true,
-    beforeSetup: function(effect) {
-      effect.element.makeClipping(); 
-    },  
-    afterFinishInternal: function(effect) {
-      effect.element.hide().undoClipping(); 
-    }
-  });
-};
-
-Effect.Grow = function(element) {
-  element = $(element);
-  var options = Object.extend({
-    direction: 'center',
-    moveTransition: Effect.Transitions.sinoidal,
-    scaleTransition: Effect.Transitions.sinoidal,
-    opacityTransition: Effect.Transitions.full
-  }, arguments[1] || { });
-  var oldStyle = {
-    top: element.style.top,
-    left: element.style.left,
-    height: element.style.height,
-    width: element.style.width,
-    opacity: element.getInlineOpacity() };
-
-  var dims = element.getDimensions();    
-  var initialMoveX, initialMoveY;
-  var moveX, moveY;
-  
-  switch (options.direction) {
-    case 'top-left':
-      initialMoveX = initialMoveY = moveX = moveY = 0; 
-      break;
-    case 'top-right':
-      initialMoveX = dims.width;
-      initialMoveY = moveY = 0;
-      moveX = -dims.width;
-      break;
-    case 'bottom-left':
-      initialMoveX = moveX = 0;
-      initialMoveY = dims.height;
-      moveY = -dims.height;
-      break;
-    case 'bottom-right':
-      initialMoveX = dims.width;
-      initialMoveY = dims.height;
-      moveX = -dims.width;
-      moveY = -dims.height;
-      break;
-    case 'center':
-      initialMoveX = dims.width / 2;
-      initialMoveY = dims.height / 2;
-      moveX = -dims.width / 2;
-      moveY = -dims.height / 2;
-      break;
-  }
-  
-  return new Effect.Move(element, {
-    x: initialMoveX,
-    y: initialMoveY,
-    duration: 0.01, 
-    beforeSetup: function(effect) {
-      effect.element.hide().makeClipping().makePositioned();
-    },
-    afterFinishInternal: function(effect) {
-      new Effect.Parallel(
-        [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
-          new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
-          new Effect.Scale(effect.element, 100, {
-            scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, 
-            sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
-        ], Object.extend({
-             beforeSetup: function(effect) {
-               effect.effects[0].element.setStyle({height: '0px'}).show(); 
-             },
-             afterFinishInternal: function(effect) {
-               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); 
-             }
-           }, options)
-      )
-    }
-  });
-};
-
-Effect.Shrink = function(element) {
-  element = $(element);
-  var options = Object.extend({
-    direction: 'center',
-    moveTransition: Effect.Transitions.sinoidal,
-    scaleTransition: Effect.Transitions.sinoidal,
-    opacityTransition: Effect.Transitions.none
-  }, arguments[1] || { });
-  var oldStyle = {
-    top: element.style.top,
-    left: element.style.left,
-    height: element.style.height,
-    width: element.style.width,
-    opacity: element.getInlineOpacity() };
-
-  var dims = element.getDimensions();
-  var moveX, moveY;
-  
-  switch (options.direction) {
-    case 'top-left':
-      moveX = moveY = 0;
-      break;
-    case 'top-right':
-      moveX = dims.width;
-      moveY = 0;
-      break;
-    case 'bottom-left':
-      moveX = 0;
-      moveY = dims.height;
-      break;
-    case 'bottom-right':
-      moveX = dims.width;
-      moveY = dims.height;
-      break;
-    case 'center':  
-      moveX = dims.width / 2;
-      moveY = dims.height / 2;
-      break;
-  }
-  
-  return new Effect.Parallel(
-    [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
-      new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
-      new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
-    ], Object.extend({            
-         beforeStartInternal: function(effect) {
-           effect.effects[0].element.makePositioned().makeClipping(); 
-         },
-         afterFinishInternal: function(effect) {
-           effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
-       }, options)
-  );
-};
-
-Effect.Pulsate = function(element) {
-  element = $(element);
-  var options    = arguments[1] || { };
-  var oldOpacity = element.getInlineOpacity();
-  var transition = options.transition || Effect.Transitions.sinoidal;
-  var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) };
-  reverser.bind(transition);
-  return new Effect.Opacity(element, 
-    Object.extend(Object.extend({  duration: 2.0, from: 0,
-      afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
-    }, options), {transition: reverser}));
-};
-
-Effect.Fold = function(element) {
-  element = $(element);
-  var oldStyle = {
-    top: element.style.top,
-    left: element.style.left,
-    width: element.style.width,
-    height: element.style.height };
-  element.makeClipping();
-  return new Effect.Scale(element, 5, Object.extend({   
-    scaleContent: false,
-    scaleX: false,
-    afterFinishInternal: function(effect) {
-    new Effect.Scale(element, 1, { 
-      scaleContent: false, 
-      scaleY: false,
-      afterFinishInternal: function(effect) {
-        effect.element.hide().undoClipping().setStyle(oldStyle);
-      } });
-  }}, arguments[1] || { }));
-};
-
-Effect.Morph = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      style: { }
-    }, arguments[1] || { });
-    
-    if (!Object.isString(options.style)) this.style = $H(options.style);
-    else {
-      if (options.style.include(':'))
-        this.style = options.style.parseStyle();
-      else {
-        this.element.addClassName(options.style);
-        this.style = $H(this.element.getStyles());
-        this.element.removeClassName(options.style);
-        var css = this.element.getStyles();
-        this.style = this.style.reject(function(style) {
-          return style.value == css[style.key];
-        });
-        options.afterFinishInternal = function(effect) {
-          effect.element.addClassName(effect.options.style);
-          effect.transforms.each(function(transform) {
-            effect.element.style[transform.style] = '';
-          });
-        }
-      }
-    }
-    this.start(options);
-  },
-  
-  setup: function(){
-    function parseColor(color){
-      if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
-      color = color.parseColor();
-      return $R(0,2).map(function(i){
-        return parseInt( color.slice(i*2+1,i*2+3), 16 ) 
-      });
-    }
-    this.transforms = this.style.map(function(pair){
-      var property = pair[0], value = pair[1], unit = null;
-
-      if (value.parseColor('#zzzzzz') != '#zzzzzz') {
-        value = value.parseColor();
-        unit  = 'color';
-      } else if (property == 'opacity') {
-        value = parseFloat(value);
-        if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
-          this.element.setStyle({zoom: 1});
-      } else if (Element.CSS_LENGTH.test(value)) {
-          var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
-          value = parseFloat(components[1]);
-          unit = (components.length == 3) ? components[2] : null;
-      }
-
-      var originalValue = this.element.getStyle(property);
-      return { 
-        style: property.camelize(), 
-        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), 
-        targetValue: unit=='color' ? parseColor(value) : value,
-        unit: unit
-      };
-    }.bind(this)).reject(function(transform){
-      return (
-        (transform.originalValue == transform.targetValue) ||
-        (
-          transform.unit != 'color' &&
-          (isNaN(transform.originalValue) || isNaN(transform.targetValue))
-        )
-      )
-    });
-  },
-  update: function(position) {
-    var style = { }, transform, i = this.transforms.length;
-    while(i--)
-      style[(transform = this.transforms[i]).style] = 
-        transform.unit=='color' ? '#'+
-          (Math.round(transform.originalValue[0]+
-            (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
-          (Math.round(transform.originalValue[1]+
-            (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
-          (Math.round(transform.originalValue[2]+
-            (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
-        (transform.originalValue +
-          (transform.targetValue - transform.originalValue) * position).toFixed(3) + 
-            (transform.unit === null ? '' : transform.unit);
-    this.element.setStyle(style, true);
-  }
-});
-
-Effect.Transform = Class.create({
-  initialize: function(tracks){
-    this.tracks  = [];
-    this.options = arguments[1] || { };
-    this.addTracks(tracks);
-  },
-  addTracks: function(tracks){
-    tracks.each(function(track){
-      track = $H(track);
-      var data = track.values().first();
-      this.tracks.push($H({
-        ids:     track.keys().first(),
-        effect:  Effect.Morph,
-        options: { style: data }
-      }));
-    }.bind(this));
-    return this;
-  },
-  play: function(){
-    return new Effect.Parallel(
-      this.tracks.map(function(track){
-        var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options');
-        var elements = [$(ids) || $$(ids)].flatten();
-        return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) });
-      }).flatten(),
-      this.options
-    );
-  }
-});
-
-Element.CSS_PROPERTIES = $w(
-  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + 
-  'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
-  'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
-  'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
-  'fontSize fontWeight height left letterSpacing lineHeight ' +
-  'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
-  'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
-  'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
-  'right textIndent top width wordSpacing zIndex');
-  
-Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
-
-String.__parseStyleElement = document.createElement('div');
-String.prototype.parseStyle = function(){
-  var style, styleRules = $H();
-  if (Prototype.Browser.WebKit)
-    style = new Element('div',{style:this}).style;
-  else {
-    String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
-    style = String.__parseStyleElement.childNodes[0].style;
-  }
-  
-  Element.CSS_PROPERTIES.each(function(property){
-    if (style[property]) styleRules.set(property, style[property]); 
-  });
-  
-  if (Prototype.Browser.IE && this.include('opacity'))
-    styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
-
-  return styleRules;
-};
-
-if (document.defaultView && document.defaultView.getComputedStyle) {
-  Element.getStyles = function(element) {
-    var css = document.defaultView.getComputedStyle($(element), null);
-    return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
-      styles[property] = css[property];
-      return styles;
-    });
-  };
-} else {
-  Element.getStyles = function(element) {
-    element = $(element);
-    var css = element.currentStyle, styles;
-    styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
-      results[property] = css[property];
-      return results;
-    });
-    if (!styles.opacity) styles.opacity = element.getOpacity();
-    return styles;
-  };
-};
-
-Effect.Methods = {
-  morph: function(element, style) {
-    element = $(element);
-    new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { }));
-    return element;
-  },
-  visualEffect: function(element, effect, options) {
-    element = $(element)
-    var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
-    new Effect[klass](element, options);
-    return element;
-  },
-  highlight: function(element, options) {
-    element = $(element);
-    new Effect.Highlight(element, options);
-    return element;
-  }
-};
-
-$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
-  'pulsate shake puff squish switchOff dropOut').each(
-  function(effect) { 
-    Effect.Methods[effect] = function(element, options){
-      element = $(element);
-      Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
-      return element;
-    }
-  }
-);
-
-$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( 
-  function(f) { Effect.Methods[f] = Element[f]; }
-);
-
-Element.addMethods(Effect.Methods);
diff --git a/ajaxui/scriptaculous/scriptaculous.js b/ajaxui/scriptaculous/scriptaculous.js
deleted file mode 100644
index 6cfe36e8..00000000
--- a/ajaxui/scriptaculous/scriptaculous.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// script.aculo.us scriptaculous.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
-
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-var Scriptaculous = {
-  Version: '1.8.1',
-  require: function(libraryName) {
-    // inserting via DOM fails in Safari 2.0, so brute force approach
-    document.write('<script type="text/javascript" src="'+libraryName+'"><\/script>');
-  },
-  REQUIRED_PROTOTYPE: '1.6.0',
-  load: function() {
-    function convertVersionString(versionString){
-      var r = versionString.split('.');
-      return parseInt(r[0])*100000 + parseInt(r[1])*1000 + parseInt(r[2]);
-    }
- 
-    if((typeof Prototype=='undefined') || 
-       (typeof Element == 'undefined') || 
-       (typeof Element.Methods=='undefined') ||
-       (convertVersionString(Prototype.Version) < 
-        convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
-       throw("script.aculo.us requires the Prototype JavaScript framework >= " +
-        Scriptaculous.REQUIRED_PROTOTYPE);
-    
-    $A(document.getElementsByTagName("script")).findAll( function(s) {
-      return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))
-    }).each( function(s) {
-      var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,'');
-      var includes = s.src.match(/\?.*load=([a-z,]*)/);
-      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
-       function(include) { Scriptaculous.require(path+include+'.js') });
-    });
-  }
-}
-
-Scriptaculous.load();
\ No newline at end of file
diff --git a/ajaxui/scriptaculous/slider.js b/ajaxui/scriptaculous/slider.js
deleted file mode 100644
index cc46fe37..00000000
--- a/ajaxui/scriptaculous/slider.js
+++ /dev/null
@@ -1,275 +0,0 @@
-// script.aculo.us slider.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
-
-// Copyright (c) 2005-2007 Marty Haught, Thomas Fuchs 
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-if (!Control) var Control = { };
-
-// options:
-//  axis: 'vertical', or 'horizontal' (default)
-//
-// callbacks:
-//  onChange(value)
-//  onSlide(value)
-Control.Slider = Class.create({
-  initialize: function(handle, track, options) {
-    var slider = this;
-    
-    if (Object.isArray(handle)) {
-      this.handles = handle.collect( function(e) { return $(e) });
-    } else {
-      this.handles = [$(handle)];
-    }
-    
-    this.track   = $(track);
-    this.options = options || { };
-
-    this.axis      = this.options.axis || 'horizontal';
-    this.increment = this.options.increment || 1;
-    this.step      = parseInt(this.options.step || '1');
-    this.range     = this.options.range || $R(0,1);
-    
-    this.value     = 0; // assure backwards compat
-    this.values    = this.handles.map( function() { return 0 });
-    this.spans     = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
-    this.options.startSpan = $(this.options.startSpan || null);
-    this.options.endSpan   = $(this.options.endSpan || null);
-
-    this.restricted = this.options.restricted || false;
-
-    this.maximum   = this.options.maximum || this.range.end;
-    this.minimum   = this.options.minimum || this.range.start;
-
-    // Will be used to align the handle onto the track, if necessary
-    this.alignX = parseInt(this.options.alignX || '0');
-    this.alignY = parseInt(this.options.alignY || '0');
-    
-    this.trackLength = this.maximumOffset() - this.minimumOffset();
-
-    this.handleLength = this.isVertical() ? 
-      (this.handles[0].offsetHeight != 0 ? 
-        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) : 
-      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth : 
-        this.handles[0].style.width.replace(/px$/,""));
-
-    this.active   = false;
-    this.dragging = false;
-    this.disabled = false;
-
-    if (this.options.disabled) this.setDisabled();
-
-    // Allowed values array
-    this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false;
-    if (this.allowedValues) {
-      this.minimum = this.allowedValues.min();
-      this.maximum = this.allowedValues.max();
-    }
-
-    this.eventMouseDown = this.startDrag.bindAsEventListener(this);
-    this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
-    this.eventMouseMove = this.update.bindAsEventListener(this);
-
-    // Initialize handles in reverse (make sure first handle is active)
-    this.handles.each( function(h,i) {
-      i = slider.handles.length-1-i;
-      slider.setValue(parseFloat(
-        (Object.isArray(slider.options.sliderValue) ? 
-          slider.options.sliderValue[i] : slider.options.sliderValue) || 
-         slider.range.start), i);
-      h.makePositioned().observe("mousedown", slider.eventMouseDown);
-    });
-    
-    this.track.observe("mousedown", this.eventMouseDown);
-    document.observe("mouseup", this.eventMouseUp);
-    document.observe("mousemove", this.eventMouseMove);
-    
-    this.initialized = true;
-  },
-  dispose: function() {
-    var slider = this;    
-    Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
-    Event.stopObserving(document, "mouseup", this.eventMouseUp);
-    Event.stopObserving(document, "mousemove", this.eventMouseMove);
-    this.handles.each( function(h) {
-      Event.stopObserving(h, "mousedown", slider.eventMouseDown);
-    });
-  },
-  setDisabled: function(){
-    this.disabled = true;
-  },
-  setEnabled: function(){
-    this.disabled = false;
-  },  
-  getNearestValue: function(value){
-    if (this.allowedValues){
-      if (value >= this.allowedValues.max()) return(this.allowedValues.max());
-      if (value <= this.allowedValues.min()) return(this.allowedValues.min());
-      
-      var offset = Math.abs(this.allowedValues[0] - value);
-      var newValue = this.allowedValues[0];
-      this.allowedValues.each( function(v) {
-        var currentOffset = Math.abs(v - value);
-        if (currentOffset <= offset){
-          newValue = v;
-          offset = currentOffset;
-        } 
-      });
-      return newValue;
-    }
-    if (value > this.range.end) return this.range.end;
-    if (value < this.range.start) return this.range.start;
-    return value;
-  },
-  setValue: function(sliderValue, handleIdx){
-    if (!this.active) {
-      this.activeHandleIdx = handleIdx || 0;
-      this.activeHandle    = this.handles[this.activeHandleIdx];
-      this.updateStyles();
-    }
-    handleIdx = handleIdx || this.activeHandleIdx || 0;
-    if (this.initialized && this.restricted) {
-      if ((handleIdx>0) && (sliderValue<this.values[handleIdx-1]))
-        sliderValue = this.values[handleIdx-1];
-      if ((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1]))
-        sliderValue = this.values[handleIdx+1];
-    }
-    sliderValue = this.getNearestValue(sliderValue);
-    this.values[handleIdx] = sliderValue;
-    this.value = this.values[0]; // assure backwards compat
-    
-    this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] = 
-      this.translateToPx(sliderValue);
-    
-    this.drawSpans();
-    if (!this.dragging || !this.event) this.updateFinished();
-  },
-  setValueBy: function(delta, handleIdx) {
-    this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta, 
-      handleIdx || this.activeHandleIdx || 0);
-  },
-  translateToPx: function(value) {
-    return Math.round(
-      ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) * 
-      (value - this.range.start)) + "px";
-  },
-  translateToValue: function(offset) {
-    return ((offset/(this.trackLength-this.handleLength) * 
-      (this.range.end-this.range.start)) + this.range.start);
-  },
-  getRange: function(range) {
-    var v = this.values.sortBy(Prototype.K); 
-    range = range || 0;
-    return $R(v[range],v[range+1]);
-  },
-  minimumOffset: function(){
-    return(this.isVertical() ? this.alignY : this.alignX);
-  },
-  maximumOffset: function(){
-    return(this.isVertical() ? 
-      (this.track.offsetHeight != 0 ? this.track.offsetHeight :
-        this.track.style.height.replace(/px$/,"")) - this.alignY : 
-      (this.track.offsetWidth != 0 ? this.track.offsetWidth : 
-        this.track.style.width.replace(/px$/,"")) - this.alignX);
-  },  
-  isVertical:  function(){
-    return (this.axis == 'vertical');
-  },
-  drawSpans: function() {
-    var slider = this;
-    if (this.spans)
-      $R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) });
-    if (this.options.startSpan)
-      this.setSpan(this.options.startSpan,
-        $R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
-    if (this.options.endSpan)
-      this.setSpan(this.options.endSpan, 
-        $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
-  },
-  setSpan: function(span, range) {
-    if (this.isVertical()) {
-      span.style.top = this.translateToPx(range.start);
-      span.style.height = this.translateToPx(range.end - range.start + this.range.start);
-    } else {
-      span.style.left = this.translateToPx(range.start);
-      span.style.width = this.translateToPx(range.end - range.start + this.range.start);
-    }
-  },
-  updateStyles: function() {
-    this.handles.each( function(h){ Element.removeClassName(h, 'selected') });
-    Element.addClassName(this.activeHandle, 'selected');
-  },
-  startDrag: function(event) {
-    if (Event.isLeftClick(event)) {
-      if (!this.disabled){
-        this.active = true;
-        
-        var handle = Event.element(event);
-        var pointer  = [Event.pointerX(event), Event.pointerY(event)];
-        var track = handle;
-        if (track==this.track) {
-          var offsets  = Position.cumulativeOffset(this.track); 
-          this.event = event;
-          this.setValue(this.translateToValue( 
-           (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
-          ));
-          var offsets  = Position.cumulativeOffset(this.activeHandle);
-          this.offsetX = (pointer[0] - offsets[0]);
-          this.offsetY = (pointer[1] - offsets[1]);
-        } else {
-          // find the handle (prevents issues with Safari)
-          while((this.handles.indexOf(handle) == -1) && handle.parentNode) 
-            handle = handle.parentNode;
-            
-          if (this.handles.indexOf(handle)!=-1) {
-            this.activeHandle    = handle;
-            this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
-            this.updateStyles();
-            
-            var offsets  = Position.cumulativeOffset(this.activeHandle);
-            this.offsetX = (pointer[0] - offsets[0]);
-            this.offsetY = (pointer[1] - offsets[1]);
-          }
-        }
-      }
-      Event.stop(event);
-    }
-  },
-  update: function(event) {
-   if (this.active) {
-      if (!this.dragging) this.dragging = true;
-      this.draw(event);
-      if (Prototype.Browser.WebKit) window.scrollBy(0,0);
-      Event.stop(event);
-   }
-  },
-  draw: function(event) {
-    var pointer = [Event.pointerX(event), Event.pointerY(event)];
-    var offsets = Position.cumulativeOffset(this.track);
-    pointer[0] -= this.offsetX + offsets[0];
-    pointer[1] -= this.offsetY + offsets[1];
-    this.event = event;
-    this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
-    if (this.initialized && this.options.onSlide)
-      this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
-  },
-  endDrag: function(event) {
-    if (this.active && this.dragging) {
-      this.finishDrag(event, true);
-      Event.stop(event);
-    }
-    this.active = false;
-    this.dragging = false;
-  },  
-  finishDrag: function(event, success) {
-    this.active = false;
-    this.dragging = false;
-    this.updateFinished();
-  },
-  updateFinished: function() {
-    if (this.initialized && this.options.onChange) 
-      this.options.onChange(this.values.length>1 ? this.values : this.value, this);
-    this.event = null;
-  }
-});
diff --git a/ajaxui/tvheadend.js b/ajaxui/tvheadend.js
deleted file mode 100644
index 53be59cd..00000000
--- a/ajaxui/tvheadend.js
+++ /dev/null
@@ -1,130 +0,0 @@
-function switchtab(name, index)
-{
-    a = new Ajax.Updater(name + 'deck', '/ajax/' + name + 'tab/'  + index, 
-			 { method: 'get', evalScripts: true});
-
-    a = new Ajax.Updater(name + 'menu', '/ajax/' + name + 'menu/' + index,
-			 { method: 'get', evalScripts: true});
-};
-
-function updatelistonserver(listid, url, resultid)
-{
-    //    document.getElementById(resultid).innerHTML = "Updating...";
-
-    a = new Ajax.Updater(resultid, url, 
-			 { evalScripts: true,
-			   parameters:Sortable.serialize(listid)});
-};
-
-function addlistentry(listid, url, name)
-{
-    if(name == null || name == "") {
-	alert("Emtpy name is not allowed");
-    } else {
-	a = new Ajax.Updater(listid, url,
-			     { evalScripts: true,
-			       parameters: { name: name },
-			       insertion: Insertion.Bottom
-			     });
-    }
-}
-
-
-function dellistentry(url, id, name)
-{
-    if(confirm("Are you sure you want to delete '" + name + "'") == true) {
-	a = new Ajax.Request(url, { parameters: { id: id }});
-    }
-}
-
-function addlistentry_by_widget(listid, url, widget)
-{
-    name = $F(widget);
-    $(widget).clear();
-    addlistentry(listid, url, name);
-}
-
-
-function showhide(name)
-{
-    ctrlname = 'toggle_' + name;
-    if(document.getElementById(ctrlname).innerHTML == 'More') {
-	document.getElementById(ctrlname).innerHTML = 'Less';
-	new Effect.Appear(name, {duration: 0.5});
-    } else {
-	document.getElementById(ctrlname).innerHTML = 'More';
-	new Effect.Fade(name, {duration: 0.5});
-    }
-}
-
-function tentative_chname(id, url, name)
-{
-	var newname = prompt("Enter name of channel", name);
-	if(newname != null && newname != name) {
-		a = new Ajax.Updater(id, url,
-				 { evalScripts: true,
-				  parameters: { newname: newname }});
-	}
-}
-
-function mailboxquery(boxid)
-{
-	new Ajax.Request('/ajax/mailbox/' + boxid,
-	{
-		onFailure: function(req) { alert(req.responseText); },
-		onException: function(t,e) { alert(e); }
-	})
-}
-
-function dvb_adapter_rename(id, oldname)
-{
-	newname = prompt("Enter new name for adapter", oldname);
-	if(newname != null && newname != oldname) {
-		a = new Ajax.Request('/ajax/dvbadapterrename/' + id,
-			{ parameters: { 'newname': newname}});
-	}
-}
-
-function dvb_adapter_delete(id, name)
-{
-	if(confirm("Are you sure you want to delete '" + name + "'") == true) {
-		a = new Ajax.Request('/ajax/dvbadapterdelete/' + id);
-	}
-}
-
-function makedivinput(id, url)
-{
-	$(id).innerHTML='<div style="width:100%; overflow:auto">' + 
-	'<div style="width:75%; float:left">' + 
-	'<input id="val' + id + '" type="password">' +
-	'</div>' + 
-	'<div style="width:25%; float:left">' + 
-	'<input type="button" value="Set" ' + 
-	'onClick="new Ajax.Request(\'' + url + '\', ' +
-	'{parameters: {value: $F(\'val' + id + '\')}})">' +
-	'</div></div>';
-}
-
-function channel_rename(tag, oldname)
-{
-	newname = prompt("Enter new name", oldname);
-	if(newname != null && newname != oldname) {
-		a = new Ajax.Request('/ajax/chrename/' + tag,
-			{ parameters: { 'newname': newname}});
-	}
-}
-
-function channel_delete(tag, name)
-{
-	if(confirm("Are you sure you want to delete '" + name + "'") == true){
-		a = new Ajax.Request('/ajax/chdelete/' + tag);
-	}
-}
-
-function channel_merge(srctag, dsttag)
-{
-	if(confirm("Are you sure") == true){
-		a = new Ajax.Request('/ajax/chmerge/' + srctag,
-					{parameters: {dst: dsttag}});
-	}
-}
diff --git a/tvhead.h b/tvhead.h
index dccd0216..7f0350b6 100644
--- a/tvhead.h
+++ b/tvhead.h
@@ -410,8 +410,6 @@ typedef struct th_transport {
   
   LIST_ENTRY(th_transport) tht_mux_link;
 
-  RB_ENTRY(th_transport) tht_tmp_link;
-
   LIST_ENTRY(th_transport) tht_active_link;
 
   LIST_HEAD(, th_subscription) tht_subscriptions;