From bcfbf350d520d1ba1ba178bbe538c46a9c4fc539 Mon Sep 17 00:00:00 2001
From: ArthurClemens <ArthurClemens@0b4bb1d4-4e5a-0410-9cc4-b2b747904278>
Date: Thu, 25 Oct 2012 21:33:55 +0000
Subject: [PATCH] Item12192: Fixes and enhancements after "improve typography"
 changes

git-svn-id: http://svn.foswiki.org/branches/Release01x01@15716 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
---
 .../data/System/PatternSkinColorSettings.txt  | 1006 -----------------
 .../data/System/PatternSkinCssCookbook.txt    |    3 -
 .../data/System/PatternSkinElements.txt       |  761 ++++++++++---
 ...PatternSkinHorizontalNavigationExample.txt |    4 +-
 .../lib/Foswiki/Contrib/PatternSkin/MANIFEST  |    1 -
 .../System/PatternSkinTheme/colors_src.css    |  662 ++++++++---
 .../pub/System/PatternSkinTheme/style_src.css |  586 ++++++++--
 .../System/PatternSkinTheme2009/colors.css    |    1 -
 PatternSkin/templates/changeform.pattern.tmpl |    5 +-
 PatternSkin/templates/css.pattern.tmpl        |    2 -
 PatternSkin/templates/edit.pattern.tmpl       |    9 +-
 PatternSkin/templates/foswiki.pattern.tmpl    |   19 +-
 PatternSkin/templates/login.pattern.tmpl      |    9 +-
 PatternSkin/templates/renamebase.pattern.tmpl |    2 +-
 PatternSkin/templates/view.pattern.tmpl       |    2 +-
 15 files changed, 1578 insertions(+), 1494 deletions(-)
 delete mode 100644 PatternSkin/data/System/PatternSkinColorSettings.txt

