diff -uNr tivoweb-tcl/Changelog tivoweb-j/Changelog
--- tivoweb-tcl/Changelog	Fri Oct 26 05:56:45 2001
+++ tivoweb-j/Changelog	Sat Nov  3 19:42:22 2001
@@ -1,3 +1,11 @@
+1.9.2-J:
+    Added even more information to the info page. Updated Now Showing to
+    display showing parts. Bits and pieces of UI cleanup based on my 
+    own preferences. Made themes work with my mixture of fixed width
+    and dynamically sized tables. Uses theme.cs to identify theme names. 
+    theme2.css is the original theme, theme.css has table-layout: fixed;
+    added to table, td, th, caption setting.
+
 1.9.2:
    Mail module by Jeff Keegan
    Reload functionality (beta)
diff -uNr tivoweb-tcl/daynight.cs tivoweb-j/daynight.cs
--- tivoweb-tcl/daynight.cs	Wed Dec 31 19:00:00 1969
+++ tivoweb-j/daynight.cs	Sat Nov  3 04:45:14 2001
@@ -0,0 +1 @@
+
diff -uNr tivoweb-tcl/daynight.css tivoweb-j/daynight.css
--- tivoweb-tcl/daynight.css	Thu Jun 28 15:47:15 2001
+++ tivoweb-j/daynight.css	Sat Nov  3 04:00:56 2001
@@ -35,6 +35,7 @@
 table, td, th, caption {
   border: 0px;
   border-spacing: 0px;
+  table-layout: fixed;
   empty-cells: show;
 }
 table {
diff -uNr tivoweb-tcl/daynight2.css tivoweb-j/daynight2.css
--- tivoweb-tcl/daynight2.css	Wed Dec 31 19:00:00 1969
+++ tivoweb-j/daynight2.css	Sat Nov  3 04:00:46 2001
@@ -0,0 +1,102 @@
+/*
+ * Day + Night Theme
+ * (C) 2001
+ * Mike Baker <mbm@linux.com>
+ *
+ * $Id: daynight.css,v 1.6 2001/06/28 19:47:15 mbm Exp $
+ */
+
+#theme:after {
+  content: "DAY + NIGHT THEME";
+  color: #000000;
+  font-size: .5em;
+  font-weight: 100;
+  letter-spacing: 1.2em;
+}
+body {
+  background: #40408c;
+  font-family: arial, helvetica, sans-serif;
+  text-align: center;
+  margin: 0px;
+}
+head + body {
+  background: #40408c url(/TiVoLogo.1.png) 97% 99% fixed no-repeat;
+}
+:link, :visited {
+  color: #FFBB00;
+  text-decoration: none;
+}
+a:hover {
+  text-decoration: underline;
+}
+table :link, table :visited {
+  color: #1c2c6d;
+}
+table, td, th, caption {
+  border: 0px;
+  border-spacing: 0px;
+  empty-cells: show;
+}
+table {
+  border: 2px solid black;
+  margin: auto;
+  margin-bottom: 1em;
+}
+body > table:first-child {
+  border: 0px;
+}
+td {
+  padding: 0px 5px 0px 5px;
+  border-left: 1px solid #8888FF;
+  border-bottom: 1px solid #8888FF;
+}
+th, caption {
+  padding: 0px 5px 0px 5px;
+  background: #7777FF;
+  color: #000000;
+  font-weight: bold;
+}
+th a:link, th a:visited {
+  text-decoration: none;
+}
+th a:before, th a:after {
+  content: "::";
+  color: #4444FF;
+  font-weight: bold;
+  font-style: italic;
+}
+font {
+  font-weight: normal;
+}
+h1, h2, h3 {
+  color: #FFBB00;
+  font-size: 2em;
+}
+pre {
+  text-align: left;
+  margin: 1em;
+}
+body > table:first-child th, body > table:first-child td {
+  background: #7777FF;
+  border-left: 2px solid black;
+  border-bottom: 2px solid black;
+}
+body > table:first-child td, tr:first-child th, tr:first-child caption {
+  padding: 0px 5px 0px 5px;
+  font-weight: bold;
+  background: #FFBB00;
+  border-bottom: 2px solid black;
+} 
+body > table:first-child th:first-child, td:first-child {
+  border-left: 0px;
+  white-space: nowrap;
+}
+body > table:first-child tr:first-child th:first-child {
+  border-bottom: 0px;
+}
+body > table:first-child tr:first-child + tr + tr th, td {
+  background: #9999FF;
+}
+body > table:first-child {
+  margin-bottom: 1em;
+}
diff -uNr tivoweb-tcl/html.itcl tivoweb-j/html.itcl
--- tivoweb-tcl/html.itcl	Wed Oct 17 17:22:04 2001
+++ tivoweb-j/html.itcl	Sat Nov  3 04:22:19 2001
@@ -51,6 +51,17 @@
 <table width=\"100%\" border=0 cellpadding=0 cellspacing=1><tr><th width=\"50%\">$TT_HTTPD::NAME - v$TT_HTTPD::VERSION&nbsp;</th><th>&nbsp;</th><th>&nbsp;</th><th>&nbsp;</th><td>&nbsp;</td><td>&nbsp;</td><th>&nbsp;</th><th>&nbsp;</th><td>&nbsp;</td><th>&nbsp;</th><td>&nbsp;</td><td>&nbsp;</td><th>&nbsp;</th></tr><tr><th id=\"theme\">&nbsp;</th><td>&nbsp;</td><th>&nbsp;</th><td>&nbsp;</td><th>&nbsp;</th><td>&nbsp;</td><th>&nbsp;</th><td>&nbsp;</td><th>&nbsp;</th><td>&nbsp;</td><td>&nbsp;</td><th>&nbsp;</th><td>&nbsp;</td></tr><tr><th colspan=13><font size=\"-1\">$TT_HTTPD::OPTIONS_MENU</font></th></tr></table>"
 }
 
