diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/README b/koha-tmpl/intranet-tmpl/default/zh-TW/README
index c54ced9e8c..2f6257f2e9 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/README
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/README
@@ -45,6 +45,7 @@ metadata			
 on loan								[HKPL]
 optional* (not mandatory)	パㄏノ			[NCL]
 physical description		絔琩兜				[HKPL]
+preference			把计% [Note 1]
 printer				ゴ诀%
 publisher							[HKPL]
 record (n.)			癘魁				[HKPL]
@@ -65,3 +66,23 @@ uniform title			
 user				弄%
 user area			弄盡跋%
 user home			弄盡跋%
+value				把计 (Note 2)
+variable			把计% (Note 1)
+
+-------------------------------------------------------------------------------
+Note 1: "variable" as used in "system parameters", i.e., "parameter"
+	[parameters/systempreferences.tmpl]
+Note 2: is "砞﹚" better?
+	[parameters/systempreferences.tmpl]
+-------------------------------------------------------------------------------
+
+Form not submitted because of the following problem(s)\n
+See parameters/systempreferences.tmpl
+
+-------------------------------------------------------------------------------
+
+HTML markup syntax errors:
+parameters/systempreferences.tmpl
+
+"Parameters" in the top menu leads to all kinds of system stuff
+"Preferences"
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc
index 4ca1e33dd7..43eae30181 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-bottom.inc
@@ -4,20 +4,17 @@
 
 </BLOCKQUOTE>
 
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
-
 <CENTER>
 <FONT SIZE=2  face="arial, helvetica">
 <A HREF="/cgi-bin/koha/mainpage.pl"></a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">瑈硄狝叭</a> ||
-<A HREF="/cgi-bin/koha/catalogue-home.pl">繻旅琩高</a> ||
+<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">繻旅琩高</a> ||
 <A HREF="/cgi-bin/koha/members-home.pl">弄眀め</a> ||
 <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">虑潦竚</a> ||
+<A HREF="/cgi-bin/koha/circ/circulation.pl">瑈硄狝叭</a> ||
 <A HREF="/cgi-bin/koha/reports-home.pl">厨</a> ||
-<A HREF="/cgi-bin/koha/admin-home.pl">╰参砞﹚</a> ||
-<A HREF="/help/">ㄏノ弧</a>
+<A HREF="/cgi-bin/koha/admin-home.pl">╰参把计</a> ||
+<A HREF="/cgi-bin/koha/about.pl">Τ闽<mi>Koha</mi></a> || 
+Help
 </FONT>
 </CENTER>
 </BODY>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc
index 31a3f62a84..a7dbf0afeb 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc
@@ -1,120 +1,108 @@
 <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<!--Authored by rachel@katipo.co.nz 104:38 1/11/99-->
-<!--updated by rachel@katipo.co.nz 12:24 12/01/00-->
 
 <html>
 <head>
 <title>KOHA: INTRANET: Parameters</title>
 <meta http-equiv="Content-Type" content="text/html; charset=big5">
+<link rel="stylesheet" type="text/css" href="<TMPL_VAR name="themelang">/includes/common-style.css">
+</head>
+<body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300"
+marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
 
-
-<style type="text/css">
-<!--
-select,option {font-size:12px}
--->
-
+<style>
+a.parameters {
+	background-color: #86c268;
+	font-weight: normal;
+	text-decoration: none;
+	cursor: hand;
+	color: #FFFFFF;
+	padding:4px;
+	font-weight: bold;
+	}
+a.parameters:hover {
+	background-color: #86c268;
+	color: #FFFFFF;
+	text-decoration: normal;
+	font-weight: bold;
+	}
 </style>
 
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-
-// go to page selected from options menu
-
-function leapto(form) {
-var myindex=form.dest.selectedIndex
-parent.location.href=(form.dest.options[myindex].value);
-}
-
-function focusinput() {
-    window.onerror=null;
-    if (document.forms[0]) {
-	document.forms[0].elements[0].focus();
-    }
-}
-
-if (document.images){
-
-menu=new Image;
-menu.src ="/images/cat-cat.gif"
-
-}
-
-function messenger(url){
-  window1=window.open(url,"window1","height=250,width=350,left=150,top=50,350,screenY=50");
-
-}
-
-//-->
-
-</script>
-
-</head>
-<body text="black" bgcolor="white" link="#0000ff"
-vlink="#0000ff" "3366cc" Alink="#cc3300"
-marginheight=0 marginwidth=0 leftmargin=0 topmargin=0
-onLoad=focusinput()>
-
-
-
-
-<!--HDL Colours
-
-	Yellow = ffcc00
-	light blue = ccccff
-	bright blue links = 0000ff
-	aubergine = 663266
-	light green/grey = cccc99
-
-
--->
-
 <!------------------------MENUS-------------------------------->