diff --git a/PatternSkin/data/System/PatternSkinColorSettings.txt b/PatternSkin/data/System/PatternSkinColorSettings.txt
deleted file mode 100644
index e49c5e61b5..0000000000
--- a/PatternSkin/data/System/PatternSkinColorSettings.txt
+++ /dev/null
@@ -1,1006 +0,0 @@
-%META:TOPICPARENT{name="PatternSkin"}%
----+!! Color scheme settings for %SYSTEMWEB%.PatternSkin
-Use this topic to change the color settings of %SYSTEMWEB%.PatternSkin. When this topic is saved, the attachment =my_colors.css= will be updated with new color values. This method relies on Foswiki:Extensions.AttachContentPlugin to work.
-
-<nop>AttachContentPlugin is %IF{"context AttachContentPluginEnabled" then="" else="*not* "}%installed.
-
----++!! Usage
-
-<div class="foswikiFormSteps">
-<div class="foswikiFormStep">
----+++!! Step 1
-Let %SYSTEMWEB%.PatternSkin point to the custom-made colors style sheet. In [[%USERSWEB%.SitePreferences]] copy this line: <verbatim class="tml">
-   * Set USERCOLORSURL = %PUBURLPATH%/%SYSTEMWEB%/PatternSkinTheme/my_colors.css
-</verbatim>
-</div>
-<div class="foswikiFormStep">
----+++!! Step 2
-Edit this topic, and change the color as you like.
-</div>
-<div class="foswikiFormStep foswikiLast">
----+++!! Step 3
-%IF{"context AttachContentPluginEnabled" then='<form action="%SCRIPTURL{save}%/%WEB%/%TOPIC%" method="post"><input type="hidden" name="action" value="action_save=1" /><input type="submit" class="foswikiButton" value="Save the topic" /></form> This will generate an [[%PUBURLPATH%/%SYSTEMWEB%/PatternSkinTheme/my_colors.css][attachment]] to topic [[PatternSkinTheme]].' else='Install !AttachContentPlugin to be able to save this topic. On saving, an attachment will be created to topic PatternSkinTheme.'}% 
-</div>
-</div>
-
-<blockquote class="foswikiHelp">%H% For more help on customizing styles, see [[PatternSkinCustomization]].</blockquote>
-
----++!! Color preference settings
-%TOC%
-
----++ Logical groupings
----+++ Text
----++++ MAIN_TEXT Main text color
-   * Local MAIN_TEXT = #000
----++++ LIGHT_ON_DARK_TEXT Light on dark text color
-   * Local LIGHT_ON_DARK_TEXT = #fff
----++++ GRAYED_TEXT
-   * Local GRAYED_TEXT = #797979
----++++ GENERAL_TEXT General text (black)
-   * Local GENERAL_TEXT = #000
----++++ H1_HEADER_TEXT Header text
-   * Local H1_HEADER_TEXT = #333
----++++ HEADER_TEXT Header text
-   * Local HEADER_TEXT = #390
----++++ CODE_TEXT Code text, left bar text and links
-   * Local CODE_TEXT = #333
----++++ MUTED_TEXT Muted text (dark gray)
-   * Local MUTED_TEXT = %GRAYED_TEXT%
----++++ GRAYED_OUT_TEXT Grayed out text
-   * Local GRAYED_OUT_TEXT = %GRAYED_TEXT%
----++++ SEPARATOR Separator
-   * Local SEPARATOR = #ccc
----++++ SIDEBAR_TEXT Side bar text
-   * Local SIDEBAR_TEXT = #333
-   
-   
----+++ Links
----++++ LINK_TEXT_NORMAL Link normal text
-   * Local LINK_TEXT_NORMAL = #06c
----++++ LINK_BACKGROUND_NORMAL Link normal background
-   * Local LINK_BACKGROUND_NORMAL = transparent
----++++ LINK_TEXT_NORMAL_VISITED Link normal text visited
-   * Local LINK_TEXT_NORMAL_VISITED = #4c94db
----++++ LINK_TEXT_ACTION_BUTTON Link text red (same as LINK_BACKGROUND_HOVER)
-   * Local LINK_TEXT_ACTION_BUTTON = #0055b5
----++++ LINK_TEXT_HOVER Link hover text
-   * Local LINK_TEXT_HOVER = %LINK_TEXT_NORMAL%
----++++ LINK_BACKGROUND_HOVER Link background hover
-   * Local LINK_BACKGROUND_HOVER = transparent
----++++ SIDE_BAR_LINK_TEXT Side bar link text
-   * Local SIDE_BAR_LINK_TEXT = %SIDEBAR_TEXT%
----++++ BUTTON_TEXT_NORMAL Button text
-   * Local BUTTON_TEXT_NORMAL = #333
-   
----+++ Disabled
----++++ DISABLED_BORDER Disabled border
-   * Local DISABLED_BORDER = #e0e0e0
----++++ DISABLED_TEXT Disabled text
-   * Local DISABLED_TEXT = #aaa
----++++ DISABLED_BACKGROUND Disabled background
-   * Local DISABLED_BACKGROUND = #fafaf8
----++++ BUTTON_BORDERS_DISABLED Disabled button borders
-   * Local BUTTON_BORDERS_DISABLED = #fff #ccc #ccc #fff
-
----+++ Search results bottom
----++++ SEARCH_RESULTS_INFO_TEXT Search results info (green)
-   * Local SEARCH_RESULTS_INFO_TEXT = #049804
-
----+++ Alert
----++++ ALERT_TEXT Alert text (red)
-   * Local ALERT_TEXT = #f00
----++++ ALERT_TEXT_MUTED Muted alert text (dark red)
-   * Local ALERT_TEXT_MUTED = #900
----++++ ALERT_BORDER Alert border
-   * Local ALERT_BORDER = #f00
-
----+++ Buttons
----++++ BUTTON_TEXT Button text color (dark gray)
-   * Local BUTTON_TEXT = #000
----++++ BUTTON_BORDERS Button borders
-   * Local BUTTON_BORDERS = #fff #888 #888 #fff
----++++ BUTTON_BACKGROUND Button background
-   * Local BUTTON_BACKGROUND = #e2e3e3
----++++ BUTTON_CANCEL_BACKGROUND Cancel button background
-   * Local BUTTON_CANCEL_BACKGROUND = #f2d5d0
----++++ SUBMIT_BUTTON_BACKGROUND Submit button background
-   * Local SUBMIT_BUTTON_BACKGROUND = #06c
----++++ SUBMIT_BUTTON_BORDER_TEXT Submit button text color
-   * Local SUBMIT_BUTTON_BORDER_TEXT = #fff
----++++ SELECT_BORDER Select border
-   * Local SELECT_BORDER = #888
-
----+++ Background colors
----++++ PAGE_BACKGROUND General background color
-   * Local PAGE_BACKGROUND = #eeedec
----++++ MAIN_TEXT_BACKGROUND Main background color
-   * Local MAIN_TEXT_BACKGROUND = #fff
----++++ NEUTRAL_BACKGROUND
-   * Local NEUTRAL_BACKGROUND = #f5f5f5
----++++ SIDE_BAR_BACKGROUND Side bar background
-   * Local SIDE_BAR_BACKGROUND = #fff
----++++ TOP_BAR_BACKGROUND Top bar background
-   * Local TOP_BAR_BACKGROUND = #fff
----++++ ATTACHMENT_AND_FORM_BACKGROUND Attachment, form
-   * Local ATTACHMENT_AND_FORM_BACKGROUND = %ACTIVE_FORM_BACKGROUND%
----++++ BACKGROUND_ON_FORM_BACKGROUND Table background on a form
-   * Local BACKGROUND_ON_FORM_BACKGROUND = #fcfcfc
----++++ TOPIC_ACTION_BACKGROUND Topic action row
-   * Local TOPIC_ACTION_BACKGROUND = %MAIN_TEXT_BACKGROUND%
----++++ CODE_BACKGROUND code, pre and verbatim
-   * Local CODE_BACKGROUND = #ededeb
----++++ NOTIFICATION_BACKGROUND Info, broadcast message and notifications
-   * Local NOTIFICATION_BACKGROUND = #fff7e7
----++++ INFO_BACKGROUND
-   * Local INFO_BACKGROUND = #e5fce1
-
----+++ Border colors
----++++ NEUTRAL_BORDER Info (light gray)
-   * Local NEUTRAL_BORDER = #ddd
----++++ SEPARATOR_BORDER
-   * Local SEPARATOR_BORDER = #dfdfdf
----++++ STRONG_BORDER
-   * Local STRONG_BORDER = #ccc
----++++ ATTACHMENT_AND_FORM_BORDER Attachment, form
-   * Local ATTACHMENT_AND_FORM_BORDER = #fff
----++++ LAYOUT_ELEMENT_BORDER Main layout elements (neutral tone)
-   * Local LAYOUT_ELEMENT_BORDER = #eee
----++++ IMAGE_BORDER Image border
-   * Local IMAGE_BORDER = #eee
----++++ FORM_STEP_BORDER Form step border
-   * Local FORM_STEP_BORDER = #ddd
----++++ NOTIFICATION_BORDER Notification messages
-   * Local NOTIFICATION_BORDER = #fbad17
----++++ TOPIC_ACTION_BORDER Topic action border
-   * Local TOPIC_ACTION_BORDER = %FORM_STEP_BORDER%
----++++ INFO_BORDER Info border
-   * Local INFO_BORDER = #9c9
-   
----++++ Table colors
----+++++ TABLE_DATA_BACKGROUND Table data background
-   * Local TABLE_DATA_BACKGROUND = #f0f6f9
----+++++ TABLE_HEADER_BACKGROUND Table header background
-   * Local TABLE_HEADER_BACKGROUND = #d6d3cf
----+++++ TABLE_SELECTED_COLUMN_HEADER_BACKGROUND Sorted table column accent background
-   * Local TABLE_SELECTED_COLUMN_HEADER_BACKGROUND = #c4c1ba
----+++++ TABLE_DATA_ODD_BACKGROUND Table data background (odd row)
-   * Local TABLE_DATA_ODD_BACKGROUND = #f7f7f6
----+++++ TABLE_DATA_EVEN_BACKGROUND Table data background (even row)
-   * Local TABLE_DATA_EVEN_BACKGROUND = #ffffff
----+++++ TABLE_DATA_ODD_SELECTED_BACKGROUND Table data background (odd row, selected column)
-   * Local TABLE_DATA_ODD_SELECTED_BACKGROUND = #f0f0ee
----+++++ TABLE_DATA_EVEN_SELECTED_BACKGROUND Table data background (even row, selected column)
-   * Local TABLE_DATA_EVEN_SELECTED_BACKGROUND = #f7f7f6
----+++++ TABLE_DATA_MIX_BACKGROUND Table data background (mix between even and odd)
-   * Local TABLE_DATA_MIX_BACKGROUND = #f7fafc
----++++ TABLE_BORDER Table border, sup (light neutral tone)
-   * Local TABLE_BORDER = #eee
----++++ LINK_TEXT_NORMAL_TABLE_HEADER Table header link text
-   * Local LINK_TEXT_NORMAL_TABLE_HEADER = #000
----++++ LINK_TEXT_NORMAL_BORDER_TABLE_HEADER Table header link border
-   * Local LINK_TEXT_NORMAL_BORDER_TABLE_HEADER = #bbb
----++++ LINK_TEXT_SORTED_TABLE_HEADER Sorted table header link text
-   * Local LINK_TEXT_SORTED_TABLE_HEADER = #fff
----++++ LINK_TEXT_HOVER_TABLE_HEADER Table header link hover text
-   * Local LINK_TEXT_HOVER_TABLE_HEADER = #fff
----++++ LINK_BORDER_TABLE_SELECTED_COLUMN_HEADER Link border in selected column header
-   * Local LINK_BORDER_TABLE_SELECTED_COLUMN_HEADER = #999
-
----+++ Forms
----++++ INPUT_FIELD_BORDERS Input field borders
-   * Local INPUT_FIELD_BORDERS = #bbb #f2f2f2 #f2f2f2 #bbb
----++++ FORM_INPUT_BORDER Textarea, input and select (darker gray)
-   * Local FORM_INPUT_BORDER = #aaa
----++++ FORM_BORDER Form (same as foswikiTable border)
-   * Local FORM_BORDER = #cfcfcf
----++++ ACTIVE_FORM_BACKGROUND Edit form, form steps
-   * Local ACTIVE_FORM_BACKGROUND = #f6f6f5
----++++ FORMFIELD_ACTIVE Active form field
-   * Local FORMFIELD_ACTIVE = #ebf5fa
----++++ FORM_HEADER_TEXT Header text on form background
-   * Local FORM_HEADER_TEXT = #333
-
-<!-- END OF COLOR PREFERENCES -->
-
-Do not change the text below this line unless you know what you are doing!
----
-<verbatim class="tml">
-%STARTATTACH{"my_colors.css" web="%SYSTEMWEB%" topic="PatternSkinTheme"}%
-/* PatternSkin colors */
-/* Generated by AttachContentPlugin from %WEB%.PatternSkinColorSettings */
-
-/* LAYOUT ELEMENTS */
-
-#patternScreen {
-    background:%PAGE_BACKGROUND%;
-}
-#patternPage {
-    border-color:%STRONG_BORDER%;
-}
-#patternTopBar {
-   border-color:%SEPARATOR_BORDER%;
-   background:%PAGE_BACKGROUND%;
-   /* color can be overridden with WEBHEADERBGCOLOR in %SYSTEMWEB%/DefaultPreferences */
-}
-#patternMain { /* don't set a background here; use patternOuter */ }
-#patternOuter {
-   background:none;
-   border-color:%LAYOUT_ELEMENT_BORDER%;
-}
-#patternSideBar,
-#patternWrapper {
-   background:%SIDE_BAR_BACKGROUND%;
-}
-#patternBottomBar {
-   border-color:%STRONG_BORDER%;
-   background-color:%PAGE_BACKGROUND%;
-}
-#patternBottomBarContents,
-#patternBottomBarContents a:link,
-#patternBottomBarContents a:visited {
-   color:%GRAYED_OUT_TEXT%;
-}
-#patternBottomBarContents a:hover {
-   color:%LINK_TEXT_HOVER%;
-}
-
-/* GENERAL HTML ELEMENTS */
-
-html body {
-   background-color:%PAGE_BACKGROUND%;
-   color:%MAIN_TEXT%;
-}
-html body.patternEditPage,
-.mceContentBody {
-   background-color:%MAIN_TEXT_BACKGROUND%;
-}
-
-/* be kind to netscape 4 that doesn't understand inheritance */
-body, p, li, ul, ol, dl, dt, dd, acronym, h1, h2, h3, h4, h5, h6 {
-   background-color:transparent;
-}
-hr {
-   color:%SEPARATOR_BORDER%;
-   background-color:%SEPARATOR_BORDER%;
-}
-pre, code, tt {
-   color:%CODE_TEXT%;
-}
-pre {
-   background:%CODE_BACKGROUND%;
-   border-color:%NEUTRAL_BORDER%;
-}
-blockquote {
-   background-color:%NEUTRAL_BACKGROUND%;
-   border-color:%NEUTRAL_BORDER%;
-}
-blockquote h2 {
-   background:none;
-}
-h1 {
-   color:%H1_HEADER_TEXT%;
-}
-h2, h3, h4, h5, h6 {
-   color:%HEADER_TEXT%;
-}
-
-/* to override old Render.pm coded font color style */
-.foswikiNewLink font {
-   color:inherit;
-}
-.foswikiNewLink a:link sup,
-.foswikiNewLink a:visited sup {
-   color:%MUTED_TEXT%;
-   border-color:%NEUTRAL_BORDER%;
-}
-.foswikiNewLink a:hover sup {
-   background-color:%LINK_BACKGROUND_HOVER%;
-   color:%LINK_TEXT_HOVER%;
-   border-color:%LINK_BACKGROUND_HOVER%;
-}
-.foswikiNewLink {
-   border-color:%NEUTRAL_BORDER%;
-}
-:link:focus,
-:visited:focus,
-:link,
-:visited,
-:link:active,
-:visited:active {
-   color:%LINK_TEXT_NORMAL%;
-   background-color:transparent;
-}
-:link:hover,
-:visited:hover {
-   color:%LINK_TEXT_HOVER%;
-   background-color:%LINK_BACKGROUND_HOVER%;
-   background-image:none;
-}
-:link:hover img,
-:visited:hover img {
-   background-color:transparent;
-}
-.foswikiTopic a:visited {
-   color:%LINK_TEXT_NORMAL_VISITED%;
-}
-.foswikiTopic a:hover {
-   color:%LINK_TEXT_HOVER%;
-}
-.foswikiUnvisited a:visited {
-   color:%LINK_TEXT_NORMAL%;
-}
-.foswikiUnvisited a:hover {
-   color:%LINK_TEXT_HOVER%;
-}
-
-/* Form elements */
-
-textarea,
-input,
-select {
-   border-color:%FORM_INPUT_BORDER%;
-   color:%MAIN_TEXT%;
-   background-color:%MAIN_TEXT_BACKGROUND%;
-}
-.foswikiSubmit,
-.foswikiButton {
-   border-color:%BUTTON_BORDERS%;
-}
-.foswikiSubmit {
-   color:%SUBMIT_BUTTON_BORDER_TEXT%;
-   background-color:%SUBMIT_BUTTON_BACKGROUND%;
-}
-.foswikiButton {
-   color:%BUTTON_TEXT%;
-   background-color:%BUTTON_BACKGROUND%;
-}
-.foswikiButtonCancel {
-   color:%BUTTON_TEXT%;
-   background-color:%BUTTON_CANCEL_BACKGROUND%;
-}
-.foswikiSubmitDisabled,
-.foswikiSubmitDisabled:active {
-   border-color:%BUTTON_BORDERS_DISABLED%;
-   color:%DISABLED_TEXT%;
-   background-color:%ACTIVE_FORM_BACKGROUND%;
-}
-.foswikiTextarea,
-.foswikiInputField,
-.foswikiInputFieldDisabled,
-.foswikiInputFieldReadOnly,
-.foswikiSelect {
-   border-color:%INPUT_FIELD_BORDERS%;
-}
-.foswikiTextarea,
-.foswikiInputField,
-.foswikiSelect {
-   color:%MAIN_TEXT%;
-   background-color:%MAIN_TEXT_BACKGROUND%;
-}
-.foswikiInputField:active,
-.foswikiInputField:focus,
-.foswikiInputFieldFocus {
-   background-color:%FORMFIELD_ACTIVE%;
-}
-
-.foswikiTextareaRawView {
-   color:%GENERAL_TEXT%;
-}
-.foswikiInputFieldDisabled {
-   color:%DISABLED_TEXT%;
-   background-color:%DISABLED_BACKGROUND%;
-}
-.foswikiInputFieldReadOnly {
-   color:%GRAYED_TEXT%;
-}
-.foswikiSelect {
-   border-color:%INPUT_FIELD_BORDERS%;
-   color:%MAIN_TEXT%;
-   background-color:%MAIN_TEXT_BACKGROUND%;
-}
-.foswikiInputFieldDisabled,
-.foswikiSelectDisabled {
-   color:%DISABLED_TEXT%;
-   border-color:%INPUT_FIELD_BORDERS%;
-   background-color:%DISABLED_BACKGROUND%;
-}
-.foswikiInputFieldBeforeFocus {
-   color:%MUTED_TEXT%;
-}
-
-/*   -----------------------------------------------------------
-   Plugin elements
-   -----------------------------------------------------------   */
-
-/* TablePlugin */
-.foswikiTable,
-.foswikiTable td,
-.foswikiTable th {
-   border-color:%TABLE_BORDER%;
-}
-.foswikiTable th {
-	background:%TABLE_HEADER_BACKGROUND%;
-}
-.foswikiTable th,
-.foswikiTable th a:link,
-.foswikiTable th a:visited {
-   color:%LINK_TEXT_NORMAL_TABLE_HEADER%;
-}
-
-/* TwistyContrib */
-.twistyPlaceholder {
-   color:%GRAYED_OUT_TEXT%;
-}
-a:hover.twistyTrigger {
-   color:%LINK_TEXT_HOVER%;
-}
-
-/* TipsContrib */
-.tipsOfTheDay {
-	background-color:%ATTACHMENT_AND_FORM_BACKGROUND%;
-}
-
-/* RevCommentPlugin */
-.revComment .patternTopicAction {
-   background-color:%ATTACHMENT_AND_FORM_BACKGROUND%;
-}
-
-/*   -----------------------------------------------------------
-   Foswiki styles
-   -----------------------------------------------------------   */
-
-.foswikiGrayText {
-   color:%GRAYED_OUT_TEXT%;
-}
-.foswikiGrayText a:link,
-.foswikiGrayText a:visited {
-   color:%GRAYED_OUT_TEXT%;
-}
-.foswikiGrayText a:hover {
-   color:%LINK_TEXT_HOVER%;
-}
-
-.foswikiEditForm .foswikiFormTable,
-.foswikiEditForm .foswikiFormTable th,
-.foswikiEditForm .foswikiFormTable td {
-   border-color:%TABLE_BORDER%;
-}
-.foswikiAttachments table {
-   border-color:%TABLE_BORDER%;
-   background-color:%MAIN_TEXT_BACKGROUND%;
-}
-table.foswikiFormTable,
-.foswikiAttachments table,
-.foswikiAttachments th,
-.foswikiAttachments td {
-   border-color:%TABLE_BORDER%;
-   background-color:%BACKGROUND_ON_FORM_BACKGROUND% !important;
-}
-.foswikiForm td,
-.foswikiForm th,
-.foswikiAttachments td, 
-.foswikiAttachments th {
-   border-color:%TABLE_BORDER%;
-}
-.foswikiFormSteps {
-   background-color:%ACTIVE_FORM_BACKGROUND%;
-   border-color:%FORM_STEP_BORDER%;
-}
-.foswikiFormStep,
-.patternPreviewFormStep {
-   border-color:%FORM_STEP_BORDER%;
-}
-.foswikiFormStep h2 {
-   color:%H1_HEADER_TEXT%;
-}
-.foswikiFormStep h3,
-.foswikiFormStep h4 {
-   color:%FORM_HEADER_TEXT%;
-}
-.foswikiFormStep h3,
-.foswikiFormStep h4 {
-   background-color:transparent;
-}
-.foswikiActionFormStepSign {
-   color:%DISABLED_TEXT%;
-}
-.foswikiFormStep .foswikiHelp,
-.foswikiFormStep .foswikiAllowNonWikiWord {
-	background:%MAIN_TEXT_BACKGROUND%;
-}
-.foswikiToc .foswikiTocTitle {
-   color:%MUTED_TEXT%;
-}
-.foswikiBroadcastMessage,
-.foswikiNotification {
-   background-color:%NOTIFICATION_BACKGROUND%;
-   border-color:%NOTIFICATION_BORDER%;
-}
-.foswikiMessage {
-   background-color:%NOTIFICATION_BACKGROUND%;
-}
-#foswikiLogin .patternLoginNotification {
-   background-color:%MAIN_TEXT_BACKGROUND%;
-   border-color:%ALERT_BORDER%;
-}
-.foswikiHelp {
-   background-color:%INFO_BACKGROUND%;
-   border-color:%INFO_BORDER%;
-}
-.foswikiBroadcastMessage b,
-.foswikiBroadcastMessage strong {
-   color:%ALERT_TEXT%;
-}
-.foswikiAlert,
-.foswikiAlert code {
-   color:%ALERT_TEXT%;
-}
-.foswikiEmulatedLink {
-   color:%LINK_TEXT_NORMAL%;
-}
-.foswikiPageForm table {
-   border-color:%TABLE_BORDER%;
-   background:%MAIN_TEXT_BACKGROUND%;
-}
-.foswikiPageForm hr {
-   border-color:%FORM_BORDER%;
-   background-color:%FORM_BORDER%;
-   color:%FORM_BORDER%;
-}
-.foswikiAccessKey {
-   color:inherit;
-   border-color:%GRAYED_OUT_TEXT%;
-}
-a:link .foswikiAccessKey,
-a:visited .foswikiAccessKey {
-   color:inherit;
-}
-a:hover .foswikiAccessKey {
-   color:inherit;
-}
-.foswikiImage {
-	background-color:%MAIN_TEXT_BACKGROUND%;
-}
-.foswikiImage img,
-.foswikiImage a:link img,
-.foswikiImage a:visited img {
-   border-color:%IMAGE_BORDER%;
-   background-color:%MAIN_TEXT_BACKGROUND%;
-}
-#patternTopBar .foswikiImage,
-#patternTopBar .foswikiImage img {
-   background-color:transparent;
-}
-.foswikiImage a:hover img {
-   border-color:%LINK_TEXT_HOVER%;
-}
-.foswikiSeparator {
-   color:%SEPARATOR%;
-}
-.foswikiHorizontalList ul li {
-	border-color:%SEPARATOR%;
-}
-.foswikiAllowNonWikiWord {
-	border-color:%LAYOUT_ELEMENT_BORDER%;
-}
-
-/*   -----------------------------------------------------------
-   Pattern skin specific elements
-   -----------------------------------------------------------   */
-#patternPage {
-   background-color:%MAIN_TEXT_BACKGROUND%;
-}
-.patternHomePathTitle,
-.patternRevInfo,
-.patternHomePath a:link,
-.patternHomePath a:visited {
-   color:%GRAYED_TEXT%;
-}
-.patternHomePath:hover a:link,
-.patternHomePath:hover a:visited {
-   color:%LINK_TEXT_NORMAL%;
-}
-
-/* Left bar */
-#patternSideBarContents {
-   color:%GENERAL_TEXT%;
-}
-#patternSideBarContents hr {
-   color:%FORM_STEP_BORDER%;
-   background-color:%FORM_STEP_BORDER%;
-}
-#patternSideBarContents a:link,
-#patternSideBarContents a:visited {
-   color:%SIDE_BAR_LINK_TEXT%;
-}
-#patternSideBarContents a:hover {
-   color:%LINK_TEXT_HOVER%;
-}
-#patternSideBarContents .patternLeftBarPersonal,
-#patternSideBarContents .patternWebIndicator {
-    border-color:%LAYOUT_ELEMENT_BORDER%;
-}
-#patternSideBarContents b,
-#patternSideBarContents strong {
-    color:%SIDEBAR_TEXT%;
-}
-
-.patternTopicActions {
-   background-color:%TOPIC_ACTION_BACKGROUND%;
-   color:%MAIN_TEXT%;
-}
-.patternActionButtons a:link,
-.patternActionButtons a:visited,
-.patternActionButtons a:hover {
-   color:%LINK_TEXT_NORMAL%;
-}
-.patternTopicAction s,
-.patternTopicAction strike {
-   color:%DISABLED_TEXT%;
-}
-.patternTopicAction .foswikiAccessKey {
-   color:%LINK_TEXT_NORMAL%;
-   border-color:%LINK_TEXT_NORMAL%;
-}
-.patternTopicAction a:hover .foswikiAccessKey {
-   color:%LINK_TEXT_HOVER%;
-}
-.patternTopicAction label {
-   color:%GENERAL_TEXT%;
-}
-.patternHelpCol {
-   color:%GRAYED_OUT_TEXT%;
-}
-.patternSigLine {
-   color:%MUTED_TEXT%;
-}
-.patternToolBar a:link .foswikiAccessKey,
-.patternToolBar a:visited .foswikiAccessKey {
-   color:inherit;
-   border-color:%LINK_TEXT_NORMAL_VISITED%;
-}
-.patternToolBar a:hover .foswikiAccessKey {
-   background-color:transparent;
-   color:inherit;
-   border-color:%LINK_TEXT_NORMAL_VISITED%;
-}
-.patternInfo,
-.patternInfo a:link,
-.patternInfo a:visited {
-	color:%GRAYED_TEXT%;
-}
-.patternInfo:hover a:link,
-.patternInfo:hover a:visited,
-.patternInfo a:hover {
-	color:%LINK_TEXT_NORMAL%;
-}
-.patternTwistyButton {
-	color:%LINK_TEXT_NORMAL%;
-}
-.patternAttachmentHeader .foswikiSmall {
-   color:%GRAYED_OUT_TEXT%;
-}
-
-/* WebSearch, WebSearchAdvanced */
-
-table#foswikiSearchTable {
-   border-color:%FORM_STEP_BORDER%;
-   background-color:%PAGE_BACKGROUND%;
-}
-table#foswikiSearchTable th,
-table#foswikiSearchTable td {
-   background-color:%MAIN_TEXT_BACKGROUND%;
-   border-color:%FORM_STEP_BORDER%;
-}
-table#foswikiSearchTable hr {
-   border-color:%FORM_STEP_BORDER%;
-   background-color:%FORM_STEP_BORDER%;
-}
-table#foswikiSearchTable th {
-   color:%MAIN_TEXT%;
-}
-
-/*   -----------------------------------------------------------
-   Search results
-   styles and overridden styles used in search.pattern.tmpl
-   -----------------------------------------------------------   */
-
-.foswikiSearchResult .foswikiAlert {
-   color:%ALERT_TEXT%;
-}
-.foswikiSearchResult .foswikiSummary .foswikiAlert {
-   color:%ALERT_TEXT_MUTED%;
-}
-.foswikiSearchResult .foswikiBottomRow,
-.foswikiSearchResult .foswikiBottomRow a:link,
-.foswikiSearchResult .foswikiBottomRow a:visited {
-   color:%SEARCH_RESULTS_INFO_TEXT%;
-}
-.foswikiSearchResult .foswikiBottomRow:hover a:link,
-.foswikiSearchResult .foswikiBottomRow:hover a:visited {
-   color:%LINK_TEXT_NORMAL%;
-}
-.patternViewPage .patternSearchResultsBegin {
-   border-color:%TABLE_BORDER%;
-}
-
-/* preview.pattern.tmpl */
-
-.foswikiPreviewArea {
-	background:%MAIN_TEXT_BACKGROUND%;
-}
-
-/* rdiff.pattern.tmpl */
-
-.patternDiff,
-.patternDiffPage .foswikiDiffTable {
-   border-color:%STRONG_BORDER%;
-}
-.patternDiff .foswikiTopRow {
-   background-color:%NEUTRAL_BACKGROUND%;
-}
-tr.foswikiDiffDebug td {
-   border-color:%NEUTRAL_BACKGROUND%;
-}
-.foswikiDiffTable table th {
-   background-color:%NEUTRAL_BACKGROUND%;
-}
-.foswikiDiffTable th {
-   background-color:%NEUTRAL_BACKGROUND%;
-}
-/* Changed */
-.foswikiDiffChangedHeader {
-	/* violet - do not change */
-	background:#ccf !important;
-}
-.foswikiDiffChangedText {
-	/* violet - do not change */
-	border-color:#99f !important;
-	background-color:#fff !important;
-}
-/* Deleted */
-.foswikiDiffDeletedHeader {
-	background-color:#ffd6d6 !important;
-}
-.foswikiDiffDeletedMarker {
-	/* red - do not change */
-	border-color:#f33 !important;
-	background-color:#fff !important;
-}
-/* Added */
-.foswikiDiffAddedHeader {
-	background-color:#ccf5d6 !important;
-}
-.foswikiDiffAddedMarker {
-	/* green - do not change */
-	border-color:#0c3 !important;
-	background-color:#fff !important;
-}
-/* Unchanged */
-.foswikiDiffUnchangedMarker {
-	border-color:%NEUTRAL_BACKGROUND% !important;
-	background-color:#fff !important;
-}
-.foswikiDiffUnchangedText {
-   color:%GRAYED_OUT_TEXT%;
-}
-.foswikiDiffUnchangedTextContents { }
-.foswikiDiffLineNumberHeader th {
-   background-color:%NEUTRAL_BACKGROUND% !important;
-}
-
-
-
-
-/* IMAGES */
-/* image positions are set here as well as these are dependent on the image */
-
-#patternTopBar {
-    /* image is defined as WEBHEADERART in %SYSTEMWEB%/DefaultPreferences */
-}
-.foswikiToc li {
-   background-image:url(bullet-toc.gif);
-   background-repeat:no-repeat;
-   background-position:0 .4em;
-}
-.patternPrintPage #patternOuter {
-   background:#fff; /* white - do not change */
-}
-.foswikiSubmit,
-.foswikiSubmitDisabled {
-   background-image:url(bg_submit_gradient.gif);
-   background-repeat:repeat-x;
-}
-.foswikiSubmit,
-a.foswikiSubmit:link,
-a.foswikiSubmit:visited {
-   background-position:0px 0px;
-   background-color:#06c;
-   border-color:#94cce2 #0e66a2 #0e66a2 #94cce2;
-   color:#fff;
-}
-.foswikiSubmit:hover,
-a.foswikiSubmit:hover {
-   background-position:0px -80px;
-   background-color:#0047b7;
-   border-color:#0e66a2 #94cce2 #94cce2 #0e66a2;
-   color:#fff;
-}
-.foswikiSubmit:active,
-a.foswikiSubmit:active {
-   background-position:0px -160px;
-   background-color:#73ace6;
-   border-color:#0e66a2 #94cce2 #94cce2 #0e66a2;
-   color:#fff;
-}
-.foswikiSubmitDisabled,
-.foswikiSubmitDisabled:hover,
-.foswikiSubmitDisabled:active {
-   background-position:0px -240px;
-   background-color:#d9e8f7;
-   border-color:#ccc #ccc #ccc #ccc;
-   color:#ccc;
-}
-.foswikiButton,
-a.foswikiButton:link,
-a.foswikiButton:visited {
-   background-image:url(bg_button_gradient.gif);
-   background-repeat:repeat-x;
-   background-position:0px 0px;
-   border-color:#fff #94cce2 #94cce2 #fff;
-   background-color:#cce7f1;
-   color:%BUTTON_TEXT_NORMAL%;
-}
-.foswikiButton:hover,
-.foswikiButton:active,
-a.foswikiButton:hover,
-a.foswikiButton:active {
-   background-position:0px -160px;
-   border-color:#94cce2 #94cce2 #94cce2 #94cce2;
-   background-color:#cce7f1;
-   color:%BUTTON_TEXT_NORMAL%;
-}
-.foswikiButtonDisabled,
-.foswikiButtonDisabled:hover,
-.foswikiButtonDisabled:active {
-   background-image:url(bg_button_gradient.gif);
-   background-repeat:repeat-x;
-   background-position:0px -240px;
-   border-color:#ccc #ccc #ccc #ccc;
-   background-color:#edece6;
-   color:#bbb;
-}
-.foswikiButtonCancel {
-   background-image:url(bg_buttoncancel_gradient.gif);
-   background-repeat:repeat-x;
-   background-position:0px 0px;
-   border-color:#f3ddd7 #ce5232 #ce5232 #f3ddd7;
-   background-color:#dd724d;
-   color:#fff;
-}
-.foswikiButtonCancel:hover {
-   background-position:0px -80px;
-   border-color:#ce5232 #f3ddd7 #f3ddd7 #ce5232;
-   background-color:#dd724d;
-   color:#fff;
-}
-.foswikiButtonCancel:active {
-   background-position:0px -160px;
-   border-color:#ce5232 #f3ddd7 #f3ddd7 #ce5232;
-   background-color:#dd724d;
-   color:#fff;
-}
-.patternToolBar span a:link,
-.patternToolBar span a:visited,
-.patternToolBar span s,
-.patternToolBar span strike {
-   background-image:url(bg_button_gradient.gif);
-   background-repeat:repeat-x;
-}
-.patternToolBar span a:link,
-.patternToolBar span a:visited {
-   background-position:0px 0px;
-   border-color:#fff #94cce2 #94cce2 #fff;
-   background-color:#cce7f1;
-   color:%BUTTON_TEXT_NORMAL%;
-}
-.patternToolBar span a:hover {
-   background-position:0px -80px;
-   border-color:#94cce2 #94cce2 #94cce2 #94cce2;
-   background-color:#cce7f1;
-   color:#222;
-}
-.patternToolBar span a:active {
-   background-position:0px -160px;
-   border-color:#94cce2 #94cce2 #94cce2 #94cce2;
-   background-color:#e8e5d7;
-   color:#222;
-}
-.patternToolBar span s,
-.patternToolBar span strike {
-   background-position:0px -240px;
-   border-color:#eae9e7 #eae9e7 #eae9e7 #eae9e7;
-   background-color:#edece6;
-   color:#bbb;
-}
-.patternTextareaButton {
-   border-color:#fffefd #b8b6ad #b8b6ad #fffefd;
-   overflow:hidden;
-}
-.patternButtonFontSelector {
-   background-image:url(button_font_selector.gif);
-   width:33px;
-   height:16px;
-}
-.patternButtonFontSelectorProportional {
-   background-position:0 0;
-}
-.patternButtonFontSelectorMonospace {
-   background-position:0 -16px;
-}
-.patternButtonEnlarge,
-.patternButtonShrink {
-   background-image:url(button_arrow.gif);
-   width:16px;
-   height:16px;
-}
-.patternButtonEnlarge {
-   background-position:0 0;
-}
-.patternButtonEnlarge:hover {
-   background-position:0 -42px;
-}
-.patternButtonEnlarge:active {
-   background-position:0 -84px;
-}
-.patternButtonShrink {
-   background-position:16px 0;
-}
-.patternButtonShrink:hover {
-   background-position:16px -42px;
-}
-.patternButtonShrink:active {
-   background-position:16px -84px;
-}
-
-/* common settings */
-.patternLeftBarPersonal li,
-li.patternLogOut,
-li.patternLogIn {
-   padding-left:13px;
-   background-position:0 .4em;
-   background-repeat:no-repeat;
-}
-.patternLeftBarPersonal li {
-   background-image:url(bullet-personal_sidebar.gif);
-}
-.patternLeftBarPersonal li.patternLogOut {
-   background-image:url(bullet-lock.gif);
-}
-.patternLeftBarPersonal li.patternLogIn {
-   background-image:url(bullet-lock.gif);
-}
-#foswikiLogin,
-.patternShadow {
-	border:10px solid %MAIN_TEXT_BACKGROUND%;
-	margin-top:10px;
-	margin-bottom:10px;
-	-moz-box-shadow: 0 0 10px %STRONG_BORDER%;
-	-webkit-box-shadow: 0 0 10px %STRONG_BORDER%;
-	box-shadow: 0 0 10px %STRONG_BORDER%;
-}
-.patternBorder {
-	border-color:%NEUTRAL_BORDER%;
-}
-.foswikiJs a.jqPopUpWindow:link,
-.foswikiJs a.jqPopUpWindow:visited,
-.foswikiJs a.jqPopUpWindow:hover {
-	background-image:url(popup.gif);
-	background-repeat:no-repeat;
-	background-position:right;
-	padding-right:14px;
-	margin-right:3px;
-}
-%ENDATTACH%
-</verbatim>
-<!-- %JQREQUIRE{"chili"}% -->
diff --git a/PatternSkin/data/System/PatternSkinCssCookbook.txt b/PatternSkin/data/System/PatternSkinCssCookbook.txt
index c3f0a513b9..7cbbaf47ef 100644
--- a/PatternSkin/data/System/PatternSkinCssCookbook.txt
+++ b/PatternSkin/data/System/PatternSkinCssCookbook.txt
@@ -15,9 +15,6 @@
 
 When customizing your Foswiki installation, you can either choose to completely rewrite all css styles, or to selectively override some styles. The latter option is by far less time consuming, but all depends on your graphical wishes.
 