+proc html_start_2 {title} {
+    set ret "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n"
+    append ret "<HTML><HEAD>\n"
+    if {$title != ""} {
+        append ret "<TITLE>$title</TITLE>\n"
+    }
+    append ret "<link rel=\"stylesheet\" href=\"/$TT_HTTPD::STYLE$TT_HTTPD::STYLE2.css\">\n"
+    append ret "</HEAD><BODY>
+<table width=\"100%\" border=0 cellpadding=0 cellspacing=1><tr><th width=\"50%\">$TT_HTTPD::NAME - v$TT_HTTPD::VERSION&nbsp;</th><th>&nbsp;</th><th>&nbsp;</th><th>&nbsp;</th><td>&nbsp;</td><td>&nbsp;</td><th>&nbsp;</th><th>&nbsp;</th><td>&nbsp;</td><th>&nbsp;</th><td>&nbsp;</td><td>&nbsp;</td><th>&nbsp;</th></tr><tr><th id=\"theme\">&nbsp;</th><td>&nbsp;</td><th>&nbsp;</th><td>&nbsp;</td><th>&nbsp;</th><td>&nbsp;</td><th>&nbsp;</th><td>&nbsp;</td><th>&nbsp;</th><td>&nbsp;</td><td>&nbsp;</td><th>&nbsp;</th><td>&nbsp;</td></tr><tr><th colspan=13><font size=\"-1\">$TT_HTTPD::OPTIONS_MENU</font></th></tr></table>"
+}
+
 proc html_end {} {
     return "</BODY></HTML>"
 }
@@ -100,7 +111,7 @@
     if { $str == "" } {
        set str "&nbsp;"
     }