-
 <table cellpadding=0 cellspacing=0 width="100%" border=0>
-<tr bgcolor=663266 >
-
-	<td  valign=top>
-	<table cellpadding=0 cellspacing=0  border=0 height=29>
-	<tr valign=top bgcolor=663266 >
-	<td background="/images/catalogue-spot-1.gif" width="224"
-	height="29"><font size=1 face="arial"><img src="/images/holder.gif" width=210 height=4 alt=" " hspace=0 vspace=0><br>
-	<img src="/images/holder.gif"
-	width=35 height=21 align=left alt=" " hspace=0 vspace=0><font size="+1">KOHA: <a href="/cgi-bin/koha/mainpage.pl">匡虫</a></font><br>
-	<img src="/images/holder.gif" width=210 height=1 alt=" " hspace=0 vspace=0></FONT></td>
-
-	</TR></TABLE> </td>
-
-
-	<td  valign=bottom align=right>
-<img src="/images/holder.gif"  WIDTH=1  HEIGHT=38 HSPACE=0 vspace=0></td>
-<td  valign=bottom align=right>
-	<table cellpadding=0 cellspacing=0  border=0 height=29><tr><td>
-<img src=/images/cat-cat.gif border="0" name=menu usemap="#map" HSPACE=0 vspace=0 ></td>
-
-	</TR></TABLE></TD>
+<tr height="65">
+	<td valign="bottom" align="left">
+		<table bgcolor="dddddd" width="100%" cellpadding=0 cellspacing=0>
+		<tr>
+			<td>
+			<div id="menubar">
+			<table cellpadding=0 cellspacing=0  border=0 height=29 width=70%>
+				<tr>
+					<td class="koha"><b>KOHA</b></td>
+					<td>
+						<a class="home" href="/cgi-bin/koha/mainpage.pl"></a>
+					</td>
+					<td>
+						<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">繻旅琩高</a>
+					</td>
+					<td>
+						<a class="members" href="/cgi-bin/koha/members-home.pl">弄眀め</a>
+					</td>
+					<td>
+						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">虑潦竚</a>
+					</td>
+					<td>
+						<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">瑈硄狝叭</a>
+					</td>
+					<td>
+						<a class="reports" href="/cgi-bin/koha/reports-home.pl">厨</a>
+					</td>
+					<td>
+						<a class="parameters" href="/cgi-bin/koha/admin-home.pl">╰参砞﹚</a>
+					</td>
+					<td>
+						<a class="about" href="/cgi-bin/koha/about.pl">Τ闽<span lang=mi>Koha</span></a>
+					</td>
+				</TR>
+			</TABLE>
+			</div>
+			<div id="submenu" style="border-left:0px;">
+			<table cellpadding=0 cellspacing=0  border=0 height=20>
+				<tr>
+					<td width="100"></td>
+					<td><b>匡兜 &gt;&gt;&nbsp;&nbsp;</b></td>
+					<td>
+						<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Funds</a>
+					</td>
+					<td>
+						<div id="submenu">
+						<a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu">Auth value</a>
+						</div>
+					</td>
+					<td>
+						<div id="submenu">
+						<a href="/cgi-bin/koha/admin/thesaurus.pl" class="submenu">Thesaurus</a>
+						</div>
+					</td>
+					<td>
+						<div id="submenu">
+						<a href="/cgi-bin/koha/admin/currency.pl" class="submenu">Currencies</a>
+						</div>
+					</td>
+					<td>
+						<div id="submenu">
+						<a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Printers</a>
+						</div>
+					</td>
+				</tr>
+			</table>
+			</div>
+		</td></tr></table>
+	</TD>
 </tr>
-
-</tr>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=3><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR>
-
 </table>