----+++ Changing the color scheme
-Have a look at PatternSkinColorSettings.
-
 ---+++ When you need lots of graphic changes: Rewriting CSS
    * Create a new topic that will contain your new CSS files
    * Attach 3 new style sheets to the topic
diff --git a/PatternSkin/data/System/PatternSkinElements.txt b/PatternSkin/data/System/PatternSkinElements.txt
index 27446446c7..589dac16ef 100644
--- a/PatternSkin/data/System/PatternSkinElements.txt
+++ b/PatternSkin/data/System/PatternSkinElements.txt
@@ -1,104 +1,208 @@
-%META:TOPICINFO{author="ProjectContributor" date="1304697250" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1351103142" format="1.1" version="1"}%
 %META:TOPICPARENT{name="PatternSkin"}%
-<div class="foswikiBroadcastMessage"> <strong>NOTE:</strong> Edit and Attach will be disabled today between 05:00 PM and 06:00 PM PDT (00:00 to 01:00 GMT) for a scheduled Foswiki maintenance.</div>
+---+!! Pattern Skin Elements
+Some intro text.
 
-<div class="foswikiNotification">This is a notification. 
-Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
-Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
-Normal text.
-Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
-Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
-Normal text.
-Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
-Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
-Normal text.
-</div>
-
----+!! h1 header [[%TOPIC%][with link]]
-
-*Intro text.* Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
+Text.
 
 %TOC{title="On this page:"}%
 
----++ h2 header [[%TOPIC%][with link]]
+---+!! Heading 1
+
+text
+
+---++ Heading 2
+
+text
+
+---+++ Heading 3
+
+text
+
+---++++ Heading 4
+
+text
+
+---+++++ Heading 5
+
+text
+
+---++++++ Heading 6
+
+text
+
+<h2 id='paragraph'>A very very very very very very very very very very very very very very very very very very very very very very very very long header</h2> 
+
+Regular text lorem ipsum dolor sit amet, <a href='#' title='test link'>test link</a> adipiscing elit. *Bold text nullam dignissim* convallis est. _Italic text quisque aliquam._ Donec faucibus. __Bold italic nunc iaculis suscipit dui.__ Nam sit amet sem. Aliquam libero nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem, consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue quis tellus.
+
+Lorem ipsum dolor sit amet, <em>emphasis</em> consectetuer adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem, consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue quis tellus.
+
+paragraphs:
+
+<p>Lorem ipsum dolor sit amet, <a href='#' title='test link'>test link</a> adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem, consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue quis tellus.</p>
+<p>Lorem ipsum dolor sit amet, <em>emphasis</em> consectetuer adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem, consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue quis tellus.</p>
+
+<h2 id='list_types'>List Types</h2> 
+
+<h3>Definition List</h3> 
+<DL>
+<DT><STRONG>Lower cost</STRONG>
+<DD>The new version of this product costs significantly less than the
+previous one!
+<DT><STRONG>Easier to use</STRONG>
+<DD>We've changed the product so that it's much easier to use!
+<DT><STRONG>Safe for kids</STRONG>
+<DD>You can leave your kids alone in a room with this product and
+they won't get hurt (not a guarantee).
+</DL>
+
+
+<h3>Ordered List</h3> 
+<ol> 
+<li>List Item 1</li> 
+<li>List Item 2</li> 
+<li>List Item 3</li> 
+</ol> 
+<h3>Unordered List</h3> 
+<ul> 
+<li>List Item 1</li> 
+<li>List Item 2</li> 
+<li>List Item 3</li> 
+</ul>
+
+---+++ TML markup unordered list
+   * level 1
+      * level 2
+         * level 3
+   * level 1
+---+++ TML markup ordered list
+   1 level 1
+      1 level 2
+         1 level 3
+   1 level 1
+   1 level 1
+   1 level 1
+   1 level 1
+   1 level 1
+   1 level 1
+   1 level 1
+   1 level 1
+   1 level 1
+   1 level 1
+   1 level 1
+   1 level 1
+   1 level 1
+   
+---+++ TML markup numbered lists
+   A. item 1
+   A. item 2
+   A. item 3
+
+   i. item 1
+   i. item 2
+   i. item 3
+
+   I. item 1
+   I. item 2
+   I. item 3
+---+++ TML markup definition list
+   $ Sushi: Japan 
+   $ Dim Sum: S.F. 
+      
+---+++ TML mixed lists
+   1 level 1
+      * level 2
+         * level 3
+   1 level 1
+      1 level 2
+         1 level 3
+
+
+
+---+ H1 header [[%TOPIC%][with link]]
 *Intro text.* Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
 
----++ h2 header [[%TOPIC%][with link]] - no newline
+---++ H2 header [[%TOPIC%][with link]]
 *Intro text.* Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
 
----+++ h3 header [[%TOPIC%][with link]] and a very long header text a very long header text a very long header text a very long header text a very long header text a very long header text a very long header text
+---++ H2 header [[%TOPIC%][with link]]
 
-*Intro text.* Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
-
----++++ h4 header [[%TOPIC%][with link]]
+Empty line before *Intro text.* Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
 
+---+++ H3 header [[%TOPIC%][with link]]
 *Intro text.* Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
 
----+++++ h5 header [[%TOPIC%][with link]]
-
+---++++ H4 header [[%TOPIC%][with link]]
 *Intro text.* Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
 
----++++++ h6 header [[%TOPIC%][with link]]
+---+++++ H5 header [[%TOPIC%][with link]]
+*Intro text.* Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
 
+---++++++ H6 header  [[%TOPIC%][with link]]
 *Intro text.* Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
 
-<div class="foswikiNotification">
+[[%TOPIC%][link]]
+
+<div class='foswikiNotification'>
 ---+ h1 header in a block
 Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
 </div>
 
-<div class="foswikiNotification">
+<div class='foswikiNotification'>
 ---++ h2 header in a block
 Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
 </div>
 
-<div class="foswikiNotification">
+<div class='foswikiNotification'>
 ---+++ h3 header in a block
 Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
 </div>
 
-<div class="foswikiNotification">
+<div class='foswikiNotification'>
 ---++++ h4 header in a block
 Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
 </div>
 
-<div class="foswikiNotification">
+<div class='foswikiNotification'>
 ---+++++ h5 header in a block
 Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
 </div>
 
-<div class="foswikiNotification">
+<div class='foswikiNotification'>
 ---++++++ h6 header in a block
 Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
 </div>
 
-
 ---++ Text sizes
 
 Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal 
-<span class="foswikiSmallish">Smallish text. Smallish text. Smallish text. Smallish text. Smallish text. Smallish text. Smallish text. Smallish text. Smallish text. </span>
-<span class="foswikiSmall">Small text. Small text. Small text. Small text. Small text. Small text. Small text. Small text. Small text. </span>
+<span class='foswikiSmallish'>Smallish text. Smallish text. Smallish text. Smallish text. Smallish text. Smallish text. Smallish text. Smallish text. Smallish text. </span>
+<span class='foswikiSmall'>Small text. Small text. Small text. Small text. Small text. Small text. Small text. Small text. Small text. </span>
 
 ---++ Text colors
 
-<span class="foswikiGrayText">Grayed out text.</span>
+<span class='foswikiGrayText'>Grayed out text.</span>
 
-<span class="foswikiAlert">Alert text.</span>
-
----++ Rule
----
+<span class='foswikiAlert'>Alert text.</span>
 
----++ Images
-Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
-Text with :-) smilies and %ICON{info}% icons.
-Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
 
 ---++ Blockquote
-
 <blockquote>
 Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
 </blockquote>
 
+---++ Rules
+---
+---
+---
+text
+---
+---+++ header
+text
+---
+text
+
+
 ---++ Table
 
 | *Numbers* | *Texts* |
@@ -106,13 +210,33 @@ Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. No
 | 123  | xyz |
 | 789  | rst |
 
----++ Verbatim
+and text below the table
+
+%TABLE{initsort="1"}%
+| *Numbers* | *Texts* |
+| 456  | uvw |
+| 123  | xyz |
+| 789  | rst |
+| def  | rst |
+| kqo  | rst |
 
+---++ Code texts
+---+++ Inline code
+lasdkj asldjas ldja sld =adasdsadasdas= aldjasldksaldkjas =ads<a href='#'>link</a>aidas=.
+---+++ verbatim
 <verbatim>
 verbatim text
 A lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text 
+<a href='#'>link</a>
 </verbatim>
 
+---+++ pre
+<pre>
+verbatim text
+<span class='foswikiAlert'>A lot more of verbatim text</span> lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text 
+<a href='#'>link</a>
+</pre>
+
 ---++ Lists
 
 Bullet list:
@@ -129,13 +253,421 @@ Numbered list:
       1 Item 2.2
    1 Item 3
 
----++ Attachment table
 
