diff --git a/PatternSkin/data/System/PatternSkin.txt b/PatternSkin/data/System/PatternSkin.txt
index fe64b16a92..79402e3916 100644
--- a/PatternSkin/data/System/PatternSkin.txt
+++ b/PatternSkin/data/System/PatternSkin.txt
@@ -57,17 +57,17 @@ The original Photoshop files of the skin graphics (mainly background images) are
 If you have set the SKIN [[preference setting]] to =pattern= and you still don't see the layout as on the <a href="%ATTACHURL%/patternskin_screenshot_full.png">screenshot</a>, a few settings in may have been disabled.
 
 Check these [[%SYSTEMWEB%.PreferenceSettings][preference settings]] here:
-   * TWIKILAYOUTURL = %TWIKILAYOUTURL%
-   * TWIKISTYLEURL = %TWIKISTYLEURL%
-   * TWIKICOLORSURL = %TWIKICOLORSURL%
+   * FOSWIKI_LAYOUT_URL = %FOSWIKI_LAYOUT_URL%
+   * FOSWIKI_STYLE_URL = %FOSWIKI_STYLE_URL%
+   * FOSWIKI_COLORS_URL = %FOSWIKI_COLORS_URL%
    * SKIN = %SKIN%
 
-If TWIKILAYOUTURL or TWIKISTYLEURL don't give a value or point to non-existing files, check in %SYSTEMWEB%.DefaultPreferences and in %USERSWEB%.SitePreferences that the following preferences do exist and that they are set to on:
+If FOSWIKI_LAYOUT_URL or FOSWIKI_STYLE_URL don't give a value or point to non-existing files, check in %SYSTEMWEB%.DefaultPreferences and in %USERSWEB%.SitePreferences that the following preferences do exist and that they are set to on:
 <pre>
    * %<nop>SYSTEMWEB%.PatternSkin settings:
-      * <nop>Set TWIKILAYOUTURL = %<nop>PUBURLPATH%/%<nop>SYSTEMWEB%/PatternSkin/layout.css
-      * <nop>Set TWIKISTYLEURL = %<nop>PUBURLPATH%/%<nop>SYSTEMWEB%/PatternSkin/style.css
-      * <nop>Set TWIKICOLORSURL = %<nop>PUBURLPATH%/%<nop>SYSTEMWEB%/PatternSkin/colors.css
+      * <nop>Set FOSWIKI_LAYOUT_URL = %<nop>PUBURLPATH%/%<nop>SYSTEMWEB%/PatternSkin/layout.css
+      * <nop>Set FOSWIKI_STYLE_URL = %<nop>PUBURLPATH%/%<nop>SYSTEMWEB%/PatternSkin/style.css
+      * <nop>Set FOSWIKI_COLORS_URL = %<nop>PUBURLPATH%/%<nop>SYSTEMWEB%/PatternSkin/colors.css
 </pre>
 
 *NOTE:* customization of these values should be done in [[%USERSWEB%.SitePreferences]]
diff --git a/PatternSkin/data/System/PatternSkinCssCookbook.txt b/PatternSkin/data/System/PatternSkinCssCookbook.txt
index 14830d6aa2..b85a7618b4 100644
--- a/PatternSkin/data/System/PatternSkinCssCookbook.txt
+++ b/PatternSkin/data/System/PatternSkinCssCookbook.txt
@@ -23,9 +23,9 @@ Have a look at PatternSkinColorSettings.
    * Attach 3 new style sheets to the topic
    * Point the CSS [[%SYSTEMWEB%.PreferenceSettings][preference settings]] in [[%SYSTEMWEB%.DefaultPreferences]] or [[%USERSWEB%.SitePreferences]] to your new files:
 <pre>