-    return "<TR $attrs>$str</TR>"
+    return "<TR ALIGN=CENTER $attrs>$str</TR>"
 }
 
 proc th {args} {
diff -uNr tivoweb-tcl/httpd-tt.itcl tivoweb-j/httpd-tt.itcl
--- tivoweb-tcl/httpd-tt.itcl	Wed Sep 19 19:54:43 2001
+++ tivoweb-j/httpd-tt.itcl	Sat Nov  3 04:05:34 2001
@@ -2,7 +2,7 @@
 
 namespace eval TT_HTTPD {
 	variable	NAME	"TiVo Web Project - TCL"
-	variable	VERSION	"1.9.2"
+	variable	VERSION	"1.9.2-J"
 	variable	AUTHOR	"SFR,TivoTechie,Lightn,MbM"
 	variable	URL		"http://tivo.lightn.org/"
 	variable	NOTICE	"The program comes with ABSOLUTELY NO WARRANTY.
@@ -16,5 +16,6 @@
 
 	variable	MAIN_MENU ""
 	variable	STYLE "technophobe"
+  variable  STYLE2 "2"
 }
 
diff -uNr tivoweb-tcl/httpd-tt.tcl tivoweb-j/httpd-tt.tcl
--- tivoweb-tcl/httpd-tt.tcl	Sat Nov  3 19:44:58 2001
+++ tivoweb-j/httpd-tt.tcl	Sat Nov  3 03:42:51 2001
@@ -30,7 +30,7 @@
 
     set TT_HTTPD::OPTIONS_MENU "\n"
     append TT_HTTPD::OPTIONS_MENU [html_link "/" "Main Menu"]
-    append TT_HTTPD::OPTIONS_MENU "\n"
+    append TT_HTTPD::OPTIONS_MENU " |\n"
 
     set TT_HTTPD::MAIN_MENU "
 <TABLE border=0 cellpadding=0 cellspacing=1>
@@ -39,7 +39,7 @@
 
     foreach module $module_list {
         append TT_HTTPD::OPTIONS_MENU [html_link "/[lindex $module 0]" [lindex $module 1]]
-        append TT_HTTPD::OPTIONS_MENU "\n"
+        append TT_HTTPD::OPTIONS_MENU " |\n"
 
         append TT_HTTPD::MAIN_MENU [tr "ALIGN=LEFT" [td [html_link "/[lindex $module 0]" [lindex $module 1]]] [td [lindex $module 2]]]
         append TT_HTTPD::MAIN_MENU "\n"
@@ -94,7 +94,7 @@
 proc action_quit {chan dummy env} {
     global quit
 
-    puts $chan [html_start ""]
+    puts $chan [html_start_2 ""]
     puts $chan "Server has terminated."
     puts $chan [html_end]
     set quit ""
@@ -102,7 +102,7 @@
 
 
 proc action_ {chan dummy env} {
-    puts $chan [html_start ""]
+    puts $chan [html_start_2 ""]
     puts $chan "$TT_HTTPD::MAIN_MENU"
     puts $chan [html_end]
 }
@@ -260,6 +260,7 @@
 
 puts "Loading modules..."
 set modules [glob "$source_dir/modules/*.itcl"]
+set modules [lsort $modules]
 
 foreach module $modules {
    puts [file rootname [file tail $module]]
diff -uNr tivoweb-tcl/modules/info.itcl tivoweb-j/modules/info.itcl
--- tivoweb-tcl/modules/info.itcl	Wed Jul  4 03:10:20 2001
+++ tivoweb-j/modules/info.itcl	Tue Oct 30 11:17:02 2001
@@ -1,4 +1,6 @@
 proc action_info {chan path env} {
+    set day [expr [clock seconds]/86400]
+    set secs [expr [clock seconds]%86400]
     global db
         puts $chan [html_start "Info Page"]
 
@@ -16,6 +18,67 @@
         puts $chan "<TR><TD>Remote Address</TD><TD>$remoteaddress</TD></TR>"
         puts $chan [html_table_end] 
 
+        RetryTransaction {
+           set state [db $db open /State/MyWorld]
+           set channel [dbobj $state get LastChannel]
+           set chnum [dbobj $channel get Number]
+           set station [dbobj $channel get Station]
+           set stationid [dbobj $station fsid]
+           set chname [strim [dbobj $station get Name]]
+        }
+
+        ForeachMfsFile id name "tyDb" "/Schedule" "$stationid:$day:" {
+           if { [regexp {[0-9]*:[0-9]*:([0-9]*]):([0-9]*):[0-9]*:[0-9]*} $name start end] } {
+              if { $start > $secs } {
+                 set day [expr $day - 1]
+                 # not correct, need to redo ForeachMfsFile
+              }
+           } else {
+        #      puts "Parsing error"
+           }
+
+           RetryTransaction {
+              set stationday [db $db openid $id]
+              set showings [dbobj $stationday get Showing]
+              foreach showing $showings {
+                 set duration [dbobj $showing get Duration]
+                 set time [dbobj $showing get Time]
+                 if { $time <= $secs && ($time + $duration) >= $secs } {
+                    set program [dbobj $showing get Program]
+                    puts $chan [html_table_start "" "Current Activity" ""]
+                    puts $chan "<TR><PRE>"
+                    puts $chan "<TR><TD>Channel: $chnum $chname</TD></TR>"
+                    puts $chan "<TR><TD>Program: [strim [dbobj $program get Title]]</TD></TR>"
+                    puts $chan "<TR><TD>Episode: [strim [dbobj $program get EpisodeTitle]]</TD></TR>"
+                    puts $chan "<TR><TD>Description: [strim [dbobj $program get Description]]</TD></TR>"
+                 }
+              }
+           }
+        }
+
+        set selectiontypes "{Manual Recording} {Manual Recording} {Manual Recording} {Manual Recording} {Manual Recording} Suggestion Suggestion {Manual Recording} {Season Pass} {Season Pass} {Manual Recording} {Manual Recording} WishList {Manual Recording}"
+        set count 0
+        ForeachMfsFile id name "tyDb" "/Recording/InProgress" "" {
+           RetryTransaction {
+              set inprog [db $db openid $id]
+              set seltype [dbobj $inprog get SelectionType]
+              foreach selectiontype $seltype {
+                 if { $seltype != 0 } {
+                    set count 1 
+                    set seltypestr [lindex $selectiontypes [expr $seltype - 1]]
+                 }
+              }
+           }
+        }
+
+        if { $count == 0 } {
+           set seltypestr "Not Recording"
+        }   
+
+        puts $chan "<TR><TD>Recording Status: $seltypestr</TD></TR>"
+        puts $chan "</PRE></TR>"
+        puts $chan [html_table_end]
+
         puts $chan [html_table_start "" "Kernel Information" ""] 
         puts $chan "<TR><TD><PRE>"
         puts $chan "Kernel Version:\n"
@@ -25,6 +88,12 @@
         puts $chan "</PRE></TD></TR>"
         puts $chan [html_table_end] 
 
+        puts $chan [html_table_start "" "Memory Information" ""]
+        puts $chan "<TR><TD><PRE>"
+        puts $chan "Memory Statistics:\n"
+        puts $chan [exec cat /proc/meminfo]
+        puts $chan "</PRE></TD></TR>"
+        puts $chan [html_table_end]
 
         puts $chan [html_table_start "" "Filesystem/Disk Information" ""] 
         puts $chan "<TR><TD><PRE>"
diff -uNr tivoweb-tcl/modules/mail.itcl tivoweb-j/modules/mail.itcl
--- tivoweb-tcl/modules/mail.itcl	Sun Aug 26 01:13:07 2001
+++ tivoweb-j/modules/mail.itcl	Sat Nov  3 04:12:04 2001
@@ -15,7 +15,7 @@
     set path [string range $path 1 end]
   }
 
-  puts $chan [html_start "TiVo Mail"]
+  puts $chan [html_start_2 "TiVo Mail"]
   puts $chan [html_table_start "" "TiVo Mail" "COLSPAN=2"]
   puts $chan [tr "" [td [html_link "/newmail" "Create New Mail"]]]
   puts $chan [tr "" [td [html_link "/listmail" "View/Delete Existing Mail"]]]
@@ -31,7 +31,7 @@
   set showdeleted ""
   eval $env
 
-  puts $chan [html_start "List TiVo Mail"]
+  puts $chan [html_start_2 "List TiVo Mail"]
 
   #puts $chan [html_table_start "" "TiVo Mail" "COLSPAN=2"]
   #puts $chan [tr "" [td [html_link "/newmail" "Create New Mail"]]]
@@ -80,7 +80,7 @@
   set destvals "1 2"
   set destlabs "{Message Board} {Pre-TiVo Central}"
 
-  puts $chan [html_start "Create TiVo Mail"]
+  puts $chan [html_start_2 "Create TiVo Mail"]
 
   puts $chan [html_form_start "POST" "/sendmail"]
   puts $chan [html_table_start "" "Enter new email message" "COLSPAN=2"]
@@ -154,7 +154,7 @@
     set expdatestr [clock format $expsecs -format "%1m/%1d"]
   }
  
-  puts $chan [html_start "View TiVo Mail"]
+  puts $chan [html_start_2 "View TiVo Mail"]
   puts $chan [html_table_start "" "" ""]
   puts $chan [tr "" [td "WIDTH='1%'" "Subject:"] [td $subject]]
   puts $chan [tr "" [td "WIDTH='1%'" "From:"] [td $from]]
diff -uNr tivoweb-tcl/modules/remount.itcl tivoweb-j/modules/remount.itcl
--- tivoweb-tcl/modules/remount.itcl	Thu Jul 12 01:26:05 2001
+++ tivoweb-j/modules/remount.itcl	Sat Nov  3 02:23:20 2001
@@ -19,4 +19,4 @@
     puts $chan [html_end]
 }
 
-register_module "remount" "Remount Root" "Remount the TiVo Root Filesystem as Read-Write or Read-Only"
+register_module "remount" "Remount" "Remount the TiVo Root Filesystem as Read-Write or Read-Only"
diff -uNr tivoweb-tcl/modules/resources.itcl tivoweb-j/modules/resources.itcl
--- tivoweb-tcl/modules/resources.itcl	Wed Sep 19 20:53:29 2001
+++ tivoweb-j/modules/resources.itcl	Sat Nov  3 02:24:56 2001
@@ -214,7 +214,7 @@
       set resourceitem ""
    }
 