-<div class="foswikiAttachments">
-<table summary="Topic attachments" style="border-width:1px;" cellspacing="0" id="foswikiAttachmentsTable" cellpadding="0" class="foswikiTable" rules="rows" border="1"><caption>Topic attachments</caption><tr class="foswikiTableEven"><th bgcolor="#ffffff" align="center" valign="middle" style="text-align:center;vertical-align:middle;" class="foswikiFirstCol"> <a rel="nofollow" href="%TOPIC%?sortcol=0;table=1;up=0#sorted_table" style="color:#0066cc" title="Sort by this column">I</a> </th><th bgcolor="#ffffff" align="center" valign="middle" style="text-align:center;vertical-align:middle;"> <a rel="nofollow" href="%TOPIC%?sortcol=1;table=1;up=0#sorted_table" style="color:#0066cc" title="Sort by this column">Attachment</a> </th><th bgcolor="#ffffff" align="center" valign="middle" style="text-align:center;vertical-align:middle;"> <a rel="nofollow" href="%TOPIC%?sortcol=2;table=1;up=0#sorted_table" style="color:#0066cc" title="Sort by this column">Action</a> </th><th bgcolor="#ffffff" align="center" valign="middle" style="text-align:center;vertical-align:middle;"> <a rel="nofollow" href="%TOPIC%?sortcol=3;table=1;up=0#sorted_table" style="color:#0066cc" title="Sort by this column">Size</a> </th><th bgcolor="#ffffff" align="center" valign="middle" style="text-align:center;vertical-align:middle;"> <a rel="nofollow" href="%TOPIC%?sortcol=4;table=1;up=0#sorted_table" style="color:#0066cc" title="Sort by this column">Date</a> </th><th bgcolor="#ffffff" align="center" valign="middle" style="text-align:center;vertical-align:middle;"> <a rel="nofollow" href="%TOPIC%?sortcol=5;table=1;up=0#sorted_table" style="color:#0066cc" title="Sort by this column">Who</a> </th><th bgcolor="#ffffff" align="center" valign="middle" style="text-align:center;vertical-align:middle;"> <a rel="nofollow" href="%TOPIC%?sortcol=6;table=1;up=0#sorted_table" style="color:#0066cc" title="Sort by this column">Comment</a> </th></tr>
-<tr class="foswikiTableOdd"><td bgcolor="#ffffff" align="center" valign="top" style="text-align:center;vertical-align:top;" class="foswikiFirstCol"> <img width="16" alt="txt" align="top" src="%PUBURL%/%SYSTEMWEB%/DocumentGraphics/txt.gif" height="16" border="0" /><span class="foswikiHidden">txt</span> </td><td bgcolor="#ffffff" align="left" valign="top" style="text-align:left;vertical-align:top;"> <a href="%SCRIPTURL{"viewfile"}%/System/FileAttachment?rev=;filename=Sample.txt">Sample.txt</a> </td><td bgcolor="#ffffff" align="left" valign="top" style="text-align:left;vertical-align:top;"> <a href="%SCRIPTURL{"attach"}%/System/FileAttachment?filename=Sample.txt&amp;revInfo=1" title='change, update, previous revisions, move, delete...'rel='nofollow'>manage</a> </td><td bgcolor="#ffffff" align="right" valign="top" style="text-align:right;vertical-align:top;"> 0.1&nbsp;K </td><td bgcolor="#ffffff" align="left" valign="top" style="text-align:left;vertical-align:top;"> 22 Jul 2000 - 19:37 </td><td bgcolor="#ffffff" align="left" valign="top" style="text-align:left;vertical-align:top;"> <a href="ProjectContributor">ProjectContributor</a> </td><td bgcolor="#ffffff" align="left" valign="top" style="text-align:left;vertical-align:top;"> Just a sample </td></tr>
-<tr class="foswikiTableEven"><td bgcolor="#ffffff" align="center" valign="top" style="text-align:center;vertical-align:top;" class="foswikiFirstCol foswikiLast"> <img width="16" alt="gif" align="top" src="%PUBURL%/%SYSTEMWEB%/DocumentGraphics/gif.gif" height="16" border="0" /><span class="foswikiHidden">gif</span> </td><td bgcolor="#ffffff" align="left" valign="top" style="text-align:left;vertical-align:top;" class="foswikiLast"> <a href="%SCRIPTURL{"viewfile"}%/System/FileAttachment?rev=;filename=Smile.gif">Smile.gif</a> </td><td bgcolor="#ffffff" align="left" valign="top" style="text-align:left;vertical-align:top;" class="foswikiLast"> <a href="%SCRIPTURL{"attach"}%/System/FileAttachment?filename=Smile.gif&amp;revInfo=1" title='change, update, previous revisions, move, delete...'rel='nofollow'>manage</a> </td><td bgcolor="#ffffff" align="right" valign="top" style="text-align:right;vertical-align:top;" class="foswikiLast"> 0.1&nbsp;K </td><td bgcolor="#ffffff" align="left" valign="top" style="text-align:left;vertical-align:top;" class="foswikiLast"> 22 Jul 2000 - 19:38 </td><td bgcolor="#ffffff" align="left" valign="top" style="text-align:left;vertical-align:top;" class="foswikiLast"> <a href="ProjectContributor">ProjectContributor</a> </td><td bgcolor="#ffffff" align="left" valign="top" style="text-align:left;vertical-align:top;" class="foswikiLast"> Smiley face </td></tr>
-</table></div><!--//foswikiAttachments-->
+---++ Comment
+
+%COMMENT{}%
+
+---++ Links
+
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. [[System.WebHome]] Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum DoesNotExist Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.
+
+
+---+ Header
+<div class='foswikiNotification'>
+---++ h2 header in a block
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+</div>
+<div class='foswikiHelp'>
+Available help:
+   * <strong>Help:</strong> Please see %POPUPWINDOW{"%SYSTEMWEB%.FileAttachment" label="System.FileAttachment"}% for more information about attaching files.
+   * <strong>Bug:</strong> Internet Explorer 4.0 or earlier: If you get an "Internal Server Error" message when you upload a file, you need to try again. It should work the second time.
+</div>
+
+---++ h2 header
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+<verbatim>
+verbatim text
+A lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text 
+</verbatim>
+
+<button class='foswikiButton'>foswikiButton</button> <button class='foswikiButtonDisabled'>foswikiButtonDisabled</button> <input type='submit' class='foswikiSubmit' value='foswikiSubmit' />
+
+---+ Header
+<div class='foswikiNotification'>
+---++ h2 header in a block
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+</div>
+<div class='foswikiHelp'>
+Available help:
+   * <strong>Help:</strong> Please see %POPUPWINDOW{"%SYSTEMWEB%.FileAttachment" label="System.FileAttachment"}% for more information about attaching files.
+   * <strong>Bug:</strong> Internet Explorer 4.0 or earlier: If you get an "Internal Server Error" message when you upload a file, you need to try again. It should work the second time.
+</div>
+
+---++ h2 header
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+<verbatim>
+verbatim text
+A lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text 
+</verbatim>
+
+<button class='foswikiButton'>foswikiButton</button> <button class='foswikiButtonDisabled'>foswikiButtonDisabled</button> <input type='submit' class='foswikiSubmit' value='foswikiSubmit' />
+
+---+ Header
+<div class='foswikiNotification'>
+---++ h2 header in a block
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+</div>
+<div class='foswikiHelp'>
+Available help:
+   * <strong>Help:</strong> Please see %POPUPWINDOW{"%SYSTEMWEB%.FileAttachment" label="System.FileAttachment"}% for more information about attaching files.
+   * <strong>Bug:</strong> Internet Explorer 4.0 or earlier: If you get an "Internal Server Error" message when you upload a file, you need to try again. It should work the second time.
+</div>
+
+---++ h2 header
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+<verbatim>
+verbatim text
+A lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text 
+</verbatim>
+
+<button class='foswikiButton'>foswikiButton</button> <button class='foswikiButtonDisabled'>foswikiButtonDisabled</button> <input type='submit' class='foswikiSubmit' value='foswikiSubmit' />
+
+---+ Header
+<div class='foswikiNotification'>
+---++ h2 header in a block
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+</div>
+<div class='foswikiHelp'>
+Available help:
+   * <strong>Help:</strong> Please see %POPUPWINDOW{"%SYSTEMWEB%.FileAttachment" label="System.FileAttachment"}% for more information about attaching files.
+   * <strong>Bug:</strong> Internet Explorer 4.0 or earlier: If you get an "Internal Server Error" message when you upload a file, you need to try again. It should work the second time.
+</div>
+
+---++ h2 header
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+<verbatim>
+verbatim text
+A lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text lot more of verbatim text 
+</verbatim>
+
+<button class='foswikiButton'>foswikiButton</button> <button class='foswikiButtonDisabled'>foswikiButtonDisabled</button> <input type='submit' class='foswikiSubmit' value='foswikiSubmit' />
+
+---++ Buttons
+---+++ input type="submit"
+<input type='submit' class='foswikiButton' value='foswikiButton' /> disabled: <input type='submit' class='foswikiButtonDisabled' value='foswikiButtonDisabled' /> or <input type='submit' class='foswikiButton foswikiButtonDisabled' value='foswikiButton foswikiButtonDisabled' />
+
+<input type='submit' class='foswikiSubmit' value='foswikiSubmit' /> or <input type='submit' class='foswikiButton foswikiSubmit' value='foswikiButton foswikiSubmit' /> disabled: <input type='submit' class='foswikiSubmitDisabled' value='foswikiSubmitDisabled' /> or <input type='submit' class='foswikiSubmit foswikiButtonDisabled' value='foswikiSubmit foswikiButtonDisabled' />
+
+<input type='submit' class='foswikiButtonCancel' value='foswikiButtonCancel' /> or <input type='submit' class='foswikiButton foswikiButtonCancel' value='foswikiButton foswikiButtonCancel' /> disabled: 
+<input type='submit' class='foswikiButtonCancel foswikiButtonDisabled' value='foswikiButtonCancel foswikiButtonDisabled' />
+
+<input type='submit' class='foswikiButton foswikiButtonSmall' value='foswikiButton foswikiButtonSmall' /> disabled: <input type='submit' class='foswikiButtonDisabled foswikiButtonSmall' value='foswikiButtonDisabled foswikiButtonSmall' />
+
+<input type='submit' class='foswikiButton foswikiButtonMini' value='foswikiButton foswikiButtonMini' /> disabled: <input type='submit' class='foswikiButtonDisabled foswikiButtonMini' value='foswikiButtonDisabled foswikiButtonMini' />
+
+<input type='submit' class='foswikiButton foswikiButtonLarge' value='foswikiButton foswikiButtonLarge' /> disabled: <input type='submit' class='foswikiButtonDisabled foswikiButtonLarge' value='foswikiButtonDisabled foswikiButtonLarge' />
+
+---+++ links
+<a href='#' class='foswikiButton'>foswikiButton</a> disabled: <a href='#' class='foswikiButtonDisabled'>foswikiButtonDisabled</a> or <a href='#' class='foswikiButton foswikiButtonDisabled'>foswikiButton foswikiButtonDisabled</a>
+
+<a href='#' class='foswikiSubmit'>foswikiSubmit</a> or <a href='#' class='foswikiButton foswikiSubmit'>foswikiButton foswikiSubmit</a> disabled: <a href='#' class='foswikiSubmitDisabled'>foswikiSubmitDisabled</a> or <a href='#' class='foswikiSubmit foswikiButtonDisabled'>foswikiSubmit foswikiButtonDisabled</a>
+
+<a href='#' class='foswikiButtonCancel'>foswikiButtonCancel</a> or <a href='#' class='foswikiButton foswikiButtonCancel'>foswikiButton foswikiButtonCancel</a>
+disabled: <a href='#' class='foswikiButtonCancel foswikiButtonDisabled'>foswikiButtonCancel foswikiButtonDisabled</a>
+
+<a href='#' class='foswikiButtonSmall'>foswikiButtonSmall</a> or <a href='#' class='foswikiButton foswikiButtonSmall'>foswikiButton foswikiButtonSmall</a> disabled: <a href='#' class='foswikiButtonSmall foswikiButtonDisabled'>foswikiButtonSmall foswikiButtonDisabled</a>
+
+<a href='#' class='foswikiButtonMini'>foswikiButtonMini</a> or <a href='#' class='foswikiButton foswikiButtonMini'>foswikiButton foswikiButtonMini</a> disabled: <a href='#' class='foswikiButtonMini foswikiButtonDisabled'>foswikiButtonMini foswikiButtonDisabled</a>
+
+<a href='#' class='foswikiButtonLarge'>foswikiButtonLarge</a> or <a href='#' class='foswikiButton foswikiButtonLarge'>foswikiButton foswikiButtonLarge</a> disabled: <a href='#' class='foswikiButtonLarge foswikiButtonDisabled'>foswikiButtonLarge foswikiButtonDisabled</a>
+ 
+---+++ buttons
+<button class='foswikiButton'>foswikiButton</button> disabled: 
+<button class='foswikiButtonDisabled'>foswikiButtonDisabled</button> or <button class='foswikiButton foswikiButtonDisabled'>foswikiButton foswikiButtonDisabled</button>
+
+<button class='foswikiSubmit'>foswikiSubmit</button> or <button class='foswikiButton foswikiSubmit'>foswikiButton foswikiSubmit</button> 
+disabled: <button class='foswikiSubmitDisabled'>foswikiSubmitDisabled</button> or <button class='foswikiSubmit foswikiButtonDisabled'>foswikiSubmit foswikiButtonDisabled</button>
+
+<button class='foswikiButtonCancel'>foswikiButtonCancel</button> or <button class='foswikiButton foswikiButtonCancel'>foswikiButton foswikiButtonCancel</button>
+disabled: <button class='foswikiButtonCancel foswikiButtonDisabled'>foswikiButtonCancel foswikiButtonDisabled</button>
+
+<button class='foswikiButtonSmall'>foswikiButtonSmall</button> or <button class='foswikiButton foswikiButtonSmall'>foswikiButton foswikiButtonSmall</button> disabled: 
+<button class='foswikiButtonSmall foswikiButtonDisabled'>foswikiButtonSmall foswikiButtonDisabled</button>
+
+<button class='foswikiButtonMini'>foswikiButtonMini</button> or <button class='foswikiButton foswikiButtonMini'>foswikiButton foswikiButtonMini</button> disabled: 
+<button class='foswikiButtonMini foswikiButtonDisabled'>foswikiButtonMini foswikiButtonDisabled</button>
+
+<button class='foswikiButtonLarge'>foswikiButtonLarge</button>
+ or <button class='foswikiButton foswikiButtonLarge'>foswikiButton foswikiButtonLarge</button> disabled: 
+<button class='foswikiButtonLarge foswikiButtonDisabled'>foswikiButtonLarge foswikiButtonDisabled</button>
+            
+            
+---+++ Input fields 
+=.foswikiInputField=
+
+<input type='text' size='30' class='foswikiInputField' value='value' /><button class='foswikiSubmit'>Submit</button>
+
+<input type='text' size='30' class='foswikiInputField' value='value'/><input type='submit' class='foswikiButton' value='Submit' />
+
+<textarea class='foswikiInputField' cols='20' rows='4'>value</textarea><input type='submit' class='foswikiButton' value='Submit' />
+
+---++++ Readonly
+<input type='text' size='30' readonly='readonly' class='foswikiInputField foswikiInputFieldReadOnly' value='readonly value' />
+
+---++++ Disabled
+<input type='text' size='30' disabled='disabled' class='foswikiInputField foswikiInputFieldDisabled' value='disabled value' />
+
+---++ JQuery buttons
+Using =%<nop>BUTTON{}%=
+
+%BUTTON{"%MAKETEXT{"OK"}%" icon="tick" onclick="alert($(this).text());"}%
+%BUTTON{"%MAKETEXT{"Cancel"}%" icon="cross" onclick="alert($(this).text());"}%
+%BUTTON{"%MAKETEXT{"Info"}%" icon="information" onclick="alert($(this).text());"}%
+%BUTTON{"%MAKETEXT{"Add"}%" icon="add" onclick="alert($(this).text());"}%
+%BUTTON{"%MAKETEXT{"Delete"}%" icon="delete" onclick="alert($(this).text());"}%
+%BUTTON{"%MAKETEXT{"Globe"}%" icon="world_key" onclick="alert('foo')"}%
+<div class='clear'></div>
+
+---++ Re-created jQuery buttons
+=.jqButton=
+
+<a class='jqButton jqButtonDefault' href='#'><span> <span class='jqButtonIcon' style='background-image:url(%ICONURLPATH{"choice-yes"}%)'>OK</span> </span></a>
+
+=.foswikiButton=
+
+<a class='foswikiButton' href='#'><span> <span class='foswikiButtonIcon' style='background-image:url(%ICONURLPATH{"choice-yes"}%)'>OK</span> </span></a>
+
+
+---++ Form steps
+=.foswikiFormSteps= and =.foswikiFormStep=
+
+<div class='foswikiFormSteps'>
+<div class='foswikiFormStep'>
+---++ What to expect
+<p>Some explanation</p>
+<input type='text' class='foswikiInputField' value='Some entry' />
+<div class='foswikiHelp'>
+Help text
+</div>
+<hr />
+<input type='submit' class='foswikiSubmit' value='Send it' />
+</div>
+</div>
+
+---++ Help text
+=.foswikiHelp=
+
+<div class='foswikiHelp'>
+<strong>Help:</strong> Please see %POPUPWINDOW{"%SYSTEMWEB%.FileAttachment" label="System.FileAttachment"}% for more information about attaching files.
+</div>
+
+<div class='foswikiHelp'>
+Available help:
+   * <strong>Help:</strong> Please see %POPUPWINDOW{"%SYSTEMWEB%.FileAttachment" label="System.FileAttachment"}% for more information about attaching files.
+   * <strong>Bug:</strong> Internet Explorer 4.0 or earlier: If you get an "Internal Server Error" message when you upload a file, you need to try again. It should work the second time.
+</div>
+
+<div class='foswikiHelp'>
+---++ Help
+Please see %POPUPWINDOW{"%SYSTEMWEB%.FileAttachment" label="System.FileAttachment"}% for more information about attaching files.
+</div>
+
+---++ Images
+=img=
+
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
+
+<img src='%PUBURLPATH%/%SYSTEMWEB%/BeginnersStartHere/Motorola_logo.gif' height='65' alt='' />
+
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
+
+
+---+++ foswikiImage
+=.foswikiImage=
+
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
+<div class='foswikiImage'><img src='%PUBURLPATH%/%SYSTEMWEB%/BeginnersStartHere/Motorola_logo.gif' height='65' alt='' /></div>
+
+
+---+++ Icons
+=img= and =.foswikiIcon=
+
+Normal text. Normal text. Normal text. Normal text.
+Text with :-) smilies and %ICON{info}% icons.
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text.
+
+
+---++ Foswiki styles
+---+++ Broadcast Message
+=.foswikiBroadcastMessage=
+
+<div class='foswikiBroadcastMessage'> <strong>NOTE:</strong> Edit and Attach will be disabled today between 05:00 PM and 06:00 PM PDT (00:00 to 01:00 GMT) for a scheduled Foswiki maintenance.</div>
+
+---++ Notification
+=.foswikiNotification=
+
+<div class='foswikiNotification'>
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. N
+</div>
+
+text before 
+<div class='foswikiNotification'>
+Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. Normal text. 
+</div>
+text after
+
+=.foswikiMessage=
+
+Text before <span class='foswikiMessage'>This is important</span> text after.
+
+
+---++ Horizontal list
+=.foswikiHorizontalList=
+
+<div class='foswikiHorizontalList'>
+   1 ordered item 1
+   1 ordered item 2
+   1 ordered item 3
+<div class='foswikiClear'></div>
+</div>
+
+<div class='foswikiHorizontalList'>
+   * unordered item 1
+   * unordered item 2
+   * unordered item 3
+<div class='foswikiClear'></div>
+</div>
+
+<div class='foswikiHorizontalList'>
+	<ul>
+		<li>unordered item 1</li>
+		<li>unordered item 2</li>
+		<li class='foswikiLast'>unordered item 3</li>
+	</ul>
+	<div class='foswikiClear'></div>
+</div>
+
+---++ Tabs
+
+---+++ Foswiki tabs
+<div class='foswikiTabs foswikiClearfix'>
+	<ul>
+		<li class='foswikiActive'><a href='#tab1'>Tab 1</a></li>
+		<li><a href='#tab2'>Tab 2</a></li>
+		<li><a href='#tab3'>Tab 3</a></li>
+    </ul>
+</div>
+<div id='tab1' class='foswikiTabContent'>
+---++!! Tab 1
+Regular text lorem ipsum dolor sit amet, <a href='#' title='test link'>test link</a> adipiscing elit. *Bold text nullam dignissim* convallis est. _Italic text quisque aliquam._ Donec faucibus. __Bold italic nunc iaculis suscipit dui.__ Nam sit amet sem. Aliquam libero nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem, consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue quis tellus.
+</div>
+<div id='tab2' class='foswikiTabContent'>
+---++!! Tab 2
+Regular text lorem ipsum dolor sit amet, <a href='#' title='test link'>test link</a> adipiscing elit. *Bold text nullam dignissim* convallis est. _Italic text quisque aliquam._ Donec faucibus. __Bold italic nunc iaculis suscipit dui.__ Nam sit amet sem. Aliquam libero nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem, consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue quis tellus.
+</div>
+<div id='tab3' class='foswikiTabContent'>
+---++!! Tab 3
+Regular text lorem ipsum dolor sit amet, <a href='#' title='test link'>test link</a> adipiscing elit. *Bold text nullam dignissim* convallis est. _Italic text quisque aliquam._ Donec faucibus. __Bold italic nunc iaculis suscipit dui.__ Nam sit amet sem. Aliquam libero nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem, consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue quis tellus.
+</div>
+
+---+++ Foswiki tabs without tab pane
+<div class='foswikiTabs foswikiClearfix'>
+	<ul>
+		<li class='foswikiActive'><a href='#tab1'>Tab 1</a></li>
+		<li><a href='#tab2'>Tab 2</a></li>
+		<li><a href='#tab3'>Tab 3</a></li>
+    </ul>
+</div>
+<div class='foswikiFormSteps'>
+<div class='foswikiFormStep'>
+---++ What to expect
+<p>Some explanation</p>
+<input type='text' value='Some entry' />
+</div>
+<div class='foswikiFormStep'>
+<input type='submit' class='foswikiSubmit' value='Send it' />
+</div>
+</div>
+
+---+++ jQuery tabs
+%TABPANE{}%
+%TAB{
+	"Tab 1"
+	id="tab1"
+}%This is in the first tab.
+%ENDTAB%
+%TAB{
+	"<img src='%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/help.png' class='foswikiIcon' height='16' alt='' /> %MAKETEXT{"Help"}%"
+	id="help"
+}%This is in the second tab.
+%ENDTAB%
+%ENDTABPANE%
+
+---+++ Simple
+%TABPANE{class="simple"}%
+%TAB{
+	"Tab 1"
+	id="tab1"
+}%This is in the first tab.
+%ENDTAB%
+%TAB{
+	"<img src='%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/help.png' class='foswikiIcon' height='16' alt='' /> %MAKETEXT{"Help"}%"
+	id="help"
+}%This is in the second tab.
+%ENDTAB%
+%ENDTABPANE%
+
+---+++ Links
+%TABPANE{class="links"}%
+%TAB{
+	"Tab 1"
+	id="tab1"
+}%This is in the first tab.
+%ENDTAB%
+%TAB{
+	"%MAKETEXT{"Help"}%"
+	id="help"
+}%This is in the second tab.
+%ENDTAB%
+%ENDTABPANE%
+
+
+---++ Grid
+%ADDTOZONE{
+"head"
+text="<style>
+.test {
+    background: #eee;
+}
+.test .test {
+    background: #ddd;
+}
+.row-fluid .item.span3 {
+    margin-left: 0;
+    margin-right: 1em;
+}
+.row-fluid .item.span12 {
+    margin-left: 0;
+    padding-right: 0;
+}
+</style>"
+}%
+<div class="row-fluid" id="att">
+    <div class="item span3 test">Level 2</div>
+    <div class="item span3 test">Level 2</div>
+    <div class="item span3 test">Level 2</div>
+    <div class="item span3 test">Level 2</div>
+    <div class="item span3 test">Level 2</div>
+    <div class="item span3 test">Level 2</div>
+    <div class="item span3 test">Level 2</div>
+    <div class="item span3 test">Level 2</div>
+</div>
+
+%STARTSECTION{"test"}%
+%TABPANE{class="simple"}%
+%TAB{
+	"Tab 1"
+	id="tab1"
+}%This is in the first tab.
+%ENDTAB%
+%TAB{
+	"<img src='%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/help.png' class='foswikiIcon' height='16' alt='' /> %MAKETEXT{"Help"}%"
+	id="help"
+}%This is in the second tab.
+%ENDTAB%
+%ENDTABPANE%
+%ENDSECTION{"test"}%
 
 ---++ Data form
 
@@ -154,9 +686,9 @@ Numbered list:
 <p />
 <span class="patternSearched">Searched: <b>caching</b></span><span id="foswikiNumberOfResultsContainer"></span><span id="foswikiModifySearchContainer"></span>
 <h4 class="patternSearchResultsHeader" style="background-color:#FFD8AA"><span class="foswikiLeft"><b>Results from Foswiki web</b> retrieved at 00:46 (GMT)</span><span class="foswikiRight"></span><br class="foswikiClear" /></h4>
-<div class="patternSearchResult"><div class="foswikiTopRow"><div class="foswikiLeft"><a href="%SCRIPTURL{"view"}%/System/HeadlinesPlugin"><b>HeadlinesPlugin</b></a></div><div class="foswikiRight foswikiSRAuthor"> <a href="%SCRIPTURL{"view"}%/Main/ProjectContributor">ProjectContributor</a></div><div class="foswikiRight foswikiSRRev"><span class="foswikiNew">NEW</span> - <a href="%SCRIPTURL{"riff"}%/System/HeadlinesPlugin" rel='nofollow'>27 May 2006 - 07:56</a>&nbsp;</div><br class="foswikiClear" /></div><!--/foswikiTopRow--><div class="foswikiBottomRow"><div class="foswikiSummary foswikiGrayText">Headlines Plugin Description This plugin displays RSS and ATOM feeds from news sites. Use it to build news portals that show headline news. Note: Syndic8.com ...</div><!--/foswikiSummary-->
-</div><!--/foswikiBottomRow--></div><!--/patternSearchResult--><div class="patternSearchResult"><div class="foswikiTopRow"><div class="foswikiLeft"><a href="%SCRIPTURL{"view"}%/System/TWikiAjaxContrib"><b>TWikiAjaxContrib</b></a></div><div class="foswikiRight foswikiSRAuthor"> <a href="%SCRIPTURL{"view"}%/Main/ProjectContributor">ProjectContributor</a></div><div class="foswikiRight foswikiSRRev">r2 - <a href="%SCRIPTURL{"riff"}%/System/TWikiAjaxContrib" rel='nofollow'>02 Nov 2006 - 22:04</a>&nbsp;</div><br class="foswikiClear" /></div><!--/foswikiTopRow--><div class="foswikiBottomRow"><div class="foswikiSummary foswikiGrayText">TWikiAjaxContrib TWikiAjaxContrib provides a convenience wrapper class around Yahoo's Connection Manager (AJAX). Goals are: To make it possible for plugins ...</div><!--/foswikiSummary-->
-</div><!--/foswikiBottomRow--></div><!--/patternSearchResult--><div class="patternSearchResult"><div class="foswikiTopRow"><div class="foswikiLeft"><a href="%SCRIPTURL{"view"}%/System/TWikiAjaxContribExamples"><b>TWikiAjaxContribExamples</b></a></div><div class="foswikiRight foswikiSRAuthor"> <a href="%SCRIPTURL{"view"}%/Main/ProjectContributor">ProjectContributor</a></div><div class="foswikiRight foswikiSRRev">r2 - <a href="%SCRIPTURL{"riff"}%/System/TWikiAjaxContribExamples" rel='nofollow'>02 Nov 2006 - 22:04</a>&nbsp;</div><br class="foswikiClear" /></div><!--/foswikiTopRow--><div class="foswikiBottomRow"><div class="foswikiSummary foswikiGrayText">!TWikiAjaxContrib Examples Code examples and demos for TWikiAjaxContrib. Default loading indicator Because Foswiki files are served along dynamic urls we cannot use ...</div><!--/foswikiSummary-->
+<div class="patternSearchResult"><div class="foswikiTopRow"><div class="foswikiLeft"><a href="%SCRIPTURL{"view"}%/System/HeadlinesPlugin"><b>HeadlinesPlugin</b></a></div><div class="foswikiRight foswikiSRAuthor"> <a href="%SCRIPTURL{"view"}%/Main/ProjectContributor">ProjectContributor</a></div><div class="foswikiRight foswikiSRRev"><span class="foswikiNew">NEW</span> - <a href="%SCRIPTURL{"rdiff"}%/System/HeadlinesPlugin" rel='nofollow'>27 May 2006 - 07:56</a>&nbsp;</div><br class="foswikiClear" /></div><!--/foswikiTopRow--><div class="foswikiBottomRow"><div class="foswikiSummary foswikiGrayText">Headlines Plugin Description This plugin displays RSS and ATOM feeds from news sites. Use it to build news portals that show headline news. Note: Syndic8.com ...</div><!--/foswikiSummary-->
+</div><!--/foswikiBottomRow--></div><!--/patternSearchResult--><div class="patternSearchResult"><div class="foswikiTopRow"><div class="foswikiLeft"><a href="%SCRIPTURL{"view"}%/System/TWikiAjaxContrib"><b>TWikiAjaxContrib</b></a></div><div class="foswikiRight foswikiSRAuthor"> <a href="%SCRIPTURL{"view"}%/Main/ProjectContributor">ProjectContributor</a></div><div class="foswikiRight foswikiSRRev">r2 - <a href="%SCRIPTURL{"rdiff"}%/System/TWikiAjaxContrib" rel='nofollow'>02 Nov 2006 - 22:04</a>&nbsp;</div><br class="foswikiClear" /></div><!--/foswikiTopRow--><div class="foswikiBottomRow"><div class="foswikiSummary foswikiGrayText">TWikiAjaxContrib TWikiAjaxContrib provides a convenience wrapper class around Yahoo's Connection Manager (AJAX). Goals are: To make it possible for plugins ...</div><!--/foswikiSummary-->
+</div><!--/foswikiBottomRow--></div><!--/patternSearchResult--><div class="patternSearchResult"><div class="foswikiTopRow"><div class="foswikiLeft"><a href="%SCRIPTURL{"view"}%/System/TWikiAjaxContribExamples"><b>TWikiAjaxContribExamples</b></a></div><div class="foswikiRight foswikiSRAuthor"> <a href="%SCRIPTURL{"view"}%/Main/ProjectContributor">ProjectContributor</a></div><div class="foswikiRight foswikiSRRev">r2 - <a href="%SCRIPTURL{"rdiff"}%/System/TWikiAjaxContribExamples" rel='nofollow'>02 Nov 2006 - 22:04</a>&nbsp;</div><br class="foswikiClear" /></div><!--/foswikiTopRow--><div class="foswikiBottomRow"><div class="foswikiSummary foswikiGrayText">!TWikiAjaxContrib Examples Code examples and demos for TWikiAjaxContrib. Default loading indicator Because Foswiki files are served along dynamic urls we cannot use ...</div><!--/foswikiSummary-->
 </div><!--/foswikiBottomRow--></div><!--/patternSearchResult--><div class="patternSearchResultCount" id="twikiBottomResultCount">Number of topics: <b>3</b></div><!--/patternSearchResultCount-->
 <p />
 <a name="foswikiSearchForm"></a>