-      * <nop>Set TWIKILAYOUTURL = %<nop>PUBURLPATH%/%<nop>SYSTEMWEB%/YourNewTopic/layout.css
-      * <nop>Set TWIKISTYLEURL = %<nop>PUBURLPATH%/%<nop>SYSTEMWEB%/YourNewTopic/style.css
-      * <nop>Set TWIKICOLORSURL = %<nop>PUBURLPATH%/%<nop>SYSTEMWEB%/YourNewTopic/colors.css
+      * <nop>Set FOSWIKI_LAYOUT_URL = %<nop>PUBURLPATH%/%<nop>SYSTEMWEB%/YourNewTopic/layout.css
+      * <nop>Set FOSWIKI_STYLE_URL = %<nop>PUBURLPATH%/%<nop>SYSTEMWEB%/YourNewTopic/style.css
+      * <nop>Set FOSWIKI_COLORS_URL = %<nop>PUBURLPATH%/%<nop>SYSTEMWEB%/YourNewTopic/colors.css
  </pre>
 
 ---+++ When you need to make small adjustments: Adding to existing CSS
diff --git a/PatternSkin/pub/System/PatternSkin/style.css b/PatternSkin/pub/System/PatternSkin/style.css
index 8511379316..dff1d390e0 100644
--- a/PatternSkin/pub/System/PatternSkin/style.css
+++ b/PatternSkin/pub/System/PatternSkin/style.css
@@ -582,7 +582,7 @@ a.twikiLinkInHeaderRight {
 #twikiLogo img {
 	margin:0;
 	padding:0;
-        border:0px;
+    border:0px;
 }
 .twikiNoBreak {
 	white-space:nowrap;
@@ -612,7 +612,6 @@ a.twikiLinkInHeaderRight {
 	border-width:1px 0 0 0;
 	border-style:solid;
 }
-#patternBottomBarContents {}
 #patternWebBottomBar {
 	font-size:94%; /*S2*/
 	line-height:125%;
diff --git a/PatternSkin/templates/css.pattern.tmpl b/PatternSkin/templates/css.pattern.tmpl
index cc6da94765..4d514ff94c 100644
--- a/PatternSkin/templates/css.pattern.tmpl
+++ b/PatternSkin/templates/css.pattern.tmpl
@@ -12,9 +12,9 @@
 %TMPL:P{"leftbardimensions"}%
 </style>
 <style type="text/css" media="all">
-%IF{ "$ TWIKILAYOUTURL" then="@import url('%TWIKILAYOUTURL%');"}%
-%IF{ "$ TWIKISTYLEURL"  then="@import url('%TWIKISTYLEURL%');"}%
-%IF{ "$ TWIKICOLORSURL" then="@import url('%TWIKICOLORSURL%');"}%
+%IF{ "$ FOSWIKI_LAYOUT_URL" then="@import url('%FOSWIKI_LAYOUT_URL%');"}%
+%IF{ "$ FOSWIKI_STYLE_URL"  then="@import url('%FOSWIKI_STYLE_URL%');"}%
+%IF{ "$ FOSWIKI_COLORS_URL" then="@import url('%FOSWIKI_COLORS_URL%');"}%
 </style>
 %TMPL:P{"styles:skin"}%%TMPL:P{"styles:dynamic"}%<style type="text/css" media="all">
 %IF{ "$ USERLAYOUTURL" then="@import url('%USERLAYOUTURL%');"}%
diff --git a/PatternSkin/templates/view.pattern.tmpl b/PatternSkin/templates/view.pattern.tmpl
index 0066da3cda..acba153c5c 100644
--- a/PatternSkin/templates/view.pattern.tmpl
+++ b/PatternSkin/templates/view.pattern.tmpl
@@ -40,7 +40,7 @@
 
 %TMPL:DEF{"breadcrumb:wikitoolname"}%[[%MAINWEB%.%HOMETOPIC%][%WIKITOOLNAME%]]%TMPL:END%
 
-%TMPL:DEF{"breadcrumb:currentweb"}%%TMPL:P{"breadcrumb:separator"}%<img src="%ICONURLPATH{web-bg-small}%" border="0" alt="" width="13" height="13" style="background-color:%WEBBGCOLOR%" />&nbsp;<a href="%SCRIPTURLPATH{"view"}%/%WEB%/%HOMETOPIC%">%MAKETEXT{"[_1] Web" args="<nop>%WEB%"}%</a>%TMPL:END%
+%TMPL:DEF{"breadcrumb:currentweb"}%%TMPL:P{"breadcrumb:separator"}%<a href="%SCRIPTURLPATH{"view"}%/%WEB%/%HOMETOPIC%">%MAKETEXT{"[_1] Web" args="<nop>%WEB%"}%</a>%TMPL:END%
 
 %TMPL:DEF{"breadcrumb:annotation"}%%IF{"defined rev" then=" %MAKETEXT{"(revision [_1])" args="%URLPARAM{"rev"}%"}%" else=" <span class='patternRevInfo'>(%REVINFO{format="$date, $wikiusername"}%)</span>"}%%IF{"defined raw" then=" %MAKETEXT{"(raw view)"}%"}%%TMPL:END%
 
diff --git a/PatternSkin/templates/viewleftbar.pattern.tmpl b/PatternSkin/templates/viewleftbar.pattern.tmpl
index 4b8d343aac..3b6d73b5f3 100644
--- a/PatternSkin/templates/viewleftbar.pattern.tmpl
+++ b/PatternSkin/templates/viewleftbar.pattern.tmpl
@@ -6,7 +6,7 @@
 
 
 %TMPL:DEF{"webleftbarindicator"}%<div class="patternWebIndicator">
-   * [[%BASEWEB%.%HOMETOPIC%][%ICON{"web-bg-small"}% <nop>%BASEWEB%]]
+   * [[%BASEWEB%.%HOMETOPIC%][<nop>%BASEWEB%]]
 </div>%TMPL:END%
 
 
diff --git a/PatternSkin/templates/viewtopbar.pattern.tmpl b/PatternSkin/templates/viewtopbar.pattern.tmpl
index 09ae0997ab..b1456c9cc3 100644
--- a/PatternSkin/templates/viewtopbar.pattern.tmpl
+++ b/PatternSkin/templates/viewtopbar.pattern.tmpl
@@ -17,7 +17,7 @@
 	overflow:hidden;
 }
 #twikiLogo {