-   puts $chan [html_start "Resource Editor"]
+   puts $chan [html_start_2 "Resource Editor"]
    # puts $chan [h1 "Resource Editor"]
 
    if { $resourcegroup != "" } {
diff -uNr tivoweb-tcl/modules/theme.itcl tivoweb-j/modules/theme.itcl
--- tivoweb-tcl/modules/theme.itcl	Sun Jun 24 01:10:54 2001
+++ tivoweb-j/modules/theme.itcl	Sat Nov  3 04:44:55 2001
@@ -9,10 +9,10 @@
       set TT_HTTPD::STYLE $path
     }
   }
-  puts $chan [html_start "Theme Browser"]
+  puts $chan [html_start_2 "Theme Browser"]
   puts $chan [html_table_start "" "" ""]
-  puts $chan [tr "" [th "" "THEMES"]]
-  foreach filename [glob -nocomplain $source_dir/*css] {
+  puts $chan [tr "" [th "" "Select Theme"]]
+  foreach filename [glob -nocomplain $source_dir/*cs] {
     set filename [file rootname [file tail $filename]]
     puts $chan [tr "" [td [html_link $filename $filename]]]
   }
diff -uNr tivoweb-tcl/modules/ui.itcl tivoweb-j/modules/ui.itcl
--- tivoweb-tcl/modules/ui.itcl	Wed Oct 17 17:41:34 2001
+++ tivoweb-j/modules/ui.itcl	Sat Nov  3 03:12:20 2001
@@ -26,7 +26,7 @@
         set type [string range $type 1 end]
     }
 
-    puts $chan [html_start "Channel Guide"]
+    puts $chan [html_start_2 "Channel Guide"]
 
     if { $type == "" } {
        puts $chan [html_table_start "" "" "ALIGN=TOP"]
@@ -80,7 +80,7 @@
         set objectid [string range $objectid 1 end]
     }
 
-    puts $chan [html_start "Channel"]
+    puts $chan [html_start_2 "Channel"]
 
     set stationmatch [lsearch $channeltablestation $objectid]
     if { $stationmatch != -1 } {
@@ -202,7 +202,7 @@
     global channeltablenum
     global channeltablecallsign
 
-    puts $chan [html_start "Listings"]
+    puts $chan [html_start_2 "Listings"]
 
     if {[string index $path 0] == "/"} {
         set path [string range $path 1 end]
@@ -291,10 +291,18 @@
 }
 
 proc action_saveprogram {chan path env} {
-   puts $chan [html_start "Edit Program"]
+   puts $chan [html_start_2 "Edit Program"]
    eval $env
    updaterec $objectid $title $eptitle $description
-   puts $chan "<B>Program Updated Successfully</B>"
+   puts $chan [html_table_start "" "" ""]
+   puts $chan [tr "" [td "Title:"][td "$title"]]
+   if { $eptitle != "" } {
+         puts $chan [tr "" [td "Episode Title:"][td "$eptitle"]]
+   }
+   puts $chan [tr "" [td "Description"] [td "$description"]]
+   puts $chan [html_table_end]
+   puts $chan <BR><BR>
+   puts $chan "<B>Program Updated Successfully</B><BR><BR>[html_link /nowshowing "Now Showing"]"
    puts $chan [html_end]
 }
 
@@ -305,7 +313,7 @@
        set objectid [string range $objectid 1 end]
    }
 
-   puts $chan [html_start "Edit Program"]
+   puts $chan [html_start_2 "Edit Program"]
    RetryTransaction {
       set rec [db $db openid $objectid]
       set showing [dbobj $rec get Showing]
@@ -376,6 +384,7 @@
     global genrevals
     global tvratingnums
     global tvratingvals
+    global tystreams
     global showingbitnums
     global showingbitvals
     global advisorynums
@@ -763,8 +772,10 @@
               set size "[expr ($seconds * ($bitrate / (8 * 1024))) / 1024] MB (estimated)"
            } else {
               set size 0
+              set tystreams ""
               foreach part $parts {
                  set file [dbobj $part get File]
+                 append tystreams "$file "
                  if { [catch {mfs streamsize $file} sizes] } {
                     
                  } else {
@@ -773,7 +784,10 @@
               }
               append size " MB"
            }
-           puts $chan "<TR><TD>Size</TD><TD>$size</TD></TD>"
+          if {$tystreams != ""} {
+           puts $chan "<TR><TD>Parts</TD><TD>$tystreams</TD></TR>"
+           }
+           puts $chan "<TR><TD>Size</TD><TD>$size</TD></TR>"
         }
 
         puts -nonewline $chan [html_table_end]
@@ -784,45 +798,45 @@
     set nowtime [clock seconds]
     if { $rec != "" } {
        if { $state == 6 } {
-          # append actionstr [tr "" [td [html_link "/deletetodo/$recfsid" "Cancel Recording"]]]
-          append actionstr [tr "" [td [html_link "/confirmdelete/2/$recfsid" "Cancel Recording"]]]
+          # append actionstr [html_link "/deletetodo/$recfsid" "Cancel Recording"]
+          append actionstr [html_link "/confirmdelete/2/$recfsid" "Cancel Recording"]
           append actionstr "\n"
        } elseif { $state == 4 } {
-          append actionstr [tr "" [td [html_link "/editprogram/$recfsid" "Edit Program"]]]
-          # append actionstr [tr "" [td [html_link "/deletens/$recfsid" "Delete Recording"]]]
-          append actionstr [tr "" [td [html_link "/confirmdelete/1/$recfsid" "Delete Recording"]]]
+          append actionstr [html_link "/editprogram/$recfsid" "Edit Program"]
+          # append actionstr [html_link "/deletens/$recfsid" "Delete Recording"]
+          append actionstr " | "
+          append actionstr [html_link "/confirmdelete/1/$recfsid" "Delete Recording"]
           append actionstr "\n"
        } elseif { $state == 2 } {
           if { $nowtime < $showingstart } {
-             append actionstr [tr "" [td [html_link "/recoptions/$objectid" "Record"]]]
+             append actionstr [html_link "/recoptions/$objectid" "Record"]
              append actionstr "\n"
           }
        }
     } else {
        if { $nowtime < $showingstart } {
-          append actionstr [tr "" [td [html_link "/recoptions/$objectid" "Record"]]]
+          append actionstr [html_link "/recoptions/$objectid" "Record"]
           append actionstr "\n"
        }
     }
     if { $rec != "" && $programsourcefsid != "" && $programsourcetype == 1 } {
-       append actionstr [tr "" [td [html_link "/editseasonpass/$programsourcefsid" "Edit Season Pass"]]]
+       append actionstr " | "
+       append actionstr [html_link "/editseasonpass/$programsourcefsid" "Edit Season Pass"]
        append actionstr "\n"
     } else {
        set sp_index [lsearch $cache_sp_key "$seriesfsid|$stationid"]
        if { $sp_index != -1 } {
-          append actionstr [tr "" [td [html_link "/editseasonpass/[lindex $cache_sp_fsid $sp_index]" "Edit Season Pass"]]]
+          append actionstr " | "
+          append actionstr [html_link "/editseasonpass/[lindex $cache_sp_fsid $sp_index]" "Edit Season Pass"]
           append actionstr "\n"
        } elseif { $episodic == 1 } {
-          append actionstr [tr "" [td [html_link "/getseasonpass/$objectid" "Get Season Pass"]]]
+          append actionstr " | "
+          append actionstr [html_link "/getseasonpass/$objectid" "Get Season Pass"]
           append actionstr "\n"
        }
     }
     if { $actionstr != "" } {
-       puts $chan [html_table_start "" "" ""]
-       puts $chan [tr "" [th "Actions"]]
        puts $chan $actionstr
-       puts -nonewline $chan [html_table_end]
-       puts $chan "<P>"
     }
     puts $chan [html_end]
 }
@@ -835,9 +849,9 @@
     puts $chan [html_start "Record"]
     set value [MakeTodoRecording $objectid $quality 3 $startearly $endlate $kal $conflictslist]
     if { $value > 0 } {
-       puts $chan "<B>Scheduling Successful</B> [html_link /showing/$value Recording]"
+       puts $chan "<B>Scheduling Successful</B><BR><BR>[html_link /showing/$value Details] | [html_link /ui "Main Menu"]"
     } else {
-       puts $chan "<B>Scheduling Failed '$value'</B>"
+       puts $chan "<B>Scheduling Failed '$value'</B><BR><BR>[html_link /ui "Main Menu"]"
     }
     puts $chan [html_end]
 }
@@ -878,7 +892,7 @@
 proc action_recoptions {chan objectid env} {
     global defrecquality
 
-    puts $chan [html_start "Recording Options"]
+    puts $chan [html_start_2 "Recording Options"]
     puts $chan [h1 "Recording Options"]
     puts $chan [html_form_start "POST" "/conflicts"]
     puts $chan [html_table_start "" "" ""]
@@ -1060,8 +1074,8 @@
     } else {
        puts $chan "<B>$deletestr Failed</B>"
     }
-    puts $chan "<P>"
-    puts $chan "<A HREF=\"#\" onClick=\"history.go(-2)\">Back</A>"
+    puts $chan "<P><BR><BR>"
+    puts $chan [html_link /ui "Main Menu"]
     puts $chan [html_end]
 
 }
@@ -1091,8 +1105,8 @@
     } else {
        puts $chan "<B>$deletestr Failed</B>"
     }
-    puts $chan "<P>"
-    puts $chan "<A HREF=\"#\" onClick=\"history.go(-2)\">Back</A>"
+    puts $chan "<P><BR><BR>"
+    puts $chan [html_link /ui "Main Menu"]
     puts $chan [html_end]
 
 }
@@ -1614,7 +1628,7 @@
 
     set dowvals "Sun Mon Tue Wed Thu Fri Sat {Daily} {M-F}"
 
-    puts $chan [html_start "Edit Season Pass"]
+    puts $chan [html_start_2 "Edit Season Pass"]
     if { $type == 1 } {
         puts $chan [h1 "$title ($channum $callsign)"]
     } elseif { $type == 2 } {
@@ -1844,7 +1858,7 @@
        set preftype $path
     }
 
-    puts $chan [html_start "Preferences"]
+    puts $chan [html_start_2 "Preferences"]
 
     if { $preftype == "" } {
        puts $chan [html_table_start "" "" "ALIGN=TOP"]
@@ -2115,7 +2129,7 @@
     }
 
     if {$path == ""} {
-        puts $chan [html_start "User Interface"]
+        puts $chan [html_start_2 "User Interface"]
         puts $chan [html_table_start "" "" "ALIGN=TOP"]
         puts $chan [tr "" [th "" "User Interface"]]
         puts $chan [tr "" [td [html_link "/ui/seasonpass" "Season Pass"]]]
diff -uNr tivoweb-tcl/technophobe.cs tivoweb-j/technophobe.cs
--- tivoweb-tcl/technophobe.cs	Wed Dec 31 19:00:00 1969
+++ tivoweb-j/technophobe.cs	Sat Nov  3 04:45:26 2001
@@ -0,0 +1 @@
+
diff -uNr tivoweb-tcl/technophobe.css tivoweb-j/technophobe.css
--- tivoweb-tcl/technophobe.css	Sun Aug 19 21:02:33 2001
+++ tivoweb-j/technophobe.css	Sat Nov  3 03:59:58 2001
@@ -41,6 +41,7 @@
 table, td, th, caption {
         border: 0px;
         border-spacing: 0px;
+        table-layout: fixed;
         empty-cells: show;
 }
 table {
diff -uNr tivoweb-tcl/technophobe2.css tivoweb-j/technophobe2.css
--- tivoweb-tcl/technophobe2.css	Wed Dec 31 19:00:00 1969
+++ tivoweb-j/technophobe2.css	Sat Nov  3 03:59:43 2001
@@ -0,0 +1,88 @@
+/*
+ * Technophobe Theme
+ * (C) 2001
+ * Mike Baker <mbm@linux.com>
+ *
+ * $Id: technophobe.css,v 1.4 2001/08/20 01:02:33 lightn Exp $
+ */
+
+#theme:after {
+        content: "Technophobe Theme";
+        color: #505050;
+        font-size: .5em;
+        font-weight: 100;
+        letter-spacing: 1.2em;
+}
+
+#space {
+        border-style: hidden;
+        border: 0px 0px 0px 0px;
+        border-spacing: 0px;
+        padding: 1px 0px 0px 0px;
+}
+
+body {
+        background: #505050;
+        margin: 0px;
+        margin-bottom: 2em;
+        font-family: arial, helvetica, sans-serif;
+        text-align: center;
+}
+:link, :visited {
+        color: #FFBB00;
+        text-decoration: none;
+}
+a:hover {
+        text-decoration: underline;
+}
+table :link, table :visited {
+        color: #0000FF;
+}
+table, td, th, caption {
+        border: 0px;
+        border-spacing: 0px;
+        empty-cells: show;
+}
+table {
+        margin: auto;
+        margin-bottom: 1em;
+}
+table:first-child {
+       margin-top: 0px;
+}
+th, caption {
+        color: #ffffff;
+        background: #202020;
+        font-weight: bold;
+        padding: 0px 5px 0px 5px;
+}
+td {
+        padding: 0px 5px 0px 5px;
+        background: #909090;
+        border-left: 1px solid #808080;
+        border-bottom: 1px solid #808080;
+}
+td:first-child {
+        border-left: 0px;
+        white-space: nowrap;
+
+}
+th a:link, th a:visited {
+        text-decoration: none;
+        color: #7777ff;
+}
+th a:before, th a:after {
+        content: "/";
+        color: #909090;
+}
+font {
+        font-weight: normal;
+}
+h1 {
+        color: #FFBB00;
+        font-size: 2em;
+}
+pre {
+        margin: 2em;
+        text-align: left;
+}