@@ -186,55 +718,30 @@ Numbered list:
 ---++ Upload Form
 
 <div class="foswikiFormSteps">
-<div class="foswikiFormStep">
-<h3><a name="Attach_new_file"></a> Attach new file </h3>
-<p />
-Select a new local file to update attachment <code>Sample.txt</code> <span class="foswikiGrayText">(<a href="#">UploadingUser</a>)</span><br />Upload up to 10000 KB.
-<p />
-<input class="foswikiInputField" type="file" name="filepath" value="Sample.txt" size="30" /><input type="hidden" name="filename" value="Sample.txt" />
-</div><!-- /foswikiFormStep-->
-<div class="foswikiFormStep">
-<h3><a name="Comment"></a> Comment </h3>
-<p />
-Describe the file so other people know what it is.
-<p />
-<input class="foswikiInputField" type="text" name="filecomment" value="Just a sample" maxlength="256" size="50" />
-</div><!-- /foswikiFormStep-->
-<div class="foswikiFormStep">
-<h3><a name="Properties"></a> Properties </h3>
-<p />
-<input type="checkbox" class="foswikiCheckbox" id="createlink" name="createlink"  /><label for="createlink">Create a link to the attached file</label> <span class="foswikiGrayText">Images will be displayed, for other attachments a link will be created.</span>
-<p />
-<input type="checkbox" class="foswikiCheckbox" id="hidefile" name="hidefile"  /><label for="hidefile">Do not show attachment in table</label> <span class="foswikiGrayText">Attachments will not be shown in topic view page.</span>
-</div><!-- /foswikiFormStep--><div class="foswikiFormStep foswikiLast"><input type="submit" class="foswikiButton" name="changeproperties" value='Change comment and properties only' /></div><!-- /foswikiFormStep-->
-</div><!-- /foswikiFormSteps-->
-<a name="topic-actions"> </a><div class="patternTopicActions"><div class="patternTopicAction" style="margin-top:-1px;"><span class="patternActionButtons"> <input type="submit" class="foswikiSubmit" value='Upload file' /> or <a href="#" title='Back to topic' accesskey='c' rel='nofollow'><span class='foswikiAccessKey'>C</span>ancel</a></span></div></div><!--/patternTopicActions-->
+    <div class="foswikiFormStep">
+        <h3><a name="Attach_new_file"></a>  Attach new file </h3>
+        Upload up to 10000 KB.
+        <input type="hidden" name="filename" value="" /> 
+        <input class="foswikiInputField" type="file" name="filepath" value="" size="70" />
+    </div>
+    <div class="foswikiFormStep">
+        <h3><a name="Comment"></a>  Comment </h3>
+        <p>
+        Describe the file so other people know what it is.
+        </p>
+        <input class="foswikiInputField" type="text" name="filecomment" value="" size="70" />
+    </div>
+    <div class="foswikiFormStep">
+        <h3><a name="Properties"></a>  Properties </h3>
+        <input type="checkbox" class="foswikiCheckbox" id="createlink" name="createlink"><label for="createlink">Create a link to the attached file</label> <span class="foswikiGrayText">Images will be displayed, for other attachments a link will be created.</span>
+        <input type="checkbox" class="foswikiCheckbox" id="hidefile" name="hidefile" /><label for="hidefile">Do not show attachment in table</label> <span class="foswikiGrayText">Attachments will not be shown in topic view page.</span>
+    </div>
+    <div class="patternTopicActions foswikiFormStep">
+        <span class="patternActionButtons"><input type="submit" class="foswikiSubmit" value="Upload file" /> <span><a href="/bin/view/System/PatternSkinElements" title="Back to topic" accesskey="c" rel="nofollow"><span class="foswikiAccessKey">C</span>ancel</a></span>
+        </span>
+    </div>
+</div>
 
----++ Login form
-
-<div class="foswikiFormSteps">
-<div class="foswikiFormStep">
-%TMPL:P{"pagetitle"}%%TMPL:P{"pagenote"}%
-</div><!-- /foswikiFormStep-->
-<div class="foswikiFormStep">
----+++ %MAKETEXT{"Username"}%
-
-%ICON{"person"}% <input class="foswikiInputField" type="text" size="30" name="username" value="%URLPARAM{"username"}%" tabindex="1" />
-%TMPL:P{"authenticationnote"}%
-</div><!-- /foswikiFormStep-->
-<div class="foswikiFormStep">
----+++ %MAKETEXT{"Password"}%
-
-%ICON{"key"}% <input class="patternFormFieldVerticalForm" type="password" size="30" class="foswikiInputField" name="password" value="" tabindex="2" />%TMPL:P{"forgotpasswordnote"}%
-</div><!-- /foswikiFormStep-->
-<div class="foswikiFormStep foswikiLast">
-<input class="foswikiSubmit" type="submit" value='%MAKETEXT{"Logon"}%' tabindex="3" />
-</div><!-- /foswikiFormStep-->
-</div><!-- /foswikiFormSteps-->
-<literal>
-%QUERYPARAMS{format="<input type='hidden' name='$name' value='$percntENCODE{$quot()$value$quot type=$quot()html$quot}$percnt' />"}%
-</literal>
-</form>
 
 ---++ Comment form/table
 
@@ -254,51 +761,3 @@ Describe the file so other people know what it is.
 ---++ Links
 
 [[WebHome]] DoesNotExist
-
----++ Form elements
-
-<input type="submit" class="foswikiButton" value="foswikiButton" />
-
-<input type="submit" class="foswikiSubmit" value="foswikiSubmit" />
-
-<input type="submit" class="foswikiButtonCancel" value="foswikiButtonCancel" />
-
-<input size="30" class="foswikiInputField" />
-
-<textarea class="foswikiInputField" size="30" rows="4"></textarea>
-
----++ Help text
-
-<div class="foswikiHelp"><ul>
-<li> <strong>Help:</strong> Please see %POPUPWINDOW{"%SYSTEMWEB%.FileAttachment" label="FileAttachment"}% for more information about attaching files.
-</li> <li> <strong>Bug:</strong> Internet Explorer 4.0 or earlier: If you get an "Internal Server Error" message when you upload a file, you need to try again. It should work the second time.
-</li></ul> 
-</div>
-
----++ JQuery buttons
-
-%BUTTON{
-"Create a new topic"
-icon="add"
-}%
-%CLEAR%
-
-%BUTTON{
-"Cancel"
-icon="cross"
-class="foswikiButtonCancel"
-}%
-%CLEAR%
-
-%BUTTON{
-"Cyan"
-class="cyan"
-}%
-%CLEAR%
-
-%BUTTON{
-"Simple"
-class="simple"
-}%
-%CLEAR%
-
diff --git a/PatternSkin/data/System/PatternSkinHorizontalNavigationExample.txt b/PatternSkin/data/System/PatternSkinHorizontalNavigationExample.txt
index 1bc98a9b61..3a7eba9bc2 100644
--- a/PatternSkin/data/System/PatternSkinHorizontalNavigationExample.txt
+++ b/PatternSkin/data/System/PatternSkinHorizontalNavigationExample.txt
@@ -3,12 +3,12 @@
 
 Include main navigation with:
 <verbatim class="tml">
-%INCLUDE{"HorizontalNavigationExample" section="main"}%
+%INCLUDE{"%SYSTEMWEB%.HorizontalNavigationExample" section="main"}%
 </verbatim>
 
 Include meta navigation with:
 <verbatim class="tml">
-%INCLUDE{"HorizontalNavigationExample" section="meta"}%
+%INCLUDE{"%SYSTEMWEB%.HorizontalNavigationExample" section="meta"}%
 </verbatim>
 
 
diff --git a/PatternSkin/lib/Foswiki/Contrib/PatternSkin/MANIFEST b/PatternSkin/lib/Foswiki/Contrib/PatternSkin/MANIFEST
index bf568d50c9..1b744448ff 100644
--- a/PatternSkin/lib/Foswiki/Contrib/PatternSkin/MANIFEST
+++ b/PatternSkin/lib/Foswiki/Contrib/PatternSkin/MANIFEST
@@ -4,7 +4,6 @@ data/Main/PatternSkinUserViewTemplate.txt 0644
 data/Main/WebLeftBarExample.txt 0644
 data/Sandbox/WebLeftBarExample.txt 0644
 data/System/PatternSkin.txt 0644
-data/System/PatternSkinColorSettings.txt 0644
 data/System/PatternSkinCss.txt 0644
 data/System/PatternSkinCssCookbook.txt 0644
 data/System/PatternSkinCssCookbookCenterPage.txt 0644
diff --git a/PatternSkin/pub/System/PatternSkinTheme/colors_src.css b/PatternSkin/pub/System/PatternSkinTheme/colors_src.css
index 0ac5e58f98..4ef8ce46e2 100755
--- a/PatternSkin/pub/System/PatternSkinTheme/colors_src.css
+++ b/PatternSkin/pub/System/PatternSkinTheme/colors_src.css
@@ -1,5 +1,4 @@
 /* PatternSkin colors */
-/* Generated by AttachContentPlugin from System.PatternSkinColorSettings */
 
 /* LAYOUT ELEMENTS */
 
@@ -73,7 +72,7 @@ h1 {
    color:#333;
 }
 h2, h3, h4, h5, h6 {
-   color:#390;
+   color:#339000;
 }
 
 /* to override old Render.pm coded font color style */
@@ -134,28 +133,6 @@ select {
    color:#000;
    background-color:#fff;
 }
-.foswikiSubmit,
-.foswikiButton {
-   border-color:#fff #888 #888 #fff;
-}
-.foswikiSubmit {
-   color:#fff;
-   background-color:#06c;
-}
-.foswikiButton {
-   color:#000;
-   background-color:#e2e3e3;
-}
-.foswikiButtonCancel {
-   color:#000;
-   background-color:#f2d5d0;
-}
-.foswikiSubmitDisabled,
-.foswikiSubmitDisabled:active {
-   border-color:#fff #ccc #ccc #fff;
-   color:#aaa;
-   background-color:#f6f6f5;
-}
 .foswikiTextarea,
 .foswikiInputField,
 .foswikiInputFieldDisabled,
@@ -263,6 +240,11 @@ a:hover.twistyTrigger {
    color:inherit;
 }
 
