diff --git a/data/Main/WebLinks.txt b/data/Main/WebLinks.txt
index 29ef614..bf09f61 100644
--- a/data/Main/WebLinks.txt
+++ b/data/Main/WebLinks.txt
@@ -1,14 +1,14 @@
 %META:TOPICINFO{author="ProjectContributor" date="1174668643" format="1.1" reprev="1.4" version="$Rev$"}%
 ---+ %TOPIC%
 
-Sidebar navigation in the %WEB% web. See also the %SYSTEMWEB%.TWikiWebLinks
+Sidebar navigation in the %WEB% web. See also the %SYSTEMWEB%.SiteLinks
 
 %STARTINCLUDE%<!-- main.weblinks -->
    * [[%SYSTEMWEB%.WelcomeGuest][%MAKETEXT{"Welcome"}%]]
    * [[%USERREGISTRATION%][%MAKETEXT{"Registration"}%]] %IFDEFINEDTHEN{"%IFEXISTS{"%USERSWEB%.%WIKIUSERSTOPIC%"}%" as="1" glue="off"}%
    * [[%USERSWEB%.%WIKIUSERSTOPIC%][%MAKETEXT{"Users"}%]] %FIDEFINED%
    * [[%USERSWEB%.WikiGroups][%MAKETEXT{"Groups"}%]]
-   * [[%SYSTEMWEB%.ChangePassword][%MAKETEXT{"Password"}%]]%WEBCOMPONENT{"TWikiWebLinks"}% 
+   * [[%SYSTEMWEB%.ChangePassword][%MAKETEXT{"Password"}%]]
 <!-- //main.weblinks -->%STOPINCLUDE%
 
 
diff --git a/data/Main/TWikiGuestSideBar.txt b/data/Main/WikiGuestSideBar.txt
similarity index 100%
rename from data/Main/TWikiGuestSideBar.txt
rename to data/Main/WikiGuestSideBar.txt
diff --git a/data/System/AjaxWebSelector.txt b/data/System/AjaxWebSelector.txt
new file mode 100644
index 0000000..e23163b
--- /dev/null
+++ b/data/System/AjaxWebSelector.txt
@@ -0,0 +1,223 @@
+%META:TOPICINFO{author="ProjectContributor" date="1243950128" format="1.1" reprev="1.4" version="1.4"}%
+---+!! %TOPIC%
+%TOC%
+
+%JQREQUIRE{"chili"}%
+---++ Webs
+<verbatim class="tml">
+%STARTSECTION{"webs"}%
+<literal>
+%FLEXWEBLIST{
+  subwebs="none"
+  header="[{"
+  format="$n$indent   id:'$web',$n$indent   name:'$name',$n$indent   parent:'$parent',$n$indent   depth: $depth,$n$indent   color:'$color',$n$indent   description:'$sitemapuseto',$n$indent   nrsubwebs: $nrsubwebs,$n$indent   url: '$url'$n$indent" 
+  subheader=",   subwebs:$n$indent   [{"
+  separator="},{" 
+  subseparator="},{" 
+  subfooter="}]$n$indent"
+  footer="}]$n"
+}%
+</literal>
+%ENDSECTION{"webs"}%
+</verbatim>
+
+---++ Webselector
+<verbatim class="tml">
+%STARTINCLUDE%<!-- webselector -->
+%JQREQUIRE{"gradient"}% %JQREQUIRE{"simplemodal"}%<!-- jqrequire// -->
+<style type="text/css">@import url(%ATTACHURLPATH%/webselector.css);</style>
+<script type="text/javascript" src="%ATTACHURLPATH%/webselector.js"></script>
+<div id="weblist" class="foswikiFormSteps" style="display:none">
+---++ Select a web
+<table><tr>
+  <td>
+    <input type="text" class="foswikiInputField" id="webName" size="30" />
+    <input type="hidden" id="webId" />
+    <input type="hidden" id="webUrl" />
+  </td>
+  <td>
+    %BUTTON{"Go" icon="page_white_go" id="webGo"}%
+  </td>
+</tr></table>
+<div class="container"></div>
+</div>
+</div>
+<!-- //webselector -->%STOPINCLUDE%
+</verbatim>
+
+---++ Webselector.css
+<verbatim class="css">
+%STARTATTACH{"webselector.css"}%
+.weblet {
+  float:left;
+  padding:10px;
+  margin:0px 10px 10px 0px;
+  border:1px solid #ddd;
+  width:100px;
+  height:100px;
+  position:relative;
+  font-size:95%;
+  overflow:hidden;
+}
+.weblet h2 {
+  margin:0px;
+  border:0px;
+}
+.weblet .parent {
+  font-size:95%;
+  font-style:italic;
+}
+.weblet .desc {
+  margin-top:0.1em;
+}
+.weblet .more {
+  margin-top:0.1em;
+}
+.weblet .more a {
+  text-decoration:none;
+}
+#weblist .container {
+  margin-top:10px;
+  width:550px;
+  height:390px;
+  overflow-x:hidden;
+  overflow-y:auto;
+}
+.weblet h2 {
+  margin-top:0px;
+  font-size:105%;
+  font-weight:bold;
+  color:#222;
+}
+.weblet.selected {
+  border:1px solid red;
+}
+%ENDATTACH%
+</verbatim>
+
+---++ Webselector.js
+<verbatim class="js">
+%STARTATTACH{"webselector.js"}%
+(function($) {
+webSelector = {
+   show: function() {
+    $("#weblist").modal({
+      persist:true, 
+      onShow: webSelector.init
+    });
+    $(window).trigger("resize");
+    return false;
+  },
+
+  spaceOutWikiWord: function(wikiWord) {
+    return wikiWord.replace(/([a-z])([A-Z0-9]+)/g, "$1 $2");
+  },
+
+  addWeblets: function(webs, $container) {
+    for (var i in webs) {
+      var web = webs[i];
+      var color = web.color;
+      if (color == '') 
+        color = 'dddddd';
+      color = color.replace(/#/g, '');
+      var webName = webSelector.spaceOutWikiWord(web.name);
+
+      var $weblet = $("<div class='weblet' id='"+web.id+"'>"+
+        "<h2>"+webName+"</h2>"+
+        (web.parent?"<div class='parent'> In "+web.parent+"</div>":"")+
+        "<div class='desc'>"+web.description+"</div>"+
+        (web.nrsubwebs?"<div class='more'><a href='#'>more &#187;</a></div>":"")+
+        "<input type='hidden' name='webUrl' value='"+web.url+"' />"+
+        "<input type='hidden' name='webName' value='"+web.name+"' />"+
+        "</div>").
+        appendTo($container);
+      $weblet.gradient({to:'ffffff', from:color});
+      webSelector.addWeblets(web.subwebs, $container);
+    }
+  },
+
+  selectWeblet: function(elem) {
+    var webId = '', webName= '', webUrl = '';
+    if (elem) {
+      if ($(elem).hasClass("selected")) {
+        return webSelector.goWeb();
+      }
+      webId = $(elem).attr('id');
+      webName = $(elem).find("input[name=webName]").val();
+      webUrl = $(elem).find("input[name=webUrl]").val();    
+    }
+    $("#webId").val(webId);
+    $("#webName").val(webName);
+    $("#webUrl").val(webUrl);
+    $("#weblist .weblet").removeClass("selected");
+    if (elem)
+      $(elem).addClass("selected");
+  },
+
+  goWeb: function() {
+    var webUrl = $("#webUrl").val();
+    if (webUrl) {
+      window.location.href = webUrl;
+    }
+    return false;
+  },
+
+  init: function() {
+    if (typeof(webSelector.webs) == 'undefined') {
+      var $container = $("#weblist .container");
+      var url = "%SCRIPTURL{view}%/%WEB%/%TOPIC%?section=webs;skin=text;contenttype=text/plain";
+      $.getJSON(url, function(data) {
+        webSelector.webs = data;
+        webSelector.addWeblets(data, $container);
+        $(".weblet").click(function() {
+          webSelector.selectWeblet(this);
+        });
+        $("#webGo").click(webSelector.goWeb);
+      });
+
+      $("#webName").keyup(function(e) {
+        var webName = $(this).val();
+        var count = 0;
+        var foundWeblet;
+        if (webName) {
+          $(".weblet").each(function() {
+            var thisName = $(this).find("input[name=webName]").val();
+            if (thisName.indexOf(webName) == 0) {
+              $(this).show();
+              count++;
+              foundWeblet = this;
+            } else {
+              $(this).hide();
+            }
+          });
+        } else {
+          $(".weblet").show();
+          webSelector.selectWeblet();
+        }
+        if (count == 1 && e.which == 13) {
+          webSelector.selectWeblet(foundWeblet);
+          webSelector.goWeb();
+        }
+      });
+    }
+
+    window.setTimeout(function() {
+      $("#webName").focus();
+    }, 100);
+  }
+}
+})(jQuery);
+%ENDATTACH%
+</verbatim>
+
+---++ Test
+%<nop>INCLUDE{"%TOPIC%"}%
+
+<div>
+%BUTTON{"Goto webspace" onclick="webSelector.show();" icon="page_white_go"}%
+%CLEAR%
+</div>
+
+%META:FILEATTACHMENT{name="webselector.css" attachment="webselector.css" attr="" author="micha" comment="Generated by !AttachContentPlugin" date="1243950128" path="webselector.css" size="649" version="8"}%
+%META:FILEATTACHMENT{name="webselector.js" attachment="webselector.js" attr="" author="micha" comment="Generated by !AttachContentPlugin" date="1243950128" path="webselector.js" size="3199" version="29"}%
+%META:TOPICMOVED{by="micha" date="1243614912" from="Sandbox.AjaxWebSelector" to="System.AjaxWebSelector"}%
diff --git a/data/TWiki/MySideBar.txt b/data/System/MySideBar.txt
similarity index 91%
rename from data/TWiki/MySideBar.txt
rename to data/System/MySideBar.txt
index 6b83fb8..ea45a41 100644
--- a/data/TWiki/MySideBar.txt
+++ b/data/System/MySideBar.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1185741636" format="1.1" reprev="1.2" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1185741636" format="1.1" reprev="1.2" version="$Rev: 1823 $"}%
 %META:TOPICPARENT{name="WebHome"}%
 %STARTINCLUDE%<!-- mysidebar -->
 <nop><h2><a name="mysidebar">MySideBar</a></h2>
diff --git a/data/TWiki/MySideBarTemplate.txt b/data/System/MySideBarTemplate.txt
similarity index 95%
rename from data/TWiki/MySideBarTemplate.txt
rename to data/System/MySideBarTemplate.txt
index 5198a3f..cbb26a2 100644
--- a/data/TWiki/MySideBarTemplate.txt
+++ b/data/System/MySideBarTemplate.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1133357180" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1133357180" format="1.1" version="$Rev: 1823 $"}%
 %META:TOPICPARENT{name="MySideBar"}%
 ---+ %MAKETEXT{"[_1]'s sidebar" args="%WIKIUSERNAME%"}%
 
@@ -29,7 +29,7 @@
    * [[%SYSTEMWEB%.ReferenceManual][%MAKETEXT{"Reference Manual"}%]]
    * [[%SYSTEMWEB%.GoodStyle][%MAKETEXT{"Good Style"}%]] 
    * [[%SYSTEMWEB%.FrequentlyAskedQuestions][%MAKETEXT{"FAQs"}%]] 
-   * [[%SYSTEMWEB%.Macros][%MAKETEXT{"TWiki Variables"}%]] 
+   * [[%SYSTEMWEB%.Macros][%MAKETEXT{"Macros"}%]] 
    * [[%SYSTEMWEB%.DataForms][%MAKETEXT{"Data Forms"}%]] 
    * [[%SYSTEMWEB%.FormattedSearch][%MAKETEXT{"Formatted Search"}%]]
    * [[%SYSTEMWEB%.FileAttachment][%MAKETEXT{"File Attachment"}%]] 
diff --git a/data/TWiki/NatSearch.txt b/data/System/NatSearch.txt
similarity index 100%
rename from data/TWiki/NatSearch.txt
rename to data/System/NatSearch.txt
diff --git a/data/TWiki/NatSkin.txt b/data/System/NatSkin.txt
similarity index 91%
rename from data/TWiki/NatSkin.txt
rename to data/System/NatSkin.txt
index 701f6f2..bc4dc01 100644
--- a/data/TWiki/NatSkin.txt
+++ b/data/System/NatSkin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1227037698" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1234355406" format="1.1" version="1.2"}%
 <!--
 
    PLEASE DO NOT EDIT THIS TOPIC
@@ -103,7 +103,28 @@ allways open an extra window.
 %$INSTALL_INSTRUCTIONS%
 
    * Test if installed: [[%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?skin=nat][click here]]
-   * Set the SKIN variable in your %USERWEB%.SitePreferences to =nat= 
+   * Edit [[%LOCALSITEPREFS%]] and change the SKIN variable to "nat";
+     customize the default style adding the variables SKINSTYLE, STYLEBORDER,
+     STYLEBUTTONS and STYLESIDEBAR (see NatSkin)
+   * If you have set up ssl for your server add the following variable to your <nop>SitePreferenecs:
+     <verbatim> * Set HTTPSLOGON = on </verbatim>
+     This will prevent passwords being sent in clear-text over a possibly insecure net.
+   * To switch on external link detection add 
+     <verbatim> * Set EXTERNALLINKS = on </verbatim>
+   * To obfuscate email addresses in the case they appear online use:
+     <verbatim> * Set OBFUSCATEEMAILS = on </verbatim>
+   * To enable ssl as soon as you logged in use the following rewrite rules in =bin/.htaccess=:
+     <verbatim>
+ RewriteEngine On
+ RewriteCond %{SERVER_PORT} !443
+ RewriteCond %{QUERY_STRING} template=oopslogon
+ RewriteRule ^(.*)$ https://%{HTTP_HOST}/bin/$1 [R,L]
+</verbatim>
+     Note, that you might need to accommodate the =/bin= url path above to your installation!
+   * If you are running Foswiki using Foswiki:Extensions/FastCGIEngineContrib or any other stand-alone engine,
+     you will have to add the following line to your =LocalSite.cfg= 
+     <verbatim>$Foswiki::cfg{SwitchBoard}{natsearch} = ['Foswiki::Plugins::NatSkinPlugin::Search', 'searchCgi', {natsearch => 1}];</verbatim>
+
 
 ---++ Dependencies
 %$DEPENDENCIES%
@@ -115,9 +136,9 @@ are listed there.
 |  Skin Author: | Michael Daum |
 |  Copyright &copy;: | 2003-2009, Michael Daum http://michaeldaumconsulting.com |
 |  License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) |
-|  Skin Version: | v3.0-pre37 |
-|  Dependencies: | NatSkinPlugin |
-|  Description: | Driven by cascading stylesheets, Comes with 12 alternative styles, <nop>MoveableType and Wordpress Look-n-Feel |
+|  Release: | %$RELEASE% |
+|  Version: | %$VERSION% |
+|  Description: | Userfriendly Foswiki skin providing a flexible theming engine for professional webdesigns |
 |  Base Name: | nat |
 |  Screenshot: | <div style="overflow:hidden;height:200px"><a href="%ATTACHURL%/BlueNoteStyle.jpeg"><img src="%ATTACHURL%/BlueNoteStyle.jpeg" title="Clean"/></a></div> |
 |  Change&nbsp;History: | <!-- specify latest version first -->&nbsp; |
@@ -194,11 +215,11 @@ are listed there.
                   reworked javascript to use jquery instead, \
                   numerous markup and css fixes, \
                   better attachment table at bottom of topics |
-|  21 May 2007: | Bugs:Item3969 - 8bit email fix (TWiki:Main.WillNorris) |
+|  21 May 2007: | Bugs:Item3969 - 8bit email fix (Foswiki:Main.WillNorris) |
 |  08 Mar 2007: | fixed sidebar navigation in IE; fixed page forms width for FF |
 |  06 Mar 2007: | fixed renameweb; nicened all rename dialogs; \
                   don't stretch tables to 100% width by default; \
-                  added some default TWiki styles (twikiLeft, twikiRight, etc); \
+                  added some default styles (twikiLeft, twikiRight, etc); \
                   some javascript fixes calculating the height of the edit textarea; \
                   simplified topic actions using the new USERACTIONS tag |
 |  05 Feb 2007: | removed =...ForAdmins= components again; \
@@ -210,7 +231,7 @@ are listed there.
                   moved editsidebar content into a twisty under the textarea; \
                   new templates to customize the login screen; \
                   new <nop>JotSpot theme; \
-                  increased the skin's css priority for the <nop>TWikiTable layout \
+                  increased the skin's css priority for the <nop>DataTable layout \
                   to counter newer versions of the <nop>TablePlugin that inlines css \
                   by default; \
                   repositoned broadcast area above the main area and \
@@ -219,9 +240,9 @@ are listed there.
                   added presets to the <nop>NatSkinStyleBrowsers to switch the look&feel \
                   to that of some well-known CMS systems; \
                   added support for <nop>SectionalEditPlugin; \
-                  added support for redirectto urlparam of TWiki-4.1.1; \
+                  added support for redirectto urlparam of TMwiki-4.1.1; \
                   disabled css in print view as firefox can't print pages otherwise; \
-                  added support for the forthcomming TWiki::Cache; \
+                  added support for the forthcomming <nop>PageCache; \
                   fixed templates for renaming a web; \
                   fixed lease conflict template's use of QUERYPARAMS; \
                   new variable %<nop>TWIKIREGISTRAION% to make the registration form \
@@ -258,7 +279,7 @@ are listed there.
                   fixed sidebar in !PatternStyle + searchbox in position 1; \
                   fixed oopsmore's button style on different locales; \
                   more IE hacks; more i18n fixes |
-|  15 Aug 2006: | interface internationalization (TWiki:Main.OliverKrueger, TWiki:Main.AndreUlrich); \
+|  15 Aug 2006: | interface internationalization (Foswiki:Main.OliverKrueger, Foswiki:Main.AndreUlrich); \
                   adjusted css to cope waith possibly long strings in i18n; \
                   added "Change Language" dialogue to oopsmore; \
                   replaced most =em= based widths with =px= based ones to cope with different font presets; \
@@ -268,9 +289,9 @@ are listed there.
                   added =strings.nat.tmpl= template defining strings used in <nop>NatSkinPlugin; \
                   lots of css and template fixes;\
                   only load those javascript snippets that are really used |
-|   7 Aug 2006: | removed natTWikiInfo from the bottom bar containing the "Powered by" prose; \
+|   7 Aug 2006: | removed natWikiInfo from the bottom bar containing the "Powered by" prose; \
                   fixed USEWYSIWYG (again) |
-|   3 Aug 2006: | first 3 dot O prerelease, 3.0-final will be a TWiki V4 only skin; \
+|   3 Aug 2006: | first 3 dot O prerelease, 3.0-final will be a TMwiki V4 only skin; \
                   addded <nop>NatEdit templates; \
                   restructured edit and preview templates to allow <nop>NatEdit to "mix in" \
                   its toolbar; \
@@ -302,7 +323,7 @@ are listed there.
                   added css classes for ok/cancel buttons on oops dialogues; \
                   lots of css improvements, mostly diff related |
 |  24 May 2006: | spacing and font improvements; \
-                  added example <nop>TWikiWebCcss; \
+                  added example <nop>SiteCcss; \
                   removed focusing the search box on every view; \
                   if there's an WEBLOGOIMAGE then use it in the title bar instead of the WIKITOOLNAME; \
                   fixed bug in save actions that could have caused data loss ; \
@@ -334,7 +355,7 @@ are listed there.
 |  11 Mar 2006: | reworked sidebar using the new WEBCOMPONET logic; \
                   docu restructuring - more needed; \
                   using messages.tmpl as far as possible |
-|   1 Mar 2006: | fixed <nop>TWikiForm not showing certain row values (uuh); \
+|   1 Mar 2006: | fixed <nop>DataForm not showing certain row values (uuh); \
                   added more css for the most recent stuff added to the <nop>BlogPlugin; \
                   removed html from mailnotification; \
                   replaced SCRIPTURL{} with SCRIPTURL+SCRIPTSUFFIX again for legacy platforms; \
@@ -423,8 +444,8 @@ are listed there.
 |  12 Aug 2005: | first round of pre-releases numbered 1.91 upwards |
 |  24 Jul 2005: | rewritten the templates, renamed the CSS classes |
 |  25 Jun 2003: | Initial version |
-|  Skin Home: | http://foswiki.org/Extensions/NatSkin |
-|  Feedback: | http://foswiki.org/Extensions/NatSkinDev |
+|  Home: | Foswiki:Extensions/NatSkin |
+|  Support: | Foswiki:Support/NatSkin |
 
 %META:FILEATTACHMENT{name="wikiringlogo40x40.png" attachment="wikiringlogo40x40.png" attr="h" comment="" date="1189787359" path="wikiringlogo40x40.png" size="2571" stream="wikiringlogo40x40.png" tmpFilename="" user="ProjectContributor" version="1"}%
 %META:FILEATTACHMENT{name="BlueNoteStyle.jpeg" attachment="BlueNoteStyle.jpeg" attr="h" comment="" date="1225905266" path="BlueNoteStyle.jpeg" size="42093" stream="IO::File=GLOB(0x8f2567c)" tmpFilename="/var/tmp/CGItemp41158" user="ProjectContributor" version="1"}%
diff --git a/data/TWiki/NatSkinConfiguration.txt b/data/System/NatSkinConfiguration.txt
similarity index 95%
rename from data/TWiki/NatSkinConfiguration.txt
rename to data/System/NatSkinConfiguration.txt
index 172f858..1c940ef 100644
--- a/data/TWiki/NatSkinConfiguration.txt
+++ b/data/System/NatSkinConfiguration.txt
@@ -1,10 +1,10 @@
-%META:TOPICINFO{author="ProjectContributor" date="1168359736" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1168359736" format="1.1" version="$Rev: 1340 $"}%
 %META:TOPICPARENT{name="NatSkin"}%
 ---+!! %TOPIC%
 %TOC%
 
 ---++ Theme configuration
-The different NatSkin styles (themes) are controlled using TWiki preference
+The different NatSkin styles (themes) are controlled using preference 
 variables and can be set 
    * per user (on the user's home topic), 
    * per web (in the WebPreferences),
@@ -61,7 +61,7 @@ when combining the different skin states:
      natsearch, changes and search topic actions. 
    * The web buttons will alternate with the sidebar so that they will not be displayed
      on the same side. 
-   * If the web buttons are enabled the default [[TWikiWebSideBar][WebSideBar]] will disable the redundant 
+   * If the web buttons are enabled the default SiteSideBar will disable the redundant 
      navigation to other webs.
 
 ---++ Defining new Themes
@@ -90,7 +90,7 @@ Css files must obey the following naming scheme to be recognized
      can be used to vary a base style, e.g. to add header art or change some fonts and colours
 
 ---+++ Email Obfuscation
-The standard TWiki engine tries to obfuscate email addresses by adding a phrase to the email url (like NOSPAM)
+The standard Foswiki engine tries to obfuscate email addresses by adding a phrase to the email url (like NOSPAM)
 to fool collecting web crawlers. But that is not adequate enough today as crawlers are aware of that. The solution
 to that is to remove every trace of a pattern that could be an email address from the html source code and regenerate
 them using javascript. Most likely, web crawlers will only parse the html and don't run a javascript interpreter 
diff --git a/data/TWiki/NatSkinCss.txt b/data/System/NatSkinCss.txt
similarity index 99%
rename from data/TWiki/NatSkinCss.txt
rename to data/System/NatSkinCss.txt
index 01d17f4..8cdef1b 100644
--- a/data/TWiki/NatSkinCss.txt
+++ b/data/System/NatSkinCss.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1168359939" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1168359939" format="1.1" version="$Rev: 1340 $"}%
 %META:TOPICPARENT{name="NatSkin"}%
 ---+!! %TOPIC%
 
@@ -619,7 +619,7 @@ the =natBottomBar= will be classified as =natBottomBarBoth=.
 | =natTopicEditForm= \
 | form.nat.tmpl \
 | |
-| =natTWikiTopic= \
+| =natWikiTopic= \
 | formtables.nat.tmpl \
 | |
 | =natTopicFormFirstCol= \
@@ -651,4 +651,4 @@ the =natBottomBar= will be classified as =natBottomBarBoth=.
 | defaulttopbar.nat.tmpl \
 | |
 
-<!-- extracted 157 classes in 63 files -->
\ No newline at end of file
+<!-- extracted 157 classes in 63 files -->
diff --git a/data/System/NatSkinFAQ.txt b/data/System/NatSkinFAQ.txt
new file mode 100644
index 0000000..ca7eafb
--- /dev/null
+++ b/data/System/NatSkinFAQ.txt
@@ -0,0 +1,45 @@
+%META:TOPICINFO{author="ProjectContributor" date="1156519729" format="1.1" version="$Rev: 1340 $"}%
+%META:TOPICPARENT{name="NatSkin"}%
+---+!! %TOPIC%
+%TOC%
+
+---++ The documentation of <nop>NatSkin is crap. I'm lost!
+If you need help there are a couple of options:
+   * Create a support request on Foswiki:Support/WebHome.
+   * Explain the problem on Foswiki:Extensions/NatSkinDev.
+   * Join the [[irc://irc.freenode.net/foswiki][#foswiki]] IRC channel and ask for help.
+   * Contact the [[mailto:daum@wikiring.com][WikiRing]] in case you need 
+     professional support.
+
+In any case helping out improving documentation, fixing bugs, helping others
+with the same problems is very welcome.
+
+---++ Why does <nop>NatSkin depend on so many extra plugins?
+The main goal is to achieve the best user experience possible. It frankly
+does not matter if that requires extra plugins.
+
+Some things can't be done with the inventory being shipped with standard
+Foswiki. A lot of the plugins once have been an integral part of the
+NatSkinPlugin and then been externalized into plugins of their own for the
+greater benefit. 
+
+---++ Why are there so many template files?
+<nop>NatSkin does not build upon the standard templates/skin of Foswiki as
+it differs substantially in the way it is broken up into components. Therefor 
+every function of the core engine will use a =*.nat.tmpl= file. Infact,
+the <nop>NatSkin templates are created to provide an independent base
+for further template modifications. 
+
+<nop>NatSkin templates offer much more flexibility than the standard 
+templates do. While its theming engine controls which css files are to
+be loaded, it also maintains the SKIN path to allow themes to override
+the standard markup. So switching a theme does also switch the SKIN path
+and the templates with it.
+
+---++ Can I enable offsite link detection?
+Yes. Use ={NatSkin}{DetectExternalLinks}= configuration setting.
+
+---++ Does <nop>NatSkin support <nop>QuietSave?
+This feature confuses more than provide any added value and has thus been removed from
+the =edit= page to simplify the interface.
+
diff --git a/data/System/NatSkinStyleBrowser.txt b/data/System/NatSkinStyleBrowser.txt
new file mode 100644
index 0000000..67faf1e
--- /dev/null
+++ b/data/System/NatSkinStyleBrowser.txt
@@ -0,0 +1,117 @@
+%META:TOPICINFO{author="ProjectContributor" date="1202840013" format="1.1" version="$Rev: 1823 $"}%
+---+ Style Browser
+Explore the style variations of the %SYSTEMWEB%.NatSkin by changing the base
+_style_ and a _variation_ of it. In general style variations are used to change
+the header art but also adapt colors to match the graphics. Various elements of
+the style can be relocated using style switches or even be switched off. Use
+the "reset" button whenever you want to revert your selection and come back to
+the site's default settings. Note that each web may have its own defaults build
+in. If you select different style options they have precedence over those.
+
+Register [[%USERREGISTRATION%][here]] to make your settings persistent.
+See the %SYSTEMWEB%.NatSkinPlugin documentation on how to use style settings in your personal
+<nop>%WIKITOOLNAME% account.
+
+%STARTINCLUDE%<!-- style browser -->
+<noautolink>
+<div class="natSkinStyleBrowser">
+<form action="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%" _method="post">
+<div class="foswikiFormSteps">
+  <div class="foswikiFormStep">
+    <h3 >%MAKETEXT{"Style"}%:</h3>
+    <table>
+      <tr>
+        <td width="20px">
+          <a href="?switchstyle=prev" title="%MAKETEXT{"Switch to previous style"}%"><img src="%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/arrowleft.gif" border="0" alt="%MAKETEXT{"prev"}%"/></a>
+        </td>
+        <td>
+          <select id="style" name="style"">
+            %FORMATLIST{"%KNOWNSTYLES%" pattern="\s*(.*)\s*" format="<option $percntIF{\"context natskin_style_$1\" then=\"selected='selected'\"}$percnt>$1</option>" join="\n" separator=" "}%
+          </select>
+        </td>
+        <td align="right" width="20px">
+          <a href="?switchstyle=next" title="%MAKETEXT{"Switch to next style"}%"><img src="%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/arrowright.gif" border="0" alt="%MAKETEXT{"next"}%"/></a>
+        </td>
+      </tr>
+    </table>
+  </div>
+  <div class="foswikiFormStep">
+    <h3 >%MAKETEXT{"Variation"}%:</h3>
+    <table>
+      <tr>
+        <td width="20px">
+          <a href="?switchvariation=prev" title="%MAKETEXT{"Switch to previous variation"}%"><img src="%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/arrowleft.gif" border="0" alt="%MAKETEXT{"prev"}%"/></a>
+        </td>
+        <td>
+          <select id="variation" name="stylevariation">
+          </select>
+        </td>
+        <td align="right" width="20px">
+          <a href="?switchvariation=next" title="%MAKETEXT{"Switch to next variation"}%"><img src="%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/arrowright.gif" border="0" alt="%MAKETEXT{"prev"}%"/></a>
+        </td>
+      </tr>
+    </table>
+  </div>
+  <div class="foswikiFormStep">
+    <h3 >%MAKETEXT{"Layout"}%:</h3>
+    <ul>
+      <li> <input type="radio" class="foswikiRadiobox" id="borderon" name="styleborder" value="on" %IF{"context natskin_border_on" then="checked='checked'"}% /><label for="borderon">%MAKETEXT{"Border On"}%</label></li>
+      <li> <input type="radio" class="foswikiRadiobox" id="borderoff" name="styleborder" value="off" %IF{"context natskin_border_off" then="checked='checked'"}% /><label for="borderoff">%MAKETEXT{"Border Off"}%</label></li>
+      <li> <input type="radio" class="foswikiRadiobox" id="borderthin" name="styleborder" value="thin" %IF{"context natskin_border_thin" then="checked='checked'"}% /><label for="borderthin">%MAKETEXT{"Thin Layout"}%</label></li>
+    </ul>
+
+    <ul>
+      <li> <input type="radio" class="foswikiRadiobox" id="sidebarleft" name="stylesidebar" value="left" %IF{"context natskin_sidebar_left" then="checked='checked'"}% /><label for="sidebarleft">%MAKETEXT{"Sidebar Left"}%</label></li>
+      <li> <input type="radio" class="foswikiRadiobox" id="sidebarright" name="stylesidebar" value="right" %IF{"context natskin_sidebar_right" then="checked='checked'"}% /><label for="sidebarright">%MAKETEXT{"Sidebar Right"}%</label></li>
+      <li> <input type="radio" class="foswikiRadiobox" id="sidebarboth" name="stylesidebar" value="both" %IF{"context natskin_sidebar_both" then="checked='checked'"}% /><label for="sidebarboth">%MAKETEXT{"Both sidebars"}%</label></li>
+      <li> <input type="radio" class="foswikiRadiobox" id="sidebaroff" name="stylesidebar" value="off" %IF{"context natskin_sidebar_off" then="checked='checked'"}% /><label for="sidebaroff">%MAKETEXT{"Sidebar Off"}%</label></li>
+    </ul>
+
+    <ul>
+      <li> <input type="radio" class="foswikiRadiobox" id="buttonson" name="stylebuttons" value="on" %IF{"context natskin_buttons_on" then="checked='checked'"}% /><label for="buttonson">%MAKETEXT{"Web Buttons On"}%</label></li>
+      <li> <input type="radio" class="foswikiRadiobox" id="buttonsoff" name="stylebuttons" value="off" %IF{"context natskin_buttons_off" then="checked='checked'"}% /><label for="buttonsoff">%MAKETEXT{"Web Buttons Off"}%</label></li>
+    </ul>
+    
+    <ul>
+      <li> <input type="radio" class="foswikiRadiobox" id="searchboxtop" name="stylesearchbox" value="top" %IF{"context natskin_searchbox_top" then="checked='checked'"}% /><label for="searchboxtop">%MAKETEXT{"Searchbox in topbar"}%</label></li>
+      <li> <input type="radio" class="foswikiRadiobox" id="searchboxpos1" name="stylesearchbox" value="pos1" %IF{"context natskin_searchbox_pos1" then="checked='checked'"}% /><label for="searchboxpos1">%MAKETEXT{"Searchbox in pos. 1"}%</label></li>
+      <li> <input type="radio" class="foswikiRadiobox" id="searchboxpos2" name="stylesearchbox" value="pos2" %IF{"context natskin_searchbox_pos2" then="checked='checked'"}% /><label for="searchboxpos2">%MAKETEXT{"Searchbox in pos. 2"}%</label></li>
+      <li> <input type="radio" class="foswikiRadiobox" id="searchboxpos3" name="stylesearchbox" value="pos3" %IF{"context natskin_searchbox_pos3" then=" checked='checked'"}% /><label for="searchboxpos3">%MAKETEXT{"Searchbox in pos. 3"}%</label></li>
+      <li> <input type="radio" class="foswikiRadiobox" id="searchboxoff" name="stylesearchbox" value="off" %IF{"context natskin_searchbox_off" then=" checked='checked'"}% /><label for="searchboxoff">%MAKETEXT{"Searchbox off"}%</label></li>
+    </ul>
+  </div>
+  <div class="foswikiFormStep foswikiFormLast foswikiFormButtons">
+    %BUTTON{"%MAKETEXT{"OK"}%" type="submit" icon="tick"}%
+    %BUTTON{"%MAKETEXT{"Reset"}%" icon="cross" onclick="window.location.href='%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%?style=reset';" }%
+    %CLEAR%
+  </div>
+</div>
+</form>
+</div>
+<script type="text/javascript">
+var knownVariations = {
+  %KNOWNVARIATIONS{header="'$style': [" format="'$variation'" footer="]" separator=", " varseparator="', '"}%
+};
+var selectedVariation = '%GETSKINSTATE{"$variation"}%';
+function setVariations() {
+  var style = jQuery("#style").val();
+  var varSelect = jQuery("#variation").empty().append("<option>none</option>");
+  if (knownVariations[style]) {
+    for (var i = 0; i < knownVariations[style].length; i++) {
+      var variation = knownVariations[style][i];
+      var selected = variation == selectedVariation ? "selected":"";
+      varSelect.append("<option "+selected+">"+knownVariations[style][i]+"</option>");
+    }
+  }
+  if (jQuery.browser.msie) {
+    varSelect.find("option").width("auto"); // IE7 fix, IE6 is okay
+  }
+}
+jQuery(function() {
+  jQuery("#style").change(function() {
+    setVariations();
+  }).change();
+});
+</script>
+</noautolink>
+<!-- //style browser -->%STOPINCLUDE%
diff --git a/data/TWiki/NatSkinTemplates.txt b/data/System/NatSkinTemplates.txt
similarity index 96%
rename from data/TWiki/NatSkinTemplates.txt
rename to data/System/NatSkinTemplates.txt
index ecb989d..fa1a200 100644
--- a/data/TWiki/NatSkinTemplates.txt
+++ b/data/System/NatSkinTemplates.txt
@@ -1,13 +1,13 @@
-%META:TOPICINFO{author="ProjectContributor" date="1125075424" format="1.0" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1125075424" format="1.0" version="$Rev: 1340 $"}%
 %META:TOPICPARENT{name="NatSkin"}%
 ---+!! %TOPIC%
 <!-- TODO: 
- This docu only reflects the templates used on a beijing or cairo TWiki engine.
+ This docu only reflects the templates used on a beijing or cairo engine.
  The extra templates used on a dakar engine aren't listed here yet.
 -->
 
 The template setup of the NatSkin differes completely from the standard templates that
-come with the TWiki folowing its own inner logic compared to the Foswiki:Extensions/PatternSkin. The
+come with Foswiki folowing its own inner logic compared to the Foswiki:Extensions/PatternSkin. The
 NatSkinTemplates have especially been designed to simplify subskins overwriting parts
 of the NatSkin. 
 
@@ -111,7 +111,7 @@ default fragments are left out for clarity.
       1 <a name="OopsMessagesTemplates">Messages:</a>
          * oopsbadpwformat, oopschangepasswd, oopsempty, oopslocked,
            oopslockedrename, oopsmanage, oopsmissing, oopsmngcreateweb,
-           oopsmore, oopsnoformdef, oopsnotwikiuser, oopsnoweb,
+           oopsmore, oopsnoformdef, oopsnowikiuser, oopsnoweb,
            oopspreview, oopsregemail, oopsregexist, oopsregpasswd,
            oopsregrequ, oopsregthanks, oopsregwiki, oopsrenamenotwikiword,
            oopsresetpasswd, oopsrev, oopssave, oopstopicexists,
diff --git a/data/System/NatSkinTopicDoesNotExistViewTemplate.txt b/data/System/NatSkinTopicDoesNotExistViewTemplate.txt
new file mode 100644
index 0000000..2bb6b20
--- /dev/null
+++ b/data/System/NatSkinTopicDoesNotExistViewTemplate.txt
@@ -0,0 +1,48 @@
+%META:TOPICINFO{author="ProjectContributor" date="1231502400" format="1.0" version="$Rev: 1643 $"}%
+%TMPL:INCLUDE{"WebCreateNewTopic"}%
+
+%TMPL:DEF{"topicactions"}%%TMPL:END%
+%TMPL:DEF{"revinfo"}%%TMPL:END%
+%TMPL:DEF{"formtitle"}%%TMPL:END%
+%TMPL:DEF{"contentheader_container"}%%TMPL:END%
+%TMPL:DEF{"newtopictitle"}%%BASETOPIC%%TMPL:END%
+%TMPL:DEF{"newtopic"}%%BASETOPIC%%TMPL:END%
+%TMPL:DEF{"searchvalue"}%%BASETOPIC%%TMPL:END%
+
+%TMPL:DEF{"content"}%
+<h1 class="natOopsHeading">%MAKETEXT{"Topic [_1] does not exist" args="'%BASETOPIC%'"}%</h1>
+%SEARCH{"moved.from='%BASEWEB%.%BASETOPIC%'" 
+  nosearch="on" 
+  nototal="on" 
+  type="query" 
+  format="<div class='foswikiNotification'>%MAKETEXT{"A topic with this name did exist, but has been renamed or moved to [_1]." args="[[$web.$topic]]"}%</div>" 
+}%
+%MAKETEXT{"Did you spell the topic name correctly? Remember, a topic name is case sensitive."}%
+
+%TMPL:P{"createform"}%
+
+%SEARCH{"%BASETOPIC%" 
+  header="<h2 >%MAKETEXT{"Similar topics"}%</h2>"
+  limit="10" 
+  scope="topic" 
+  web="%BASEWEB%" 
+  nonoise="on" 
+  order="modified" 
+  reverse="on"
+}%
+%TMPL:END%
+
+%TMPL:DEF{"formstartstep"}%<!-- formstartstep -->
+%TWISTYBUTTON{id="createnewtopic" link="%BUTTON{"%MAKETEXT{"Create new topic"}%" icon="add"}%"}%
+%BUTTON{"%MAKETEXT{"Cancel"}%" icon="cross" target="%BASEWEB%.%HOMETOPIC%" title="%MAKETEXT{"Get me out of here"}%"}%
+%CLEAR%
+%TWISTYTOGGLE{id="createnewtopic"}%
+
+<div class='foswikiFormSteps'>%TMPL:P{"formstart"}%
+<!-- //formstartstep -->%TMPL:END%
+
+%TMPL:DEF{"formendstep"}%<!-- formendstep -->
+%TMPL:P{"formend"}%
+%ENDTWISTY%
+</div>
+<!-- //formendstep -->%TMPL:END%
diff --git a/data/TWiki/NatSkinWebCreateNewTopicTemplate.txt b/data/System/NatSkinWebCreateNewTopicTemplate.txt
similarity index 58%
rename from data/TWiki/NatSkinWebCreateNewTopicTemplate.txt
rename to data/System/NatSkinWebCreateNewTopicTemplate.txt
index 48c861b..815c7e6 100644
--- a/data/TWiki/NatSkinWebCreateNewTopicTemplate.txt
+++ b/data/System/NatSkinWebCreateNewTopicTemplate.txt
@@ -1,25 +1,34 @@
-%META:TOPICINFO{author="ProjectContributor" date="1131431859" format="1.1" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1131431859" format="1.1" version="$Rev: 1963 $"}%
 %TMPL:INCLUDE{"view"}%
 
-%TMPL:DEF{"content"}%
-%TMPL:P{"formstartstep"}%
----++ %MAKETEXT{"Create New Topic in the [_1] Web" args="<nop>%BASEWEB%"}%
-%TMPL:P{"topictitlestep"}%
-%TMPL:P{"DIStopicnamestep"}%
-%TMPL:P{"topictemplatestep"}%
-%TMPL:P{"formbuttons"}%
-%TMPL:P{"formendstep"}%
-%TMPL:END%
+%TMPL:DEF{"content"}%%TMPL:P{"createform"}%%TMPL:END%
+
+%TMPL:DEF{"createform"}%<!-- createform -->
+%TMPL:P{"formstartstep"}%<!-- formstartstep// -->
+%TMPL:P{"formtitle"}%<!-- formtitle// -->
+%TMPL:P{"topictitlestep"}%<!-- topictitlestep// -->
+%TMPL:P{"DIStopicnamestep"}%%TMPL:P{"hiddentopicnamestep"}%
+%TMPL:P{"topictemplatestep"}%<!-- topictemplatestep// -->
+%TMPL:P{"formbuttons"}%<!-- formbuttons// -->
+%TMPL:P{"formendstep"}%<!-- topictemplatestep// -->
+<!-- //createform -->%TMPL:END%
+
+%TMPL:DEF{"formtitle"}%<!-- formtitle -->
+<h2 >%MAKETEXT{"Create New Topic in the [_1] Web" args="<nop>%BASEWEB%"}%</h2>
+<!-- //formtitle -->%TMPL:END%
+
+%TMPL:DEF{"newtopictitle"}%%URLPARAM{"newtopictitle"}%%TMPL:END%
+%TMPL:DEF{"newtopic"}%%URLPARAM{"newtopic"}%%TMPL:END%
 
 %TMPL:DEF{"viewjavascript"}%<!-- viewjavascript -->
-%JQSCRIPT{"jquery.validate"}%
+%JQREQUIRE{"validate"}%
 <!-- //viewjavascript -->%TMPL:END%
 
 %{ do not show the following elements }%
 %TMPL:DEF{"topicactions"}%%TMPL:END%
 
 %TMPL:DEF{"formstartstep"}%<!-- formstartstep -->
-<div class='twikiFormSteps'>%TMPL:P{"formstart"}%
+<div class='foswikiFormSteps'>%TMPL:P{"formstart"}%
 <!-- //formstartstep -->%TMPL:END%
 
 %TMPL:DEF{"formendstep"}%<!-- formendstep -->
@@ -28,28 +37,32 @@
 <!-- //formendstep -->%TMPL:END%
 
 %TMPL:DEF{"topictitlestep"}%<!-- topictitlestep -->
-<div class='twikiFormStep'>
----+++ %MAKETEXT{"Title:"}%
+<div class='foswikiFormStep'>
+<h3 >%MAKETEXT{"Title:"}%</h3>
 %TMPL:P{"topictitle"}%
 </div>
 <!-- //topictitlestep -->%TMPL:END%
 
 %TMPL:DEF{"topicnamestep"}%<!-- topicnamestep -->
-<div class='twikiFormStep'>
----+++ %MAKETEXT{"Name:"}%
+<div class='foswikiFormStep'>
+<h3 >%MAKETEXT{"Name:"}%</h3>
 %TMPL:P{"topicname"}%%TMPL:P{"nonwikiword"}%
 </div>
 <!-- //topicnamestep -->%TMPL:END%
 
+%TMPL:DEF{"hiddentopicnamestep"}%<!-- hiddentopicnamestep -->
+<input type="hidden" name="topic" id="topic" value="%TMPL:P{"newtopic"}%"/>
+<!-- //hiddentopicnamestep -->
+
 %TMPL:DEF{"topictemplatestep"}%<!-- topictemplatestep -->
-<div class='twikiFormStep'>
----+++ %MAKETEXT{"Template:"}%
+<div class='foswikiFormStep'>
+<h3 >%MAKETEXT{"Template:"}%</h3>
 %TMPL:P{"topictemplate"}%
 </div>
 <!-- //topictemplate -->%TMPL:END%
 
 %TMPL:DEF{"formbuttons"}%<!-- formbuttons -->
-<div class='twikiFormStep twikiFormButtons twikiFormLast'>
+<div class='foswikiFormStep foswikiFormButtons foswikiFormLast'>
 %TMPL:P{"submit"}%%TMPL:P{"cancel"}%%CLEAR%
 </div>
 <!-- //formbuttons -->%TMPL:END%
@@ -59,29 +72,28 @@
 <input type="hidden" name="t" value="%GMTIME{"$epoch"}%" />
 <input type="hidden" name="onlynewtopic" value="on" />
 <input type="hidden" name="topicparent" value="%URLPARAM{"topicparent"}%" />
-<input type="hidden" name="topic" id="topic" value="%URLPARAM{"newtopic"}%"/>
 <!-- //formstart -->%TMPL:END%
 
 
 %TMPL:DEF{"topictitle"}%<!-- topictitle -->
-<input type="text" class="twikiInputField required" name="TopicTitle" id="topictitle" size="40" value="%URLPARAM{"newtopictitle"}%" />
-<div class="twikiFormDescription">
+<input type="text" class="foswikiInputField required" name="TopicTitle" id="topictitle" size="40" value="%TMPL:P{"newtopictitle"}%" />
+<div class="foswikiFormDescription">
 %MAKETEXT{"Free form title text."}%
 </div>
 <!--//topictitle -->%TMPL:END%
 
 %TMPL:DEF{"topicname"}%<!-- topicname -->
-<input type="text" class="twikiInputField" name="topic" id="topic" size="40" value="%URLPARAM{"newtopic"}%" />
-<div class="twikiFormDescription">
+<input type="text" class="foswikiInputField" name="topic" id="topic" size="40" value="%TMPL:P{"newtopic"}%" />
+<div class="foswikiFormDescription">
 <nop>WikiWord the new page is associated with.
 </div>
 <!--//topicname -->%TMPL:END%
 
 %TMPL:DEF{"topictemplate"}%<!-- topictemplate -->
-<select name="templatetopic" class="twikiSelect">
+<select name="templatetopic" class="foswikiSelect">
 %IF{"'%URLPARAM{"templatetopic"}%'" then='<option selected="selected">%URLPARAM{"templatetopic"}%</option>'}%
 <option value="">%MAKETEXT{"Default template"}%</option>%SEARCH{".*Template$" scope="topic" excludetopic="WebTopicEditTemplate,WebCreateNewTopicTemplate,*ViewTemplate" type="regex" nonoise="on" format="<option>$topic</option>"}%</select> 
-<div class="twikiFormDescription">
+<div class="foswikiFormDescription">
 %MAKETEXT{"Initialize the new topic using a template."}%
 </div>
 <!-- //topictemplate -->%TMPL:END%
@@ -99,8 +111,8 @@
 
 %TMPL:DEF{"javascript"}%<!-- javascript -->
 %TMPL:P{"defaultjavascript"}%
-<script type="text/javascript" src="%PUBURLPATH%/%TWIKIWEB%/JQueryPlugin/jquery.wikiword.js"></script>
-<script type="text/javascript" src="%PUBURLPATH%/%TWIKIWEB%/JQueryPlugin/jquery.validate.js"></script>
+<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/jquery.wikiword.js"></script>
+<script type="text/javascript" src="%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/jquery.validate.js"></script>
 <script type="text/javascript">
 $(function() {
   $("#topic").wikiword("#topictitle");
diff --git a/data/System/SiteButtons.txt b/data/System/SiteButtons.txt
new file mode 100644
index 0000000..5265864
--- /dev/null
+++ b/data/System/SiteButtons.txt
@@ -0,0 +1,15 @@
+%META:TOPICINFO{author="ProjectContributor" date="1238252390" format="1.1" reprev="1.2" version="1.2"}%
+%STARTINCLUDE%<!-- sitebuttons --> 
+%FLEXWEBLIST{
+  webs="%USERSWEB%,public,%SYSTEMWEB%"
+  selection="%FORMATLIST{"%BASEWEB%" split="[\/\.]" limit="1"}%"
+  marker="current"
+  exclude="^(TestCases|Trash|Attic|Sandbox|TWiki|System).*"
+  adminwebs="Applications.*"
+  map="%SYSTEMWEB%=System"
+  header="<ul><li>"
+  format="$percntWEBLINK{\"$web\" format=\"<a class='natWebLink $marker' href='$dollarurl'>$name</a>\"}$percnt"
+  separator="</li><li>"
+  footer="</li></ul>"
+}%
+<!-- //sitebuttons -->%STOPINCLUDE%
diff --git a/data/TWiki/TWikiWebHtmlHead.txt b/data/System/SiteHtmlHead.txt
similarity index 91%
rename from data/TWiki/TWikiWebHtmlHead.txt
rename to data/System/SiteHtmlHead.txt
index f3a3550..d127e06 100644
--- a/data/TWiki/TWikiWebHtmlHead.txt
+++ b/data/System/SiteHtmlHead.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1147166156" format="1.1" reprev="1.5" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1147166156" format="1.1" reprev="1.5" version="$Rev: 1340 $"}%
 ---+ %TOPIC%
 Default <nop>WebHtmlHead component for your <nop>%WIKITOOLNAME% site.
 Create a <nop>WebHtmlHead topic in your web to override the content of this topic.
diff --git a/data/System/SiteLinks.txt b/data/System/SiteLinks.txt
new file mode 100644
index 0000000..f10a365
--- /dev/null
+++ b/data/System/SiteLinks.txt
@@ -0,0 +1,11 @@
+%META:TOPICINFO{author="ProjectContributor" date="1233745105" format="1.1" version="1.3"}%
+---+ %TOPIC%
+
+Standard links in sidebar navigation. 
+
+<verbatim class="tml">
+%STARTINCLUDE%<!-- default navigation links -->
+<!-- //default navigation links -->%STOPINCLUDE%
+</verbatim>
+
+
diff --git a/data/TWiki/TWikiWebNothingFound.txt b/data/System/SiteNothingFound.txt
similarity index 92%
rename from data/TWiki/TWikiWebNothingFound.txt
rename to data/System/SiteNothingFound.txt
index bfdd0cf..1454536 100644
--- a/data/TWiki/TWikiWebNothingFound.txt
+++ b/data/System/SiteNothingFound.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1170174391" format="1.1" reprev="1.3" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1170174391" format="1.1" reprev="1.3" version="$Rev: 1340 $"}%
 ---+ %MAKETEXT{"Note: This topic does not exist"}%
 
 *Do you want to create '<nop>%TOPIC%'?*
diff --git a/data/TWiki/TWikiWebRightBar.txt b/data/System/SiteRightBar.txt
similarity index 53%
rename from data/TWiki/TWikiWebRightBar.txt
rename to data/System/SiteRightBar.txt
index a71513c..ff02f55 100644
--- a/data/TWiki/TWikiWebRightBar.txt
+++ b/data/System/SiteRightBar.txt
@@ -1,5 +1,5 @@
-%META:TOPICINFO{author="ProjectContributor" date="1132161897" format="1.1" version="$Rev$"}%
-%STARTINCLUDE%<!-- twiki.twikiwebrightbar -->
-<h2 class="natSideBarTitle">Recent Changes</h2>
+%META:TOPICINFO{author="ProjectContributor" date="1132161897" format="1.1" version="$Rev: 1340 $"}%
+%STARTINCLUDE%<!-- siterightbar -->
+<h2 >Recent Changes</h2>
 %SEARCH{".*" regex="on" scope="topic" nonoise="on" format="   * [[$web.$topic][$topic]]" limit="20" order="modified" reverse="on"}%
-<!-- //twiki.twikiwebrightbar -->%STOPINCLUDE%
+<!-- //siterightbar -->%STOPINCLUDE%
diff --git a/data/TWiki/TWikiWebSideBar.txt b/data/System/SiteSideBar.txt
similarity index 66%
rename from data/TWiki/TWikiWebSideBar.txt
rename to data/System/SiteSideBar.txt
index 6ac905a..759aad7 100644
--- a/data/TWiki/TWikiWebSideBar.txt
+++ b/data/System/SiteSideBar.txt
@@ -1,30 +1,26 @@
-%META:TOPICINFO{author="ProjectContributor" date="1225902640" format="1.1" reprev="1.2" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1238416975" format="1.1" version="1.2"}%
 ---+!! %TOPIC%
 Default sidebar implementation
 
-%STARTINCLUDE%<!-- twiki.twikiwebsidebar -->
-<div class="natSideBarSection natSideBarWebLinks">
+%STARTINCLUDE%<!-- sitesidebar -->
 <h2 >%WEBLINK%</h2>
-%WEBCOMPONENT{"WebLinks"}%
-</div>
-<div class="natSideBarSection">
+%WEBCOMPONENT{"Links"}%
 <h2 >Tools</h2>
    * [[WebTopicList][%MAKETEXT{"Index"}%]]
    * [[WebChanges][%MAKETEXT{"Changes"}%]]
    * [[WebNotify][%MAKETEXT{"Notifications"}%]]
    * [[WebStatistics][%MAKETEXT{"Statistics"}%]]
    * [[Sandbox.WebHome][Sandbox]]
-</div>
 %TMPL:P{context="natskin_sidebar_pos2" then="searchbox_pos2"}%<!-- -->
 %IFDEFINEDTHEN{"%IFACCESS{"%USERSWEB%.AdminGroup" type="change"}%" as="1"}%
-<div class="natSidebarSection" natSideBarAdminLinks">
+<div class="natSidebarSection natSideBarAdminLinks">
 <h2 >Admin</h2>
    * [[%SCRIPTURL{"configure"}%][%MAKETEXT{"Configure [_1]" args="<nop>%WIKITOOLNAME%"}%]]
    * [[%BASEWEB%.WebPreferences][%MAKETEXT{"Web Preferences"}%]]
    * [[%LOCALSITEPREFS%][%MAKETEXT{"Site Preferences"}%]]
    * [[%SYSTEMWEB%.InstalledPlugins][%MAKETEXT{"Installed Plugins"}%]]
-   * [[%SYSTEMWEB%.ManagingWebs][%MAKETEXT{"Add Web"}%]]
+   * [[%SYSTEMWEB%.WebCreateNewWeb][%MAKETEXT{"Add Web"}%]]
    * [[%SCRIPTURL{"rename"}%/%BASEWEB%/%BASETOPIC%?action=renameweb][Rename Web]]
 </div>
 %FIDEFINED%
-<!-- //twiki.twikiwebsidebar -->%STOPINCLUDE%
+<!-- //sitesidebar -->%STOPINCLUDE%
diff --git a/data/TWiki/TWikiWebTopicActions.txt b/data/System/SiteTopicActions.txt
similarity index 71%
rename from data/TWiki/TWikiWebTopicActions.txt
rename to data/System/SiteTopicActions.txt
index b708f4a..4dc3c34 100644
--- a/data/TWiki/TWikiWebTopicActions.txt
+++ b/data/System/SiteTopicActions.txt
@@ -1,12 +1,11 @@
-%META:TOPICINFO{author="ProjectContributor" date="1161605041" format="1.1" reprev="1.2" version="$Rev$"}%
+%META:TOPICINFO{author="ProjectContributor" date="1161605041" format="1.1" reprev="1.2" version="$Rev: 1823 $"}%
 ---+ %TOPIC%
 Default site-level configuration for the !WebTopicActions !WebComponent
 
-%STARTINCLUDE%<!-- twikiwebtopicactions -->
+%STARTINCLUDE%<!-- sitetopicactions -->
 %USERACTIONS{
   restrictedactions="new, attach, move, delete, history, more, raw"
   format="$edit$sep$attach$sep$new$sep$raw$sep$delete$sep$history$sep$print$sep$more"
-  history="$edit$sep$raw$sep$history$sep$first$sep$prev$sep$next$sep$last$sep$done"
+  history="$edit$sep$raw$sep$history$sep$first$sep$prev$sep$next$sep$last$sep$close"
 }%
-<!-- //twikiwebtopicactions -->%STOPINCLUDE%
-
+<!-- //sitetopicactions -->%STOPINCLUDE%
diff --git a/data/System/WebCreateNewWeb.txt b/data/System/WebCreateNewWeb.txt
new file mode 100644
index 0000000..9468e09
--- /dev/null
+++ b/data/System/WebCreateNewWeb.txt
@@ -0,0 +1,68 @@
+%META:TOPICINFO{author="ProjectContributor" date="1241699224" format="1.1" reprev="1.4" version="1.4"}%
+%META:TOPICPARENT{name="ManagingWebs"}%
+---+!! %TOPIC%
+<div class="foswikiFormSteps">
+  <h2>Create a new web</h2>
+  <form name="admin" action="%SCRIPTURLPATH{manage}%/%WEB%/%TOPIC%" method="post">
+  <input name="newtopic" type="hidden" value="%URLPARAM{"newtopic"}%" />
+  <input name="action" type="hidden" value="createweb" />
+  <input name="WEBBGCOLOR" type="hidden" value="#ffffff" />
+  <div class="foswikiFormStep">
+    <h3>Name:</h3>
+    <input name="newweb" class="foswikiInputField" type="text" value="%URLPARAM{"newweb"}%" size="60" />
+    <div class="foswikiFormDescription">
+      The name must start with an upper case letter, followed by upper or lower case letters or numbers.
+      Specify a short name to avoid long URLs.
+    </div>
+  </div>
+  <div class="foswikiFormStep">
+    <h3>Description:</h3>
+    <input type="text" class="foswikiInputField" name="SITEMAPWHAT" value="" size="60" />
+    <div class="foswikiFormDescription">
+      Enter a short description of the web. 
+      Write =Web.TopicName= instead of just =TopicName= if you include links. This
+      description will be used in the %SYSTEMWEB%.SiteMap
+    </div>
+  </div>
+  %TWISTY{
+    showlink="%MAKETEXT{"Show advanced options"}%" 
+    hidelink="%MAKETEXT{"Hide advanced options"}%"
+    showimgleft="%ICONURLPATH{toggleopen-small}%"
+    hideimgleft="%ICONURLPATH{toggleclose-small}%"
+    mode="div"
+  }%
+---
+  <div class="foswikiFormStep">
+    <h3>Template web:</h3>
+    <select name="baseweb" class="foswikiSelect">
+    %WEBLIST{ "<option $marker>$name</option>" webs="webtemplate,public" selection="_default" separator=" "}%
+    </select>
+    <div class="foswikiFormDescription">Select a TemplateWeb which you want the new web to be based on.</div>
+  </div>
+  <div class="foswikiFormStep">
+    <h3>Sitemap:</h3>
+    <label><input type="radio" name="SITEMAPLIST" value="on" checked="checked" /> *show* on sitemap </label> %BR%
+    <label><input type="radio" name="SITEMAPLIST" value="" /> *hide* from sitemap </label>
+    <div class="foswikiFormDescription">
+      Note, that this will only affect the list of webs on the SiteMap. The web itself is still accessible
+      to users.
+    </div>
+  </div>
+  <div class="foswikiFormStep">
+    <h3>Global search:</h3>
+    <label><input type="radio" name="NOSEARCHALL" value="on" /> *include* in global search </label>%BR%
+    <label><input type="radio" name="NOSEARCHALL" value="" checked="checked" /> *exclude* from global search </label>
+    <div class="foswikiFormDescription">
+      Specify if you want to exclude the web from a global search. Note, that you will have to
+      enter this web explicitly to search in it.
+    </div>
+  </div>
+  %ENDTWISTY%
+  <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
+    %BUTTON{"%MAKETEXT{"Submit"}%" icon="add" type="submit"}%
+    %CLEAR%
+  </div>
+</div>
+</form>
+
+%ICON{"help"}% Get help on [[%SYSTEMWEB%.ManagingWebs][managing webs]].
\ No newline at end of file
diff --git a/data/TWiki/WebLinks.txt b/data/System/WebLinks.txt
similarity index 100%
rename from data/TWiki/WebLinks.txt
rename to data/System/WebLinks.txt
diff --git a/data/TWiki/NatSkinFAQ.txt b/data/TWiki/NatSkinFAQ.txt
deleted file mode 100644
index ebcc8e2..0000000
--- a/data/TWiki/NatSkinFAQ.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-%META:TOPICINFO{author="ProjectContributor" date="1156519729" format="1.1" version="$Rev$"}%
-%META:TOPICPARENT{name="NatSkin"}%
----+!! %TOPIC%
-%TOC%
-
----++ The documentation of <nop>NatSkin is crap. I'm lost!
-If you need help there are a couple of options:
-   * Create a support request on Foswiki:Support/WebHome.
-   * Explain the problem on Foswiki:Extensions/NatSkinDev.
-   * Join the [[irc://irc.freenode.net/twiki][#twiki]] IRC channel and ask for help.
-   * Contact the [[mailto:daum@wikiring.com][WikiRing]] in case you need 
-     professional support.
-
-In any case helping out improving documentation, fixing bugs, helping others
-with the same problems is very welcome.
-
----++ Why does <nop>NatSkin depend on so many extra plugins?
-Because some things can't be done with the inventory being
-shipped with standard TWiki. A lot of the plugins once have been an integral
-part of the NatSkinPlugin and then been externalized into plugins
-of their own for the greater benefit. This tendency is still ongoing.
-
----++ It does not work (on my TWiki/Cairo installation).
-<nop>NatSkin once supported TWiki-2 (Beijing), TWiki-3 (Cairo) and TWiki-4 (Dakar)
-but has dropped support for Beijing and Cairo since version 3.0. 
-If you still need <nop>NatSkin on a legacy TWiki installation then try 
-[[http://twiki.org/cgi-bin/viewfile/Plugins/NatSkin?rev=37;filename=NatSkin.zip][NatSkin v2.9999]],
-[[http://twiki.org/cgi-bin/viewfile/Plugins/NatSkinPlugin?rev=31;filename=NatSkinPlugin.zip][NatSkinPlugin v2.9998]].
-
-
-
----++ Why are there so many template files?
-<nop>NatSkin does not build upon the standard templates/skin of TWiki as
-it differs substantially in the way it is broken up into components. Therefor 
-every function of the core engine will use a =*.nat.tmpl= file. Infact,
-the <nop>NatSkin templates are created to provide an independent base
-for further template modifications. See the discussion on TWiki:Codev/ConsolidateSkinTemplates.
-
----++ Can I disable offsite link detection?
-No. Missing feature to make this feature optional.
-
----++ I can't change the colors of <nop>TWikiTables using the TablePlugin.
-Yes, this is a known issue. NatSkin styles <nop>TWikiTables matching the
-selected style and thus overrides the html attributes the TablePlugin sets.
-This can only be resolved by teaching the TablePlugin css. In addition it must
-be able to distinguish global defaults, being overridable by the skin's css, from
-user-defined table properties.
-See the discussion at TWiki:Codev/CompleteCssControlofTWikiTables.
-
----++ Why is the sidebar switched off during =edit=?
-In case you use =STYLEBORDERS = thin= <nop>NatSkin will automatically disable
-the sidebar during edit not to narrow the text area even more. Try a different
-setting for =STYLEBORDERS= and you will have the sidebar during edit showing
-the help information again.
-
----++ I can't finish editing!
-Most probably you clicked on "Save" which saved your changes but keept you in the edit process.
-If you want to save&amp;quit click on "Done". Have a look at a comparison of the topic actions
-in the next FAQ.
-
----++ Why are the topic actions named differently compared to standard TWiki?
-Here is a comparison of the differences:
-
-| *NatSkin* | *PatternSkin* | *Description* |
-| %GREEN%Preview%ENDCOLOR%   | %GREEN%Preview%ENDCOLOR% | preview changes after editing |
-| %GREEN%Cancel%ENDCOLOR%    | %GREEN%Cancel%ENDCOLOR% | abandon changes and exit |
-| %YELLOW%Undo%ENDCOLOR%      | %YELLOW%n/a%ENDCOLOR%     | abandon changes and continue editing |
-| %YELLOW%n/a%ENDCOLOR%       | %YELLOW%Quiet Save%ENDCOLOR% | save changes "quietly"|
-| %RED%Save%ENDCOLOR%      | %RED%Checkpoint%ENDCOLOR% | save changes and continue editing |
-| %RED%Done%ENDCOLOR%      | %RED%Save%ENDCOLOR%        | save changes and exit |
-
-<nop>NatSkin's tries to be at least a bit closer to the terminology known from standard desktop 
-applications.
-
----++ Does <nop>NatSkin support <nop>QuietSave?
-This TWiki feature confuses more than provide any added value and has thus been removed from
-the =edit= page to simplify the interface.
-
----++ Why are there different actions in the attachment table?
-The table column of the attachments table has the title "Actions". In standard TWiki,
-the only thing that you can do per attachment here one action: "manage". 
-The things that you _can_ do with attachments is 
-   1 changing their properties (comments, attributes), 
-   1 moving (which is used for deleting also) and 
-   1 creatinga link to it in the topic text. 
-<nop>NatSkin tries to ease the standard use cases making them accessible
-with less mouse clicks, meanwhile not cluttering the interface.
-That's why there's "props, move" and not only "manage".
-
----++ How do I create a custom style for <nop>NatSkin?
-
----++ How do I create a custom header art?
-
----++ How do I restrict the possible choice of styles and variations?
-
diff --git a/data/TWiki/NatSkinStyleBrowser.txt b/data/TWiki/NatSkinStyleBrowser.txt
deleted file mode 100644
index c7bfda7..0000000
--- a/data/TWiki/NatSkinStyleBrowser.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-%META:TOPICINFO{author="ProjectContributor" date="1202840013" format="1.1" version="$Rev$"}%
----+ Style Browser
-Explore the style variations of the %SYSTEMWEB%.NatSkin by changing the base
-_style_ and a _variation_ of it. In general style variations are used to change
-the header art but also adapt colors to match the graphics. Various elements of
-the style can be relocated using style switches or even be switched off. Use
-the "reset" button whenever you want to revert your selection and come back to
-the site's default settings. Note that each web may have its own defaults build
-in. If you select different style options they have precedence over those.
-
-Register [[%USERREGISTRATION%][here]] to make your settings persistent.
-See the %SYSTEMWEB%.NatSkinPlugin documentation on how to use style settings in your personal
-<nop>%WIKITOOLNAME% account.
-
-%STARTINCLUDE%
-<table><tr><td>
-<div class="twikiPageForm">
-<div class="natSkinStyleBrowser">
-%IFSKINSTATETHEN{final="all"}%
-<!-- %RED%all styles and switches are final%ENDCOLOR% -->
-%ELSESKINSTATE%
-<form action="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%" _method="post">
-<table border="0">
-%IFSKINSTATETHEN{final="style"}% %ELSESKINSTATE%
-<tr><td colspan="3"> *%MAKETEXT{"Style"}%:* </td></tr>
-<tr>
-<td><a href="?switchstyle=prev" title="%MAKETEXT{"Switch to previous style"}%"><img src="%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/arrowleft.gif" border="0" alt="%MAKETEXT{"prev"}%"/></a></td>
-<td>
-<select name="style">
-<noautolink>
-%FORMATLIST{"%KNOWNSTYLES%" pattern="\s*(.*)\s*" format="<option $percntIFSKINSTATE{style=\"$1\" then=\"selected=\\"selected\\"\"}$percnt>$1</option>" join="\n" separator=" "}%
-</noautolink>
-</select>
-</td>
-<td align="right"><a href="?switchstyle=next" title="%MAKETEXT{"Switch to next style"}%"><img src="%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/arrowright.gif" border="0" alt="%MAKETEXT{"next"}%"/></a></td>
-</tr>
-%FISKINSTATE%
-%IFSKINSTATETHEN{final="variation"}% %ELSESKINSTATE%
-<tr><td colspan="3"> *%MAKETEXT{"Variation"}%:* </td></tr>
-<tr><td><a href="?switchvariation=prev" title="%MAKETEXT{"Switch to previous variation"}%"><img src="%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/arrowleft.gif" border="0" alt="%MAKETEXT{"prev"}%"/></a></td>
-<td>
-<select name="stylevariation">
-<noautolink>
-%FORMATLIST{"none, %KNOWNVARIATIONS%" pattern="\s*(.*)\s*" format="<option $percntIFSKINSTATE{variation=\"$1\" then=\"selected=\\"selected\\"\"}$percnt>$1</option>" join="\n" separator=" "}%
-</noautolink>
-</select>
-</td>
-<td align="right"><a href="?switchvariation=next" title="%MAKETEXT{"Switch to next variation"}%"><img src="%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/arrowright.gif" border="0" alt="%MAKETEXT{"prev"}%"/></a></td>
-</tr>
-%FISKINSTATE%
-%IFSKINSTATETHEN{final="switches"}% %ELSESKINSTATE%
-<tr><td colspan="3"> <p /> *%MAKETEXT{"Layout"}%:* </td></tr>
-<tr>
-<td colspan="3">
-%IFSKINSTATETHEN{final="border"}% %ELSESKINSTATE%
-<ul>
-<li> <input type="radio" class="twikiRadiobox" id="borderon" name="styleborder" value="on" %IFSKINSTATE{border="on" then="checked=\"checked\""}% /><label for="borderon">%MAKETEXT{"Border On"}%</label></li>
-<li> <input type="radio" class="twikiRadiobox" id="borderoff" name="styleborder" value="off" %IFSKINSTATE{border="off" then="checked=\"checked\""}% /><label for="borderoff">%MAKETEXT{"Border Off"}%</label></li>
-<li> <input type="radio" class="twikiRadiobox" id="borderthin" name="styleborder" value="thin" %IFSKINSTATE{border="thin" then="checked=\"checked\""}% /><label for="borderthin">%MAKETEXT{"Thin Layout"}%</label></li>
-</ul>
-%FISKINSTATE%
-%IFSKINSTATETHEN{final="sidebar"}% %ELSESKINSTATE%
-<ul>
-<li> <input type="radio" class="twikiRadiobox" id="sidebarleft" name="stylesidebar" value="left" %IFSKINSTATE{sidebar="left" then="checked=\"checked\""}% /><label for="sidebarleft">%MAKETEXT{"Sidebar Left"}%</label></li>
-<li> <input type="radio" class="twikiRadiobox" id="sidebarright" name="stylesidebar" value="right" %IFSKINSTATE{sidebar="right" then="checked=\"checked\""}% /><label for="sidebarright">%MAKETEXT{"Sidebar Right"}%</label></li>
-<li> <input type="radio" class="twikiRadiobox" id="sidebarboth" name="stylesidebar" value="both" %IFSKINSTATE{sidebar="both" then="checked=\"checked\""}% /><label for="sidebarboth">%MAKETEXT{"Both sidebars"}%</label></li>
-<li> <input type="radio" class="twikiRadiobox" id="sidebaroff" name="stylesidebar" value="off" %IFSKINSTATE{sidebar="off" then="checked=\"checked\""}% /><label for="sidebaroff">%MAKETEXT{"Sidebar Off"}%</label></li>
-</ul>
-%FISKINSTATE%
-%IFSKINSTATETHEN{final="buttons"}% %ELSESKINSTATE%
-<ul>
-<li> <input type="radio" class="twikiRadiobox" id="buttonson" name="stylebuttons" value="on" %IFSKINSTATE{buttons="on" then="checked=\"checked\""}% /><label for="buttonson">%MAKETEXT{"Web Buttons On"}%</label></li>
-<li> <input type="radio" class="twikiRadiobox" id="buttonsoff" name="stylebuttons" value="off" %IFSKINSTATE{buttons="off" then="checked=\"checked\""}% /><label for="buttonsoff">%MAKETEXT{"Web Buttons Off"}%</label></li>
-</ul>
-%FISKINSTATE%
-%IFSKINSTATETHEN{final="searchbox"}% %ELSESKINSTATE%
-<ul>
-<li> <input type="radio" class="twikiRadiobox" id="searchboxtop" name="stylesearchbox" value="top" %IFSKINSTATE{searchbox="top" then="checked=\"checked\""}% /><label for="searchboxtop">%MAKETEXT{"Searchbox in topbar"}%</label></li>
-<li> <input type="radio" class="twikiRadiobox" id="searchboxpos1" name="stylesearchbox" value="pos1" %IFSKINSTATE{searchbox="pos1" then="checked=\"checked\""}% /><label for="searchboxpos1">%MAKETEXT{"Searchbox in pos. 1"}%</label></li>
-<li> <input type="radio" class="twikiRadiobox" id="searchboxpos2" name="stylesearchbox" value="pos2" %IFSKINSTATE{searchbox="pos2" then="checked=\"checked\""}% /><label for="searchboxpos2">%MAKETEXT{"Searchbox in pos. 2"}%</label></li>
-<li> <input type="radio" class="twikiRadiobox" id="searchboxpos3" name="stylesearchbox" value="pos3" %IFSKINSTATE{searchbox="pos3" then=" checked=\"checked\""}% /><label for="searchboxpos3">%MAKETEXT{"Searchbox in pos. 3"}%</label></li>
-<li> <input type="radio" class="twikiRadiobox" id="searchboxoff" name="stylesearchbox" value="off" %IFSKINSTATE{searchbox="off" then=" checked=\"checked\""}% /><label for="searchboxoff">%MAKETEXT{"Searchbox off"}%</label></li>
-</ul>
-%FISKINSTATE%
-</td></tr>
-%FISKINSTATE%
-<tr><td colspan="3"> *%MAKETEXT{"Presets"}%:* </td></tr>
-<tr><td colspan="3">
-   * <a href="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%?
-*~~ style=JotSpot&
-*~~ stylevariation=none&
-*~~ styleborder=off&
-*~~ stylesidebar=left&
-*~~ stylesearchbox=pos1&
-*~~ stylebuttons=on">Jotspot</a>
-   * <a href="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%?
-*~~ style=SeaGreen&
-*~~ stylevariation=none&
-*~~ styleborder=thin&
-*~~ stylesidebar=right&
-*~~ stylesearchbox=top&
-*~~ stylebuttons=on">MovableType</a>
-   * <a href="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%?
-*~~ style=Pattern&
-*~~ stylevariation=none&
-*~~ styleborder=off&
-*~~ stylesidebar=left&
-*~~ stylesearchbox=top&
-*~~ stylebuttons=off">TWiki</a>
-   * <a href="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%?
-*~~ style=Kubrick&
-*~~ stylevariation=none&
-*~~ styleborder=thin&
-*~~ stylesidebar=right&
-*~~ stylesearchbox=pos1&
-*~~ stylebuttons=on">Wordpress</a>
-</td></tr>
-<tr>
-<td colspan="3" align="center">
-<div style="white-space:nowrap">
-<input style="width:49%" type="submit" class="natOkButton" value="OK" title="%MAKETEXT{"Submit changes"}%"/>
-<input style="width:49%" type="button" class="natCancelButton" value="Reset" title="%MAKETEXT{"Reset to defaults"}%" 
-~~~ onclick="window.location.href='%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%?resetstyle=on';" />
-</div>
-</td>
-</tr>
-</table>
-</form>%ENDSECTION{"presets"}%
-</div>
-%FISKINSTATE%
-</div>
-</td></tr></table>
-%STOPINCLUDE%
-
-<!--
-   * Set SKIN = nat
--->
diff --git a/data/TWiki/TWikiWebButtons.txt b/data/TWiki/TWikiWebButtons.txt
deleted file mode 100644
index 4e4f454..0000000
--- a/data/TWiki/TWikiWebButtons.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-%META:TOPICINFO{author="ProjectContributor" date="1225762335" format="1.1" reprev="1.2" version="$Rev$"}%
-%STARTINCLUDE%<!-- twiki.twikiwebbuttons --> 
-%~~ FLEXWEBLIST{
-~~~   webs="%USERSWEB%,public,%SYSTEMWEB%"
-~~~   selection="%FORMATLIST{"%BASEWEB%" split="[\/\.]" limit="1"}%"
-~~~   marker="current"
-~~~   exclude="^(TestCases|Trash|Attic|Sandbox).*"
-~~~   adminwebs="Applications.*"
-~~~   map="%SYSTEMWEB%=System"
-~~~   format="   $indent* $percntWEBLINK{\"$web\" format=\"<a class='natWebLink $marker' href='$dollarurl' title='$dollartooltip'>$name</a>\"}$percnt$n"
-~~~ }%%STOPINCLUDE%
diff --git a/data/TWiki/TWikiWebLinks.txt b/data/TWiki/TWikiWebLinks.txt
deleted file mode 100644
index e5b546f..0000000
--- a/data/TWiki/TWikiWebLinks.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-%META:TOPICINFO{author="ProjectContributor" date="1197888740" format="1.1" reprev="1.10" version="$Rev$"}%
----+ %TOPIC%
-
-Standard links in sidebar navigation. 
-
-%STARTINCLUDE%<!-- twiki.twikiweblinks -->
-   * [[%BASEWEB%.WebTopicList][%MAKETEXT{"Index"}%]]
-   * [[%BASEWEB%.WebChanges][%MAKETEXT{"Changes"}%]]
-   * [[%BASEWEB%.WebNotify][%MAKETEXT{"Notifications"}%]]
-   * [[%BASEWEB%.WebStatistics][%MAKETEXT{"Statistics"}%]]
-<!-- twiki.twikiweblinks -->%STOPINCLUDE%
diff --git a/data/TWiki/TWikiWebMoreTopicActions.txt b/data/TWiki/TWikiWebMoreTopicActions.txt
deleted file mode 100644
index 6486db6..0000000
--- a/data/TWiki/TWikiWebMoreTopicActions.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-%META:TOPICINFO{author="ProjectContributor" date="1162063414" format="1.1" version="$Rev$"}%
-<div class="natOopsMore">
-<div class="twikiFormSteps">
-  <form name="editsettings" action="%SCRIPTURLPATH{"manage"}%/%BASEWEB%/%BASETOPIC%" method="post">
-    <input type="hidden" name="action" value="editSettings" />
-    <div class="twikiFormStep">
-        <h2>%MAKETEXT{"Edit topic preferences"}%</h2>
-        %MAKETEXT{"Edit preference settings for '[_1]'" args="[[%BASEWEB%.%BASETOPIC%]]"}%
-    </div>
-    <div class="twikiFormStep twikiFormButtons twikiFormLast">
-        %BUTTON{value="%MAKETEXT{"Edit"}%" type="submit" icon="page_white_edit"}%
-        %CLEAR%
-    </div>
-  </form>
-</div>
-<div class="twikiFormSteps">
-  <form name="restoretopic" action="%SCRIPTURLPATH{"manage"}%/%BASEWEB%/%BASETOPIC%">
-    <input type="hidden" name="action" value="restoreRevision" />
-    <input type="hidden" name="nowysiwyg" value="1" />
-    <div class="twikiFormStep">
-      <h2>%MAKETEXT{"Restore topic"}%</h2>
-      %MAKETEXT{"Restore topic to revision:"}% 
-      <input class="twikiInputField" type="text" name="rev" size="6" value="%NATMAXREV%" />
-      <div class="twikiFormDescription">
-        %MAKETEXT{"You will be able to review the topic before saving it to a new revision."}%
-      </div>
-    </div>
-    <div clasS="twikiFormStep twikiFormButtons twikiFormLast">
-      %BUTTON{"%MAKETEXT{"Restore"}%" icon="arrow_undo" type="submit" }%
-      %CLEAR%
-    </div>
-  </form>
-</div>
-
-<div class="twikiFormSteps">
-  <form name="searchbacklinks" action="%SCRIPTURLPATH{"oops"}%/%BASEWEB%/%BASETOPIC%">
-  <div class="twikiFormStep">
-    <h2>%MAKETEXT{"Search for backlinks"}%</h2>
-  </div>
-  <div class="twikiFormStep">
-    %MAKETEXT{"Find topics that link back to '[_1]'" args="[[%BASEWEB%.%BASETOPIC%]]"}%
-
-    <input type="radio" id="searchthis" name="template" value="backlinksweb" checked />
-    <label for="searchthis">%MAKETEXT{"Search in current web"}%</label>
-
-    <input type="radio" id="searchall" name="template" value="backlinksallwebs" />
-    <label for="searchall">%MAKETEXT{"Search in all public webs"}%</label>
-  </div>
-  <div class="twikiFormStep twikiFormButtons twikiFormLast">
-    %BUTTON{"%MAKETEXT{"Search"}%" type="submit" icon="find"}%
-    %CLEAR%
-  </div>
-  </form>
-</div>     
-<hr class="twikiClear" />
-<div class="twikiFormSteps">
-  <div class="twikiFormStep">
-    <h2>%MAKETEXT{"Rename, move or delete this topic"}%</h2>
-    %MAKETEXT{"Rename topic *[_1]*" args="%BASETOPIC%"}%
-
-    %MAKETEXT{"See also:"}% %SYSTEMWEB%.ManagingTopics.
-  </div>
-  <div class="twikiFormStep twikiFormButtons twikiFormLast">
-    %BUTTON{"%MAKETEXT{"Rename"}%" target="%SCRIPTURLPATH{"rename"}%/%BASEWEB%/%BASETOPIC%?currentwebonly=on" icon="page_white_delete"}%
-    %CLEAR%
-  </div>
-</div>
-<div class="twikiFormSteps" style='%IF{"context i18n_enabled" then="" else="display:none"}%'>
-  <form name="changelanguage" action="%SCRIPTURLPATH{"oops"}%/%BASEWEB%/%BASETOPIC%" method="get">
-    <input type="hidden" name="template" value="oopslanguagechanged" />
-    <input type="hidden" name="refresh" value="on" />
-    <div class="twikiFormStep">
-      <h2>%MAKETEXT{"Change interface language"}%</h2>
-      <select name="language">
-      <option value="default">Default</option>
-      %LANGUAGES{format="<option $marker value=\"$langtag\">$langname</option>" selection="%LANGUAGE%" separator=" "}%
-      </select>
-
-      <input type="checkbox" class="twikiCheckbox" name="todefault" id="todefault" onclick="document.changelanguage.language.value = (this.checked)?'default':'%LANGUAGE%';this.blur();">
-      <label for="todefault">%MAKETEXT{"Default language"}%</label>
-    </div>
-    <div class="twikiFormStep twikiFormButtons twikiFormLast">
-      %BUTTON{"%MAKETEXT{"Submit"}%" type="submit" icon="world"}%
-      %CLEAR%
-    </div>
-  </form>
-</div>
-<div class="twikiFormSteps" style="%IF{"not {Cache}{Enabled}" then="display:none"}%">
-  <div class="twikiFormStep">
-    <h2>%MAKETEXT{"Refresh topic caching"}%</h2>
-    %MAKETEXT{"Get a fresh page of the topic [_1]" args="[[%BASEWEB%.%BASETOPIC%]]"}%&nbsp;
-  </div>
-  <div class="twikiFormStep twikiFormButtons twikiFormLast">
-    %BUTTON{"%MAKETEXT{"Refresh"}%" icon="arrow_refresh" target="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%?refresh=on" }%
-    %CLEAR%
-  </div>
-</div>
-<div class="twikiFormSteps alt">
-  %BUTTON{"%MAKETEXT{"Back"}%" target="%BASEWEB%.%BASETOPIC%" icon="arrow_left"}%
-  %CLEAR%
-</div>
diff --git a/lib/Foswiki/Contrib/NatSkin.pm b/lib/Foswiki/Contrib/NatSkin.pm
new file mode 100644
index 0000000..d84c4e2
--- /dev/null
+++ b/lib/Foswiki/Contrib/NatSkin.pm
@@ -0,0 +1,6 @@
+package Foswiki::Contrib::NatSkin;
+use vars qw($VERSION $RELEASE);
+$VERSION = '$Rev$';
+$RELEASE = '3.90';
+
+1;
diff --git a/lib/Foswiki/Contrib/NatSkin/DEPENDENCIES b/lib/Foswiki/Contrib/NatSkin/DEPENDENCIES
new file mode 100644
index 0000000..1936fbb
--- /dev/null
+++ b/lib/Foswiki/Contrib/NatSkin/DEPENDENCIES
@@ -0,0 +1,11 @@
+Foswiki::Contrib::FamFamFamContrib,>=2075,perl,Required.
+Foswiki::Plugins::BreadCrumbsPlugin,>=4318,perl,Required
+Foswiki::Plugins::FilterPlugin,>=3491,perl,Required
+Foswiki::Plugins::FlexWebListPlugin,>=3493,perl,Required
+Foswiki::Plugins::GluePlugin,>=3494,perl,Required
+Foswiki::Plugins::IfDefinedPlugin,>=3637,perl,Required
+Foswiki::Plugins::SetVariablePlugin,>=4287,perl,Required
+Foswiki::Plugins::UploadPlugin,>=1340,perl,Required
+Foswiki::Plugins::NatEditPlugin,>=1993,perl,Required
+Foswiki::Plugins::JQueryPlugin,>=3740,perl,Required
+Foswiki::Plugins::NatSkinPlugin,>=0,perl,Required.
diff --git a/lib/Foswiki/Contrib/NatSkin/MANIFEST b/lib/Foswiki/Contrib/NatSkin/MANIFEST
new file mode 100644
index 0000000..b4f4047
--- /dev/null
+++ b/lib/Foswiki/Contrib/NatSkin/MANIFEST
@@ -0,0 +1,255 @@
+data/Main/NatSkinUserViewTemplate.txt 0644
+data/Main/WebLinks.txt 0644
+data/Main/WikiGuestSideBar.txt 0644
+data/System/AjaxWebSelector.txt 0644
+data/System/MySideBarTemplate.txt 0644
+data/System/MySideBar.txt 0644
+data/System/NatSearch.txt 0644
+data/System/NatSkinConfiguration.txt 0644
+data/System/NatSkinCss.txt 0644
+data/System/NatSkinFAQ.txt 0644
+data/System/NatSkinStyleBrowser.txt 0644
+data/System/NatSkinTemplates.txt 0644
+data/System/NatSkinTopicDoesNotExistViewTemplate.txt 0644
+data/System/NatSkin.txt 0644
+data/System/NatSkinWebCreateNewTopicTemplate.txt 0644
+data/System/SiteButtons.txt 0644
+data/System/SiteHtmlHead.txt 0644
+data/System/SiteLinks.txt 0644
+data/System/SiteNothingFound.txt 0644
+data/System/SiteRightBar.txt 0644
+data/System/SiteSideBar.txt 0644
+data/System/SiteTopicActions.txt 0644
+data/System/WebCreateNewWeb.txt 0644
+data/System/WebLinks.txt 0644
+lib/Foswiki/Contrib/NatSkin.pm 0644
+pub/System/NatSkin/attach.js 0644
+pub/System/NatSkin/attach.js.gz 0644
+pub/System/NatSkin/BaseBorder.css 0644
+pub/System/NatSkin/BaseBorder.css.gz 0644
+pub/System/NatSkin/BaseButtons.css 0644
+pub/System/NatSkin/BaseButtons.css.gz 0644
+pub/System/NatSkin/BaseStyle.css 0644
+pub/System/NatSkin/BaseStyle.css.gz 0644
+pub/System/NatSkin/BaseThin.css 0644
+pub/System/NatSkin/BaseThin.css.gz 0644
+pub/System/NatSkin/blank.gif 0644
+pub/System/NatSkin/BlueNoteBorder.css 0644
+pub/System/NatSkin/BlueNoteBorder.css.gz 0644
+pub/System/NatSkin/BlueNoteButtons.css 0644
+pub/System/NatSkin/BlueNoteButtons.css.gz 0644
+pub/System/NatSkin/BlueNoteStyle.css 0644
+pub/System/NatSkin/BlueNoteStyle.css.gz 0644
+pub/System/NatSkin/BlueNoteStyle.jpeg 0644
+pub/System/NatSkin/BlueNoteThin.css 0644
+pub/System/NatSkin/BlueNoteThin.css.gz 0644
+pub/System/NatSkin/bullet-toc.gif 0644
+pub/System/NatSkin/button-bg.png 0644
+pub/System/NatSkin/external.png 0644
+pub/System/NatSkin/favicon.ico 0644
+pub/System/NatSkin/feed-icon-12x12.gif 0644
+pub/System/NatSkin/feed-icon-12x12-gray.gif 0644
+pub/System/NatSkin/feed-icon-12x12-gray.png 0644
+pub/System/NatSkin/feed-icon-12x12.png 0644
+pub/System/NatSkin/foswiki-header-notrans.png 0644
+pub/System/NatSkin/foswiki-header.png 0644
+pub/System/NatSkin/foswiki-header-tile.png 0644
+pub/System/NatSkin/foswiki-logo.png 0644
+pub/System/NatSkin/GrayBlend.gif 0644
+pub/System/NatSkin/GrayBlend.png 0644
+pub/System/NatSkin/icons/application_form_edit.png 0644
+pub/System/NatSkin/icons/attach.png 0644
+pub/System/NatSkin/icons/bin.png 0644
+pub/System/NatSkin/icons/bullet_orange.png 0644
+pub/System/NatSkin/icons/control-back-gray.png 0644
+pub/System/NatSkin/icons/control-back.png 0644
+pub/System/NatSkin/icons/control-bottom-gray.png 0644
+pub/System/NatSkin/icons/control-bottom.png 0644
+pub/System/NatSkin/icons/control-down-gray.png 0644
+pub/System/NatSkin/icons/control-down.png 0644
+pub/System/NatSkin/icons/control-eject-gray.png 0644
+pub/System/NatSkin/icons/control-eject.png 0644
+pub/System/NatSkin/icons/control-end-gray.png 0644
+pub/System/NatSkin/icons/control-end.png 0644
+pub/System/NatSkin/icons/control-forward-gray.png 0644
+pub/System/NatSkin/icons/control-forward.png 0644
+pub/System/NatSkin/icons/control-left-gray.png 0644
+pub/System/NatSkin/icons/control-left.png 0644
+pub/System/NatSkin/icons/control-pause-gray.png 0644
+pub/System/NatSkin/icons/control-pause.png 0644
+pub/System/NatSkin/icons/control-play-gray.png 0644
+pub/System/NatSkin/icons/control-play.png 0644
+pub/System/NatSkin/icons/control-rev-gray.png 0644
+pub/System/NatSkin/icons/control-rev.png 0644
+pub/System/NatSkin/icons/control-right-gray.png 0644
+pub/System/NatSkin/icons/control-right.png 0644
+pub/System/NatSkin/icons/control-start-gray.png 0644
+pub/System/NatSkin/icons/control-start.png 0644
+pub/System/NatSkin/icons/control-stop-gray.png 0644
+pub/System/NatSkin/icons/control-stop.png 0644
+pub/System/NatSkin/icons/control-top-gray.png 0644
+pub/System/NatSkin/icons/control-top.png 0644
+pub/System/NatSkin/icons/control-up-gray.png 0644
+pub/System/NatSkin/icons/control-up.png 0644
+pub/System/NatSkin/icons/cross.png 0644
+pub/System/NatSkin/icons/eye.png 0644
+pub/System/NatSkin/icons/help.png 0644
+pub/System/NatSkin/icons/link.png 0644
+pub/System/NatSkin/icons/magnifier.png 0644
+pub/System/NatSkin/icons/page_white_acrobat.png 0644
+pub/System/NatSkin/icons/page_white_add.png 0644
+pub/System/NatSkin/icons/page_white_go.png 0644
+pub/System/NatSkin/icons/page_white_stack.png 0644
+pub/System/NatSkin/icons/pencil_go.png 0644
+pub/System/NatSkin/icons/pencil.png 0644
+pub/System/NatSkin/icons/printer.png 0644
+pub/System/NatSkin/icons/text_align_left.png 0644
+pub/System/NatSkin/icons/time.png 0644
+pub/System/NatSkin/icons/user.png 0644
+pub/System/NatSkin/icons/wrench.png 0644
+pub/System/NatSkin/iepngfix.htc 0644
+pub/System/NatSkin/login_keys.png 0644
+pub/System/NatSkin/Makefile 0644
+pub/System/NatSkin/menuarrow.gif 0644
+pub/System/NatSkin/menubg.gif 0644
+pub/System/NatSkin/menucorner.gif 0644
+pub/System/NatSkin/minus.png 0644
+pub/System/NatSkin/natskin.js 0644
+pub/System/NatSkin/natskin.js.gz 0644
+pub/System/NatSkin/obfuscator.js 0644
+pub/System/NatSkin/obfuscator.js.gz 0644
+pub/System/NatSkin/oldrevisionbg.png 0644
+pub/System/NatSkin/oopsmore_diff_debug.gif 0644
+pub/System/NatSkin/oopsmore_diff_sequential.gif 0644
+pub/System/NatSkin/oopsmore_diff_sidebyside.gif 0644
+pub/System/NatSkin/pdf.png 0644
+pub/System/NatSkin/plus.png 0644
+pub/System/NatSkin/previewbg.png 0644
+pub/System/NatSkin/print.css 0644
+pub/System/NatSkin/print.css.gz 0644
+pub/System/NatSkin/q_black.gif 0644
+pub/System/NatSkin/wikiringlogo40x40.png 0644
+templates/addform.nat.tmpl 0644
+templates/attachagain.nat.tmpl 0644
+templates/attachjavascript.nat.tmpl 0644
+templates/attach.nat.tmpl 0644
+templates/attachnew.nat.tmpl 0644
+templates/attachsidebar.nat.tmpl 0644
+templates/attachtables.nat.tmpl 0644
+templates/backlinksallwebs.nat.tmpl 0644
+templates/backlinksweb.nat.tmpl 0644
+templates/body.nat.tmpl 0644
+templates/changeform.nat.tmpl 0644
+templates/changeformsidebar.nat.tmpl 0644
+templates/changes.nat.tmpl 0644
+templates/comments.nat.tmpl 0644
+templates/compare.nat.tmpl 0644
+templates/editform.nat.tmpl 0644
+templates/edit.nat.tmpl 0644
+templates/editsection.nat.tmpl 0644
+templates/editstyles.nat.tmpl 0644
+templates/editTableRow.nat.tmpl 0644
+templates/edittext.nat.tmpl 0644
+templates/form.nat.tmpl 0644
+templates/formtables.nat.tmpl 0644
+templates/foswiki.nat.tmpl 0644
+templates/javascript.nat.tmpl 0644
+templates/kinosearch.nat.tmpl 0644
+templates/loginbase.nat.tmpl 0644
+templates/login.nat.tmpl 0644
+templates/login.sudo.nat.tmpl 0644
+templates/mailnotify.nat.tmpl 0644
+templates/messages.nat.tmpl 0644
+templates/moveattachment.nat.tmpl 0644
+templates/moveattachmentsidebar.nat.tmpl 0644
+templates/oo2twiki.nat.tmpl 0644
+templates/oopsaccesschange.nat.tmpl 0644
+templates/oopsaccesscreateweb.nat.tmpl 0644
+templates/oopsaccessdenied.nat.tmpl 0644
+templates/oopsaccessgroup.nat.tmpl 0644
+templates/oopsaccessrename.nat.tmpl 0644
+templates/oopsaccessview.nat.tmpl 0644
+templates/oopsaccessvote.nat.tmpl 0644
+templates/oopsattention.nat.tmpl 0644
+templates/oopsauth.nat.tmpl 0644
+templates/oopsbadpwformat.nat.tmpl 0644
+templates/oopsblacklist.nat.tmpl 0644
+templates/oopschangepasswd.nat.tmpl 0644
+templates/oopsempty.nat.tmpl 0644
+templates/oopserrbase.nat.tmpl 0644
+templates/oopsgeneric.nat.tmpl 0644
+templates/oopshistory.nat.tmpl 0644
+templates/oopslanguagechanged.nat.tmpl 0644
+templates/oopsleaseconflict.nat.tmpl 0644
+templates/oopslocked.nat.tmpl 0644
+templates/oopslockedrename.nat.tmpl 0644
+templates/oopslogonbase.nat.tmpl 0644
+templates/oopslogon.nat.tmpl 0644
+templates/oopsmanage.nat.tmpl 0644
+templates/oopsmissing.nat.tmpl 0644
+templates/oopsmngcreateweb.nat.tmpl 0644
+templates/oopsmore.nat.tmpl 0644
+templates/oopsmoveerr.nat.tmpl 0644
+templates/oops.nat.tmpl 0644
+templates/oopsnoformdef.nat.tmpl 0644
+templates/oopsnotwikiuser.nat.tmpl 0644
+templates/oopsnoweb.nat.tmpl 0644
+templates/oopspreview.nat.tmpl 0644
+templates/oopsregemail.nat.tmpl 0644
+templates/oopsregexist.nat.tmpl 0644
+templates/oopsregpasswd.nat.tmpl 0644
+templates/oopsregrequ.nat.tmpl 0644
+templates/oopsregthanks.nat.tmpl 0644
+templates/oopsregwiki.nat.tmpl 0644
+templates/oopsrenameerr.nat.tmpl 0644
+templates/oopsrenamenotwikiword.nat.tmpl 0644
+templates/oopsresetpasswd.nat.tmpl 0644
+templates/oopsrev.nat.tmpl 0644
+templates/oopssaveerr.nat.tmpl 0644
+templates/oopssave.nat.tmpl 0644
+templates/oopssendmailerr.nat.tmpl 0644
+templates/oopssoftwareerr.nat.tmpl 0644
+templates/oopstopicexists.nat.tmpl 0644
+templates/oopsupload.nat.tmpl 0644
+templates/oopswrongpassword.nat.tmpl 0644
+templates/page.nat.tmpl 0644
+templates/plucsearch.nat.tmpl 0644
+templates/previewjavascript.nat.tmpl 0644
+templates/preview.nat.tmpl 0644
+templates/printjavascript.nat.tmpl 0644
+templates/rdiff.nat.tmpl 0644
+templates/rdifftopicactions.nat.tmpl 0644
+templates/renamebase.nat.tmpl 0644
+templates/renameconfirm.nat.tmpl 0644
+templates/renamedelete.nat.tmpl 0644
+templates/renamejavascript.nat.tmpl 0644
+templates/rename.nat.tmpl 0644
+templates/renamerefs.nat.tmpl 0644
+templates/renamesidebar.nat.tmpl 0644
+templates/renamestyles.nat.tmpl 0644
+templates/renamewebbase.nat.tmpl 0644
+templates/renamewebconfirm.nat.tmpl 0644
+templates/renamewebdelete.nat.tmpl 0644
+templates/renamewebjavascript.nat.tmpl 0644
+templates/renameweb.nat.tmpl 0644
+templates/renamewebsidebar.nat.tmpl 0644
+templates/searchbase.nat.tmpl 0644
+templates/searchbookview.nat.tmpl 0644
+templates/searchbox.nat.tmpl 0644
+templates/searchbox.pluc.tmpl 0644
+templates/searchformat.nat.tmpl 0644
+templates/searchmeta.nat.tmpl 0644
+templates/search.nat.tmpl 0644
+templates/searchrenameview.nat.tmpl 0644
+templates/settingsjavascript.nat.tmpl 0644
+templates/settings.nat.tmpl 0644
+templates/sidebar.nat.tmpl 0644
+templates/styles.nat.tmpl 0644
+templates/topbar.nat.tmpl 0644
+templates/twistyplugin.nat.tmpl 0644
+templates/validate.nat.tmpl 0644
+templates/viewbody.plain.nat.tmpl 0644
+templates/view.nat.tmpl 0644
+templates/view.plain.nat.tmpl 0644
+templates/view.print.nat.tmpl 0644
+templates/viewtopicactions.nat.tmpl 0644
diff --git a/lib/TWiki/Contrib/NatSkin/build.pl b/lib/Foswiki/Contrib/NatSkin/build.pl
similarity index 100%
rename from lib/TWiki/Contrib/NatSkin/build.pl
rename to lib/Foswiki/Contrib/NatSkin/build.pl
diff --git a/lib/TWiki/Contrib/NatSkin.pm b/lib/TWiki/Contrib/NatSkin.pm
deleted file mode 100644
index 8603803..0000000
--- a/lib/TWiki/Contrib/NatSkin.pm
+++ /dev/null
@@ -1,6 +0,0 @@
-package TWiki::Contrib::NatSkin;
-use vars qw($VERSION $RELEASE);
-$VERSION = '$Rev$';
-$RELEASE = '3.00-pre37';
-
-1;
diff --git a/lib/TWiki/Contrib/NatSkin/DEPENDENCIES b/lib/TWiki/Contrib/NatSkin/DEPENDENCIES
deleted file mode 100644
index 3b0628d..0000000
--- a/lib/TWiki/Contrib/NatSkin/DEPENDENCIES
+++ /dev/null
@@ -1,11 +0,0 @@
-Foswiki::Contrib::FamFamFamContrib,>=1.0,perl,Required.
-TWiki::Plugins::BreadCrumbsPlugin,>=1.00,perl,Required
-TWiki::Plugins::FamFamFamContrib,>=1.0,perl,Required.
-TWiki::Plugins::FilterPlugin,>=1.40,perl,Required
-TWiki::Plugins::FlexWebListPlugin,>=1.20,perl,Required
-TWiki::Plugins::GluePlugin,>=2.00,perl,Required
-TWiki::Plugins::IfDefinedPlugin,>=1.01,perl,Required
-TWiki::Plugins::JQueryPlugin,>=1.1,perl,Required
-TWiki::Plugins::JQueryTwistyPlugin,>=1.00,perl,Recommended
-TWiki::Plugins::NatEditPlugin,>=2.00,perl,Required
-TWiki::Plugins::NatSkinPlugin,>=3.0,perl,Required.
diff --git a/lib/TWiki/Contrib/NatSkin/MANIFEST b/lib/TWiki/Contrib/NatSkin/MANIFEST
deleted file mode 100644
index 8ed0c36..0000000
--- a/lib/TWiki/Contrib/NatSkin/MANIFEST
+++ /dev/null
@@ -1,229 +0,0 @@
-data/Main/NatSkinUserViewTemplate.txt 0644
-data/Main/TWikiGuestSideBar.txt 0644
-data/Main/WebLinks.txt 0644
-data/TWiki/MySideBarTemplate.txt 0644
-data/TWiki/MySideBar.txt 0644
-data/TWiki/NatSearch.txt 0644
-data/TWiki/NatSkinConfiguration.txt 0644
-data/TWiki/NatSkinCss.txt 0644
-data/TWiki/NatSkinFAQ.txt 0644
-data/TWiki/NatSkinStyleBrowser.txt 0644
-data/TWiki/NatSkinTemplates.txt 0644
-data/TWiki/NatSkin.txt 0644
-data/TWiki/NatSkinWebCreateNewTopicTemplate.txt 0644
-data/TWiki/TWikiWebButtons.txt 0644
-data/TWiki/TWikiWebHtmlHead.txt 0644
-data/TWiki/TWikiWebLinks.txt 0644
-data/TWiki/TWikiWebMoreTopicActions.txt 0644
-data/TWiki/TWikiWebNothingFound.txt 0644
-data/TWiki/TWikiWebRightBar.txt 0644
-data/TWiki/TWikiWebSideBar.txt 0644
-data/TWiki/TWikiWebTopicActions.txt 0644
-data/TWiki/WebLinks.txt 0644
-lib/TWiki/Contrib/NatSkin.pm 0644
-pub/TWiki/NatSkin/attach.js 0644
-pub/TWiki/NatSkin/BaseBorder.css 0644
-pub/TWiki/NatSkin/BaseButtons.css 0644
-pub/TWiki/NatSkin/BaseStyle.css 0644
-pub/TWiki/NatSkin/BaseThin.css 0644
-pub/TWiki/NatSkin/blank.gif 0644
-pub/TWiki/NatSkin/BlueNoteBorder.css 0644
-pub/TWiki/NatSkin/BlueNoteButtons.css 0644
-pub/TWiki/NatSkin/BlueNoteStyle.css 0644
-pub/TWiki/NatSkin/BlueNoteStyle.jpeg 0644
-pub/TWiki/NatSkin/BlueNoteThin.css 0644
-pub/TWiki/NatSkin/bullet-toc.gif 0644
-pub/TWiki/NatSkin/button-bg.png 0644
-pub/TWiki/NatSkin/external.png 0644
-pub/TWiki/NatSkin/favicon.ico 0644
-pub/TWiki/NatSkin/feed-icon-12x12.gif 0644
-pub/TWiki/NatSkin/feed-icon-12x12-gray.gif 0644
-pub/TWiki/NatSkin/feed-icon-12x12-gray.png 0644
-pub/TWiki/NatSkin/feed-icon-12x12.png 0644
-pub/TWiki/NatSkin/foswiki-logo.png 0644
-pub/TWiki/NatSkin/GrayBlend.gif 0644
-pub/TWiki/NatSkin/GrayBlend.png 0644
-pub/TWiki/NatSkin/icons/application_form_edit.png 0644
-pub/TWiki/NatSkin/icons/attach.png 0644
-pub/TWiki/NatSkin/icons/bin.png 0644
-pub/TWiki/NatSkin/icons/control-back-gray.png 0644
-pub/TWiki/NatSkin/icons/control-back.png 0644
-pub/TWiki/NatSkin/icons/control-bottom-gray.png 0644
-pub/TWiki/NatSkin/icons/control-bottom.png 0644
-pub/TWiki/NatSkin/icons/control-down-gray.png 0644
-pub/TWiki/NatSkin/icons/control-down.png 0644
-pub/TWiki/NatSkin/icons/control-eject-gray.png 0644
-pub/TWiki/NatSkin/icons/control-eject.png 0644
-pub/TWiki/NatSkin/icons/control-end-gray.png 0644
-pub/TWiki/NatSkin/icons/control-end.png 0644
-pub/TWiki/NatSkin/icons/control-forward-gray.png 0644
-pub/TWiki/NatSkin/icons/control-forward.png 0644
-pub/TWiki/NatSkin/icons/control-left-gray.png 0644
-pub/TWiki/NatSkin/icons/control-left.png 0644
-pub/TWiki/NatSkin/icons/control-pause-gray.png 0644
-pub/TWiki/NatSkin/icons/control-pause.png 0644
-pub/TWiki/NatSkin/icons/control-play-gray.png 0644
-pub/TWiki/NatSkin/icons/control-play.png 0644
-pub/TWiki/NatSkin/icons/control-rev-gray.png 0644
-pub/TWiki/NatSkin/icons/control-rev.png 0644
-pub/TWiki/NatSkin/icons/control-right-gray.png 0644
-pub/TWiki/NatSkin/icons/control-right.png 0644
-pub/TWiki/NatSkin/icons/control-start-gray.png 0644
-pub/TWiki/NatSkin/icons/control-start.png 0644
-pub/TWiki/NatSkin/icons/control-stop-gray.png 0644
-pub/TWiki/NatSkin/icons/control-stop.png 0644
-pub/TWiki/NatSkin/icons/control-top-gray.png 0644
-pub/TWiki/NatSkin/icons/control-top.png 0644
-pub/TWiki/NatSkin/icons/control-up-gray.png 0644
-pub/TWiki/NatSkin/icons/control-up.png 0644
-pub/TWiki/NatSkin/icons/eye.png 0644
-pub/TWiki/NatSkin/icons/help.png 0644
-pub/TWiki/NatSkin/icons/magnifier.png 0644
-pub/TWiki/NatSkin/icons/page_white_acrobat.png 0644
-pub/TWiki/NatSkin/icons/page_white_add.png 0644
-pub/TWiki/NatSkin/icons/page_white_go.png 0644
-pub/TWiki/NatSkin/icons/page_white_stack.png 0644
-pub/TWiki/NatSkin/icons/pencil.png 0644
-pub/TWiki/NatSkin/icons/printer.png 0644
-pub/TWiki/NatSkin/icons/text_align_left.png 0644
-pub/TWiki/NatSkin/icons/user.png 0644
-pub/TWiki/NatSkin/icons/wrench.png 0644
-pub/TWiki/NatSkin/iepngfix.htc 0644
-pub/TWiki/NatSkin/login_keys.png 0644
-pub/TWiki/NatSkin/menuarrow.gif 0644
-pub/TWiki/NatSkin/menucorner.gif 0644
-pub/TWiki/NatSkin/natskin.js 0644
-pub/TWiki/NatSkin/foswiki-header-notrans.png 0644
-pub/TWiki/NatSkin/foswiki-header.png 0644
-pub/TWiki/NatSkin/foswiki-header-tile.png 0644
-pub/TWiki/NatSkin/foswiki-logo.png 0644
-pub/TWiki/NatSkin/obfuscator.js 0644
-pub/TWiki/NatSkin/oldrevisionbg.png 0644
-pub/TWiki/NatSkin/oopsmore_diff_debug.gif 0644
-pub/TWiki/NatSkin/oopsmore_diff_sequential.gif 0644
-pub/TWiki/NatSkin/oopsmore_diff_sidebyside.gif 0644
-pub/TWiki/NatSkin/pdf.png 0644
-pub/TWiki/NatSkin/previewbg.png 0644
-pub/TWiki/NatSkin/q_black.gif 0644
-pub/TWiki/NatSkin/wikiringlogo40x40.png 0644
-templates/addform.nat.tmpl 0644
-templates/attachagain.nat.tmpl 0644
-templates/attachjavascript.nat.tmpl 0644
-templates/attach.nat.tmpl 0644
-templates/attachnew.nat.tmpl 0644
-templates/attachsidebar.nat.tmpl 0644
-templates/attachtables.nat.tmpl 0644
-templates/backlinksallwebs.nat.tmpl 0644
-templates/backlinksweb.nat.tmpl 0644
-templates/body.nat.tmpl 0644
-templates/changeform.nat.tmpl 0644
-templates/changeformsidebar.nat.tmpl 0644
-templates/changes.nat.tmpl 0644
-templates/comments.nat.tmpl 0644
-templates/editform.nat.tmpl 0644
-templates/edit.nat.tmpl 0644
-templates/editsection.nat.tmpl 0644
-templates/editstyles.nat.tmpl 0644
-templates/editTableRow.nat.tmpl 0644
-templates/edittext.nat.tmpl 0644
-templates/form.nat.tmpl 0644
-templates/formtables.nat.tmpl 0644
-templates/javascript.nat.tmpl 0644
-templates/kinosearch.nat.tmpl 0644
-templates/loginbase.nat.tmpl 0644
-templates/login.nat.tmpl 0644
-templates/login.sudo.nat.tmpl 0644
-templates/mailnotify.nat.tmpl 0644
-templates/messages.nat.tmpl 0644
-templates/moveattachment.nat.tmpl 0644
-templates/moveattachmentsidebar.nat.tmpl 0644
-templates/oo2twiki.nat.tmpl 0644
-templates/oopsaccesschange.nat.tmpl 0644
-templates/oopsaccesscreateweb.nat.tmpl 0644
-templates/oopsaccessdenied.nat.tmpl 0644
-templates/oopsaccessgroup.nat.tmpl 0644
-templates/oopsaccessrename.nat.tmpl 0644
-templates/oopsaccessview.nat.tmpl 0644
-templates/oopsaccessvote.nat.tmpl 0644
-templates/oopsattention.nat.tmpl 0644
-templates/oopsauth.nat.tmpl 0644
-templates/oopsbadpwformat.nat.tmpl 0644
-templates/oopsblacklist.nat.tmpl 0644
-templates/oopschangepasswd.nat.tmpl 0644
-templates/oopsempty.nat.tmpl 0644
-templates/oopserrbase.nat.tmpl 0644
-templates/oopsgeneric.nat.tmpl 0644
-templates/oopshistory.nat.tmpl 0644
-templates/oopslanguagechanged.nat.tmpl 0644
-templates/oopsleaseconflict.nat.tmpl 0644
-templates/oopslocked.nat.tmpl 0644
-templates/oopslockedrename.nat.tmpl 0644
-templates/oopslogonbase.nat.tmpl 0644
-templates/oopslogon.nat.tmpl 0644
-templates/oopsmanage.nat.tmpl 0644
-templates/oopsmissing.nat.tmpl 0644
-templates/oopsmngcreateweb.nat.tmpl 0644
-templates/oopsmore.nat.tmpl 0644
-templates/oopsmoveerr.nat.tmpl 0644
-templates/oops.nat.tmpl 0644
-templates/oopsnoformdef.nat.tmpl 0644
-templates/oopsnotwikiuser.nat.tmpl 0644
-templates/oopsnoweb.nat.tmpl 0644
-templates/oopspreview.nat.tmpl 0644
-templates/oopsregemail.nat.tmpl 0644
-templates/oopsregexist.nat.tmpl 0644
-templates/oopsregpasswd.nat.tmpl 0644
-templates/oopsregrequ.nat.tmpl 0644
-templates/oopsregthanks.nat.tmpl 0644
-templates/oopsregwiki.nat.tmpl 0644
-templates/oopsrenameerr.nat.tmpl 0644
-templates/oopsrenamenotwikiword.nat.tmpl 0644
-templates/oopsresetpasswd.nat.tmpl 0644
-templates/oopsrev.nat.tmpl 0644
-templates/oopssaveerr.nat.tmpl 0644
-templates/oopssave.nat.tmpl 0644
-templates/oopssendmailerr.nat.tmpl 0644
-templates/oopssoftwareerr.nat.tmpl 0644
-templates/oopstopicexists.nat.tmpl 0644
-templates/oopsupload.nat.tmpl 0644
-templates/oopswrongpassword.nat.tmpl 0644
-templates/page.nat.tmpl 0644
-templates/plucsearch.nat.tmpl 0644
-templates/previewjavascript.nat.tmpl 0644
-templates/preview.nat.tmpl 0644
-templates/printjavascript.nat.tmpl 0644
-templates/rdiff.nat.tmpl 0644
-templates/rdifftopicactions.nat.tmpl 0644
-templates/renamebase.nat.tmpl 0644
-templates/renameconfirm.nat.tmpl 0644
-templates/renamedelete.nat.tmpl 0644
-templates/renamejavascript.nat.tmpl 0644
-templates/rename.nat.tmpl 0644
-templates/renamerefs.nat.tmpl 0644
-templates/renamesidebar.nat.tmpl 0644
-templates/renamestyles.nat.tmpl 0644
-templates/renamewebbase.nat.tmpl 0644
-templates/renamewebconfirm.nat.tmpl 0644
-templates/renamewebdelete.nat.tmpl 0644
-templates/renamewebjavascript.nat.tmpl 0644
-templates/renameweb.nat.tmpl 0644
-templates/renamewebsidebar.nat.tmpl 0644
-templates/searchbase.nat.tmpl 0644
-templates/searchbookview.nat.tmpl 0644
-templates/searchbox.nat.tmpl 0644
-templates/searchbox.pluc.tmpl 0644
-templates/searchformat.nat.tmpl 0644
-templates/searchmeta.nat.tmpl 0644
-templates/search.nat.tmpl 0644
-templates/searchrenameview.nat.tmpl 0644
-templates/settingsjavascript.nat.tmpl 0644
-templates/settings.nat.tmpl 0644
-templates/sidebar.nat.tmpl 0644
-templates/strings.nat.tmpl 0644
-templates/styles.nat.tmpl 0644
-templates/topbar.nat.tmpl 0644
-templates/viewbody.plain.nat.tmpl 0644
-templates/view.nat.tmpl 0644
-templates/view.plain.nat.tmpl 0644
-templates/view.print.nat.tmpl 0644
-templates/viewtopicactions.nat.tmpl 0644
diff --git a/pub/TWiki/NatSkin/BaseBorder.css b/pub/System/NatSkin/BaseBorder.css
similarity index 100%
rename from pub/TWiki/NatSkin/BaseBorder.css
rename to pub/System/NatSkin/BaseBorder.css
diff --git a/pub/System/NatSkin/BaseBorder.css.gz b/pub/System/NatSkin/BaseBorder.css.gz
new file mode 100644
index 0000000..b083857
Binary files /dev/null and b/pub/System/NatSkin/BaseBorder.css.gz differ
diff --git a/pub/TWiki/NatSkin/BaseButtons.css b/pub/System/NatSkin/BaseButtons.css
similarity index 100%
rename from pub/TWiki/NatSkin/BaseButtons.css
rename to pub/System/NatSkin/BaseButtons.css
diff --git a/pub/System/NatSkin/BaseButtons.css.gz b/pub/System/NatSkin/BaseButtons.css.gz
new file mode 100644
index 0000000..2de88f7
Binary files /dev/null and b/pub/System/NatSkin/BaseButtons.css.gz differ
diff --git a/pub/TWiki/NatSkin/BaseStyle.css b/pub/System/NatSkin/BaseStyle.css
similarity index 81%
rename from pub/TWiki/NatSkin/BaseStyle.css
rename to pub/System/NatSkin/BaseStyle.css
index 6b0c56d..7779070 100644
--- a/pub/TWiki/NatSkin/BaseStyle.css
+++ b/pub/System/NatSkin/BaseStyle.css
@@ -1,28 +1,23 @@
 /* Base Style */
 /* base */
+
 .foswikiMakeVisible,
 .foswikiMakeVisibleInline,
-.foswikiMakeVisibleBlock,
-.twikiMakeVisible,
-.twikiMakeVisibleInline,
-.twikiMakeVisibleBlock {
+.foswikiMakeVisibleBlock {
   display:none;
 }
 
-.foswikiLeft,
-.twikiLeft {
+.foswikiLeft {
   float:left;
   position:relative;
 }
-.foswikiRight,
-.twikiRight {
+.foswikiRight {
   position:relative;
   float:right;
   display:inline;
   margin:0;
 }
-.foswikiClear,
-.twikiClear {
+.foswikiClear {
   margin:0;
   padding:0;
   height:0px;
@@ -31,45 +26,45 @@
   display:block;
   border:0px;
 }
-.foswikiHidden,
-.twikiHidden {
+.foswikiHidden {
   display:none;
 }
-.foswikiSmall,
-.twikiSmall {
+.foswikiSmall {
   font-size:90%; 
+  line-height:120%;
 }
-.foswikiSmallish,
-.twikiSmallish {
+.foswikiSmallish {
   font-size:95%;
 }
 
-.twikiGrayText,
+.foswikiLayoutTable {
+  border-spacing:0px;
+  border-collapse:collapse;
+}
+.foswikiLayoutTable td {
+  padding:0px;
+}
+.foswikiLayoutTable th {
+  padding:0px 5px 0px 0px;
+}
+
 .foswikiGrayText {
   color:#8E9195;
 }
-.twikiGrayText a,
 .foswikiGrayText a {
   color:#7B7E81;
 }
 .foswikiSmallish i,
-.foswikiSmall i,
-.twikiSmallish i,
-.twikiSmall i {
+.foswikiSmall i {
   font-style:normal; /* no italics for fonts that are already small */
 }
 
 /* html elements */
-.natHtml {
-  background:white;
-}
-.twikiEmulatedLink,
 .foswikiEmulatedLink,
 a {
   text-decoration:none; 
   color:#0065CD;
 }
-.twikiEmulatedLink:hover,
 .foswikiEmulatedLink:hover,
 a:hover { 
   text-decoration:underline; 
@@ -99,8 +94,7 @@ html {
 input, textarea, select, body { 
   font-size:100%;
 }
-.foswikiCheckbox,
-.twikiCheckbox {
+.foswikiCheckbox {
   margin:0px 3px 0px 0px;
 }
 h1 { font-size:180%;}
@@ -110,8 +104,6 @@ h4 { font-size:120%; margin-top:10px; margin-bottom:0px; }
 h5 { font-size:110%; margin-top:10px; margin-bottom:0px; }
 h6 { font-size:110%; margin-top:10px; margin-bottom:0px; }
 
-h1 .twikiEmulatedLink, h2 .twikiEmulatedLink, h3 .twikiEmulatedLink,
-h4 .twikiEmulatedLink, h5 .twikiEmulatedLink, h3 .twikiEmulatedLink,
 h1 .foswikiEmulatedLink, h2 .foswikiEmulatedLink, h3 .foswikiEmulatedLink,
 h4 .foswikiEmulatedLink, h5 .foswikiEmulatedLink, h3 .foswikiEmulatedLink,
 h1, h2, h3, h4, h5, h6,
@@ -134,14 +126,15 @@ dt {
 }
 
 pre, code,
-.twikiTextareaRawView,
+.foswikiTextareaRawView,
+.foswikiTextarea,
 .natEditTextArea {
   font-family:"Bitstream Vera Sans Mono", "Andale Mono", monospace;
 }
 
 pre {
   overflow:auto;
-  margin:0px;
+  margin:1em 0em;
 }
 .DISnatBody > pre { /* hide from IE */
   /*\*/ overflow:auto !important; /* */ overflow:scroll; /* for Mac Safari */
@@ -190,9 +183,6 @@ form {
   width:21cm; 
   margin:0px; 
 }
-.natMiddle {
-  background-color:white;
-}
 .natPrintBody,
 .natPrintBody .natMain,
 .natPrintBody .natMiddle {
@@ -202,22 +192,14 @@ form {
 .natBodyContents {
   text-align:left;
 }
-.natOopsMoreBody .natSideBarContents,
-.natOopsBody .natSideBarContents {
-  display:none;
-}
-.natOopsBody .natWebButtons,
-.natOopsBody .natMainHeaderContents,
-.natOopsMoreBody .natWebButtons,
-.natOopsMoreBody .natMainHeaderContents {
-  display:none;
+.natOopsMore h1 {
+  margin-top:0px;
 }
 .natOopsMessage {
   width:58em;
-  margin:0px auto;
+  margin:0.75em auto;
 }
-.natOopsMessage .foswikiFormSteps,
-.natOopsMessage .twikiFormSteps {
+.natOopsMessage .foswikiFormSteps {
   margin-bottom:2em;
 }
 .natLayoutTable {
@@ -233,6 +215,11 @@ form {
   text-align:center;
   padding-top:5px;
 }
+.natLoadTime {
+  position:absolute;
+  top:0;
+  right:0;
+}
 .natPreviewBody .natMainContents {
   background-image:url('previewbg.png');
 }
@@ -279,6 +266,14 @@ form {
   min-height:40em;
 }
 
+/* IE6 fix for missing min-height */
+.natMiddle .natSpacer {
+  display:none;
+  _display:inline;
+  height:10em;
+  width:1px;
+}
+
 /* topbar */
 .natHeaderArt {
   background-repeat:no-repeat;
@@ -360,13 +355,9 @@ form {
 .natNotes p {
   margin-top:0px;
 }
-.natSideBar .twikiCurrentTopicLink,
 .natSideBar .foswikiCurrentTopicLink {
   color:red;
 }
-.natSideBar h1 .twikiCurrentTopicLink,
-.natSideBar h2 .twikiCurrentTopicLink,
-.natSideBar h3 .twikiCurrentTopicLink,
 .natSideBar h1 .foswikiCurrentTopicLink,
 .natSideBar h2 .foswikiCurrentTopicLink,
 .natSideBar h3 .foswikiCurrentTopicLink {
@@ -378,9 +369,6 @@ form {
 }
 
 /* login */
-.natLoginBody .natMainHeaderContents {
-  display:none;
-}
 .natLoginMessage h2 {
   margin:0px;
 }
@@ -388,22 +376,18 @@ form {
   margin:0px auto;
   width:500px;
 }
-
 /* edit */
 .natEditBody .natLayoutTable {
   table-layout:auto; /* firefox fix to preven collapsing tables */
 }
-.natEditBody .natSideBarContents, 
-.natEditBody .natMainContents {
-  min-height:auto;
-}
-.natEditBody .natMainHeaderContents,
-.natEditBody .natMainFooterContents,
-.natEditBody .natWebButtons,
 .natEditBody .natBottomBar,
-.natEditBody .natHeaderArt {
+.natEditBody .natWebButtons {
   display:none;
 }
+.natEditBody .natSideBarContents, 
+.natEditBody .natMainContents {
+  min-height:0em;
+}
 .natEditBody h1 {
   margin-bottom:1em;
 }
@@ -414,7 +398,6 @@ form {
 .natEditTopicInfo table td {
   padding:0em 0.5em 0.5em 0em;
 }
-.natEditBody table th.twikiFirstCol,
 .natEditBody table th.foswikiFirstCol {
   width:10em;
 }
@@ -438,14 +421,12 @@ form {
 .natSearchRenameContents table {
   width:100%;
 }
-.natSearchRenameContents .twikiTopRow,
 .natSearchRenameContents .foswikiTopRow {
   white-space:pre;
   text-align:left;
   vertical-align:top;
   padding:5px;
 }
-.natSearchRenameContents .twikiSummary,
 .natSearchRenameContents .foswikiSummary {
   padding:5px;
   text-align:left;
@@ -467,12 +448,6 @@ form {
 .natSearchTotal span {
   color:red;
 }
-.natSearchForm {
-  margin:1em 0em;
-}
-.natSearchFormOptions {
-  margin:1.0em 0em;
-}
 .natSearchFormOptions td {
   padding:0px 5px 0px 0px;
 }
@@ -483,11 +458,9 @@ form {
 .natSearch {
   font-weight:bold;
 }
-.twikiNew,
 .foswikiNew {
   text-transform:lowercase;
 }
-.twikiNew,
 .foswikiNew,
 .natSearchNewTopic {
   color:red; 
@@ -518,18 +491,15 @@ form {
   color:green;
 }
 .foswikiSubmit,
-.twikiSubmit,
 .natOkButton {
   color:green;
 }
 .foswikiButton,
-.twikiButton,
 .foswikiButton,
 .natAltButton {
   color:blue;
 }
 .foswikiButtonCancel,
-.twikiButtonCancel,
 .natCancelButton {
   color:red;
 }
@@ -539,6 +509,15 @@ form {
 }
 
 /* topic actions */
+.natBodyAuthenticated .natBreadCrumbs {
+  margin-right:280px;
+}
+.natBodyNotAuthenticated .natBreadCrumbs {
+  margin-right:100px;
+}
+.natBodyNotAuthenticated .natTopicAttachments .natTopicActions {
+  display:none;
+}
 .natGreeter {
   margin:0em 0em 0.1em 0em;
   white-space:nowrap;
@@ -546,16 +525,24 @@ form {
 .natUserGreeter {
   padding:2px 0px;
 }
+.natTopicActions {
+  float:right;
+  text-align:right;
+}
+.natTopicActions span span,
+.natTopicActions a span {
+  display:none;
+}
 .natTopicActions .natSep {
   display:none;
 }
 #natTopicActionTooltip {
-  display:none;
+  /*display:none;*/
   text-align:right;
   float:left;
 }
-.natHomePageUserAction:hover,
-.natHomePageUserAction {
+.natAccountAction:hover,
+.natAccountAction {
   background-image:url(icons/user.png);
   background-repeat:no-repeat;
   background-position:0% 0%;
@@ -578,6 +565,11 @@ form {
   margin:0px 2px 0px 0px;
   padding:2px 5px 5px 22px;
   color:black;
+  float:left;
+  width:16px;
+  height:16px;
+  padding:2px;
+  margin-left:5px;
 }
 
 .natDisabledTopicAction {
@@ -602,10 +594,18 @@ form {
 .natEditFormTopicAction {
   background-image:url(icons/application_form_edit.png);
 }
+.natRestoreTopicAction:hover,
+.natRestoreTopicAction {
+  background-image:url(icons/pencil_go.png);
+}
 .natAttachTopicAction:hover,
 .natAttachTopicAction {
   background-image:url(icons/attach.png);
 }
+.natAddLinkTopicAction:hover,
+.natAddLinkTopicAction {
+  background-image:url(icons/link.png);
+}
 .natPrintTopicAction:hover,
 .natPrintTopicAction {
   background-image:url(icons/printer.png);
@@ -616,7 +616,7 @@ form {
 }
 .natHistoryTopicAction:hover,
 .natHistoryTopicAction {
-  background-image:url(icons/page_white_stack.png);
+  background-image:url(icons/time.png);
 }
 .natRawTopicAction:hover,
 .natRawTopicAction {
@@ -684,9 +684,9 @@ form {
   display:inline;
 }
 
-.natDoneTopicAction:hover,
-.natDoneTopicAction {
-  background-image:url(icons/control-eject.png);
+.natCloseTopicAction:hover,
+.natCloseTopicAction {
+  background-image:url(icons/cross.png);
 }
 
 .natDiffTopicAction:hover,
@@ -741,6 +741,10 @@ form {
   text-align:right;
 }
 
+.natSkinStyleBrowser {
+  width:220px;
+}
+
 .natSideBar .natSkinStyleBrowser ul,
 .natMain .natSkinStyleBrowser ul {
   padding-left:0px;
@@ -756,13 +760,15 @@ form {
   margin-left:0px;
 }
 
-.natSkinStyleBrowser select { 
-  width:180px;
+.natSkinStyleBrowser table,
+.natSkinStyleBrowser select {
+  width:100%;
 }
-.natSkinStyleBrowser input[type=radio] {
-  border:0px; /* only IE puts borders on radio boxes */
+.natSkinStyleBrowser td {
+  vertical-align:top;
 }
 
+
 .natSideBar a.natFeedIcon:hover,
 a.natFeedIcon:hover {
   background:#eee url("feed-icon-12x12.png") 3px center no-repeat !important;
@@ -784,18 +790,15 @@ a.natFeedIcon {
 }
 
 /* base styles */
-.twikiNewLink,
 .foswikiNewLink {
   color:blue;
   background:#eeeeee;
 }
 
-.twikiAlert,
 .foswikiAlert {
   color:red;
 }
-.foswikiBroadcastMessage,
-.twikiBroadcastMessage {
+.foswikiBroadcastMessage {
   text-align:left;
   background:yellow;
   color:black;
@@ -803,26 +806,17 @@ a.natFeedIcon {
   padding:0.5em 1em;
 }
 .foswikiBroadcastMessage .foswikiLink,
-.foswikiBroadcastMessage .foswikiLink,
-.foswikiBroadcastMessage a,
-.twikiBroadcastMessage .twikiLink,
-.twikiBroadcastMessage .foswikiLink,
-.twikiBroadcastMessage a {
+.foswikiBroadcastMessage a {
   color:red;
 }
 .foswikiBroadcastMessage .foswikiLink:hover,
-.foswikiBroadcastMessage .foswikiLink:hover,
-.foswikiBroadcastMessage a:hover,
-.twikiBroadcastMessage .twikiLink:hover,
-.twikiBroadcastMessage .foswikiLink:hover,
-.twikiBroadcastMessage a:hover {
+.foswikiBroadcastMessage a:hover {
   color:black;
   background:orange;
 }
 
 /* tables */
-.foswikiTable,
-.twikiTable {
+.foswikiTable {
   margin-top:1px;
   empty-cells:show;
   border:1px solid #d0d0d0;
@@ -831,22 +825,18 @@ a.natFeedIcon {
 }
 
 .foswikiTable th, 
-.foswikiTable td,
-.twikiTable th, 
-.twikiTable td {
+.foswikiTable td {
   padding:2px 5px;
   border:0px;
 }
 
-.foswikiTable th,
-.twikiTable th {
+.foswikiTable th {
   font-weight:bold;
   text-align:left;
   background:#1875D5;
 }
 
-.foswikiTable th img,
-.twikiTable th img {
+.foswikiTable th img {
   vertical-align:middle;
   margin-left:2px;
   margin:0px 2px;
@@ -863,8 +853,7 @@ a.natFeedIcon {
  *
  * See http://www.quirksmode.org/css/display.html
  */
-.foswikiPageForm,
-.twikiPageForm {
+.foswikiPageForm {
   /*
   display:inline-block; 
   display:table; 
@@ -872,9 +861,8 @@ a.natFeedIcon {
   */
 }
 .foswikiPageForm th,
-.twikiPageForm th,
-.twikiPageForm .twikiFirstCol,
-.twikiPageForm .foswikiFirstCol {
+.foswikiPageForm th,
+.foswikiPageForm .foswikiFirstCol {
   font-weight:bold;
 }
 .natTopicEditForm .natTopicFormTitle,
@@ -885,17 +873,14 @@ a.natFeedIcon {
   clear:both;
 }
 .natTopicEditForm table,
-.twikiPageForm table,
 .natTopicForm table {
   width:100%;
   border-collapse:collapse;
 }
-.foswikiPageForm form,
-.twikiPageForm form {
+.foswikiPageForm form {
   margin:0px;
 }
-.foswikiPageForm table table,
-.twikiPageForm table table {
+.foswikiPageForm table table {
   border:0px;
 }
 
@@ -936,149 +921,121 @@ legend {
   font-size:100%;
   font-weight:bold;
 }
-.foswikiFormSteps,
-.twikiFormSteps {
+.foswikiFormSteps {
   padding:1em;
 }
-.foswikiFormStep,
-.twikiFormStep {
+.foswikiFormStep {
   margin:0em 0em 1em;
 }
-.foswikiFormStep hr,
-.twikiFormStep hr {
+.foswikiFormSteps hr {
   margin:1em 0em;
 }
-.foswikiFormLast,
-.twikiFormLast {
+.foswikiFormSteps .foswikiFormLast hr {
+  margin-bottom:1em;
+}
+.foswikiFormLast {
   margin-bottom:0em;
 }
 .foswikiFormSteps h2,
 .foswikiFormSteps h3,
-.foswikiFormSteps h4,
-.twikiFormSteps h2,
-.twikiFormSteps h3,
-.twikiFormSteps h4 {
+.foswikiFormSteps h4 {
   font-weight:bold;
 }
-.foswikiFormStep p,
-.twikiFormStep p {
+.foswikiFormStep p {
   margin:0.35em 0em;
 }
-.foswikiFormOptions,
-.twikiFormOptions {
+.foswikiFormOptions {
   margin:0.35em 0em;
   line-height:160%;
 }
-.foswikiFormStep.foswikiFormButtons,
-.twikiFormStep.twikiFormButtons {
-  margin-top:2em;
-}
-.foswikiFormButtons.foswikiFormLast,
-.twikiFormButtons.twikiFormLast {
+.foswikiFormButtons.foswikiFormLast {
   margin-top:20px;
 }
-.foswikiFormOptions .foswikiCheckbox,
-.twikiFormOptions .twikiCheckbox {
+.foswikiFormOptions .foswikiCheckbox {
   margin:0px 8px 0px 0px;
 }
-.foswikiFormButtons input,
-.twikiFormButtons input {
+.foswikiFormButtons input {
   padding:3px 5px;
 }
-.twikiFormDescription {
+.foswikiFormDescription {
   margin:0.1em 0em;
 }
 
 
-span.foswikiErrorSummary,
-span.twikiErrorSummary,
-label.error {
+.foswikiErrorSummary,
+.error {
   color:red;
-  padding:0em 0em 0em 1.0em;
   line-height:normal;
 }
+label.error,
+span.foswikiErrorSummary {
+  padding:0em 0em 0em 1.0em;
+}
+div.error,
+div.foswikiErrorSummary {
+  padding:1em 0em;
+}
 
 /* diff */
-.foswikiDiffTable,
-.twikiDiffTable { 
+.foswikiDiffTable {
   border:1px solid #ccc;
   margin-bottom:2em;
   width:100%;
 }
-.foswikiDiffTable table,
-.twikiDiffTable table {
+.foswikiDiffTable table {
   border:0px;
 }
 
-.foswikiDiffTable td,
-.twikiDiffTable td {
+.foswikiDiffTable td {
   border:0px;
 }
 
-.foswikiDiffTable th,
-.twikiDiffTable th {
+.foswikiDiffTable th {
   background:#dddddd;
 }
-.foswikiDiffLineNumberHeader th,
-.twikiDiffLineNumberHeader th { 
+.foswikiDiffLineNumberHeader th {
   background:#eeeeee;
 }
 
 td.foswikiDiffChangedHeader,
-td.foswikiDiffAddedHeader,
-td.twikiDiffChangedHeader,
-td.twikiDiffAddedHeader { 
+td.foswikiDiffAddedHeader {
   background:#D0FFD0;
   border-top:1px solid #ccc;
   border-bottom:1px solid #ccc;
 }
-.foswikiDiffAddedMarker,
-.twikiDiffAddedMarker { 
+.foswikiDiffAddedMarker {
   background:#aaaadd;
 }
-.foswikiDiffAddedText,
-.twikiDiffAddedText { 
+.foswikiDiffAddedText {
   background:#ccccff;
 }
 .foswikiDiffChangedMarker,
-.foswikiDiffChangedText,
-.twikiDiffChangedMarker,
-.twikiDiffChangedText { 
+.foswikiDiffChangedText {
 }
 
-.foswikiDiffDeletedHeader,
-.twikiDiffDeletedHeader { }
+.foswikiDiffDeletedHeader { }
 
-.foswikiDiffDeletedMarker,
-.twikiDiffDeletedMarker { 
+.foswikiDiffDeletedMarker {
   background:#dd7777;
 }
-.foswikiDiffDeletedText,
-.twikiDiffDeletedText { 
+.foswikiDiffDeletedText {
  background:#ff9999;
 }
 
-td.foswikiDiffChangedText,
-td.twikiDiffChangedText {
+td.foswikiDiffChangedText {
   color:red;
 }
-.twikiWebIndent,
 .foswikiWebIndent {
   margin:0 0 0 1em;
 }
 
 /* TOC */
-.foswikiToc,
-.twikiToc {
+.foswikiToc {
   margin-top:5px;
   margin-bottom:5px;
   padding-top:5px;
   padding-bottom:5px;
 }
-.foswikiToc img,
-.twikiToc img {
-  display:none;
-}
 
 /* see also page.nat.tmpl */
 .natMiddle .natExternalLink:after {
@@ -1177,15 +1134,6 @@ img.alignleft {
   text-transform:capitalize;
 }
 
-/* RedDotPlugin */
-.natBody .redDot a {
-  color:red;
-  font-weight:bold;
-  margin-left:2px;
-  margin-right:2px;
-  text-decoration:none;
-}
-
 /* HeadlinesPlugin */
 
 /* debug 
@@ -1293,12 +1241,19 @@ img.alignleft {
   text-decoration:none !important;
 }
 
+.natSideBar li .imagePlain_right {
+  margin:2px 0px 7px 7px;
+}
+.natSideBar li .imagePlain_left {
+  margin:2px 7px 7px 0px;
+}
+
 /* math mode plugin */
 .mmpImage {
   vertical-align:middle;
 }
 
-/* TWikiWorkbench basics */
+/* WikiWorkbench basics */
 .twbPageNavigation {
   margin:0.5em 0em;
 }
@@ -1314,11 +1269,26 @@ img.alignleft {
   background:#eee;
 }
 
+.blogScroll a {
+  text-decoration:none;
+}
+
 /* classification plugin */
-.clsTopicInfo .twikiCurrentTopicLink,
-.clsTopicInfo .foswikiCurrentTopicLink {
+.foswikiTopicInfo .foswikiCurrentTopicLink {
   color:inherit;
 }
+.foswikiTopicInfo {
+  margin:0em 0em 2em 0em;
+  font-size:95%;
+}
+.foswikiTopicInfo .natRevision {
+  margin:0px;
+  font-size:100%;
+}
+h1 .foswikiTopicSummary {
+  font-size:12.35px;
+  display:block;
+}
 
 /* jquery treeview */
 .natSideBar .jqTreeview ul > li:before { 
@@ -1360,3 +1330,4 @@ table.craSideBySide .craCell {
   width:1px;
   background-color:#666;
 }
+
diff --git a/pub/System/NatSkin/BaseStyle.css.gz b/pub/System/NatSkin/BaseStyle.css.gz
new file mode 100644
index 0000000..55141d5
Binary files /dev/null and b/pub/System/NatSkin/BaseStyle.css.gz differ
diff --git a/pub/TWiki/NatSkin/BaseThin.css b/pub/System/NatSkin/BaseThin.css
similarity index 100%
rename from pub/TWiki/NatSkin/BaseThin.css
rename to pub/System/NatSkin/BaseThin.css
diff --git a/pub/System/NatSkin/BaseThin.css.gz b/pub/System/NatSkin/BaseThin.css.gz
new file mode 100644
index 0000000..b7ede16
Binary files /dev/null and b/pub/System/NatSkin/BaseThin.css.gz differ
diff --git a/pub/TWiki/NatSkin/BlueNoteBorder.css b/pub/System/NatSkin/BlueNoteBorder.css
similarity index 92%
rename from pub/TWiki/NatSkin/BlueNoteBorder.css
rename to pub/System/NatSkin/BlueNoteBorder.css
index 5913b00..78ef15b 100644
--- a/pub/TWiki/NatSkin/BlueNoteBorder.css
+++ b/pub/System/NatSkin/BlueNoteBorder.css
@@ -1,10 +1,8 @@
 /* border variation for clean */
-@import url('BaseBorder.css');
-
 .natBody {
   margin:1em 2em;
 }
-.twikiBroadcastMessage {
+.foswikiBroadcastMessage {
   margin:-1em -2em 1em;
 }
 .natEditBody {
diff --git a/pub/System/NatSkin/BlueNoteBorder.css.gz b/pub/System/NatSkin/BlueNoteBorder.css.gz
new file mode 100644
index 0000000..5993267
Binary files /dev/null and b/pub/System/NatSkin/BlueNoteBorder.css.gz differ
diff --git a/pub/TWiki/NatSkin/BlueNoteButtons.css b/pub/System/NatSkin/BlueNoteButtons.css
similarity index 87%
rename from pub/TWiki/NatSkin/BlueNoteButtons.css
rename to pub/System/NatSkin/BlueNoteButtons.css
index 8a0e65a..87bd3e5 100644
--- a/pub/TWiki/NatSkin/BlueNoteButtons.css
+++ b/pub/System/NatSkin/BlueNoteButtons.css
@@ -1,6 +1,4 @@
 /* variation to switch on the web buttons for clean */
-@import url('BaseButtons.css');
-
 .natSideBarHeader,
 .natWebButtons {
   background-color:#9CBAEF;
@@ -11,9 +9,13 @@
   /* ie 6 */
   _background-image:none;
 }
-.natBodyRight .natWebButtons {
+.natWebButtons {
   padding-left:2em;
 }
+.natBodyLeft .natWebButtons,
+.natBodyBoth .natWebButtons {
+  padding-left:0px;
+}
 .natTopBar {
   border-bottom:0px;
 }
@@ -23,7 +25,7 @@
   float:left;
 }
 
-.natWebButtons ul a {
+.natWebButtons li a {
   margin:0px;
   line-height:2.0em;
   padding-left:1.0em;
@@ -31,25 +33,25 @@
   font-weight:bold;
   color:#00458F;
 }
-.natWebButtons ul ul a {
+.natWebButtons li li a {
   font-weight:normal;
   color:#444;
 }
 
-.natWebButtons ul a.current:hover,
-.natWebButtons ul a.current {
+.natWebButtons li a.current:hover,
+.natWebButtons li a.current {
   text-decoration: none;
   background-color:#fff;
 }
 
-.natWebButtons ul a.current:hover,
-.natWebButtons ul a:hover {
+.natWebButtons li a.current:hover,
+.natWebButtons li a:hover {
   text-decoration: none;
-  background-color:#0055b5;
   background-image:url(button-bg.png);
   background-repeat:repeat-x;
   background-position:left bottom;
-  color:white;
+  background-color:#0055b5;
+  color:#fff;
   /* ie6 */
   _background-image:none
 }
@@ -146,10 +148,6 @@ ul.superfish a {
 }
 
 ul.superfish li {
-  /*
-  background:url(menubg.gif);
-  background-position:top left;
-  background-repeat:repeat-x;*/
   border-right:1px solid #E1EAFA;
 }
 ul.superfish {
@@ -168,13 +166,6 @@ ul.superfish li li {
   border-right:1px solid #c2c4c4;
   width:9.45em; 
 }
-ul.superfish li:hover, 
-ul.superfish li.sfHover,
-ul.superfish li a:focus, 
-ul.superfish li a:hover, 
-ul.superfish li a:active {
-  /*background:url(menubg.gif) 0px -128px;*/
-}
 ul.superfish li li a:hover.foswikiNewLink,
 ul.superfish li li:hover, 
 ul.superfish li li.sfHover,
@@ -201,9 +192,6 @@ ul.superfish li li li {
 ul.superfish li li li li {
   background:#E9E9EB;
 }
-ul.superfish li.sfHover ul {
-  opacity:0.95;
-}
 ul.superfish .sfPath {
   background-color:red;
 }
diff --git a/pub/System/NatSkin/BlueNoteButtons.css.gz b/pub/System/NatSkin/BlueNoteButtons.css.gz
new file mode 100644
index 0000000..b8b1c59
Binary files /dev/null and b/pub/System/NatSkin/BlueNoteButtons.css.gz differ
diff --git a/pub/TWiki/NatSkin/BlueNoteStyle.css b/pub/System/NatSkin/BlueNoteStyle.css
similarity index 75%
rename from pub/TWiki/NatSkin/BlueNoteStyle.css
rename to pub/System/NatSkin/BlueNoteStyle.css
index 3088fbf..94ab47c 100644
--- a/pub/TWiki/NatSkin/BlueNoteStyle.css
+++ b/pub/System/NatSkin/BlueNoteStyle.css
@@ -1,6 +1,4 @@
 /* BlueNote Style */
-@import url("BaseStyle.css");
-
 /* html elements */
 html {
   line-height:140%;
@@ -20,7 +18,6 @@ html {
   margin:0;
   padding:0;
 }
-.twikiEmulatedLink,
 .foswikiEmulatedLink,
 a:active, 
 a {
@@ -29,9 +26,9 @@ a {
   text-decoration:none;
   text-decoration:underline;
 }
+.treeview a:hover,
 a:hover {
   color:#ffffff;
-  background:#b22222;
   background:#0055b5;
   text-decoration:none;
 }
@@ -48,36 +45,37 @@ pre {
 }
 
 p {
-  margin:1.0em 0em 0em;
+  margin:1.0em 0em;
 }
 
 h1 { font-size:160%; margin-top:1em;margin-bottom:0.2em;padding-bottom:0.1em; }
-h2 { font-size:135%; margin-top:1em;margin-bottom:0.5em;}
-h3 { font-size:125%; margin-top:1em;margin-bottom:0.5em;}
-h4 { font-size:120%; margin-top:1em;margin-bottom:0.0em;}
-h5 { font-size:110%; margin-top:1em;margin-bottom:0.0em;}
+h2 { font-size:140%; margin-top:1.5em;margin-bottom:0.5em;}
+h3 { font-size:130%; margin-top:1.5em;margin-bottom:0em;}
+h4 { font-size:110%; margin-top:1em;margin-bottom:0.0em;}
+h5 { font-size:105%; margin-top:1em;margin-bottom:0.0em;}
 h6 { font-size:105%; margin-top:1em;margin-bottom:0.0em;}
 h1, h2, h3, h4, h5, h6 {
   line-height:normal;
 }
 
-h1, h2, h3, h4, h5, h6,
-h1 a, h2 a, h3 a, h4 a, h5 a, h6 a,
-h1 a:hover, h2 a:hover, h3 a:hover,
-h4 a:hover, h5 a:hover, h6 a:hover {
+h1, h1 a, h1 a:hover, 
+h2, 
+h3 {
   font-weight:normal;
   background:none;
   color:#222;
   text-decoration:none;
 }
 
-h1,
-h1 a,
-h1 a:hover {
+h4, 
+h5, 
+h6 {
+  font-weight:bold;
+  background:none;
   color:#444;
-  color:#0055b5;
-  color:#222;
+  text-decoration:none;
 }
+
 .natViewBody h1,
 .natCompareBody h1 {
   border-bottom:1px #ddd solid;
@@ -131,6 +129,9 @@ dl dd {
 .natTopRight {
   padding:2.0em 1.5em 2.0em 1em;
 }
+.natMiddle {
+  background:white;
+}
 .natMain {
   background-image:url(button-bg.png);
   background-repeat:repeat-x;
@@ -138,6 +139,10 @@ dl dd {
   /* ie 6 */
   _background-image:none;
 }
+.natPrintBody .natMiddle {
+  background-image:none;
+  border-bottom:1px;
+}
 .natMainHeaderContents {
   margin:2em 2em 1.5em;
 }
@@ -148,25 +153,10 @@ dl dd {
   margin:1.5em 2em;
 }
 
-.natTopicActions {
-  float:right;
-}
 #natTopicActionTooltip {
   color:#808080;
   font-size:95%;
 }
-.natTopicAction:hover,
-.natTopicAction {
-  float:left;
-  width:16px;
-  height:16px;
-  padding:2px;
-  margin-left:5px;
-}
-.natTopicActions span span,
-.natTopicActions a span {
-  display:none;
-}
 .natTopRight,
 .natSideBarHeader,
 .natSideBar {
@@ -177,8 +167,7 @@ dl dd {
 .natLoginBody .natLoginMessage {
   padding:20px;
 }
-.natLoginBody .foswikiFormSteps,
-.natLoginBody .twikiFormSteps {
+.natLoginBody .foswikiFormSteps {
   margin:0em 0em 1em;
   padding:1em 0em;
   background-color:#f6f6f6;
@@ -196,37 +185,31 @@ dl dd {
   padding:13px 19px;
   border-bottom:2px solid #e0e0e0;
 }
-.natLoginBody .foswikiFormStep,
-.natLoginBody .twikiFormStep {
+.natLoginBody .foswikiFormStep {
   margin:0em 1em 1em 12em;
 }
-.natLoginBody .twikiFormLast {
+.natLoginBody .foswikiFormLast {
   margin:2em 1em 1em 12em;
   _margin:2em 1em 0em 12em; /* IE 6 fix */
 }
 
 /* base styles */
-.foswikiBroadcastMessage,
-.twikiBroadcastMessage {
+.foswikiBroadcastMessage {
   margin:0em 0em 1em;
 }
 
 /* tables */
-.foswikiTable,
-.twikiTable {
+.foswikiTable {
   border:1px #dedede solid;
   line-height:140%;
   border-spacing:0px;
   margin:0.25em 0em;
 }
-.foswikiTable td,
-.twikiTable td {
+.foswikiTable td {
   background:#f9f9f9;
 }
 .foswikiTable th,
-.foswikiTable td,
-.twikiTable th,
-.twikiTable td {
+.foswikiTable td {
   padding:0.3em 0.7em;
   border:1px #dedede solid;
 }
@@ -238,15 +221,7 @@ dl dd {
 .foswikiTable th h2,
 .foswikiTable th h3,
 .foswikiTable th h4,
-.foswikiTable th span,
-.twikiTable th,
-.twikiTable th a,
-.twikiTable th a:hover,
-.twikiTable th font,
-.twikiTable th h2,
-.twikiTable th h3,
-.twikiTable th h4,
-.twikiTable th span {
+.foswikiTable th span {
   color:#444;
   font-weight:bold;
   text-decoration:none;
@@ -254,26 +229,19 @@ dl dd {
   color:white;
 }
 .foswikiTable th a:hover,
-.foswikiTable th a:hover font,
-.twikiTable th a:hover,
-.twikiTable th a:hover font {
+.foswikiTable th a:hover font {
   text-decoration:underline;
 }
-.foswikiTable th h4,
-.twikiTable th h4 {
+.foswikiTable th h4 {
   margin:0px;
 }
 
 th.foswikiSortedDescendingCol,
-th.foswikiSortedAscendingCol,
-th.twikiSortedDescendingCol,
-th.twikiSortedAscendingCol {
+th.foswikiSortedAscendingCol{ 
   background:#8DA8D8;
 }
 .foswikiTable td.foswikiSortedDescendingCol,
-.foswikiTable td.foswikiSortedAscendingCol,
-.twikiTable td.twikiSortedDescendingCol,
-.twikiTable td.twikiSortedAscendingCol {
+.foswikiTable td.foswikiSortedAscendingCol {
   background:#f4f4f4;
 }
 
@@ -282,99 +250,73 @@ th.twikiSortedAscendingCol {
 .foswikiPageForm .foswikiTable td,
 .foswikiFormSteps .foswikiTable td,
 .foswikiPageForm .foswikiTable th,
-.foswikiFormSteps .foswikiTable th,
-.twikiPageForm .twikiTable td,
-.twikiFormSteps .twikiTable td,
-.twikiPageForm .twikiTable th,
-.twikiFormSteps .twikiTable th {
+.foswikiFormSteps .foswikiTable th {
   border:0px;
 }
 .foswikiPageForm .foswikiTable,
-.foswikiFormSteps .foswikiTable,
-.twikiPageForm .twikiTable,
-.twikiFormSteps .twikiTable {
+.foswikiFormSteps .foswikiTable {
   border:1px solid #F2D9A3;
 }
 .foswikiPageForm .foswikiTable td,
-.foswikiFormSteps .foswikiTable td,
-.twikiPageForm .twikiTable td,
-.twikiFormSteps .twikiTable td {
+.foswikiFormSteps .foswikiTable td {
   border-bottom:1px solid #F2D9A3;
   vertical-align:middle;
 }
 .foswikiFormSteps .foswikiTable td,
-.foswikiPageForm .foswikiTable td,
-.twikiFormSteps .twikiTable td,
-.twikiPageForm .twikiTable td {
+.foswikiPageForm .foswikiTable td {
   background:transparent;
 }
 .foswikiFormSteps .foswikiTable th,
 .foswikiFormSteps .foswikiTable th a,
 .foswikiPageForm .foswikiTable th,
-.foswikiPageForm .foswikiTable th a,
-.twikiFormSteps .twikiTable th,
-.twikiFormSteps .twikiTable th a,
-.twikiPageForm .twikiTable th,
-.twikiPageForm .twikiTable th a {
+.foswikiPageForm .foswikiTable th a {
   background:#FEEFCD;
   color:#444;
 }
 .foswikiFormSteps .foswikiTable th,
-.foswikiPageForm .foswikiTable th,
-.twikiFormSteps .twikiTable th,
-.twikiPageForm .twikiTable th {
+.foswikiPageForm .foswikiTable th {
   border-bottom:0px;
   vertical-align:top;
 }
 /* diff */
-.foswikiDiffTable,
-.twikiDiffTable {
+.foswikiDiffTable {
   border:1px solid #ddd;
   background:#f6f6f6;
 }
 .foswikiDiffTable td,
-.foswikiDiffTable th,
-.twikiDiffTable td,
-.twikiDiffTable th {
+.foswikiDiffTable th {
   border:0px;
 }
-.foswikiDiffTable th,
-.twikiDiffTable th {
+.foswikiDiffTable th {
   border-bottom:1px solid #ddd;
 }
 
-.foswikiDiffDeletedText,
-.twikiDiffDeletedText {
+.foswikiDiffDeletedText {
  background:#FFD7D7;
 }
 
 
 /* forms */
-.foswikiPageForm,
-.twikiPageForm {
+.foswikiPageForm {
   margin:1em 0px;
   padding:1em;
   border-top:1px solid #ddd;
   border-bottom:1px solid #ddd;
   background:#FEF8EB;
 }
-.natSideBar .foswikiPageForm,
-.natSideBar .twikiPageForm {
+.natSideBar .foswikiPageForm {
   margin:-1px -1em 0em;
   border:0px;
   /*background:#CECFCE;*/
 }
-.foswikiPageForm table,
-.twikiPageForm table {
+.foswikiPageForm table {
   margin:0px;
 }
 
-.foswikiPageForm th,
-.twikiPageForm th {
+.foswikiPageForm th {
   color:#444;
 }
-.foswikiPageForm th a,
-.twikiPageForm th a {
+.foswikiPageForm th a {
   color:#444;
   text-decoration:none;
   font-weight:bold;
@@ -395,114 +337,88 @@ legend {
   font-size:110%;
 }
 
-fieldset .foswikiFormSteps,
-fieldset .twikiFormSteps {
+fieldset .foswikiFormSteps {
   border:0px;
 }
 
-.foswikiFormSteps,
-.twikiFormSteps {
+.foswikiFormSteps {
   border-top:1px solid #ddd;
   border-bottom:1px solid #ddd;
   background:#FEF8EB;
   padding:1.0em;
 }
-.foswikiFormStep,
-.twikiFormStep {
+.foswikiFormStep {
   margin:0em 0em 1em;
 }
-.foswikiFormLast,
-.twikiFormLast {
+.foswikiFormLast {
   margin-bottom:0em;
 }
-.foswikiFormStep hr,
-.twikiFormStep hr {
-  margin:1.5em -1.5em;
+.foswikiFormSteps hr {
+  margin:1em -1.5em;
 }
 .foswikiFormSteps h2,
 .foswikiFormSteps h3,
 .foswikiFormSteps h4,
 .foswikiFormSteps h2 a,
 .foswikiFormSteps h3 a,
-.foswikiFormSteps h4 a,
-.twikiFormSteps h2,
-.twikiFormSteps h3,
-.twikiFormSteps h4,
-.twikiFormSteps h2 a,
-.twikiFormSteps h3 a,
-.twikiFormSteps h4 a {
+.foswikiFormSteps h4 a {
   margin-top:0em;
   font-weight:bold;
   color:inherit;
 }
-.foswikiFormSteps h2,
-.twikiFormSteps h2 { font-size:130%; }
+.foswikiFormSteps h2 { 
+  font-size:130%; 
+}
 
-.foswikiFormSteps h3,
-.twikiFormSteps h3 { font-size:100%; }
+.foswikiFormSteps h3 {
+  font-size:100%; 
+}
 
 .foswikiFormSteps h4,
 .foswikiFormSteps h5,
-.foswikiFormSteps h6,
-.twikiFormSteps h4,
-.twikiFormSteps h5,
-.twikiFormSteps h6 { 
+.foswikiFormSteps h6 {
   font-size:100%; 
 }
 
-.foswikiFormSteps h2,
-.twikiFormSteps h2 {
+.foswikiFormSteps h2 {
   border-bottom:0px;
   color:#b0321b;
   color:#9C3063;
 }
 
-.foswikiFormSteps h3,
-.twikiFormSteps h3 {
+.foswikiFormSteps h3 {
   margin:0em 0em 0.2em;
 }
 
-.foswikiFormOptions .foswikiCheckbox,
-.twikiFormOptions .twikiCheckbox {
-  margin:0em 0.2em 0em;
-}
-
 .foswikiFormSteps .jqTabContents,
-.foswikiFormSteps ul.jqTabGroup li.current,
-.twikiFormSteps .jqTabContents,
-.twikiFormSteps ul.jqTabGroup li.current {
+.foswikiFormSteps ul.jqTabGroup li.current {
   background:#FEF1D6;
 }
 
-.foswikiFormSteps .jqTabContents,
-.twikiFormSteps .jqTabContents {
+.foswikiFormSteps .jqTabContents {
   padding:1.0em;
 }
 
-.foswikiFormDescription,
-.twikiFormDescription {
+.foswikiFormDescription {
   margin:0.2em 0em;
   color:#828282;
 }
 
-.jqTabContents .foswikiFormSteps,
-.jqTabContents .twikiFormSteps {
+.jqTabContents .foswikiFormSteps {
   margin:-8px;
   padding:1em 1.5em;
   background:transparent;
   border:0px;
 }
 
-.jqTabContents .foswikiFormSteps .foswikiFormStep,
-.jqTabContents .twikiFormSteps .twikiFormStep {
+.jqTabContents .foswikiFormSteps .foswikiFormStep {
   background:#FEF8EB;
   /*background:#f6f6f6;*/
   border-top:1px solid #ddd;
   margin:0em;
   padding:1em 1.5em;
 }
-.jqTabContents .foswikiFormSteps .foswikiFormLast,
-.jqTabContents .twikiFormSteps .twikiFormLast {
+.jqTabContents .foswikiFormSteps .foswikiFormLast {
   border-bottom:1px solid #ddd;
 }
 
@@ -546,11 +462,11 @@ fieldset .twikiFormSteps {
 .natWebTitle a {
   float:left;
   width:287px;
-  height:74px;
-  margin:13px;
+  height:70px;
+  margin:25px 0px 0px 23px;
   text-decoration:none;
   /* ie 6 */
-  _margin-left:23px; /
+  _margin-left:23px;
 }
 .natWebTitle a,
 .natWebTitle a:hover {
@@ -559,6 +475,9 @@ fieldset .twikiFormSteps {
 .natEditBody .natMainContents h1 {
   margin:0em 0em .5em;
 }
+.natEditBody .natMainContents {
+  margin:1em 2em;
+}
 .natWebSlogan {
   font-style:italic;
   display:inline;
@@ -630,6 +549,7 @@ fieldset .twikiFormSteps {
 }
 .natSideBar h2 {
   font-size:120%;
+  clear:both;
 }
 .natSideBar h2,
 .natSideBar h2 a {
@@ -663,7 +583,6 @@ fieldset .twikiFormSteps {
   margin:0.5em 0em 0.5em 0em;
   font-size:100%;
   font-weight:bold;
-  display:inline;
 }
 .natSideBar h2 a,
 .natSideBar h3 a,
@@ -672,57 +591,55 @@ fieldset .twikiFormSteps {
   font-weight:inherit;
 }
 
-.natSideBar p,
-.natSideBarSection {
-  /*background:#CECFCE;*/
-  margin:0em -1em;
-  padding:0em 1em;
-}
 .natSideBar p {
   border-bottom:1px solid white;
+  margin:0em -1em;
+  padding:0em 1em;
 }
 
 .natSideBar p {
   padding:1em;
 }
 
-.natSideBar ol,
 .natSideBar ul {
   margin:0em -1em -1px;
-  /*background:#cecfce;*/
   border-bottom:1px solid #c2c4c4;
 }
 
-.natSideBar li {
-  line-height:2.0em;
+.natSideBar ul li {
   margin:0px;
   padding:1px 1em;
   border-top:1px solid #c2c4c4;
 }
+.natSideBar li a:hover,
+.natSideBar li a {
+  color:#434343;
+}
 .natSideBar ul li a:hover,
 .natSideBar ul li a {
   font-weight:normal;
   display:block;
-  color:#434343;
   margin:0px -1em;
-  padding:0px 1em;
+  padding:0.5em 1em;
 }
-.natSideBar .twikiCurrentTopicLink,
 .natSideBar .foswikiCurrentTopicLink {
   color:#9C3063;
   background:#fff;
 }
 
 .natSideBar ol {
-  padding:1em 0em 1em 2.5em;
+  margin:0em 0em -1px;
+  padding:0em 0.25em 0.5em;
 }
 .natSideBar ol li {
   background-image:none;
   border-bottom:0px;
   line-height:normal;
+  padding:0.25em 0em;
 }
-.natSideBar ol li a {
-  color:#9C3063;
+.natSideBar ol li a:hover {
+  background:#0055b5;
+  color:#ffffff;
 }
 .natSideBar ul ul {
   margin-left:0px;
@@ -770,7 +687,7 @@ fieldset .twikiFormSteps {
 /* main area */
 .natBreadCrumbs {
   font-size:95%;
-  line-height:135%;
+  line-height:normal;
 }
 .natBreadCrumbs,
 .natBreadCrumbs .natSep {
@@ -784,7 +701,6 @@ fieldset .twikiFormSteps {
   color:white;
 }
 
-.natMainContents .twikiNewLink,
 .natMainContents .foswikiNewLink {
   background-color:#eee;
   color:#9C3063;
@@ -798,41 +714,41 @@ fieldset .twikiFormSteps {
   margin:0em 0em 1.5em;
   font-size:95%;
 }
-.clsTopicInfo {
+.foswikiTopicInfo {
   margin:0em 0em 2em 0em;
   font-size:95%;
 }
-.clsTopicInfo .natRevision {
+.foswikiTopicInfo .natRevision {
   margin:0px;
   font-size:100%;
 }
-.clsTopicSummary,
-.clsTopicInfo {
+.foswikiTopicSummary,
+.foswikiTopicInfo {
   line-height:135%;
 }
-.clsTopicSummary,
-.clsTopicInfo, 
+.foswikiTopicSummary,
+.foswikiTopicInfo, 
 .natRevision {
   color:#808080;
 }
-h1 .clsTopicSummary {
+h1 .foswikiTopicSummary {
   font-size:12.35px;
   color:#808080;
 }
-.clsTopicInfo h1 {
+.foswikiTopicInfo h1 {
   font-size:170%;
-  line-height:135%;
+  line-height:115%;
 }
-.clsTopicInfo a,
+.foswikiTopicInfo a,
 .natRevision a,
-.natMainContents .clsTopicInfo a {
+.natMainContents .foswikiTopicInfo a {
   color:#808080;
 }
-.natMainContents .clsTopicInfo h1 a {
+.natMainContents .foswikiTopicInfo h1 a {
   color:#222;
   text-decoration:none;
 }
-.clsTopicInfo a:hover,
+.foswikiTopicInfo a:hover,
 .natRevision a:hover {
   color:white;
   text-decoration:none;
@@ -866,8 +782,7 @@ h1 .clsTopicSummary {
 .natTopicForm .natTopicAction:hover {
   background-color:#FEE7B5;
 }
-.natTopicForm  .foswikiFormStep,
-.natTopicForm  .twikiFormStep {
+.natTopicForm  .foswikiFormStep {
   margin:0.3em 0em;
   padding:0em;
 }
@@ -907,7 +822,6 @@ h1 .clsTopicSummary {
 .natTopicAttachments .natTopicActions a:hover {
   background-color:#FEE8B8;
 }
-.natTopicAttachments .twikiFormStep,
 .natTopicAttachments .foswikiFormStep {
   margin:1.25em 0em 0em;
 }
@@ -917,41 +831,32 @@ h1 .clsTopicSummary {
 .natSearchRevision a {
   color:#aaa;
 }
-.natSearchForm {
-  border-bottom:1px #ddd solid;
-  padding-bottom:2px;
-}
 
 /* TOC */
-.foswikiToc,
-.twikiToc {
+.foswikiToc {
   margin:1em 0em 0em 0.2em;
   padding:0em;
 }
-.foswikiTocTitle,
-.twikiTocTitle {
+.foswikiTocTitle {
   margin:0em 0em 0.25em 0em;
   padding:0em;
   font-size:125%;
   color:#222;
   display:block;
 }
-.foswikiToc ul,
-.twikiToc ul {
+.foswikiToc ul {
   list-style:none;
   padding:0.5em 0em;
   margin:0;
   border-top:1px solid #eee;
   border-left:4px solid #eee;
 }
-.foswikiToc ul ul,
-.twikiToc ul ul {
+.foswikiToc ul ul {
   padding:0em 0em 0em .5em;
   margin-top:0px;
   border:0px;
 }
-.foswikiToc li,
-.twikiToc li {
+.foswikiToc li {
   margin-left:1em;
   padding-left:1em;
   background-image:url(bullet-toc.gif);
@@ -959,8 +864,7 @@ h1 .clsTopicSummary {
   background-repeat:no-repeat;
   background-repeat:no-repeat;
 }
-.foswikiToc a,
-.twikiToc a {
+.foswikiToc a {
   background-image:none;
   text-decoration:none;
 }
@@ -1086,37 +990,47 @@ h1 .clsTopicSummary {
   border-bottom:1px #bbb solid;
   margin:-2px -5px;
 }
+.empContactSummary h1 {
+  border-bottom:0px;
+}
 
 /* ClassificationPlugin */
 .clsBrowser a,
+.tagCloud a,
 .clsTagCloud a {
   text-decoration:none;
   display:inline;
+  color:#0055b5;
 }
-.fltMakeIndexWrapper a:hover,
-.natMainContents .fltMakeIndexWrapper a {
-  line-height:100%;
+.fltMakeIndexWrapper h2 {
+  margin-top:0px;
 }
 .fltMakeIndexWrapper h3 {
-  font-size:100%;
   font-weight:bold;
 }
-.fltMakeIndexWrapper .clsTopicInfo {
+.fltMakeIndexWrapper .foswikiTopicInfo {
   color:#808080;
 }
 .fltMakeIndexWrapper .clsSubCategories a,
 .fltMakeIndexWrapper .clsSubCategories {
   color:#808080;
 }
+.fltMakeIndexWrapper .clsSubCategories a:hover {
+  color:#ffffff;
+  background:#0055b5;
+}
 .natMainContents .fltMakeIndexWrapper ul {
   list-style-type:none;
-  margin:0px 7px 7px 0px;
+  margin:0em 2.0em 0em 0em;
   padding:0px;
 }
-.natMainContents .fltMakeIndexWrapper li {
-  padding:7px 0px;
+.natMainContents .fltMakeIndexWrapper ul li {
+  border-bottom:1px solid #eee;
+  padding:0em 0.5em 0.5em 0em;
+  margin:0em 0em 1em 0em;
 }
 
+
 /* HistoryPlugin */
 .natOopsHistoryBody form {
   margin:0em 1em 1em 0em;
@@ -1163,13 +1077,94 @@ td.mceToolbarTop {
   margin:0em -0.5em 0em;
 }
 .natSideBar .treeview a:hover,
+.treeview a:hover,
+a:hover {
+  color:#ffffff;
+  background:#0055b5;
+  text-decoration:none;
+}
+.natSideBar .treeview a:hover,
 .natSideBar .treeview a {
   display:inline;
   padding:0px;
   margin:0px;
 }
-.natSideBar .jqTreeview ul,
-.natSideBar .jqTreeview ol,
+.natSideBar .treeview,
+.natSideBar .treeview ul,
+.natSideBar .treeview ol,
 .natSideBar .treeview li {
   border:0px;
 }
+
+/* jqTextboxList */
+.jqTextboxListValue {
+  background-color:#FEEFCD;
+  border:1px solid #F2D9A3;
+}
+
+/* reddot plugin */
+.natSideBar .redDot {
+  font-size:90%;
+  display:none;
+}
+.natSideBar:hover .redDot {
+  display:inline;
+}
+.natSideBar .redDot a:hover {
+  background-color:#D4D4D6;
+  color:black;
+}
+
+@media print {
+  /* TOC */
+  .foswikiToc::before {
+    font-size:135%;
+  }
+  .foswikiTocTitle {
+    display:none;
+  }
+  .foswikiToc {
+    text-align:left;
+    page-break-after:always;
+  }
+  .foswikiTocTitle {
+    display:none;
+  }
+  .foswikiToc::before {
+    font-size:160%;
+    margin:2em 0em 1em;
+    display:block;
+    content: "Table of Contents";
+  }
+  .foswikiToc > ul {
+    columns: 2;
+    column-gap: 1em;
+    border:0px;
+    padding:0px;
+    margin:0px;
+  }
+  .foswikiToc a::after {
+    content:leader(".") target-counter(attr(href), page);
+  }
+  .foswikiToc li {
+    background:transparent;
+    padding-left:0px;
+    margin-left:5px;
+  }
+
+  h1, h2, h3, h4, h5, h6 {
+    color:black;
+    font-weight:bold;
+  }
+  h2 {
+    margin-top:1.5cm;
+  }
+  h3 {
+    margin-top:1cm;
+  }
+  body {
+    font-size: 11pt;
+    line-height: 1.3em;
+  }
+
+}
diff --git a/pub/System/NatSkin/BlueNoteStyle.css.gz b/pub/System/NatSkin/BlueNoteStyle.css.gz
new file mode 100644
index 0000000..7b7360a
Binary files /dev/null and b/pub/System/NatSkin/BlueNoteStyle.css.gz differ
diff --git a/pub/TWiki/NatSkin/BlueNoteStyle.jpeg b/pub/System/NatSkin/BlueNoteStyle.jpeg
similarity index 100%
rename from pub/TWiki/NatSkin/BlueNoteStyle.jpeg
rename to pub/System/NatSkin/BlueNoteStyle.jpeg
diff --git a/pub/TWiki/NatSkin/BlueNoteThin.css b/pub/System/NatSkin/BlueNoteThin.css
similarity index 93%
rename from pub/TWiki/NatSkin/BlueNoteThin.css
rename to pub/System/NatSkin/BlueNoteThin.css
index 8882d0d..2b2b78e 100644
--- a/pub/TWiki/NatSkin/BlueNoteThin.css
+++ b/pub/System/NatSkin/BlueNoteThin.css
@@ -1,7 +1,4 @@
 /* thin variant for clean */
-@import url("BaseThin.css");
-
-
 .natBodyContents {
   padding-top:2em;
 }
diff --git a/pub/System/NatSkin/BlueNoteThin.css.gz b/pub/System/NatSkin/BlueNoteThin.css.gz
new file mode 100644
index 0000000..81df381
Binary files /dev/null and b/pub/System/NatSkin/BlueNoteThin.css.gz differ
diff --git a/pub/TWiki/NatSkin/GrayBlend.gif b/pub/System/NatSkin/GrayBlend.gif
similarity index 100%
rename from pub/TWiki/NatSkin/GrayBlend.gif
rename to pub/System/NatSkin/GrayBlend.gif
diff --git a/pub/TWiki/NatSkin/GrayBlend.png b/pub/System/NatSkin/GrayBlend.png
similarity index 100%
rename from pub/TWiki/NatSkin/GrayBlend.png
rename to pub/System/NatSkin/GrayBlend.png
diff --git a/pub/System/NatSkin/Makefile b/pub/System/NatSkin/Makefile
new file mode 100644
index 0000000..5c78c03
--- /dev/null
+++ b/pub/System/NatSkin/Makefile
@@ -0,0 +1,25 @@
+TARGET= \
+  attach.js \
+  BaseBorder.css \
+  BaseButtons.css \
+  BaseStyle.css \
+  BaseThin.css \
+  BlueNoteBorder.css \
+  BlueNoteButtons.css \
+  BlueNoteStyle.css \
+  BlueNoteThin.css \
+  print.css \
+  natskin.js \
+  obfuscator.js
+
+
+GZIP=gzip
+
+
+.SUFFIXES: .js .css
+
+all: $(TARGET) $(TARGET:.js=.js.gz) $(TARGET:.css=.css.gz)
+
+%.gz: %
+	@echo compressing $< to $@
+	@$(GZIP) -c $< > $@
diff --git a/pub/TWiki/NatSkin/attach.js b/pub/System/NatSkin/attach.js
similarity index 89%
rename from pub/TWiki/NatSkin/attach.js
rename to pub/System/NatSkin/attach.js
index faef99c..ed9db15 100644
--- a/pub/TWiki/NatSkin/attach.js
+++ b/pub/System/NatSkin/attach.js
@@ -7,8 +7,8 @@ function toggleAttachmentEditor(elem, state) {
     toggleAttachmentEditor(lastElem, 'off');
   }
 
-  var $elemStep = $(elem).parents(".twikiFormStep"); 
-  var $editor = $elemStep.find("#natAttachmentEditor");
+  var $elemStep = jQuery(elem).parents(".foswikiFormStep"); 
+  var $editor = $elemStep.find(".natAttachmentEditor");
   var $comment = $elemStep.find(".natAttachmentComment");
   var text = $editor.find("textarea").text();
 
diff --git a/pub/System/NatSkin/attach.js.gz b/pub/System/NatSkin/attach.js.gz
new file mode 100644
index 0000000..60739a4
Binary files /dev/null and b/pub/System/NatSkin/attach.js.gz differ
diff --git a/pub/TWiki/NatSkin/blank.gif b/pub/System/NatSkin/blank.gif
old mode 100755
new mode 100644
similarity index 100%
rename from pub/TWiki/NatSkin/blank.gif
rename to pub/System/NatSkin/blank.gif
diff --git a/pub/TWiki/NatSkin/bullet-toc.gif b/pub/System/NatSkin/bullet-toc.gif
similarity index 100%
rename from pub/TWiki/NatSkin/bullet-toc.gif
rename to pub/System/NatSkin/bullet-toc.gif
diff --git a/pub/TWiki/NatSkin/button-bg.png b/pub/System/NatSkin/button-bg.png
similarity index 100%
rename from pub/TWiki/NatSkin/button-bg.png
rename to pub/System/NatSkin/button-bg.png
diff --git a/pub/TWiki/NatSkin/external.png b/pub/System/NatSkin/external.png
similarity index 100%
rename from pub/TWiki/NatSkin/external.png
rename to pub/System/NatSkin/external.png
diff --git a/pub/TWiki/NatSkin/favicon.ico b/pub/System/NatSkin/favicon.ico
similarity index 100%
rename from pub/TWiki/NatSkin/favicon.ico
rename to pub/System/NatSkin/favicon.ico
diff --git a/pub/TWiki/NatSkin/feed-icon-12x12-gray.gif b/pub/System/NatSkin/feed-icon-12x12-gray.gif
similarity index 100%
rename from pub/TWiki/NatSkin/feed-icon-12x12-gray.gif
rename to pub/System/NatSkin/feed-icon-12x12-gray.gif
diff --git a/pub/TWiki/NatSkin/feed-icon-12x12-gray.png b/pub/System/NatSkin/feed-icon-12x12-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/feed-icon-12x12-gray.png
rename to pub/System/NatSkin/feed-icon-12x12-gray.png
diff --git a/pub/TWiki/NatSkin/feed-icon-12x12.gif b/pub/System/NatSkin/feed-icon-12x12.gif
similarity index 100%
rename from pub/TWiki/NatSkin/feed-icon-12x12.gif
rename to pub/System/NatSkin/feed-icon-12x12.gif
diff --git a/pub/TWiki/NatSkin/feed-icon-12x12.png b/pub/System/NatSkin/feed-icon-12x12.png
similarity index 100%
rename from pub/TWiki/NatSkin/feed-icon-12x12.png
rename to pub/System/NatSkin/feed-icon-12x12.png
diff --git a/pub/TWiki/NatSkin/foswiki-header-notrans.png b/pub/System/NatSkin/foswiki-header-notrans.png
similarity index 100%
rename from pub/TWiki/NatSkin/foswiki-header-notrans.png
rename to pub/System/NatSkin/foswiki-header-notrans.png
diff --git a/pub/TWiki/NatSkin/foswiki-header-tile.png b/pub/System/NatSkin/foswiki-header-tile.png
similarity index 100%
rename from pub/TWiki/NatSkin/foswiki-header-tile.png
rename to pub/System/NatSkin/foswiki-header-tile.png
diff --git a/pub/TWiki/NatSkin/foswiki-header.png b/pub/System/NatSkin/foswiki-header.png
similarity index 100%
rename from pub/TWiki/NatSkin/foswiki-header.png
rename to pub/System/NatSkin/foswiki-header.png
diff --git a/pub/System/NatSkin/foswiki-logo.png b/pub/System/NatSkin/foswiki-logo.png
new file mode 100644
index 0000000..0b8e406
Binary files /dev/null and b/pub/System/NatSkin/foswiki-logo.png differ
diff --git a/pub/TWiki/NatSkin/icons/application_form_edit.png b/pub/System/NatSkin/icons/application_form_edit.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/application_form_edit.png
rename to pub/System/NatSkin/icons/application_form_edit.png
diff --git a/pub/TWiki/NatSkin/icons/attach.png b/pub/System/NatSkin/icons/attach.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/attach.png
rename to pub/System/NatSkin/icons/attach.png
diff --git a/pub/TWiki/NatSkin/icons/bin.png b/pub/System/NatSkin/icons/bin.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/bin.png
rename to pub/System/NatSkin/icons/bin.png
diff --git a/pub/System/NatSkin/icons/bullet_orange.png b/pub/System/NatSkin/icons/bullet_orange.png
new file mode 100755
index 0000000..fa63024
Binary files /dev/null and b/pub/System/NatSkin/icons/bullet_orange.png differ
diff --git a/pub/TWiki/NatSkin/icons/control-back-gray.png b/pub/System/NatSkin/icons/control-back-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-back-gray.png
rename to pub/System/NatSkin/icons/control-back-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-back.png b/pub/System/NatSkin/icons/control-back.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-back.png
rename to pub/System/NatSkin/icons/control-back.png
diff --git a/pub/TWiki/NatSkin/icons/control-bottom-gray.png b/pub/System/NatSkin/icons/control-bottom-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-bottom-gray.png
rename to pub/System/NatSkin/icons/control-bottom-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-bottom.png b/pub/System/NatSkin/icons/control-bottom.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-bottom.png
rename to pub/System/NatSkin/icons/control-bottom.png
diff --git a/pub/TWiki/NatSkin/icons/control-down-gray.png b/pub/System/NatSkin/icons/control-down-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-down-gray.png
rename to pub/System/NatSkin/icons/control-down-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-down.png b/pub/System/NatSkin/icons/control-down.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-down.png
rename to pub/System/NatSkin/icons/control-down.png
diff --git a/pub/TWiki/NatSkin/icons/control-eject-gray.png b/pub/System/NatSkin/icons/control-eject-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-eject-gray.png
rename to pub/System/NatSkin/icons/control-eject-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-eject.png b/pub/System/NatSkin/icons/control-eject.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-eject.png
rename to pub/System/NatSkin/icons/control-eject.png
diff --git a/pub/TWiki/NatSkin/icons/control-end-gray.png b/pub/System/NatSkin/icons/control-end-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-end-gray.png
rename to pub/System/NatSkin/icons/control-end-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-end.png b/pub/System/NatSkin/icons/control-end.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-end.png
rename to pub/System/NatSkin/icons/control-end.png
diff --git a/pub/TWiki/NatSkin/icons/control-forward-gray.png b/pub/System/NatSkin/icons/control-forward-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-forward-gray.png
rename to pub/System/NatSkin/icons/control-forward-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-forward.png b/pub/System/NatSkin/icons/control-forward.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-forward.png
rename to pub/System/NatSkin/icons/control-forward.png
diff --git a/pub/TWiki/NatSkin/icons/control-left-gray.png b/pub/System/NatSkin/icons/control-left-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-left-gray.png
rename to pub/System/NatSkin/icons/control-left-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-left.png b/pub/System/NatSkin/icons/control-left.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-left.png
rename to pub/System/NatSkin/icons/control-left.png
diff --git a/pub/TWiki/NatSkin/icons/control-pause-gray.png b/pub/System/NatSkin/icons/control-pause-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-pause-gray.png
rename to pub/System/NatSkin/icons/control-pause-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-pause.png b/pub/System/NatSkin/icons/control-pause.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-pause.png
rename to pub/System/NatSkin/icons/control-pause.png
diff --git a/pub/TWiki/NatSkin/icons/control-play-gray.png b/pub/System/NatSkin/icons/control-play-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-play-gray.png
rename to pub/System/NatSkin/icons/control-play-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-play.png b/pub/System/NatSkin/icons/control-play.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-play.png
rename to pub/System/NatSkin/icons/control-play.png
diff --git a/pub/TWiki/NatSkin/icons/control-rev-gray.png b/pub/System/NatSkin/icons/control-rev-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-rev-gray.png
rename to pub/System/NatSkin/icons/control-rev-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-rev.png b/pub/System/NatSkin/icons/control-rev.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-rev.png
rename to pub/System/NatSkin/icons/control-rev.png
diff --git a/pub/TWiki/NatSkin/icons/control-right-gray.png b/pub/System/NatSkin/icons/control-right-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-right-gray.png
rename to pub/System/NatSkin/icons/control-right-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-right.png b/pub/System/NatSkin/icons/control-right.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-right.png
rename to pub/System/NatSkin/icons/control-right.png
diff --git a/pub/TWiki/NatSkin/icons/control-start-gray.png b/pub/System/NatSkin/icons/control-start-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-start-gray.png
rename to pub/System/NatSkin/icons/control-start-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-start.png b/pub/System/NatSkin/icons/control-start.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-start.png
rename to pub/System/NatSkin/icons/control-start.png
diff --git a/pub/TWiki/NatSkin/icons/control-stop-gray.png b/pub/System/NatSkin/icons/control-stop-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-stop-gray.png
rename to pub/System/NatSkin/icons/control-stop-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-stop.png b/pub/System/NatSkin/icons/control-stop.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-stop.png
rename to pub/System/NatSkin/icons/control-stop.png
diff --git a/pub/TWiki/NatSkin/icons/control-top-gray.png b/pub/System/NatSkin/icons/control-top-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-top-gray.png
rename to pub/System/NatSkin/icons/control-top-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-top.png b/pub/System/NatSkin/icons/control-top.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-top.png
rename to pub/System/NatSkin/icons/control-top.png
diff --git a/pub/TWiki/NatSkin/icons/control-up-gray.png b/pub/System/NatSkin/icons/control-up-gray.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-up-gray.png
rename to pub/System/NatSkin/icons/control-up-gray.png
diff --git a/pub/TWiki/NatSkin/icons/control-up.png b/pub/System/NatSkin/icons/control-up.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/control-up.png
rename to pub/System/NatSkin/icons/control-up.png
diff --git a/pub/System/NatSkin/icons/cross.png b/pub/System/NatSkin/icons/cross.png
new file mode 100755
index 0000000..1514d51
Binary files /dev/null and b/pub/System/NatSkin/icons/cross.png differ
diff --git a/pub/TWiki/NatSkin/icons/eye.png b/pub/System/NatSkin/icons/eye.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/eye.png
rename to pub/System/NatSkin/icons/eye.png
diff --git a/pub/TWiki/NatSkin/icons/help.png b/pub/System/NatSkin/icons/help.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/help.png
rename to pub/System/NatSkin/icons/help.png
diff --git a/pub/System/NatSkin/icons/link.png b/pub/System/NatSkin/icons/link.png
new file mode 100755
index 0000000..25eacb7
Binary files /dev/null and b/pub/System/NatSkin/icons/link.png differ
diff --git a/pub/TWiki/NatSkin/icons/magnifier.png b/pub/System/NatSkin/icons/magnifier.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/magnifier.png
rename to pub/System/NatSkin/icons/magnifier.png
diff --git a/pub/TWiki/NatSkin/icons/page_white_acrobat.png b/pub/System/NatSkin/icons/page_white_acrobat.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/page_white_acrobat.png
rename to pub/System/NatSkin/icons/page_white_acrobat.png
diff --git a/pub/TWiki/NatSkin/icons/page_white_add.png b/pub/System/NatSkin/icons/page_white_add.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/page_white_add.png
rename to pub/System/NatSkin/icons/page_white_add.png
diff --git a/pub/TWiki/NatSkin/icons/page_white_go.png b/pub/System/NatSkin/icons/page_white_go.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/page_white_go.png
rename to pub/System/NatSkin/icons/page_white_go.png
diff --git a/pub/TWiki/NatSkin/icons/page_white_stack.png b/pub/System/NatSkin/icons/page_white_stack.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/page_white_stack.png
rename to pub/System/NatSkin/icons/page_white_stack.png
diff --git a/pub/TWiki/NatSkin/icons/pencil.png b/pub/System/NatSkin/icons/pencil.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/pencil.png
rename to pub/System/NatSkin/icons/pencil.png
diff --git a/pub/System/NatSkin/icons/pencil_go.png b/pub/System/NatSkin/icons/pencil_go.png
new file mode 100755
index 0000000..937bded
Binary files /dev/null and b/pub/System/NatSkin/icons/pencil_go.png differ
diff --git a/pub/TWiki/NatSkin/icons/printer.png b/pub/System/NatSkin/icons/printer.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/printer.png
rename to pub/System/NatSkin/icons/printer.png
diff --git a/pub/TWiki/NatSkin/icons/text_align_left.png b/pub/System/NatSkin/icons/text_align_left.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/text_align_left.png
rename to pub/System/NatSkin/icons/text_align_left.png
diff --git a/pub/System/NatSkin/icons/time.png b/pub/System/NatSkin/icons/time.png
new file mode 100755
index 0000000..911da3f
Binary files /dev/null and b/pub/System/NatSkin/icons/time.png differ
diff --git a/pub/TWiki/NatSkin/icons/user.png b/pub/System/NatSkin/icons/user.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/user.png
rename to pub/System/NatSkin/icons/user.png
diff --git a/pub/TWiki/NatSkin/icons/wrench.png b/pub/System/NatSkin/icons/wrench.png
similarity index 100%
rename from pub/TWiki/NatSkin/icons/wrench.png
rename to pub/System/NatSkin/icons/wrench.png
diff --git a/pub/TWiki/NatSkin/iepngfix.htc b/pub/System/NatSkin/iepngfix.htc
old mode 100755
new mode 100644
similarity index 100%
rename from pub/TWiki/NatSkin/iepngfix.htc
rename to pub/System/NatSkin/iepngfix.htc
diff --git a/pub/TWiki/NatSkin/login_keys.png b/pub/System/NatSkin/login_keys.png
similarity index 100%
rename from pub/TWiki/NatSkin/login_keys.png
rename to pub/System/NatSkin/login_keys.png
diff --git a/pub/TWiki/NatSkin/menuarrow.gif b/pub/System/NatSkin/menuarrow.gif
similarity index 100%
rename from pub/TWiki/NatSkin/menuarrow.gif
rename to pub/System/NatSkin/menuarrow.gif
diff --git a/pub/System/NatSkin/menubg.gif b/pub/System/NatSkin/menubg.gif
new file mode 100644
index 0000000..8c79dc3
Binary files /dev/null and b/pub/System/NatSkin/menubg.gif differ
diff --git a/pub/TWiki/NatSkin/menucorner.gif b/pub/System/NatSkin/menucorner.gif
similarity index 100%
rename from pub/TWiki/NatSkin/menucorner.gif
rename to pub/System/NatSkin/menucorner.gif
diff --git a/pub/System/NatSkin/minus.png b/pub/System/NatSkin/minus.png
new file mode 100644
index 0000000..03fb9be
Binary files /dev/null and b/pub/System/NatSkin/minus.png differ
diff --git a/pub/TWiki/NatSkin/natskin.js b/pub/System/NatSkin/natskin.js
similarity index 50%
rename from pub/TWiki/NatSkin/natskin.js
rename to pub/System/NatSkin/natskin.js
index 74e4f18..58b65ff 100644
--- a/pub/TWiki/NatSkin/natskin.js
+++ b/pub/System/NatSkin/natskin.js
@@ -1,5 +1,30 @@
 // (c)opyright 2006-2009 Michael Daum http://michaeldaumconsulting.com
-$(function() {
+
+// document ready
+(function($) {$(function() {
+
+  /* ie6 png transperency fix for img tags */
+  if ($.browser.msie && $.browser.version < 7) {
+    runOnLoad(
+      function() {
+        window.setTimeout(function() {
+          $("img[src$='png']").each(function () {
+            var img = $(this);
+            var width = img.width() || 16;
+            var height = img.height() || 16;
+            //alert(width);
+            img.css({
+              "width": width,
+              "height": height, 
+              "filter": "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + img.attr("src") + "', sizingMethod='scale')"
+            });
+            img.attr("src", blankImg);
+          });
+        }, 10);
+      }
+    );
+  }
+
   /* move revinfo */
   if (true) {
     var target = $(".natMain h1:first");
@@ -10,17 +35,15 @@ $(function() {
 
   /* horiz menu */
   if (true) {
-    $(".natWebButtonsContents > ul").
-      superfish({}).
-      find("li:has(ul)").
-      addClass("hasSubMenu");
+    $(".natWebButtonsContents > ul").superfish({}).
+      find("li:has(ul)").addClass("hasSubMenu");
     $(".natWebButtonsContents").css('display', 'block');
   }
 
   /* add overflow div for tables */
   if (true) { 
-    $(".natMainContents .twikiTable, .natMainContents .foswikiTable")
-      .not($(".twikiTable .twikiTable, .foswikiTable .foswikiTable", this))
+    $(".natMainContents .foswikiTable, .natMainContents .foswikiTable")
+      .not($(".foswikiTable .foswikiTable, .foswikiTable .foswikiTable", this))
       .wrap("<div class='overflow'></div>");
   }
 
@@ -34,9 +57,16 @@ $(function() {
           track:true,
           showURL:false,
           bodyHandler: function() { 
-            var img = $("<img/>").attr({
-              src: this.href
-            }); 
+            var src = this.href;
+            var data = $(this).metadata();
+            if (foswiki.ImagePluginEnabled && data) {
+              src = foswiki.scriptUrl+"/rest/ImagePlugin/resize?"+
+                "topic="+data.web+"."+data.topic+";"+
+                "file="+data.image+";"+
+                "width="+(data.width||300)+";"+
+                "height="+(data.height||300)
+            }
+            var img = $("<img/>").attr('src', src);
             return $("<div class='imgTooltip'></div>").append(img);
           }
         });
@@ -71,6 +101,12 @@ $(function() {
     });
   }
 
+  if (true) { // set the MakeVisibles and MakeHiddens
+    $(".foswikiMakeVisible, .foswikiMakeVisibleInline").css("display", "inline");
+    $(".foswikiMakeVisibleBlock").css("display", "block");
+    $(".foswikiMakeHidden").css("display", "none");
+  }
+
   if (true) { // remove empty attachment comments
     $("#natTopicAttachments .natAttachmentComment").each(function(){
       var text = $(this).text();
@@ -81,4 +117,10 @@ $(function() {
     });
   }
 
-}); 
+  if (true) { // typographic improvements in sidebar
+    $('.natSideBar h2 + h2').each(function() {
+      $(this).replaceWith('<h3>'+$(this).text()+'</h3>');
+    });
+  }
+
+});}(jQuery));
diff --git a/pub/System/NatSkin/natskin.js.gz b/pub/System/NatSkin/natskin.js.gz
new file mode 100644
index 0000000..adfc449
Binary files /dev/null and b/pub/System/NatSkin/natskin.js.gz differ
diff --git a/pub/System/NatSkin/obfuscator.js b/pub/System/NatSkin/obfuscator.js
new file mode 100644
index 0000000..a21e4b1
--- /dev/null
+++ b/pub/System/NatSkin/obfuscator.js
@@ -0,0 +1,24 @@
+// (c)opyright 2006-2009 Michael Daum http://michaeldaumconsulting.com
+(function($) {
+$.wremo = {
+  build: function(options) {
+    return this.each(function() {
+      $(this).empty();
+      var id = $(this).attr('id');
+      var ems = new Array();
+      for (var i = 0; i < emoas[id][1].length; i++) {
+        ems.push(emoas[id][1][i][1]+'@'+emoas[id][1][i][0]+emoas[id][1][i][2]);
+      }
+      var txt = emoas[id][0] || ems.join(', ');
+      var href = 'ma'+'il'+'to'+':'+ems.join(', ');
+      $("<a></a>").attr('href', href).append(txt).appendTo(this);
+    });
+  }
+}
+
+$(function() {
+  $.fn.wremo = $.wremo.build;
+  $(".wremo").wremo();
+});
+
+})(jQuery);
diff --git a/pub/System/NatSkin/obfuscator.js.gz b/pub/System/NatSkin/obfuscator.js.gz
new file mode 100644
index 0000000..a526346
Binary files /dev/null and b/pub/System/NatSkin/obfuscator.js.gz differ
diff --git a/pub/TWiki/NatSkin/oldrevisionbg.png b/pub/System/NatSkin/oldrevisionbg.png
similarity index 100%
rename from pub/TWiki/NatSkin/oldrevisionbg.png
rename to pub/System/NatSkin/oldrevisionbg.png
diff --git a/pub/System/NatSkin/oldrevisionbg.xcf b/pub/System/NatSkin/oldrevisionbg.xcf
new file mode 100644
index 0000000..b2050c6
Binary files /dev/null and b/pub/System/NatSkin/oldrevisionbg.xcf differ
diff --git a/pub/TWiki/NatSkin/oopsmore_diff_debug.gif b/pub/System/NatSkin/oopsmore_diff_debug.gif
similarity index 100%
rename from pub/TWiki/NatSkin/oopsmore_diff_debug.gif
rename to pub/System/NatSkin/oopsmore_diff_debug.gif
diff --git a/pub/TWiki/NatSkin/oopsmore_diff_sequential.gif b/pub/System/NatSkin/oopsmore_diff_sequential.gif
similarity index 100%
rename from pub/TWiki/NatSkin/oopsmore_diff_sequential.gif
rename to pub/System/NatSkin/oopsmore_diff_sequential.gif
diff --git a/pub/TWiki/NatSkin/oopsmore_diff_sidebyside.gif b/pub/System/NatSkin/oopsmore_diff_sidebyside.gif
similarity index 100%
rename from pub/TWiki/NatSkin/oopsmore_diff_sidebyside.gif
rename to pub/System/NatSkin/oopsmore_diff_sidebyside.gif
diff --git a/pub/TWiki/NatSkin/pdf.png b/pub/System/NatSkin/pdf.png
similarity index 100%
rename from pub/TWiki/NatSkin/pdf.png
rename to pub/System/NatSkin/pdf.png
diff --git a/pub/System/NatSkin/plus.png b/pub/System/NatSkin/plus.png
new file mode 100644
index 0000000..7428c48
Binary files /dev/null and b/pub/System/NatSkin/plus.png differ
diff --git a/pub/TWiki/NatSkin/previewbg.png b/pub/System/NatSkin/previewbg.png
similarity index 100%
rename from pub/TWiki/NatSkin/previewbg.png
rename to pub/System/NatSkin/previewbg.png
diff --git a/pub/System/NatSkin/print.css b/pub/System/NatSkin/print.css
new file mode 100644
index 0000000..89df23d
--- /dev/null
+++ b/pub/System/NatSkin/print.css
@@ -0,0 +1,161 @@
+/* page layout */
+@page {
+  size: a4;
+  margin:2.5cm 2cm 2cm 2cm;
+
+  @top-left {
+    content: string(title);
+    text-transform:uppercase;
+    font-family:arial,Helvetica,sans-serif;
+  }
+  @top-right {
+    content: string(chapter);
+    font-family:arial,Helvetica,sans-serif;
+  }
+  @bottom-right {
+    content: counter(page);
+    font-family:arial,Helvetica,sans-serif;
+  }
+}
+@page:first {
+  @top-left {
+    content: none;
+  }
+  @top-right {
+    content: none;
+  }
+}
+
+h1:first-of-type { string-set: title content() }
+h2 { string-set: chapter content() }
+
+html {
+  background:transparent !important;
+}
+body {
+  margin:0 !important;
+  padding:0 !important;
+  width:auto !important;
+  prince-linebreak-magic: auto;
+  hyphens: auto;
+/*
+  columns: 2;
+  column-gap: 1em;
+*/
+}
+
+/* pagination */
+h1, h2, h3, h4, h5, h6 {
+  page-break-after:avoid;
+  page-break-inside:avoid;
+}
+ul, ol, dl {
+  page-break-before:avoid;
+}
+.natMainContents table {
+  page-break-before:avoid;
+}
+pre {
+  page-break-inside:avoid;
+}
+
+/* hidden elements */
+.natFeedIcon,
+.natMainHeaderContents,
+.natBottomBar,
+.natBreadCrumbs,
+.natTopicActions,
+.natGreeter,
+.natSideBarHeader,
+.natWebButtons,
+.natSideBar,
+.natTopBar {
+  display:none;
+}
+
+
+/* spacings */
+.natHeaderArt {
+  border:0px !important;
+  margin:0px !important;
+  padding:0px !important;
+  background:transparent !important;
+}
+.natBodyContents {
+  width:auto !important;
+  padding:0px !important;
+  margin:0px !important;
+  border:0px !important;
+}
+.natLayoutTable {
+  table-layout:auto;
+  width:100%;
+}
+.natMain,
+.natMiddle {
+  border:0px !important;
+  padding:0px !important;
+  background:transparent !important;
+}
+.natMainContents {
+  background:transparent;
+  min-height:auto;
+  margin:0px !important;
+  padding:0px !important;
+}
+
+p {
+  margin:0.5em 0em;
+  text-indent:1em;
+  text-align:justify;
+  orphans:3;
+  widows:2;
+}
+p + p { text-indent: 1.5em }
+img {
+  page-break-inside: avoid;
+  prince-image-resolution: 150dpi;
+}
+
+
+/* links */
+.foswikiNewLink {
+  color:inherit !important;
+  background:inherit !important;
+  text-decoration:none;
+}
+
+/* clear overflow properties */
+.natMainContents,
+.overflow,
+pre {
+  overflow:visible !important;
+}
+
+/* BlogPlugin */
+.blogReply,
+.blogScroll,
+.blogAddComment {
+  display:none;
+}
+
+/* RedDotPlugin */
+.redDot {
+  display:none;
+}
+
+/* TwistyPlugin */
+.twistyHidden,
+.twistyTrigger {
+  display:none;
+}
+
+/* CommentPlugin */
+.commentPlugin {
+  display:none;
+}
+
+/* EditTablePlugin */
+.editTableEditImageButton {
+  display:none;
+}
diff --git a/pub/System/NatSkin/print.css.gz b/pub/System/NatSkin/print.css.gz
new file mode 100644
index 0000000..79aa084
Binary files /dev/null and b/pub/System/NatSkin/print.css.gz differ
diff --git a/pub/TWiki/NatSkin/q_black.gif b/pub/System/NatSkin/q_black.gif
similarity index 100%
rename from pub/TWiki/NatSkin/q_black.gif
rename to pub/System/NatSkin/q_black.gif
diff --git a/pub/TWiki/NatSkin/wikiringlogo40x40.png b/pub/System/NatSkin/wikiringlogo40x40.png
similarity index 100%
rename from pub/TWiki/NatSkin/wikiringlogo40x40.png
rename to pub/System/NatSkin/wikiringlogo40x40.png
diff --git a/pub/TWiki/NatSkin/foswiki-logo.png b/pub/TWiki/NatSkin/foswiki-logo.png
deleted file mode 100644
index 1606405..0000000
Binary files a/pub/TWiki/NatSkin/foswiki-logo.png and /dev/null differ
diff --git a/pub/TWiki/NatSkin/obfuscator.js b/pub/TWiki/NatSkin/obfuscator.js
deleted file mode 100644
index 38c6c28..0000000
--- a/pub/TWiki/NatSkin/obfuscator.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// (c)opyright 2006-2009 Michael Daum http://michaeldaumconsulting.com
-function wremo(emoas, linkText, id) {
-  var elem = document.getElementById(id);
-  if (elem) {
-    if (elem.firstChild) {
-      elem.removeChild(elem.firstChild);
-    }
-
-    var anchor = document.createElement("a");
-    elem.appendChild(anchor);
-
-    anchor.href = 'ma'+'il'+'to'+':';
-
-    for (var i = 0; i < emoas.length; i++) {
-      anchor.href += emoas[i][1] + '@' + emoas[i][0] + '.' + emoas[i][2];
-      if (i < emoas.length-1) {
-	anchor.href += ', ';
-      }
-    }
-
-    if (linkText == '') {
-      for (var i = 0; i < emoas.length; i++) {
-	linkText += emoas[i][1] + '@' + emoas[i][0] + '.' + emoas[i][2] + ' ';
-      }
-    }
-    var anchorText = document.createTextNode(linkText);
-    anchor.appendChild(anchorText);
-  }
-}
-
diff --git a/templates/attach.nat.tmpl b/templates/attach.nat.tmpl
index a7085b7..c19f401 100755
--- a/templates/attach.nat.tmpl
+++ b/templates/attach.nat.tmpl
@@ -4,43 +4,41 @@
 %TMPL:INCLUDE{"attachsidebar"}%<!-- attachsidebar// -->
 %TMPL:INCLUDE{"attachjavascript"}%<!-- attachjavascript// -->
 %TMPL:INCLUDE{"attachstyles"}%<!-- attachstyles// -->
-%TMPL:DEF{"breadcrumbs"}%<!-- breadcrumbs -->
-  <div class="natBreadCrumbs">
-    %MAKETEXT{"You are here:"}%<span class='natSep'>&nbsp; </span>%IFDEFINED{"$percntTHISBREADCRUMBS$percnt" then="$test" else="$percntBREADCRUMBS{separator=\"<span class='natSep'>&nbsp;&#187; </span>\"}$percnt"}%
-  </div>
-<!-- //breadcrumbs -->%TMPL:END%
 %TMPL:DEF{"contentheader"}%%TMPL:P{"breadcrumbs"}%%TMPL:END%
-%TMPL:DEF{"title"}%%TOPICTITLE% (attach) - %WIKITOOLNAME%%TMPL:END%
-%TMPL:DEF{"contenttitle"}%<h1>Attachments at %TOPICTITLE%</h1>%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (attach) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"contenttitle"}%<h1>Attachments at <noautolink>%TMPL:P{"topictitle"}%</noautolink></h1>%TMPL:END%
 %TMPL:DEF{"bodyclass"}%natAttachBody%TMPL:END%
 %TMPL:DEF{"meta"}%<meta name="robots" content="noindex, nofollow" />%TMPL:END%
 %TMPL:DEF{"content"}%<!-- content -->
+%JQREQUIRE{"focus"}%<!-- jqrequire::focus -->
 %TMPL:P{"contenttitle"}%<!-- contenttitle// -->
-<div class="twikiFormSteps">
+<div class="foswikiFormSteps">
+%BUTTON{"%MAKETEXT{"Close"}%" 
+  title="%MAKETEXT{"Close this dialog"}%"
+  style="float:right;margin:0px;" 
+  target="%BASEWEB%.%BASETOPIC%" 
+  icon="cross"
+}%
 %TABPANE{select="%URLPARAM{"tab" default="1"}%"}%
 %TAB{"%MAKETEXT{"New"}%"}%
-<h2>%TMPL:P{"heading"}% </h2>
+<h2><noautolink>%TMPL:P{"heading"}%:</noautolink></h2>
   <form id="main" name="main" enctype="multipart/form-data" action="%SCRIPTURLPATH{"upload"}%/%WEB%/%TOPIC%" method="post" >
     <input type="hidden" name="filename" id="filename" value="%FILENAME%" />
-    <div class="twikiFormStep">
+    <div class="foswikiFormStep">
       <h3><label for="filepath">%MAKETEXT{"File"}%:</label></h3>
-      <input class="required" type="file" name="filepath" id="filepath" size="50"/>
-      %IFDEFINEDTHEN{"$percntURLPARAM{\"message\"}$percnt"}%
-        <span class="twikiAlert" id="message" style="padding:0px 10px">
-          %URLPARAM{"message"}%
-        </span>
-      %FIDEFINED%
+      <input class="jqFocus required" type="file" name="filepath" id="filepath" size="50"/>
+      %IF{"defined 'message'" then="<span class='foswikiAlert' id='message' style='padding:0px 10px'>%URLPARAM{"message"}%</span>"}%
     </div>
-    <div class="twikiFormStep">
+    <div class="foswikiFormStep">
       <h3><label for="filecomment">%MAKETEXT{"Comment"}%:</label></h3>
      <input type="text" name="filecomment" id="filecomment" value="%URLPARAM{"filecomment" default="%FILECOMMENT%"}%" size="50"/>
     </div>
-    <div class="twikiFormStep">
+    <div class="foswikiFormStep">
       <h3>%MAKETEXT{"Options"}%:</h3>
-      <table class="twikiFormOptions" cellspacing="0" cellpadding="0">
+      <table class="foswikiFormOptions" cellspacing="0" cellpadding="0">
         <tr>
           <td>
-            <input type="checkbox" class="twikiCheckbox" name="createlink" id="createlink" %ATTACHLINKBOX% /> 
+            <input type="checkbox" class="foswikiCheckbox" name="createlink" id="createlink" %ATTACHLINKBOX% /> 
           </td>
           <td>
             <label for="createlink">
@@ -51,7 +49,7 @@
         <tr>
         <tr>
           <td>
-            <input type="checkbox" class="twikiCheckbox" name="hidefile" id="hidefile" %HIDEFILE% /> 
+            <input type="checkbox" class="foswikiCheckbox" name="hidefile" id="hidefile" %HIDEFILE% /> 
           </td>
           <td>
             <label for="hidefile">
@@ -62,12 +60,13 @@
 %TMPL:P{"moreoptions"}%
       </table>
     </div>
-    <div class="twikiFormStep twikiFormLast twikiFormButtons">
+    <div class="foswikiFormStep foswikiFormLast foswikiFormButtons">
 %TMPL:P{"attachaction"}%
     </div>
   </form>
 %ENDTAB%
 %TMPL:P{"existingattachments"}%<!-- existingattachments// -->
 %ENDTABPANE%
+%CLEAR%
 </div>
 <!-- //content -->%TMPL:END%
diff --git a/templates/attachjavascript.nat.tmpl b/templates/attachjavascript.nat.tmpl
index f5e2d76..34c1d65 100644
--- a/templates/attachjavascript.nat.tmpl
+++ b/templates/attachjavascript.nat.tmpl
@@ -1,11 +1,13 @@
 <!-- template: attachjavascript.nat.tmpl -->
 %TMPL:DEF{"attachjavascript"}%<!-- attachjavascript -->
-<script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/NatSkin/attach.js"></script>
-%JQSCRIPT{"jquery.validate"}%
+<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/NatSkin/attach.js"></script>
+%JQREQUIRE{"validate"}%
 <script type="text/javascript">
-$(function() {
-  $("#main").validate();
+//<![CDATA[
+jQuery(function() {
+  jQuery("#main").validate();
 });
+//]]>
 </script>
 <!-- //attachjavascript -->%TMPL:END%
 %TMPL:DEF{"javascript"}%<!-- javascript -->
diff --git a/templates/attachnew.nat.tmpl b/templates/attachnew.nat.tmpl
index ee8bb81..8e3bae3 100755
--- a/templates/attachnew.nat.tmpl
+++ b/templates/attachnew.nat.tmpl
@@ -1,8 +1,7 @@
 %TMPL:INCLUDE{"attach"}%<!-- template: attachnew.nat.tmpl -->
-%TMPL:DEF{"heading"}%%MAKETEXT{"Upload a file to <nop>[_1]" args="'%TOPICTITLE%'"}%%TMPL:END%
+%TMPL:DEF{"heading"}%%MAKETEXT{"Upload a file to <nop>[_1]" args="%TMPL:P{"topictitle"}%"}%%TMPL:END%
 %TMPL:DEF{"attachaction"}%<!-- attachaction -->
-%BUTTON{"%MAKETEXT{"Submit"}%" icon="tick" title="Upload selected file" type="submit"}%
-%BUTTON{"%MAKETEXT{"Cancel"}%" icon="cross" title="Cancel and return to topic" target="%WEB%.%TOPIC%"}%
+%BUTTON{"%MAKETEXT{"Submit"}%" icon="tick" title="Upload selected file" type="save"}%
 %CLEAR%
 <!-- //attachaction -->%TMPL:END%
 %TMPL:DEF{"notes"}% <!-- notes -->
@@ -15,7 +14,7 @@
 %TMPL:DEF{"moreoptions"}%<!-- moreoptions -->
 <tr style="%IF{ "context BatchUploadPluginEnabled" else='display:none'}%">
   <td>
-    <input type="checkbox" class="twikiCheckbox" id="batchupload" name="batchupload" id="batchupload" />
+    <input type="checkbox" class="foswikiCheckbox" id="batchupload" name="batchupload" id="batchupload" />
   </td>
   <td>
     <label for="batchupload">
@@ -26,7 +25,7 @@
 </tr>
 <tr>
   <td>
-    <input type="checkbox" class="twikiCheckbox" name="redirectto" id="redirectto" value="%SCRIPTURL{"attach"}%/%WEB%/%TOPIC%?message=%ENCODE{"%MAKETEXT{"Upload successful"}%."}%" %IFDEFINED{"$percntURLPARAM{\"message\"}$percnt" then=" checked "}% />
+    <input type="checkbox" class="foswikiCheckbox" name="redirectto" id="redirectto" value="%SCRIPTURL{"attach"}%/%WEB%/%TOPIC%?message=%ENCODE{"%MAKETEXT{"Upload successful"}%."}%" %IF{"defined 'message'" then="checked"}% />
   </td>
   <td>
     <label for="redirectto">
@@ -36,10 +35,12 @@
 </tr>
 <!-- //moreoptions -->%TMPL:END%
 %TMPL:DEF{"existingattachments"}%<!-- existingattachments -->
-%TAB{"%MAKETEXT{"Existing files"}%"}%
-<h2>%MAKETEXT{"Attachments at [_1]" args="'%TOPICTITLE%'"}%</h2>
+%IFDEFINEDTHEN{"$percntMETA{\"attachments\" all=\"on\"}$percnt"}%
+%$nopTAB{"%MAKETEXT{"Existing files"}%"}%
+<h2><noautolink>%MAKETEXT{"Attachments at [_1]" args="%TMPL:P{"topictitle"}%"}%:</noautolink></h2>
 <div id="natTopicAttachments" class="natTopicAttachments">
-%META{"attachments" all="on"}%
+$test
 </div>
-%ENDTAB%
+%$nopENDTAB%
+%FIDEFINED%
 <!-- //existingattachments -->%TMPL:END%
diff --git a/templates/attachtables.nat.tmpl b/templates/attachtables.nat.tmpl
index 7644ef3..74a84a6 100755
--- a/templates/attachtables.nat.tmpl
+++ b/templates/attachtables.nat.tmpl
@@ -2,31 +2,24 @@
 
 <!-- attachments editor -->
 %TMPL:DEF{"ATTACH:editor"}%<!-- ATTACH:editor -->
-<div id="natAttachmentEditor" style="display:none">
+<div class="natAttachmentEditor" style="display:none">
 <form name="attach" action="%SCRIPTURLPATH{"upload"}%/%WEB%/%TOPIC%" method="post">
   <input type="hidden" name="filename" id="filename" value="%A_FILE%" />
   <input type="hidden" name="redirectto" value="%SCRIPTURL{"attach"}%/%WEB%/%TOPIC%?tab=2#%A_FILE%" />
   <input type="hidden" name="changeproperties" value="on" />
-  <div class="twikiFormStep">
+  <div class="foswikiFormStep">
     <h3>Comment:</h3>
-    <textarea name="filecomment" class="foswikiTextarea" cols="60" rows="3">
-      %IFDEFINED{"%ENCODE{"%A_COMMENT%" type="html"}%" as="&#38;nbsp;" then="" else="$test"}%
-    </textarea>
+    <textarea name="filecomment" class="foswikiTextarea" cols="60" rows="3">%IF{"'%ENCODE{"%A_COMMENT%" type="html"}%'='&#38;nbsp;'" then="" else="%ENCODE{"%A_COMMENT%" type="html"}%"}%</textarea>
   </div>
-  <div class="twikiFormStep twikiFormOptions">
+  <div class="foswikiFormStep foswikiFormOptions">
     <h3>Options:</h3>
     <label>
-      <input type="checkbox" class="twikiCheckbox" name="hidefile" id="hidefile" %IFDEFINED{"%A_ATTRS%" as="h" then=" checked "}% /> 
+      <input type="checkbox" class="foswikiCheckbox" name="hidefile" id="hidefile" %IF{"'%A_ATTRS%'='h'" then=" checked "}% /> 
       %MAKETEXT{"Hide attachment in normal topic view."}%
-    </label><br />
-    <label>
-      <input type="checkbox" class="twikiCheckbox" name="createlink" id="createlink" /> 
-      %MAKETEXT{"Create a link to the attached file at the end of the topic."}%
     </label>
   </div>
-  <div class="twikiFormButtons">
-    %BUTTON{"%MAKETEXT{"OK"}%" icon="tick" type="submit"}%
-    %BUTTON{"%MAKETEXT{"Cancel"}%" onclick="toggleAttachmentEditor(this, 'off')" icon="cross"}%
+  <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
+    %BUTTON{"%MAKETEXT{"OK"}%" icon="tick" type="save"}%
     %CLEAR%
   </div>
 </form>
@@ -35,25 +28,26 @@
 
 <!-- topic attachment table -->
 %TMPL:DEF{ATTACH:files:header}%<!-- attach:file:header -->
-<div class="twikiFormSteps natTopicAttachments" id="natTopicAttachments">
-%USERACTIONS{format="$attach"}%
+<div class="foswikiFormSteps natTopicAttachments" id="natTopicAttachments">
+<a class="natTopicAction natAttachTopicAction" title="%MAKETEXT{"Manage existing attachments"}%" href="%SCRIPTURLPATH{"attach"}%/%WEB%/%TOPIC%?tab=2" rel="nofollow">
+<span>Attach</span>
+</a>
 %TWISTY{
   mode="div" 
   start="show" 
   remember="off" 
-  buttonmode="div" 
   prefix="<h2>" 
   suffix="</h2>" 
   link="%MAKETEXT{"Attachments"}% " 
   showimg="%ICONURLPATH{toggleopenleft}%"
   hideimg="%ICONURLPATH{toggleclose}%"
 }%%TMPL:END%
-%TMPL:DEF{ATTACH:files:row}%<div class="twikiFormStep">
+%TMPL:DEF{ATTACH:files:row}%<div class="foswikiFormStep">
   <table cellspacing="0" cellpadding="0">
   <tr>
     <td class="natAttachmentIcon">%A_ICON%</td> 
     <td class="natAttachmentInfo">
-      <div class="natAttachmentName"><a href="%PUBURL%/%WEB%/%TOPIC%/%A_FILE%">%A_FILE%</a> (%A_SIZE%)</div>
+      <div class="natAttachmentName"><a href="%PUBURL%/%WEB%/%TOPIC%/%A_FILE%" class="{web:'%WEB%', topic:'%TOPIC%', image:'%A_FILE%'}">%A_FILE%</a> (%A_SIZE%)</div>
       %MAKETEXT{"version [_1] uploaded by [_2] on [_3]" args="%A_REV%,%A_USER%, %A_DATE%"}%
       <div class="natAttachmentComment"><noautolink>%A_COMMENT%</noautolink></div>
     </td>
@@ -65,29 +59,27 @@
 <!-- table at top of attach screen -->
 
 %TMPL:DEF{ATTACH:files:header:A}% %TMPL:END%
-%TMPL:DEF{ATTACH:files:row:A}%<div class="twikiFormStep"><a name="%A_FILE%"></a>
+%TMPL:DEF{ATTACH:files:row:A}%<div class="foswikiFormStep"><a name="%A_FILE%"></a>
   <table cellspacing="0" cellpadding="0">
   <tr>
     <td class="natAttachmentIcon">%A_ICON%</td> 
     <td class="natAttachmentInfo">
-      <div class="natAttachmentName"><a href="%PUBURL%/%WEB%/%TOPIC%/%A_FILE%">%A_FILE%</a> (%A_SIZE%) </div>
+      <div class="natAttachmentName"><a href="%PUBURL%/%WEB%/%TOPIC%/%A_FILE%" class="{web:'%WEB%', topic:'%TOPIC%', image:'%A_FILE%'}">%A_FILE%</a> (%A_SIZE%) </div>
       %MAKETEXT{"version [_1] uploaded by [_2] on [_3]" args="%A_REV%,%A_USER%, %A_DATE%"}%
-      %IFDEFINED{"%A_ATTRS%" as="h" then=", <span class='twikiAlert'>hidden</span>"}%
+      %IF{"'%A_ATTRS%'='h'" then=", <span class='foswikiAlert'>hidden</span>"}%
       <div class="natAttachmentComment"><noautolink>%A_COMMENT%</noautolink></div>
       %TMPL:P{"ATTACH:editor"}% 
     </td>
     <td class="natAttachmentActions">
-      <a href="#" title='%MAKETEXT{"edit properties of this attachment"}%' rel='nofollow' onclick="toggleAttachmentEditor(this); return false;"><img src="%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/pencil.png" border="0"/></a>
-      <a href="#" title='%MAKETEXT{"view revisions of this attachment"}%' rel='nofollow' onclick="toggleAttachmentHistory(this); return false;"><img src="%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/time.png" border="0"/></a>
-      <a href="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%?attachment=%A_FILE%" title='%MAKETEXT{"move this attachment to a different topic"}%' rel='nofollow'><img src="%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/page_white_go.png" border="0"/></a> 
-      <a href="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%?attachment=%A_FILE%;newweb=%TRASHWEB%;" title="%MAKETEXT{"delete this attachment"}%" rel='nofollow'><img src="%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/bin.png" border="0" /></a>
+      <a href="#" title='%MAKETEXT{"Edit properties of this attachment"}%' rel='nofollow' onclick="toggleAttachmentEditor(this); return false;"><img src="%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/pencil.png" border="0" width="16" height="16" /></a>
+      <!-- a href="#" title='%MAKETEXT{"View revisions of this attachment"}%' rel='nofollow' onclick="toggleAttachmentHistory(this); return false;"><img src="%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/time.png" border="0" width="16" height="16" /></a-->
+      <a href="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%?attachment=%A_FILE%" title='%MAKETEXT{"move this attachment to a different topic"}%' rel='nofollow'><img src="%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/page_white_go.png" border="0" width="16" height="16" /></a> 
+      <a href="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%?attachment=%A_FILE%;newweb=%TRASHWEB%;newtopic=TrashAttachment" title="%MAKETEXT{"delete this attachment"}%" rel='nofollow'><img src="%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/bin.png" border="0" width="16" height="16" /></a>
     </td>
   </tr>
   </table>
 </div>%TMPL:END%
-%TMPL:DEF{ATTACH:files:footer:A}%<div class="twikiFormStep twikiFormButtons twikiFormLast">
-%BUTTON{"%MAKETEXT{"Back"}%" style="float:right" class="natAltButton" title="Return to topic" target="%WEB%.%TOPIC%"}%
-</div>%TMPL:END%
+%TMPL:DEF{ATTACH:files:footer:A}%%TMPL:END%
 
 <!-- Header definition for top table in attach screen -->
 <!-- Header definition for topic attachments and top table in attach screen -->
diff --git a/templates/backlinksallwebs.nat.tmpl b/templates/backlinksallwebs.nat.tmpl
index df141a8..8c3df1c 100644
--- a/templates/backlinksallwebs.nat.tmpl
+++ b/templates/backlinksallwebs.nat.tmpl
@@ -1,11 +1,11 @@
 %TMPL:INCLUDE{"search"}%<!-- template: backlinksallwebs.nat.tmpl -->
-%TMPL:DEF{"title"}%%TOPICTITLE% - %MAKETEXT{"(backlinks)"}% - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% %MAKETEXT{"(backlinks)"}% - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"contenttitle"}%<h1>%MAKETEXT{"Backlinks to [_1] in all Webs" args="<nop>%TOPIC%"}%</h1>%TMPL:END%
 %TMPL:DEF{"content"}%<!-- content -->
 %TMPL:P{"beforetext"}%<!-- beforetext// -->
 %TMPL:P{"contenttitle"}%<!-- contenttitle// -->
-<div class="foswikiFormSteps twikiFormSteps">
-<div class="foswikiFormStep twikiFormStep foswikiFormLast twikiFormLast">
+<div class="foswikiFormSteps">
+<div class="foswikiFormStep foswikiFormLast">
 %BUTTON{"%MAKETEXT{"Done"}%" icon="tick" target="%WEB%.%TOPIC%" title="Return to <nop>%TOPIC%"}%
 %BUTTON{"%MAKETEXT{"Local Search"}%" icon="find" target="%SCRIPTURLPATH{"oops"}%/%WEB%/%TOPIC%?template=backlinksweb" title="%MAKETEXT{"Search for backlinks in the [_1] web only" args="<nop>%WEB%"}%"}%
 %CLEAR%
@@ -17,8 +17,3 @@
 %TMPL:DEF{"contentheader"}%<!-- contentheader -->
 %TMPL:P{"breadcrumbs"}%<!-- breadcrumbs //-->
 <!-- // contentheader -->%TMPL:END%
-%TMPL:DEF{"breadcrumbs"}%<!-- breadcrumbs -->
-<div class="natBreadCrumbs">
-  %MAKETEXT{"You are here:"}%<span class='natSep'>&nbsp; </span>%IFDEFINED{"$percntTHISBREADCRUMBS$percnt" then="$test" else="$percntBREADCRUMBS{separator=\"<span class='natSep'>&nbsp;&#187; </span>\"}$percnt"}%
-</div>
-<!-- //breadcrumbs -->%TMPL:END%
diff --git a/templates/backlinksweb.nat.tmpl b/templates/backlinksweb.nat.tmpl
index 484ffb2..638372e 100644
--- a/templates/backlinksweb.nat.tmpl
+++ b/templates/backlinksweb.nat.tmpl
@@ -1,11 +1,11 @@
 %TMPL:INCLUDE{"search"}%<!-- template:backlinksweb.nat.tmpl -->
-%TMPL:DEF{"title"}%%TOPICTITLE% - (%MAKETEXT{"backlinks"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"backlinks"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"contenttitle"}%<h1>%MAKETEXT{"Backlinks to [_1] in the [_2] Web" args="<nop>%TOPIC%, <nop>%WEB%"}%</h1>%TMPL:END%
 %TMPL:DEF{"content"}%<!-- content -->
 %TMPL:P{"beforetext"}%<!-- beforetext// -->
 %TMPL:P{"contenttitle"}%<!-- contenttitle// -->
-<div class="foswikiFormSteps twikiFormSteps">
-<div class="foswikiFormStep twikiFormStep foswikiFormLast twikiFormLast">
+<div class="foswikiFormSteps">
+<div class="foswikiFormStep foswikiFormLast">
 %BUTTON{"%MAKETEXT{"Done"}%" icon="tick" target="%WEB%.%TOPIC%" title="Return to <nop>%TOPIC%"}%
 %BUTTON{"%MAKETEXT{"Global Search"}%" icon="find" target="%SCRIPTURLPATH{"oops"}%/%WEB%/%TOPIC%?template=backlinksallwebs" title="%MAKETEXT{"Search for backlinks in all webs"}%"}%
 %CLEAR%
@@ -17,8 +17,3 @@
 %TMPL:DEF{"contentheader"}%<!-- contentheader -->
 %TMPL:P{"breadcrumbs"}%<!-- breadcrumbs //-->
 <!-- // contentheader -->%TMPL:END%
-%TMPL:DEF{"breadcrumbs"}%<!-- breadcrumbs -->
-<div class="natBreadCrumbs">
-  %MAKETEXT{"You are here:"}%<span class='natSep'>&nbsp; </span>%IFDEFINED{"$percntTHISBREADCRUMBS$percnt" then="$test" else="$percntBREADCRUMBS{separator=\"<span class='natSep'>&nbsp;&#187; </span>\"}$percnt"}%
-</div>
-<!-- //breadcrumbs -->%TMPL:END%
diff --git a/templates/body.nat.tmpl b/templates/body.nat.tmpl
index d952841..79b1914 100755
--- a/templates/body.nat.tmpl
+++ b/templates/body.nat.tmpl
@@ -1,18 +1,32 @@
 <!-- template: body.nat.tmpl -->
 %TMPL:DEF{"defaultbodyclass"}%natBody%TMPL:END%
+
+%{ container definitions --------------------------------------------------- }%
 %TMPL:DEF{"contentheader_container"}%<div class="natMainHeaderContents">%TMPL:P{"contentheader"}%</div>%TMPL:END%
-%TMPL:DEF{"content_container"}%<div class="natMainContents" id="natMainContents">%TMPL:P{"content"}%</div>%TMPL:END%
+%TMPL:DEF{"content_container"}%<div class="natMainContents" id="natMainContents">%TMPL:P{"content"}%%TMPL:P{"spacer"}%<a name="ContentBottom"></a></div>%TMPL:END%
 %TMPL:DEF{"contentfooter_container"}%<div class="natMainFooterContents">%TMPL:P{"contentfooter"}%</div>%TMPL:END%
-%TMPL:DEF{"sidebar_container"}%<!-- sidebar container -->
-<div class="natSideBarContents">
+%TMPL:DEF{"sidebar_container"}%<div class="natSideBarContents">
 %TMPL:P{"sidebar"}%
-</div>
-<!-- //sidebar container -->%TMPL:END%
+%TMPL:P{"spacer"}%
+</div>%TMPL:END%
+%TMPL:DEF{"rightsidebar_container"}%<div class="natSideBarContents">
+%TMPL:P{"rightsidebar"}%
+%TMPL:P{"spacer"}%
+</div>%TMPL:END%
+
+%TMPL:DEF{"webbuttons"}%<div class="natWebButtonsContents"> 
+%WEBCOMPONENT{"Buttons"}% <!-- webbuttons -->
+</div>%TMPL:END%
+
+%{ sidebar definitions when the web buttons are on ------------------------- }%
 %TMPL:DEF{"buttons_on"}%<!-- buttons_on -->
 %TMPL:P{context="natskin_sidebar_left" then="buttons_on_sidebar_left"}%<!-- natskin_sidebar_left// -->
 %TMPL:P{context="natskin_sidebar_right" then="buttons_on_sidebar_right"}%<!-- natskin_sidebar_right// -->
+%TMPL:P{context="natskin_sidebar_both" then="buttons_on_sidebar_both"}%<!-- natskin_sidebar_both// -->
 %TMPL:P{context="natskin_sidebar_off" then="buttons_on_sidebar_off"}%<!-- natskin_sidebar_off// -->
 <!-- //buttons_on -->%TMPL:END%
+
+%{ button/sidebar dependeing layouts --------------------------------------- }%
 %TMPL:DEF{"buttons_on_sidebar_left"}%<!-- buttons_on_sidebar_left -->
 <tr>
   <td class="natSideBarHeader natSideBarHeaderLeft">
@@ -20,15 +34,17 @@
 %TMPL:P{"sidebarheader"}%<!-- sidebarheader// -->
     </div>
   </td>
-  <td class="natWebButtons natWebButtonsLeft" id="natWebButtons" style="%IFSKINSTATE{action="login|logon" then="display:none"}%">
-    <div class="natWebButtonsContents"> %WEBCOMPONENT{"WebButtons"}% </div>
+  <td class="natWebButtons natWebButtonsRight" id="natWebButtons">
+%TMPL:P{"webbuttons"}%<!-- webbuttons// -->
+    </div>
   </td>
 </tr>
 <!-- //buttons_on_sidebar_left -->%TMPL:END%
+
 %TMPL:DEF{"buttons_on_sidebar_right"}%<!-- buttons_on_sidebar_right -->
 <tr>
-  <td class="natWebButtons natWebButtonsLeft" id="natWebButtons" style="%IFSKINSTATE{action="login|logon" then="display:none"}%">
-    <div class="natWebButtonsContents"> %WEBCOMPONENT{"WebButtons"}% </div>
+  <td class="natWebButtons natWebButtonsLeft" id="natWebButtons">
+%TMPL:P{"webbuttons"}%<!-- webbuttons// -->
   </td>
   <td class="natSideBarHeader natSideBarHeaderRight">
     <div class="natSideBarHeaderContents">
@@ -37,16 +53,30 @@
   </td>
 </tr>
 <!-- //buttons_on_sidebar_left -->%TMPL:END%
+
+%TMPL:DEF{"buttons_on_sidebar_both"}%<!-- buttons_on_sidebar_both -->
+<tr>
+  <td class="natSideBarHeader natSideBarHeaderLeft">
+    <div class="natSideBarHeaderContents">
+%TMPL:P{"sidebarheader"}%<!-- sidebarheader// -->
+    </div>
+  </td>
+  <td class="natWebButtons natWebButtonsRight" id="natWebButtons">
+%TMPL:P{"webbuttons"}%<!-- webbuttons// -->
+  </td>
+</tr>
+<!-- //buttons_on_sidebar_both -->%TMPL:END%
+
 %TMPL:DEF{"buttons_on_sidebar_off"}%<!-- buttons_on_sidebar_off -->
 <tr>
-  <td colspan="2" class="natWebButtons natWebButtonsLeft" id="natWebButtons" style="%IFSKINSTATE{action="login|logon" then="display:none"}%">
-    <div class="natWebButtonsContents"> %WEBCOMPONENT{"WebButtons"}% </div>
+  <td colspan="2" class="natWebButtons natWebButtonsLeft" id="natWebButtons">
+%TMPL:P{"webbuttons"}%<!-- webbuttons// -->
   </td>
 </tr>
 <!-- //buttons_on_sidebar_off -->%TMPL:END%
-%TMPL:DEF{"rightsidebar_container"}%<div class="natSideBarContents">
-%TMPL:P{"rightsidebar"}%
-</div>%TMPL:END%
+
+%{ page layouts depeding on sidebar ---------------------------------------- }%
+%{ left }%
 %TMPL:DEF{"layout_sidebar_left"}%<!-- layout sidebar left -->
       <table class="natLayoutTable natHeaderArt" id="natHeaderArt" cellpadding="0" cellspacing="0" border="0" width="100%">
 %TMPL:P{"topbar"}%<!-- topbar// -->
@@ -65,6 +95,8 @@
 	</tr>
       </table> 
 <!-- //layout sidebar left -->%TMPL:END%
+
+%{ right }%
 %TMPL:DEF{"layout_sidebar_right"}%<!-- sidebar right -->
       <table class="natLayoutTable natHeaderArt" id="natHeaderArt" cellpadding="0" cellspacing="0" border="0" width="100%">
 %TMPL:P{"topbar"}%<!-- topbar// -->
@@ -81,9 +113,14 @@
 	</tr>
       </table> 
 <!-- //sidebar right -->%TMPL:END%
+
+%{ both }%
 %TMPL:DEF{"layout_sidebar_both"}%<!-- sidebar both -->
       <table class="natLayoutTable natHeaderArt" id="natHeaderArt" cellpadding="0" cellspacing="0" border="0" width="100%">
 %TMPL:P{"topbar"}%<!-- topbar// -->
+      </table>
+      <table class="natLayoutTable"  cellpadding="0" cellspacing="0" border="0" width="100%">
+%TMPL:P{context="natskin_buttons_on" then="buttons_on"}%<!-- buttons_on// -->
       </table>
       <table class="natLayoutTable" cellpadding="0" cellspacing="0" border="0" width="100%">
 	<tr>
@@ -101,6 +138,8 @@
 	</tr>
       </table> 
 <!-- //sidebar both -->%TMPL:END%
+
+%{ no sidebar }%
 %TMPL:DEF{"layout_sidebar_off"}%<!-- sidebar off -->
       <table class="natLayoutTable natHeaderArt" id="natHeaderArt" cellpadding="0" cellspacing="0" border="0" width="100%">
 %TMPL:P{"topbar"}%<!-- topbar// -->
@@ -116,29 +155,31 @@
 	</tr>
       </table> 
 <!-- //sidebar off-->%TMPL:END%
+
+%{ page bottom definitions -------------------------------------------------- }%
 %TMPL:DEF{"bottombar"}%<!-- bottombar -->
 <noautolink>
 <div class="natCopyRight">%WEBCOPYRIGHT%</div>
 <div class="natSyndicate">
-  %IFDEFINEDTHEN{"$percntWEBSYNDICATION$percnt"}%
-    %$nopWEBSYNDICATION%
-  %ELSEDEFINED%
-    %MAKETEXT{"Syndicate this site"}% 
-    <a class="natFeedIcon" href="%SCRIPTURL{"view"}%/%WEB%/WebRss">RSS</a><a class="natFeedIcon" href="%SCRIPTURL{"view"}%/%WEB%/WebAtom">ATOM</a>
-  %FIDEFINED%
+%IF{"defined 'WEBSYNDICATION'"
+  then="$percntWEBSYNDICATION$percnt"
+  else="%MAKETEXT{"Syndicate this site"}% <a class='natFeedIcon' href='%SCRIPTURL{"view"}%/%WEB%/WebRss'>RSS</a><a class='natFeedIcon' href='%SCRIPTURL{"view"}%/%WEB%/WebAtom'>ATOM</a>"
+}%
 </div>
 </noautolink>
 <!-- //bottombar -->%TMPL:END%
+
+%{ assembly stage ---------------------------------------------------------- }%
 %TMPL:DEF{"defaultbody"}%<!-- defaulbody -->
 %TMPL:P{"broadcast"}%<!-- broadcast// -->
-<a name="PageTop"></a>
 <div class="natBodyContents">
-%TMPL:P{"topicactions_top"}%<!-- topicactions_top// -->
+<a name="PageTop"></a>
+%TMPL:P{"useractions"}%<!-- useractions// -->
 %TMPL:P{context="natskin_sidebar_left" then="layout_sidebar_left"}%<!-- layout_sidebar_left// -->
 %TMPL:P{context="natskin_sidebar_right" then="layout_sidebar_right"}%<!-- layout_sidebar_right// -->
 %TMPL:P{context="natskin_sidebar_both" then="layout_sidebar_both"}%<!-- layout_sidebar_both// -->
 %TMPL:P{context="natskin_sidebar_off" then="layout_sidebar_off"}%<!-- layout_sidebar_off// -->
-  <div class="natBottomBar %IFSKINSTATE{sidebar="right|off" then="natBottomBarLeft"}% %IFSKINSTATE{sidebar="left|off" then="natBottomBarRight"}% %IFSKINSTATE{sidebar="off" then="natBottomBarBoth"}%">
+  <div class="natBottomBar %IF{"context 'natskin_sidebar_right' or 'context natskin_sidebar_off'" then="natBottomBarLeft"}% %IF{"context 'natskin_sidebar_left' or context 'natskin_sidebar_off'" then="natBottomBarRight"}% %IF{"context 'natskin_sidebar_off'" then="natBottomBarBoth"}%">
     <div class="natBottomBarContents">
 %TMPL:P{"bottombar"}%<!-- bottombar// -->
     </div>
@@ -147,7 +188,7 @@
   <div id="natExtraDiv2"></div>
   <div id="natExtraDiv3"></div>
   <div id="natExtraDiv4"></div>
-</div>
 <a name="PageBottom"></a>
+</div>
 <!-- //defaultbody -->%TMPL:END%
-%TMPL:DEF{"body"}%%TMPL:P{"defaultbody"}%%TMPL:END%
+%TMPL:DEF{"body"}%<body class="%IF{"context authenticated" then="natBodyAuthenticated" else="natBodyNotAuthenticated"}% %TMPL:P{"defaultbodyclass"}% %TMPL:P{"bodyclass"}% %IF{"context 'natskin_sidebar_left'" then="natBodyLeft"}% %IF{"context 'natskin_sidebar_right'" then="natBodyRight"}% %IF{"context 'natskin_sidebar_both'" then="natBodyBoth"}% %IF{"context 'natskin_sidebar_off'" then="natBodyOff"}% %IF{"context 'natskin_border_thin'" then="natBodyThin"}% %IF{"context 'natskin_border_on'" then="natBodyBorder"}%">%TMPL:P{"defaultbody"}%</body>%TMPL:END%
diff --git a/templates/changeform.nat.tmpl b/templates/changeform.nat.tmpl
index a924ec3..d8a5a20 100755
--- a/templates/changeform.nat.tmpl
+++ b/templates/changeform.nat.tmpl
@@ -6,52 +6,32 @@
 %TMPL:INCLUDE{"changeformstyles"}%<!-- changeformstyles// -->
 %TMPL:DEF{"bodyclass"}%natChangeFormBody%TMPL:END%
 %TMPL:DEF{"meta"}% <meta name="robots" content="noindex, nofollow" /> %TMPL:END%
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"edit"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"edit"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"contenttitle"}%<h1>%MAKETEXT{"Choose a new form for [_1]" args="[[%TOPIC%]]"}%</h1>%TMPL:END%
 %TMPL:DEF{"content"}%<!-- content -->
 %TMPL:P{"contenttitle"}%<!-- contenttitle// -->
-<div class="twikiPageForm">
+<noautolink>
 <form name="EditForm" method="post" action="%SCRIPTURLPATH{"edit"}%/%WEB%/%TOPIC%?t=%GMTIME{"$year$mo$day$hours$minutes$seconds"}%">
-  <input type="hidden" name="topicparent" value="%TOPICPARENT%" />
-  <input type="hidden" name="redirectto" value="%REDIRECTTO%" />
+<input type="hidden" name="topicparent" value="%TOPICPARENT%" />
+<input type="hidden" name="redirectto" value="%REDIRECTTO%" />
 %TEXT%
-  <input type="hidden" name="skin" value="%URLPARAM{"skin"}%" />
-  <input type="hidden" name="cover" value="%URLPARAM{"cover"}%" />
-<noautolink>
+<input type="hidden" name="skin" value="%URLPARAM{"skin"}%" />
+<input type="hidden" name="cover" value="%URLPARAM{"cover"}%" />
+<div class="foswikiFormSteps">
+<div class="foswikiFormStep">
 <table cellspacing="5" class="natChangeForm">
-%~~ NATFORMLIST{
-~~~   separator=" "
-~~~   format="
-~~~     <tr>
-~~~     <td>
-~~~       <input type=\"radio\" 
-~~~              name=\"formtemplate\" 
-~~~              id=\"formtemplateelem$index\"
-~~~              $checked
-~~~              value=\"$name\" />
-~~~     </td>
-~~~     <td style=\"padding-right:10px\">
-~~~       <label for=\"formtemplateelem$index\">
-~~~         <nop>$formTopic
-~~~       </label></td>
-~~~     <td>
-~~~     $percntIFDEFINEDTHEN{\"$name\" as=\"none\"}$percnt
-~~~       remove the current form (caution: possible data loss)
-~~~     $percntELSEDEFINED$percnt
-~~~       $percntFORMFIELD{\"Summary\" topic=\"$formWeb.$formTopic\"}$percnt
-~~~       (<a href=\"%SCRIPTURLPATH{"view"}%/$formWeb/$formTopic\" target=\"_blank\">?</a>)
-~~~     $percntFIDEFINED$percnt
-~~~     </td></tr>"
-~~~ }%
-<tr><td>&nbsp;</td>
-<td colspan="2">
-<p>
-  %BUTTON{"%MAKETEXT{"OK"}%" accesskey="o" type="submit" icon="tick"}%
+%NATFORMLIST{
+  separator=" "
+  format="<tr><td><input type='radio' name='formtemplate' id='formtemplateelem$index' $checked value='$name' /></td><td style='padding-right:10px'><label for='formtemplateelem$index'><nop>$formTopic</label></td><td>$percntIF{\"'$name'='none'\" then=\"remove the current form (caution: possible data loss)\" else=\"$percntFORMFIELD{\"Summary\" topic=\"$formWeb.$formTopic\"}$percnt (<a href='%SCRIPTURLPATH{"view"}%/$formWeb/$formTopic' target='_blank'>?</a>)\"}$percnt</td></tr>"
+}%
+</table>
+</div>
+<div class="foswikiFormStep foswikiFormLast foswikiFormButtons">
+  %BUTTON{"%MAKETEXT{"OK"}%" accesskey="o" type="save" icon="tick"}%
   %BUTTON{"%MAKETEXT{"Cancel"}%" accesskey="c" onclick="history.back()" icon="cross"}%
   %CLEAR%
-</td></tr>
-</table>
-</form>
 </div>
+</div>
+</form>
 </noautolink>
 <!-- //content -->%TMPL:END%
diff --git a/templates/changeformsidebar.nat.tmpl b/templates/changeformsidebar.nat.tmpl
index 6ad14af..9ef5186 100755
--- a/templates/changeformsidebar.nat.tmpl
+++ b/templates/changeformsidebar.nat.tmpl
@@ -8,7 +8,7 @@
 <nop><h2><a name="Notes">%MAKETEXT{"Notes"}%</a></h2>
 <div class="natNotes">
 <p>%MAKETEXT{"Any change you made to topic before coming to this page are preserved."}%</p>
-<p><span class="twikiAlert">%MAKETEXT{"Existing form data will be lost! (still available in old version)"}%</span></p>
+<p><span class="foswikiAlert">%MAKETEXT{"Existing form data will be lost! (still available in old version)"}%</span></p>
 <p>%MAKETEXT{"All possible forms are defined in the WEBFORM variable in the WebPreferences."}%</p>
 </div>
 <!-- //sidebar -->%TMPL:END%
diff --git a/templates/changes.nat.tmpl b/templates/changes.nat.tmpl
index 4e3593f..d30af2c 100755
--- a/templates/changes.nat.tmpl
+++ b/templates/changes.nat.tmpl
@@ -5,7 +5,7 @@
 %TMPL:INCLUDE{"changesjavascript"}%<!-- changesjavascript// -->
 %TMPL:INCLUDE{"changesstyles"}%<!-- changesstyles -->
 %TMPL:DEF{"bodyclass"}%natChangesBody%TMPL:END%
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"changes"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"changes"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"meta"}% %HTTP_EQUIV_ON_VIEW% %TMPL:END%
 %TMPL:DEF{"content"}%<!-- content -->
 <table class="natSearchTable" cellpadding="0" cellspacing="0" width=100%>
diff --git a/templates/compare.nat.tmpl b/templates/compare.nat.tmpl
new file mode 100644
index 0000000..d24c544
--- /dev/null
+++ b/templates/compare.nat.tmpl
@@ -0,0 +1,11 @@
+%TMPL:INCLUDE{"view"}%<!-- template: compare.nat.tmpl -->
+%TMPL:DEF{"bodyclass"}%natCompareBody%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% %MAKETEXT{"([_1] vs. [_2])" args="%REVTITLE1%, %REVTITLE2%"}% - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"meta"}% <meta name="robots" content="noindex, nofollow" /> %TMPL:END%
+%TMPL:DEF{"content"}%<!-- content -->
+%TMPL:P{"beforetext"}%<!-- beforetext// -->
+%TMPL:P{"rendercontent"}%<!-- rendercontent// -->
+%TMPL:P{"rawbutton"}%<!-- rawbutton // -->
+%TMPL:P{"aftertext"}%<!-- aftertext// -->
+%TMPL:P{"form"}%<!-- form // -->
+<!-- //content -->%TMPL:END%
diff --git a/templates/edit.nat.tmpl b/templates/edit.nat.tmpl
index 6cfc838..11273ff 100755
--- a/templates/edit.nat.tmpl
+++ b/templates/edit.nat.tmpl
@@ -5,8 +5,307 @@
 %TMPL:INCLUDE{"editstyles"}%<!-- editstyles// -->
 %TMPL:INCLUDE{"edithelp"}%<!-- edithelp// -->
 %TMPL:INCLUDE{"edittoolbar"}%<!-- edittoolbar// -->
+%TMPL:DEF{"useractions"}%%TMPL:END%
+%TMPL:DEF{"topbar"}%%TMPL:END%
+%TMPL:DEF{"webbuttons"}%%TMPL:END%
 %TMPL:DEF{"bodyclass"}%natEditBody%TMPL:END%
 %TMPL:DEF{"meta"}% %HTTP_EQUIV_ON_EDIT% %TMPL:END%
 %TMPL:DEF{"title"}%%TOPIC% - %WEBLINK{format="$web"}% - (%IF{"defined 'rev'" then="%MAKETEXT{"restore"}%" else="%MAKETEXT{"edit"}%"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"contentheader"}%%TMPL:END%
-<!-- //pagetitle -->%TMPL:END%
+%TMPL:DEF{"moresettings"}%<!-- moresettings -->
+<div class="foswikiFormSteps">
+  <h2>Show on screen</h2>
+  <div class="foswikiFormStep foswikiFormLast">
+    <input type='hidden' name='Default+DISPLAYFORM' value="%GETVAR{"DISPLAYFORM" scope="web" default="on"}%" />
+    <input type='hidden' name='Default+DISPLAYATTACHMENTS' value="%GETVAR{"DISPLAYATTACHMENTS" scope="web" default="on"}%" />
+    <input type='hidden' name='Default+DISPLAYCOMMENTS' value="%GETVAR{"DISPLAYCOMMENTS" scope="web" default="on"}%" />
+    <input type='hidden' name='Default+DISPLAYTOPICACTIONS' value="%GETVAR{"DISPLAYTOPICACTIONS" scope="web" default="on"}%" />
+    <input type='hidden' name='Default+DISPLAYREVISIONINFO' value="%GETVAR{"DISPLAYREVISIONINFO" scope="web" default="on"}%" />
+    <input type='hidden' name='Default+DISPLAYBREADCRUMBS' value="%GETVAR{"DISPLAYBREADCRUMBS" scope="web" default="on"}%" />
+    <table>
+      <tr>
+        <th>%MAKETEXT{"Data form"}%</th>
+        <td><input type='radio' class='foswikiRadio' id="displayform_on" name='Local+DISPLAYFORM' value="on" %IF{"$'DISPLAYFORM'='on' OR isempty 'DISPLAYFORM'" then="checked='checked'"}% /></td>
+        <td><label for="displayform_on">%MAKETEXT{"on"}%</label></td>
+        <td><input type='radio' class='foswikiRadio' id="displayform_off" name='Local+DISPLAYFORM' value="off" %IF{"$'DISPLAYFORM'='off'" then="checked='checked'"}% /></td>
+        <td><label for="displayform_off">%MAKETEXT{"off"}%</label></td>
+      </tr>
+      <tr>
+        <th>%MAKETEXT{"Attachments"}%</th>
+        <td><input type="radio" class="foswikiRadio" id="displayattachments_on" name="Local+DISPLAYATTACHMENTS" value="on" %IF{"$'DISPLAYATTACHMENTS'='on' OR isempty 'DISPLAYATTACHMENTS'" then="checked='checked'"}% /></td>
+        <td><label for="displayattachments_on">%MAKETEXT{"on"}%</label></td>
+        <td><input type='radio' class="foswikiRadio" id="displayattachments_off" name='Local+DISPLAYATTACHMENTS' value="off" %IF{"$'DISPLAYATTACHMENTS'='off'" then="checked='checked'"}% /></td>
+        <td><label for="displayattachments_off">%MAKETEXT{"off"}%</label></td>
+      </tr>
+      <tr>
+        <th>%MAKETEXT{"Comments"}%</th>
+        <td><input type="radio" class="foswikiRadio" id="displaycomments_on" name="Local+DISPLAYCOMMENTS" value="on" %IF{"$'DISPLAYCOMMENTS'='on' OR isempty 'DISPLAYCOMMENTS'" then="checked='checked'"}% /></td>
+        <td><label for="displaycomments_on">%MAKETEXT{"on"}%</label></td>
+        <td><input type='radio' class="foswikiRadio" id="displaycomments_off" name='Local+DISPLAYCOMMENTS' value="off" %IF{"$'DISPLAYCOMMENTS'='off'" then="checked='checked'"}% /></td>
+        <td><label for="displaycomments_off">%MAKETEXT{"off"}%</label></td>
+      </tr>
+      <tr>
+        <th>%MAKETEXT{"Topic actions"}%</th>
+        <td><input type="radio" class="foswikiRadio" id="displaytopicactions_on" name="Local+DISPLAYTOPICACTIONS" value="on" %IF{"$'DISPLAYTOPICACTIONS'='on' OR isempty 'DISPLAYTOPICACTIONS'" then="checked='checked'"}% /></td>
+        <td><label for="displaytopicactions_on">%MAKETEXT{"on"}%</label></td>
+        <td><input type='radio' class="foswikiRadio" id="displaytopicactions_off" name='Local+DISPLAYTOPICACTIONS' value="off" %IF{"$'DISPLAYTOPICACTIONS'='off'" then="checked='checked'"}% /></td>
+        <td><label for="displaytopicactions_off">%MAKETEXT{"off"}%</label></td>
+      </tr>
+      <tr>
+        <th>%MAKETEXT{"Revision information"}%</th>
+        <td><input type="radio" class="foswikiRadio" id="displayrevisioninfo_on" name="Local+DISPLAYREVISIONINFO" value="on" %IF{"$'DISPLAYREVISIONINFO'='on' OR isempty 'DISPLAYREVISIONINFO'" then="checked='checked'"}% /></td>
+        <td><label for="displayrevisioninfo_on">%MAKETEXT{"on"}%</label></td>
+        <td><input type='radio' class="foswikiRadio" id="displayrevisioninfo_off" name='Local+DISPLAYREVISIONINFO' value="off" %IF{"$'DISPLAYREVISIONINFO'='off'" then="checked='checked'"}% /></td>
+        <td><label for="displayrevisioninfo_off">%MAKETEXT{"off"}%</label></td>
+      </tr>
+      <tr>
+        <th>%MAKETEXT{"Breadcrumbs navigation"}%</th>
+        <td><input type="radio" class="foswikiRadio" id="displaybreadcrumbs_on" name="Local+DISPLAYBREADCRUMBS" value="on" %IF{"$'DISPLAYBREADCRUMBS'='on' OR isempty 'DISPLAYBREADCRUMBS'" then="checked='checked'"}% /></td>
+        <td><label for="displaybreadcrumbs_on">%MAKETEXT{"on"}%</label></td>
+        <td><input type='radio' class="foswikiRadio" id="displaybreadcrumbs_off" name='Local+DISPLAYBREADCRUMBS' value="off" %IF{"$'DISPLAYBREADCRUMBS'='off'" then="checked='checked'"}% /></td>
+        <td><label for="displaybreadcrumbs_off">%MAKETEXT{"off"}%</label></td>
+      </tr>
+    </table>
+  </div>
+</div>
+<!-- //moresettings -->%TMPL:END%
+
+%TMPL:DEF{"moretabs"}%<!-- moretabs -->
+%TAB{"Permissions"}%
+<noautolink>
+<div class="foswikiFormSteps" id="permissionsForm">
+  <input type="hidden" class="permset_change" id="allow_change" name="Set+ALLOWTOPICCHANGE" value="%GETVAR{"ALLOWTOPICCHANGE" default="undefined"}%" />
+  <input type="hidden" class="permset_change" id="deny_change" name="Set+DENYTOPICCHANGE" value="%GETVAR{"DENYTOPICCHANGE" default="undefined"}%" />
+  <input type="hidden" class="permset_view" id="allow_view" name="Set+ALLOWTOPICVIEW" value="%GETVAR{"ALLOWTOPICVIEW" default="undefined"}%" />
+  <input type="hidden" class="permset_view" id="deny_view" name="Set+DENYTOPICVIEW" value="%GETVAR{"DENYTOPICVIEW" default="undefined"}%" />
+  <input type="hidden" name="Default+ALLOWTOPICCHANGE" value="undefined" />
+  <input type="hidden" name="Default+ALLOWTOPICVIEW" value="undefined" />
+  <input type="hidden" name="Default+DENYTOPICCHANGE" value="undefined" />
+  <input type="hidden" name="Default+DENYTOPICVIEW" value="undefined" />
+  <h2>%MAKETEXT{"Permissions"}%</h2>
+  <div class="foswikiFormStep">
+    <h3>%MAKETEXT{"Users who may view"}%:</h3>
+      <input type="hidden" name="Default+PERMSET_VIEW" value="default" />
+      <input type="radio" class="foswikiRadio" id="default_view" name="Local+PERMSET_VIEW" value="default" %IF{"$'PERMSET_VIEW'='default' OR isempty 'PERMSET_VIEW'" then="checked='checked'"}% /> 
+      <label for="default_view" title='%MAKETEXT{"default as defined in the [_1]" args="<nop>%WEBPREFSTOPIC%"}%'>%MAKETEXT{"Default"}%</label>
+
+      <input type="radio" class="foswikiRadio" id="everybody_view" name="Local+PERMSET_VIEW" value="everybody" %IF{"$'PERMSET_VIEW'='everybody'" then="checked='checked'"}% /> 
+      <label for="everybody_view" title="%MAKETEXT{"public view access"}%">%MAKETEXT{"Everybody"}%</label>
+
+      <input type="radio" class="foswikiRadio" id="registered_users_view" name="Local+PERMSET_VIEW" value="registeredusers" %IF{"$'PERMSET_VIEW'='registeredusers'" then="checked='checked'"}% /> 
+      <label for="registered_users_view" title='%MAKETEXT{"restrict read access to users that have an account on this site"}%'>%MAKETEXT{"Registered users"}%</label>
+
+      <input type="radio" class="foswikiRadio" id="just_author_view" name="Local+PERMSET_VIEW" value="justauthor" %IF{"$'PERMSET_VIEW'='justauthor'" then="checked='checked'"}% />
+      <label for="just_author_view" title='%MAKETEXT{"restrict access to [_1]" args="%SPACEOUT{"%WIKINAME%"}%"}%'>%MAKETEXT{"Just me"}%</label>
+
+      <input type="radio" class="foswikiRadio" id="nobody_view" name="Local+PERMSET_VIEW" value="nobody" %IF{"$'PERMSET_VIEW'='nobody'" then="checked='checked'"}% /> 
+      <label for="nobody_view" title='%MAKETEXT{"strictly deny any access to this topic"}%'>%MAKETEXT{"Nobody"}%</label>
+
+      <table class="foswikiLayoutTable">
+        <tr>
+          <td>
+            <input type="radio" class="foswikiRadio" id="details_view_toggle" name="Local+PERMSET_VIEW" value="details" %IF{"$'PERMSET_VIEW'='details'" then="checked='checked'"}% />
+          </td>
+          <td>
+            <label for="details_view_toggle" title='%MAKETEXT{"specify a list of users and/or groups"}%'>&nbsp;%MAKETEXT{"Specific users/groups"}%</label>
+          </td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>
+            <div id="details_view_container" %IF{"$'PERMSET_VIEW'!='details'" then="style='display:none'"}%>
+              <input type="text" size="40" id="details_view" name="Local+PERMSET_VIEW_DETAILS" value="%GETVAR{"PERMSET_VIEW_DETAILS"}%" />
+              <input type="hidden" name="Default+PERMSET_VIEW_DETAILS" value="" />
+            </div>
+          </td>
+        </tr>
+      </table>
+  </div>
+  <div class="foswikiFormStep foswikiFormLast">
+    <h3>%MAKETEXT{"Users who may edit"}%:</h3>
+      <input type="hidden" name="Default+PERMSET_CHANGE" value="default" />
+      <input type="radio" class="foswikiRadio" id="default_change" name="Local+PERMSET_CHANGE" value="default" %IF{"$'PERMSET_CHANGE'='default' OR isempty 'PERMSET_CHANGE'" then="checked='checked'"}% /> 
+      <label for="default_change" title='%MAKETEXT{"default as defined in the [_1]" args="<nop>%WEBPREFSTOPIC%"}%'>%MAKETEXT{"Default"}%</label>
+
+      <input type="radio" class="foswikiRadio" id="registered_users_change" name="Local+PERMSET_CHANGE"  value="registeredusers" %IF{"$'PERMSET_CHANGE'='registeredusers'" then="checked='checked'"}% /> 
+      <label for="registered_users_change" title='%MAKETEXT{"restrict write access to users that have an account on this site"}%'>%MAKETEXT{"Registered users"}%</label>
+
+      <input type="radio" class="foswikiRadio" id="just_author_change" name="Local+PERMSET_CHANGE" value="justauthor" %IF{"$'PERMSET_CHANGE'='justauthor'" then="checked='checked'"}% />
+      <label for="just_author_change" title='%MAKETEXT{"restrict access to [_1]" args="%SPACEOUT{"%WIKINAME%"}%"}%'>%MAKETEXT{"Just me"}%</label>
+
+      <input type="radio" class="foswikiRadio" id="nobody_change" name="Local+PERMSET_CHANGE" value="nobody" %IF{"$'PERMSET_CHANGE'='nobody'" then="checked='checked'"}% /> 
+      <label for="nobody_change" title='%MAKETEXT{"strictly deny write access to this topic"}%'>%MAKETEXT{"Nobody"}%</label>
+
+      <table class="foswikiLayoutTable">
+        <tr>
+          <td>
+            <input type="radio" class="foswikiRadio" id="details_change_toggle" name="Local+PERMSET_CHANGE" value="details" %IF{"$'PERMSET_CHANGE'='details'" then="checked='checked'"}% />
+          </td>
+          <td>
+            <label for="details_change_toggle" title='%MAKETEXT{"specify a list of users and/or groups"}%'>&nbsp;%MAKETEXT{"Specific users/groups"}%</label>
+          </td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>
+            <div id="details_change_container" %IF{"$'PERMSET_CHANGE'!='details'" then="style='display:none'"}%>
+              <input type="text" size="40" id="details_change" name="Local+PERMSET_CHANGE_DETAILS" value="%GETVAR{"PERMSET_CHANGE_DETAILS"}%" />
+              <input type="hidden" name="Default+PERMSET_CHANGE_DETAILS" value="" />
+            </div>
+          </td>
+        </tr>
+      </table>
+  </div>
+
+  %T% %MAKETEXT{
+    "Note that granting and restricting access to a larger set of topics is best done on web level in [_1]." 
+    args="<a href='%SCRIPTURLPATH{"view"}%/%WEB%/%WEBPREFSTOPIC%' target='_blank'>%WEBPREFSTOPIC%</a>"
+  }%
+</div>
+</noautolink>
+<literal>
+<script type="text/javascript">
+(function($) {
+  function setPermission(type, rules) {
+    $(".permset_"+type).each(function() { 
+      $(this).val("undefined");
+    });
+    for (var key in rules) {
+      var val = rules[key];
+      $.log("setting #"+key+"_"+type+"="+val); 
+      $("#"+key+"_"+type).val(val);
+    }
+  }
+
+  function switchOnDetails(type) {
+    $("#details_"+type+"_container").slideDown(300);
+    var names = [];
+    $("input[name='Local+PERMSET_"+type.toUpperCase()+"_DETAILS']").each(function() {
+      var val = $(this).val();
+      if (val) 
+        names.push(val);
+    });
+    names = names.join(', ');
+    $.log("switchOnDetails - names="+names);
+    setPermission(type, {
+      allow: names
+    });
+  }
+
+  function switchOffDetails(type) {
+    $("#details_"+type+"_container").slideUp(300);
+    setPermission(type, {
+      allow: ""
+    });
+  }
+
+  function setPermissionSet(permSet) {
+    switch(permSet) {
+      /* change rules */
+      case 'default_change':
+        switchOffDetails("change");
+        setPermission("change", {
+        });
+        break;
+      case 'nobody_change':
+        switchOffDetails("change");
+        setPermission("change", {
+          allow: ' ',
+          deny: undefined
+        });
+        break;
+      case 'registered_users_change':
+        switchOffDetails("change");
+        setPermission("change", {
+          deny: "%USERINFO{"guest" format="$wikiname"}%"
+        });
+        break;
+      case 'just_author_change':
+        switchOffDetails("change");
+        setPermission("change", {
+          allow: "%WIKINAME%"
+        });
+        break;
+      case 'details_change':
+      case 'details_change_toggle':
+        switchOnDetails("change");
+        break;
+      /* view rules */
+      case 'default_view':
+        switchOffDetails("view");
+        setPermission("view");
+        break;
+      case 'everybody_view':
+        switchOffDetails("view");
+        setPermission("view", {
+          deny: ' '
+        });
+        break;
+      case 'nobody_view':
+        switchOffDetails("view");
+        setPermission("view", {
+          allow: ' ',
+          deny: undefined
+        });
+        break;
+      case 'registered_users_view':
+        switchOffDetails("view");
+        setPermission("view", {
+          deny: "%USERINFO{"guest" format="$wikiname"}%"
+        });
+        break;
+      case 'just_author_view':
+        switchOffDetails("view");
+        setPermission("view", {
+          allow: "%WIKINAME%"
+        });
+        break;
+      case 'details_view':
+      case 'details_view_toggle':
+        switchOnDetails("view");
+        break;
+      default:
+        alert("unregistered permission-set '"+permSet+"'");
+        break;
+    };
+  }
+
+  $(function() {
+    if (0) { /* debugging */
+      $(".permset_view, .permset_change").each(function() {
+        $(this).wrap("<div></div>").parent().prepend("<b>"+$(this).attr('name')+": </b>");
+      });
+    }
+    $("#details_change, #details_view").textboxlist({
+      onSelect: function(input) {
+        var currentValues = input.currentValues;
+        $.log("currentValues="+currentValues);
+        $(input).debug();
+        $.log("inputName="+input.inputName);
+        var type = (input.inputName=="Local+PERMSET_CHANGE_DETAILS")?"change":"view";
+        setPermission(type, {
+          allow: currentValues.join(", ")
+        });
+      },
+      autocomplete:"%SCRIPTURL{"view"}%/%SYSTEMWEB%/JQueryAjaxHelper?section=user;contenttype=text/plain;skin=text",
+      autocompleteOpts: {
+        autoFill: false,
+        matchCase: false,
+        multiple: true,
+        formatItem: function(row, index, max, search) {
+          return "<table width='100%'><tr><td width='60px'><img width='50' src='"+row[2]+"' /></td><td>"+row[0]+"<br />"+row[1]+"</td></tr></table>";
+        }
+      }
+    });
+    $("input[type=radio], input[type=checkbox]").click(function() {
+      $(this).blur();
+    });
+    $("#permissionsForm input[type=radio]").click(function() {
+      setPermissionSet($(this).attr('id'));
+    });
+  });
+})(jQuery);
+</script>
+</literal>
+%ENDTAB%
+<!-- //moretabs -->%TMPL:END%
diff --git a/templates/editTableRow.nat.tmpl b/templates/editTableRow.nat.tmpl
index 3dd2192..1bf7c80 100644
--- a/templates/editTableRow.nat.tmpl
+++ b/templates/editTableRow.nat.tmpl
@@ -2,7 +2,7 @@
 %TMPL:DEF{"contenttitle"}%<h1>%HEADERTEXT% in Table <nop>%TABLENAME% of %TOPIC%</h1>%TMPL:END%
 %TMPL:DEF{"content"}%<!-- content -->
 %TMPL:P{"contenttitle"}%<!-- contenttitle// -->
-<div class="twikiFormHolder">
+<div class="foswikiFormHolder">
 <form name="main" enctype="multipart/form-data" action="%SCRIPTURLPATH{"uploadTableRow"}%/%WEB%/%TOPIC%" method="post">
 <input type="hidden" name="template" value="%TEMPLATE%">
 <input type="hidden" name="header" value="%HEADER%">
diff --git a/templates/editform.nat.tmpl b/templates/editform.nat.tmpl
index 270237f..5cf637b 100755
--- a/templates/editform.nat.tmpl
+++ b/templates/editform.nat.tmpl
@@ -1,4 +1,4 @@
 %TMPL:INCLUDE{"edit"}%<!-- template: editform.nat.tmpl -->
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"edit form"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"edit form"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"textarea"}%<div style="display:none"><textarea name="text" rows="10" cols="80">%TEXT%</textarea></div>%TMPL:END%
 %TMPL:DEF{"pagetitle"}%[[%WEB%.%TOPIC%][%WEBLINK{format="$web"}%.%TOPIC%]] (%MAKETEXT{"edit form"}%)%TMPL:END%
diff --git a/templates/editsection.nat.tmpl b/templates/editsection.nat.tmpl
index 60a22df..9f48ba1 100644
--- a/templates/editsection.nat.tmpl
+++ b/templates/editsection.nat.tmpl
@@ -1,7 +1,7 @@
 %TMPL:INCLUDE{"edit"}%<!-- template: editsection.nat.tmpl -->
 %TMPL:INCLUDE{"sidebar"}%<!-- sidebar// -->
 %TMPL:DEF{"bodyclass"}%natEditBody natEditSectionBody%TMPL:END%
-%TMPL:DEF{"title"}%%TOPICTITLE% - (%MAKETEXT{"edit section"}%)%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"edit section"}%)%TMPL:END%
 %TMPL:DEF{"content"}% <!-- content -->
 <div class="natEdit">
 <form name="EditForm" action="%SCRIPTURLPATH{"savesection"}%/%WEB%/%TOPIC%" method="post">
diff --git a/templates/editstyles.nat.tmpl b/templates/editstyles.nat.tmpl
index c8a74db..abdb283 100644
--- a/templates/editstyles.nat.tmpl
+++ b/templates/editstyles.nat.tmpl
@@ -1,8 +1,8 @@
 <!-- template: editstyles.nat.tmpl -->
 %TMPL:DEF{"editstyles"}%
 <style type="text/css">
-  @import url("%PUBURLPATH%/%TWIKIWEB%/NatEditPlugin/styles.css");
-  @import url("%PUBURLPATH%/%TWIKIWEB%/NatEditPlugin/%IF{"defined NATEDIT_THEME" then="%NATEDIT_THEME%" else="default"}%/styles.css");
+  @import url("%PUBURLPATH%/%SYSTEMWEB%/NatEditPlugin/styles.css");
+  @import url("%PUBURLPATH%/%SYSTEMWEB%/NatEditPlugin/%IF{"defined NATEDIT_THEME" then="%NATEDIT_THEME%" else="default"}%/styles.css");
 </style>
 %TMPL:END%
 %TMPL:DEF{"styles"}%
diff --git a/templates/edittext.nat.tmpl b/templates/edittext.nat.tmpl
index 066be48..c9a47dc 100755
--- a/templates/edittext.nat.tmpl
+++ b/templates/edittext.nat.tmpl
@@ -1,4 +1,4 @@
 %TMPL:INCLUDE{"edit"}% <!-- edittext.nat.tmpl -->
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"edit text"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"edit text"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"contenttitle"}%<h1>[[%WEB%.%TOPIC%]] (%MAKETEXT{"edit text"}%)</h1>%TMPL:END%
 %TMPL:DEF{"formfields"}%%TMPL:END%
diff --git a/templates/form.nat.tmpl b/templates/form.nat.tmpl
index 1d44efd..0ce402f 100755
--- a/templates/form.nat.tmpl
+++ b/templates/form.nat.tmpl
@@ -1,13 +1,13 @@
 <!-- template: form.nat.tmpl -->
 %TMPL:DEF{"changeform"}%%TMPL:END%
-%TMPL:DEF{"mandatory"}%<tr><td colspan="2" align="right"><span class="foswikiAlert twikiAlert">*</span> %MAKETEXT{"indicates mandatory fields"}% </td></tr> %TMPL:END%
+%TMPL:DEF{"mandatory"}%<tr><td colspan="2" align="right"><span class="foswikiAlert">*</span> %MAKETEXT{"indicates mandatory fields"}% </td></tr> %TMPL:END%
 %TMPL:DEF{"repeatedformrows"}% %REPEAT%
 <tr>
-<th class="foswikiFirstCol twikiFirstCol natTopicFormFirstCol">%ROWTITLE%: %ROWEXTRA%</th>
+<th class="foswikiFirstCol natTopicFormFirstCol">%ROWTITLE%: %ROWEXTRA%</th>
 <td>%ROWVALUE%</td>
 </tr>%REPEAT%<tr><td colspan="2">
 <div class="natTopicFormLabel">%ROWVALUE%</div></td></tr>%REPEAT% %TMPL:END%
 %TMPL:DEF{"formtail"}% %TMPL:P{context="mandatoryfields" then="mandatory"}%%TMPL:END%
-%TAB{"Form" after="fixHeightOfPane()"}%
-<div class="natTopicEditForm"><table class="foswikiTable twikiTable"><tr><th class="natTopicFormTitle" colspan="2">%FORMTITLE%</th></tr>%TMPL:P{"repeatedformrows"}%%TMPL:P{"formtail"}%</table></div>
+%TAB{"Form"}%
+<div class="natTopicEditForm"><table class="foswikiTable"><tr><th class="natTopicFormTitle" colspan="2">%FORMTITLE%</th></tr>%TMPL:P{"repeatedformrows"}%%TMPL:P{"formtail"}%</table></div>
 %ENDTAB%
diff --git a/templates/formtables.nat.tmpl b/templates/formtables.nat.tmpl
index 8295bf0..984a4c8 100755
--- a/templates/formtables.nat.tmpl
+++ b/templates/formtables.nat.tmpl
@@ -1,7 +1,7 @@
 %{ These templates define the form attached at the bottom of viewed page. }%
 %{ Header definition for topic attachments and top table in attach screen }%
 %TMPL:DEF{FORM:display:header}% <!-- form:display:header -->
-<div class="natTopicForm foswikiFormSteps twikiFormSteps">
+<div class="natTopicForm foswikiFormSteps">
 %USERACTIONS{format="$editform"}%
 <h2 >[[%A_TITLE%]]
 %TWISTYBUTTON{
@@ -17,11 +17,11 @@
   start="show" 
   remember="off" 
   mode="div"
-}%<table class="foswikiTable twikiTable">%TMPL:END%
+}%<table class="foswikiTable">%TMPL:END%
 %TMPL:DEF{FORM:display:row}% <!-- form:display:row -->
 <tr>
-  <th class="foswikiTableFirstCol twikiTableFirstCol"> %A_TITLE%: </th>
-  <td class="foswikiFormValue twikiFormValue"> %A_VALUE% </td>
+  <th class="foswikiTableFirstCol"> %A_TITLE%: </th>
+  <td class="foswikiFormValue"> %A_VALUE% </td>
 </tr>%TMPL:END%
 %TMPL:DEF{FORM:display:footer}% <!-- form:display:footer -->
 </table>%ENDTWISTY%</div>%TMPL:END%
diff --git a/templates/foswiki.nat.tmpl b/templates/foswiki.nat.tmpl
new file mode 100644
index 0000000..7fb043c
--- /dev/null
+++ b/templates/foswiki.nat.tmpl
@@ -0,0 +1,183 @@
+<!-- template: foswiki.nat.tmpl -->
+%TMPL:DEF{"LOG_IN"}%%MAKETEXT{"Log In"}%%TMPL:END%
+%TMPL:DEF{"LOG_IN_HELP"}%%MAKETEXT{"Log in to [_1]." args="<nop>%WIKITOOLNAME%"}%%TMPL:END%
+%TMPL:DEF{"LOG_IN_ACTION"}%<a class="natUserAction natLoginUserAction" rel="nofollow" href="%$url%" accesskey="l" title="%TMPL:P{"LOG_IN_HELP"}%"><span>%TMPL:P{"LOG_IN"}%</span></a>%TMPL:END%
+%TMPL:DEF{"LOG_IN_ACTION_RESTRICTED"}%<span class="natUserAction natLoginUserAction natDisabledUserAction"><span>%TMPL:P{"LOG_IN"}%</span></span>%TMPL:END%
+
+%TMPL:DEF{"LOG_OUT"}%%MAKETEXT{"Log Out"}%%TMPL:END%
+%TMPL:DEF{"LOG_OUT_HELP"}%%MAKETEXT{"Log out [_1]" args="<nop>%WIKINAME%"}%%TMPL:END%
+%TMPL:DEF{"LOG_OUT_ACTION"}%<a class="natUserAction natLogoutUserAction" rel="nofollow" href="%$url%" accesskey="l" title="%TMPL:P{"LOG_OUT_HELP"}%"><span>%TMPL:P{"LOG_OUT"}%</span></a>%TMPL:END%
+%TMPL:DEF{"LOG_OUT_ACTION_RESTRICTED"}%<span class="natUserAction natLogoutUserAction natDisabledUserAction"><span>%TMPL:P{"LOG_OUT"}%</span></span>%TMPL:END%
+
+%TMPL:DEF{"VIEW"}%%MAKETEXT{"View"}%%TMPL:END%
+%TMPL:DEF{"VIEW_HELP"}%%MAKETEXT{"View formatted topic"}%%TMPL:END%
+%TMPL:DEF{"VIEW_ACTION"}%<a class="natTopicAction natViewTopicAction" rel="nofollow" href="%$url%" accesskey="r" title="%TMPL:P{"VIEW_HELP"}%"><span>%TMPL:P{"VIEW"}%</span></a>%TMPL:END%
+%TMPL:DEF{"VIEW_ACTION_RESTRICTED"}%<span class="natTopicAction natViewTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"VIEW"}%</span></span>%TMPL:END%
+
+%TMPL:DEF{"RAW"}%%MAKETEXT{"Raw"}%%TMPL:END%
+%TMPL:DEF{"RAW_HELP"}%%MAKETEXT{"View raw topic text"}%%TMPL:END%
+%TMPL:DEF{"RAW_ACTION"}%<a class="natTopicAction natRawTopicAction" rel="nofollow" href="%$url%" accesskey="r" title="%TMPL:P{"RAW_HELP"}%"><span>%TMPL:P{"RAW"}%</span></a>%TMPL:END%
+%TMPL:DEF{"RAW_ACTION_RESTRICTED"}%<span class="natTopicAction natRawTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"RAW"}%</span></span>%TMPL:END%
+
+%TMPL:DEF{"EDIT"}%%MAKETEXT{"Edit"}%%TMPL:END%
+%TMPL:DEF{"EDIT_HELP"}%%MAKETEXT{"Edit this topic"}%%TMPL:END%
+%TMPL:DEF{"EDIT_ACTION_RESTRICTED"}%<span class="natTopicAction natEditTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"EDIT"}%</span></span>%TMPL:END%
+%TMPL:DEF{"EDIT_ACTION"}%<a class="natTopicAction natEditTopicAction" rel="nofollow" href="%$url%" accesskey="e" title="%TMPL:P{"EDIT_HELP"}%"><span>%TMPL:P{"EDIT"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"EDITFORM"}%%MAKETEXT{"Edit form"}%%TMPL:END%
+%TMPL:DEF{"EDITFORM_HELP"}%%MAKETEXT{"Edit data form of this topic"}%%TMPL:END%
+%TMPL:DEF{"EDITFORM_ACTION_RESTRICTED"}%<span class="natTopicAction natEditFormTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"EDITFORM"}%</span></span>%TMPL:END%
+%TMPL:DEF{"EDITFORM_ACTION"}%<a class="natTopicAction natEditFormTopicAction" rel="nofollow" href="%$url%" accesskey="e" title="%TMPL:P{"EDITFORM_HELP"}%"><span>%TMPL:P{"EDITFORM"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"EDITTEXT"}%%MAKETEXT{"Edit text"}%%TMPL:END%
+%TMPL:DEF{"EDITTEXT_HELP"}%%MAKETEXT{"Edit text data of this topic"}%%TMPL:END%
+%TMPL:DEF{"EDITTEXT_ACTION_RESTRICTED"}%<span class="natTopicAction natEditTextTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"EDITTEXT"}%</span></span>%TMPL:END%
+%TMPL:DEF{"EDITTEXT_ACTION"}%
+%TMPL:END%
+
+%TMPL:DEF{"RESTORE"}%%MAKETEXT{"Restore"}%%TMPL:END%
+%TMPL:DEF{"RESTORE_HELP"}%%MAKETEXT{"rdit this version of the topic"}%%TMPL:END%
+%TMPL:DEF{"RESTORE_ACTION_RESTRICTED"}%<span class="natTopicAction natRestoreTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"RESTORE"}%</span></span>%TMPL:END%
+%TMPL:DEF{"RESTORE_ACTION"}%<a class="natTopicAction natRestoreTopicAction" rel="nofollow" href="%$url%" accesskey="e" title="%TMPL:P{"RESTORE_HELP"}%"><span>%TMPL:P{"RESTORE"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"ATTACH"}%%MAKETEXT{"Attach"}%%TMPL:END%
+%TMPL:DEF{"ATTACH_HELP"}%%MAKETEXT{"Attach files and manage existing attachments"}%%TMPL:END%
+%TMPL:DEF{"ATTACH_ACTION_RESTRICTED"}%<span class="natTopicAction natAttachTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"ATTACH"}%</span></span>%TMPL:END%
+%TMPL:DEF{"ATTACH_ACTION"}%<a class="natTopicAction natAttachTopicAction" rel="nofollow" href="%$url%" accesskey="a" title="%TMPL:P{"ATTACH_HELP"}%"><span>%TMPL:P{"ATTACH"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"DELETE"}%%MAKETEXT{"Delete"}%%TMPL:END%
+%TMPL:DEF{"DELETE_HELP"}%%MAKETEXT{"Delete this topic"}%%TMPL:END%
+%TMPL:DEF{"DELETE_ACTION_RESTRICTED"}%<span class="natTopicAction natDeleteTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"DELETE"}%</span></span>%TMPL:END%
+%TMPL:DEF{"DELETE_ACTION"}%<a class="natTopicAction natDeleteTopicAction" rel="nofollow" href="%$url%" accesskey="t" title="%TMPL:P{"DELETE_HELP"}%"><span>%TMPL:P{"DELETE"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"MOVE"}%%MAKETEXT{"Move"}%%TMPL:END%
+%TMPL:DEF{"MOVE_HELP"}%%MAKETEXT{"Move or rename this topic"}%%TMPL:END%
+%TMPL:DEF{"MOVE_ACTION_RESTRICTED"}%<span class="natTopicAction natMoveTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"MOVE"}%</span></span>%TMPL:END%
+%TMPL:DEF{"MOVE_ACTION"}%<a class="natTopicAction natMoveTopicAction" rel="nofollow" href="%$url%" accesskey="m" title="%TMPL:P{"MOVE_HELP"}%"><span>%TMPL:P{"MOVE"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"HISTORY"}%%MAKETEXT{"History"}%%TMPL:END%
+%TMPL:DEF{"HISTORY_HELP"}%%MAKETEXT{"View topic history"}%%TMPL:END%
+%TMPL:DEF{"HISTORY_ACTION_RESTRICTED"}%<span class="natTopicAction natHistoryTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"HISTORY"}%</span></span>%TMPL:END%
+%TMPL:DEF{"HISTORY_ACTION"}%<a class="natTopicAction natHistoryTopicAction" rel="nofollow" href="%$url%" accesskey="d" title="%TMPL:P{"HISTORY_HELP"}%"><span>%TMPL:P{"HISTORY"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"MORE"}%%MAKETEXT{"Tools"}%%TMPL:END%
+%TMPL:DEF{"MORE_HELP"}%%MAKETEXT{"More actions"}%%TMPL:END%
+%TMPL:DEF{"MORE_ACTION_RESTRICTED"}%<span class="natTopicAction natMoreTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"MORE"}%</span></span>%TMPL:END%
+%TMPL:DEF{"MORE_ACTION"}%<a class="natTopicAction natMoreTopicAction" rel="nofollow" href="%$url%" accesskey="x" title="%TMPL:P{"MORE_HELP"}%"><span>%TMPL:P{"MORE"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"NEW"}%%MAKETEXT{"New"}%%TMPL:END%
+%TMPL:DEF{"NEW_HELP"}%%MAKETEXT{"Create New Topic"}%%TMPL:END%
+%TMPL:DEF{"NEW_ACTION_RESTRICTED"}%<span class="natTopicAction natNewTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"NEW"}%</span></span>%TMPL:END%
+%TMPL:DEF{"NEW_ACTION"}%<a class="natTopicAction natNewTopicAction" rel="nofollow" href="%$url%" accesskey="n" title="%TMPL:P{"NEW_HELP"}%"><span>%TMPL:P{"NEW"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"PRINT"}%%MAKETEXT{"Print"}%%TMPL:END%
+%TMPL:DEF{"PRINT_HELP"}%%MAKETEXT{"Print this topic"}%%TMPL:END%
+%TMPL:DEF{"PRINT_ACTION_RESTRICTED"}%<span class="natTopicAction natPrintTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"PRINT"}%</span></span>%TMPL:END%
+%TMPL:DEF{"PRINT_ACTION"}%<a class="natTopicAction natPrintTopicAction" rel="nofollow" href="%$url%" accesskey="p" title="%TMPL:P{"PRINT_HELP"}%"><span>%TMPL:P{"PRINT"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"REGISTER"}%%MAKETEXT{"Register"}%%TMPL:END%
+%TMPL:DEF{"REGISTER_HELP"}%%MAKETEXT{"Create a user account on [_1]." args="<nop>%WIKITOOLNAME%"}%%TMPL:END%
+%TMPL:DEF{"REGISTER_ACTION_RESTRICTED"}%<span class="natUserAction natRegisterUserAction natDisabledUserAction"><span>%TMPL:P{"REGISTER"}%</span></span>%TMPL:END%
+%TMPL:DEF{"REGISTER_ACTION"}%<a class="natUserAction natRegisterUserAction" rel="nofollow" href="%$url%" accesskey="r" title="%TMPL:P{"REGISTER_HELP"}%"><span>%TMPL:P{"REGISTER"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"HELP"}%%MAKETEXT{"Help"}%%TMPL:END%
+%TMPL:DEF{"HELP_HELP"}%%MAKETEXT{"Get help"}%"%TMPL:END%
+%TMPL:DEF{"HELP_ACTION_RESTRICTED"}%<span class="natTopicAction natHelpTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"HELP"}%</span></span>%TMPL:END%
+%TMPL:DEF{"HELP_ACTION"}%<a class="natTopicAction natHelpTopicAction" rel="nofollow" href="%$url%" title="%TMPL:P{"HELP_HELP"}%"><span>%TMPL:P{"HELP"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"PDF"}%%MAKETEXT{"Pdf"}%%TMPL:END%
+%TMPL:DEF{"PDF_HELP"}%%MAKETEXT{"Export this topic as PDF"}%%TMPL:END%
+%TMPL:DEF{"PDF_ACTION_RESTRICTED"}%<span class="natTopicAction natPdfTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"PDF"}%</span></span>%TMPL:END%
+%TMPL:DEF{"PDF_ACTION"}%<a class="natTopicAction natPdfTopicAction" rel="nofollow" href="%$url%" accesskey="p" title="%TMPL:P{"PDF_HELP"}%"><span>%TMPL:P{"PDF"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"USERS"}%%MAKETEXT{"Users"}%%TMPL:END%
+%TMPL:DEF{"USERS_HELP"}%%MAKETEXT{"See the directory of all registered users"}%%TMPL:END%
+%TMPL:DEF{"USERS_ACTION_RESTRICTED"}%%TMPL:END%
+%TMPL:DEF{"USERS_ACTION"}%<a class='natUserAction natUsersAction' href='%SCRIPTURLPATH{"view"}%/%USERSWEB%/%WIKIUSERSTOPIC%' title='%TMPL:P{"USERS_HELP"}%'>%TMPL:P{"USERS"}%</a>%TMPL:END%
+
+%TMPL:DEF{"ACCOUNT"}%%SPACEOUT{"%WIKINAME%"}%%TMPL:END%
+%TMPL:DEF{"ACCOUNT_HELP"}%%MAKETEXT{"Go to your homepage"}%%TMPL:END%
+%TMPL:DEF{"ACCOUNT_ACTION_RESTRICTED"}%<span class="natUserAction natAccountAction natDisabledTopicAction"><span>%TMPL:P{"ACCOUNT"}%</span></span>%TMPL:END%
+%TMPL:DEF{"ACCOUNT_ACTION"}%<a class="natUserAction natAccountAction" rel="nofollow" href="%$url%" title="%TMPL:P{"ACCOUNT_HELP"}%"><span>%TMPL:P{"ACCOUNT"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"FIRST"}%%MAKETEXT{"First"}%%TMPL:END%
+%TMPL:DEF{"FIRST_HELP"}%%MAKETEXT{"View first revision of this topic"}%%TMPL:END%
+%TMPL:DEF{"FIRST_ACTION_RESTRICTION"}%<span class="natTopicAction natFirstTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"FIRST"}%</span></span>%TMPL:END%
+%TMPL:DEF{"FIRST_ACTION"}%<a class="natTopicAction natFirstTopicAction" rel="nofollow" href="%$url%" accesskey="f" title="%TMPL:P{"FIRST_HELP"}%"><span>%TMPL:P{"FIRST"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"NEXT"}%%MAKETEXT{"Next"}%%TMPL:END%
+%TMPL:DEF{"NEXT_HELP"}%%MAKETEXT{"View next revision of this topic"}%%TMPL:END%
+%TMPL:DEF{"NEXT_ACTION_RESTRICTED"}%<span class="natTopicAction natNextTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"NEXT"}%</span></span>%TMPL:END%
+%TMPL:DEF{"NEXT_ACTION"}%<a class="natTopicAction natNextTopicAction" rel="nofollow" href="%$url%" accesskey="n" title="%TMPL:P{"NEXT_HELP"}%"><span>%TMPL:P{"NEXT"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"PREV"}%%MAKETEXT{"Previous"}%%TMPL:END%
+%TMPL:DEF{"PREV_HELP"}%%MAKETEXT{"View previous revision of this topic"}%%TMPL:END%
+%TMPL:DEF{"PREV_ACTION_RESTRICTED"}%<span class="natTopicAction natPrevTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"PREV"}%</span></span>%TMPL:END%
+%TMPL:DEF{"PREV_ACTION"}%<a class="natTopicAction natPrevTopicAction" rel="nofollow" href="%$url%" accesskey="p" title="%TMPL:P{"PREV_HELP"}%"><span>%TMPL:P{"PREV"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"LAST"}%%MAKETEXT{"Last"}%%TMPL:END%
+%TMPL:DEF{"LAST_HELP"}%%MAKETEXT{"View last revision of this topic"}%%TMPL:END%
+%TMPL:DEF{"LAST_ACTION_RESTRICTED"}%<span class="natTopicAction natLastTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"LAST"}%</span></span>%TMPL:END%
+%TMPL:DEF{"LAST_ACTION"}%<a class="natTopicAction natLastTopicAction" rel="nofollow" href="%$url%" accesskey="l" title="%TMPL:P{"LAST_HELP"}%"><span>%TMPL:P{"LAST"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"DIFF"}%%MAKETEXT{"Diff"}%%TMPL:END%
+%TMPL:DEF{"DIFF_HELP"}%%MAKETEXT{"Show last change"}%%TMPL:END%
+%TMPL:DEF{"DIFF_ACTION_RESTRICTED"}%<span class="natTopicAction natDiffTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"DIFF"}%</span></span>%TMPL:END%
+%TMPL:DEF{"DIFF_ACTION"}%<a class="natTopicAction natDiffTopicAction" rel="nofollow" href="%$url%" accesskey="d" title="%TMPL:P{"DIFF_HELP"}%"><span>%TMPL:P{"DIFF"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"CLOSE"}%%MAKETEXT{"Close"}%%TMPL:END%
+%TMPL:DEF{"CLOSE_HELP"}%%MAKETEXT{"Close this dialog"}%%TMPL:END%
+%TMPL:DEF{"CLOSE_ACTION_RESTRICTED"}%<span class="natTopicAction natCloseTopicActionDisabled natDisabledTopicAction"><span>%TMPL:P{"CLOSE"}%</span></span>%TMPL:END%
+%TMPL:DEF{"CLOSE_ACTION"}%<a class="natTopicAction natCloseTopicAction" rel="nofollow" href="%$url%" accesskey="x" title="%TMPL:P{"CLOSE_HELP"}%"><span>%TMPL:P{"CLOSE"}%</span></a>%TMPL:END%
+
+%TMPL:DEF{"NOTHING_FOUND"}%%MAKETEXT{"Nothing found. Try again!"}%%TMPL:END%
+
+%TMPL:DEF{"breadcrumbs"}%<!-- breadcrumb -->
+<div class="natBreadCrumbs">
+%MAKETEXT{"You are here:"}%<span class='natSep'>&nbsp; </span>%TMPL:P{context="ClassificationPluginEnabled" then="breadcrumbs_classificationplugin" else="breadcrumbs_standard"}%
+</div>
+<!-- //breadcrumbs -->%TMPL:END%
+
+%TMPL:DEF{"useractions"}%<!-- useractions -->
+%USERACTIONS{
+  guest="<div class='natGreeter natGuestGreeter'>$login$sep$users$sep$register</div>"
+  format="<div class='natGreeter natUserGreeter'>$account$sep$users$sep$logout</div>"
+}%
+<!-- //useractions -->%TMPL:END%
+
+%TMPL:DEF{"breadcrumbs_standard"}%%BREADCRUMBS{separator="<span class='natSep'>&nbsp;&#187; </span>"}%%TMPL:END%
+
+%TMPL:DEF{"breadcrumbs_classificationplugin"}%%CATINFO{
+  cat="%URLPARAM{"catname" default="%BASEWEB%.%BASETOPIC%"}%" 
+  header="$percntBREADCRUMBS{recurse=\"topicoff\" separator=\"<span class='natSep'>&nbsp;&#187; </span>\"}$percnt<span class='natSep'>&nbsp;&#187; </span>" format="$breadcrumb" separator="<span class='natSep'>&nbsp;&#187; </span>"
+  null="$percntTMPL:P{\"breadcrumbs_standard\"}$percnt"
+}%%TMPL:END%
+
+%TMPL:DEF{"hiddenform"}%<!-- hiddenform -->
+<form id="EditForm" name="EditForm" action="%SCRIPTURLPATH{"save"}%/%WEB%/%TOPIC%" method="post">
+  <input type="hidden" name="action_addform" value="" />
+  <input type="hidden" name="action_cancel" value="" />
+  <input type="hidden" name="action_checkpoint" value="" />
+  <input type="hidden" name="action_preview" value="" />
+  <input type="hidden" name="action_replaceform" value="" />
+  <input type="hidden" name="action_save" value="" />
+  <input type="hidden" name="submitChangeForm" value="" />
+  %FORMFIELDS% 
+  <input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" />
+  <input type="hidden" name="originalrev" value="%URLPARAM{"originalrev"}%" />
+  <input type="hidden" name="redirectto" value="%REDIRECTTO%" />
+  <input type="hidden" name="topicparent" value="%TOPICPARENT%" />
+  <input type="hidden" name="templatetopic" value="%URLPARAM{"templatetopic" default="%TEMPLATETOPIC%"}%" />
+  <input type="hidden" name="cover" value="%URLPARAM{"cover"}%" />
+  <input type="hidden" name="cmd" value="%CMD%" />
+  <input type="hidden" name="nowysiwyg" value="%URLPARAM{"nowysiwyg"}%" />
+  <input type="hidden" name="rev" value="%URLPARAM{"rev"}%" />
+  <input type="hidden" name="text" value="%HIDDENTEXT%" />
+</form>
+<!-- //hiddenform-->%TMPL:END%
+
+%TMPL:DEF{"spacer"}%<img src='%PUBURLPATH%/%SYSTEMWEB%/NatSkin/blank.gif' class='natSpacer' />%TMPL:END%
+
+%TMPL:DEF{"topictitle"}%%TMPL:P{context="DBCachePluginEnabled" then="topictitle_dbcache" else="topictitle_default"}%%TMPL:END%
+%TMPL:DEF{"topictitle_default"}%default %IF{"defined 'TOPICTITLE'" then="%TOPICTITLE%" else="%BASETOPIC%"}%%TMPL:END%
+%TMPL:DEF{"topictitle_dbcache"}%dbcache %GETTOPICTITLE{encode="entity"}%%TMPL:END%
diff --git a/templates/javascript.nat.tmpl b/templates/javascript.nat.tmpl
index 73e72ec..1bd9491 100755
--- a/templates/javascript.nat.tmpl
+++ b/templates/javascript.nat.tmpl
@@ -1,14 +1,7 @@
 <!-- template: javascript.nat.tmpl -->
 %TMPL:DEF{"defaultjavascript"}%<!-- defaultjavascript -->
-%TMPL:P{"jqueryjavascript"}%
-<script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/JQueryPlugin/jquery.superfish.js" ></script>
-<script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/NatSkin/natskin.js" ></script>
-<script type="text/javascript"> 
-$(function() { 
-  %TMPL:P{"onloadscript"}% 
-}); 
-</script>
-<!-- //defaultjavascript -->%TMPL:END%
+%JQREQUIRE{"superfish"}%
+%JQREQUIRE{"tooltip"}%
 %TMPL:DEF{"javascript"}%<!-- javascript -->
 %TMPL:P{"defaultjavascript"}%
 <!-- //javascript -->%TMPL:END%
diff --git a/templates/kinosearch.nat.tmpl b/templates/kinosearch.nat.tmpl
index b92891c..1369983 100644
--- a/templates/kinosearch.nat.tmpl
+++ b/templates/kinosearch.nat.tmpl
@@ -1,15 +1,15 @@
 %TMPL:INCLUDE{"search"}%<!-- template: kinosearch.nat.tmpl -->
 %TMPL:DEF{"seealso"}%%TMPL:END%
 %TMPL:DEF{"searchform"}%<!-- searchform -->
-<div class="natSearchForm">
+<div class="foswikiPageForm natSearchForm">
 <form name="searchform" action="%SCRIPTURLPATH{"kinosearch"}%/%BASEWEB%/%BASETOPIC%" method="post">
-<input type="text" name="search" size="30" value="%URLPARAM{"search" encode="entity"}%" accesskey="f" /> 
+<input type="text" class="foswikiInputField" name="search" size="30" value="%URLPARAM{"search" encode="entity"}%" accesskey="f" /> 
 <input type="submit" value="%MAKETEXT{"Search"}%" class="natOkButton" title="submit the query" />
 <input type="button" value="%MAKETEXT{"Cancel"}%" class="natCancelButton" onclick="window.location.href='%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%';" accesskey="c" title='%MAKETEXT{"go back to <nop>[_1]" args="%WEB%.%TOPIC%"}%'>
 &nbsp;%TMPL:P{"seealso"}%
 <table class="natSearchFormOptions" cellspacing="0" cellpadding="0"><tr>
 <td>
-<input type="checkbox" class="twikiCheckbox" id="web" name="web" value="all" %IFDEFINED{"%URLPARAM{web}%" as="all" then=" checked"}%/>
+<input type="checkbox" class="foswikiCheckbox" id="web" name="web" value="all" %IF{"$'URLPARAM{web}'='all'" then=" checked"}%/>
 </td>
 <td>
 <label for="web">%MAKETEXT{"search in all webs"}%</label>
@@ -24,14 +24,14 @@
 </td>
 <td>
 <select name="limit">
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="5" then=" selected"}%>5</option>
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="10" then=" selected"}%>10</option>
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="20" then=" selected"}%>20</option>
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="30" then=" selected"}%>30</option>
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="40" then=" selected"}%>40</option>
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="50" then=" selected"}%>50</option>
-  <option %IFDEFINED{"%URLPARAM{"limit" default="100"}%" as="100" then=" selected"}%>100</option>
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="all" then=" selected"}%>all</option>
+  <option %IF{"$'URLPARAM{limit}'='5'" then="selected"}%>5</option>
+  <option %IF{"$'URLPARAM{limit}'='10'" then="selected"}%>10</option>
+  <option %IF{"$'URLPARAM{limit}'='20'" then="selected"}%>20</option>
+  <option %IF{"$'URLPARAM{limit}'='30'" then="selected"}%>30</option>
+  <option %IF{"$'URLPARAM{limit}'='40'" then="selected"}%>40</option>
+  <option %IF{"$'URLPARAM{limit}'='50'" then="selected"}%>50</option>
+  <option %IF{"$'URLPARAM{limit}'='100' or $'URLPARAM{limit}'=''" then="selected"}%>100</option>
+  <option %IF{"$'URLPARAM{limit}'='all'" then="selected"}%>all</option>
 </select>
 </td></tr></table>
 </form>
diff --git a/templates/login.nat.tmpl b/templates/login.nat.tmpl
index 4532fdd..b0ddd7f 100755
--- a/templates/login.nat.tmpl
+++ b/templates/login.nat.tmpl
@@ -15,7 +15,7 @@
 %TMPL:DEF{"UNRECOGNISED_USER"}%%MAKETEXT{"Unrecognised user and/or password."}%%TMPL:END%
 %TMPL:DEF{"message"}%<!-- message -->
 <h2 id="natLogonBanner">%BANNER%</h2>
-<div class="twikiFormSteps">
+<div class="foswikiFormSteps">
 %NOTE%<!-- note// -->
 %TMPL:P{"logon"}%<!-- logon// -->
 %TMPL:P{"seealso"}%<!-- seealso// -->
@@ -31,12 +31,12 @@
 </div> 
 <!-- //content -->%TMPL:END%
 %TMPL:DEF{"contact"}%<!-- contact -->
-<div class="twikiGrayText natContact"> 
+<div class="foswikiGrayText natContact"> 
 %MAKETEXT{"Contact [_1] if you have any questions." args="<a href='mailto:%WIKIWEBMASTER%?subject=%ENCODE{\"%WIKITOOLNAME%: Request for support\"}%&&body=%ENCODE{\"Hello, I have got a question ...\"}%'>%WIKIWEBMASTER%</a>"}%
 </div> 
 <!-- //contact -->%TMPL:END%
 %TMPL:DEF{"seealso"}%<!-- seealso -->
-<div class="twikiFormStep twikiFormLast">
+<div class="foswikiFormStep foswikiFormLast">
 [[%SYSTEMWEB%.ResetPassword][%MAKETEXT{"Did you forget your password?"}%]] %BR%
 [[%USERREGISTRATION%][%MAKETEXT{"Do you want to become a registered user?"}%]]
 </div>
diff --git a/templates/login.sudo.nat.tmpl b/templates/login.sudo.nat.tmpl
index 927d4a7..62f8427 100755
--- a/templates/login.sudo.nat.tmpl
+++ b/templates/login.sudo.nat.tmpl
@@ -1,4 +1,4 @@
-%%TMPL:INCLUDE{"login"}%<!-- template: login.sudo.nat.tmpl -->
+%TMPL:INCLUDE{"login"}%<!-- template: login.sudo.nat.tmpl -->
 
 %TMPL:DEF{"webaction"}%%MAKETEXT{"Admin <nop>%WIKITOOLNAME% User Authentication"}%%TMPL:END%
 %TMPL:DEF{"LOGGED_IN_BANNER"}%%MAKETEXT{"[_1] is currently logged in" args="%USERSWEB%.%WIKINAME%"}%%TMPL:END%
@@ -6,7 +6,7 @@
 
 %TMPL:DEF{"title"}%%MAKETEXT{"Sudo Login"}% - %WIKITOOLNAME%%TMPL:END%
 
-%TMPL:DEF{"usernamefield"}%<input tabindex='1' class="twikiInputField twikiFocus" type="text" size="40" name="username" value="%WIKIADMINLOGIN%"  %TMPL:P{context="no_auto_complete_login" then="autocomplete_off"}% />%TMPL:END%
+%TMPL:DEF{"usernamefield"}%<input tabindex='1' class="foswikiInputField foswikiFocus" type="text" size="40" name="username" value="%WIKIADMINLOGIN%"  %TMPL:P{context="no_auto_complete_login" then="autocomplete_off"}% />%TMPL:END%
 
 %TMPL:DEF{"usernamenote"}%%TMPL:P{"authrealm"}%%TMPL:END%
 
@@ -14,4 +14,4 @@
 
 %TMPL:DEF{"loginasadministratorform"}%%TMPL:END%
 
-%TMPL:DEF{"authrealm"}%<span class="twikiUnvisited">%MAKETEXT{"Enter the %WIKITOOLNAME% Administrator user or login as set in [_1]" args="[[%SCRIPTURL{configure}%][configure]]"}%</span>%TMPL:END%
+%TMPL:DEF{"authrealm"}%<span class="foswikiUnvisited">%MAKETEXT{"Enter the %WIKITOOLNAME% Administrator user or login as set in [_1]" args="[[%SCRIPTURL{configure}%][configure]]"}%</span>%TMPL:END%
diff --git a/templates/loginbase.nat.tmpl b/templates/loginbase.nat.tmpl
index 61734ab..55211f1 100755
--- a/templates/loginbase.nat.tmpl
+++ b/templates/loginbase.nat.tmpl
@@ -1,47 +1,46 @@
 <!-- template: loginbase.tmpl -->
-%TMPL:DEF{"onloadscript"}%if (document.LogonForm) {document.LogonForm.username.focus();} %TMPL:END%
+%TMPL:DEF{"useractions"}%<div class='natGreeter'>&nbsp;</div>%TMPL:END%
 %TMPL:DEF{"rememberbox"}%<!-- rememberbox -->
-<div class="twikiFormStep">
-<label>
+<div class="foswikiFormStep">
   <table cellspacing="0" cellpadding="0"><tr><td>
-  <input name="remember" class="twikiCheckbox" type="checkbox" value="1" />
+  <input id="remember" name="remember" class="foswikiCheckbox" type="checkbox" value="1" />
   </td><td style="padding-left:0.3em">
-  %MAKETEXT{"Remember me on this computer"}%
+  <label for="remember">%MAKETEXT{"Remember me on this computer"}%</label>
   </td></tr></table>
-</label>
 </div>
 <!-- //rememberbox -->%TMPL:END%
 %TMPL:DEF{"logon"}%<!-- logon -->
-%JQSCRIPT{"jquery.validate"}%
-%JQSCRIPT{"jquery.shake"}%
+%JQREQUIRE{"validate"}% %JQREQUIRE{"shake"}% %JQREQUIRE{"focus"}%<!-- jqrequire -->
 <script type="text/javascript">
-$(function() {
+//<![CDATA[
+(function($) {
+(function() {
   $("#LogonForm").validate();
   var bannerText = $("#natLogonBanner").text();
   if (bannerText == '%TMPL:P{UNRECOGNISED_USER}%') {
     $(".natLogin").shake(3, 10, 180);
   }
 });
+})(jQuery);
+//]]>
 </script>
-<form id="LogonForm" name="LogonForm" action="%IFDEFINED{"%HTTPSLOGON%" as ="on" then="https" else="http"}%://%HTTP_HOST%%SCRIPTURLPATH{"login"}%/%WEB%/%TOPIC%" method="post">
-<input type="hidden" name="web" value="%WEB%" />
-<input type="hidden" name="topic" value="%TOPIC%" />
-<input type="hidden" name="action" value="%TMPL:P{action}%"/>
-<input type="hidden" name="origurl" value="%IFDEFINED{"%ORIGURL%"}%" />
+<form id="LogonForm" name="LogonForm" action="%IF{"$'HTTPSLOGON'='on'" then="https" else="http"}%://%HTTP_HOST%%SCRIPTURLPATH{"login"}%/%WEB%/%TOPIC%" method="post">
+<literal>%QUERYPARAMS{encoding="entity" format="<input type='hidden' name='$name' value='$value' />"}%</literal><!-- queryparams// -->
+%IF{"defined 'ORIGURL'" then="<input type='hidden' name='origurl' value='$percntORIGURL$percnt' />"}%
 <input type="submit" style="display:none" />
-<div class="twikiFormStep">
+<div class="foswikiFormStep">
 ---+++ %MAKETEXT{"Username"}%:
-<input type="text" class="twikiFormField required" size="20" id="username" name="username" value='%URLPARAM{"usernamestep"}%' /> 
+<input type="text" class="foswikiFormField jqFocus required" size="20" id="username" name="username" value='%URLPARAM{"usernamestep"}%' /> 
 </div>
-<div class="twikiFormStep">
+<div class="foswikiFormStep">
 ---+++ %MAKETEXT{"Password"}%:
-<input type="password" class="twikiFormField required" size="20" id="password" name="password" />
+<input type="password" class="foswikiFormField required" size="20" id="password" name="password" />
 </div>
 %TMPL:P{context="can_remember_login" then="rememberbox"}%<!-- rememberbox // -->
-<div class="twikiFormStep twikiFormButtons">
-  %BUTTON{"%MAKETEXT{"Log In"}%" icon="tick" type="submit"}% 
+<div class="foswikiFormStep foswikiFormButtons">
+  %BUTTON{"%MAKETEXT{"Log In"}%" icon="tick" type="save"}% 
   %BUTTON{"%MAKETEXT{"Cancel"}%" icon="cross" target="%WIKILOGOURL%"}%
-  <div style="clear:both"></div>
+  %CLEAR%
 </div>
 </form>
 <!-- //logon -->%TMPL:END%
diff --git a/templates/messages.nat.tmpl b/templates/messages.nat.tmpl
index efeb400..e3debe4 100644
--- a/templates/messages.nat.tmpl
+++ b/templates/messages.nat.tmpl
@@ -1,4 +1,4 @@
-%TMPL:INCLUDE{"messages"}%
+%TMPL:INCLUDE{"messages"}%<!-- template: messages.nat.tmpl -->
 %TMPL:DEF{"remove_user_done"}%<!-- removes contact note -->
 ---+++ %MAKETEXT{"User Account [_1] Deleted" args="<nop>%PARAM1%"}%
 %MAKETEXT{"Your user name has been removed from the Authentication System."}%
@@ -18,7 +18,7 @@
 ---+++ %MAKETEXT{"Unrecognized action command [_1]" args="'%PARAM1%'"}%
 %TMPL:P{"goback"}%
 %TMPL:END%
-%TMPL:DEF{"notwikiuser"}%<!-- fixes duplicate definition of notwikiuser in messages.tmpl -->
+%TMPL:DEF{"nofoswikiuser"}%<!-- fixes duplicate definition of nofoswikiuser in messages.tmpl -->
 ---+++ %MAKETEXT{"Can't find user \"[_1]\"." args="<nop>%PARAM1%"}%
 %MAKETEXT{"Please make sure you spelled the [_1] correctly and try again. If you get stuck, please mail [_2]."
  args="%SYSTEMWEB%.LoginName,%WIKIWEBMASTER%"}%
@@ -113,9 +113,7 @@ white, maroon, red, purple, fuchsia, green, lime, olive, yellow, navy, blue, tea
 %TMPL:END%
 %TMPL:DEF{"confirm"}%<!-- BlackListPlugin support -->
 ---+++ %MAKETEXT{"Thank you for registering"}%
-%MAKETEXT{"Your activation code has been sent to [_1].  Either click on the
-link in your email or enter the code in the box below to activate your membership.
-(This code is of the form \"YourName.xxxxxxxxxx\")" args="%PARAM1%"}%
+%MAKETEXT{"Your activation code has been sent to [_1].  Either click on the link in your email or enter the code in the box below to activate your membership.  (This code is of the form \"YourName.xxxxxxxxxx\")" args="%PARAM1%"}%
 
 <form action="%SCRIPTURLPATH{"register"}%" method="post">
 <!--input type="hidden" name="rx" value="%BLACKLISTPLUGIN{action="magic"}%" /-->
@@ -126,7 +124,7 @@ link in your email or enter the code in the box below to activate your membershi
 
 %TMPL:END%
 %TMPL:DEF{"missing_fields"}%<!-- better dialog, uses goback def -->
----+++ %MAKETEXT{"Missing Fields =<span class=\"twikiAlert\">**</span>="}%
+---+++ %MAKETEXT{"Missing Fields =<span class=\"foswikiAlert\">**</span>="}%
 <noautolink>
 %MAKETEXT{"The required field [_1] was not filled in." args="*%PARAM1%*"}%
 </noautolink>
@@ -219,7 +217,7 @@ link in your email or enter the code in the box below to activate your membershi
 ---+++ %MAKETEXT{"Topic Save Error"}%
 %MAKETEXT{"Could not save [_1]." args="<nop>%WEB%.%TOPIC%"}%
 
-%MAKETEXT{"The required field =<span class=\"twikiAlert\">**</span>= *[_1]* was not filled in." args="%PARAM1%"}%
+%MAKETEXT{"The required field =<span class=\"foswikiAlert\">**</span>= *[_1]* was not filled in." args="%PARAM1%"}%
 
 %TMPL:P{"goback"}%
 %TMPL:END%
@@ -284,8 +282,7 @@ You may be able to get your <nop>%WIKITOOLNAME% administrator to change the sett
 <div %PARAM5%>
 %MAKETEXT{"Continue and try to rename web?"}%
 
-
-<form class="natOopsButtons" name="ButtonBox" action="%SCRIPTURLPATH{"rename"}%/%WEB%/%HOMETOPIC%">
+<form class="natOopsButtons" name="ButtonBox" action="%SCRIPTURLPATH{"rename"}%/%WEB%/%HOMETOPIC%" method="post">
   <input type="hidden" name="action" value="renameweb">
   <input type="hidden" name="confirm" value="continue">
   <input type="submit" class="natOkButton" value='%MAKETEXT{"OK"}%'>&nbsp;
@@ -367,3 +364,28 @@ template that doesn't exist." args="%PARAM2%"}%
    * %MAKETEXT{"You can try out this site hands-on in the [[Sandbox.WebHome][Sandbox]] web."}%
 %PARAM1%
 %TMPL:END%
+%TMPL:DEF{"move_err"}%
+---+++ %MAKETEXT{"Attachment move failed"}%
+%IF{
+  "'%URLPARAM{param1}%.%URLPARAM{param2}%'='%TRASHWEB%.TrashAttachment'"
+  then="%MAKETEXT{"During deletion of attachment =[_1]= an error was found. Please notify your [_2] administrator." args="%URLPARAM{attachment}%, <nop>%WIKITOOLNAME%"}%"
+  else="%MAKETEXT{"During move of attachment [_1] to [_2] an error was found. Please notify your [_3] administrator." args="%PARAM3%, <nop>%PARAM1%.<nop>%PARAM2%, <nop>%WIKITOOLNAME%"}%"
+}%
+
+
+<div class="alt">
+%PARAM4%
+</div>
+
+%TMPL:P{"goback"}%
+%TMPL:END%
+%TMPL:DEF{"delete_err"}%
+---+++ %MAKETEXT{"Attachment delete failed"}%
+%MAKETEXT{"During deletion of attachment =[_1]= an error was found. Please notify your [_2] administrator." args="%URLPARAM{attachment}%, <nop>%WIKITOOLNAME%"}%
+
+<div class="alt">
+%PARAM4%
+</div>
+
+%TMPL:P{"goback"}%
+%TMPL:END%
diff --git a/templates/moveattachment.nat.tmpl b/templates/moveattachment.nat.tmpl
index 1c0f019..f8a5490 100755
--- a/templates/moveattachment.nat.tmpl
+++ b/templates/moveattachment.nat.tmpl
@@ -4,73 +4,92 @@
 %TMPL:INCLUDE{"moveattachmenttopicactions"}%<!-- moveattachmenttopicactions// -->
 %TMPL:INCLUDE{"moveattachmentjavascript"}%<!-- moveattachmentjavascript// -->
 %TMPL:INCLUDE{"moveattachmentstyles"}%<!-- moveattachmentstyles// -->
+%TMPL:DEF{"contentheader"}%%TMPL:P{"breadcrumbs"}%%TMPL:END%
 %TMPL:DEF{"bodyclass"}%natMoveAttachmentBody%TMPL:END%
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"move attachment"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"move attachment"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"contenttitle"}%<!-- contenttitle-->
-<h1>
-%IFDEFINEDTHEN{"%URLPARAM{"newweb"}%" as="%TRASHWEB%"}%
-%MAKETEXT{"Delete attachment \"[_1]\"" args="<nop>%FILENAME%"}%
-%ELSEDEFINED%
-%MAKETEXT{"Move attachment \"[_1]\"" args="<nop>%FILENAME%"}%
-%FIDEFINED%
-</h1>
+<h1>%IF{"$'URLPARAM{newweb}'='%TRASHWEB%'"
+  then="%MAKETEXT{"Delete attachment '[_1]'" args="<nop>%FILENAME%"}%"
+  else="%MAKETEXT{"Move attachment '[_1]'" args="<nop>%FILENAME%"}%"
+}%</h1>
 <!-- //contenttitle -->%TMPL:END%
 %TMPL:DEF{"meta"}% <meta name="robots" content="noindex, nofollow" /> %TMPL:END%
-%TMPL:DEF{"onloadscript"}%document.rename.newtopic.focus();%TMPL:END%
 %TMPL:DEF{"content"}%<!-- content -->
+%JQREQUIRE{"focus"}%<!-- jqfocus -->
 %TMPL:P{"contenttitle"}%<!-- contenttitle// -->
-<form name="rename" action="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%">
-%IFDEFINEDTHEN{"%URLPARAM{"newweb"}%" as="%TRASHWEB%"}%
-<h3>Are you sure?</h3>
-
+<form name="rename" action="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%" method="post">
+%IF{"$'URLPARAM{newweb}'='%TRASHWEB%'" 
+  then="$percntTMPL:P{\"content_trash\"}$percnt" 
+  else="$percntTMPL:P{\"content_move\"}$percnt" 
+}%
+<input type="hidden" name="attachment" value="%FILENAME%" />
+<input type="hidden" name="newattachment" value="%NEW_FILENAME%" />
+<input type="hidden" name="changeRefs" value="0" />
+</div>
+</form>
+<!-- //content -->%TMPL:END%
+%TMPL:DEF{"notes"}%<!-- notes -->
+%IF{"$'URLPARAM{newweb}'='%TRASHWEB%'" 
+  then="$percntTMPL:P{\"notes_trash\"}$percnt" 
+  else="$percntTMPL:P{\"notes_move\"}$percnt" 
+}%
+<p> 
+  %MAKETEXT{"Note that any URLs that refer to the attachment will be broken after this move."}%
+</p>
+<!-- //notes -->%TMPL:END%
+%TMPL:DEF{"content_trash"}%<!-- content_trash -->
 <input type="hidden" name="newweb" value="%TRASHWEB%" />
 <input type="hidden" name="newtopic" value="TrashAttachment" />
-<input type="submit" class="natOkButton" value='%MAKETEXT{"Yes"}%' />&nbsp;
-<input type="button" class="natCancelButton" value='%MAKETEXT{"No"}%' onclick="window.location.href='%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%'">
-%ELSEDEFINED%
-<div class="foswikiFormSteps twikiFormSteps">
-<div class="foswikiFormStep twikiFormStep">
+<div class="foswikiFormSteps">
+  <div class="foswikiFormStep">
+  <h2>Are you sure?</h2>
+  </div>
+  <div class="foswikiFormStep foswikiFormLast foswikiFormButtons">
+  %BUTTON{"%MAKETEXT{"Yes"}%" icon="tick" type="save"}%
+  %BUTTON{"%MAKETEXT{"No"}%" icon="cross" target="%WEB%.%TOPIC%"}%
+  %CLEAR%
+  </div>
+</div>
+<!-- //content_trash -->%TMPL:END%
+%TMPL:DEF{"content_move"}%<!-- content_move -->
+<div class="foswikiFormSteps">
+<div class="foswikiFormStep">
   <h3>%MAKETEXT{"From"}%:</h3>
-  <span class="twikiAlert"><nop>%WEB%.%TOPIC%</span>
+  <span class="foswikiAlert"><nop>%WEB%.%TOPIC%</span>
 </div>
-<div class="foswikiFormStep twikiFormStep">
+<div class="foswikiFormStep">
   <h3>%MAKETEXT{"Move attachment to web:"}%</h3>
   <select name="newweb" onchange="if (document.rename.newweb.value == '%TRASHWEB%') { document.rename.newtopic.value = 'TrashAttachment'; document.rename.totrash.checked = true; } else { document.rename.totrash.checked = false; }"> 
-    %WEBLIST{"<option $marker value='$name'>$name</option>" webs="%TRASHWEB%,%NEW_WEB%,public" selection="%NEW_WEB%" separator=" "}% 
+    %FLEXWEBLIST{"<option $marker value='$name'>$name</option>" webs="%TRASHWEB%,%NEW_WEB%,publiccurrent" selection="%IFDEFINED{"%NEW_WEB%" then="$test" else="%WEB%"}%" marker=" selected " separator=" "}% 
   </select>
 
   <label for="totrash">
-    <input type="checkbox" class="foswikiCheckbox twikiCheckbox" name="totrash" id="totrash" onclick="var elem = document.rename.newweb; if (elem.value == '%TRASHWEB%') { elem.value = '%WEB%'; document.rename.newtopic.value = '%TOPIC%'; document.rename.totrash.checked = false; } else { elem.value = '%TRASHWEB%'; document.rename.newtopic.value = 'TrashAttachment'; document.rename.totrash.checked = true; }">
+    <input type="checkbox" class="foswikiCheckbox" name="totrash" id="totrash" onclick="var elem = document.rename.newweb; if (elem.value == '%TRASHWEB%') { elem.value = '%WEB%'; document.rename.newtopic.value = '%TOPIC%'; document.rename.totrash.checked = false; } else { elem.value = '%TRASHWEB%'; document.rename.newtopic.value = 'TrashAttachment'; document.rename.totrash.checked = true; }">
     %MAKETEXT{"Move to %TRASHWEB%"}%
   </label>
 </div>
-<div class="foswikiFormStep twikiFormStep">
+<div class="foswikiFormStep">
   <h3>%MAKETEXT{"To topic:"}%</h3>
-  <input type="text" name="newtopic" value="%TOPIC%" size="40"/>
+  <input type="text" name="newtopic" value="%TOPIC%" size="40" class="jqFocus" />
 </div>
-<div class="foswikiFormStep twikiFormStep">
+<div class="foswikiFormStep">
 </div>
-<div class="foswikiFormStep twikiFormStep foswikiFormButtons twikiFormButtons foswikiFormLast twikiFormLast">
-  %BUTTON{"%MAKETEXT{"OK"}%" type="submit" icon="tick"}%
+<div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
+  %BUTTON{"%MAKETEXT{"OK"}%" type="save" icon="tick"}%
   %BUTTON{"%MAKETEXT{"Cancel"}%" target="%WEB%.%TOPIC%" icon="cross"}%
   %CLEAR%
 </div>
 </div>
-%FIDEFINED%
-<input type="hidden" name="attachment" value="%FILENAME%" />
-<input type="hidden" name="changeRefs" value="0" />
-</div>
-</form>
-<!-- //content -->%TMPL:END%
-%TMPL:DEF{"notes"}%<!-- notes -->
-%IFDEFINEDTHEN{"%URLPARAM{"newweb"}%" as="%TRASHWEB%"}%
+<!-- //content_move -->%TMPL:END%
+%TMPL:DEF{"notes_trash"}%<!-- notes_trash -->
 <p>
   %MAKETEXT{"When the file is deleted, it is moved to the %TRASHWEB% web and attached to the %TRASHWEB%.TrashAttachment topic."}%
 </p>
 <p> 
   %MAKETEXT{"The attachment and its history will be moved as well."}%
 </p>
-%ELSEDEFINED%
+<!-- //notes_trash -->%TMPL:END%
+%TMPL:DEF{"notes_move"}%<!-- notes_move -->
 <p>
   %MAKETEXT{"To delete an attachment move it to the [_1] topic." args="%TRASHWEB%.TrashAttachment"}%
 </p>
@@ -83,8 +102,4 @@
 <p> 
   %MAKETEXT{"The new topic chosen must already exist."}%
 </p>
-%FIDEFINED%
-<p> 
-  %MAKETEXT{"Note that any URLs that refer to the attachment will be broken after this move."}%
-</p>
-<!-- //notes -->%TMPL:END%
+<!-- //notes_move -->%TMPL:END%
diff --git a/templates/oo2twiki.nat.tmpl b/templates/oo2twiki.nat.tmpl
index 7e74a89..90ce5f2 100644
--- a/templates/oo2twiki.nat.tmpl
+++ b/templates/oo2twiki.nat.tmpl
@@ -1,4 +1,4 @@
-%TMPL:INCLUDE{"attach"}%<!-- template: oo2twiki.nat.tmpl -->
+%TMPL:INCLUDE{"attach"}%<!-- template: oo2foswiki.nat.tmpl -->
 %TMPL:DEF{"title"}%%TOPIC% (import) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"attachaction"}% <!-- attachaction -->
 <input type="submit" class="natOkButton" title="Upload selected file" value='%MAKETEXT{"Upload file"}%' />
@@ -24,9 +24,9 @@ size and complexity of the uploaded document.%ENDCOLOR%
 %TMPL:DEF{"content"}%<!-- content -->
 <h2>%MAKETEXT{"Import <nop>OpenOffice Document"}%</h2>
 
-<div class="twikiPageForm">
+<div class="foswikiPageForm">
 <form name="main" enctype="multipart/form-data" action="%SCRIPTURLPATH{"convert"}%/%WEB%/%TOPIC%" method="post">
-<input type="hidden" class="twikiCheckbox" name="hidefile" value="0" /> 
+<input type="hidden" class="foswikiCheckbox" name="hidefile" value="0" /> 
 <table>
  <tr>
   <th align="right">
diff --git a/templates/oops.nat.tmpl b/templates/oops.nat.tmpl
index 04a1760..06a1121 100755
--- a/templates/oops.nat.tmpl
+++ b/templates/oops.nat.tmpl
@@ -5,7 +5,7 @@
 %TMPL:INCLUDE{"oopsjavascript"}%<!-- oopsjavascript// -->
 %TMPL:INCLUDE{"oopsstyles"}%<!-- oopsstyles// -->
 %TMPL:DEF{"bodyclass"}%natOopsBody%TMPL:END%
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"oops"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"oops"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"contenttitle"}%<h1 class="%TMPL:P{"headingstyle"}%">%TMPL:P{"heading"}%</h1>
 %TMPL:DEF{"meta"}% <meta name="robots" content="noindex, nofollow" /> %TMPL:END%
 %TMPL:DEF{"headingstyle"}%natOopsHeading%TMPL:END%
@@ -17,8 +17,8 @@
 %MAKETEXT{"Please go <a href=\"javascript:history.back()\">back</a> in your browser and try again."}%
 
 <form class="natOopsButtons" name="ButtonBox" action="%WIKILOGOURL%">
-  %BUTTON{"%MAKETEXT{"OK"}%" icon="tick" onclick="history.back()"}%
-  %BUTTON{"%MAKETEXT{"Cancel"}%" target="%WIKILOGOURL%" icon="cross"}%
+  %BUTTON{"%MAKETEXT{"Retry"}%" icon="tick" onclick="history.back()"}%
+  %BUTTON{"%MAKETEXT{"Abort"}%" target="%WIKILOGOURL%" icon="cross"}%
   %CLEAR%
 </form> 
 <!-- //goback -->%TMPL:END%
diff --git a/templates/oopsaccesschange.nat.tmpl b/templates/oopsaccesschange.nat.tmpl
index 55c4f2e..a60ffeb 100755
--- a/templates/oopsaccesschange.nat.tmpl
+++ b/templates/oopsaccesschange.nat.tmpl
@@ -1,7 +1,5 @@
-%TMPL:INCLUDE{"oopslogonbase"}%
-<!-- template: oopsaccesschange.nat.tmpl -->
+%TMPL:INCLUDE{"oopslogonbase"}%<!-- template: oopsaccesschange.nat.tmpl -->
 %TMPL:DEF{"action"}%edit%TMPL:END%
-%TMPL:DEF{"onloadscript"}%document.LogonForm.username.focus();%TMPL:END%
 %TMPL:DEF{"heading"}%%MAKETEXT{"Change Access Denied"}%%TMPL:END%
 %TMPL:DEF{"message"}% <!-- -->
 %MAKETEXT{"[_1] has no permission to change topic [[[_2]]]." args="%USERNAME%,%WEB%.%TOPIC%"}%
diff --git a/templates/oopsaccessdenied.nat.tmpl b/templates/oopsaccessdenied.nat.tmpl
index f3d44b2..511e8de 100755
--- a/templates/oopsaccessdenied.nat.tmpl
+++ b/templates/oopsaccessdenied.nat.tmpl
@@ -1,5 +1,4 @@
-%TMPL:INCLUDE{"oopslogonbase"}%
-<!-- template: oopsaccessdenied.nat.tmpl -->
+%TMPL:INCLUDE{"oopslogonbase"}%<!-- template: oopsaccessdenied.nat.tmpl -->
 %TMPL:INCLUDE{"messages"}%
 %TMPL:DEF{"heading"}%%MAKETEXT{"Access Denied"}%%TMPL:END%
 %TMPL:DEF{"message"}%%INSTANTIATE%%TMPL:END%
diff --git a/templates/oopschangepasswd.nat.tmpl b/templates/oopschangepasswd.nat.tmpl
index bfa381e..6c4e286 100755
--- a/templates/oopschangepasswd.nat.tmpl
+++ b/templates/oopschangepasswd.nat.tmpl
@@ -1,6 +1,6 @@
 %TMPL:INCLUDE{"oops"}%
 <!-- template: oopschangepasswd.nat.tmpl -->
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"note"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"note"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"heading"}%%MAKETEXT{"Password changed successfully!"}%%TMPL:END%
 %TMPL:DEF{"headingstyle"}%natNoteHeading%TMPL:END%
 %TMPL:DEF{"message"}%<!-- -->
diff --git a/templates/oopserrbase.nat.tmpl b/templates/oopserrbase.nat.tmpl
index f0aad0b..74e617f 100755
--- a/templates/oopserrbase.nat.tmpl
+++ b/templates/oopserrbase.nat.tmpl
@@ -6,7 +6,7 @@
  args="<nop>%WIKITOOLNAME%"}%
 
 <noautolink>
-<form enctype="text/plain" method="post" name="ErrorMail" action="mailto:%WIKIWEBMASTER%?subject=%ENCODE{"%WIKITOOLNAME%: %TMPL:P{"heading"}%"}%">
+<form enctype="text/plain" name="ErrorMail" action="mailto:%WIKIWEBMASTER%?subject=%ENCODE{"%WIKITOOLNAME%: %TMPL:P{"heading"}%"}%" method="post">
 %TMPL:P{"formvariables"}%
 <textarea name="How to reproduce" id="description" wrap="virtual" cols="60" rows="5">%MAKETEXT{"... don't know, it just happended."}%</textarea>'
 <input type="submit" class="natOkButton" value='%MAKETEXT{"OK"}%'>&nbsp;
diff --git a/templates/oopshistory.nat.tmpl b/templates/oopshistory.nat.tmpl
index 15874e5..974f802 100644
--- a/templates/oopshistory.nat.tmpl
+++ b/templates/oopshistory.nat.tmpl
@@ -1,17 +1,17 @@
 %TMPL:INCLUDE{"oops"}%<!-- template: oopshistory.nat.tmpl -->
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"History"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"History"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"heading"}%%MAKETEXT{"Compare Revisions of [_1]" args="<nop>%TOPIC%"}% (r%HISTORY_REV1% - r%HISTORY_REV2%)%TMPL:END%
 %TMPL:DEF{"headingstyle"}%natNoteHeading%TMPL:END%
 %TMPL:DEF{"javascript"}%%TMPL:P{"defaultjavascript"}%%TMPL:P{"oopshistoryjavascript"}%%TMPL:END%
 %TMPL:DEF{"formstart"}%%TMPL:P{context="CompareRevisionsAddonPluginEnabled" then="formstart_compare" else="formstart_rdiff"}%%TMPL:END%
 %TMPL:DEF{"formstart_compare"}%<!-- formstart_compare -->
-<div class="twikiFormSteps">
+<div class="foswikiFormSteps">
 <form name="main" action="%SCRIPTURLPATH{"compare"}%/%WEB%/%TOPIC%">
   <input type="hidden" name="render" value="interweave" />
   <input type="hidden" name="type" value="history">
 <!-- //formstart_compare -->%TMPL:END%
 %TMPL:DEF{"formstart_rdiff"}%<!-- formstart_rdiff -->
-<div class="twikiFormSteps">
+<div class="foswikiFormSteps">
 <form name="main" action="%SCRIPTURLPATH{"rdiff"}%/%WEB%/%TOPIC%">
   <input type="hidden" name="render" value="sequential" />
   <input type="hidden" name="type" value="history">
@@ -19,7 +19,9 @@
 %TMPL:DEF{"formend"}%</form></div>%TMPL:END%
 %TMPL:DEF{"oopshistoryjavascript"}%<!-- oopshistoryjavascript -->
 <script type="text/javascript">
+//<![CDATA[
 /* updates the radio buttons in a way to prevent illegal selections */
+(function($) {
 function updateRadio () {
   var vals = [];
   $(".natHistoryTable input[@checked]").each(function () {
@@ -30,8 +32,8 @@ function updateRadio () {
     var rev = $(this).attr('name');
     var val = parseInt($(this).val(), 10);
     if (val > 0) {
-      if ((rev == 'rev1' && val > vals['rev2']) ||
-          (rev == 'rev2' && val < vals['rev1'])) {
+      if ((rev == 'rev2' && val > vals['rev1']) ||
+          (rev == 'rev1' && val < vals['rev2'])) {
         $(this).removeAttr('disabled');
       }
     }
@@ -40,10 +42,12 @@ function updateRadio () {
 }
 $(function() {
   updateRadio();
-  $(".natHistoryTable input[@name='rev1']:last").attr('disabled','disabled').attr('value', '0');
-  $(".natHistoryTable input[@name='rev2']:first").attr('disabled','disabled').attr('value', '0');
+  $(".natHistoryTable input[@name='rev1']:first").attr('disabled','disabled').attr('value', '0');
+  $(".natHistoryTable input[@name='rev2']:last").attr('disabled','disabled').attr('value', '0');
   $(".natHistoryTable input").click(updateRadio);
 });
+})(jQuery);
+//]]>
 </script>
 <!-- //oopshistoryjavascript -->%TMPL:END%
 %TMPL:DEF{"rev_table"}%%TMPL:P{context="RevCommentPluginEnabled" then="table_rcp_enabled" else="table_rcp_disabled"}%%TMPL:END%
@@ -58,10 +62,10 @@ $(function() {
 %~~ HISTORY{
 ~~~   format="
 ~~~     <tr>
-~~~       <td align=\"right\">
+~~~       <td align='right'>
 ~~~         $rev
-~~~         <input $checked1 type=\"radio\" name=\"rev1\" value=\"$rev\">
-~~~         <input $checked2 type=\"radio\" name=\"rev2\" value=\"$rev\">
+~~~         <input $checked1 type='radio' name='rev2' value='$rev'>
+~~~         <input $checked2 type='radio' name='rev1' value='$rev'>
 ~~~       </td>
 ~~~       <td>$date</td>
 ~~~       <td>$percntIFEXISTS{\"$wikiusername\" then=\"[[$wikiusername][$wikiname]]\" else=\"<nop>$wikiname\"}$percnt</td>
@@ -74,7 +78,7 @@ $(function() {
 ~~~      }$percnt
 ~~~      $percntBUTTON{\"Restore\"
 ~~~        icon=\"arrow_refresh\"
-~~~        href=\"%SCRIPTURLPATH{"manage"}%/%WEB%/%TOPIC%?t=%GMTIME{"$epoch"}%&action=restoreRevision&rev=$rev\" 
+~~~        href=\"%SCRIPTURLPATH{"edit"}%/%WEB%/%TOPIC%?t=%GMTIME{"$epoch"}%;rev=$rev\" 
 ~~~        title=\"%MAKETEXT{"Restore revision [_1]" args="$rev"}%\"
 ~~~        class=\"natHistoryAction\"
 ~~~      }$percnt
@@ -87,40 +91,40 @@ $(function() {
 ~~~  header=""
 ~~~  footer="
 ~~~    <tr>
-~~~      <td colspan=\"3\" align='center'>
+~~~      <td colspan='3' align='center'>
 ~~~        $percntIFDEFINEDTHEN{\"$next{'test'}\" as=\"test\" glue=\"off\"}$percnt
 *~~        </a>
-~~~        <a href=\"$next{'%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory&nrev=$nrev'}\">
-*~~          <img src=\"%PUBURLPATH%/%TWIKIWEB%/NatSkin/control-start.png\" 
-~~~               alt=\"%MAKETEXT{show last revisions}%\"
-~~~               title=\"%MAKETEXT{show last revisions}%\" />
+~~~        <a href='$next{'%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory;nrev=$nrev'}'>
+*~~          <img src='%PUBURLPATH%/%SYSTEMWEB%/NatSkin/icons/control-start.png' 
+~~~               alt='%MAKETEXT{show last revisions}%'
+~~~               title='%MAKETEXT{show last revisions}%' />
 *~~        </a>
-~~~        <a href=\"$next{'%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory&rev2=$rev2&nrev=$nrev'}\">
-*~~          <img src=\"%PUBURLPATH%/%TWIKIWEB%/NatSkin/control-left.png\" 
-~~~               alt=\"%MAKETEXT{show later revisions}%\"
-~~~               title=\"%MAKETEXT{show later revisions}%\" />
+~~~        <a href='$next{'%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory;rev2=$rev2;nrev=$nrev'}'>
+*~~          <img src='%PUBURLPATH%/%SYSTEMWEB%/NatSkin/icons/control-left.png' 
+~~~               alt='%MAKETEXT{show later revisions}%'
+~~~               title='%MAKETEXT{show later revisions}%' />
 *~~        </a>
 ~~~        $percntELSEDEFINED$percnt
-~~~          <img src=\"%PUBURLPATH%/%TWIKIWEB%/NatSkin/control-start-gray.png\" 
-~~~               alt=\"%MAKETEXT{blank}%\" />
-~~~          <img src=\"%PUBURLPATH%/%TWIKIWEB%/NatSkin/control-left-gray.png\" 
-~~~               alt=\"%MAKETEXT{blank}%\" />
+~~~          <img src='%PUBURLPATH%/%SYSTEMWEB%/NatSkin/icons/control-start-gray.png' 
+~~~               alt='%MAKETEXT{blank}%' />
+~~~          <img src='%PUBURLPATH%/%SYSTEMWEB%/NatSkin/icons/control-left-gray.png' 
+~~~               alt='%MAKETEXT{blank}%' />
 ~~~        $percntFIDEFINED$percnt
 ~~~        $percntIFDEFINEDTHEN{\"$previous{'test'}\" as=\"test\" glue=\"off\"}$percnt
-~~~        <a href=\"$previous{'%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory&rev2=$rev2&nrev=$nrev'}\">
-*~~          <img src=\"%PUBURLPATH%/%TWIKIWEB%/NatSkin/control-right.png\" 
-~~~               alt=\"%MAKETEXT{show earlier revisions}%\"
-~~~               title=\"%MAKETEXT{show earlier revisions}%\" />
+~~~        <a href='$previous{'%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory;rev2=$rev2;nrev=$nrev'}'>
+*~~          <img src='%PUBURLPATH%/%SYSTEMWEB%/NatSkin/icons/control-right.png' 
+~~~               alt='%MAKETEXT{show earlier revisions}%'
+~~~               title='%MAKETEXT{show earlier revisions}%' />
 *~~        </a>
-~~~        <a href=\"$previous{'%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory&rev1=1&nrev=$nrev'}\">
-*~~          <img src=\"%PUBURLPATH%/%TWIKIWEB%/NatSkin/control-end.png\" 
-~~~               alt=\"%MAKETEXT{show first revisions}%\"
-~~~               title=\"%MAKETEXT{show first revisions}%\" />
+~~~        <a href='$previous{'%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory;rev1=1;nrev=$nrev'}'>
+*~~          <img src='%PUBURLPATH%/%SYSTEMWEB%/NatSkin/icons/control-end.png' 
+~~~               alt='%MAKETEXT{show first revisions}%'
+~~~               title='%MAKETEXT{show first revisions}%' />
 ~~~        $percntELSEDEFINED$percnt
-~~~          <img src=\"%PUBURLPATH%/%TWIKIWEB%/NatSkin/control-right-gray.png\" 
-~~~               alt=\"%MAKETEXT{blank}%\" />
-~~~          <img src=\"%PUBURLPATH%/%TWIKIWEB%/NatSkin/control-end-gray.png\" 
-~~~               alt=\"%MAKETEXT{blank}%\" />
+~~~          <img src='%PUBURLPATH%/%SYSTEMWEB%/NatSkin/icons/control-right-gray.png' 
+~~~               alt='%MAKETEXT{blank}%' />
+~~~          <img src='%PUBURLPATH%/%SYSTEMWEB%/NatSkin/icons/control-end-gray.png' 
+~~~               alt='%MAKETEXT{blank}%' />
 ~~~        $percntFIDEFINED$percnt
 ~~~      </td>
 ~~~    </tr>"
@@ -144,10 +148,10 @@ $(function() {
 %~~ HISTORY{
 ~~~   format="
 ~~~     <tr>
-~~~       <td align=\"right\">
-~~~         <a href=\"%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?rev=1.$rev\">$rev</a>
-~~~         <input type=\"radio\" name=\"rev1\" value=\"$rev\">
-~~~         <input type=\"radio\" name=\"rev2\" value=\"$rev\">
+~~~       <td align='right'>
+~~~         <a href='%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?rev=1.$rev'>$rev</a>
+~~~         <input type='radio' name='rev1' value='$rev'>
+~~~         <input type='radio' name='rev2' value='$rev'>
 ~~~       </td>
 ~~~       <td>$date</td>
 ~~~       <td>%IFEXISTS{"$wikiusername" then="[[$wikiusername][$wikiname]]" else="<nop>$wikiname"}%</td>
@@ -159,11 +163,11 @@ $(function() {
 ~~~   header=""
 ~~~   footer="
 ~~~    <tr>
-~~~      <td colspan=\"3\">
-~~~        $previous{'first' url='%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory&rev1=1&nrev=$nrev'}
-~~~        $previous{'earlier' url='%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory&rev1=$rev1&nrev=$nrev'} 
-~~~        $next{'later' url='%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory&rev1=$rev1&nrev=$nrev'} 
-~~~        $next{'last' url='%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory&nrev=$nrev'}
+~~~      <td colspan='3'>
+~~~        $previous{'first' url='%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory;rev1=1;nrev=$nrev'}
+~~~        $previous{'earlier' url='%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory;rev1=$rev1;nrev=$nrev'} 
+~~~        $next{'later' url='%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory;rev1=$rev1;nrev=$nrev'} 
+~~~        $next{'last' url='%SCRIPTURLPATH{oops}%/%WEB%/%TOPIC%?template=oopshistory;nrev=$nrev'}
 ~~~      </td>
 ~~~    </tr>"
 ~~~ }%
diff --git a/templates/oopslanguagechanged.nat.tmpl b/templates/oopslanguagechanged.nat.tmpl
index 671e306..bd72328 100644
--- a/templates/oopslanguagechanged.nat.tmpl
+++ b/templates/oopslanguagechanged.nat.tmpl
@@ -4,13 +4,10 @@
 %TMPL:DEF{"heading"}%%MAKETEXT{"Change language"}%%TMPL:END%
 %TMPL:DEF{"headingstyle"}%natNoteHeading%TMPL:END%
 %TMPL:DEF{"message"}%
-%IFDEFINEDTHEN{"%URLPARAM{"language"}%" as="default" glue="off"}%
-%$nopSESSION_VARIABLE{"LANGUAGE" clear=" "}%
-%MAKETEXT{"Your language will be reset to the global default from the next screen on. You will be redirected to there right now. If you aren't, ~[~[[_1]~]~[click here~]~] to proceed." args="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%"}%
-%ELSEDEFINED%
-%$nopSESSION_VARIABLE{"LANGUAGE" set="%URLPARAM{language}%"}%
-%MAKETEXT{"Your language will be changed to [_1] from the next screen. You will be redirected to there right now. If you aren't, ~[~[[_2]~]~[click here~]~] to proceed." args="*%URLPARAM{language}%*, %SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%"}%
-%FIDEFINED%
+%IF{"$'URLPARAM{language}'='default'" 
+  then="$percntSESSION_VARIABLE{\"LANGUAGE\" clear=\" \"}$percnt %MAKETEXT{"Your language will be reset to the global default from the next screen on. You will be redirected to there right now. If you aren't, ~[~[[_1]~]~[click here~]~] to proceed." args="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%"}%"
+  else="$percntSESSION_VARIABLE{\"LANGUAGE\" set=\"%URLPARAM{language}%\"}$percnt %MAKETEXT{"Your language will be changed to [_1] from the next screen. You will be redirected to there right now. If you aren't, ~[~[[_2]~]~[click here~]~] to proceed." args="*%URLPARAM{language}%*, %SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%"}%"
+}%
 
 <form class="natOopsButtons" name="ButtonBox" action="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%">
   <input type="submit" class="natOkButton" value='%MAKETEXT{"OK"}%'>
@@ -19,6 +16,8 @@
 %TMPL:END%
 %TMPL:DEF{"javascript"}%%TMPL:P{"defaultjavascript"}%
 <script type="text/javascript">
+//<![CDATA[
 window.setTimeout("window.location.href = '%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%'",2000);
+//]]>
 </script>
 %TMPL:END%
diff --git a/templates/oopslogon.nat.tmpl b/templates/oopslogon.nat.tmpl
index 7485d4a..dafcf54 100755
--- a/templates/oopslogon.nat.tmpl
+++ b/templates/oopslogon.nat.tmpl
@@ -1,6 +1,6 @@
 %TMPL:INCLUDE{"oopslogonbase"}%
 <!-- template: oopslogon.nat.tmpl -->
-%TMPL:DEF{"title"}% %TOPICTITLE% (%MAKETEXT{"note"}%)  - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}% %TOPIC% (%MAKETEXT{"note"}%)  - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"heading"}%%MAKETEXT{"Welcome the [_1]" args="<nop>%WIKITOOLNAME%"}%%TMPL:END%
 %TMPL:DEF{"headingstyle"}%natNoteHeading%TMPL:END%
 %TMPL:DEF{"message"}%<!-- -->
diff --git a/templates/oopslogonbase.nat.tmpl b/templates/oopslogonbase.nat.tmpl
index b116a4c..dd8e2fe 100755
--- a/templates/oopslogonbase.nat.tmpl
+++ b/templates/oopslogonbase.nat.tmpl
@@ -1,3 +1,2 @@
-%TMPL:INCLUDE{"oops"}% 
+%TMPL:INCLUDE{"oops"}%<!-- template: oopslogonbase.tmpl -->
 %TMPL:INCLUDE{"loginbase"}%
-<!-- template: oopslogonbase.tmpl -->
diff --git a/templates/oopsmanage.nat.tmpl b/templates/oopsmanage.nat.tmpl
index 8e19fb2..36b0063 100755
--- a/templates/oopsmanage.nat.tmpl
+++ b/templates/oopsmanage.nat.tmpl
@@ -5,7 +5,7 @@
 
 %TMPL:DEF{"heading"}%%MAKETEXT{"Administration error"}%%TMPL:END%
 %TMPL:DEF{"message"}%<!-- -->
----++ %MAKETEXT{"Error: [_1] <span class=\"twikiAlert\">[_2]</span>" args="%PARAM1%,%PARAM2%"}%
+---++ %MAKETEXT{"Error: [_1] <span class=\"foswikiAlert\">[_2]</span>" args="%PARAM1%,%PARAM2%"}%
 %MAKETEXT{"Possibly caused by improper use of the =manage= script."}%<br />
 
 %TMPL:P{"goback"}%
diff --git a/templates/oopsmore.nat.tmpl b/templates/oopsmore.nat.tmpl
index f8f77b9..12680c4 100755
--- a/templates/oopsmore.nat.tmpl
+++ b/templates/oopsmore.nat.tmpl
@@ -1,7 +1,138 @@
 %TMPL:INCLUDE{"oops"}%<!-- template: oopsmore.nat.tmpl -->
 %TMPL:DEF{"bodyclass"}%natOopsMoreBody%TMPL:END%
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"tools"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"tools"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"heading"}%%MAKETEXT{"Tools"}%%TMPL:END%
 %TMPL:DEF{"headingstyle"}%natNoteHeading%TMPL:END%
-%TMPL:DEF{"message"}% %WEBCOMPONENT{"WebMoreTopicActions"}%
-%TMPL:END%
+%TMPL:DEF{"message"}% <!-- message -->
+<div class="foswikiFormSteps">
+  <div class="foswikiFormStep">
+    <h2>%MAKETEXT{"Rename, move or delete this topic"}%</h2>
+    %MAKETEXT{"Rename topic *[_1]*" args="%BASETOPIC%"}%
+
+    %MAKETEXT{"See also:"}% %SYSTEMWEB%.ManagingTopics.
+  </div>
+  <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
+    %BUTTON{"%MAKETEXT{"Rename"}%" target="%SCRIPTURLPATH{"rename"}%/%BASEWEB%/%BASETOPIC%?currentwebonly=on" icon="page_white_delete"}%
+    %CLEAR%
+  </div>
+</div>
+
+<div class="foswikiFormSteps">
+  <form name="editsettings" action="%SCRIPTURLPATH{"manage"}%/%BASEWEB%/%BASETOPIC%" method="post">
+    <input type="hidden" name="action" value="editSettings" />
+    <div class="foswikiFormStep">
+        <h2>%MAKETEXT{"Edit topic preferences"}%</h2>
+        %MAKETEXT{"Edit preference settings for '[_1]'" args="[[%BASEWEB%.%BASETOPIC%]]"}%
+    </div>
+    <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
+        %BUTTON{value="%MAKETEXT{"Edit"}%" type="save" icon="page_white_edit"}%
+        %CLEAR%
+    </div>
+  </form>
+</div>
+
+<div class="foswikiFormSteps">
+  <form name="searchbacklinks" action="%SCRIPTURLPATH{"oops"}%/%BASEWEB%/%BASETOPIC%">
+  <div class="foswikiFormStep">
+    <h2>%MAKETEXT{"Search for backlinks"}%</h2>
+  </div>
+  <div class="foswikiFormStep">
+    %MAKETEXT{"Find topics that link back to '[_1]'" args="[[%BASEWEB%.%BASETOPIC%]]"}%
+
+    <input type="radio" id="searchthis" name="template" value="backlinksweb" checked />
+    <label for="searchthis">%MAKETEXT{"Search in current web"}%</label>
+
+    <input type="radio" id="searchall" name="template" value="backlinksallwebs" />
+    <label for="searchall">%MAKETEXT{"Search in all public webs"}%</label>
+  </div>
+  <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
+    %BUTTON{"%MAKETEXT{"Search"}%" type="save" icon="find"}%
+    %CLEAR%
+  </div>
+  </form>
+</div>     
+
+<div class="foswikiFormSteps">
+  <form name="restoretopic" action="%SCRIPTURLPATH{"manage"}%/%BASEWEB%/%BASETOPIC%" method="post">
+    <input type="hidden" name="action" value="restoreRevision" />
+    <input type="hidden" name="nowysiwyg" value="1" />
+    <div class="foswikiFormStep">
+      <h2>%MAKETEXT{"Restore topic"}%</h2>
+      %MAKETEXT{"Restore topic to revision:"}% 
+      <input class="foswikiInputField" type="text" name="rev" size="6" value="%NATMAXREV%" />
+      <div class="foswikiFormDescription">
+        %MAKETEXT{"You will be able to review the topic before saving it to a new revision."}%
+      </div>
+    </div>
+    <div clasS="foswikiFormStep foswikiFormButtons foswikiFormLast">
+      %BUTTON{"%MAKETEXT{"Restore"}%" icon="arrow_undo" type="save" }%
+      %CLEAR%
+    </div>
+  </form>
+</div>
+
+<div class="foswikiFormSteps" style="%IF{"not {Cache}{Enabled}" then="display:none"}%">
+  <div class="foswikiFormStep">
+    <h2>%MAKETEXT{"Refresh topic caching"}%</h2>
+    %MAKETEXT{"Get a fresh page of the topic [_1]" args="[[%BASEWEB%.%BASETOPIC%]]"}%&nbsp;
+  </div>
+  <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
+    %BUTTON{"%MAKETEXT{"Refresh"}%" icon="arrow_refresh" target="%SCRIPTURLPATH{"view"}%/%BASEWEB%/%BASETOPIC%?refresh=on" }%
+    %CLEAR%
+  </div>
+</div>
+
+<div class="foswikiFormSteps" style="%IF{"not {Cache}{Enabled}" then="display:none"}%">
+  <div class="foswikiFormStep">
+    <h2>Dependencies</h2>
+    %MAKETEXT{"List of topics the current depends on."}%
+  </div>
+  <div id="dependencies" class="foswikiFormStep foswikiFormButtons foswikiFormLast">
+    %BUTTON{"Show Dependencies" 
+      onclick="jQuery(this).find('.jqButtonIcon').css('background-image','url(%PUBURLPATH%/%SYSTEMWEB%/JQueryPlugin/plugins/spinner/spinner.gif)');jQuery('#dependencies').load('%SCRIPTURLPATH{"rest"}%/RenderPlugin/tag?name=DISPLAYDEPENDENCIES;topic=%BASEWEB%.%BASETOPIC%;render=on');return false;"
+      icon="page_white_stack"
+    }%
+    %CLEAR%
+  </div>
+</div>
+
+<div class="foswikiFormSteps" style='%IF{"context i18n_enabled" then="" else="display:none"}%'>
+  <form name="changelanguage" action="%SCRIPTURLPATH{"oops"}%/%BASEWEB%/%BASETOPIC%" method="post">
+    <input type="hidden" name="template" value="oopslanguagechanged" />
+    <input type="hidden" name="refresh" value="on" />
+    <div class="foswikiFormStep">
+      <h2>%MAKETEXT{"Change interface language"}%</h2>
+      <select name="language">
+      <option value="default">Default</option>
+      %LANGUAGES{format="<option $marker value=\"$langtag\">$langname</option>" selection="%LANGUAGE%" separator=" "}%
+      </select>
+
+      <input type="checkbox" class="foswikiCheckbox" name="todefault" id="todefault" onclick="document.changelanguage.language.value = (this.checked)?'default':'%LANGUAGE%';this.blur();">
+      <label for="todefault">%MAKETEXT{"Default language"}%</label>
+    </div>
+    <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
+      %BUTTON{"%MAKETEXT{"Submit"}%" type="save" icon="world"}%
+      %CLEAR%
+    </div>
+  </form>
+</div>
+
+<!-- //message -->%TMPL:END%
+%TMPL:DEF{"content"}%<!-- content -->
+<div class="natOopsMore">
+  <div class="natOopsMessage">
+%BUTTON{"%MAKETEXT{"Close"}%" 
+  title="%MAKETEXT{"Close this dialog"}%"
+  style="float:right;margin:0px;" 
+  target="%BASEWEB%.%BASETOPIC%" 
+  icon="cross"
+}%
+%TMPL:P{"contenttitle"}%<!-- contenttitle// -->
+%TMPL:P{"message"}%<!-- message// -->
+    <div class="natContact"> 
+      %TMPL:P{"contact"}% 
+    </div>
+  </div>
+</div>
+
+<!-- // content -->%TMPL:END%
diff --git a/templates/oopsregrequ.nat.tmpl b/templates/oopsregrequ.nat.tmpl
index c5ac685..eb44abc 100755
--- a/templates/oopsregrequ.nat.tmpl
+++ b/templates/oopsregrequ.nat.tmpl
@@ -2,6 +2,6 @@
 <!-- template: oopsregrequ.nat.tmpl -->
 %TMPL:DEF{"heading"}%%MAKETEXT{"Missing Fields"}%%TMPL:END%
 %TMPL:DEF{"message"}%<!-- -->
-%MAKETEXT{"Fields with a =<span class=\"twikiAlert\">**</span>= mark are required."}%
+%MAKETEXT{"Fields with a =<span class=\"foswikiAlert\">**</span>= mark are required."}%
 
 %TMPL:P{"goback"}% %TMPL:END%
diff --git a/templates/oopsregthanks.nat.tmpl b/templates/oopsregthanks.nat.tmpl
index 316811f..99fc792 100755
--- a/templates/oopsregthanks.nat.tmpl
+++ b/templates/oopsregthanks.nat.tmpl
@@ -1,5 +1,5 @@
 %TMPL:INCLUDE{"oops"}%<!-- template: oopsregthanks.nat.tmpl -->
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"note"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"note"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"headingstyle"}%natNoteHeading%TMPL:END%
 %TMPL:DEF{"heading"}%%MAKETEXT{"Thank you for registering"}%%TMPL:END%
 %TMPL:DEF{"message"}%<!-- message -->
diff --git a/templates/oopsrenamenotwikiword.nat.tmpl b/templates/oopsrenamenotwikiword.nat.tmpl
index b601bbf..956541e 100755
--- a/templates/oopsrenamenotwikiword.nat.tmpl
+++ b/templates/oopsrenamenotwikiword.nat.tmpl
@@ -1,5 +1,4 @@
-%TMPL:INCLUDE{"oops"}%
-<!-- template: oopsrenamenotwikiword.nat.tmpl -->
+%TMPL:INCLUDE{"oops"}%<!-- template: oopsrenamenowikiword.nat.tmpl -->
 %TMPL:DEF{"heading"}%%MAKETEXT{"New topic name is not a <nop>WikiWord"}% %TMPL:END%
 %TMPL:DEF{"message"}%<!-- -->
 %MAKETEXT{"Please chose a topic name that is a [_1] or check the _Allow non-Wiki Word_ &nbsp;box." args="%SYSTEMWEB%.WikiWord"}%
diff --git a/templates/oopsresetpasswd.nat.tmpl b/templates/oopsresetpasswd.nat.tmpl
index 47d3feb..1ea8cb5 100755
--- a/templates/oopsresetpasswd.nat.tmpl
+++ b/templates/oopsresetpasswd.nat.tmpl
@@ -1,6 +1,6 @@
 %TMPL:INCLUDE{"oops"}%
 <!-- template: oopsresetpasswd.nat.tmpl -->
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"note"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"note"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"color"}%green%TMPL:END%
 %TMPL:DEF{"heading"}%%MAKETEXT{"Request to reset your <nop>%WIKITOOLNAME% password"}%%TMPL:END%
 %TMPL:DEF{"mailuri"}%"mailto:%WIKIWEBMASTER%?subject=%WIKITOOLNAME%&#32;-&#32;Sorry,&#32;please&#32;reset&#32;my&#32;password&amp;body=%PARAM1%"%TMPL:END%
@@ -15,7 +15,7 @@
 %MAKETEXT{"Please copy this information into a friendly e-mail to [_1]"
  args="<a href=%TMPL:P{\"mailuri\"}%>%WIKIWEBMASTER%</a>"}%
 
-<form name="ButtonBox" enctype="text/plain" method="post" action=%TMPL:P{"mailuri"}%>
+<form name="ButtonBox" enctype="text/plain" action=%TMPL:P{"mailuri"}% method="post">
   <input type="hidden" name="Password" value="%PARAM1%" />
   <input type="submit" class="natOkButton" value ='%MAKETEXT{"OK"}%'>&nbsp;
   <input type="button" class="natCancelButton" value='%MAKETEXT{"Cancel"}%' onclick="history.back()">
diff --git a/templates/oopsrev.nat.tmpl b/templates/oopsrev.nat.tmpl
index 1b08325..44f151f 100755
--- a/templates/oopsrev.nat.tmpl
+++ b/templates/oopsrev.nat.tmpl
@@ -13,31 +13,31 @@
   <tr>
     <td align="center">
       <label for="sequential">
-	<img src="%PUBURLPATH%/%TWIKIWEB%/NatSkin/oopsmore_diff_sequential.gif" alt='%MAKETEXT{"sequential"}%' width="80" height="80" />
+	<img src="%PUBURLPATH%/%SYSTEMWEB%/NatSkin/oopsmore_diff_sequential.gif" alt='%MAKETEXT{"sequential"}%' width="80" height="80" />
       </label>
     </td>
     <td align="center">
       <label for="sidebyside">
-	<img src="%PUBURLPATH%/%TWIKIWEB%/NatSkin/oopsmore_diff_sidebyside.gif" alt='%MAKETEXT{"side by side"}%' width="80" height="80" />
+	<img src="%PUBURLPATH%/%SYSTEMWEB%/NatSkin/oopsmore_diff_sidebyside.gif" alt='%MAKETEXT{"side by side"}%' width="80" height="80" />
       </label>
     </td>
     <td align="center">
       <label for="debug">
-	<img src="%PUBURLPATH%/%TWIKIWEB%/NatSkin/oopsmore_diff_debug.gif" alt='%MAKETEXT{"debug"}%' width="80" height="80" />
+	<img src="%PUBURLPATH%/%SYSTEMWEB%/NatSkin/oopsmore_diff_debug.gif" alt='%MAKETEXT{"debug"}%' width="80" height="80" />
       </label>
     </td>
   </tr>
   <tr>
     <td align="center">
-      <input type="radio" class="twikiRadiobox" name="render" id="sequential" value="sequential" checked="checked" />
+      <input type="radio" class="foswikiRadiobox" name="render" id="sequential" value="sequential" checked="checked" />
       <label for="sequential">%MAKETEXT{"sequential"}%</label>
       </td>
     <td align="center">
-      <input type="radio" class="twikiRadiobox" name="render" id="sidebyside" value="sidebyside" />
+      <input type="radio" class="foswikiRadiobox" name="render" id="sidebyside" value="sidebyside" />
       <label for="sidebyside">%MAKETEXT{"side by side"}%</label>
     </td>
     <td align="center">
-      <input type="radio" class="twikiRadiobox" name="render" id="debug" value="debug" />
+      <input type="radio" class="foswikiRadiobox" name="render" id="debug" value="debug" />
       <label for="debug">%MAKETEXT{"debug"}%</label>
     </td>
   </tr>
@@ -68,7 +68,7 @@
 <form style="margin:0px" name="main" action="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%">
   <input type="text" name="rev" size="6" value="%PARAM1%" /> <br />
   (1 ... %PARAM3%) </td>
-<td valign=top style="padding-left:1em"> %MAKETEXT{"in <input type=\"checkbox\" class=\"twikiCheckbox\" name=\"raw\"> raw text format."}%</td>
+<td valign=top style="padding-left:1em"> %MAKETEXT{"in <input type=\"checkbox\" class=\"foswikiCheckbox\" name=\"raw\"> raw text format."}%</td>
 </tr>
 <tr>
 <td>&nbsp;</td>
diff --git a/templates/oopswrongpassword.nat.tmpl b/templates/oopswrongpassword.nat.tmpl
index 46d7907..36f470e 100755
--- a/templates/oopswrongpassword.nat.tmpl
+++ b/templates/oopswrongpassword.nat.tmpl
@@ -1,6 +1,5 @@
 %TMPL:INCLUDE{"oopslogonbase"}%
 <!-- template: oopswrongpassword.nat.tmpl -->
-%TMPL:DEF{"onloadscript"}%document.LogonForm.username.focus();%TMPL:END%
 %TMPL:DEF{"heading"}%%MAKETEXT{"Incorrect Password"}%%TMPL:END%
 %TMPL:DEF{"message"}%<!-- -->
 %MAKETEXT{"The password you entered in the *password* field is incorrect. Please try again."}%
diff --git a/templates/page.nat.tmpl b/templates/page.nat.tmpl
index 6c8d24d..c26d919 100755
--- a/templates/page.nat.tmpl
+++ b/templates/page.nat.tmpl
@@ -1,23 +1,26 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+%TMPL:P{"page"}%<!-- page //-->
+%TMPL:DEF{"page"}%<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html class="natHtml" xmlns="http://www.w3.org/1999/xhtml" xml:lang="%LANG%" lang="%LANG%">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
+%TMPL:P{"head"}%<!-- head// -->
+%TMPL:P{"body"}%<!-- body // -->
+</html>
+<!-- template: page.nat.tmpl -->
+%TMPL:END%
+%TMPL:DEF{"head"}%<head>
+<meta http-equiv="Content-Type" content="%CONTENTTYPE%; charset=%CHARSET%">
 <title>%TMPL:P{"title"}%</title>
-<meta name="generator" content="Foswiki/NatSkin" /> %TMPL:P{"meta"}%
-%IFDEFINEDTHEN{"%FAVICON%"}%
-<link rel="icon" href="%FAVICON%" type="image/x-icon" />
-<link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />
-%FIDEFINED%
+<meta name="date" content="%REVINFO{"$http"}%"> 
+%TMPL:P{"meta"}%
+<link rel="icon" href="%FAVICON%" type="image/x-icon">
+<link rel="shortcut icon" href="%FAVICON%" type="image/x-icon">
+%RENDERHEAD%
 %GETSKINSTYLE%
 %TMPL:P{"styles"}%
 %TMPL:P{"javascript"}%
-%WEBCOMPONENT{"WebHtmlHead"}%
-</head>
-<body class="%TMPL:P{"defaultbodyclass"}% %TMPL:P{"bodyclass"}% %IFSKINSTATE{sidebar="left" then="natBodyLeft" else="natBodyRight"}% %IFSKINSTATE{border="thin" then="natBodyThin"}% %IFSKINSTATE{border="on" then="natBodyBorder"}%">%TMPL:P{"body"}%</body>
-</html>
-<!-- template: page.nat.tmpl -->
-%TMPL:INCLUDE{"strings"}%
+%WEBCOMPONENT{"HtmlHead"}%
+</head>%TMPL:END%
+%TMPL:INCLUDE{"foswiki"}%
+%TMPL:INCLUDE{"head"}%
 %TMPL:INCLUDE{"body"}%
 %TMPL:INCLUDE{"sidebar"}%
 %TMPL:INCLUDE{"topbar"}%
diff --git a/templates/plucsearch.nat.tmpl b/templates/plucsearch.nat.tmpl
index 95a0cd3..da9c4a3 100755
--- a/templates/plucsearch.nat.tmpl
+++ b/templates/plucsearch.nat.tmpl
@@ -63,10 +63,10 @@
   <th>&nbsp;</th>
   <td>
     <label>
-      <input type="checkbox" class="twikiCheckbox" name="attachments" value="on" %IF{"$'URLPARAM{attachments}'='on'" then="checked"}%/>attachments only
+      <input type="checkbox" class="foswikiCheckbox" name="attachments" value="on" %IF{"$'URLPARAM{attachments}'='on'" then="checked"}%/>attachments only
     </label>
     <label>
-      <input type="checkbox" class="twikiCheckbox" name="web" value="%BASEWEB%" %IF{"$'URLPARAM{web}'='%BASEWEB%'" then="checked"}%/>current web only
+      <input type="checkbox" class="foswikiCheckbox" name="web" value="%BASEWEB%" %IF{"$'URLPARAM{web}'='%BASEWEB%'" then="checked"}%/>current web only
     </label>
   </td>
 </tr>
diff --git a/templates/preview.nat.tmpl b/templates/preview.nat.tmpl
index 4ed3421..4f7f6f0 100755
--- a/templates/preview.nat.tmpl
+++ b/templates/preview.nat.tmpl
@@ -1,4 +1,5 @@
 %TMPL:INCLUDE{"edit"}%<!-- template: preview.nat.tmpl -->
+%TMPL:INCLUDE{"topbar"}%<!-- topbar// -->
 %TMPL:INCLUDE{"previewbody"}%<!-- previewbody// -->
 %TMPL:INCLUDE{"previewtopicactions"}%<!-- previewtopicactions// -->
 %TMPL:INCLUDE{"previewsidebar"}%<!-- previewsidebar// -->
@@ -7,36 +8,15 @@
 %TMPL:INCLUDE{"previewtoolbar"}%<!-- previewtoolbar// -->
 %TMPL:DEF{"bodyclass"}%natPreviewBody%TMPL:END%
 %TMPL:DEF{"meta"}% %HTTP_EQUIV_ON_PREVIEW% %TMPL:END%
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"preview"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"preview"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"contentheader"}%%TMPL:P{"breadcrumbs"}%%TMPL:END%
-%TMPL:DEF{"breadcrumbs"}%<!-- breadcrumbs -->
-<div class="natBreadCrumbs">
-  %MAKETEXT{"You are here:"}%<span class='natSep'>&nbsp; </span>%IFDEFINED{"$percntTHISBREADCRUMBS$percnt" then="$test" else="$percntBREADCRUMBS{separator=\"<span class='natSep'>&nbsp;&#187; </span>\"}$percnt"}%
-</div>
-<!-- //breadcrumbs -->%TMPL:END%
 %TMPL:DEF{"content"}%%TMPL:P{"content_natskin"}%%TMPL:END%
 %TMPL:DEF{"content_natskin"}%<!-- content_natskin -->
 %TMPL:P{"previewtoolbar"}%<!-- previewtoolbar// -->
 %TEXT%
 %META{"form"}%
-<form id="EditForm" name="EditForm" method="post" action="%SCRIPTURLPATH{"save"}%/%WEB%/%TOPIC%">
-  <input type="hidden" name="action_addform" value="" />
-  <input type="hidden" name="action_cancel" value="" />
-  <input type="hidden" name="action_checkpoint" value="" />
-  <input type="hidden" name="action_preview" value="" />
-  <input type="hidden" name="action_replaceform" value="" />
-  <input type="hidden" name="action_save" value="" />
-  <input type="hidden" name="submitChangeForm" value="" />
-  %FORMFIELDS% 
-  <input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" />
-  <input type="hidden" name="originalrev" value="%URLPARAM{"originalrev"}%" />
-  <input type="hidden" name="redirectto" value="%REDIRECTTO%" />
-  <input type="hidden" name="topicparent" value="%TOPICPARENT%" />
-  <input type="hidden" name="templatetopic" value="%URLPARAM{"templatetopic" default="%TEMPLATETOPIC%"}%" />
-  <input type="hidden" name="cover" value="%URLPARAM{"cover"}%" />
-  <input type="hidden" name="cmd" value="%CMD%" />
-  <input type="hidden" name="nowysiwyg" value="%URLPARAM{"nowysiwyg"}%" />
-  <input type="hidden" name="rev" value="%URLPARAM{"rev"}%" />
-  <input type="hidden" name="text" value="%HIDDENTEXT%" />
-</form>
+%TMPL:P{"hiddenform"}%<!-- hiddenform// -->
 <!-- //content_natskin-->%TMPL:END%
+%TMPL:DEF{"webbuttons"}%<div class="natWebButtonsContents"> 
+%WEBCOMPONENT{"Buttons"}% <!-- webbuttons -->
+</div>%TMPL:END%
diff --git a/templates/previewjavascript.nat.tmpl b/templates/previewjavascript.nat.tmpl
index 9414d4e..3fefe8f 100644
--- a/templates/previewjavascript.nat.tmpl
+++ b/templates/previewjavascript.nat.tmpl
@@ -1,2 +1 @@
-<!-- template: previewjavascript.nat.tmpl -->
-%TMPL:INCLUDE{"editjavascript"}%
+%TMPL:INCLUDE{"editjavascript"}%<!-- template: previewjavascript.nat.tmpl -->
diff --git a/templates/rdiff.nat.tmpl b/templates/rdiff.nat.tmpl
index 4acdd84..18146d5 100755
--- a/templates/rdiff.nat.tmpl
+++ b/templates/rdiff.nat.tmpl
@@ -5,8 +5,8 @@
 %TMPL:INCLUDE{"rdiffjavascript"}%<!-- rdiffjavascript// -->
 %TMPL:INCLUDE{"rdiffstyles"}%<!-- rdiffstyles// -->
 %TMPL:DEF{"bodyclass"}%natRdiffBody%TMPL:END%
-%TMPL:DEF{"title"}%%TOPICTITLE% %MAKETEXT{"([_1] vs. [_2])" args="%REVTITLE2%, %REVTITLE1%"}% - %WIKITOOLNAME%%TMPL:END%
-%TMPL:DEF{"contenttitle"}%<h1>%MAKETEXT{"Difference:"}% %TOPICTITLE% %MAKETEXT{"([_1] vs. [_2])" args="%REVTITLE2%, %REVTITLE1%"}%</h1>%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% %MAKETEXT{"([_1] vs. [_2])" args="%REVTITLE2%, %REVTITLE1%"}% - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"contenttitle"}%<h1>%MAKETEXT{"Difference:"}% %TMPL:P{"topictitle"}% %MAKETEXT{"([_1] vs. [_2])" args="%REVTITLE2%, %REVTITLE1%"}%</h1>%TMPL:END%
 %TMPL:DEF{"meta"}% <meta name="robots" content="noindex, nofollow" /> %TMPL:END%
 %TMPL:DEF{"contentheader"}%<!-- contentheader -->
 %TMPL:P{"topicactions"}%<!-- topicactions// -->
@@ -19,7 +19,7 @@
 %TMPL:P{"aftertext"}%<!-- aftertext// -->
 <!-- //content -->%TMPL:END%
 %TMPL:DEF{"text"}%<!-- text -->
-%REPEAT%<div class="overflow"><table class="foswikiDiffTable twikiDiffTable" cellspacing="0" cellpadding="0">
+%REPEAT%<div class="overflow"><table class="foswikiDiffTable" cellspacing="0" cellpadding="0">
 <th>
 <a href="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?rev=%REVTITLE1%">%TOPIC% %REVTITLE1% - %REVINFO1%</a>
 </th>
@@ -28,7 +28,7 @@
 </td></tr>
 </table></div>
 <br clear="all" />%REPEAT%
-<table class="foswikiTable twikiTable">
+<table class="foswikiTable">
 %TAIL%
 </table>
 <!-- //text -->%TMPL:END%
diff --git a/templates/rename.nat.tmpl b/templates/rename.nat.tmpl
index e9a6e27..e0a503d 100755
--- a/templates/rename.nat.tmpl
+++ b/templates/rename.nat.tmpl
@@ -7,7 +7,7 @@
 <!-- //newweb -->%TMPL:END%
 %TMPL:DEF{"webaction"}%Rename%TMPL:END%
 %TMPL:DEF{"buttons"}%<!-- buttons -->
-%BUTTON{type="submit" "%MAKETEXT{"Rename"}%" icon="tick"}%
+%BUTTON{type="save" "%MAKETEXT{"Rename"}%" icon="tick"}%
 %BUTTON{"%MAKETEXT{"Cancel"}%" icon="cross" target="%WEB%.%TOPIC%"}%
 %CLEAR%
 <!-- //buttons -->%TMPL:END%
diff --git a/templates/renamebase.nat.tmpl b/templates/renamebase.nat.tmpl
index d916665..f26c4db 100755
--- a/templates/renamebase.nat.tmpl
+++ b/templates/renamebase.nat.tmpl
@@ -4,53 +4,53 @@
 %TMPL:INCLUDE{"renametopicactions"}%<!-- renametopicactions// -->
 %TMPL:INCLUDE{"renamejavascript"}%<!-- renamejavascript// -->
 %TMPL:INCLUDE{"renamestyles"}%<!-- renamestyle// -->
+%TMPL:DEF{"contentheader"}%%TMPL:P{"breadcrumbs"}%%TMPL:END%
 %TMPL:DEF{"bodyclass"}%natRenameBody%TMPL:END%
-%TMPL:DEF{"contentheader_container"}%%TMPL:END%
 %TMPL:DEF{"meta"}% <meta name="robots" content="noindex, nofollow" /> %TMPL:END%
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"rename"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"rename"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"contenttitle"}%<h1>%TMPL:P{"webaction"}% %WEB%.%TOPIC% </h1>%TMPL:END%
-%TMPL:DEF{"onloadscript"}%document.rename.newtopic.focus();%TMPL:END%
+%TMPL:DEF{"trashcheckbox"}%
+    <input type="checkbox" class="foswikiCheckbox" name="totrash" id="totrash" onclick="document.rename.newweb.value = (this.checked)?'%TRASHWEB%':'%WEB%';this.blur()">
+    <label for="totrash">%MAKETEXT{"Move to %TRASHWEB%"}%</label>
+%TMPL:END%
 %TMPL:DEF{"content"}%<!-- content -->
+%TMPL:P{"beforetext"}%<!-- beforetext// -->
 %TMPL:P{"contenttitle"}%<!-- contenttitle// -->
-<form method="POST" name="rename" action="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%">
+<form method="POST" name="rename" action="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%" method="post">
 <!--input type="hidden" name="confirm" value="on"-->
-<div class="twikiFormSteps">
-  <div class="twikiFormStep">
+<div class="foswikiFormSteps">
+  <div class="foswikiFormStep">
     <h3>%MAKETEXT{"New location"}%:</h3>
     %TMPL:P{"newweb"}%
-    %IFDEFINEDTHEN{"%URLPARAM{"newweb"}%" as="%TRASHWEB%"}%%ELSEDEFINED%
-
-    <input type="checkbox" class="twikiCheckbox" name="totrash" id="totrash" onclick="document.rename.newweb.value = (this.checked)?'%TRASHWEB%':'%WEB%';this.blur()">
-    <label for="totrash">%MAKETEXT{"Move to %TRASHWEB%"}%</label>
-    %FIDEFINED%
+    %IF{"$'URLPARAM{newweb}'!='%TRASHWEB%'" then="$percntTMPL:P{\"trashcheckbox\"}$percnt"}%
   </div>
-  <div class="twikiFormStep">
+  <div class="foswikiFormStep">
     <h3>%MAKETEXT{"New topic name"}%:</h3>
     %TMPL:P{"newtopic"}%
 
-    <input type="checkbox" class="twikiCheckbox" name="nonwikiword" id="nonwikiword" %IF{"$ 'URLPARAM{nonwikiword}'='on'" then="checked='checked'"}% />
+    <input type="checkbox" class="foswikiCheckbox" name="nonwikiword" id="nonwikiword" %IF{"$ 'URLPARAM{nonwikiword}'='on'" then="checked='checked'"}% />
     <label for="nonwikiword">%MAKETEXT{"Allow non <nop>WikiWord for the new topic name"}%</label>
   </div>
-  <div class="twikiFormStep twikiFormButtons twikiFormLast">
+  <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
     %TMPL:P{"buttons"}%
   </div>
-  <div class="twikiFormStep"><hr /></div>
-  <div class="twikiFormStep">
+  <div class="foswikiFormStep"><hr /></div>
+  <div class="foswikiFormStep">
     <h3>%MAKETEXT{"Update links in the '[_2]' web" args="<nop>%TOPIC%,<nop>%WEB%"}%:</h3>
     <div class="natSearchRenameContents">%LOCAL_SEARCH%</div>
   </div>
   %IFDEFINEDTHEN{"%URLPARAM{"currentwebonly"}%" as="on"}%%ELSEDEFINED%
-  <div class="twikiFormStep">
+  <div class="foswikiFormStep">
     <h3>%MAKETEXT{"Update links in all web"}%:</h3>
     <div class="natSearchRenameContents">%GLOBAL_SEARCH%</div>
   </div>
   %FIDEFINED%
-  <div class="twikiFormStep twikiFormButtons twikiFormLast">
+  <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
     %BUTTON{"%MAKETEXT{"Set all"}%" icon="add" onclick="checkAll('rename', true);" title="%MAKETEXT{"Select all topics"}%"}%
     %BUTTON{"%MAKETEXT{"Clear all"}%" icon="delete" onclick="checkAll('rename', false);" title="%MAKETEXT{"Clear selection"}%"}%
-    %IFDEFINEDTHEN{"%URLPARAM{"currentwebonly"}%" as="on"}%
-    %BUTTON{"%MAKETEXT{"Search in all webs"}%" icon="find" onclick="window.location.href='%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%'" title="%MAKETEXT{"Search for backlinks in all webs"}%"}%
-    %FIDEFINED%
+    %IF{"$'URLPARAM{currentwebonly}'='on'"
+      then="$percntBUTTON{\"%MAKETEXT{"Search in all webs"}%\" icon=\"find\" target=\"%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%?newweb=%URLPARAM{"newweb"}%\" title=\"%MAKETEXT{"Search for backlinks in all webs"}%\"}$percnt"
+    }%
     %CLEAR%
   </div>
 </div>
diff --git a/templates/renamedelete.nat.tmpl b/templates/renamedelete.nat.tmpl
index 656931a..9b45831 100755
--- a/templates/renamedelete.nat.tmpl
+++ b/templates/renamedelete.nat.tmpl
@@ -1,4 +1,46 @@
 %TMPL:INCLUDE{"rename"}%<!-- template: renamedelete.nat.tmpl -->
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"delete"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"delete"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"webaction"}%%MAKETEXT{"Delete"}%%TMPL:END%
-%TMPL:DEF{"newweb"}%<input type="hidden" name="newweb" value="%TRASHWEB%" /> <span class="twikiAlert">%TRASHWEB%</span> %TMPL:END%
+%TMPL:DEF{"buttons"}%<!-- buttons -->
+%BUTTON{type="save" "%MAKETEXT{"Delete"}%" icon="bin"}%
+%BUTTON{"%MAKETEXT{"Cancel"}%" icon="cross" target="%WEB%.%TOPIC%"}%
+%CLEAR%
+<!-- //buttons -->%TMPL:END%
+%TMPL:DEF{"content"}%<!-- content -->
+%TMPL:P{"beforetext"}%<!-- beforetext// -->
+%TMPL:P{"contenttitle"}%<!-- contenttitle// -->
+<form name="rename" action="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%" method="post">
+<input type="hidden" name="newweb" value="%TRASHWEB%" />
+<input type="hidden" name="newtopic" value="%NEW_TOPIC%" />
+<input type="hidden" name="nonwikiword" value="on" />
+<!--input type="hidden" name="confirm" value="on"-->
+<div class="foswikiFormSteps">
+  <div class="foswikiFormStep">
+    <h3>Move this topic into the <span class="foswikiAlert"> [[%TRASHWEB%.WebHome][%TRASHWEB% web]] </span></h3>
+    The topic will be renamed to _%TRASHWEB%.%NEW_TOPIC%_.
+  </div>
+  <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
+    %TMPL:P{"buttons"}%
+  </div>
+  <div class="foswikiFormStep"><hr /></div>
+  <div class="foswikiFormStep">
+    <h3>%MAKETEXT{"Update links in the '[_2]' web" args="<nop>%TOPIC%,<nop>%WEB%"}%:</h3>
+    <div class="natSearchRenameContents">%LOCAL_SEARCH%</div>
+  </div>
+  %IFDEFINEDTHEN{"%URLPARAM{"currentwebonly"}%" as="on"}%%ELSEDEFINED%
+  <div class="foswikiFormStep">
+    <h3>%MAKETEXT{"Update links in all web"}%:</h3>
+    <div class="natSearchRenameContents">%GLOBAL_SEARCH%</div>
+  </div>
+  %FIDEFINED%
+  <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
+    %BUTTON{"%MAKETEXT{"Set all"}%" icon="add" onclick="checkAll('rename', true);" title="%MAKETEXT{"Select all topics"}%"}%
+    %BUTTON{"%MAKETEXT{"Clear all"}%" icon="delete" onclick="checkAll('rename', false);" title="%MAKETEXT{"Clear selection"}%"}%
+    %IF{"$'URLPARAM{currentwebonly}'='on'"
+      then="$percntBUTTON{\"%MAKETEXT{"Search in all webs"}%\" icon=\"find\" target=\"%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%?newweb=%URLPARAM{"newweb"}%\" title=\"%MAKETEXT{"Search for backlinks in all webs"}%\"}$percnt"
+    }%
+    %CLEAR%
+  </div>
+</div>
+</form>
+<!-- //content -->%TMPL:END%
diff --git a/templates/renamejavascript.nat.tmpl b/templates/renamejavascript.nat.tmpl
index 942d809..dfa444c 100644
--- a/templates/renamejavascript.nat.tmpl
+++ b/templates/renamejavascript.nat.tmpl
@@ -1,6 +1,6 @@
 <!-- template: renamejavascript.nat.tmpl-->
 %TMPL:DEF{"renamejavascript"}%<script type="text/javascript">
-<!--
+//<![CDATA[
 function checkAll(form, theCheck) {
   var j = 0;
   for( var i = 0; i < document.forms[form].length; i++ ) {
@@ -11,7 +11,7 @@ function checkAll(form, theCheck) {
     }
   }
 }
-//-->
+//]]>
 </script>%TMPL:END%
 %TMPL:DEF{"javascript"}%
 %TMPL:P{"defaultjavascript"}% 
diff --git a/templates/renamesidebar.nat.tmpl b/templates/renamesidebar.nat.tmpl
index aec2670..3e389be 100755
--- a/templates/renamesidebar.nat.tmpl
+++ b/templates/renamesidebar.nat.tmpl
@@ -1,7 +1,7 @@
 <!-- template: renamesidebar.nat.tmpl -->
 %TMPL:DEF{"sidebar"}%<!-- sidebar -->
 <h2 ><a name="Help">%MAKETEXT{"Help"}%</a></h2>
-   * <a href="%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/TWikiTopics" target="_blank">%MAKETEXT{"About Topics"}%</a> </li>
+   * <a href="%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/TopicsAndWebs" target="_blank">%MAKETEXT{"About Topics and Webs"}%</a> </li>
    * <a href="%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/ManagingTopics" target="_blank">%MAKETEXT{"Managing Topics"}%</a> </li>
    * <a href="%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/DeleteOrRenameATopic" target="_blank">%MAKETEXT{"Deleting Topics"}%</a> </li>
    * <a href="%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/WikiWord" target="_blank">%MAKETEXT{"WikiWord"}%</a> </li>
diff --git a/templates/renamestyles.nat.tmpl b/templates/renamestyles.nat.tmpl
index 41a0f56..7def20f 100644
--- a/templates/renamestyles.nat.tmpl
+++ b/templates/renamestyles.nat.tmpl
@@ -1,8 +1,7 @@
 <!-- template: renamestyles.nat.tmpl-->
 %TMPL:DEF{"renamestyles"}%
 <style type="text/css">
-.foswikiTable,
-.twikiTable {
+.foswikiTable {
   width:auto;
 }
 </style>
diff --git a/templates/renamewebbase.nat.tmpl b/templates/renamewebbase.nat.tmpl
index e9ce0ee..4ee952c 100644
--- a/templates/renamewebbase.nat.tmpl
+++ b/templates/renamewebbase.nat.tmpl
@@ -10,36 +10,36 @@
 %TMPL:DEF{"title"}%%WEB% (%MAKETEXT{"rename web"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"contenttitle"}%<h1>%MAKETEXT{"Rename the <nop>[_1] Web" args="%WEB%"}%</h1>%TMPL:END%
 %TMPL:DEF{"webaction"}%%MAKETEXT{"Rename"}%%TMPL:END%
-%TMPL:DEF{"onloadscript"}%document.renameweb.newsubweb.focus();%TMPL:END%
 %TMPL:DEF{"buttons"}%<!-- buttons -->
-  %BUTTON{type="submit" value="%MAKETEXT{"Rename"}%" icon="tick"}%
+  %BUTTON{type="save" value="%MAKETEXT{"Rename"}%" icon="tick"}%
   %BUTTON{type="button" value="%MAKETEXT{"Cancel"}%" icon="cross" target="%WEB%.%TOPIC%"}%
   %CLEAR%
 <!-- //buttons -->%TMPL:END%
 %TMPL:DEF{"content"}%<!-- content -->
+%JQREQUIRE{"focus"}%<!-- jqFocus -->
 %TMPL:P{"contenttitle"}%<!-- contenttitle// -->
-<form method="post" name="renameweb" action="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%">
+<form name="renameweb" action="%SCRIPTURLPATH{"rename"}%/%WEB%/%TOPIC%" method="post">
 <input type="hidden" name="action" value="renameweb" />
 <input type="hidden" name="confirm" value="getlock" />
-<div class="twikiFormSteps">
-  <div class="twikiFormStep">
+<div class="foswikiFormSteps">
+  <div class="foswikiFormStep">
     <h3>%MAKETEXT{"New web name"}%:</h3>
     %TMPL:P{"newsubweb"}%
   </div>
-  <div class="twikiFormStep">
+  <div class="foswikiFormStep">
     <h3>%MAKETEXT{"New parent web"}%:</h3>
     %TMPL:P{"newparentweb"}%
 
-    <input type="checkbox" class="twikiCheckbox" name="totrash" id="totrash" onclick="document.renameweb.newparentweb.value = (this.checked)?'Trash':'';this.blur();">&nbsp;
+    <input type="checkbox" class="foswikiCheckbox" name="totrash" id="totrash" onclick="document.renameweb.newparentweb.value = (this.checked)?'Trash':'';this.blur();">&nbsp;
     <label for="totrash">
       %MAKETEXT{"Move to Trash"}%
     </label>
   </div>
-  <div class="twikiFormStep twikiFormButtons twikiFormLast">
+  <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
     %TMPL:P{"buttons"}%<!-- buttons// -->
   </div>
-  <div class="twikiFormStep"><hr /></div>
-  <div class="twikiFormStep">
+  <div class="foswikiFormStep"><hr /></div>
+  <div class="foswikiFormStep">
     <h3>%MAKETEXT{"Update links in the '[_2]' web" args="<nop>%TOPIC%,<nop>%WEB%"}%:</h3>
     <div class="natSearchRenameContents">
 %LOCAL_SEARCH%
@@ -52,7 +52,7 @@
     </div>
 %FIDEFINED%
   </div>
-  <div class="twikiFormStep twikiFormButtons twikiFormLast">
+  <div class="foswikiFormStep foswikiFormButtons foswikiFormLast">
     %BUTTON{"%MAKETEXT{"Set all"}%" onclick="checkAll('renameweb', true);" title="%MAKETEXT{"Select all topics"}%" icon="add"}%
     %BUTTON{"%MAKETEXT{"Clear all"}%" onclick="checkAll('renameweb', false);" title="%MAKETEXT{"Clear selection"}%" icon="delete"}%
 %IFDEFINEDTHEN{"%URLPARAM{"currentwebonly"}%" as="on"}%
@@ -60,8 +60,8 @@
 %FIDEFINED%
     %CLEAR%
   </div>
-  <div class="twikiFormStep"><hr /></div>
-  <div class="twikiFormStep">
+  <div class="foswikiFormStep"><hr /></div>
+  <div class="foswikiFormStep">
     <h3>%MAKETEXT{"Locked Topics"}%:</h3>
     *%MAKETEXT{"No permission:"}%* 
     <div class="natSearchRenameContents">
diff --git a/templates/renamewebdelete.nat.tmpl b/templates/renamewebdelete.nat.tmpl
index fafe7f2..c77f3da 100644
--- a/templates/renamewebdelete.nat.tmpl
+++ b/templates/renamewebdelete.nat.tmpl
@@ -1,8 +1,8 @@
 %TMPL:INCLUDE{"renamewebbase"}%
 <!-- template: renamewebdelete.nat.tmpl-->
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"rename web"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"rename web"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"webaction"}%%MAKETEXT{"Delete"}%%TMPL:END%
-%TMPL:DEF{"newsubweb"}%<input type="text" name="newsubweb" value="%NEW_SUBWEB%" size="36" />%TMPL:END%
+%TMPL:DEF{"newsubweb"}%<input type="text" name="newsubweb" value="%NEW_SUBWEB%" size="36" class="jqFocus" />%TMPL:END%
 %TMPL:DEF{"newparentweb"}%<select name="newparentweb">
 %FLEXWEBLIST{webs="%TRASHWEB%,public" exclude="%WEB%" format="<option $marker value=\"$web\">$web</option>" selection="%NEW_PARENTWEB%" marker="selected=\"selected\""}%
 </select>
diff --git a/templates/renamewebsidebar.nat.tmpl b/templates/renamewebsidebar.nat.tmpl
index 7caf95ca..c611e37 100644
--- a/templates/renamewebsidebar.nat.tmpl
+++ b/templates/renamewebsidebar.nat.tmpl
@@ -4,7 +4,7 @@
 	* <a href="%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/ManagingWebs" target="_blank">%MAKETEXT{"Managing Webs"}%</a> 
 	* <a href="%SCRIPTURLPATH{"view"}%/%SYSTEMWEB%/WikiWord" target="_blank">%MAKETEXT{"WikiWord"}%</a> 
 <h2 ><a name="Notes">%MAKETEXT{"Notes"}%</a></h2>
-<div class="natSideBarSection natNotes">
+<div class="natNotes">
 %TMPL:P{"notes"}%<!-- notes// -->
 </div>
 <!-- //sidebar -->%TMPL:END%
diff --git a/templates/search.nat.tmpl b/templates/search.nat.tmpl
index a329870..4675b12 100755
--- a/templates/search.nat.tmpl
+++ b/templates/search.nat.tmpl
@@ -1,6 +1,6 @@
 %TMPL:INCLUDE{"searchbase"}%<!-- template: search.nat.tmpl -->
 %TMPL:DEF{"searchbox_top"}%%TMPL:END%
-%TMPL:DEF{"topictitle_dbcache"}%%GETTOPICTITLE{"%TOPICNAME%"}%%TMPL:END%
+%TMPL:DEF{"topictitle_dbcache"}%<noautolink>%GETTOPICTITLE{"%TOPICNAME%"}%</noautolink>%TMPL:END%
 %TMPL:DEF{"topictitle_nodbcache"}%%TOPICNAME%%TMPL:END%
 %TMPL:DEF{"topictitle"}%%TMPL:P{context="DBCachePluginEnabled" then="topictitle_dbcache" else="topictitle_nodbcache"}%%TMPL:END%
 %TMPL:DEF{"seealso"}%[[WebSearchAdvanced][%MAKETEXT{"Advanced Search"}%]]%TMPL:END%
@@ -15,52 +15,56 @@
 %TMPL:DEF{"contenttitle"}%<h1>%MAKETEXT{"Search result for [_1]" args="<span class='natSearchString'>\"%URLPARAM{"search"}%\"</span>"}%</h1>%TMPL:END%
 %TMPL:DEF{"content"}%<!-- content -->
 %TMPL:P{"contenttitle"}%<!-- contenttitle// -->
-%SPLIT%%TMPL:P{"searchform"}%%SPLIT% 
-<div class="natSearchResult">
+%SPLIT%%TMPL:P{context="natskin_action_natsearch" then="searchform"}%%SPLIT% 
 %REPEAT%<div class="natSearchHit %CALC{"$SETM(incr, +1)$IF($ODD($GET(incr)),natSearchHitOdd,natSearchHitEven)"}%">
 %TMPL:P{"searchhit"}%
-</div>
 %REPEAT%</div>%SPLIT%<div class="natSearchTotal">
   %MAKETEXT{"<span>[_1]</span> topics found" args="%NTOPICS%"}% 
 </div>%SPLIT%
 <!-- //content -->%TMPL:END%
 %TMPL:DEF{"searchform"}%<!-- searchform -->
-%IFSKINSTATETHEN{action="natsearch"}%
-<div class="natSearchForm">
-<form id="searchform" name="searchform" action="%SCRIPTURLPATH{"natsearch"}%/%BASEWEB%/%BASETOPIC%" method="post">
-<input type="text" id="search" name="search" size="30" value="%URLPARAM{"search" encode="entity"}%" style="float:left;margin-right:8px;"/>
+%JQREQUIRE{"focus"}%<!-- jqrequire -->
+<form id="searchform" name="searchform" action="%SCRIPTURLPATH{"natsearch"}%/%BASEWEB%/%BASETOPIC%">
+<div class="foswikiFormSteps natSearchForm">
+<div class="foswikiFormStep foswikiFormButtons">
+<input type="text" class="foswikiInputField jqFocus" id="search" name="search" size="30" value="%URLPARAM{"search" encode="entity"}%" style="float:left;margin-right:8px;"/>
 %BUTTON{"%MAKETEXT{"Search"}%" type="submit" title="submit the query" icon="find"}%
 %BUTTON{"%MAKETEXT{"Cancel"}%" target="%BASEWEB%.%BASETOPIC%" title="%MAKETEXT{"go back to <nop>[_1]" args="%WEB%.%TOPIC%"}%" icon="cross"}%
 %TMPL:P{"seealso"}%
 %CLEAR%
-<table class="natSearchFormOptions" cellspacing="0" cellpadding="0"><tr>
-<td>
-<input type="checkbox" class="twikiCheckbox" id="web" name="web" value="all" %IFDEFINED{"%URLPARAM{web}%" as="all" then=" checked"}%/>
-</td>
-<td>
-<label for="web">%MAKETEXT{"search in all webs"}%</label>
-</td>
-<td>
-&nbsp;|&nbsp;
-</td>
-<td>
-<label>
-  %MAKETEXT{"maximum number of hits per web"}%:
-</label>
-</td>
-<td>
-<select name="limit">
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="5" then=" selected"}%>5</option>
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="10" then=" selected"}%>10</option>
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="20" then=" selected"}%>20</option>
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="30" then=" selected"}%>30</option>
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="40" then=" selected"}%>40</option>
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="50" then=" selected"}%>50</option>
-  <option %IFDEFINED{"%URLPARAM{"limit" default="100"}%" as="100" then=" selected"}%>100</option>
-  <option %IFDEFINED{"%URLPARAM{"limit"}%" as="all" then=" selected"}%>all</option>
-</select>
-</td></tr></table>
+</div>
+<div class="foswikiFormStep foswikiFormLast">
+<table class="natSearchFormOptions" cellspacing="0" cellpadding="0">
+<tr>
+  <td>
+    <input type="checkbox" class="foswikiCheckbox" id="web" name="web" value="all" %IF{"$'URLPARAM{web}'='all'" then=" checked"}%/>
+  </td>
+  <td>
+    <label for="web">%MAKETEXT{"search in all webs"}%</label>
+  </td>
+  <td>
+    &nbsp;|&nbsp;
+  </td>
+  <td>
+    <label>
+      %MAKETEXT{"maximum number of hits per web"}%:
+    </label>
+  </td>
+  <td>
+  <select name="limit">
+    <option %IF{"$'URLPARAM{limit}'='5'" then="selected"}%>5</option>
+    <option %IF{"$'URLPARAM{limit}'='10'" then="selected"}%>10</option>
+    <option %IF{"$'URLPARAM{limit}'='20'" then="selected"}%>20</option>
+    <option %IF{"$'URLPARAM{limit}'='30'" then="selected"}%>30</option>
+    <option %IF{"$'URLPARAM{limit}'='40'" then="selected"}%>40</option>
+    <option %IF{"$'URLPARAM{limit}'='50'" then="selected"}%>50</option>
+    <option %IF{"$'URLPARAM{limit}'='100' or $'URLPARAM{limit}'=''" then="selected"}%>100</option>
+    <option %IF{"$'URLPARAM{limit}'='all'" then="selected"}%>all</option>
+  </select>
+  </td>
+</tr>
+</table>
+</div>
 </form>
 </div>
-%FISKINSTATE%
 <!-- //searchform -->%TMPL:END%
diff --git a/templates/searchbase.nat.tmpl b/templates/searchbase.nat.tmpl
index f43697d..52621b7 100755
--- a/templates/searchbase.nat.tmpl
+++ b/templates/searchbase.nat.tmpl
@@ -6,6 +6,5 @@
 %TMPL:INCLUDE{"searchstyles"}%<!-- searchstyles// -->
 %TMPL:INCLUDE{"searchbox"}%<!-- searchbox// -->
 %TMPL:DEF{"bodyclass"}%natSearchBody%TMPL:END%
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"search"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"search"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"meta"}% <meta name="robots" content="noindex, nofollow" /> %TMPL:END%
-%TMPL:DEF{"onloadscript"}%$("#searchform #search").focus();%TMPL:END%
diff --git a/templates/searchbox.nat.tmpl b/templates/searchbox.nat.tmpl
index 6754d47..37d52c4 100755
--- a/templates/searchbox.nat.tmpl
+++ b/templates/searchbox.nat.tmpl
@@ -1,23 +1,26 @@
 <!-- template: searchbox.nat.tmpl -->
 %TMPL:DEF{"searchbox_go"}%<!-- search box go-->
 <form name="searchbox" action="%SCRIPTURLPATH{"natsearch"}%/%BASEWEB%/%BASETOPIC%">
-<input type="hidden" name="limit" value="100" />
-<table cellspacing="0" cellpadding="0" border="0"><tr>
-<td valign="middle">
-<input type="text" title="Enter topic name or a search string" name="search" value="%URLPARAM{"search" default="%MAKETEXT{"Search"}%" encode="entity"}%" accesskey="f" onblur="if(this.value==''){this.value = '%MAKETEXT{"Search"}%'}" onfocus="if(this.value=='%MAKETEXT{"Search"}%'){this.value = ''}" /> 
-</td>
-<td valign="middle">
-<a href="javascript:document.searchbox.submit()" title="Go"><span>Go</span></a>
-</td>
-</tr></table>
+  <input type="hidden" name="limit" value="100" />
+  <table cellspacing="0" cellpadding="0" border="0">
+    <tr>
+      <td valign="middle">
+        <input type="text" title="Enter topic name or a search string" name="search" value="%TMPL:P{"searchvalue"}%" accesskey="f" onblur="if(this.value==''){this.value = '%MAKETEXT{"Search"}%'}" onfocus="if(this.value=='%TMPL:P{"searchvalue"}%'){this.value = ''}" /> 
+      </td>
+      <td valign="middle">
+        <a href="#" onclick="document.searchbox.submit();return false;" title="Go"><span>Go</span></a>
+      </td>
+    </tr>
+  </table>
 </form>
 <!-- //search box-->%TMPL:END%
 %TMPL:DEF{"searchbox"}%<!-- search box -->
-<form name="searchbox" action="%SCRIPTURLPATH{"natsearch"}%/%BASEWEB%/%BASETOPIC%" method="post">
+<form name="searchbox" action="%SCRIPTURLPATH{"natsearch"}%/%BASEWEB%/%BASETOPIC%">
 <input type="hidden" name="limit" value="100" />
-<input type="text" title="Enter topic name or a search string" name="search" value="%URLPARAM{"search" default="%MAKETEXT{"Search"}%" encode="entity"}%" accesskey="f" onblur="if(this.value==''){this.value = '%MAKETEXT{"Search"}%'}" onfocus="if(this.value=='%MAKETEXT{"Search"}%'){this.value = ''}" /> 
+<input type="text" title="Enter topic name or a search string" name="search" value="%TMPL:P{"searchvalue"}%" accesskey="f" onblur="if(this.value==''){this.value = '%MAKETEXT{"Search"}%'}" onfocus="if(this.value=='%TMPL:P{"searchvalue"}%'){this.value = ''}" /> 
 </form>
 <!-- //search box-->%TMPL:END%
+%TMPL:DEF{"searchvalue"}%%URLPARAM{"search" default="%MAKETEXT{"Search"}%" encode="entity"}%%TMPL:END%
 %TMPL:DEF{"searchbox_top"}%<div class="natSearchBox natSearchBoxTop">%TMPL:P{"searchbox_go"}%</div>%TMPL:END%
 %TMPL:DEF{"searchbox_pos1"}%<div class="natSearchBox natSearchBoxPos1">%TMPL:P{"searchbox"}%</div>%TMPL:END%
 %TMPL:DEF{"searchbox_pos2"}%<div class="natSearchBox natSearchBoxPos2">%TMPL:P{"searchbox"}%</div>%TMPL:END%
diff --git a/templates/searchrenameview.nat.tmpl b/templates/searchrenameview.nat.tmpl
index cd79ff2..3a57a6e 100755
--- a/templates/searchrenameview.nat.tmpl
+++ b/templates/searchrenameview.nat.tmpl
@@ -14,7 +14,7 @@
 <table class="natSearchHit" border="0" cellspacing="0" cellpadding="0">
 <tr>
   <th width="10%">
-    %SELECTION%<input type="checkbox" class="twikiCheckbox" name="RENAME%LABEL%%TOPIC_NUMBER%" checked="checked" />
+    %SELECTION%<input type="checkbox" class="foswikiCheckbox" name="RENAME%LABEL%%TOPIC_NUMBER%" checked="checked" />
     <input type="hidden" name="TOPIC%LABEL%%TOPIC_NUMBER%" value="%WEB%.%TOPICNAME%" />%SELECTION%
   </th><th width="45%">
     <a href="%SCRIPTURLPATH{"view"}%/%WEB%/%TOPICNAME%">%TOPICNAME%</a> 
diff --git a/templates/settings.nat.tmpl b/templates/settings.nat.tmpl
index 6f2b8d9..c1da465 100755
--- a/templates/settings.nat.tmpl
+++ b/templates/settings.nat.tmpl
@@ -6,5 +6,5 @@
 %TMPL:INCLUDE{"settingsjavascript"}%<!-- settingsjavascript// -->
 %TMPL:INCLUDE{"settingsstyles"}%<!-- settingsstyles// -->
 %TMPL:INCLUDE{"settingstoolbar"}%<!-- settingstoolbar// -->
-%TMPL:DEF{"title"}%%TOPICTITLE% (%MAKETEXT{"prefs"}%) - %WIKITOOLNAME%%TMPL:END%
+%TMPL:DEF{"title"}%%TOPIC% (%MAKETEXT{"prefs"}%) - %WIKITOOLNAME%%TMPL:END%
 %TMPL:DEF{"contenttitle"}%<h1>[[%WEB%.%TOPIC%][%WEBLINK{format="$web"}%.%TOPIC%]] (%MAKETEXT{"prefs"}%)</h1>%TMPL:END%
diff --git a/templates/sidebar.nat.tmpl b/templates/sidebar.nat.tmpl
index 923f142..40f89c4 100755
--- a/templates/sidebar.nat.tmpl
+++ b/templates/sidebar.nat.tmpl
@@ -1,7 +1,7 @@
 <!-- template: sidebar.nat.tmpl -->
-%TMPL:DEF{"webleftbar"}%%WEBCOMPONENT{"WebLeftBar"}%%TMPL:END%
-%TMPL:DEF{"webrightbar"}%%WEBCOMPONENT{"WebRightBar"}%%TMPL:END%
-%TMPL:DEF{"websidebar"}%%WEBCOMPONENT{"WebSideBar"}%%TMPL:END%
+%TMPL:DEF{"webleftbar"}%%WEBCOMPONENT{"LeftBar"}%%TMPL:END%
+%TMPL:DEF{"webrightbar"}%%WEBCOMPONENT{"RightBar"}%%TMPL:END%
+%TMPL:DEF{"websidebar"}%%WEBCOMPONENT{"SideBar"}%%TMPL:END%
 %TMPL:DEF{"pattern_sidebar"}%<h2 class="natSideBarTitle" style="background:%WEBBGCOLOR%">%BASEWEB%</h2>%TMPL:P{context="natskin_searchbox_pos1" then="searchbox_pos1"}%%TMPL:P{"webleftbar"}%%TMPL:END%
 %TMPL:DEF{"nat_sidebar"}%%TMPL:P{context="natskin_searchbox_pos1" then="searchbox_pos1"}%%TMPL:P{"websidebar"}%%TMPL:END%
 %TMPL:DEF{"defaultsidebar"}%%TMPL:P{context="natskin_style_pattern" then="pattern_sidebar" else="nat_sidebar"}%%TMPL:P{context="natskin_searchbox_pos3" then="searchbox_pos3"}%%TMPL:END%
diff --git a/templates/strings.nat.tmpl b/templates/strings.nat.tmpl
deleted file mode 100644
index cd00f6f..0000000
--- a/templates/strings.nat.tmpl
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- template: strings.nat.tmpl -->
-%TMPL:DEF{"LOG_IN"}%%MAKETEXT{"Log In"}%%TMPL:END%
-%TMPL:DEF{"LOG_IN_HELP"}%%MAKETEXT{"Log in to [_1]." args="<nop>%WIKITOOLNAME%"}%%TMPL:END%
-%TMPL:DEF{"LOG_OUT"}%%MAKETEXT{"Log Out"}%%TMPL:END%
-%TMPL:DEF{"LOG_OUT_HELP"}%%MAKETEXT{"Log out [_1]" args="<nop>%WIKINAME%"}%%TMPL:END%
-%TMPL:DEF{"VIEW"}%%MAKETEXT{"View"}%%TMPL:END%
-%TMPL:DEF{"VIEW_HELP"}%%MAKETEXT{"View formatted topic"}%%TMPL:END%
-%TMPL:DEF{"RAW"}%%MAKETEXT{"Raw"}%%TMPL:END%
-%TMPL:DEF{"RAW_HELP"}%%MAKETEXT{"View raw topic text"}%%TMPL:END%
-%TMPL:DEF{"EDIT"}%%MAKETEXT{"Edit"}%%TMPL:END%
-%TMPL:DEF{"EDIT_HELP"}%%MAKETEXT{"Edit this topic"}%%TMPL:END%
-%TMPL:DEF{"EDITFORM"}%%MAKETEXT{"Edit form"}%%TMPL:END%
-%TMPL:DEF{"EDITFORM_HELP"}%%MAKETEXT{"Edit data form of this topic"}%%TMPL:END%
-%TMPL:DEF{"EDITTEXT"}%%MAKETEXT{"Edit text"}%%TMPL:END%
-%TMPL:DEF{"EDITTEXT_HELP"}%%MAKETEXT{"Edit text data of this topic"}%%TMPL:END%
-%TMPL:DEF{"RESTORE"}%%MAKETEXT{"Restore"}%%TMPL:END%
-%TMPL:DEF{"RESTORE_HELP"}%%MAKETEXT{"Edit this version of the topic"}%%TMPL:END%
-%TMPL:DEF{"ATTACH"}%%MAKETEXT{"Attach"}%%TMPL:END%
-%TMPL:DEF{"ATTACH_HELP"}%%MAKETEXT{"Attach files and manage existing attachments"}%%TMPL:END%
-%TMPL:DEF{"DELETE"}%%MAKETEXT{"Delete"}%%TMPL:END%
-%TMPL:DEF{"DELETE_HELP"}%%MAKETEXT{"Delete this topic"}%%TMPL:END%
-%TMPL:DEF{"MOVE"}%%MAKETEXT{"Move"}%%TMPL:END%
-%TMPL:DEF{"MOVE_HELP"}%%MAKETEXT{"Move or rename this topic"}%%TMPL:END%
-%TMPL:DEF{"HISTORY"}%%MAKETEXT{"History"}%%TMPL:END%
-%TMPL:DEF{"HISTORY_HELP"}%%MAKETEXT{"View topic history"}%%TMPL:END%
-%TMPL:DEF{"MORE"}%%MAKETEXT{"Tools"}%%TMPL:END%
-%TMPL:DEF{"MORE_HELP"}%%MAKETEXT{"More actions"}%%TMPL:END%
-%TMPL:DEF{"NEW"}%%MAKETEXT{"New"}%%TMPL:END%
-%TMPL:DEF{"NEW_HELP"}%%MAKETEXT{"Create New Topic"}%%TMPL:END%
-%TMPL:DEF{"PRINT"}%%MAKETEXT{"Print"}%%TMPL:END%
-%TMPL:DEF{"PRINT_HELP"}%%MAKETEXT{"Print this topic"}%%TMPL:END%
-%TMPL:DEF{"REGISTER"}%%MAKETEXT{"Register"}%%TMPL:END%
-%TMPL:DEF{"REGISTER_HELP"}%%MAKETEXT{"Create a user account on [_1]." args="<nop>%WIKITOOLNAME%"}%%TMPL:END%
-%TMPL:DEF{"NOTHING_FOUND"}%%MAKETEXT{"Nothing found. Try again!"}%%TMPL:END%
-%TMPL:DEF{"GO_HOME"}%%MAKETEXT{"Go to your hometopic"}%"%TMPL:END%
-%TMPL:DEF{"HELP"}%%MAKETEXT{"Help"}%%TMPL:END%
-%TMPL:DEF{"HELP_HELP"}%%MAKETEXT{"Get help"}%"%TMPL:END%
-%TMPL:DEF{"PDF"}%%MAKETEXT{"Print"}%%TMPL:END%
-%TMPL:DEF{"PDF_HELP"}%%MAKETEXT{"Export this topic as PDF"}%%TMPL:END%
-%TMPL:DEF{"USERS"}%%MAKETEXT{"Users"}%%TMPL:END%
-%TMPL:DEF{"USERS_HELP"}%%MAKETEXT{"See the directory of all registered users"}%%TMPL:END%
-%TMPL:DEF{"FIRST"}%%MAKETEXT{"First"}%%TMPL:END%
-%TMPL:DEF{"FIRST_HELP"}%%MAKETEXT{"View first revision of this topic"}%%TMPL:END%
-%TMPL:DEF{"LAST"}%%MAKETEXT{"Last"}%%TMPL:END%
-%TMPL:DEF{"LAST_HELP"}%%MAKETEXT{"View last revision of this topic"}%%TMPL:END%
-%TMPL:DEF{"NEXT"}%%MAKETEXT{"Next"}%%TMPL:END%
-%TMPL:DEF{"NEXT_HELP"}%%MAKETEXT{"View next revision of this topic"}%%TMPL:END%
-%TMPL:DEF{"PREV"}%%MAKETEXT{"Previous"}%%TMPL:END%
-%TMPL:DEF{"PREV_HELP"}%%MAKETEXT{"View previous revision of this topic"}%%TMPL:END%
-%TMPL:DEF{"DIFF"}%%MAKETEXT{"Diff"}%%TMPL:END%
-%TMPL:DEF{"DIFF_HELP"}%%MAKETEXT{"Show last change"}%%TMPL:END%
-%TMPL:DEF{"DONE"}%%MAKETEXT{"Done"}%%TMPL:END%
-%TMPL:DEF{"DONE_HELP"}%%MAKETEXT{"Return to normal view"}%%TMPL:END%
diff --git a/templates/styles.nat.tmpl b/templates/styles.nat.tmpl
index fef7d34..65388ad 100644
--- a/templates/styles.nat.tmpl
+++ b/templates/styles.nat.tmpl
@@ -1,17 +1,18 @@
 <!-- template: styles.nat.tmpl -->
 %TMPL:DEF{"defaultstyles"}%<!-- defaultstyles -->
+<!-- ie6 png fix -->
 <script type="text/javascript">
-  blankImg = '%PUBURLPATH%/%TWIKIWEB%/NatSkin/blank.gif';
+//<![CDATA[
+blankImg = '%PUBURLPATH%/%SYSTEMWEB%/NatSkin/blank.gif';
+//]]>
 </script>
 <style type="text/css">
-/* ie6 png fix */
-* html .natWebLogo, 
-* html .natLogin .twikiFormSteps, 
+/* ie6 png transperency fix for css backgrounds */
 * html .natLogin .foswikiFormSteps, 
 * html .jqButtonIcon,
 * html .natUserAction,
 * html .natTopicAction {
-  behavior:url(%PUBURLPATH%/%TWIKIWEB%/NatSkin/iepngfix.htc);
+  behavior:url(%PUBURLPATH%/%SYSTEMWEB%/NatSkin/iepngfix.htc);
 }
 * html .jqButton .jqButtonIcon {
   margin-top:3px;
diff --git a/templates/topbar.nat.tmpl b/templates/topbar.nat.tmpl
index 9c279c9..a0331aa 100644
--- a/templates/topbar.nat.tmpl
+++ b/templates/topbar.nat.tmpl
@@ -10,6 +10,7 @@
   <td class="natTopBar natTopRight" valign="top" width="250px">
     <div class="natTopRightContents">
 %TMPL:P{context="natskin_searchbox_top" then="searchbox_top"}%<!-- searchbox_top// -->
+    </div>
   </td>
 </tr>
 <!-- //defaulttopbar -->%TMPL:END%
diff --git a/templates/twistyplugin.nat.tmpl b/templates/twistyplugin.nat.tmpl
new file mode 100644
index 0000000..153ba18
--- /dev/null
+++ b/templates/twistyplugin.nat.tmpl
@@ -0,0 +1,13 @@
+%TMPL:INCLUDE{twistyplugin}%
+
+%TMPL:DEF{twisty:header}%
+<link rel="stylesheet" href="%PUBURLPATH%/%SYSTEMWEB%/TwistyPlugin/twisty.jquery.css" type="text/css" media="all" />
+%ADDTOHEAD{
+  "TWISTYPLUGIN::HEADER"
+  text="
+<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/TwistyPlugin/twisty.jquery.js'></script>
+<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikiPref.js'></script>
+<script type='text/javascript' src='%PUBURLPATH%/%SYSTEMWEB%/JavascriptFiles/foswikiStyles.js'></script>
+  "
+  requires="JQUERYPLUGIN"
+}%%TMPL:END%
diff --git a/templates/validate.nat.tmpl b/templates/validate.nat.tmpl
new file mode 100644
index 0000000..2611bb4
--- /dev/null
+++ b/templates/validate.nat.tmpl
@@ -0,0 +1,22 @@
+%TMPL:INCLUDE{"page"}%<!-- template: validate.nat.tmpl-->
+%TMPL:DEF{"bodyclass"}%natValidateBody%TMPL:END%
+%TMPL:DEF{"content"}%<!-- content -->
+<div id="foswikiLogin">
+  <div class="foswikiFormSteps">
+    <form action='%SCRIPTURLPATH{"login"}%/%WEB%/%TOPIC%' name='loginform' method='post'>
+      <input type="hidden" name="origurl" value="%ORIGURL%" />
+      <literal>
+        %QUERYPARAMS{encoding="entity" format="<input type='hidden' name='$name' value='$value' />"}%
+      </literal>
+      <div class="foswikiFormStep">
+        <h2 >%MAKETEXT{"User validation required to save"}%</h2>
+        %MAKETEXT{"[_1] received a request from your browser which has an expired validation key. This may be because someone is trying to post using your session. Please indicate whether you want [_1] to process this request." args="<nop>%WIKITOOLNAME%"}%
+      </div>
+      <div class="foswikiFormStep foswikiFormLast foswikiFormButtons">
+        <input name="response" tabindex='4' type='submit' class='foswikiSubmit' value='OK' />
+        <input name="response" tabindex='5' type='submit' class='foswikiSubmit' value='Cancel' />
+      </div>
+    </form>
+  </div>
+</div>
+<!-- //content -->%TMPL:END%
diff --git a/templates/view.nat.tmpl b/templates/view.nat.tmpl
index cf41fd0..d2d3d91 100755
--- a/templates/view.nat.tmpl
+++ b/templates/view.nat.tmpl
@@ -5,40 +5,68 @@
 %TMPL:INCLUDE{"viewjavascript"}%<!-- viewjavascript// -->
 %TMPL:INCLUDE{"viewstyles"}%<!-- viewstyles// -->
 %TMPL:INCLUDE{"searchbox"}%<!-- searchbox// -->
-%TMPL:DEF{"bodyclass"}%natViewBody%IFSKINSTATE{history="1" then=" natViewHistoryBody"}%%TMPL:END%
+
+%TMPL:DEF{"bodyclass"}%natViewBody %IF{"context 'natskin_history_1'" then="natViewHistoryBody"}%%TMPL:END%
+
 %TMPL:DEF{"title"}%%HTMLTITLE%%TMPL:END%
-%TMPL:DEF{"meta"}%%HTTP_EQUIV_ON_VIEW%
-%IFACCESS{"%WEB%.%TOPIC%" type="change" as="1" then="<link rel=\"alternate\" type=\"application/x-wiki\" title=\"Edit this page!\" href=\"%SCRIPTURL{"edit"}%/%WEB%/%TOPIC%?t=%GMTIME{"$epoch"}%\" />" glue="off" else=""}%
-%IFDEFINED{"$percntMETAKEYWORDS$percnt" then="<meta name=\"keywords\" content=\"$test\" />$n<meta http-equiv=\"keywords\" content=\"$test\" />"}%
-%IFDEFINED{"$percntMETAAUTHOR$percnt" glue="off" then="<meta name=\"author\" content=\"$test\" />"}%
-%IFDEFINED{"$percntMETADESCRIPTION$percnt" then="<meta name=\"description\" content=\"$test\" />"}%%TMPL:END%
+
+%TMPL:DEF{"meta"}%%TMPL:P{"metatitle"}%%TMPL:P{"metakeywords"}%%TMPL:P{"metaauthor"}%%TMPL:P{"metadescription"}%%TMPL:P{"metaedit"}%%HTTP_EQUIV_ON_VIEW%%TMPL:END%
+
+%TMPL:DEF{"metatitle"}%<meta name='title' content='%HTMLTITLE%'>
+%TMPL:END%
+
+%TMPL:DEF{"metakeywords"}%%IF{
+  "defined 'METAKEYWORDS'" 
+  then="<meta name='keywords' content='$percntMETAKEYWORDS$percnt'>$n" 
+  else="$percntIF{\"'%WEB%.%TOPIC%'/Tag\" then=\"<meta name='keywords' content='$dollarpercntFORMFIELD{Tag}$dollarpercnt'>$n\"}$percnt"
+}%%TMPL:END%
+
+%TMPL:DEF{"metaauthor"}%%IF{
+  "defined 'METAAUTHOR'" 
+  then="<meta name='author' content='$percntMETAAUTHOR$percnt'>$n"
+}%%TMPL:END%
+
+%TMPL:DEF{"metadescription"}%%IF{
+  "defined 'METADESCRIPTION'" 
+  then="<meta name='description' content='$percntMETADESCRIPTION$percnt'>$n"
+  else="$percntIF{\"'%WEB%.%TOPIC%'/Summary\" then=\"<meta name='description' content='$dollarpercntFORMFIELD{\\"Summary\\"}$dollarpercnt'>$dollarn\"}$percnt"
+}%%TMPL:END%
+
+%TMPL:DEF{"metaedit"}%%IF{
+  "'%WEB%.%TOPIC%' allows 'change'" 
+  then="<link rel='alternate' type='application/x-wiki' title='Edit this page!' href='%SCRIPTURL{"edit"}%/%WEB%/%TOPIC%?t=%GMTIME{"$epoch"}%'>$n"
+}%%TMPL:END%
+
 %TMPL:DEF{"content"}%<!-- content -->
 %TMPL:P{"beforetext"}%<!-- beforetext// -->
 %TMPL:P{"text"}%<!-- text// -->
 %TMPL:P{"rawbutton"}%<!-- rawbutton // -->
-%TMPL:P{"aftertext"}%<!-- aftertext// -->
-%IF{"$'DISPLAYFORM'='off'" else="$percntTMPL:P{\"form\"}$percnt"}%<!-- meta:form // -->
-%IF{"$'DISPLAYATTACHMENTS'='off'" else="$percntMETA{\"attachments\"}$percnt"}%<!-- meta:attachments// -->
+%TMPL:P{context="save" else="aftertext"}%<!-- aftertext// -->
 <!-- //content -->%TMPL:END%
-%TMPL:DEF{"rawbutton"}%%IFDEFINED{"%URLPARAM{"raw"}%" then="<div class='natButtonBox' style='text-align:right'><input type='button' class='natOkButton' onclick=\"window.location.href='%SCRIPTURL{view}%/%WEB%/%TOPIC%';\" value='Back' /></div>" else="<!-- -->" glue="off"}%%TMPL:END%
+
+%TMPL:DEF{"rawbutton"}%%IF{"$'URLPARAM{raw}'='on'" then="<div class='natButtonBox'>$percntBUTTON{\"%MAKETEXT{"View"}%\" title=\"%MAKETEXT{"Back to view mode"}%\" style=\"float:right\" icon=\"eye\" target=\"%WEB%.%TOPIC%\"}$percnt$percntCLEAR$percnt</div>" else="<!-- -->" }%%TMPL:END%
+
 %TMPL:DEF{"text"}%%TEXT%%TMPL:END%
+
+%TMPL:DEF{"aftertext"}%<!-- aftertext -->
+%IF{"$'DISPLAYFORM'='off'" else="$percntTMPL:P{\"form\"}$percnt"}%<!-- meta:form // -->
+%IF{"$'DISPLAYATTACHMENTS'='off'" else="$percntMETA{\"attachments\"}$percnt"}%<!-- meta:attachments// -->
+<!-- //aftertext -->
+
 %TMPL:DEF{"form"}%%META{"form"}%%TMPL:END%
-%TMPL:DEF{"breadcrumbs"}%<!-- breadcrumbs -->
-<div class="natBreadCrumbs">
-  %MAKETEXT{"You are here:"}%<span class='natSep'>&nbsp; </span>%IFDEFINED{"$percntTHISBREADCRUMBS$percnt" then="$test" else="$percntBREADCRUMBS{separator=\"<span class='natSep'>&nbsp;&#187; </span>\"}$percnt"}%
-</div>
-<!-- //breadcrumbs -->%TMPL:END%
+
 %TMPL:DEF{"contentheader"}%<!-- contentheader -->
-%TMPL:P{"topicactions"}%<!-- topicactions// -->
-%TMPL:P{"breadcrumbs"}%<!-- breadcrumbs //-->
+%IF{"$'DISPLAYTOPICACTIONS'='off'" else="$percntTMPL:P{\"topicactions\"}$percnt"}%<!-- topicactions// -->
+%IF{"$'DISPLAYBREADCRUMBS'='off'" else="$percntTMPL:P{\"breadcrumbs\"}$percnt"}%<!-- breadcrumbs //-->
+<span class="foswikiClear"></span>
 <!-- // contentheader -->%TMPL:END%
+
 %TMPL:DEF{"revinfo"}%<div class="natRevision">%MAKETEXT{"Changed by [_1] on [_2]" args="<span class='natRevisionAuthor'> %REVINFO{"$wikiusername" rev="%CURREV%"}% </span>, <a class='natRevisionDate' href='%TMPL:P{context="CompareRevisionsAddonPluginEnabled" then="compare" else="rdiff"}%' title='%MAKETEXT{"show last change"}%'>%REVINFO{"$date - $hour:$min - r$rev" rev="%CURREV%"}%</a>"}%</div>%TMPL:END%
 %TMPL:DEF{"rdiff"}%%SCRIPTURLPATH{"rdiff"}%/%WEB%/%TOPIC%?type=last;render=sequential%TMPL:END%
 %TMPL:DEF{"compare"}%%SCRIPTURLPATH{"compare"}%/%WEB%/%TOPIC%?type=last;render=interweave%TMPL:END%
 
 %TMPL:DEF{"contentfooter"}%<!-- content footer -->
-%TMPL:P{"revinfo"}%<!-- revinfo //-->
+%IF{"$'DISPLAYREVISIONINFO'='off'" else="$percntTMPL:P{\"revinfo\"}$percnt"}%<!-- revinfo //-->
 <!-- //content footer -->%TMPL:END%
-%TMPL:DEF{"broadcast"}%<!-- broadcast -->
-%IFDEFINED{"$percntBROADCASTMESSAGE$percnt" then="<div class='twikiBroadcastMessage'> $test </div>"}%
-<!-- //broadcast -->%TMPL:END%
+
+%TMPL:DEF{"broadcast"}%%IF{"not isempty 'BROADCASTMESSAGE'" then="<div class='foswikiBroadcastMessage'> $percntBROADCASTMESSAGE$percnt </div>"}%%TMPL:END%
diff --git a/templates/view.plain.nat.tmpl b/templates/view.plain.nat.tmpl
index 390c62f..a931bfe 100644
--- a/templates/view.plain.nat.tmpl
+++ b/templates/view.plain.nat.tmpl
@@ -1,17 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="%LANG%" lang="%LANG%">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
-<meta http-equiv="Content-Style-Type" content="text/css" /> 
+<meta http-equiv="Content-Type" content="%CONTENTTYPE%; charset=%CHARSET%">
 <title>%TMPL:P{"title"}%</title>
-<meta name="generator" content="Foswiki/NatSkin" /> %TMPL:P{"meta"}%
-<base href="%SCRIPTURL{"view"}%/%WEB%/%TOPIC%"></base>
-<link rel="icon" href="%FAVICON%" type="image/x-icon" /> 
-<link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />
+%TMPL:P{"meta"}%
+<link rel="icon" href="%FAVICON%" type="image/x-icon"> 
+<link rel="shortcut icon" href="%FAVICON%" type="image/x-icon">
 %GETSKINSTYLE%
 %TMPL:P{"styles"}%
 %TMPL:P{"javascript"}%
-%WEBCOMPONENT{"WebHtmlHead"}%
+%WEBCOMPONENT{"HtmlHead"}%
 </head>
 <body class="natBody natPlainBody %TMPL:P{"bodyclass"}%">
 <div class="natBodyContents">
diff --git a/templates/view.print.nat.tmpl b/templates/view.print.nat.tmpl
index cd6cd4c..59d47d7 100755
--- a/templates/view.print.nat.tmpl
+++ b/templates/view.print.nat.tmpl
@@ -1,19 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="%LANG%" lang="%LANG%">
+%TMPL:INCLUDE{"view"}%<!-- template:view.print.nat.tmpl -->
+%TMPL:DEF{"bodyclass"}%natPrintBody%TMPL:END%
+%TMPL:DEF{"defaultbody"}%%TMPL:P{"content_container"}%%TMPL:END%
+%TMPL:DEF{"head"}%<!-- head -->
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
-<title>%HTMLTITLE% - (%MAKETEXT{"printable"}%)</title>
-<meta http-equiv="Content-Style-Type" content="text/css" /> 
-<meta name="generator" content="Foswiki/NatSkin" /> %TMPL:P{"meta"}%
-<base href="%SCRIPTURL{view}%/%WEB%/%TOPIC%"></base>
-<link rel="icon" href="%FAVICON%" type="image/x-icon" /> 
-<link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />
-<!-- 
-
-  Disable the conditional around GETSKINSTYLE when firefox has fixed printing of pages
-  that import css. See https://bugzilla.mozilla.org/show_bug.cgi?id=154892 
--->
-%IFDEFINED{"%URLPARAM{"css"}%" as="on" then="$percntGETSKINSTYLE$percnt"}%
+<meta http-equiv="Content-Type" content="%CONTENTTYPE%; charset=%CHARSET%">
+<title>%TMPL:P{"title"}% - (%MAKETEXT{"printable"}%)</title>
+%TMPL:P{"meta"}%
+<link rel="icon" href="%FAVICON%" type="image/x-icon"> 
+<link rel="shortcut icon" href="%FAVICON%" type="image/x-icon">
 %TMPL:P{"styles"}%
 <style type="text/css">
 object#player,
@@ -25,25 +19,5 @@ object#player,
 }
 </style>
 %TMPL:P{"javascript"}%
-%WEBCOMPONENT{"WebHtmlHead"}%
-</head>
-<body class="natBody natPrintBody">
-<div class="natBodyContents">
-  <div class="natMiddle natMain">
-    <div class="natMainContents">
-%TMPL:P{"content"}%
-    </div>
-  <div class="natMainFooterContents">
-%IFDEFINED{"$percntMETA{\"attachments\"}$percnt" then="<div class=\"natTopicAttachments\"> $test </div>"}%
-  </div>
-  </div>
-</div>
-</body>
-</html>
-%TMPL:DEF{"content"}%%TEXT% 
-%META{"form"}% 
-%TMPL:END%
-<!-- template: view.print.nat.tmpl -->
-%TMPL:INCLUDE{"strings"}%
-%TMPL:INCLUDE{"styles"}%
-%TMPL:INCLUDE{"printjavascript"}%
+%WEBCOMPONENT{"HtmlHead"}%
+<!-- //head --></head>%TMPL:END%
diff --git a/templates/viewtopicactions.nat.tmpl b/templates/viewtopicactions.nat.tmpl
index 5e5def8..5751ed4 100755
--- a/templates/viewtopicactions.nat.tmpl
+++ b/templates/viewtopicactions.nat.tmpl
@@ -1,9 +1,2 @@
 <!-- template: viewtopicaction.nat.tmpl -->
-%TMPL:DEF{"usersurl"}%<a class='natUserAction' href='%SCRIPTURLPATH{"view"}%/%USERSWEB%/%WIKIUSERSTOPIC%' title='%TMPL:P{"USERS_HELP"}%'>%TMPL:P{"USERS"}%</a>
-%TMPL:DEF{"topicactions_top"}%<!-- topicactions_top -->
-%USERACTIONS{
-  guest="<div class='natGreeter natGuestGreeter'>$login$sep%TMPL:P{"usersurl"}%$sep$register</div>"
-  format="<div class='natGreeter natUserGreeter'>$user$sep%TMPL:P{"usersurl"}%$sep$logout</div>"
-}%
-<!-- //topicactions_top -->%TMPL:END%
-%TMPL:DEF{"topicactions"}%<div class="natTopicActions" id="natTopicActions"><span id="natTopicActionTooltip"></span>%WEBCOMPONENT{"WebTopicActions"}%</div>%TMPL:END%
+%TMPL:DEF{"topicactions"}%<div class="natTopicActions" id="natTopicActions"><span id="natTopicActionTooltip"></span>%WEBCOMPONENT{"TopicActions"}%</div>%TMPL:END%