-        position:absolute;
-        top:-5px;
-        left:0px;
+	position:absolute;
+	top:0px;
+	left:0px;
 }%TMPL:END%
diff --git a/PreferencesPlugin/data/System/DefaultPreferencesForm.txt b/PreferencesPlugin/data/System/DefaultPreferencesForm.txt
index 202be84f53..6d669db0bb 100644
--- a/PreferencesPlugin/data/System/DefaultPreferencesForm.txt
+++ b/PreferencesPlugin/data/System/DefaultPreferencesForm.txt
@@ -37,8 +37,8 @@
 | HTTP_EQUIV_ON_PREVIEW| textarea | 30x1 | =  | http-equiv== meta tags for ==preview== script | S |
 | SKIN | text | 30 | pattern | Skin overriding the default Foswiki templates. | S |
 | WEBTOPICLIST | textarea | 40x3 | [[WebChanges][Changes]] %SEP% [[WebIndex][Index]] %SEP% [[WebSearch][Search]] %SEP% Go <input type="text" name="topic" size="16" /> | Usually a list of topics | S |
-| TWIKILAYOUTURL | text | 30 | %PUBURL%/%SYSTEMWEB%/PatternSkin/layout.css | URL of a CSS | S |
-| TWIKISTYLEURL | text | 30 | %PUBURL%/%SYSTEMWEB%/PatternSkin/style.css | URL of a CSS | S |
+| FOSWIKI_LAYOUT_URL | text | 30 | %PUBURL%/%SYSTEMWEB%/PatternSkin/layout.css | URL of a CSS | S |
+| FOSWIKI_STYLE_URL | text | 30 | %PUBURL%/%SYSTEMWEB%/PatternSkin/style.css | URL of a CSS | S |
 | USERLAYOUTURL | text | 30 |  | URL of a CSS | S |
 | USERSTYLEURL | text | 30 |  | URL of a CSS | S |
 | DS_THEME | text | 30 | gray | Theme: (gray, monochrome, tabstyle | S |
diff --git a/core/data/Main/SitePreferences.txt b/core/data/Main/SitePreferences.txt
index 6d048f7a33..6bb972e197 100644
--- a/core/data/Main/SitePreferences.txt
+++ b/core/data/Main/SitePreferences.txt
@@ -9,7 +9,7 @@
 <!-- Preferences start here -->
 
    * =FINALPREFERENCES= locks site-level preferences that are *not* allowed to be overridden by [[%WEBPREFSTOPIC%]] or user preferences:
-      * Set FINALPREFERENCES = ATTACHFILESIZELIMIT, PREVIEWBGIMAGE, WIKITOOLNAME, WIKIHOMEURL, ALLOWROOTCHANGE, DENYROOTCHANGE, TWIKILAYOUTURL, TWIKISTYLEURL, TWIKICOLORSURL, USERSWEB, SYSTEMWEB, DOCWEB
+      * Set FINALPREFERENCES = ATTACHFILESIZELIMIT, PREVIEWBGIMAGE, WIKITOOLNAME, WIKIHOMEURL, ALLOWROOTCHANGE, DENYROOTCHANGE, FOSWIKI_LAYOUT_URL, FOSWIKI_STYLE_URL, FOSWIKI_COLORS_URL, USERSWEB, SYSTEMWEB, DOCWEB
 
 <!-- Keep this as a security measure:
    * Set ALLOWTOPICCHANGE = AdminGroup
diff --git a/core/data/System/DefaultPreferences.txt b/core/data/System/DefaultPreferences.txt
index f788d3d352..ae1fef427e 100644
--- a/core/data/System/DefaultPreferences.txt
+++ b/core/data/System/DefaultPreferences.txt
@@ -37,7 +37,7 @@ Preference settings local to your site should be set in [[%LOCALSITEPREFS%]] (th
       * Set SITEMAPUSETO = ...to do something.
 
    * Copyright notice:
-      * Set WEBCOPYRIGHT = %MAKETEXT{"Copyright &&copy; by the contributing authors. All material on this collaboration platform is the property of the contributing authors." args="1999-%GMTIME{$year}%"}% <br /> %MAKETEXT{"Ideas, requests, problems regarding [_1]? <a href='[_2]'>Send feedback</a>" args="<nop>%WIKITOOLNAME%,mailto:%WIKIWEBMASTER%?subject=%WIKITOOLNAME%%20Feedback%20on%20%BASEWEB%.%BASETOPIC%"}% %IF{"$ WEB= $ SYSTEMWEB" then="<br /> __Note:__ Please contribute updates to this topic on TWiki.org at TWiki:TWiki.%BASETOPIC%"}%
+      * Set WEBCOPYRIGHT = %MAKETEXT{"Copyright &&copy; by the contributing authors. All material on this collaboration platform is the property of the contributing authors." args="1999-%GMTIME{$year}%"}% <br /> %MAKETEXT{"Ideas, requests, problems regarding [_1]? <a href='[_2]'>Send feedback</a>" args="<nop>%WIKITOOLNAME%,mailto:%WIKIWEBMASTER%?subject=%WIKITOOLNAME%%20Feedback%20on%20%BASEWEB%.%BASETOPIC%"}%
 
    * Simplified Copyright notice for the WebRss feed (don't use any special characters, html tags, entities, wiki markup or WikiWords)
       * Set WEBRSSCOPYRIGHT = Copyright %GMTIME{"$year"}% by contributing authors
@@ -187,9 +187,9 @@ Preference settings local to your site should be set in [[%LOCALSITEPREFS%]] (th
 ---+++ PatternSkin
 
    * Default styles       
-      * Set TWIKILAYOUTURL = %PUBURLPATH%/%SYSTEMWEB%/PatternSkin/layout.css
-      * Set TWIKISTYLEURL = %PUBURLPATH%/%SYSTEMWEB%/PatternSkin/style.css
-      * Set TWIKICOLORSURL = %PUBURLPATH%/%SYSTEMWEB%/PatternSkin/colors.css
+      * Set FOSWIKI_LAYOUT_URL = %PUBURLPATH%/%SYSTEMWEB%/PatternSkin/layout.css
+      * Set FOSWIKI_STYLE_URL = %PUBURLPATH%/%SYSTEMWEB%/PatternSkin/style.css
+      * Set FOSWIKI_COLORS_URL = %PUBURLPATH%/%SYSTEMWEB%/PatternSkin/colors.css
 
    * Custom overriding styles (enabled pr. default but empty, to prevent browsers from fetching %<nop>USERLAYOUTURL%-style URLs)
       * Set USERLAYOUTURL =