-
-
-<map name="map">
-<area shape="rect" coords="18,8,84,27" href="/cgi-bin/koha/catalogue-home.pl" alt="Catalogue" onMouseOver="if(document.images)document.menu.src='/images/cat-cat.gif'" onMouseOut="if(document.images)document.menu.src='/images/cat-cat.gif'">
-
-<area shape="rect" coords="94,8,149,28" href="/cgi-bin/koha/members-home.pl" alt="Members" onMouseOver="if(document.images)document.menu.src='/images/cat-mem.gif'" onMouseOut="if(document.images)document.menu.src='/images/cat-cat.gif'">
-
-<area shape="rect" coords="154,9,212,29" alt="Acquisitions"   href="/cgi-bin/koha/loadmodules.pl?module=acquisitions" onMouseOver="if(document.images)document.menu.src='/images/cat-acq.gif'" onMouseOut="if(document.images)document.menu.src='/images/cat-cat.gif'">
-
-<area  shape="rect"alt="Reports"  coords="217,7,289,27"href="/cgi-bin/koha/reports-home.pl" onMouseOver="if(document.images)document.menu.src='/images/cat-rep.gif'" onMouseOut="if(document.images)document.menu.src='/images/cat-cat.gif'">
-
-<area shape="rect" coords="306,8,352,27" href="/cgi-bin/koha/circ/circulation.pl" alt="Circulation" onMouseOver="if(document.images)document.menu.src='/images/cat-crc.gif'" onMouseOut="if(document.images)document.menu.src='/images/cat-cat.gif'">
-
-<area  shape="rect" alt="Home" coords="374,9,419,29" href="/cgi-bin/koha/mainpage.pl" onMouseOver="if(document.images)document.menu.src='/images/cat-hom.gif'" onMouseOut="if(document.images)document.menu.src='/images/cat-cat.gif'">
-<area shape="default" nohref>
-</map>
-
-
-
 <BLOCKQUOTE>
+<TMPL_IF NAME="loggedinusername">
+    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinusername"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Log Out</a>]</p>
+<TMPL_ELSE>
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
+</TMPL_IF>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/systempreferences.tmpl
index ee0ae4b4db..abf1ec5da4 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/systempreferences.tmpl
@@ -1,9 +1,4 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>ヘ玡祅: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>祅</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>祅</a> <span lang=mi>Koha</span></p>
-</TMPL_IF>
+<TMPL_INCLUDE NAME="parameters-top.inc">
 
 <script>
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -43,16 +38,16 @@
 		var _alertString="";
 		var alertString2;
 		if (f.variable.value.length==0) {
-			_alertString += "- variable missing\\n";
+			_alertString += "- variable missing\n";
 		}
 		if (f.value.value.length==0) {
-			_alertString += "- value missing\\n";
+			_alertString += "- value missing\n";
 		}
 		if (_alertString.length==0) {
 			document.Aform.submit();
 		} else {
-			alertString2 = "Form not submitted because of the following problem(s)\\n";
-			alertString2 += "------------------------------------------------------------------------------------\\n\\n";
+			alertString2 = "Form not submitted because of the following problem(s)\n";
+			alertString2 += "------------------------------------------------------------------------------------\n\n";
 			alertString2 += _alertString;
 			alert(alertString2);
 		}
@@ -61,13 +56,21 @@
 
 <TMPL_IF name="add_form">
 <!-------------------------------------------------------------------------------------------------->
-	<H1><TMPL_VAR name="action"></H1>
+	<TMPL_IF NAME=modify>
+		<h1>э╰参把计</h1>
+	<TMPL_ELSE>
+		<H1>穝糤╰参把计</H1>
+	</TMPL_IF>
 	<form action='<TMPL_VAR name="script_name">' name=Aform method=post>
 	<input type=hidden name=op value='add_validate'>
-	<input type=hidden name=explanation value='<TMPL_VAR name="explanation">'>
 	<table>
-	<tr><td>把计</td><td><TMPL_VAR name="searchfield"></td></tr>
-	<tr><td>瞷</td><td><input type=text name=value value='<TMPL_VAR name="value">'></td></tr>
+	<TMPL_IF NAME=searchfield>
+		<tr><td>把计</td><td><TMPL_VAR name="searchfield"><input type=hidden name=variable value='<TMPL_VAR NAME=searchfield>'></td></tr>
+	<TMPL_ELSE>
+		<tr><td>把计</td><td><input type=text name=variable></td></tr>
+	</TMPL_IF>
+	<tr><td>把计</td><td><input type=text name=value value='<TMPL_VAR name="value" escape=HTML>'></td></tr>
+	<tr><td>弧</td><td><input type=text name=explanation size=80 value='<TMPL_VAR name="explanation" escape=HTML>'></td></tr>
 	<tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
 	</table>
 	</form>