+.foswikiForm + .patternTopicActions,
+.foswikiAttachments + .patternTopicActions {
+    border-color: #e2e2e2;
+}
+
 .foswikiAttachments table {
    border-color:#eee;
    background-color:#fff;
@@ -280,47 +262,65 @@ table.foswikiFormTable,
 .foswikiAttachments th {
    border-color:#eee;
 }
+
 .foswikiFormSteps {
-   background-color:#f6f6f5;
-   border-color:#ddd;
-}
-.foswikiFormStep {
-   border-color:#ddd;
-}
-.foswikiFormSteps h2 {
-   color:#333;
+    border-color: #e2e2e2;
+    background-color: #f9f9fa;
 }
-.foswikiFormSteps h3,
-.foswikiFormSteps h4 {
-   color:#333;
+.foswikiFormSteps .foswikiFormSteps {
+    background-color:#fff;
 }
 .foswikiFormSteps h3,
 .foswikiFormSteps h4 {
    background-color:transparent;
 }
-.foswikiFormSteps .foswikiHelp,
-.foswikiFormSteps .foswikiAllowNonWikiWord {
-	background:#fff;
+.foswikiFormSteps .foswikiFormSteps h3,
+.foswikiFormSteps .foswikiFormSteps h4 {
+    color: #797979;
 }
 .foswikiToc .foswikiTocTitle {
    color:#797979;
 }
 .foswikiBroadcastMessage,
 .foswikiNotification {
-   background-color:#fff7e7;
+   background-color:#fef7e3;
    border-color:#fbad17;
 }
+
+.foswikiBroadcastMessage h1,
+.foswikiBroadcastMessage h2,
+.foswikiBroadcastMessage h3,
+.foswikiBroadcastMessage h4,
+.foswikiBroadcastMessage h5,
+.foswikiBroadcastMessage h6,
+.foswikiNotification h1,
+.foswikiNotification h2,
+.foswikiNotification h3,
+.foswikiNotification h4,
+.foswikiNotification h5,
+.foswikiNotification h6 {
+    color: #665024;
+}
+
 .foswikiMessage {
-   background-color:#fff7e7;
+   background-color:#fef7e3;
 }
-#foswikiLogin .patternLoginNotification {
+.foswikiHelp {
+   background-color:#deeffa;
+   border-color:#daedf8;
+}
+.foswikiFormSteps .foswikiHelp {
    background-color:#fff;
-   border-color:#f00;
 }
-.foswikiHelp {
-   background-color:#e5fce1;
-   border-color:#9c9;
+.foswikiHelp h1,
+.foswikiHelp h2,
+.foswikiHelp h3,
+.foswikiHelp h4,
+.foswikiHelp h5,
+.foswikiHelp h6 {
+    color: #45759a;
 }
+
 .foswikiBroadcastMessage b,
 .foswikiBroadcastMessage strong {
    color:#f00;
@@ -341,6 +341,7 @@ table.foswikiFormTable,
    background-color:#cfcfcf;
    color:#cfcfcf;
 }
+
 .foswikiAccessKey {
    color:inherit;
    border-color:#797979;
@@ -352,6 +353,7 @@ a:visited .foswikiAccessKey {
 a:hover .foswikiAccessKey {
    color:inherit;
 }
+
 .foswikiImage {
 	background-color:#fff;
 }
@@ -374,9 +376,7 @@ a:hover .foswikiAccessKey {
 .foswikiHorizontalList ul li {
 	border-color:#ccc;
 }
-.foswikiAllowNonWikiWord {
-	border-color:#eee;
-}
+.foswikiAllowNonWikiWord {}
 
 /*   -----------------------------------------------------------
    Pattern skin specific elements
@@ -419,9 +419,6 @@ a:hover .foswikiAccessKey {
     color:#333;
 }
 
-.patternViewPage .patternTopicActions {
-   background-color:#fff;
-}
 .patternActionButtons a:link,
 .patternActionButtons a:visited,
 .patternActionButtons a:hover {
@@ -447,16 +444,7 @@ a:hover .foswikiAccessKey {
 .patternSigLine {
    color:#797979;
 }
-.patternToolBar a:link .foswikiAccessKey,
-.patternToolBar a:visited .foswikiAccessKey {
-   color:inherit;
-   border-color:#4c94db;
-}
-.patternToolBar a:hover .foswikiAccessKey {
-   background-color:transparent;
-   color:inherit;
-   border-color:#4c94db;
-}
+
 .patternInfo,
 .patternInfo a:link,
 .patternInfo a:visited {
@@ -597,123 +585,7 @@ tr.foswikiDiffDebug td {
 .patternPrintPage #patternOuter {
    background:#fff; /* white - do not change */
 }
-.foswikiSubmit,
-.foswikiSubmitDisabled {
-   background-image:url(bg_submit_gradient.gif);
-   background-repeat:repeat-x;
-}
-.foswikiSubmit,
-a.foswikiSubmit:link,
-a.foswikiSubmit:visited {
-   background-position:0px 0px;
-   background-color:#06c;
-   border-color:#94cce2 #0e66a2 #0e66a2 #94cce2;
-   color:#fff;
-}
-.foswikiSubmit:hover,
-a.foswikiSubmit:hover {
-   background-position:0px -80px;
-   background-color:#0047b7;
-   border-color:#0e66a2 #94cce2 #94cce2 #0e66a2;
-   color:#fff;
-}
-.foswikiSubmit:active,
-a.foswikiSubmit:active {
-   background-position:0px -160px;
-   background-color:#73ace6;
-   border-color:#0e66a2 #94cce2 #94cce2 #0e66a2;
-   color:#fff;
-}
-.foswikiSubmitDisabled,
-.foswikiSubmitDisabled:hover,
-.foswikiSubmitDisabled:active {
-   background-position:0px -240px;
-   background-color:#d9e8f7;
-   border-color:#ccc #ccc #ccc #ccc;
-   color:#ccc;
-}
-.foswikiButton,
-a.foswikiButton:link,
-a.foswikiButton:visited {
-   background-image:url(bg_button_gradient.gif);
-   background-repeat:repeat-x;
-   background-position:0px 0px;
-   border-color:#fff #94cce2 #94cce2 #fff;
-   background-color:#cce7f1;
-   color:#333;
-}
-.foswikiButton:hover,
-.foswikiButton:active,
-a.foswikiButton:hover,
-a.foswikiButton:active {
-   background-position:0px -160px;
-   border-color:#94cce2 #94cce2 #94cce2 #94cce2;
-   background-color:#cce7f1;
-   color:#333;
-}
-.foswikiButtonDisabled,
-.foswikiButtonDisabled:hover,
-.foswikiButtonDisabled:active {
-   background-image:url(bg_button_gradient.gif);
-   background-repeat:repeat-x;
-   background-position:0px -240px;
-   border-color:#ccc #ccc #ccc #ccc;
-   background-color:#edece6;
-   color:#bbb;
-}
-.foswikiButtonCancel {
-   background-image:url(bg_buttoncancel_gradient.gif);
-   background-repeat:repeat-x;
-   background-position:0px 0px;
-   border-color:#f3ddd7 #ce5232 #ce5232 #f3ddd7;
-   background-color:#dd724d;
-   color:#fff;
-}
-.foswikiButtonCancel:hover {
-   background-position:0px -80px;
-   border-color:#ce5232 #f3ddd7 #f3ddd7 #ce5232;
-   background-color:#dd724d;
-   color:#fff;
-}
-.foswikiButtonCancel:active {
-   background-position:0px -160px;
-   border-color:#ce5232 #f3ddd7 #f3ddd7 #ce5232;
-   background-color:#dd724d;
-   color:#fff;
-}
-.patternToolBar span a:link,
-.patternToolBar span a:visited,
-.patternToolBar span s,
-.patternToolBar span strike {
-   background-image:url(bg_button_gradient.gif);
-   background-repeat:repeat-x;
-}
-.patternToolBar span a:link,
-.patternToolBar span a:visited {
-   background-position:0px 0px;
-   border-color:#fff #94cce2 #94cce2 #fff;
-   background-color:#cce7f1;
-   color:#333;
-}
-.patternToolBar span a:hover {
-   background-position:0px -80px;
-   border-color:#94cce2 #94cce2 #94cce2 #94cce2;
-   background-color:#cce7f1;
-   color:#222;
-}
-.patternToolBar span a:active {
-   background-position:0px -160px;
-   border-color:#94cce2 #94cce2 #94cce2 #94cce2;
-   background-color:#e8e5d7;
-   color:#222;
-}
-.patternToolBar span s,
-.patternToolBar span strike {
-   background-position:0px -240px;
-   border-color:#eae9e7 #eae9e7 #eae9e7 #eae9e7;
-   background-color:#edece6;
-   color:#bbb;
-}
+
 .patternTextareaButton {
    border-color:#fffefd #b8b6ad #b8b6ad #fffefd;
    overflow:hidden;
@@ -771,7 +643,6 @@ li.patternLogIn {
 .patternLeftBarPersonal li.patternLogIn {
    background-image:url(bullet-lock.gif);
 }
-#foswikiLogin,
 .patternShadow {
 	border:10px solid #fff;
 	margin-top:10px;
@@ -789,3 +660,436 @@ li.patternLogIn {
 	padding-right:14px;
 	margin-right:3px;
 }
+
+/*
+* BUTTONS
+*/
+.foswikiButton,
+.jqButton,
+a.jqButton,
+.foswikiButtonSmall,
+.foswikiButtonLarge,
+.foswikiButtonMini,
+.foswikiButton:link,
+.jqButton:link,
+a.jqButton:link,
+.foswikiButtonSmall:link,
+.foswikiButtonLarge:link,
+.foswikiButtonMini:link,
+.foswikiButton:visited,
+.jqButton:visited,
+a.jqButton:visited,
+.foswikiButtonSmall:visited,
+.foswikiButtonLarge:visited,
+.foswikiButtonMini:visited {
+    color: #555555;
+    background-color: #f6f6f6;
+    background-image: -moz-linear-gradient(top, #fbfbfb, #eeeeee);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbfbfb), to(#eeeeee));
+    background-image: -webkit-linear-gradient(top, #fbfbfb, #eeeeee);
+    background-image: -o-linear-gradient(top, #fbfbfb, #eeeeee);
+    background-image: linear-gradient(to bottom, #fbfbfb, #eeeeee);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbfbfb', endColorstr='#ffeeeeee', GradientType=0);
+    border-color: #eeeeee #eeeeee #c8c8c8;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    *background-color: #eeeeee;
+    /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+    
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+    border: 1px solid #e1e1e1;
+}
+.foswikiButton .foswikiIcon,
+.jqButton .foswikiIcon,
+a.jqButton .foswikiIcon,
+.foswikiButtonSmall .foswikiIcon,
+.foswikiButtonLarge .foswikiIcon,
+.foswikiButtonMini .foswikiIcon,
+.foswikiButton:link .foswikiIcon,
+.jqButton:link .foswikiIcon,
+a.jqButton:link .foswikiIcon,
+.foswikiButtonSmall:link .foswikiIcon,
+.foswikiButtonLarge:link .foswikiIcon,
+.foswikiButtonMini:link .foswikiIcon,
+.foswikiButton:visited .foswikiIcon,
+.jqButton:visited .foswikiIcon,
+a.jqButton:visited .foswikiIcon,
+.foswikiButtonSmall:visited .foswikiIcon,
+.foswikiButtonLarge:visited .foswikiIcon,
+.foswikiButtonMini:visited .foswikiIcon {
+    color: #555555;
+}
+.foswikiButton .foswikiCaret,
+.jqButton .foswikiCaret,
+a.jqButton .foswikiCaret,
+.foswikiButtonSmall .foswikiCaret,
+.foswikiButtonLarge .foswikiCaret,
+.foswikiButtonMini .foswikiCaret,
+.foswikiButton:link .foswikiCaret,
+.jqButton:link .foswikiCaret,
+a.jqButton:link .foswikiCaret,
+.foswikiButtonSmall:link .foswikiCaret,
+.foswikiButtonLarge:link .foswikiCaret,
+.foswikiButtonMini:link .foswikiCaret,
+.foswikiButton:visited .foswikiCaret,
+.jqButton:visited .foswikiCaret,
+a.jqButton:visited .foswikiCaret,
+.foswikiButtonSmall:visited .foswikiCaret,
+.foswikiButtonLarge:visited .foswikiCaret,
+.foswikiButtonMini:visited .foswikiCaret {
+    border-top-color: rgba(85, 85, 85, 0.4);
+}
+.foswikiButton:hover,
+.jqButton:hover,
+a.jqButton:hover,
+.foswikiButtonSmall:hover,
+.foswikiButtonLarge:hover,
+.foswikiButtonMini:hover,
+.foswikiButton.foswikiActive,
+.jqButton.foswikiActive,
+a.jqButton.foswikiActive,
+.foswikiButtonSmall.foswikiActive,
+.foswikiButtonLarge.foswikiActive,
+.foswikiButtonMini.foswikiActive,
+.foswikiButton > .foswikiRequiresChangePermission a:hover,
+.jqButton > .foswikiRequiresChangePermission a:hover,
+a.jqButton > .foswikiRequiresChangePermission a:hover,
+.foswikiButtonSmall > .foswikiRequiresChangePermission a:hover,
+.foswikiButtonLarge > .foswikiRequiresChangePermission a:hover,
+.foswikiButtonMini > .foswikiRequiresChangePermission a:hover {
+    color: #4d4d4d;
+    background-color: #eeeeee;
+    background-image: -moz-linear-gradient(top, #f3f3f3, #e6e6e6);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3f3f3), to(#e6e6e6));
+    background-image: -webkit-linear-gradient(top, #f3f3f3, #e6e6e6);
+    background-image: -o-linear-gradient(top, #f3f3f3, #e6e6e6);
+    background-image: linear-gradient(to bottom, #f3f3f3, #e6e6e6);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff3f3f3', endColorstr='#ffe6e6e6', GradientType=0);
+    border-color: #e6e6e6 #e6e6e6 #c0c0c0;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    *background-color: #e6e6e6;
+    /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+    
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+    border: 1px solid #dadada;
+}
+.foswikiButton:hover .foswikiIcon,
+.jqButton:hover .foswikiIcon,
+a.jqButton:hover .foswikiIcon,
+.foswikiButtonSmall:hover .foswikiIcon,
+.foswikiButtonLarge:hover .foswikiIcon,
+.foswikiButtonMini:hover .foswikiIcon,
+.foswikiButton.foswikiActive .foswikiIcon,
+.jqButton.foswikiActive .foswikiIcon,
+a.jqButton.foswikiActive .foswikiIcon,
+.foswikiButtonSmall.foswikiActive .foswikiIcon,
+.foswikiButtonLarge.foswikiActive .foswikiIcon,
+.foswikiButtonMini.foswikiActive .foswikiIcon,
+.foswikiButton > .foswikiRequiresChangePermission a:hover .foswikiIcon,
+.jqButton > .foswikiRequiresChangePermission a:hover .foswikiIcon,
+a.jqButton > .foswikiRequiresChangePermission a:hover .foswikiIcon,
+.foswikiButtonSmall > .foswikiRequiresChangePermission a:hover .foswikiIcon,
+.foswikiButtonLarge > .foswikiRequiresChangePermission a:hover .foswikiIcon,
+.foswikiButtonMini > .foswikiRequiresChangePermission a:hover .foswikiIcon {
+    color: #4d4d4d;
+}
+.foswikiButton:hover .foswikiCaret,
+.jqButton:hover .foswikiCaret,
+a.jqButton:hover .foswikiCaret,
+.foswikiButtonSmall:hover .foswikiCaret,
+.foswikiButtonLarge:hover .foswikiCaret,
+.foswikiButtonMini:hover .foswikiCaret,
+.foswikiButton.foswikiActive .foswikiCaret,
+.jqButton.foswikiActive .foswikiCaret,
+a.jqButton.foswikiActive .foswikiCaret,
+.foswikiButtonSmall.foswikiActive .foswikiCaret,
+.foswikiButtonLarge.foswikiActive .foswikiCaret,
+.foswikiButtonMini.foswikiActive .foswikiCaret,
+.foswikiButton > .foswikiRequiresChangePermission a:hover .foswikiCaret,
+.jqButton > .foswikiRequiresChangePermission a:hover .foswikiCaret,
+a.jqButton > .foswikiRequiresChangePermission a:hover .foswikiCaret,
+.foswikiButtonSmall > .foswikiRequiresChangePermission a:hover .foswikiCaret,
+.foswikiButtonLarge > .foswikiRequiresChangePermission a:hover .foswikiCaret,
+.foswikiButtonMini > .foswikiRequiresChangePermission a:hover .foswikiCaret {
+    border-top-color: rgba(77, 77, 77, 0.4);
+}
+.foswikiSubmit,
+.foswikiSubmit:link,
+.foswikiSubmit:visited {
+    color: #fff;
+    background-color: #50aace;
+    background-image: -moz-linear-gradient(top, #58aed1, #44a4cb);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#58aed1), to(#44a4cb));
+    background-image: -webkit-linear-gradient(top, #58aed1, #44a4cb);
+    background-image: -o-linear-gradient(top, #58aed1, #44a4cb);
+    background-image: linear-gradient(to bottom, #58aed1, #44a4cb);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff58aed1', endColorstr='#ff44a4cb', GradientType=0);
+    border-color: #44a4cb #44a4cb #2a7898;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    *background-color: #44a4cb;
+    /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+    
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+    border: 1px solid #3598c0;
+}
+.foswikiSubmit .foswikiIcon,
+.foswikiSubmit:link .foswikiIcon,
+.foswikiSubmit:visited .foswikiIcon {
+    color: #fff;
+}
+.foswikiSubmit .foswikiCaret,
+.foswikiSubmit:link .foswikiCaret,
+.foswikiSubmit:visited .foswikiCaret {
+    border-top-color: rgba(255, 255, 255, 0.4);
+}
+.foswikiSubmit:hover,
+.foswikiSubmit:active {
+    color: #fff;
+    background-color: #44a4cb;
+    background-image: -moz-linear-gradient(top, #4ca8cd, #389ec8);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4ca8cd), to(#389ec8));
+    background-image: -webkit-linear-gradient(top, #4ca8cd, #389ec8);
+    background-image: -o-linear-gradient(top, #4ca8cd, #389ec8);
+    background-image: linear-gradient(to bottom, #4ca8cd, #389ec8);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4ca8cd', endColorstr='#ff389ec8', GradientType=0);
+    border-color: #389ec8 #389ec8 #276f8c;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    *background-color: #389ec8;
+    /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+    
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+    border: 1px solid #328fb4;
+    text-decoration: none;
+}
+.foswikiSubmit:hover .foswikiIcon,
+.foswikiSubmit:active .foswikiIcon {
+    color: #fff;
+}
+.foswikiSubmit:hover .foswikiCaret,
+.foswikiSubmit:active .foswikiCaret {
+    border-top-color: rgba(255, 255, 255, 0.4);
+}
+.foswikiButtonCancel,
+a.jqButton.foswikiButtonCancel,
+.jqButton.foswikiButtonCancel,
+.foswikiButtonCancel:link,
+a.jqButton.foswikiButtonCancel:link,
+.jqButton.foswikiButtonCancel:link,
+.foswikiButtonCancel:visited,
+a.jqButton.foswikiButtonCancel:visited,
+.jqButton.foswikiButtonCancel:visited {
+    color: #fff;
+    background-color: #db6b44;
+    background-image: -moz-linear-gradient(top, #dd724c, #d96137);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dd724c), to(#d96137));
+    background-image: -webkit-linear-gradient(top, #dd724c, #d96137);
+    background-image: -o-linear-gradient(top, #dd724c, #d96137);
+    background-image: linear-gradient(to bottom, #dd724c, #d96137);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdd724c', endColorstr='#ffd96137', GradientType=0);
+    border-color: #d96137 #d96137 #a4421f;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    *background-color: #d96137;
+    /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+    
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+    border: 1px solid #cf5327;
+}
+.foswikiButtonCancel .foswikiIcon,
+a.jqButton.foswikiButtonCancel .foswikiIcon,
+.jqButton.foswikiButtonCancel .foswikiIcon,
+.foswikiButtonCancel:link .foswikiIcon,
+a.jqButton.foswikiButtonCancel:link .foswikiIcon,
+.jqButton.foswikiButtonCancel:link .foswikiIcon,
+.foswikiButtonCancel:visited .foswikiIcon,
+a.jqButton.foswikiButtonCancel:visited .foswikiIcon,
+.jqButton.foswikiButtonCancel:visited .foswikiIcon {
+    color: #fff;
+}
+.foswikiButtonCancel .foswikiCaret,
+a.jqButton.foswikiButtonCancel .foswikiCaret,
+.jqButton.foswikiButtonCancel .foswikiCaret,
+.foswikiButtonCancel:link .foswikiCaret,
+a.jqButton.foswikiButtonCancel:link .foswikiCaret,
+.jqButton.foswikiButtonCancel:link .foswikiCaret,
+.foswikiButtonCancel:visited .foswikiCaret,
+a.jqButton.foswikiButtonCancel:visited .foswikiCaret,
+.jqButton.foswikiButtonCancel:visited .foswikiCaret {
+    border-top-color: rgba(255, 255, 255, 0.4);
+}
+.foswikiButtonCancel:hover,
+a.jqButton.foswikiButtonCancel:hover,
+.jqButton.foswikiButtonCancel:hover,
+.foswikiButtonCancel:active,
+a.jqButton.foswikiButtonCancel:active,
+.jqButton.foswikiButtonCancel:active {
+    color: #fff;
+    background-color: #d96137;
+    background-image: -moz-linear-gradient(top, #db6840, #d7572a);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#db6840), to(#d7572a));
+    background-image: -webkit-linear-gradient(top, #db6840, #d7572a);
+    background-image: -o-linear-gradient(top, #db6840, #d7572a);
+    background-image: linear-gradient(to bottom, #db6840, #d7572a);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdb6840', endColorstr='#ffd7572a', GradientType=0);
+    border-color: #d7572a #d7572a #973d1d;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    *background-color: #d7572a;
+    /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+    
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+    border: 1px solid #c24e25;
+    text-decoration: none;
+}
+.foswikiButtonCancel:hover .foswikiIcon,
+a.jqButton.foswikiButtonCancel:hover .foswikiIcon,
+.jqButton.foswikiButtonCancel:hover .foswikiIcon,
+.foswikiButtonCancel:active .foswikiIcon,
+a.jqButton.foswikiButtonCancel:active .foswikiIcon,
+.jqButton.foswikiButtonCancel:active .foswikiIcon {
+    color: #fff;
+}
+.foswikiButtonCancel:hover .foswikiCaret,
+a.jqButton.foswikiButtonCancel:hover .foswikiCaret,
+.jqButton.foswikiButtonCancel:hover .foswikiCaret,
+.foswikiButtonCancel:active .foswikiCaret,
+a.jqButton.foswikiButtonCancel:active .foswikiCaret,
+.jqButton.foswikiButtonCancel:active .foswikiCaret {
+    border-top-color: rgba(255, 255, 255, 0.4);
+}
+.foswikiButtonDisabled,
+.foswikiSubmitDisabled,
+.foswikiButtonDisabled:link,
+.foswikiSubmitDisabled:link,
+.foswikiButtonDisabled:visited,
+.foswikiSubmitDisabled:visited,
+.foswikiButtonDisabled:hover,
+.foswikiSubmitDisabled:hover {
+    color: #ddd;
+    background: #fafafa;
+    border: 1px solid #f0f0f0;
+}
+.foswikiCaret {
+    border-top-color: #555555;
+}
+
+/* PATTERNTOOLBAR */
+
+.patternToolBar > a:link,
+.patternToolBar > a:visited,
+.patternToolBar > .foswikiRequiresChangePermission > a:link,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited,
+.patternToolBar > a:link:link,
+.patternToolBar > a:visited:link,
+.patternToolBar > .foswikiRequiresChangePermission > a:link:link,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited:link,
+.patternToolBar > a:link:visited,
+.patternToolBar > a:visited:visited,
+.patternToolBar > .foswikiRequiresChangePermission > a:link:visited,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited:visited {
+    color: #555555;
+    background-color: #f6f6f6;
+    background-image: -moz-linear-gradient(top, #fbfbfb, #eeeeee);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbfbfb), to(#eeeeee));
+    background-image: -webkit-linear-gradient(top, #fbfbfb, #eeeeee);
+    background-image: -o-linear-gradient(top, #fbfbfb, #eeeeee);
+    background-image: linear-gradient(to bottom, #fbfbfb, #eeeeee);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbfbfb', endColorstr='#ffeeeeee', GradientType=0);
+    border-color: #eeeeee #eeeeee #c8c8c8;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    *background-color: #eeeeee;
+    /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+    
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+    border: 1px solid #e1e1e1;
+}
+.patternToolBar > a:link .foswikiIcon,
+.patternToolBar > a:visited .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:link .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited .foswikiIcon,
+.patternToolBar > a:link:link .foswikiIcon,
+.patternToolBar > a:visited:link .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:link:link .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited:link .foswikiIcon,
+.patternToolBar > a:link:visited .foswikiIcon,
+.patternToolBar > a:visited:visited .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:link:visited .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited:visited .foswikiIcon {
+    color: #555555;
+}
+.patternToolBar > a:link .foswikiCaret,
+.patternToolBar > a:visited .foswikiCaret,
+.patternToolBar > .foswikiRequiresChangePermission > a:link .foswikiCaret,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited .foswikiCaret,
+.patternToolBar > a:link:link .foswikiCaret,
+.patternToolBar > a:visited:link .foswikiCaret,
+.patternToolBar > .foswikiRequiresChangePermission > a:link:link .foswikiCaret,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited:link .foswikiCaret,
+.patternToolBar > a:link:visited .foswikiCaret,
+.patternToolBar > a:visited:visited .foswikiCaret,
+.patternToolBar > .foswikiRequiresChangePermission > a:link:visited .foswikiCaret,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited:visited .foswikiCaret {
+    border-top-color: rgba(85, 85, 85, 0.4);
+}
+.patternToolBar > a:link:hover,
+.patternToolBar > a:visited:hover,
+.patternToolBar > .foswikiRequiresChangePermission > a:link:hover,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited:hover,
+.patternToolBar > a:link.foswikiActive,
+.patternToolBar > a:visited.foswikiActive,
+.patternToolBar > .foswikiRequiresChangePermission > a:link.foswikiActive,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited.foswikiActive,
+.patternToolBar > a:link > .foswikiRequiresChangePermission a:hover,
+.patternToolBar > a:visited > .foswikiRequiresChangePermission a:hover,
+.patternToolBar > .foswikiRequiresChangePermission > a:link > .foswikiRequiresChangePermission a:hover,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited > .foswikiRequiresChangePermission a:hover {
+    color: #4d4d4d;
+    background-color: #eeeeee;
+    background-image: -moz-linear-gradient(top, #f3f3f3, #e6e6e6);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3f3f3), to(#e6e6e6));
+    background-image: -webkit-linear-gradient(top, #f3f3f3, #e6e6e6);
+    background-image: -o-linear-gradient(top, #f3f3f3, #e6e6e6);
+    background-image: linear-gradient(to bottom, #f3f3f3, #e6e6e6);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff3f3f3', endColorstr='#ffe6e6e6', GradientType=0);
+    border-color: #e6e6e6 #e6e6e6 #c0c0c0;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    *background-color: #e6e6e6;
+    /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+    
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+    border: 1px solid #dadada;
+    text-decoration: none;
+}
+.patternToolBar > a:link:hover .foswikiIcon,
+.patternToolBar > a:visited:hover .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:link:hover .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited:hover .foswikiIcon,
+.patternToolBar > a:link.foswikiActive .foswikiIcon,
+.patternToolBar > a:visited.foswikiActive .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:link.foswikiActive .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited.foswikiActive .foswikiIcon,
+.patternToolBar > a:link > .foswikiRequiresChangePermission a:hover .foswikiIcon,
+.patternToolBar > a:visited > .foswikiRequiresChangePermission a:hover .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:link > .foswikiRequiresChangePermission a:hover .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited > .foswikiRequiresChangePermission a:hover .foswikiIcon {
+    color: #4d4d4d;
+}
+.patternToolBar > a:link:hover .foswikiCaret,
+.patternToolBar > a:visited:hover .foswikiCaret,
+.patternToolBar > .foswikiRequiresChangePermission > a:link:hover .foswikiCaret,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited:hover .foswikiCaret,
+.patternToolBar > a:link.foswikiActive .foswikiCaret,
+.patternToolBar > a:visited.foswikiActive .foswikiCaret,
+.patternToolBar > .foswikiRequiresChangePermission > a:link.foswikiActive .foswikiCaret,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited.foswikiActive .foswikiCaret,
+.patternToolBar > a:link > .foswikiRequiresChangePermission a:hover .foswikiCaret,
+.patternToolBar > a:visited > .foswikiRequiresChangePermission a:hover .foswikiCaret,
+.patternToolBar > .foswikiRequiresChangePermission > a:link > .foswikiRequiresChangePermission a:hover .foswikiCaret,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited > .foswikiRequiresChangePermission a:hover .foswikiCaret {
+    border-top-color: rgba(77, 77, 77, 0.4);
+}
diff --git a/PatternSkin/pub/System/PatternSkinTheme/style_src.css b/PatternSkin/pub/System/PatternSkinTheme/style_src.css
index 3b03c9be63..65b3da3241 100755
--- a/PatternSkin/pub/System/PatternSkinTheme/style_src.css
+++ b/PatternSkin/pub/System/PatternSkinTheme/style_src.css
@@ -21,19 +21,11 @@
 /* GENERAL HTML ELEMENTS */
 
 html body {
-	font-family:arial, verdana, sans-serif;
-	font-size:104%;
-	voice-family:"\"}\""; 
-	voice-family:inherit;
-	font-size:small;
-}
-html>body { /* Mozilla */
-	font-size:small;	
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 14px;
 }
 body {
 	line-height:1.5em; /*S1*/
-	/* change font size here */
-	font-size:103%;
 }
 body font {
 	line-height:135%;
@@ -153,7 +145,7 @@ textarea,
 input,
 select {
 	vertical-align:middle;
-	font-family:arial, verdana, sans-serif;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 	font-size:100%;
 }
 label input {
@@ -162,14 +154,6 @@ label input {
 .foswikiTextarea {
 	padding:1px 4px;
 }
-.foswikiSubmit,
-.foswikiSubmitDisabled,
-.foswikiButton,
-.foswikiButtonDisabled,
-.foswikiButtonCancel,
-a.foswikiButton,
-a.foswikiSubmit,
-a.foswikiButtonCancel,
 .foswikiCheckbox {
 	border-width:1px;
 	border-style:solid;
@@ -177,45 +161,6 @@ a.foswikiButtonCancel,
 	vertical-align:middle;
 	text-align:center;
 }
-.foswikiSubmit,
-.foswikiSubmitDisabled,
-.foswikiButton,
-.foswikiButtonDisabled,
-.foswikiButtonCancel,
-.foswikiSubmit:hover,
-.foswikiSubmitDisabled:hover,
-.foswikiButton:hover,
-.foswikiSubmit:active,
-.foswikiSubmitDisabled:active,
-.foswikiButton:active {
-	cursor:default;
-	outline:none;
-	line-height:1em;
-	padding:2px 4px;
-}
-a.foswikiButton,
-a.foswikiButton:hover,
-a.foswikiButton:link:active,
-a.foswikiButton:visited:active,
-a.foswikiButtonCancel,
-a.foswikiButtonCancel:hover,
-a.foswikiButtonCancel:link:active,
-a.foswikiButtonCancel:visited:active,
-a.foswikiSubmit,
-a.foswikiSubmit:hover,
-a.foswikiSubmit:link:active,
-a.foswikiSubmit:visited:active {
-	text-decoration:none;
-	line-height:1em;
-	padding:2px 4px;
-}
-.jqButton.foswikiButtonCancel,
-.jqButton.foswikiButtonCancel:hover {
-	border:none;
-	padding:0;
-	font-weight:normal;
-	margin:0;
-}
 .foswikiCheckbox,
 .foswikiRadioButton {
 	margin:1px .25em 1px .1em;
@@ -255,9 +200,7 @@ a.foswikiSubmit:visited:active {
 }
 
 /* RevCommentPlugin */
-.patternEditPage .revComment {
-	padding:.5em 0;
-}
+.patternEditPage .revComment {}
 
 /* EditTablePlugin */
 .editTable .foswikiTable {
@@ -280,7 +223,7 @@ a.foswikiSubmit:visited:active {
 	border-collapse:collapse;
 }
 .foswikiTable td {
-	padding:.2em .5em;
+	padding:.3em .5em;
 }
 .foswikiTable th {
 	padding:.4em .5em;
@@ -319,20 +262,14 @@ a.foswikiSubmit:visited:active {
 	-----------------------------------------------------------	*/
 
 #foswikiLogin {
-	width:40em;
-	margin:0 auto;
-	border-style:solid;
-	border-width:10px;
+    border: none;
 }
 #foswikiLogin .foswikiFormSteps {
-	text-align:left;
-}
-#foswikiLogin .patternLoginNotification {
-	padding-left:.5em;
-	padding-right:.5em;
-	border-style:solid;
-	border-width:2px;
+    width:40em;
+    margin:0 auto;
+    text-align:left;
 }
+
 .foswikiFormTable th {
 	font-weight:normal;
 	text-align:left;
@@ -364,11 +301,26 @@ table.foswikiFormTable {
 	border-style:solid;
 	border-width:1px;
 }
-.foswikiAttachments table {
+
+.foswikiForm + .patternTopicActions,
+.foswikiAttachments + .patternTopicActions {
+    margin: 12px -20px;
+	padding: 12px 20px 0 20px;
+    border-style: solid none none none;
+    border-width: 1px;
+}
+
+.foswikiAttachments .foswikiTable {
 	line-height:1.5em; /*S1*/
 	width:auto;
 	width:100%;
+	margin: 1em 0;
 }
+.foswikiAttachments .foswikiTable td {
+	border-style:none none solid none;
+	border-width:1px;
+}
+
 .foswikiAttachments .foswikiTable th {
 	border-style:none none solid solid;
 	border-width:1px;
@@ -401,26 +353,33 @@ table.foswikiFormTable th.foswikiFormTableHRow a:visited {
 }
 .patternTwistyButton {
 	font-weight:bold;
-	margin:.5em 0;
 	display:inline-block;
+	margin: 0 0 .5em 0;
 }
 h3 .foswikiSmall {
 	font-weight:normal;
 	font-size:86%;
 	margin:0 0 0 .15em;
 }
+
 .foswikiFormSteps {
-	padding:12px 20px;
-	border-width:1px;
-	border-style:solid;
+    margin: .5em 0;
+	padding: 12px 20px;
+	border-width: 1px;
+	border-style: solid;
 }
 .foswikiFormStep {
-	margin:0 0 20px;
+	margin:0 0 12px 0;
+}
+.foswikiFormSteps hr {
+    margin: 12px -20px;
 }
 .foswikiFormStep:last-child {
-        margin-bottom:0;
+    margin-bottom:0;
+}
+.foswikiFormStep p:last-child {
+    margin-bottom: 0;
 }
-
 .foswikiFormStep h2,
 .foswikiFormStep h3,
 .foswikiFormStep h4 {
@@ -429,9 +388,6 @@ h3 .foswikiSmall {
 	padding:0;
 	background:none;
 }
-.foswikiFormStep p {
-	margin:.5em 0;
-}
 .foswikiFormSteps h2 {
 	font-size:115%;
 	font-weight:bold;
@@ -449,6 +405,7 @@ h3 .foswikiSmall {
 	padding-top:.25em;
 	padding-bottom:.25em;
 }
+
 .foswikiLast {}
 .foswikiToc {
 	margin:1em 0;
@@ -529,11 +486,13 @@ h3 .foswikiSmall {
 .foswikiAccessKey {
 	border:none;
 }
+
 a:hover .foswikiAccessKey {
 	text-decoration:none;
 	border-width:0 0 1px 0;
 	border-style:solid;
 }
+
 .foswikiWebIndent {
 	margin:0 0 0 1em;
 }
@@ -559,10 +518,9 @@ a:hover .foswikiAccessKey {
 	vertical-align:text-bottom;
 	border:0;
 }
-.foswikiAllowNonWikiWord {
-	border-width:1px;
-	border-style:solid;
-	padding:.5em 10px;
+.foswikiAllowNonWikiWord {}
+.foswikiAllowNonWikiWord label {
+    margin: 0 .25em 0 0;
 }
 
 /*	-----------------------------------------------------------
@@ -651,7 +609,7 @@ a:hover .foswikiAccessKey {
 #patternSideBarContents,
 #patternSideBarContents ul,
 #patternSideBarContents li {
-	line-height:1.35em;
+	line-height:1.5em;
 }
 #patternSideBarContents h2 {
 	border:none;
@@ -711,38 +669,6 @@ html>body #patternSideBarContents li { /* Mozilla */
 .patternHomePath .foswikiSeparator {
 	padding:0 .35em;
 }
-.patternToolBar span {
-	float:left;
-}
-.patternToolBar span s,
-.patternToolBar span strike,
-.patternToolBar span a:link,
-.patternToolBar span a:visited {
-	display:block;
-	border-width:1px;
-	border-style:solid;
-	padding:2px 4px;
-	line-height:1em;
-	margin:0 0 4px 4px;
-	font-weight:bold;
-}
-.patternToolBar span a:hover,
-.patternToolBar span a:hover {
-	text-decoration:none;
-	border-width:1px;
-	border-style:solid;
-}
-.patternToolBar span a:active {
-	outline:none;
-}
-.patternToolBar span.foswikiAccessKey { 
-	float:none;
-	border:none;
-}
-.patternToolBar span s,
-.patternToolBar span strike {
-	text-decoration:none;
-}
 
 .patternActionButtons a:link,
 .patternActionButtons a:visited {
@@ -896,7 +822,7 @@ h4.foswikiSearchResultsHeader {
 	font-family: "Bitstream Vera Sans Mono","Andale Mono",Courier,monospace;
 }
 .foswikiEditboxStyleProportional {
-	font-family:arial, verdana, sans-serif;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 .patternSig {
 	text-align:right
@@ -985,3 +911,419 @@ td.foswikiDiffDebugLeft {
 	text-align:left;
 }
 
+/*
+* BUTTONS
+*/
+.jqButton {
+    height: auto;
+    float: none;
+    margin: 0;
+    background-image: none;
+}
+.jqButton span {
+    background: none;
+    float: none;
+    height: auto;
+    line-height: normal;
+    padding: 0;
+    margin: 0;
+}
+.foswikiButton,
+.jqButton,
+a.jqButton,
+.foswikiButtonSmall,
+.foswikiButtonLarge,
+.foswikiButtonMini {
+    display: inline-block;
+    *display: inline;
+    /* IE7 inline-block hack */
+    
+    *zoom: 1;
+    padding: 2px 7px 2px 7px;
+    margin-bottom: 0;
+    line-height: 22px;
+    *line-height: 22px;
+    text-align: center;
+    vertical-align: middle;
+    cursor: pointer;
+    border-style: solid;
+    border-width: 1px;
+    *border: 0;
+    *margin-left: .3em;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-weight: bold;
+    font-size: 14px;
+    text-decoration: none;
+}
+.foswikiButton:first-child,
+.jqButton:first-child,
+a.jqButton:first-child,
+.foswikiButtonSmall:first-child,
+.foswikiButtonLarge:first-child,
+.foswikiButtonMini:first-child {
+    *margin-left: 0;
+}
+.foswikiButton .foswikiIcon,
+.jqButton .foswikiIcon,
+a.jqButton .foswikiIcon,
+.foswikiButtonSmall .foswikiIcon,
+.foswikiButtonLarge .foswikiIcon,
+.foswikiButtonMini .foswikiIcon {
+    vertical-align: middle;
+    line-height: .5;
+}
+.foswikiButton,
+.jqButton,
+a.jqButton,
+.foswikiButtonSmall,
+.foswikiButtonLarge,
+.foswikiButtonMini,
+.foswikiButton:link,
+.jqButton:link,
+a.jqButton:link,
+.foswikiButtonSmall:link,
+.foswikiButtonLarge:link,
+.foswikiButtonMini:link {
+    text-decoration: none;
+}
+.foswikiButton:hover,
+.jqButton:hover,
+a.jqButton:hover,
+.foswikiButtonSmall:hover,
+.foswikiButtonLarge:hover,
+.foswikiButtonMini:hover,
+.foswikiButton.foswikiActive,
+.jqButton.foswikiActive,
+a.jqButton.foswikiActive,
+.foswikiButtonSmall.foswikiActive,
+.foswikiButtonLarge.foswikiActive,
+.foswikiButtonMini.foswikiActive,
+.foswikiButton > .foswikiRequiresChangePermission a:hover,
+.jqButton > .foswikiRequiresChangePermission a:hover,
+a.jqButton > .foswikiRequiresChangePermission a:hover,
+.foswikiButtonSmall > .foswikiRequiresChangePermission a:hover,
+.foswikiButtonLarge > .foswikiRequiresChangePermission a:hover,
+.foswikiButtonMini > .foswikiRequiresChangePermission a:hover {
+    text-decoration: none;
+}
+.foswikiButton .foswikiAccessKey,
+.jqButton .foswikiAccessKey,
+a.jqButton .foswikiAccessKey,
+.foswikiButtonSmall .foswikiAccessKey,
+.foswikiButtonLarge .foswikiAccessKey,
+.foswikiButtonMini .foswikiAccessKey {
+    border: none;
+}
+.foswikiButtonSmall {
+    padding: 3px 9px;
+    font-size: 12px;
+    line-height: 20px;
+}
+.foswikiButtonSmall [class^="icon-"] {
+    margin-top: 0;
+}
+.foswikiButtonMini {
+    padding: 2px 6px;
+    font-size: 11px;
+    line-height: 18px;
+}
+.foswikiSubmit {
+    display: inline-block;
+    *display: inline;
+    /* IE7 inline-block hack */
+    
+    *zoom: 1;
+    padding: 2px 7px 2px 7px;
+    margin-bottom: 0;
+    line-height: 22px;
+    *line-height: 22px;
+    text-align: center;
+    vertical-align: middle;
+    cursor: pointer;
+    border-style: solid;
+    border-width: 1px;
+    *border: 0;
+    *margin-left: .3em;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-weight: bold;
+    font-size: 14px;
+    text-decoration: none;
+}
+.foswikiSubmit:first-child {
+  *margin-left: 0;
+}
+.foswikiSubmit .foswikiIcon {
+  vertical-align: middle;
+  line-height: .5;
+}
+.foswikiSubmit,
+.foswikiSubmit:link {
+  text-decoration: none;
+}
+.foswikiSubmit:hover,
+.foswikiSubmit:active {
+    text-decoration: none;
+}
+.foswikiButtonCancel,
+a.jqButton.foswikiButtonCancel,
+.jqButton.foswikiButtonCancel {
+    display: inline-block;
+    *display: inline;
+    /* IE7 inline-block hack */
+    
+    *zoom: 1;
+    padding: 2px 7px 2px 7px;
+    margin-bottom: 0;
+    line-height: 22px;
+    *line-height: 22px;
+    text-align: center;
+    vertical-align: middle;
+    cursor: pointer;
+    border-style: solid;
+    border-width: 1px;
+    *border: 0;
+    *margin-left: .3em;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-weight: bold;
+    font-size: 14px;
+    text-decoration: none;
+}
+.foswikiButtonCancel:first-child,
+a.jqButton.foswikiButtonCancel:first-child,
+.jqButton.foswikiButtonCancel:first-child {
+  *margin-left: 0;
+}
+.foswikiButtonCancel .foswikiIcon,
+a.jqButton.foswikiButtonCancel .foswikiIcon,
+.jqButton.foswikiButtonCancel .foswikiIcon {
+  vertical-align: middle;
+  line-height: .5;
+}
+.foswikiButtonCancel,
+a.jqButton.foswikiButtonCancel,
+.jqButton.foswikiButtonCancel,
+.foswikiButtonCancel:link,
+a.jqButton.foswikiButtonCancel:link,
+.jqButton.foswikiButtonCancel:link {
+  text-decoration: none;
+}
+.foswikiButtonCancel:hover,
+a.jqButton.foswikiButtonCancel:hover,
+.jqButton.foswikiButtonCancel:hover,
+.foswikiButtonCancel:active,
+a.jqButton.foswikiButtonCancel:active,
+.jqButton.foswikiButtonCancel:active {
+    text-decoration: none;
+}
+.foswikiButtonDisabled,
+.foswikiSubmitDisabled {
+    display: inline-block;
+    *display: inline;
+    /* IE7 inline-block hack */
+    
+    *zoom: 1;
+    padding: 2px 7px 2px 7px;
+    margin-bottom: 0;
+    line-height: 22px;
+    *line-height: 22px;
+    text-align: center;
+    vertical-align: middle;
+    cursor: pointer;
+    border-style: solid;
+    border-width: 1px;
+    *border: 0;
+    *margin-left: .3em;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-weight: bold;
+    font-size: 14px;
+    text-decoration: none;
+}
+.foswikiButtonDisabled:first-child,
+.foswikiSubmitDisabled:first-child {
+  *margin-left: 0;
+}
+.foswikiButtonDisabled .foswikiIcon,
+.foswikiSubmitDisabled .foswikiIcon {
+  vertical-align: middle;
+  line-height: .5;
+}
+.foswikiButtonDisabled,
+.foswikiSubmitDisabled,
+.foswikiButtonDisabled:link,
+.foswikiSubmitDisabled:link,
+.foswikiButtonDisabled:hover,
+.foswikiSubmitDisabled:hover {
+  cursor: default;
+  text-decoration: none;
+}
+.foswikiCaret {
+    display: inline-block;
+    width: 0;
+    height: 0;
+    margin-left: -4px;
+    content: " ";
+    border-top: 4px solid #555555;
+    border-right: 4px solid transparent;
+    border-left: 4px solid transparent;
+    margin: 0 0 0 7px;
+    vertical-align: text-top;
+}
+.jqButton .jqButtonIcon,
+.jqButton:active .jqButtonIcon,
+.foswikiButton .foswikiButtonIcon,
+.foswikiButton:active .foswikiButtonIcon {
+    background-repeat: no-repeat;
+    background-position: 0 50%;
+    padding: 0 0 0 23px;
+    display: inline-block;
+    line-height: 22px;
+    vertical-align: middle;
+}
+.foswikiButton .foswikiLabel {
+    padding-left: 8px;
+}
+.foswikiButton .foswikiIcon.icon-empty + .foswikiLabel {
+    padding-left: 0;
+}
+
+/* prevent double padding with bullet list in block */
+blockquote ol:first-child,
+pre ol:first-child,
+.foswikiHelp ol:first-child,
+.foswikiBroadcastMessage ol:first-child,
+.foswikiNotification ol:first-child,
+blockquote ul:first-child,
+pre ul:first-child,
+.foswikiHelp ul:first-child,
+.foswikiBroadcastMessage ul:first-child,
+.foswikiNotification ul:first-child {
+  margin-top: 0;
+}
+blockquote ol:last-child,
+pre ol:last-child,
+.foswikiHelp ol:last-child,
+.foswikiBroadcastMessage ol:last-child,
+.foswikiNotification ol:last-child,
+blockquote ul:last-child,
+pre ul:last-child,
+.foswikiHelp ul:last-child,
+.foswikiBroadcastMessage ul:last-child,
+.foswikiNotification ul:last-child {
+  margin-bottom: 0;
+}
+/* prevent double padding inside block */
+blockquote *:first-child,
+pre *:first-child,
+.foswikiLogin *:first-child,
+.foswikiHelp *:first-child,
+.foswikiBroadcastMessage *:first-child,
+.foswikiNotification *:first-child,
+.foswikiSection *:first-child,
+.foswikiTopicText *:first-child,
+.foswikiTabContent *:first-child,
+.jqTabContents *:first-child,
+div.foswikiAlert *:first-child,
+td *:first-child {
+  margin-top: 0;
+}
+
+/* PATTERNTOOLBAR */
+.patternToolBar > a:link,
+.patternToolBar > a:visited,
+.patternToolBar > .foswikiRequiresChangePermission > a:link,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited {
+    display: inline-block;
+    *display: inline;
+    /* IE7 inline-block hack */
+    
+    *zoom: 1;
+    padding: 2px 8.4px 2px 8.4px;
+    margin-bottom: 0;
+    line-height: 22px;
+    *line-height: 22px;
+    text-align: center;
+    vertical-align: middle;
+    cursor: pointer;
+    border-style: solid;
+    border-width: 1px;
+    *border: 0;
+    *margin-left: .3em;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-weight: bold;
+    font-size: 14px;
+    text-decoration: none;
+    margin: 0 0 6px 6px;
+}
+.patternToolBar > a:link:first-child,
+.patternToolBar > a:visited:first-child,
+.patternToolBar > .foswikiRequiresChangePermission > a:link:first-child,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited:first-child {
+    *margin-left: 0;
+}
+.patternToolBar > a:link .foswikiIcon,
+.patternToolBar > a:visited .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:link .foswikiIcon,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited .foswikiIcon {
+    vertical-align: middle;
+    line-height: .5;
+}
+.patternToolBar > a:link,
+.patternToolBar > a:visited,
+.patternToolBar > .foswikiRequiresChangePermission > a:link,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited,
+.patternToolBar > a:link:link,
+.patternToolBar > a:visited:link,
+.patternToolBar > .foswikiRequiresChangePermission > a:link:link,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited:link {
+    text-decoration: none;
+}
+.patternToolBar > a:link:hover,
+.patternToolBar > a:visited:hover,
+.patternToolBar > .foswikiRequiresChangePermission > a:link:hover,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited:hover,
+.patternToolBar > a:link.foswikiActive,
+.patternToolBar > a:visited.foswikiActive,
+.patternToolBar > .foswikiRequiresChangePermission > a:link.foswikiActive,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited.foswikiActive,
+.patternToolBar > a:link > .foswikiRequiresChangePermission a:hover,
+.patternToolBar > a:visited > .foswikiRequiresChangePermission a:hover,
+.patternToolBar > .foswikiRequiresChangePermission > a:link > .foswikiRequiresChangePermission a:hover,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited > .foswikiRequiresChangePermission a:hover {
+    text-decoration: none;
+}
+.patternToolBar > a:link .foswikiAccessKey,
+.patternToolBar > a:visited .foswikiAccessKey,
+.patternToolBar > .foswikiRequiresChangePermission > a:link .foswikiAccessKey,
+.patternToolBar > .foswikiRequiresChangePermission > a:visited .foswikiAccessKey {
+    border: none;
+}
\ No newline at end of file
diff --git a/PatternSkin/pub/System/PatternSkinTheme2009/colors.css b/PatternSkin/pub/System/PatternSkinTheme2009/colors.css
index 1ff74d91bd..be5c2895fb 100644
--- a/PatternSkin/pub/System/PatternSkinTheme2009/colors.css
+++ b/PatternSkin/pub/System/PatternSkinTheme2009/colors.css
@@ -1,5 +1,4 @@
 /* PatternSkin colors */
-/* Generated by AttachContentPlugin from System.PatternSkinColorSettings */
 
 /* LAYOUT ELEMENTS */
 
diff --git a/PatternSkin/templates/changeform.pattern.tmpl b/PatternSkin/templates/changeform.pattern.tmpl
index 721b395ac5..a874d230a4 100644
--- a/PatternSkin/templates/changeform.pattern.tmpl
+++ b/PatternSkin/templates/changeform.pattern.tmpl
@@ -13,8 +13,5 @@
 ---+++ %MAKETEXT{"Available form templates"}%   
 %FORMLIST%
 </div>
-%TEXT% %EDITACTION%
-%TMPL:P{"hiddenformfields"}%
 %TMPL:P{"topicactionbuttonsrow"}%
-</div>
-%TMPL:P{"formend"}%%TMPL:END%
\ No newline at end of file
+</div>%TEXT% %EDITACTION% %TMPL:P{"hiddenformfields"}%%TMPL:P{"formend"}%%TMPL:END%
\ No newline at end of file
diff --git a/PatternSkin/templates/css.pattern.tmpl b/PatternSkin/templates/css.pattern.tmpl
index 83da079b87..8712f72e46 100644
--- a/PatternSkin/templates/css.pattern.tmpl
+++ b/PatternSkin/templates/css.pattern.tmpl
@@ -62,7 +62,6 @@ pre {
 .foswikiFormStep {
 	height:100%;
 }
-#foswikiLogin,
 .patternShadow {
 	border:10px solid #fff;
 	margin-top:10px;
@@ -71,7 +70,6 @@ pre {
 }
 </style><![endif]-->
 <!--[if gt IE 8 ]><style type="text/css" media="screen">
-#foswikiLogin,
 .patternShadow {
 	border:10px solid #fff;
 	margin-top:10px;
diff --git a/PatternSkin/templates/edit.pattern.tmpl b/PatternSkin/templates/edit.pattern.tmpl
index c373c62682..3c2eb466e0 100644
--- a/PatternSkin/templates/edit.pattern.tmpl
+++ b/PatternSkin/templates/edit.pattern.tmpl
@@ -18,13 +18,10 @@
 <form name="main" id="main" action="%SCRIPTURLPATH{"save"}%/%WEB%/%TOPIC%" method="post">%TMPL:END%
 
 
-%TMPL:DEF{"revCommentPluginOptions"}%%IF{ "context RevCommentPluginEnabled" then="<div class='revComment'><label for='comment'>Summary of changes</label> <input class='foswikiInputField' type='text' style='width:50%' name='comment' id='comment' /> %POPUPWINDOW{"%SYSTEMWEB%.RevComment" label="%MAKETEXT{"help"}%"}%</div>" else=""}%%TMPL:END%
+%TMPL:DEF{"revCommentPluginOptions"}%%IF{ "context RevCommentPluginEnabled" then="<hr /><div class='foswikiFormStep revComment'><label for='comment'>Summary of changes</label> <input class='foswikiInputField' type='text' style='width:50%' name='comment' id='comment' /> %POPUPWINDOW{"%SYSTEMWEB%.RevComment" label="%MAKETEXT{"help"}%"}%</div>" else=""}%%TMPL:END%
 
 
-%TMPL:DEF{"forcerevisioncheckbox"}%<div class="patternSaveOptionsContents"><input type="checkbox" class="foswikiCheckbox" title="Creates a new topic revision when saving" id="forcenewrevision" name="forcenewrevision" %FORCENEWREVISIONCHECKBOX% /><label for="forcenewrevision">%MAKETEXT{"Force new revision"}%</label> %POPUPWINDOW{"%SYSTEMWEB%.ForceNewRevision" label="%MAKETEXT{"help"}%"}%</div>%TMPL:END%
-
-
-%TMPL:DEF{"saveoptions"}%<div class="foswikiFormStep patternSaveOptions">%TMPL:P{"forcerevisioncheckbox"}%</div>%TMPL:END%
+%TMPL:DEF{"forcerevisioncheckbox"}%<div class="foswikiFormStep"><input type="checkbox" class="foswikiCheckbox" title="Creates a new topic revision when saving" id="forcenewrevision" name="forcenewrevision" %FORCENEWREVISIONCHECKBOX% /><label for="forcenewrevision">%MAKETEXT{"Force new revision"}%</label> %POPUPWINDOW{"%SYSTEMWEB%.ForceNewRevision" label="%MAKETEXT{"help"}%"}%</div>%TMPL:END%
 
 
 %TMPL:DEF{"action_buttons"}%%TMPL:P{"button_save"}%&nbsp;%TMPL:P{"button_quietsave"}%&nbsp;%TMPL:P{"button_checkpoint"}% %TMPL:P{"button_preview"}% %TMPL:P{"button_cancel"}%%TMPL:END%
@@ -41,7 +38,7 @@
 %TMPL:DEF{"button_cancel"}%<input type="submit" class="foswikiButtonCancel" name="action_cancel" id="cancel" title='%MAKETEXT{"Cancel editing and discard changes"}%' %MAKETEXT{"value='Cancel' accesskey='c'"}% />%TMPL:END%
 
 
-%TMPL:DEF{"topicinfo"}%%TMPL:P{"revCommentPluginOptions"}%%TMPL:P{"saveoptions"}%<div class="patternTopicActions foswikiFormStep"><div class="patternActionButtons">%TMPL:P{"action_buttons"}%<div class="foswikiClear"></div></div></div>%TMPL:END%
+%TMPL:DEF{"topicinfo"}%%TMPL:P{"revCommentPluginOptions"}%<hr /><div class="patternTopicActions foswikiFormStep"><div class="patternActionButtons">%TMPL:P{"action_buttons"}%<div class="foswikiClear"></div></div></div>%TMPL:P{"forcerevisioncheckbox"}%%TMPL:END%
 
 
 %TMPL:DEF{"textarea"}%%IF{"{Validation}{Method}='strikeone'" then="<noscript>$percentTMPL:P{enable_js}$percent</noscript>"}%<div class="patternEditTopic"><textarea class="foswikiTextarea foswikiEditboxStyleProportional foswikiWysiwygEdit" id="topic" name="text" rows="%EDITBOXHEIGHT%" cols="%EDITBOXWIDTH%" style='%EDITBOXSTYLE%'>%TEXT%</textarea>%TMPL:P{"sig_textareabuttons"}%</div>%TMPL:END%
diff --git a/PatternSkin/templates/foswiki.pattern.tmpl b/PatternSkin/templates/foswiki.pattern.tmpl
index 9041c2612b..ab9f902536 100644
--- a/PatternSkin/templates/foswiki.pattern.tmpl
+++ b/PatternSkin/templates/foswiki.pattern.tmpl
@@ -31,7 +31,7 @@
 
 %TMPL:DEF{"topicaction"}%<div class="foswikiFormSteps">%TMPL:P{"topicactionbuttonsrow"}%</div>%TMPL:END%
 
-%TMPL:DEF{"topicactionbuttonsrow"}%<a name="topic-actions"></a><div class="patternTopicActions foswikiFormStep"><span class="patternActionButtons">%TMPL:P{"topicactionbuttons"}%</span></div>%TMPL:END%
+%TMPL:DEF{"topicactionbuttonsrow"}%<div class="patternTopicActions foswikiFormStep"><span class="patternActionButtons">%TMPL:P{"topicactionbuttons"}%</span></div>%TMPL:END%
 
 
 %TMPL:DEF{"topicinfo"}%%TMPL:P{"topicaction"}%%TMPL:END%
@@ -40,21 +40,20 @@
 
 %TMPL:DEF{"head"}%<head>
 %TMPL:P{"windowtitle"}%
-%TMPL:P{context="edit" then="ie8compatibilitymode"}%<meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
+%TMPL:P{"head:meta"}%%TMPL:P{context="edit" then="ie8compatibilitymode"}%%TMPL:P{"head:script"}%%RENDERZONE{"script"}%%RENDERZONE{"head"}%%TMPL:P{"head:css"}%</head>%TMPL:END%
+
+%TMPL:DEF{"head:meta"}%<meta http-equiv="Content-Type" content="text/html; charset=%CHARSET%" />
 <link rel="icon" href="%FAVICON%" type="image/x-icon" />
 <link rel="shortcut icon" href="%FAVICON%" type="image/x-icon" />
 <link rel="alternate" href="%SCRIPTURL{edit}%/%BASEWEB%/%BASETOPIC%?t=%GMTIME{"$epoch"}%" type="application/x-wiki" title="edit %BASETOPIC%" />
 <meta name="TEXT_NUM_TOPICS" content="%MAKETEXT{"Number of topics:"}%" />
 <meta name="TEXT_MODIFY_SEARCH" content="%MAKETEXT{"Modify search"}%" />
 <meta name="robots" content="noindex" />%HTTP_EQUIV_ON_VIEW%
-<base href="%SCRIPTURL{%SCRIPTNAME%}%/%WEB%/%TOPIC%" /><!--[if IE]></base><![endif]-->
-%TMPL:P{"script"}%%TMPL:P{"defaultstyle"}%</head>%TMPL:END%
-
-%TMPL:DEF{"script:skinbase"}%%{
-}%%TMPL:P{"JavascriptFiles/foswikiString"}%%{
-}%%TMPL:P{"JavascriptFiles/foswikiPref"}%%{
-}%%TMPL:P{"JavascriptFiles/foswikiForm"}%%{
-}%%TMPL:P{"LIBJS" id="PatternSkin/pattern" requires="JQUERYPLUGIN::FOSWIKI,JavascriptFiles/foswikiPref,JavascriptFiles/foswikiForm"}%%TMPL:END%
+<base href="%SCRIPTURL{%SCRIPTNAME%}%/%WEB%/%TOPIC%" /><!--[if IE]></base><![endif]-->%TMPL:END%
+
+%TMPL:DEF{"head:script"}%%TMPL:P{"JavascriptFiles/foswikiString"}%%TMPL:P{"JavascriptFiles/foswikiPref"}%%TMPL:P{"JavascriptFiles/foswikiForm"}%%TMPL:P{"LIBJS" id="PatternSkin/pattern" requires="JQUERYPLUGIN::FOSWIKI,JavascriptFiles/foswikiPref,JavascriptFiles/foswikiForm"}%%TMPL:END%
+
+%TMPL:DEF{"head:css"}%%TMPL:P{"defaultstyle"}%%TMPL:END%
 
 %TMPL:DEF{"bodystart"}%<body class="foswikiNoJs %TMPL:P{"bodyclassname"}%">
 #PageTop%TMPL:END%
diff --git a/PatternSkin/templates/login.pattern.tmpl b/PatternSkin/templates/login.pattern.tmpl
index 29c28c8617..282cd8f575 100644
--- a/PatternSkin/templates/login.pattern.tmpl
+++ b/PatternSkin/templates/login.pattern.tmpl
@@ -5,9 +5,8 @@
 %TMPL:DEF{"webaction"}%%TMPL:END%
 
 %TMPL:DEF{"form"}%<div id="foswikiLogin">
-<div class="foswikiFormSteps">%TMPL:P{"formstart"}%%TMPL:P{"titlestep"}%
-%TMPL:P{"usernamestep"}%%TMPL:P{"passwordstep"}%%TMPL:P{"submitstep"}%
-%TMPL:P{"formend"}%
-%TMPL:P{"seealsostep"}%
-</div>%TMPL:P{"loginasadministratorstep"}%
+%TMPL:P{"formstart"}%<div class="foswikiFormSteps">%TMPL:P{"titlestep"}%
+<hr />%TMPL:P{"usernamestep"}%%TMPL:P{"passwordstep"}%%TMPL:P{"submitstep"}%
+<hr />%TMPL:P{"seealsostep"}%
+</div>%TMPL:P{"loginasadministratorstep"}%%TMPL:P{"formend"}%
 </div>%TMPL:END%
\ No newline at end of file
diff --git a/PatternSkin/templates/renamebase.pattern.tmpl b/PatternSkin/templates/renamebase.pattern.tmpl
index ff41c68f4f..411ca15f88 100644
--- a/PatternSkin/templates/renamebase.pattern.tmpl
+++ b/PatternSkin/templates/renamebase.pattern.tmpl
@@ -15,7 +15,7 @@
 
 %TMPL:DEF{"checkuncheck"}%%{
    foswikiCheckAllOn and foswikiCheckAllOff are handled in foswikiForm.js
-}%<div class="foswikiMakeVisibleBlock">
+}%<div class="foswikiFormStep foswikiMakeVisible">
 <p><input type="button" class="foswikiButton foswikiCheckAllOn" value='%MAKETEXT{"Select all"}%' />&nbsp;<input type="button" class="foswikiButton foswikiCheckAllOff" value='%MAKETEXT{"Clear all"}%' /> %MAKETEXT{"checkboxes of referenced topics"}%</p></div>%TMPL:END%
 
 
diff --git a/PatternSkin/templates/view.pattern.tmpl b/PatternSkin/templates/view.pattern.tmpl
index 865926bd68..cbebb252dd 100644
--- a/PatternSkin/templates/view.pattern.tmpl
+++ b/PatternSkin/templates/view.pattern.tmpl
@@ -51,7 +51,7 @@
 }%%TMPL:DEF{"patterntopiccontents"}%%TMPL:P{"broadcastmessage"}%%TMPL:P{"top"}%%TMPL:P{"contentheaderstylewrapper"}%%TMPL:P{"formtop"}%%TMPL:P{"attachmentstop"}%<div class="patternContent"><div class="foswikiTopic">%TMPL:P{"content"}%</div>
 %TMPL:P{"contentfooterstylewrapper"}%%TMPL:P{"topicaction"}%</div>%TMPL:P{"footernote"}%%TMPL:END%
 
-%TMPL:DEF{"topicaction"}%<div class="foswikiFormSteps">%TMPL:P{"formbottom"}%%TMPL:P{"attachmentsbottom"}%<a name="topic-actions"></a><div class="patternTopicActions foswikiFormStep"><span class="patternActionButtons">%TMPL:P{"topicactionbuttons"}%</span></div></div>%TMPL:END%%{
+%TMPL:DEF{"topicaction"}%<div class="foswikiFormSteps">%TMPL:P{"formbottom"}%%TMPL:P{"attachmentsbottom"}%<div class="patternTopicActions foswikiFormStep"><span class="patternActionButtons">%TMPL:P{"topicactionbuttons"}%</span></div></div>%TMPL:END%%{
 ---------------------------------------------------
 }%%TMPL:DEF{"standardheader"}%%TMPL:END%
 %TMPL:DEF{"simpleheader"}%%TMPL:P{"flashnote"}%%TMPL:P{"standardheader"}%%TMPL:END%%{