From ed37185d1b852ba3601f97af1b4cc19b8a61069d Mon Sep 17 00:00:00 2001
From: zefie <zefie@zefie.net>
Date: Mon, 25 Mar 2024 16:11:09 -0400
Subject: [PATCH] Revert "update escape and unescape to encodeURIComponent and
 decodeURIComponent due to depreciation"

This reverts commit 2be836784d889e78020224634faebd0cf766489b.
---
 zefie_wtvp_minisrv/app.js                     |  14 +-
 .../topic=Tips&subtopic=Options&page=Find.htm | 144 +-----------------
 .../topic=Tips&subtopic=Options&page=Goto.htm | 144 +-----------------
 ...opic=Tips&subtopic=Options&page=HangUp.htm | 144 +-----------------
 .../topic=Tips&subtopic=Options&page=Info.htm | 144 +-----------------
 ...c=Tips&subtopic=Options&page=Messenger.htm | 144 +-----------------
 ...topic=Tips&subtopic=Options&page=Print.htm | 144 +-----------------
 ...opic=Tips&subtopic=Options&page=Reload.htm |   3 +-
 .../topic=Tips&subtopic=Options&page=Save.htm |   3 +-
 ...pic=Tips&subtopic=Options&page=TVvsWeb.htm |   3 +-
 ...ic=Tips&subtopic=Options&page=TvWindow.htm |   3 +-
 .../topic=Tips&subtopic=Options&page=logo.htm | 144 +-----------------
 .../Options/topic=Tips&subtopic=Options.htm   |   3 +-
 .../includes/ServiceVault/wtv-disk/sync.js    |   2 +-
 .../ServiceVault/wtv-flashrom/get-lc2-page.js |   2 +-
 .../wtv-flashrom/initiate-lc2-download.js     |   4 +-
 .../ServiceVault/wtv-mail/readmail.js         |   2 +-
 .../includes/ServiceVault/wtv-news/news.js    |   2 +-
 .../includes/ServiceVault/wtv-setup/get.js    |   2 +-
 .../includes/ServiceVault/wtv-setup/set-bg.js |   2 +-
 .../includes/classes/WTVShared.js             |  14 +-
 21 files changed, 55 insertions(+), 1012 deletions(-)

diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js
index e85ce6a2..6db14a5d 100644
--- a/zefie_wtvp_minisrv/app.js
+++ b/zefie_wtvp_minisrv/app.js
@@ -349,7 +349,7 @@ async function processPath(socket, service_vault_file_path, request_headers = ne
     var headers, data = null;
     var request_is_async = false;
     var service_vault_found = false;
-    var service_path = decodeURIComponent(service_vault_file_path);
+    var service_path = unescape(service_vault_file_path);
 	var vaults_to_scan = service_vaults;
     var usingSharedROMCache = false;
     var contextObj = {
@@ -670,9 +670,9 @@ async function processURL(socket, request_headers, pc_services = false) {
                                     var keyarray = [request_headers.query[k]];
                                     request_headers.query[k] = keyarray;
                                 }
-                                request_headers.query[k].push(decodeURIComponent(qraw[i].split("=")[1].replace(/\+/g, "%20")));
+                                request_headers.query[k].push(unescape(qraw[i].split("=")[1].replace(/\+/g, "%20")));
                             } else {
-                                request_headers.query[k] = decodeURIComponent(qraw[i].split("=")[1].replace(/\+/g, "%20"));
+                                request_headers.query[k] = unescape(qraw[i].split("=")[1].replace(/\+/g, "%20"));
                             }
                         } else if (qraw[i].length == 1) {
                             request_headers.query[qraw[i]] = null;
@@ -680,10 +680,10 @@ async function processURL(socket, request_headers, pc_services = false) {
                     }
                 }
             } else {
-                shortURL = decodeURIComponent(request_headers.request_url);
+                shortURL = unescape(request_headers.request_url);
             }
         } else {
-            shortURL = decodeURIComponent(request_headers.request_url);
+            shortURL = unescape(request_headers.request_url);
         }
 
         if (request_headers['wtv-request-type']) socket_sessions[socket.id].wtv_request_type = request_headers['wtv-request-type'];