@@ -75,7 +78,7 @@
 
 <TMPL_IF name="add_validate">
 <!-------------------------------------------------------------------------------------------------->
-	data recorded
+	Θ糶把计
 	<form action='<TMPL_VAR name="script_name">' method=post>
 	<input type=submit value=OK>
 	</form>
@@ -85,18 +88,20 @@
 <!-------------------------------------------------------------------------------------------------->
 <table border=0 cellspacing=0 cellpadding=2>
 	<tr valign=top bgcolor=#99cc33>
-		<td background="/images/background-mem.gif"><b>Variable</b></td>
-		<td background="/images/background-mem.gif"><b><TMPL_VAR name="searchfield"></b></td>
+		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Variable</b></td>
+		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b><TMPL_VAR name="searchfield"></b></td>
 	</tr>
 	<tr><td>Value</td><td><TMPL_VAR name="Tvalue"></td></tr>
 	<form action='<TMPL_VAR name="script_name">' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=searchfield value='<TMPL_VAR name="searchfield">'>
-	<tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>
+	<tr><td colspan=2 align=center>痷璶埃</td></tr>
 	<tr><td><INPUT type=submit value='YES'></form></td><td><form action='$script_name' method=post><input type=submit value=NO></form></td></tr>
+</table>
+
 </TMPL_IF>
 
 <TMPL_IF name="delete_confirmed">
 <!-------------------------------------------------------------------------------------------------->
-	data deleted
+	Θ埃把计
 	<form action='<TMPL_VAR name="script_name">' method=post>
 	<input type=submit value=OK>
 	</form>
@@ -104,7 +109,7 @@
 
 <!-------------------------------------------------------------------------------------------------->
 <TMPL_IF name="else">
-<font SIZE=6><em>╰参砞﹚</em></font>
+<h1>╰参砞﹚</h1>
 <form action=/cgi-bin/koha/admin/systempreferences.pl method=post>
 	<input type=text name=searchfield value="">
 	<input type=reset name=reset value="睲">
@@ -112,33 +117,37 @@
 <TMPL_VAR name="searchfield">
 <table border=0 cellspacing=0 cellpadding=2>
 <tr valign=top bgcolor=#99cc33>
-	<td background="/images/background-mem.gif"><b>把计</b></td>
-	<td background="/images/background-mem.gif"><b>瞷</b></td>
-	<td background="/images/background-mem.gif"><b>弧</b></td>
-	<td background="/images/background-mem.gif">&nbsp;</td>
-	<td background="/images/background-mem.gif">&nbsp;</td>
+	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>把计</b></td>
+	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>把计</b></td>
+	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>弧</b></td>
+	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">&nbsp;</td>
+	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">&nbsp;</td>
 <TMPL_LOOP name="loop">
 </tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
 	<td><TMPL_VAR name="variable"></td>
 	<td><TMPL_VAR name="value"></td>
 	<td><TMPL_VAR name="explanation"></td>
-	<td nowrap><a href="<TMPL_VAR name="edit">">э</a></td>
-	<td nowrap><a href="<TMPL_VAR name="delete">">埃</a></td>
+	<td><a href="<TMPL_VAR name="edit">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0>э</a></td>
+	<td><a href="<TMPL_VAR name="delete">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0>埃</a></td>
 </tr>
 </TMPL_LOOP>
 <form action='<TMPL_VAR name="script_name">' method=post>
 <input type=hidden name=op value=add_form>
 </table>
-	<form action='<TMPL_VAR name="script_name">' method=post>
-	<input type=hidden name=op value=add_form>
 <table width=40%>
 	<tr>
 		<td width=50%><TMPL_VAR name="previous"></td>
 		<td width=50%><TMPL_VAR name="next"></td>
 	</tr>
 </table>
-<br><input type=image src="/images/button-add-new.gif"  WIDTH=188  HEIGHT=44  ALT="Add budget" BORDER=0 ></a><br>
 </form>
+
+<form action=<TMPL_VAR name="script_name"> method=post>
+        <input type='hidden' name='op' value='add_form'>
+        <input type=submit class="button" value='穝糤╰参把计'>
+</form>
+
 </TMPL_IF>
 
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+
+<TMPL_INCLUDE NAME="parameters-bottom.inc">