@@ -701,7 +701,7 @@ async function processURL(socket, request_headers, pc_services = false) {
                                     var qraw_split = qraw[i].split("=");
                                     if (qraw_split.length == 2) {
                                         var k = qraw_split[0];
-                                        var data = decodeURIComponent(qraw[i].split("=")[1].replace(/\+/g, "%20"));
+                                        var data = unescape(qraw[i].split("=")[1].replace(/\+/g, "%20"));
                                         if (request_headers.query[k]) {
                                             if (typeof request_headers.query[k] === 'string') {
                                                 var keyarray = [request_headers.query[k]];
@@ -720,7 +720,7 @@ async function processURL(socket, request_headers, pc_services = false) {
                             var qraw_split = post_data_string.split("=");
                             if (qraw_split.length == 2) {
                                 var k = qraw_split[0];
-                                var data = decodeURIComponent(qraw_split[1].replace(/\+/g, "%20"));
+                                var data = unescape(qraw_split[1].replace(/\+/g, "%20"));
                                 if (request_headers.query[k]) {
                                     if (typeof request_headers.query[k] === 'string') {
                                         var keyarray = [request_headers.query[k]];
diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Find.htm b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Find.htm
index 59f03f7b..2e8e1039 100644
--- a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Find.htm
+++ b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Find.htm
@@ -1,13 +1,4 @@
-<html>
-<head>
-<title>The Options panel</title>
-<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
-<display
-noscroll
->
-<script language='Javascript'>
-    function noBackHelp(gvnStr) {
-        str = ("wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + encodeURIComponent(gvnStr) )
+<html>
<head>
<title>The Options panel</title>
<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
<display
noscroll
>
<script language='Javascript'>
function noBackHelp(gvnStr) {	str = ( "wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + escape(gvnStr) )
 location.href = str;
 }
 function goToHelpUrl(gvnTop,gvnSub,gvnPag) {	str = getHelpUrl(gvnTop,gvnSub,gvnPag);
@@ -59,138 +50,11 @@ function endDiploma() {	location.href = document.pageInfo.doneUrl.value;
 }
 function noBackDiploma() {	noBackHelp(document.pageInfo.doneUrl.value);
 }
-</script>
-</head>
-<body	hspace=0 vspace=0
-text=D2D2D3
-link=D2D2D3
-vlink=D2D2D3
-fontsize=medium
-bgcolor=2D3131
->
-<form name='helpCenterInfo' method='get'>
-<input type='hidden' name="userName" value="jarhead">
-<input type='hidden' name="ACHinfo" value="true">
-<input type='hidden' name="boxKind" value="Derby">
-<input type='hidden' name="canMail" value="true">
-<input type='hidden' name="tryItLabel" value="">
-<input type='hidden' name="tryItUrl" value="">
-</form>
-<form name='pageInfo' method='post'>
-<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
-<input type='hidden' name="remoteTypeFromDB" value="icx">
-<input type='hidden' name="payment-method" value="webtv-billing-code">
-<input type='hidden' name="show-metered-pricing" value="false">
-<input type='hidden' name="hc-showACHinfo" value="true">
-<input type='hidden' name="leaveTopicsPage">
-<input type='hidden' name="leaveIndexPage">
-<input type='hidden' name="leaveBasicsMenu">
-<input type='hidden' name="leaveBasicsAnswer">
-<input type='hidden' name="leaveInstructMenu">
-<input type='hidden' name="leaveInstructSubtopic">
-</form>
-<script>
-referer = history[history.length-2];
-referer = referer.substring(0,100);
-document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
-document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-</script>
-<form> <table cellspacing=0 cellpadding=0>
-<tr>
-<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
-<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
->
-<tr>
-<td width=107 height=80 valign=top rowspan=2>
-<spacer type=vertical height=7><br>
-<spacer type=horizontal width=7>
-<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
-<td width=453 valign=top>
-<spacer type=vertical height=48><br>
-<spacer type=horizontal width=90>
-<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
-</table>
-<tr>
-<td width=15 bgcolor=5A5A52>
-<td width=15 bgColor=2D3131 valign=top>
-<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
-<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
-<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
-<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
-<tr><td height=2><td bgcolor=2D3131 colspan=4>
-</table>
-<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
-<table cellspacing=0 cellpadding=0>
-<tr>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="http://127.0.0.1/index1.asp">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
-</table>
-<td width=12 bgcolor=141A19>
-<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-970701267-6F92C59B79A94DE50D5EFA91C7474CB3">
-<tr>
-<td bgcolor=5A5A52>
-<td>
-<td width=518 height=234 valign=top>
-<table cellpadding=0 cellspacing=0 height=234 width=518>
-<tr>
-<td height=15>
-<tr>
-<td valign=top>
-Choose <b>find</b> to look for text
+</script>
</head>
<body	hspace=0 vspace=0
text=D2D2D3
link=D2D2D3
vlink=D2D2D3
fontsize=medium
bgcolor=2D3131
>
<form name='helpCenterInfo' method='get'>
<input type='hidden' name="userName" value="jarhead">
<input type='hidden' name="ACHinfo" value="true">
<input type='hidden' name="boxKind" value="Derby">
<input type='hidden' name="canMail" value="true">
<input type='hidden' name="tryItLabel" value="">
<input type='hidden' name="tryItUrl" value="">
</form>
<form name='pageInfo' method='post'>
<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
<input type='hidden' name="remoteTypeFromDB" value="icx">
<input type='hidden' name="payment-method" value="webtv-billing-code">
<input type='hidden' name="show-metered-pricing" value="false">
<input type='hidden' name="hc-showACHinfo" value="true">
<input type='hidden' name="leaveTopicsPage">
<input type='hidden' name="leaveIndexPage">
<input type='hidden' name="leaveBasicsMenu">
<input type='hidden' name="leaveBasicsAnswer">
<input type='hidden' name="leaveInstructMenu">
<input type='hidden' name="leaveInstructSubtopic">
</form>
<script>
referer = history[history.length-2];
referer = referer.substring(0,100);
document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
</script>
<form> <table cellspacing=0 cellpadding=0>
<tr>
<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
>
<tr>
<td width=107 height=80 valign=top rowspan=2>
<spacer type=vertical height=7><br>
<spacer type=horizontal width=7>
<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
<td width=453 valign=top>
<spacer type=vertical height=48><br>
<spacer type=horizontal width=90>
<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
</table>
<tr>
<td width=15 bgcolor=5A5A52>
<td width=15 bgColor=2D3131 valign=top>
<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
<tr><td height=2><td bgcolor=2D3131 colspan=4>
</table>
<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
<table cellspacing=0 cellpadding=0>
<tr>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="http://127.0.0.1/index1.asp">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
</table>
<td width=12 bgcolor=141A19>
<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-970701267-6F92C59B79A94DE50D5EFA91C7474CB3">
<tr>
<td bgcolor=5A5A52>
<td>
<td width=518 height=234 valign=top>
<table cellpadding=0 cellspacing=0 height=234 width=518>
<tr>
<td height=15>
<tr>
<td valign=top>
Choose <b>find</b> to look for text
 on the page you're viewing.
 <p>
 For example, to find the word &quot;viewing&quot; on this page,
 press the <font size=-1><b>OPTIONS</b></font> button, choose <b>find</b>, type <b>viewing</b>,
 and choose <b>Find on page</b>.
-<td>
-<td valign=top>
-<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
-<tr>
-<td width=1 rowspan=3 bgcolor=000000>
-<td width=267 colspan=2 height=1 bgcolor=000000>
-<td width=1 rowspan=3 bgcolor=000000>
-<tr>
-<td valign=top>
-<spacer type=vertical height=75><br><spacer type=horizontal width=75>
-<img src='images/help/common/arrowDL.gif' width=55 height=79>
-<tr>
-<td height=1 bgcolor=000000>
-</table>
-<td>
-<tr>
-<td width=236 height=1>
-<td width=15>
-<td width=267>
-</table>
-<td>
-<tr>
-<td bgcolor=5A5A52>
-<td colspan=3 valign=top height=45 align=right>
-<script>
-function doContinue() {
-goToHelpUrl('Tips','Options','Info');
-}
-</script>
-<font color=ffcf69><shadow>
-<input type=button usestyle
-width="110"
-action="javascript:doContinue()"
-value="Continue"
-borderimage="file://ROM/Borders/ButtonBorder2.bif"
-selected
->
-</shadow></font>
-<spacer type=horizontal width=20>
-</table>
-</form>
-</body>
+<td>
<td valign=top>
<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
<tr>
<td width=1 rowspan=3 bgcolor=000000>
<td width=267 colspan=2 height=1 bgcolor=000000>
<td width=1 rowspan=3 bgcolor=000000>
<tr>
<td valign=top>
<spacer type=vertical height=75><br><spacer type=horizontal width=75>
<img src='images/help/common/arrowDL.gif' width=55 height=79>
<tr>
<td height=1 bgcolor=000000>
</table>
<td>
<tr>
<td width=236 height=1>
<td width=15>
<td width=267>
</table>
<td>
<tr>
<td bgcolor=5A5A52>
<td colspan=3 valign=top height=45 align=right>
<script>
function doContinue() {
+goToHelpUrl('Tips','Options','Info');
}
</script>
<font color=ffcf69><shadow>
<input type=button usestyle
width="110"
action="javascript:doContinue()"
value="Continue"
borderimage="file://ROM/Borders/ButtonBorder2.bif"
selected
>
</shadow></font>
<spacer type=horizontal width=20>
</table>
</form>
</body>
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Goto.htm b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Goto.htm
index 416d50e5..68e15ca5 100644
--- a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Goto.htm
+++ b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Goto.htm
@@ -1,13 +1,4 @@
-<html>
-<head>
-<title>The Options panel</title>
-<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
-<display
-noscroll
->
-<script language='Javascript'>
-    function noBackHelp(gvnStr) {
-        str = ("wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + encodeURIComponent(gvnStr) )
+<html>
<head>
<title>The Options panel</title>
<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
<display
noscroll
>
<script language='Javascript'>
function noBackHelp(gvnStr) {	str = ( "wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + escape(gvnStr) )
 location.href = str;
 }
 function goToHelpUrl(gvnTop,gvnSub,gvnPag) {	str = getHelpUrl(gvnTop,gvnSub,gvnPag);
@@ -59,94 +50,7 @@ function endDiploma() {	location.href = document.pageInfo.doneUrl.value;
 }
 function noBackDiploma() {	noBackHelp(document.pageInfo.doneUrl.value);
 }
-</script>
-</head>
-<body	hspace=0 vspace=0
-text=D2D2D3
-link=D2D2D3
-vlink=D2D2D3
-fontsize=medium
-bgcolor=2D3131
->
-<form name='helpCenterInfo' method='get'>
-<input type='hidden' name="userName" value="jarhead">
-<input type='hidden' name="ACHinfo" value="true">
-<input type='hidden' name="boxKind" value="Derby">
-<input type='hidden' name="canMail" value="true">
-<input type='hidden' name="tryItLabel" value="">
-<input type='hidden' name="tryItUrl" value="">
-</form>
-<form name='pageInfo' method='post'>
-<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
-<input type='hidden' name="remoteTypeFromDB" value="icx">
-<input type='hidden' name="payment-method" value="webtv-billing-code">
-<input type='hidden' name="show-metered-pricing" value="false">
-<input type='hidden' name="hc-showACHinfo" value="true">
-<input type='hidden' name="leaveTopicsPage">
-<input type='hidden' name="leaveIndexPage">
-<input type='hidden' name="leaveBasicsMenu">
-<input type='hidden' name="leaveBasicsAnswer">
-<input type='hidden' name="leaveInstructMenu">
-<input type='hidden' name="leaveInstructSubtopic">
-</form>
-<script>
-referer = history[history.length-2];
-referer = referer.substring(0,100);
-document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
-document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-</script>
-<form> <table cellspacing=0 cellpadding=0>
-<tr>
-<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
-<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
->
-<tr>
-<td width=107 height=80 valign=top rowspan=2>
-<spacer type=vertical height=7><br>
-<spacer type=horizontal width=7>
-<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
-<td width=453 valign=top>
-<spacer type=vertical height=48><br>
-<spacer type=horizontal width=90>
-<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
-</table>
-<tr>
-<td width=15 bgcolor=5A5A52>
-<td width=15 bgColor=2D3131 valign=top>
-<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
-<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
-<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
-<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
-<tr><td height=2><td bgcolor=2D3131 colspan=4>
-</table>
-<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
-<table cellspacing=0 cellpadding=0>
-<tr>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="http://127.0.0.1/index1.asp">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
-</table>
-<td width=12 bgcolor=141A19>
-<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-4003984621-946A50C25BFE17AB1A4F44F58E85FAE9">
-<tr>
-<td bgcolor=5A5A52>
-<td>
-<td width=518 height=234 valign=top>
-<table cellpadding=0 cellspacing=0 height=234 width=518>
-<tr>
-<td height=15>
-<tr>
-<td valign=top>
-Choose <b>go to</b> if you know the
+</script>
</head>
<body	hspace=0 vspace=0
text=D2D2D3
link=D2D2D3
vlink=D2D2D3
fontsize=medium
bgcolor=2D3131
>
<form name='helpCenterInfo' method='get'>
<input type='hidden' name="userName" value="jarhead">
<input type='hidden' name="ACHinfo" value="true">
<input type='hidden' name="boxKind" value="Derby">
<input type='hidden' name="canMail" value="true">
<input type='hidden' name="tryItLabel" value="">
<input type='hidden' name="tryItUrl" value="">
</form>
<form name='pageInfo' method='post'>
<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
<input type='hidden' name="remoteTypeFromDB" value="icx">
<input type='hidden' name="payment-method" value="webtv-billing-code">
<input type='hidden' name="show-metered-pricing" value="false">
<input type='hidden' name="hc-showACHinfo" value="true">
<input type='hidden' name="leaveTopicsPage">
<input type='hidden' name="leaveIndexPage">
<input type='hidden' name="leaveBasicsMenu">
<input type='hidden' name="leaveBasicsAnswer">
<input type='hidden' name="leaveInstructMenu">
<input type='hidden' name="leaveInstructSubtopic">
</form>
<script>
referer = history[history.length-2];
referer = referer.substring(0,100);
document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
</script>
<form> <table cellspacing=0 cellpadding=0>
<tr>
<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
>
<tr>
<td width=107 height=80 valign=top rowspan=2>
<spacer type=vertical height=7><br>
<spacer type=horizontal width=7>
<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
<td width=453 valign=top>
<spacer type=vertical height=48><br>
<spacer type=horizontal width=90>
<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
</table>
<tr>
<td width=15 bgcolor=5A5A52>
<td width=15 bgColor=2D3131 valign=top>
<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
<tr><td height=2><td bgcolor=2D3131 colspan=4>
</table>
<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
<table cellspacing=0 cellpadding=0>
<tr>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="http://127.0.0.1/index1.asp">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
</table>
<td width=12 bgcolor=141A19>
<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-4003984621-946A50C25BFE17AB1A4F44F58E85FAE9">
<tr>
<td bgcolor=5A5A52>
<td>
<td width=518 height=234 valign=top>
<table cellpadding=0 cellspacing=0 height=234 width=518>
<tr>
<td height=15>
<tr>
<td valign=top>
Choose <b>go to</b> if you know the
 address of a Web page you want to visit.
 For instructions, choose this link:
 <spacer type=vertical height=12><br>
@@ -162,45 +66,5 @@ href="wtv-guide:/help?topic=Search&subtopic=Goto">
 <td>
 &nbsp;
 </table>
-<td>
-<td valign=top>
-<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
-<tr>
-<td width=1 rowspan=3 bgcolor=000000>
-<td width=267 colspan=2 height=1 bgcolor=000000>
-<td width=1 rowspan=3 bgcolor=000000>
-<tr>
-<td valign=top>
-<spacer type=vertical height=75><br><spacer type=horizontal width=85>
-<img src='images/help/common/arrowDR.gif' width=55 height=79>
-<tr>
-<td height=1 bgcolor=000000>
-</table>
-<td>
-<tr>
-<td width=236 height=1>
-<td width=15>
-<td width=267>
-</table>
-<td>
-<tr>
-<td bgcolor=5A5A52>
-<td colspan=3 valign=top height=45 align=right>
-<script>
-function doContinue() {
-goToHelpUrl('Tips','Options','Save');
-}
-</script>
-<font color=ffcf69><shadow>
-<input type=button usestyle
-width="110"
-action="javascript:doContinue()"
-value="Continue"
-borderimage="file://ROM/Borders/ButtonBorder2.bif"
-selected
->
-</shadow></font>
-<spacer type=horizontal width=20>
-</table>
-</form>
-</body>
+<td>
<td valign=top>
<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
<tr>
<td width=1 rowspan=3 bgcolor=000000>
<td width=267 colspan=2 height=1 bgcolor=000000>
<td width=1 rowspan=3 bgcolor=000000>
<tr>
<td valign=top>
<spacer type=vertical height=75><br><spacer type=horizontal width=85>
<img src='images/help/common/arrowDR.gif' width=55 height=79>
<tr>
<td height=1 bgcolor=000000>
</table>
<td>
<tr>
<td width=236 height=1>
<td width=15>
<td width=267>
</table>
<td>
<tr>
<td bgcolor=5A5A52>
<td colspan=3 valign=top height=45 align=right>
<script>
function doContinue() {
+goToHelpUrl('Tips','Options','Save');
}
</script>
<font color=ffcf69><shadow>
<input type=button usestyle
width="110"
action="javascript:doContinue()"
value="Continue"
borderimage="file://ROM/Borders/ButtonBorder2.bif"
selected
>
</shadow></font>
<spacer type=horizontal width=20>
</table>
</form>
</body>
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=HangUp.htm b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=HangUp.htm
index d5893277..3dd3cdeb 100644
--- a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=HangUp.htm
+++ b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=HangUp.htm
@@ -1,13 +1,4 @@
-<html>
-<head>
-<title>The Options panel</title>
-<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
-<display
-noscroll
->
-<script language='Javascript'>
-    function noBackHelp(gvnStr) {
-        str = ("wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + encodeURIComponent(gvnStr) )
+<html>
<head>
<title>The Options panel</title>
<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
<display
noscroll
>
<script language='Javascript'>
function noBackHelp(gvnStr) {	str = ( "wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + escape(gvnStr) )
 location.href = str;
 }
 function goToHelpUrl(gvnTop,gvnSub,gvnPag) {	str = getHelpUrl(gvnTop,gvnSub,gvnPag);
@@ -59,135 +50,8 @@ function endDiploma() {	location.href = document.pageInfo.doneUrl.value;
 }
 function noBackDiploma() {	noBackHelp(document.pageInfo.doneUrl.value);
 }
-</script>
-</head>
-<body	hspace=0 vspace=0
-text=D2D2D3
-link=D2D2D3
-vlink=D2D2D3
-fontsize=medium
-bgcolor=2D3131
->
-<form name='helpCenterInfo' method='get'>
-<input type='hidden' name="userName" value="jarhead">
-<input type='hidden' name="ACHinfo" value="true">
-<input type='hidden' name="boxKind" value="Derby">
-<input type='hidden' name="canMail" value="true">
-<input type='hidden' name="tryItLabel" value="">
-<input type='hidden' name="tryItUrl" value="">
-</form>
-<form name='pageInfo' method='post'>
-<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
-<input type='hidden' name="remoteTypeFromDB" value="icx">
-<input type='hidden' name="payment-method" value="webtv-billing-code">
-<input type='hidden' name="show-metered-pricing" value="false">
-<input type='hidden' name="hc-showACHinfo" value="true">
-<input type='hidden' name="leaveTopicsPage">
-<input type='hidden' name="leaveIndexPage">
-<input type='hidden' name="leaveBasicsMenu">
-<input type='hidden' name="leaveBasicsAnswer">
-<input type='hidden' name="leaveInstructMenu">
-<input type='hidden' name="leaveInstructSubtopic">
-</form>
-<script>
-referer = history[history.length-2];
-referer = referer.substring(0,100);
-document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
-document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-</script>
-<form> <table cellspacing=0 cellpadding=0>
-<tr>
-<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
-<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
->
-<tr>
-<td width=107 height=80 valign=top rowspan=2>
-<spacer type=vertical height=7><br>
-<spacer type=horizontal width=7>
-<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
-<td width=453 valign=top>
-<spacer type=vertical height=48><br>
-<spacer type=horizontal width=90>
-<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
-</table>
-<tr>
-<td width=15 bgcolor=5A5A52>
-<td width=15 bgColor=2D3131 valign=top>
-<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
-<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
-<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
-<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
-<tr><td height=2><td bgcolor=2D3131 colspan=4>
-</table>
-<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
-<table cellspacing=0 cellpadding=0>
-<tr>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="http://127.0.0.1/index1.asp">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
-</table>
-<td width=12 bgcolor=141A19>
-<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-4241390131-87101BFD501DCD483779BD5FB1639007">
-<tr>
-<td bgcolor=5A5A52>
-<td>
-<td width=518 height=234 valign=top>
-<table cellpadding=0 cellspacing=0 height=234 width=518>
-<tr>
-<td height=15>
-<tr>
-<td valign=top>
-Choose <b>hang up</b> if you want
+</script>
</head>
<body	hspace=0 vspace=0
text=D2D2D3
link=D2D2D3
vlink=D2D2D3
fontsize=medium
bgcolor=2D3131
>
<form name='helpCenterInfo' method='get'>
<input type='hidden' name="userName" value="jarhead">
<input type='hidden' name="ACHinfo" value="true">
<input type='hidden' name="boxKind" value="Derby">
<input type='hidden' name="canMail" value="true">
<input type='hidden' name="tryItLabel" value="">
<input type='hidden' name="tryItUrl" value="">
</form>
<form name='pageInfo' method='post'>
<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
<input type='hidden' name="remoteTypeFromDB" value="icx">
<input type='hidden' name="payment-method" value="webtv-billing-code">
<input type='hidden' name="show-metered-pricing" value="false">
<input type='hidden' name="hc-showACHinfo" value="true">
<input type='hidden' name="leaveTopicsPage">
<input type='hidden' name="leaveIndexPage">
<input type='hidden' name="leaveBasicsMenu">
<input type='hidden' name="leaveBasicsAnswer">
<input type='hidden' name="leaveInstructMenu">
<input type='hidden' name="leaveInstructSubtopic">
</form>
<script>
referer = history[history.length-2];
referer = referer.substring(0,100);
document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
</script>
<form> <table cellspacing=0 cellpadding=0>
<tr>
<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
>
<tr>
<td width=107 height=80 valign=top rowspan=2>
<spacer type=vertical height=7><br>
<spacer type=horizontal width=7>
<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
<td width=453 valign=top>
<spacer type=vertical height=48><br>
<spacer type=horizontal width=90>
<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
</table>
<tr>
<td width=15 bgcolor=5A5A52>
<td width=15 bgColor=2D3131 valign=top>
<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
<tr><td height=2><td bgcolor=2D3131 colspan=4>
</table>
<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
<table cellspacing=0 cellpadding=0>
<tr>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="http://127.0.0.1/index1.asp">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
</table>
<td width=12 bgcolor=141A19>
<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-4241390131-87101BFD501DCD483779BD5FB1639007">
<tr>
<td bgcolor=5A5A52>
<td>
<td width=518 height=234 valign=top>
<table cellpadding=0 cellspacing=0 height=234 width=518>
<tr>
<td height=15>
<tr>
<td valign=top>
Choose <b>hang up</b> if you want
 to free up the phone line without
 turning your terminal off.
-<td>
-<td valign=top>
-<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
-<tr>
-<td width=1 rowspan=3 bgcolor=000000>
-<td width=267 colspan=2 height=1 bgcolor=000000>
-<td width=1 rowspan=3 bgcolor=000000>
-<tr>
-<td valign=top>
-<spacer type=vertical height=105><br><spacer type=horizontal width=65>
-<img src='images/help/common/arrowDR.gif' width=55 height=79>
-<tr>
-<td height=1 bgcolor=000000>
-</table>
-<td>
-<tr>
-<td width=236 height=1>
-<td width=15>
-<td width=267>
-</table>
-<td>
-<tr>
-<td bgcolor=5A5A52>
-<td colspan=3 valign=top height=45 align=right>
-<script>
-function doContinue() {
-goToHelpUrl('Tips','Options','Reload');
-}
-</script>
-<font color=ffcf69><shadow>
-<input type=button usestyle
-width="110"
-action="javascript:doContinue()"
-value="Continue"
-borderimage="file://ROM/Borders/ButtonBorder2.bif"
-selected
->
-</shadow></font>
-<spacer type=horizontal width=20>
-</table>
-</form>
-</body>
+<td>
<td valign=top>
<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
<tr>
<td width=1 rowspan=3 bgcolor=000000>
<td width=267 colspan=2 height=1 bgcolor=000000>
<td width=1 rowspan=3 bgcolor=000000>
<tr>
<td valign=top>
<spacer type=vertical height=105><br><spacer type=horizontal width=65>
<img src='images/help/common/arrowDR.gif' width=55 height=79>
<tr>
<td height=1 bgcolor=000000>
</table>
<td>
<tr>
<td width=236 height=1>
<td width=15>
<td width=267>
</table>
<td>
<tr>
<td bgcolor=5A5A52>
<td colspan=3 valign=top height=45 align=right>
<script>
function doContinue() {
+goToHelpUrl('Tips','Options','Reload');
}
</script>
<font color=ffcf69><shadow>
<input type=button usestyle
width="110"
action="javascript:doContinue()"
value="Continue"
borderimage="file://ROM/Borders/ButtonBorder2.bif"
selected
>
</shadow></font>
<spacer type=horizontal width=20>
</table>
</form>
</body>
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Info.htm b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Info.htm
index c7cf36e8..f7a62239 100644
--- a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Info.htm
+++ b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Info.htm
@@ -1,13 +1,4 @@
-<html>
-<head>
-<title>The Options panel</title>
-<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
-<display
-noscroll
->
-<script language='Javascript'>
-    function noBackHelp(gvnStr) {
-        str = ("wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + encodeURIComponent(gvnStr) )
+<html>
<head>
<title>The Options panel</title>
<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
<display
noscroll
>
<script language='Javascript'>
function noBackHelp(gvnStr) {	str = ( "wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + escape(gvnStr) )
 location.href = str;
 }
 function goToHelpUrl(gvnTop,gvnSub,gvnPag) {	str = getHelpUrl(gvnTop,gvnSub,gvnPag);
@@ -59,133 +50,6 @@ function endDiploma() {	location.href = document.pageInfo.doneUrl.value;
 }
 function noBackDiploma() {	noBackHelp(document.pageInfo.doneUrl.value);
 }
-</script>
-</head>
-<body	hspace=0 vspace=0
-text=D2D2D3
-link=D2D2D3
-vlink=D2D2D3
-fontsize=medium
-bgcolor=2D3131
->
-<form name='helpCenterInfo' method='get'>
-<input type='hidden' name="userName" value="jarhead">
-<input type='hidden' name="ACHinfo" value="true">
-<input type='hidden' name="boxKind" value="Derby">
-<input type='hidden' name="canMail" value="true">
-<input type='hidden' name="tryItLabel" value="">
-<input type='hidden' name="tryItUrl" value="">
-</form>
-<form name='pageInfo' method='post'>
-<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
-<input type='hidden' name="remoteTypeFromDB" value="icx">
-<input type='hidden' name="payment-method" value="webtv-billing-code">
-<input type='hidden' name="show-metered-pricing" value="false">
-<input type='hidden' name="hc-showACHinfo" value="true">
-<input type='hidden' name="leaveTopicsPage">
-<input type='hidden' name="leaveIndexPage">
-<input type='hidden' name="leaveBasicsMenu">
-<input type='hidden' name="leaveBasicsAnswer">
-<input type='hidden' name="leaveInstructMenu">
-<input type='hidden' name="leaveInstructSubtopic">
-</form>
-<script>
-referer = history[history.length-2];
-referer = referer.substring(0,100);
-document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
-document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-</script>
-<form> <table cellspacing=0 cellpadding=0>
-<tr>
-<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
-<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
->
-<tr>
-<td width=107 height=80 valign=top rowspan=2>
-<spacer type=vertical height=7><br>
-<spacer type=horizontal width=7>
-<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
-<td width=453 valign=top>
-<spacer type=vertical height=48><br>
-<spacer type=horizontal width=90>
-<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
-</table>
-<tr>
-<td width=15 bgcolor=5A5A52>
-<td width=15 bgColor=2D3131 valign=top>
-<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
-<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
-<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
-<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
-<tr><td height=2><td bgcolor=2D3131 colspan=4>
-</table>
-<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
-<table cellspacing=0 cellpadding=0>
-<tr>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="http://127.0.0.1/index1.asp">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
-</table>
-<td width=12 bgcolor=141A19>
-<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-1286115985-709196EEAA2281E9A82B1B171185457A">
-<tr>
-<td bgcolor=5A5A52>
-<td>
-<td width=518 height=234 valign=top>
-<table cellpadding=0 cellspacing=0 height=234 width=518>
-<tr>
-<td height=15>
-<tr>
-<td valign=top>
-Choose the <b>info</b> button on the Options panel to get information about the Web page you're viewing.
-<td>
-<td valign=top>
-<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
-<tr>
-<td width=1 rowspan=3 bgcolor=000000>
-<td width=267 colspan=2 height=1 bgcolor=000000>
-<td width=1 rowspan=3 bgcolor=000000>
-<tr>
-<td valign=top>
-<spacer type=vertical height=75><br><spacer type=horizontal width=120>
-<img src='images/help/common/arrowDL.gif' width=55 height=79>
-<tr>
-<td height=1 bgcolor=000000>
-</table>
-<td>
-<tr>
-<td width=236 height=1>
-<td width=15>
-<td width=267>
-</table>
-<td>
-<tr>
-<td bgcolor=5A5A52>
-<td colspan=3 valign=top height=45 align=right>
-<script>
-function doContinue() {
-goToHelpUrl('Tips','Options','Goto');
-}
-</script>
-<font color=ffcf69><shadow>
-<input type=button usestyle
-width="110"
-action="javascript:doContinue()"
-value="Continue"
-borderimage="file://ROM/Borders/ButtonBorder2.bif"
-selected
->
-</shadow></font>
-<spacer type=horizontal width=20>
-</table>
-</form>
-</body>
+</script>
</head>
<body	hspace=0 vspace=0
text=D2D2D3
link=D2D2D3
vlink=D2D2D3
fontsize=medium
bgcolor=2D3131
>
<form name='helpCenterInfo' method='get'>
<input type='hidden' name="userName" value="jarhead">
<input type='hidden' name="ACHinfo" value="true">
<input type='hidden' name="boxKind" value="Derby">
<input type='hidden' name="canMail" value="true">
<input type='hidden' name="tryItLabel" value="">
<input type='hidden' name="tryItUrl" value="">
</form>
<form name='pageInfo' method='post'>
<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
<input type='hidden' name="remoteTypeFromDB" value="icx">
<input type='hidden' name="payment-method" value="webtv-billing-code">
<input type='hidden' name="show-metered-pricing" value="false">
<input type='hidden' name="hc-showACHinfo" value="true">
<input type='hidden' name="leaveTopicsPage">
<input type='hidden' name="leaveIndexPage">
<input type='hidden' name="leaveBasicsMenu">
<input type='hidden' name="leaveBasicsAnswer">
<input type='hidden' name="leaveInstructMenu">
<input type='hidden' name="leaveInstructSubtopic">
</form>
<script>
referer = history[history.length-2];
referer = referer.substring(0,100);
document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
</script>
<form> <table cellspacing=0 cellpadding=0>
<tr>
<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
>
<tr>
<td width=107 height=80 valign=top rowspan=2>
<spacer type=vertical height=7><br>
<spacer type=horizontal width=7>
<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
<td width=453 valign=top>
<spacer type=vertical height=48><br>
<spacer type=horizontal width=90>
<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
</table>
<tr>
<td width=15 bgcolor=5A5A52>
<td width=15 bgColor=2D3131 valign=top>
<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
<tr><td height=2><td bgcolor=2D3131 colspan=4>
</table>
<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
<table cellspacing=0 cellpadding=0>
<tr>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="http://127.0.0.1/index1.asp">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
</table>
<td width=12 bgcolor=141A19>
<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-1286115985-709196EEAA2281E9A82B1B171185457A">
<tr>
<td bgcolor=5A5A52>
<td>
<td width=518 height=234 valign=top>
<table cellpadding=0 cellspacing=0 height=234 width=518>
<tr>
<td height=15>
<tr>
<td valign=top>
Choose the <b>info</b> button on the Options panel to get information about the Web page you're viewing.
+<td>
<td valign=top>
<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
<tr>
<td width=1 rowspan=3 bgcolor=000000>
<td width=267 colspan=2 height=1 bgcolor=000000>
<td width=1 rowspan=3 bgcolor=000000>
<tr>
<td valign=top>
<spacer type=vertical height=75><br><spacer type=horizontal width=120>
<img src='images/help/common/arrowDL.gif' width=55 height=79>
<tr>
<td height=1 bgcolor=000000>
</table>
<td>
<tr>
<td width=236 height=1>
<td width=15>
<td width=267>
</table>
<td>
<tr>
<td bgcolor=5A5A52>
<td colspan=3 valign=top height=45 align=right>
<script>
function doContinue() {
+goToHelpUrl('Tips','Options','Goto');
}
</script>
<font color=ffcf69><shadow>
<input type=button usestyle
width="110"
action="javascript:doContinue()"
value="Continue"
borderimage="file://ROM/Borders/ButtonBorder2.bif"
selected
>
</shadow></font>
<spacer type=horizontal width=20>
</table>
</form>
</body>
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Messenger.htm b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Messenger.htm
index 37f8b68e..1b18d405 100644
--- a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Messenger.htm
+++ b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Messenger.htm
@@ -1,13 +1,4 @@
-<html>
-<head>
-<title>The Options panel</title>
-<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
-<display
-noscroll
->
-<script language='Javascript'>
-    function noBackHelp(gvnStr) {
-        str = ("wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + encodeURIComponent(gvnStr) )
+<html>
<head>
<title>The Options panel</title>
<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
<display
noscroll
>
<script language='Javascript'>
function noBackHelp(gvnStr) {	str = ( "wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + escape(gvnStr) )
 location.href = str;
 }
 function goToHelpUrl(gvnTop,gvnSub,gvnPag) {	str = getHelpUrl(gvnTop,gvnSub,gvnPag);
@@ -59,94 +50,7 @@ function endDiploma() {	location.href = document.pageInfo.doneUrl.value;
 }
 function noBackDiploma() {	noBackHelp(document.pageInfo.doneUrl.value);
 }
-</script>
-</head>
-<body	hspace=0 vspace=0
-text=D2D2D3
-link=D2D2D3
-vlink=D2D2D3
-fontsize=medium
-bgcolor=2D3131
->
-<form name='helpCenterInfo' method='get'>
-<input type='hidden' name="userName" value="jarhead">
-<input type='hidden' name="ACHinfo" value="true">
-<input type='hidden' name="boxKind" value="Derby">
-<input type='hidden' name="canMail" value="true">
-<input type='hidden' name="tryItLabel" value="">
-<input type='hidden' name="tryItUrl" value="">
-</form>
-<form name='pageInfo' method='post'>
-<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
-<input type='hidden' name="remoteTypeFromDB" value="icx">
-<input type='hidden' name="payment-method" value="webtv-billing-code">
-<input type='hidden' name="show-metered-pricing" value="false">
-<input type='hidden' name="hc-showACHinfo" value="true">
-<input type='hidden' name="leaveTopicsPage">
-<input type='hidden' name="leaveIndexPage">
-<input type='hidden' name="leaveBasicsMenu">
-<input type='hidden' name="leaveBasicsAnswer">
-<input type='hidden' name="leaveInstructMenu">
-<input type='hidden' name="leaveInstructSubtopic">
-</form>
-<script>
-referer = history[history.length-2];
-referer = referer.substring(0,100);
-document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
-document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-</script>
-<form> <table cellspacing=0 cellpadding=0>
-<tr>
-<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
-<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
->
-<tr>
-<td width=107 height=80 valign=top rowspan=2>
-<spacer type=vertical height=7><br>
-<spacer type=horizontal width=7>
-<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
-<td width=453 valign=top>
-<spacer type=vertical height=48><br>
-<spacer type=horizontal width=90>
-<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
-</table>
-<tr>
-<td width=15 bgcolor=5A5A52>
-<td width=15 bgColor=2D3131 valign=top>
-<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
-<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
-<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
-<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
-<tr><td height=2><td bgcolor=2D3131 colspan=4>
-</table>
-<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
-<table cellspacing=0 cellpadding=0>
-<tr>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="http://127.0.0.1/index1.asp">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
-</table>
-<td width=12 bgcolor=141A19>
-<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-3363835280-039162038A5A79C2B822E3340BF79309">
-<tr>
-<td bgcolor=5A5A52>
-<td>
-<td width=518 height=234 valign=top>
-<table cellpadding=0 cellspacing=0 height=234 width=518>
-<tr>
-<td height=15>
-<tr>
-<td valign=top>
-Choose <b>messenger</b> to start a conversation
+</script>
</head>
<body	hspace=0 vspace=0
text=D2D2D3
link=D2D2D3
vlink=D2D2D3
fontsize=medium
bgcolor=2D3131
>
<form name='helpCenterInfo' method='get'>
<input type='hidden' name="userName" value="jarhead">
<input type='hidden' name="ACHinfo" value="true">
<input type='hidden' name="boxKind" value="Derby">
<input type='hidden' name="canMail" value="true">
<input type='hidden' name="tryItLabel" value="">
<input type='hidden' name="tryItUrl" value="">
</form>
<form name='pageInfo' method='post'>
<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
<input type='hidden' name="remoteTypeFromDB" value="icx">
<input type='hidden' name="payment-method" value="webtv-billing-code">
<input type='hidden' name="show-metered-pricing" value="false">
<input type='hidden' name="hc-showACHinfo" value="true">
<input type='hidden' name="leaveTopicsPage">
<input type='hidden' name="leaveIndexPage">
<input type='hidden' name="leaveBasicsMenu">
<input type='hidden' name="leaveBasicsAnswer">
<input type='hidden' name="leaveInstructMenu">
<input type='hidden' name="leaveInstructSubtopic">
</form>
<script>
referer = history[history.length-2];
referer = referer.substring(0,100);
document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
</script>
<form> <table cellspacing=0 cellpadding=0>
<tr>
<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
>
<tr>
<td width=107 height=80 valign=top rowspan=2>
<spacer type=vertical height=7><br>
<spacer type=horizontal width=7>
<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
<td width=453 valign=top>
<spacer type=vertical height=48><br>
<spacer type=horizontal width=90>
<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
</table>
<tr>
<td width=15 bgcolor=5A5A52>
<td width=15 bgColor=2D3131 valign=top>
<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
<tr><td height=2><td bgcolor=2D3131 colspan=4>
</table>
<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
<table cellspacing=0 cellpadding=0>
<tr>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="http://127.0.0.1/index1.asp">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
</table>
<td width=12 bgcolor=141A19>
<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-3363835280-039162038A5A79C2B822E3340BF79309">
<tr>
<td bgcolor=5A5A52>
<td>
<td width=518 height=234 valign=top>
<table cellpadding=0 cellspacing=0 height=234 width=518>
<tr>
<td height=15>
<tr>
<td valign=top>
Choose <b>messenger</b> to start a conversation
 with somebody using MSN Messenger.
 <p>
 To learn more about MSN Messenger, choose this link:
@@ -163,45 +67,5 @@ href="wtv-guide:/help?topic=Messenger&subtopic=Index">
 <td>
 &nbsp;
 </table>
-<td>
-<td valign=top>
-<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
-<tr>
-<td width=1 rowspan=3 bgcolor=000000>
-<td width=267 colspan=2 height=1 bgcolor=000000>
-<td width=1 rowspan=3 bgcolor=000000>
-<tr>
-<td valign=top>
-<spacer type=vertical height=105><br><spacer type=horizontal width=60>
-<img src='images/help/common/arrowDL.gif' width=55 height=79>
-<tr>
-<td height=1 bgcolor=000000>
-</table>
-<td>
-<tr>
-<td width=236 height=1>
-<td width=15>
-<td width=267>
-</table>
-<td>
-<tr>
-<td bgcolor=5A5A52>
-<td colspan=3 valign=top height=45 align=right>
-<script>
-function doContinue() {
-goToHelpUrl('Tips','Options','Print');
-}
-</script>
-<font color=ffcf69><shadow>
-<input type=button usestyle
-width="110"
-action="javascript:doContinue()"
-value="Continue"
-borderimage="file://ROM/Borders/ButtonBorder2.bif"
-selected
->
-</shadow></font>
-<spacer type=horizontal width=20>
-</table>
-</form>
-</body>
+<td>
<td valign=top>
<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
<tr>
<td width=1 rowspan=3 bgcolor=000000>
<td width=267 colspan=2 height=1 bgcolor=000000>
<td width=1 rowspan=3 bgcolor=000000>
<tr>
<td valign=top>
<spacer type=vertical height=105><br><spacer type=horizontal width=60>
<img src='images/help/common/arrowDL.gif' width=55 height=79>
<tr>
<td height=1 bgcolor=000000>
</table>
<td>
<tr>
<td width=236 height=1>
<td width=15>
<td width=267>
</table>
<td>
<tr>
<td bgcolor=5A5A52>
<td colspan=3 valign=top height=45 align=right>
<script>
function doContinue() {
+goToHelpUrl('Tips','Options','Print');
}
</script>
<font color=ffcf69><shadow>
<input type=button usestyle
width="110"
action="javascript:doContinue()"
value="Continue"
borderimage="file://ROM/Borders/ButtonBorder2.bif"
selected
>
</shadow></font>
<spacer type=horizontal width=20>
</table>
</form>
</body>
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Print.htm b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Print.htm
index a4816115..9f988dce 100644
--- a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Print.htm
+++ b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Print.htm
@@ -1,13 +1,4 @@
-<html>
-<head>
-<title>The Options panel</title>
-<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
-<display
-noscroll
->
-<script language='Javascript'>
-    function noBackHelp(gvnStr) {
-        str = ("wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + encodeURIComponent(gvnStr) )
+<html>
<head>
<title>The Options panel</title>
<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
<display
noscroll
>
<script language='Javascript'>
function noBackHelp(gvnStr) {	str = ( "wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + escape(gvnStr) )
 location.href = str;
 }
 function goToHelpUrl(gvnTop,gvnSub,gvnPag) {	str = getHelpUrl(gvnTop,gvnSub,gvnPag);
@@ -59,94 +50,7 @@ function endDiploma() {	location.href = document.pageInfo.doneUrl.value;
 }
 function noBackDiploma() {	noBackHelp(document.pageInfo.doneUrl.value);
 }
-</script>
-</head>
-<body	hspace=0 vspace=0
-text=D2D2D3
-link=D2D2D3
-vlink=D2D2D3
-fontsize=medium
-bgcolor=2D3131
->
-<form name='helpCenterInfo' method='get'>
-<input type='hidden' name="userName" value="jarhead">
-<input type='hidden' name="ACHinfo" value="true">
-<input type='hidden' name="boxKind" value="Derby">
-<input type='hidden' name="canMail" value="true">
-<input type='hidden' name="tryItLabel" value="">
-<input type='hidden' name="tryItUrl" value="">
-</form>
-<form name='pageInfo' method='post'>
-<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
-<input type='hidden' name="remoteTypeFromDB" value="icx">
-<input type='hidden' name="payment-method" value="webtv-billing-code">
-<input type='hidden' name="show-metered-pricing" value="false">
-<input type='hidden' name="hc-showACHinfo" value="true">
-<input type='hidden' name="leaveTopicsPage">
-<input type='hidden' name="leaveIndexPage">
-<input type='hidden' name="leaveBasicsMenu">
-<input type='hidden' name="leaveBasicsAnswer">
-<input type='hidden' name="leaveInstructMenu">
-<input type='hidden' name="leaveInstructSubtopic">
-</form>
-<script>
-referer = history[history.length-2];
-referer = referer.substring(0,100);
-document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
-document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-</script>
-<form> <table cellspacing=0 cellpadding=0>
-<tr>
-<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
-<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
->
-<tr>
-<td width=107 height=80 valign=top rowspan=2>
-<spacer type=vertical height=7><br>
-<spacer type=horizontal width=7>
-<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
-<td width=453 valign=top>
-<spacer type=vertical height=48><br>
-<spacer type=horizontal width=90>
-<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
-</table>
-<tr>
-<td width=15 bgcolor=5A5A52>
-<td width=15 bgColor=2D3131 valign=top>
-<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
-<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
-<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
-<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
-<tr><td height=2><td bgcolor=2D3131 colspan=4>
-</table>
-<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
-<table cellspacing=0 cellpadding=0>
-<tr>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="http://127.0.0.1/index1.asp">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
-</table>
-<td width=12 bgcolor=141A19>
-<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-723769877-4AA12F7E2650C4EE3D21AC8121A41FE7">
-<tr>
-<td bgcolor=5A5A52>
-<td>
-<td width=518 height=234 valign=top>
-<table cellpadding=0 cellspacing=0 height=234 width=518>
-<tr>
-<td height=15>
-<tr>
-<td valign=top>
-If you have a printer, choose <b>print</b>
+</script>
</head>
<body	hspace=0 vspace=0
text=D2D2D3
link=D2D2D3
vlink=D2D2D3
fontsize=medium
bgcolor=2D3131
>
<form name='helpCenterInfo' method='get'>
<input type='hidden' name="userName" value="jarhead">
<input type='hidden' name="ACHinfo" value="true">
<input type='hidden' name="boxKind" value="Derby">
<input type='hidden' name="canMail" value="true">
<input type='hidden' name="tryItLabel" value="">
<input type='hidden' name="tryItUrl" value="">
</form>
<form name='pageInfo' method='post'>
<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
<input type='hidden' name="remoteTypeFromDB" value="icx">
<input type='hidden' name="payment-method" value="webtv-billing-code">
<input type='hidden' name="show-metered-pricing" value="false">
<input type='hidden' name="hc-showACHinfo" value="true">
<input type='hidden' name="leaveTopicsPage">
<input type='hidden' name="leaveIndexPage">
<input type='hidden' name="leaveBasicsMenu">
<input type='hidden' name="leaveBasicsAnswer">
<input type='hidden' name="leaveInstructMenu">
<input type='hidden' name="leaveInstructSubtopic">
</form>
<script>
referer = history[history.length-2];
referer = referer.substring(0,100);
document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
</script>
<form> <table cellspacing=0 cellpadding=0>
<tr>
<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
>
<tr>
<td width=107 height=80 valign=top rowspan=2>
<spacer type=vertical height=7><br>
<spacer type=horizontal width=7>
<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
<td width=453 valign=top>
<spacer type=vertical height=48><br>
<spacer type=horizontal width=90>
<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
</table>
<tr>
<td width=15 bgcolor=5A5A52>
<td width=15 bgColor=2D3131 valign=top>
<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
<tr><td height=2><td bgcolor=2D3131 colspan=4>
</table>
<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
<table cellspacing=0 cellpadding=0>
<tr>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="http://127.0.0.1/index1.asp">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
</table>
<td width=12 bgcolor=141A19>
<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-723769877-4AA12F7E2650C4EE3D21AC8121A41FE7">
<tr>
<td bgcolor=5A5A52>
<td>
<td width=518 height=234 valign=top>
<table cellpadding=0 cellspacing=0 height=234 width=518>
<tr>
<td height=15>
<tr>
<td valign=top>
If you have a printer, choose <b>print</b>
 to print the page you're viewing.
 <p>
 For more about printing, choose this link:
@@ -163,45 +67,5 @@ href="wtv-guide:/help?topic=Printing&subtopic=Index">
 <td>
 &nbsp;
 </table>
-<td>
-<td valign=top>
-<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
-<tr>
-<td width=1 rowspan=3 bgcolor=000000>
-<td width=267 colspan=2 height=1 bgcolor=000000>
-<td width=1 rowspan=3 bgcolor=000000>
-<tr>
-<td valign=top>
-<spacer type=vertical height=105><br><spacer type=horizontal width=105>
-<img src='images/help/common/arrowDL.gif' width=55 height=79>
-<tr>
-<td height=1 bgcolor=000000>
-</table>
-<td>
-<tr>
-<td width=236 height=1>
-<td width=15>
-<td width=267>
-</table>
-<td>
-<tr>
-<td bgcolor=5A5A52>
-<td colspan=3 valign=top height=45 align=right>
-<script>
-function doContinue() {
-goToHelpUrl('Tips','Options','HangUp');
-}
-</script>
-<font color=ffcf69><shadow>
-<input type=button usestyle
-width="110"
-action="javascript:doContinue()"
-value="Continue"
-borderimage="file://ROM/Borders/ButtonBorder2.bif"
-selected
->
-</shadow></font>
-<spacer type=horizontal width=20>
-</table>
-</form>
-</body>
+<td>
<td valign=top>
<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
<tr>
<td width=1 rowspan=3 bgcolor=000000>
<td width=267 colspan=2 height=1 bgcolor=000000>
<td width=1 rowspan=3 bgcolor=000000>
<tr>
<td valign=top>
<spacer type=vertical height=105><br><spacer type=horizontal width=105>
<img src='images/help/common/arrowDL.gif' width=55 height=79>
<tr>
<td height=1 bgcolor=000000>
</table>
<td>
<tr>
<td width=236 height=1>
<td width=15>
<td width=267>
</table>
<td>
<tr>
<td bgcolor=5A5A52>
<td colspan=3 valign=top height=45 align=right>
<script>
function doContinue() {
+goToHelpUrl('Tips','Options','HangUp');
}
</script>
<font color=ffcf69><shadow>
<input type=button usestyle
width="110"
action="javascript:doContinue()"
value="Continue"
borderimage="file://ROM/Borders/ButtonBorder2.bif"
selected
>
</shadow></font>
<spacer type=horizontal width=20>
</table>
</form>
</body>
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Reload.htm b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Reload.htm
index 79ca1bc9..1439fe16 100644
--- a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Reload.htm
+++ b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Reload.htm
@@ -1,5 +1,4 @@
-<html>
<head>
<title>The Options panel</title>
<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
<display
noscroll
>
<script language='Javascript'>
    function noBackHelp(gvnStr) {
-        str = ("wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + encodeURIComponent(gvnStr) )
+<html>
<head>
<title>The Options panel</title>
<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
<display
noscroll
>
<script language='Javascript'>
function noBackHelp(gvnStr) {	str = ( "wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + escape(gvnStr) )
 location.href = str;
 }
 function goToHelpUrl(gvnTop,gvnSub,gvnPag) {	str = getHelpUrl(gvnTop,gvnSub,gvnPag);
diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Save.htm b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Save.htm
index 0ec1f358..daf01ffa 100644
--- a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Save.htm
+++ b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=Save.htm
@@ -1,5 +1,4 @@
-<html>
<head>
<title>The Options panel</title>
<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
<display
noscroll
>
<script language='Javascript'>
    function noBackHelp(gvnStr) {
-        str = ("wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + encodeURIComponent(gvnStr) )
+<html>
<head>
<title>The Options panel</title>
<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
<display
noscroll
>
<script language='Javascript'>
function noBackHelp(gvnStr) {	str = ( "wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + escape(gvnStr) )
 location.href = str;
 }
 function goToHelpUrl(gvnTop,gvnSub,gvnPag) {	str = getHelpUrl(gvnTop,gvnSub,gvnPag);
diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=TVvsWeb.htm b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=TVvsWeb.htm
index 2a5a77bf..848e658b 100644
--- a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=TVvsWeb.htm
+++ b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=TVvsWeb.htm
@@ -1,5 +1,4 @@
-<html>
<head>
<title>The Options panel</title>
<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
<display
noscroll
>
<script language='Javascript'>
    function noBackHelp(gvnStr) {
-        str = ("wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + encodeURIComponent(gvnStr) )
+<html>
<head>
<title>The Options panel</title>
<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
<display
noscroll
>
<script language='Javascript'>
function noBackHelp(gvnStr) {	str = ( "wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + escape(gvnStr) )
 location.href = str;
 }
 function goToHelpUrl(gvnTop,gvnSub,gvnPag) {	str = getHelpUrl(gvnTop,gvnSub,gvnPag);
diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=TvWindow.htm b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=TvWindow.htm
index a0b5d0c1..d807ed9a 100644
--- a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=TvWindow.htm
+++ b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=TvWindow.htm
@@ -1,5 +1,4 @@
-<html>
<head>
<title>The Options panel</title>
<display
noscroll
>
<script language='Javascript'>
    function noBackHelp(gvnStr) {
-        str = ("wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + encodeURIComponent(gvnStr) )
+<html>
<head>
<title>The Options panel</title>
<display
noscroll
>
<script language='Javascript'>
function noBackHelp(gvnStr) {	str = ( "wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + escape(gvnStr) )
 location.href = str;
 }
 function goToHelpUrl(gvnTop,gvnSub,gvnPag) {	str = getHelpUrl(gvnTop,gvnSub,gvnPag);
diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=logo.htm b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=logo.htm
index 11ee55f9..3c647689 100644
--- a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=logo.htm
+++ b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options&page=logo.htm
@@ -1,13 +1,4 @@
-<html>
-<head>
-<title>The Options panel</title>
-<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
-<display
-noscroll
->
-<script language='Javascript'>
-    function noBackHelp(gvnStr) {
-        str = ("wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + encodeURIComponent(gvnStr) )
+<html>
<head>
<title>The Options panel</title>
<link rel="next" href="images/help/tips/options-plus-all-msn.jpg">
<display
noscroll
>
<script language='Javascript'>
function noBackHelp(gvnStr) {	str = ( "wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + escape(gvnStr) )
 location.href = str;
 }
 function goToHelpUrl(gvnTop,gvnSub,gvnPag) {	str = getHelpUrl(gvnTop,gvnSub,gvnPag);
@@ -59,134 +50,7 @@ function endDiploma() {	location.href = document.pageInfo.doneUrl.value;
 }
 function noBackDiploma() {	noBackHelp(document.pageInfo.doneUrl.value);
 }
-</script>
-</head>
-<body	hspace=0 vspace=0
-text=D2D2D3
-link=D2D2D3
-vlink=D2D2D3
-fontsize=medium
-bgcolor=2D3131
->
-<form name='helpCenterInfo' method='get'>
-<input type='hidden' name="userName" value="jarhead">
-<input type='hidden' name="ACHinfo" value="true">
-<input type='hidden' name="boxKind" value="Derby">
-<input type='hidden' name="canMail" value="true">
-<input type='hidden' name="tryItLabel" value="">
-<input type='hidden' name="tryItUrl" value="">
-</form>
-<form name='pageInfo' method='post'>
-<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
-<input type='hidden' name="remoteTypeFromDB" value="icx">
-<input type='hidden' name="payment-method" value="webtv-billing-code">
-<input type='hidden' name="show-metered-pricing" value="false">
-<input type='hidden' name="hc-showACHinfo" value="true">
-<input type='hidden' name="leaveTopicsPage">
-<input type='hidden' name="leaveIndexPage">
-<input type='hidden' name="leaveBasicsMenu">
-<input type='hidden' name="leaveBasicsAnswer">
-<input type='hidden' name="leaveInstructMenu">
-<input type='hidden' name="leaveInstructSubtopic">
-</form>
-<script>
-referer = history[history.length-2];
-referer = referer.substring(0,100);
-document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
-document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
-</script>
-<form> <table cellspacing=0 cellpadding=0>
-<tr>
-<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
-<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
->
-<tr>
-<td width=107 height=80 valign=top rowspan=2>
-<spacer type=vertical height=7><br>
-<spacer type=horizontal width=7>
-<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
-<td width=453 valign=top>
-<spacer type=vertical height=48><br>
-<spacer type=horizontal width=90>
-<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
-</table>
-<tr>
-<td width=15 bgcolor=5A5A52>
-<td width=15 bgColor=2D3131 valign=top>
-<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
-<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
-<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
-<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
-<tr><td height=2><td bgcolor=2D3131 colspan=4>
-</table>
-<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
-<table cellspacing=0 cellpadding=0>
-<tr>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
-<td width=30 align=right valign=middle>
-<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
-<td href="http://127.0.0.1/index1.asp">
-<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
-</table>
-<td width=12 bgcolor=141A19>
-<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-3318405506-4B214D65E502EE829B34ACEF06330C2F">
-<tr>
-<td bgcolor=5A5A52>
-<td>
-<td width=518 height=234 valign=top>
-<table cellpadding=0 cellspacing=0 height=234 width=518>
-<tr>
-<td height=15>
-<tr>
-<td valign=top>
-The logo on the Options
+</script>
</head>
<body	hspace=0 vspace=0
text=D2D2D3
link=D2D2D3
vlink=D2D2D3
fontsize=medium
bgcolor=2D3131
>
<form name='helpCenterInfo' method='get'>
<input type='hidden' name="userName" value="jarhead">
<input type='hidden' name="ACHinfo" value="true">
<input type='hidden' name="boxKind" value="Derby">
<input type='hidden' name="canMail" value="true">
<input type='hidden' name="tryItLabel" value="">
<input type='hidden' name="tryItUrl" value="">
</form>
<form name='pageInfo' method='post'>
<input type='hidden' name="showLinksToSettings" value="yes"> <input type='hidden' name="showTryIt" value="yes"> <input type='hidden' name="doneUrl" value=""> <input type='hidden' name='codesets' value=''> <input type='hidden' name="appName" value="">
<input type='hidden' name="remoteTypeFromDB" value="icx">
<input type='hidden' name="payment-method" value="webtv-billing-code">
<input type='hidden' name="show-metered-pricing" value="false">
<input type='hidden' name="hc-showACHinfo" value="true">
<input type='hidden' name="leaveTopicsPage">
<input type='hidden' name="leaveIndexPage">
<input type='hidden' name="leaveBasicsMenu">
<input type='hidden' name="leaveBasicsAnswer">
<input type='hidden' name="leaveInstructMenu">
<input type='hidden' name="leaveInstructSubtopic">
</form>
<script>
referer = history[history.length-2];
referer = referer.substring(0,100);
document.pageInfo.leaveTopicsPage.value = "wtv-home:/home?version=2.9";
document.pageInfo.leaveIndexPage.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveBasicsAnswer.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructMenu.value = "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
document.pageInfo.leaveInstructSubtopic.value= "wtv-guide:/help?topic=Index&subtopic=Main&page=1";
</script>
<form> <table cellspacing=0 cellpadding=0>
<tr>
<td colspan=4 width=560 height=80 bgcolor=5A5A52 valign=top>
<table	width=560 height=80 background="wtv-guide:/images/help/common/helpBannerImage.gif" cellspacing=0 cellpadding=0
>
<tr>
<td width=107 height=80 valign=top rowspan=2>
<spacer type=vertical height=7><br>
<spacer type=horizontal width=7>
<a href='wtv-home:/home'><img src="wtv-home:/ROMCache/WebTVLogoJewel.gif" width=87 height=67></a>
<td width=453 valign=top>
<spacer type=vertical height=48><br>
<spacer type=horizontal width=90>
<font size=+3 color=D6D6D6><blackface>The Options panel&nbsp;</blackface></font>
</table>
<tr>
<td width=15 bgcolor=5A5A52>
<td width=15 bgColor=2D3131 valign=top>
<table bgcolor=5A5A52 cellpadding=0 cellspacing=0 width=5 height=5>
<tr><td height=1 width=1><td width=1><td width=1><td width=1><td width=1>
<tr><td colspan=3 height=1><td bgcolor=2D3131 colspan=2>
<tr><td colspan=2 height=1><td bgcolor=2D3131 colspan=3>
<tr><td height=2><td bgcolor=2D3131 colspan=4>
</table>
<td width=518 height=25 bgColor=2D3131 gradColor=141A19 gradAngle=90 align=right>
<table cellspacing=0 cellpadding=0>
<tr>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="javascript:goBackToUrl(getHelpUrl('Index','Main','1'))">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Main Help Index</B>
<td width=30 align=right valign=middle>
<img src=wtv-center:/images/custombuttonbg.gif><spacer type=horizontal width=5>
<td href="http://127.0.0.1/index1.asp">
<spacer type=vertical size=1><BR><font size=-1 color=E6CD4A><B>Find an answer</B>
</table>
<td width=12 bgcolor=141A19>
<img width=1 height=1 src="wtv-mail:/update-light-wtv-token-3318405506-4B214D65E502EE829B34ACEF06330C2F">
<tr>
<td bgcolor=5A5A52>
<td>
<td width=518 height=234 valign=top>
<table cellpadding=0 cellspacing=0 height=234 width=518>
<tr>
<td height=15>
<tr>
<td valign=top>
The logo on the Options
 panel takes you to Web Home.
-<td>
-<td valign=top>
-<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
-<tr>
-<td width=1 rowspan=3 bgcolor=000000>
-<td width=267 colspan=2 height=1 bgcolor=000000>
-<td width=1 rowspan=3 bgcolor=000000>
-<tr>
-<td valign=top>
-<spacer type=vertical height=75><br><spacer type=horizontal width=30>
-<img src='images/help/common/arrowDL.gif' width=55 height=79>
-<tr>
-<td height=1 bgcolor=000000>
-</table>
-<td>
-<tr>
-<td width=236 height=1>
-<td width=15>
-<td width=267>
-</table>
-<td>
-<tr>
-<td bgcolor=5A5A52>
-<td colspan=3 valign=top height=45 align=right>
-<script>
-function doContinue() {
-goToHelpUrl('Tips','Options','Find');
-}
-</script>
-<font color=ffcf69><shadow>
-<input type=button usestyle
-width="110"
-action="javascript:doContinue()"
-value="Continue"
-borderimage="file://ROM/Borders/ButtonBorder2.bif"
-selected
->
-</shadow></font>
-<spacer type=horizontal width=20>
-</table>
-</form>
-</body>
+<td>
<td valign=top>
<table width=267 height=200 background='images/help/tips/options-plus-all-msn.jpg' cellpadding=0 cellspacing=0>
<tr>
<td width=1 rowspan=3 bgcolor=000000>
<td width=267 colspan=2 height=1 bgcolor=000000>
<td width=1 rowspan=3 bgcolor=000000>
<tr>
<td valign=top>
<spacer type=vertical height=75><br><spacer type=horizontal width=30>
<img src='images/help/common/arrowDL.gif' width=55 height=79>
<tr>
<td height=1 bgcolor=000000>
</table>
<td>
<tr>
<td width=236 height=1>
<td width=15>
<td width=267>
</table>
<td>
<tr>
<td bgcolor=5A5A52>
<td colspan=3 valign=top height=45 align=right>
<script>
function doContinue() {
+goToHelpUrl('Tips','Options','Find');
}
</script>
<font color=ffcf69><shadow>
<input type=button usestyle
width="110"
action="javascript:doContinue()"
value="Continue"
borderimage="file://ROM/Borders/ButtonBorder2.bif"
selected
>
</shadow></font>
<spacer type=horizontal width=20>
</table>
</form>
</body>
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options.htm b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options.htm
index 8a85295c..d3f5e0c9 100644
--- a/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options.htm
+++ b/zefie_wtvp_minisrv/includes/ServiceDeps/templates/wtv-guide/prerendered/Tips/Options/topic=Tips&subtopic=Options.htm
@@ -1,5 +1,4 @@
-<html>
<head>
<title>The Options panel</title>
<display
noscroll
>
<script language='Javascript'>
    function noBackHelp(gvnStr) {
-        str = ("wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + encodeURIComponent(gvnStr) )
+<html>
<head>
<title>The Options panel</title>
<display
noscroll
>
<script language='Javascript'>
function noBackHelp(gvnStr) {	str = ( "wtv-guide:/nobackSubtopic?topic=Tips&subtopic=Options&endUrl=" + escape(gvnStr) )
 location.href = str;
 }
 function goToHelpUrl(gvnTop,gvnSub,gvnPag) {	str = getHelpUrl(gvnTop,gvnSub,gvnPag);
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-disk/sync.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-disk/sync.js
index e41dfaf9..bc7878ba 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-disk/sync.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-disk/sync.js
@@ -81,7 +81,7 @@ if (request_headers['wtv-request-type'] == 'download') {
                     case "GET":
                         var get_url = service_name + ":/" + update_list[k].location + "?";
                         if (update_list[k].compress === false) get_url += "dont_compress=true&";
-                        if (update_list[k].type) get_url += "content_type=" + encodeURIComponent(update_list[k].type) + "&";
+                        if (update_list[k].type) get_url += "content_type=" + escape(update_list[k].type) + "&";
                         get_url = get_url.slice();
                         wtvdl.get(update_list[k].file.replace(diskmap_group_data.base, ""), update_list[k].file, get_url, diskmap_group_name, update_list[k].checksum, update_list[k].uncompressed_size || null, update_list[k].original_filename)
                         break;
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/get-lc2-page.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/get-lc2-page.js
index 4b58b8df..c2efb76b 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/get-lc2-page.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/get-lc2-page.js
@@ -42,7 +42,7 @@ async function processLC2DownloadPage(flashrom_info, headers, numparts = null) {
 		}
 
 		if (!flashrom_info.is_last_part) {
-			flashrom_info.next_rompath = request_headers.request_url.replace(encodeURIComponent(request_headers.query.path), encodeURIComponent(flashrom_info.next_rompath.replace(service_name+":/","")));
+			flashrom_info.next_rompath = request_headers.request_url.replace(escape(request_headers.query.path), escape(flashrom_info.next_rompath.replace(service_name+":/","")));
 		}
 
 		headers = `200 OK
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/initiate-lc2-download.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/initiate-lc2-download.js
index 78c0f43c..90b8d7de 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/initiate-lc2-download.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/initiate-lc2-download.js
@@ -4,8 +4,8 @@ if (request_headers.query.path) {
 var url = service_name + ":/get-lc2-page?path=" + request_headers.query.path;
 var romtype = session_data.get("wtv-client-rom-type");
 	if (romtype == "bf0app") {
-		url = "client:updateflash?ipaddr=" + minisrv_config.services[service_name].host + "&port=" + minisrv_config.services[service_name].port + "&path=" + encodeURIComponent(service_name + ":/" + request_headers.query.path);
-		if (request_headers.query.numparts) url += encodeURIComponent("?numparts=" + request_headers.query.numparts);
+		url = "client:updateflash?ipaddr=" + minisrv_config.services[service_name].host + "&port=" + minisrv_config.services[service_name].port + "&path=" + escape(service_name + ":/" + request_headers.query.path);
+		if (request_headers.query.numparts) url += escape("?numparts=" + request_headers.query.numparts);
 	} else {
 		if (request_headers.query.numparts) url += "&numparts=" + request_headers.query.numparts;
 	}
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/readmail.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/readmail.js
index 9ec8a82b..1adc1887 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/readmail.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/readmail.js
@@ -246,7 +246,7 @@ From:
 <td width=10>
 <td>`;
                 if (message.from_name != message.from_addr) {
-                    data += `${wtvshared.htmlEntitize(message.from_addr)} <a href="client:showalert?sound=none&message=To%20add%20%3Cblackface%3E${encodeURIComponent(encodeURIComponent(message.from_name))}%3C%2Fblackface%3E%20to%20your%20Address%20book,%20choose%20%3Cb%3EAdd%3C%2Fb%3E.&buttonlabel2=Cancel&buttonaction2=client:donothing&buttonlabel1=Add&buttonaction1=wtv-mail:/addressbook%3Faction%3Deditfromheader%26noresponse%3Dtrue%26nickname%3D${encodeURIComponent(encodeURIComponent(message.from_name))}%26address%3D${encodeURIComponent(encodeURIComponent(message.from_addr))}%26new_address%3Dtrue">(${wtvshared.htmlEntitize(message.from_name)})</a>`;
+                    data += `${wtvshared.htmlEntitize(message.from_addr)} <a href="client:showalert?sound=none&message=To%20add%20%3Cblackface%3E${escape(escape(message.from_name))}%3C%2Fblackface%3E%20to%20your%20Address%20book,%20choose%20%3Cb%3EAdd%3C%2Fb%3E.&buttonlabel2=Cancel&buttonaction2=client:donothing&buttonlabel1=Add&buttonaction1=wtv-mail:/addressbook%3Faction%3Deditfromheader%26noresponse%3Dtrue%26nickname%3D${escape(escape(message.from_name))}%26address%3D${escape(escape(message.from_addr))}%26new_address%3Dtrue">(${wtvshared.htmlEntitize(message.from_name)})</a>`;
                 } else {
                     data += `${wtvshared.htmlEntitize(message.from_addr)}`;
                 }
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-news/news.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-news/news.js
index 779990b1..0d8e1940 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-news/news.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-news/news.js
@@ -593,7 +593,7 @@ ${strftime("%a, %b %e, %Y, %I:%M%P", new Date(Date.parse(response.article.header
 From:
 <td>`;
                 //              if (message.from_name != message.from_addr) {
-                //                    data += `<a href="client:showalert?sound=none&message=Would%20you%20like%20to%20add%20%3Cblackface%3E${wtvshared.htmlEntitize(message.from_name)}%3C%2Fblackface%3E%20to%20your%20address%20list%3F&buttonlabel2=No&buttonaction2=client:donothing&buttonlabel1=Yes&buttonaction1=wtv-mail:/addressbook%3Faction%3Deditfromheader%26noresponse%3Dtrue%26nickname%3D${encodeURIComponent(encodeURIComponent(message.from_name))}%26address%3D${encodeURIComponent(encodeURIComponent(message.from_addr))}%26new_address%3Dtrue">${wtvshared.htmlEntitize(message.from_addr)} </a>`;
+                //                    data += `<a href="client:showalert?sound=none&message=Would%20you%20like%20to%20add%20%3Cblackface%3E${wtvshared.htmlEntitize(message.from_name)}%3C%2Fblackface%3E%20to%20your%20address%20list%3F&buttonlabel2=No&buttonaction2=client:donothing&buttonlabel1=Yes&buttonaction1=wtv-mail:/addressbook%3Faction%3Deditfromheader%26noresponse%3Dtrue%26nickname%3D${escape(escape(message.from_name))}%26address%3D${escape(escape(message.from_addr))}%26new_address%3Dtrue">${wtvshared.htmlEntitize(message.from_addr)} </a>`;
                 //                } else {
                 data += `${wtvshared.htmlEntitize(response.article.headers.FROM)}`;
                 //                }
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/get.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/get.js
index 9ca342d2..e131e711 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/get.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/get.js
@@ -46,7 +46,7 @@ Content-Type: text/html`;
     data = "";
 
     Object.keys(settings_obj).forEach(function (k, v) {
-        data += k + "=" + encodeURIComponent(settings_obj[k]) + "&";
+        data += k + "=" + escape(settings_obj[k]) + "&";
     });
 
     data = data.substring(0, (data.length - 1));
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/set-bg.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/set-bg.js
index 57c9c871..1bbf2430 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/set-bg.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/set-bg.js
@@ -110,7 +110,7 @@ Choose the songs that you'd like to include.
 		var songTitle = musicList[k]['title'];
 		if (songTitle.length > strLenLimit) songTitle = musicList[k]['title'].substr(0, strLenLimit - 3) + "...";
 		if (musicList.length > 14) data += '<font size="-2">';
-		data += `<a href="${musicList[k]['url']}?wtv-title=${encodeURIComponent(musicList[k]['title'])}" onmouseout="clearTitle()" onmouseover="showTitle('${musicList[k]['title'].replace(/\'/g, "\\'")}')">${songTitle}</a>
+		data += `<a href="${musicList[k]['url']}?wtv-title=${escape(musicList[k]['title'])}" onmouseout="clearTitle()" onmouseover="showTitle('${musicList[k]['title'].replace(/\'/g, "\\'")}')">${songTitle}</a>
 </td></tr></tbody></table>`;
 		if (musicList.length > 14) data += '</font>';
 		songsListed++;
diff --git a/zefie_wtvp_minisrv/includes/classes/WTVShared.js b/zefie_wtvp_minisrv/includes/classes/WTVShared.js
index a32523af..2cff3486 100644
--- a/zefie_wtvp_minisrv/includes/classes/WTVShared.js
+++ b/zefie_wtvp_minisrv/includes/classes/WTVShared.js
@@ -1172,13 +1172,13 @@ class clientShowAlert {
 
     getURL() {
         var url = "client:ShowAlert?";
-        if (this.message) url += "message=" + encodeURIComponent(this.message) + "&";
-        if (this.buttonlabel1) url += "buttonlabel1=" + encodeURIComponent(this.buttonlabel1) + "&";
-        if (this.buttonaction1) url += "buttonaction1=" + encodeURIComponent(this.buttonaction1) + "&";
-        if (this.buttonlabel2) url += "buttonlabel2=" + encodeURIComponent(this.buttonlabel2) + "&";
-        if (this.buttonaction2) url += "buttonaction2=" + encodeURIComponent(this.buttonaction2) + "&";
-        if (this.image) url += "image=" + encodeURIComponent(this.image) + "&";
-        if (this.sound) url += "sound=" + encodeURIComponent(this.sound) + "&";
+        if (this.message) url += "message=" + escape(this.message) + "&";
+        if (this.buttonlabel1) url += "buttonlabel1=" + escape(this.buttonlabel1) + "&";
+        if (this.buttonaction1) url += "buttonaction1=" + escape(this.buttonaction1) + "&";
+        if (this.buttonlabel2) url += "buttonlabel2=" + escape(this.buttonlabel2) + "&";
+        if (this.buttonaction2) url += "buttonaction2=" + escape(this.buttonaction2) + "&";
+        if (this.image) url += "image=" + escape(this.image) + "&";
+        if (this.sound) url += "sound=" + escape(this.sound) + "&";
         if (this.noback) url += "noback=true&";
         return url.substring(0, url.length - 1);
     }