You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2020/01/16 08:23:46 UTC

[wicket] branch csp-display-none created (now 7a6962b)

This is an automated email from the ASF dual-hosted git repository.

papegaaij pushed a change to branch csp-display-none
in repository https://gitbox.apache.org/repos/asf/wicket.git.


      at 7a6962b  WICKET-6725: Updated tests to reflect new markup

This branch includes the following new commits:

     new 7f8b129  WICKET-6725: replace display:none by wicket--hidden css class
     new 7a6962b  WICKET-6725: Updated tests to reflect new markup

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[wicket] 01/02: WICKET-6725: replace display:none by wicket--hidden css class

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

papegaaij pushed a commit to branch csp-display-none
in repository https://gitbox.apache.org/repos/asf/wicket.git

commit 7f8b129619e1af184fc79338f9b831119898f922
Author: Emond Papegaaij <em...@topicus.nl>
AuthorDate: Mon Jan 13 20:43:01 2020 +0100

    WICKET-6725: replace display:none by wicket--hidden css class
---
 .../src/main/java/org/apache/wicket/Component.java |  2 +-
 .../src/main/java/org/apache/wicket/Page.java      | 11 +++++++
 .../wicket/css/WicketCoreCSSResourceReference.java | 36 ++++++++++++++++++++++
 .../java/org/apache/wicket/css/wicket-core.css     |  3 ++
 .../apache/wicket/settings/ResourceSettings.java   | 31 +++++++++++++++++++
 .../ajax/markup/html/AjaxIndicatorAppender.java    |  2 +-
 6 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 9da8ec5..d2da23b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -2367,7 +2367,7 @@ public abstract class Component
 		response.write(name);
 		response.write(" id=\"");
 		response.write(getAjaxRegionMarkupId());
-		response.write("\" style=\"display:none\" data-wicket-placeholder=\"\"></");
+		response.write("\" class=\"wicket--hidden\" data-wicket-placeholder=\"\"></");
 		response.write(name);
 		response.write(">");
 	}
diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java b/wicket-core/src/main/java/org/apache/wicket/Page.java
index 3f0f5b5..14ec901 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Page.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Page.java
@@ -24,10 +24,13 @@ import java.util.Set;
 
 import org.apache.wicket.authorization.UnauthorizedActionException;
 import org.apache.wicket.core.util.lang.WicketObjects;
+import org.apache.wicket.css.WicketCoreCSSResourceReference;
 import org.apache.wicket.feedback.FeedbackDelay;
 import org.apache.wicket.markup.MarkupException;
 import org.apache.wicket.markup.MarkupStream;
 import org.apache.wicket.markup.MarkupType;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.resolver.IComponentResolver;
 import org.apache.wicket.model.IModel;
@@ -1003,6 +1006,14 @@ public abstract class Page extends MarkupContainer
 		}
 	}
 
+	@Override
+	public void renderHead(IHeaderResponse response)
+	{
+		super.renderHead(response);
+		response.render(
+			CssHeaderItem.forReference(getApplication().getResourceSettings().getWicketCoreCSS()));
+	}
+
 	/**
 	 * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL.
 	 * 
diff --git a/wicket-core/src/main/java/org/apache/wicket/css/WicketCoreCSSResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/css/WicketCoreCSSResourceReference.java
new file mode 100644
index 0000000..0134681
--- /dev/null
+++ b/wicket-core/src/main/java/org/apache/wicket/css/WicketCoreCSSResourceReference.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.css;
+
+import org.apache.wicket.request.resource.CssResourceReference;
+
+public final class WicketCoreCSSResourceReference extends CssResourceReference
+{
+	private static final long serialVersionUID = 6795863553105608280L;
+
+	private static final WicketCoreCSSResourceReference INSTANCE = new WicketCoreCSSResourceReference();
+
+	public static WicketCoreCSSResourceReference get()
+	{
+		return INSTANCE;
+	}
+
+	private WicketCoreCSSResourceReference()
+	{
+		super(WicketCoreCSSResourceReference.class, "wicket-core.css");
+	}
+}
diff --git a/wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css b/wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css
new file mode 100644
index 0000000..9bbdd63
--- /dev/null
+++ b/wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css
@@ -0,0 +1,3 @@
+.wicket--hidden {
+	display: none!important;
+}
\ No newline at end of file
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
index b76fbcd..dc227ca 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/ResourceSettings.java
@@ -29,12 +29,14 @@ import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
 import org.apache.wicket.core.util.resource.locator.ResourceStreamLocator;
 import org.apache.wicket.core.util.resource.locator.caching.CachingResourceStreamLocator;
 import org.apache.wicket.css.ICssCompressor;
+import org.apache.wicket.css.WicketCoreCSSResourceReference;
 import org.apache.wicket.javascript.IJavaScriptCompressor;
 import org.apache.wicket.markup.head.PriorityFirstComparator;
 import org.apache.wicket.markup.head.ResourceAggregator.RecordedHeaderItem;
 import org.apache.wicket.markup.html.IPackageResourceGuard;
 import org.apache.wicket.markup.html.SecurePackageResourceGuard;
 import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.request.resource.CssResourceReference;
 import org.apache.wicket.request.resource.caching.FilenameWithVersionResourceCachingStrategy;
 import org.apache.wicket.request.resource.caching.IResourceCachingStrategy;
 import org.apache.wicket.request.resource.caching.NoOpResourceCachingStrategy;
@@ -172,6 +174,8 @@ public class ResourceSettings implements IPropertiesFactoryContext
 		false);
 
 	private boolean encodeJSessionId = false;
+	
+	private CssResourceReference wicketCoreCSS = WicketCoreCSSResourceReference.get();
 
 	/**
 	 * Configures Wicket's default ResourceLoaders.<br>
@@ -770,4 +774,31 @@ public class ResourceSettings implements IPropertiesFactoryContext
 		this.encodeJSessionId = encodeJSessionId;
 		return this;
 	}
+	
+	/**
+	 * Returns the resource reference of the core stylesheet for Wicket. This stylesheet contains
+	 * some lowlevel styling used by Wicket.
+	 * 
+	 * @return The resource reference of the base stylesheet for Wicket.
+	 */
+	public CssResourceReference getWicketCoreCSS()
+	{
+		return wicketCoreCSS;
+	}
+
+	/**
+	 * Replaces the core stylesheet for Wicket. Changes made to the styling can break functionality
+	 * like {@link Component#setOutputMarkupPlaceholderTag(boolean)}, causing components that should
+	 * not be visible to be displayed. Make sure the replacement stylesheet has matching definitions
+	 * for the corresponding sections in the Wicket version.
+	 * 
+	 * @param wicketCoreCSS
+	 *            The replacement styleheet.
+	 * @return {@code this} object for chaining
+	 */
+	public ResourceSettings setWicketCoreCSS(CssResourceReference wicketCoreCSS)
+	{
+		this.wicketCoreCSS = wicketCoreCSS;
+		return this;
+	}
 }
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
index d0fee97..ab1c0a1 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
@@ -95,7 +95,7 @@ public class AjaxIndicatorAppender extends Behavior
 		super.afterRender(component);
 		final Response r = component.getResponse();
 
-		r.write("<span style=\"display:none;\" class=\"");
+		r.write("<span class=\"wicket--hidden\" class=\"");
 		r.write(getSpanClass());
 		r.write("\" ");
 		r.write("id=\"");


[wicket] 02/02: WICKET-6725: Updated tests to reflect new markup

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

papegaaij pushed a commit to branch csp-display-none
in repository https://gitbox.apache.org/repos/asf/wicket.git

commit 7a6962b6b581daabd79333f78b05121c3dceb1d8
Author: Emond Papegaaij <em...@topicus.nl>
AuthorDate: Wed Jan 15 22:16:03 2020 +0100

    WICKET-6725: Updated tests to reflect new markup
---
 .../java/org/apache/wicket/css/wicket-core.css     |  16 ++
 .../wicket/DisabledComponentPage1a_result.html     |   3 +-
 .../wicket/DisabledComponentPage2_result.html      |   3 +-
 .../PageMarkupLoadingTest$Page1_expected.html      |   3 +-
 ...arkupLoadingTest$Page1_mystyle_nl_expected.html |   3 +-
 .../PageMarkupLoadingTest$Page1_nl_expected.html   |   3 +-
 ...oadingTest$Page2_myvar_mystyle_nl_expected.html |   3 +-
 .../wicket/ParentResourceEscapePathTest.java       |   2 +-
 .../org/apache/wicket/PlaceholderTagIdTest.java    |   2 +-
 .../apache/wicket/TestDetachPageAjaxResult.html    |   3 +-
 .../wicket/TestDetachPageExpectedResult.html       |   5 +-
 .../apache/wicket/TestPageExpectedResult_1.html    |   3 +-
 .../wicket/ajax/AjaxBehaviorEnabled_expected.html  |   5 +-
 .../AjaxHeaderContributionPage2_ajax_expected.html |   3 +-
 .../ajax/AjaxHeaderContributionPage2_expected.html |   7 +-
 .../AjaxHeaderContributionPage_ajax_expected.html  |   3 +-
 .../ajax/AjaxHeaderContributionPage_expected.html  |   7 +-
 .../apache/wicket/ajax/AjaxRequestHandlerTest.java |   4 +
 .../ajax/DomReadyOrderPage_ajax_expected.html      |   3 +-
 .../wicket/ajax/DomReadyOrderPage_expected.html    |   5 +-
 .../wicket/ajax/MockComponent1-expected.html       |   3 +-
 .../wicket/ajax/MockComponent3-expected.html       |   3 +-
 .../ajax/form/AjaxFormSubmitTestPage_expected.html |   5 +-
 .../OnChangeAjaxBehaviorTestPage_expected.html     |   5 +-
 .../html/ajaxLink/AjaxLinkPageExpectedResult.html  |   5 +-
 .../AjaxLinkWithBorderPage-1ExpectedResult.html    |   3 +-
 .../AjaxLinkWithBorderPageExpectedResult.html      |   5 +-
 .../html/ajaxLink/AjaxPage2-1_ExpectedResult.html  |   3 +-
 .../html/ajaxLink/AjaxPage2_ExpectedResult.html    |   5 +-
 .../SimpleTestPageExpectedResult-1.html            |   3 +-
 .../componentMap/SimpleTestPageExpectedResult.html |   5 +-
 .../SharedBehaviorTest_renderHead_expected.html    |   3 +-
 .../wicket/markup/DoctypeExpectedResult_1.html     |  43 ++---
 .../markup/DoctypeExpectedResult_1_Inherited.html  |   3 +-
 .../wicket/markup/DoctypeExpectedResult_2.html     |  41 ++---
 .../markup/IEConditionalCommentsPage-expected.html |  24 +++
 .../markup/MarkupInheritanceExpectedResult_10.html |   3 +-
 .../markup/MarkupInheritanceExpectedResult_11.html |   3 +-
 .../markup/MarkupInheritanceExpectedResult_12.html |   3 +-
 .../markup/MarkupInheritanceExpectedResult_13.html |   3 +-
 .../markup/MarkupInheritanceExpectedResult_5.html  |   3 +-
 .../markup/MarkupInheritanceExpectedResult_6.html  |   3 +-
 .../markup/MarkupInheritanceExpectedResult_7.html  |   3 +-
 .../markup/MarkupInheritanceExpectedResult_9.html  |   3 +-
 .../org/apache/wicket/markup/MarkupParserTest.java |   4 +-
 .../markup/WicketNamespaceExpectedResult_1.html    |   3 +-
 .../markup/WicketNamespaceExpectedResult_2.html    |   3 +-
 .../markup/WicketNamespaceExpectedResult_3.html    |   3 +-
 .../markup/WicketNamespaceExpectedResult_4.html    |   3 +-
 .../markup/WicketNamespaceExpectedResult_5.html    |   3 +-
 .../markup/WicketNamespaceExpectedResult_6.html    |   3 +-
 .../apache/wicket/markup/head/ExpectedResult.html  |   1 +
 .../markup/head/ExpectedResultPageFirst.html       |   1 +
 .../markup/head/PriorityDepthsPage_expected.html   |  19 +-
 .../markup/head/filter/CspNoncePageExpected.html   |   1 +
 .../markup/head/filter/DeferredPageExpected.html   |   9 +-
 .../head/filter/FilteredHeaderPageExpected.html    |   3 +-
 .../wicket/markup/html/MarkupHeadFirstPage.html    |   3 +-
 ...MarkupInheritanceResolverTestPage_expected.html |  35 ++--
 .../markup/html/autolink/Index_ExpectedResult.html |   3 +-
 .../markup/html/autolink/MyPageExpectedResult.html |   3 +-
 .../markup/html/autolink/PageAExpectedResult.html  |   3 +-
 .../markup/html/autolink/PageBExpectedResult.html  |   3 +-
 .../markup/html/basic/HomePageRedirectTest.java    |   4 +-
 .../markup/html/basic/RedirectPage-expected1.html  |   6 +
 .../markup/html/basic/RedirectPage-expected2.html  |   6 +
 .../html/basic/SimplePageExpectedResult.html       |   3 +-
 .../html/basic/SimplePageExpectedResult_10.html    |   3 +-
 .../html/basic/SimplePageExpectedResult_11.html    |   3 +-
 .../html/basic/SimplePageExpectedResult_12.html    |   3 +-
 .../html/basic/SimplePageExpectedResult_13.html    |   5 +-
 .../html/basic/SimplePageExpectedResult_14.html    |   5 +-
 .../html/basic/SimplePageExpectedResult_15.html    |   3 +-
 .../html/basic/SimplePageExpectedResult_16.html    |  19 +-
 .../html/basic/SimplePageExpectedResult_7.html     |   3 +-
 .../html/basic/SimplePageExpectedResult_9.html     |   3 +-
 .../border/HideableBorderPage_ExpectedResult.html  |   5 +-
 ...WicketComponentTreeTestPage_ExpectedResult.html |   3 +-
 .../form/CheckGroupDisabledTestPage_expected.html  |   3 +-
 .../html/form/CheckGroupTestPage1_expected.html    |   3 +-
 .../html/form/CheckGroupTestPage2_expected.html    |   3 +-
 .../html/form/CheckGroupTestPage3_expected.html    |   3 +-
 .../html/form/CheckGroupTestPage4_expected.html    |   3 +-
 .../DropDownChoiceTestPage_A_false_expected.html   |   3 +-
 .../DropDownChoiceTestPage_A_true_expected.html    |   3 +-
 ...DropDownChoiceTestPage_null_false_expected.html |   3 +-
 .../DropDownChoiceTestPage_null_true_expected.html |   3 +-
 .../form/FormDefaultButtonTestPage_expected.html   |   3 +-
 .../html/form/FormMethodTestPage_expected.html     |   3 +-
 .../form/RadioGroupDisabledTestPage_expected.html  |   3 +-
 .../html/form/RadioGroupTestPage1_expected.html    |   3 +-
 .../html/form/RadioGroupTestPage3_expected.html    |   3 +-
 .../form/feedback/FeedbackFormPage_result1.html    |   3 +-
 .../form/feedback/FeedbackFormPage_result2.html    |   3 +-
 .../FeedbackIndicatorFormPage_result1.html         |   3 +-
 .../FeedbackIndicatorFormPage_result2.html         |   3 +-
 .../html/form/pageWithParameters_expected.html     |   3 +-
 .../form/validation/HomePage1_ExpectedResult.html  |   3 +-
 .../markup/html/header/MyPage2_ExpectedResult.html |   3 +-
 .../markup/html/header/MyPageExpectedResult.html   |   3 +-
 .../html/header/inheritance/ExpectedResult2.html   |   3 +-
 .../html/header/inheritance/ExpectedResult3.html   |   3 +-
 .../header/testing/TestPage_ExpectedResult.html    |   3 +-
 .../testing2/TestExtendedPage2_ExpectedResult.html |   3 +-
 .../testing2/TestExtendedPage_ExpectedResult.html  |   3 +-
 .../header/testing3/TestPage_ExpectedResult-1.html |   3 +-
 .../header/testing3/TestPage_ExpectedResult-2.html |   3 +-
 .../html/header/threelayers/ExpectedResult.html    |   3 +-
 .../html/header/threelayers2/ExpectedResult.html   |   3 +-
 .../markup/html/internal/AjaxEnclosureTest.java    |   2 +-
 .../internal/EnclosurePageExpectedResult_1.html    |   3 +-
 .../internal/EnclosurePageExpectedResult_10-2.html |   3 +-
 .../internal/EnclosurePageExpectedResult_10-3.html |   3 +-
 .../internal/EnclosurePageExpectedResult_10.html   |  17 +-
 .../internal/EnclosurePageExpectedResult_11.html   |  25 +--
 .../internal/EnclosurePageExpectedResult_12.html   |  13 +-
 .../internal/EnclosurePageExpectedResult_13.html   |  13 +-
 .../internal/EnclosurePageExpectedResult_2.html    |   3 +-
 .../internal/EnclosurePageExpectedResult_3.html    |   3 +-
 .../internal/EnclosurePageExpectedResult_4-1.html  |  19 +-
 .../internal/EnclosurePageExpectedResult_4.html    |  11 +-
 .../internal/EnclosurePageExpectedResult_5-1.html  |  29 ++--
 .../internal/EnclosurePageExpectedResult_5.html    |  21 +--
 .../internal/EnclosurePageExpectedResult_8.html    |  11 +-
 .../EnclosurePageExpectedResult_9-1-1.html         |   3 +-
 .../internal/EnclosurePageExpectedResult_9-1.html  |   3 +-
 .../EnclosurePageExpectedResult_9-2-1.html         |   3 +-
 .../internal/EnclosurePageExpectedResult_9-2.html  |   3 +-
 .../EnclosurePageExpectedResult_9-3-1.html         |   3 +-
 .../EnclosurePageExpectedResult_9-3-2.html         |   3 +-
 .../internal/EnclosurePageExpectedResult_9-3.html  |   3 +-
 .../internal/EnclosurePageExpectedResult_9-4.html  |   3 +-
 .../internal/EnclosurePageExpectedResult_9.html    |   3 +-
 ...eEnclosureDifferentNamespaceExpectedResult.html |   3 +-
 .../InlineEnclosurePageExpectedResult_1.html       |   5 +-
 .../InlineEnclosurePageExpectedResult_2.html       |   3 +-
 .../InlineEnclosurePanelPageExpectedResult.html    |   3 +-
 .../markup/html/internal/InlineEnclosureTest.java  |   2 +
 ...reWithWicketMessagePage_invisible_expected.html |   5 +-
 ...sureWithWicketMessagePage_visible_expected.html |   3 +-
 .../markup/html/internal/TogglePageTest.java       |   2 +-
 .../html/link/AutolinkPageExpectedResult_1.html    |   3 +-
 .../html/link/AutolinkPageExpectedResult_2.html    |   3 +-
 .../html/link/AutolinkPageExpectedResult_3.html    |   3 +-
 .../html/link/AutolinkPageExpectedResult_4.html    |   3 +-
 .../html/link/AutolinkPageExpectedResult_5.html    |   3 +-
 .../link/BookmarkableHomePageLinksPage_result.html |   3 +-
 .../markup/html/link/BookmarkablePageLinkTest.java |   3 +-
 .../ClientSideImageMapPageExpectedResult_1.html    |  21 +--
 .../link/ExternalLinkPageExpectedResult_1.html     |  17 +-
 .../link/ExternalLinkPageExpectedResult_2.html     |  17 +-
 .../markup/html/link/HrefExpectedResult_1-1.html   |   5 +-
 .../markup/html/link/HrefExpectedResult_1.html     |   7 +-
 .../markup/html/link/HrefExpectedResult_2.html     |   3 +-
 .../markup/html/link/HrefExpectedResult_3.html     |   5 +-
 ...ntalTableNavigationPage_ExpectedResult_1-1.html |   3 +-
 ...ntalTableNavigationPage_ExpectedResult_1-2.html |   3 +-
 ...mentalTableNavigationPage_ExpectedResult_1.html |   3 +-
 .../list/PagedTableNavigatorExpectedResult_1.html  |   3 +-
 .../list/PagedTableNavigatorExpectedResult_2.html  |   3 +-
 .../list/PagedTableNavigatorExpectedResult_3.html  |   3 +-
 .../list/PagedTableNavigatorExpectedResult_4.html  |   3 +-
 .../list/PagedTableNavigatorExpectedResult_5.html  |   3 +-
 .../list/PagedTableNavigatorExpectedResult_6.html  |   3 +-
 .../list/PagedTableNavigatorExpectedResult_7.html  |   3 +-
 .../list/PagedTableNavigatorExpectedResult_8.html  |   3 +-
 ...NavigatorWithLabelProviderExpectedResult_1.html |   5 +-
 ...NavigatorWithLabelProviderExpectedResult_2.html |   5 +-
 ...NavigatorWithLabelProviderExpectedResult_3.html |   5 +-
 ...NavigatorWithLabelProviderExpectedResult_4.html |   5 +-
 ...NavigatorWithLabelProviderExpectedResult_5.html |   5 +-
 ...NavigatorWithLabelProviderExpectedResult_6.html |   5 +-
 ...NavigatorWithLabelProviderExpectedResult_7.html |   5 +-
 ...edTableNavigatorWithMarginExpectedResult_1.html |   3 +-
 ...edTableNavigatorWithMarginExpectedResult_2.html |   3 +-
 ...edTableNavigatorWithMarginExpectedResult_3.html |   3 +-
 ...edTableNavigatorWithMarginExpectedResult_4.html |   3 +-
 ...edTableNavigatorWithMarginExpectedResult_5.html |   7 +-
 ...edTableNavigatorWithMarginExpectedResult_6.html |   3 +-
 ...edTableNavigatorWithMarginExpectedResult_7.html |   3 +-
 .../html/list/SimpleTablePageExpectedResult_1.html |   3 +-
 .../html/list/SimpleTablePageExpectedResult_2.html |   3 +-
 .../FeedbackPanelTest_cssClasses_expected.html     |   3 +-
 .../panel/InlinePanelPageExpectedResult_1.html     |   3 +-
 .../panel/InlinePanelPageExpectedResult_2.html     |   3 +-
 .../panel/InlinePanelPageExpectedResult_3.html     |   3 +-
 .../panel/InlinePanelPageExpectedResult_4.html     |   3 +-
 .../panel/InlinePanelPageExpectedResult_5.html     |   3 +-
 .../panel/InlinePanelPageExpectedResult_6.html     |   3 +-
 .../panel/InlinePanelPageExpectedResult_7.html     |   5 +-
 .../panel/InlinePanelPageExpectedResult_8.html     |   7 +-
 .../html/panel/PanelPageExpectedResult_3.html      |   3 +-
 .../html/panel/PanelPageExpectedResult_4.html      |  43 ++---
 ...lWithAttributeModifierPageExpectedResult_1.html |   3 +-
 .../html/tags/InputTagNotVisibleWebPageResult.html |   3 +-
 .../html/tags/InputTagVisibleWebPageResult.html    |   3 +-
 .../outputTransformer/PageExpectedResult_1.html    |   5 +-
 .../outputTransformer/PageExpectedResult_2.html    |   5 +-
 .../outputTransformer/PageExpectedResult_3.html    |  39 +++--
 .../wicket/markup/parser/PageExpectedResult_1.html |   3 +-
 .../wicket/markup/parser/PageExpectedResult_2.html |   3 +-
 .../wicket/markup/parser/PageExpectedResult_3.html |   3 +-
 .../filter/DoubleHeaderPartPageExpectedResult.html |   3 +-
 ...ynamicMarkupPageWithNonClosedTags_expected.html |   3 +-
 .../filter/HeaderSectionPageExpectedResult_1.html  |   3 +-
 .../filter/HeaderSectionPageExpectedResult_10.html |   3 +-
 .../filter/HeaderSectionPageExpectedResult_11.html |   3 +-
 .../filter/HeaderSectionPageExpectedResult_14.html |   3 +-
 .../filter/HeaderSectionPageExpectedResult_15.html |   3 +-
 .../filter/HeaderSectionPageExpectedResult_16.html |   3 +-
 .../filter/HeaderSectionPageExpectedResult_17.html |   3 +-
 .../filter/HeaderSectionPageExpectedResult_18.html |   3 +-
 .../filter/HeaderSectionPageExpectedResult_19.html |   3 +-
 .../filter/HeaderSectionPageExpectedResult_2.html  |   3 +-
 .../filter/HeaderSectionPageExpectedResult_20.html |  43 ++---
 .../filter/HeaderSectionPageExpectedResult_3.html  |   3 +-
 .../filter/HeaderSectionPageExpectedResult_4.html  |   3 +-
 .../filter/HeaderSectionPageExpectedResult_5.html  |   3 +-
 .../filter/HeaderSectionPageExpectedResult_6.html  |   3 +-
 .../filter/HeaderSectionPageExpectedResult_7.html  |   3 +-
 .../filter/HeaderSectionPageExpectedResult_8.html  |   3 +-
 .../filter/HeaderSectionPageExpectedResult_9.html  |   3 +-
 .../filter/HeaderSectionPageExpectedResult_9a.html |   3 +-
 .../OpenCloseTagExpanderPageExpectedResult_1.html  |  27 +--
 .../filter/PageWithScriptTemplate_expected.html    |   3 +-
 .../SimplePage1_ExpectedResult.html_2              |  77 ++++----
 .../SimplePage2_ExpectedResult.html_2              | 193 +++++++++++----------
 .../SimpleContainerPageExpectedResult_1.html       |  21 +--
 .../resolver/SimplePageExpectedResult_1.html       |  37 ++--
 .../resolver/SimplePageExpectedResult_2.html       |   3 +-
 .../resolver/SimplePageExpectedResult_2a.html      |   3 +-
 .../resolver/SimplePageExpectedResult_3.html       |  13 +-
 .../resolver/SimplePageExpectedResult_5.html       |  17 +-
 .../resolver/SimplePageExpectedResult_6.html       |  27 +--
 ...ketMessageResolverEscapePageExpectedResult.html |   3 +-
 .../resolver/border/HomePageExpectedResult.html    |  51 +++---
 .../model/ResourceModelTest$TestPage_expected.html |   3 +-
 .../wicket/page/XmlPartialPageUpdateTest.java      |  14 +-
 .../wicket/queueing/ComponentQueueingTest.java     |   2 +-
 .../request/resource/BundlesPage_ext_result.html   |   3 +-
 .../request/resource/BundlesPage_result.html       |   3 +-
 .../request/resource/BundlesPage_result_defer.html |   3 +-
 .../ResourceAggregatorTest1Page_results.html       |   5 +-
 .../ResourceAggregatorTest2Page_results.html       |   5 +-
 .../loader/PackageTestPageExpectedResult_1.html    |  43 ++---
 ...mponentPageWithParams_indexed_mount_result.html |   3 +-
 ...telessComponentPageWithParams_mount_result.html |   3 +-
 .../StatelessComponentPageWithParams_result.html   |   3 +-
 .../StatelessComponentPage_mount_result.html       |   3 +-
 .../stateless/StatelessComponentPage_result.html   |   3 +-
 .../stateless/StatelessPageWithForm_expected.html  |   3 +-
 .../table/filter/FilterFormTestPage_expected.html  |   5 +-
 252 files changed, 1045 insertions(+), 749 deletions(-)

diff --git a/wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css b/wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css
index 9bbdd63..d4e8c79 100644
--- a/wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css
+++ b/wicket-core/src/main/java/org/apache/wicket/css/wicket-core.css
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 .wicket--hidden {
 	display: none!important;
 }
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html b/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html
index bcb4461..28aa585 100644
--- a/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage1a_result.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <a href="./org.apache.wicket.DisabledComponentPage1?0-1.-link" wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage2_result.html b/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage2_result.html
index 6bfc798..82e600d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage2_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/DisabledComponentPage2_result.html
@@ -1,4 +1,5 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 </body>
 </html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page1_expected.html b/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page1_expected.html
index d8ebd94..9debb05 100644
--- a/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page1_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page1_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 Default
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page1_mystyle_nl_expected.html b/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page1_mystyle_nl_expected.html
index 4ec916e..050f17e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page1_mystyle_nl_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page1_mystyle_nl_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 Mijn Stijl!
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page1_nl_expected.html b/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page1_nl_expected.html
index 9a40aad..3a3f6a7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page1_nl_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page1_nl_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 Nederlands
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page2_myvar_mystyle_nl_expected.html b/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page2_myvar_mystyle_nl_expected.html
index d48720d..1dd5d66 100644
--- a/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page2_myvar_mystyle_nl_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/PageMarkupLoadingTest$Page2_myvar_mystyle_nl_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 Een variatie op m'n stijl
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java b/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java
index 4cb7d34..4ed4b16 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java
@@ -58,7 +58,7 @@ class ParentResourceEscapePathTest extends WicketTestCase
 		log.error(tester.getLastResponseAsString());
 
 		String html = tester.getLastResponseAsString();
-		assertContains(html, "<html><head><wicket:link><script ");
+		assertContains(html, "<wicket:link><script ");
 		assertContains(html, " type=\"text/javascript\"");
 		assertContains(html, expectedResourceUrl() + "\"");
 		assertContains(html, "\"></script></wicket:link></head></html>");
diff --git a/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java b/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
index 5b98156..cdecfb7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/PlaceholderTagIdTest.java
@@ -42,7 +42,7 @@ class PlaceholderTagIdTest extends WicketTestCase
 	{
 		tester.startPage(TestPage.class);
 
-		tester.assertContains("<form id=\"form1_region\" style=\"display:none\" data-wicket-placeholder=\"\">");
+		tester.assertContains("<form id=\"form1_region\" class=\"wicket--hidden\" data-wicket-placeholder=\"\">");
 	}
 
 	/**
diff --git a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
index ecda0eb..c726043 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="comp1" ><![CDATA[<span wicket:id="comp" id="comp1">body</span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="comp1" ><![CDATA[<span wicket:id="comp" id="comp1">body</span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
diff --git a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
index c4b5850..76cff52 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageExpectedResult.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
@@ -11,7 +12,7 @@ Wicket.Log.enabled=true;
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.TestDetachPage?0";
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 Wicket.Ajax.ajax({"u":"./org.apache.wicket.TestDetachPage?0-1.0-comp","c":"comp1","e":"click"});;
diff --git a/wicket-core/src/test/java/org/apache/wicket/TestPageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/TestPageExpectedResult_1.html
index d473ee1..541b07c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TestPageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/TestPageExpectedResult_1.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="comp">body</span>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
index 0d62464..32f5ee9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabled_expected.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
@@ -15,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxBehaviorEnab
 
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>Insert title here</title>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.AjaxBehaviorEnabledPage?0-1.0-enabled","c":"enabled1","e":"click"});;
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
index 08ef620..2fe385c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
@@ -15,7 +15,8 @@ test
 test
 </wicket:panel></span>]]></component><component id="btest37" ><![CDATA[<span wicket:id="btest3" id="btest37"><wicket:panel>
 test
-</wicket:panel></span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org">
+</wicket:panel></span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <link href="../../test"/>
 <script type="text/javascript" src="../../javascripturl"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
index f0c0400..7a4f434 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
@@ -1,5 +1,6 @@
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <link href="../../test"/>
 <script type="text/javascript" src="../../javascripturl"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
@@ -17,7 +18,7 @@ Wicket.Log.enabled=true;
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxHeaderContributionPage2?0";
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 domReady();;
@@ -27,7 +28,7 @@ Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "load", function(event) { 
 onLoad();;
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
index dc3d8af..473d126 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
@@ -9,7 +9,8 @@ test
 test
 </wicket:panel></span>]]></component><component id="test34" ><![CDATA[<span wicket:id="test3" id="test34"><wicket:panel>
 test
-</wicket:panel></span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org">
+</wicket:panel></span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <link href="../../test"/>
 <script type="text/javascript" src="../../javascripturl"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
index 84f795a..e394475 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
@@ -1,5 +1,6 @@
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <link href="../../test"/>
 <script type="text/javascript" src="../../javascripturl"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
@@ -14,7 +15,7 @@ Wicket.Log.enabled=true;
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxHeaderContributionPage?0";
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 domReady();;
@@ -23,7 +24,7 @@ Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 ;});
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "load", function(event) { 
 onLoad();;
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java
index e3fdc5d..012da0f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java
@@ -75,6 +75,10 @@ class AjaxRequestHandlerTest extends WicketTestCase
 	@Test
 	void headerContribution2() throws IOException
 	{
+		// remove the wicket-core stylesheet
+		tester.getApplication()
+			.getHeaderContributorListeners()
+			.forEach(tester.getApplication().getHeaderContributorListeners()::remove);
 		executeHeaderTest(MockComponent2.class);
 	}
 
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
index 93b9b8c..7950158 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="test1" ><![CDATA[<a href="./org.apache.wicket.ajax.DomReadyOrderPage?0-1.-test" wicket:id="test" id="test1">Test</a>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="test1" ><![CDATA[<a href="./org.apache.wicket.ajax.DomReadyOrderPage?0-1.-test" wicket:id="test" id="test1">Test</a>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
index f127d71..35a534e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
@@ -1,5 +1,6 @@
 <html>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
@@ -11,7 +12,7 @@ Wicket.Log.enabled=true;
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.DomReadyOrderPage?0";
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.DomReadyOrderPage?0-1.0-test","c":"test1","e":"click","pd":true});;
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html
index 3ee776e..028e7f6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html
@@ -1,4 +1,5 @@
-<![CDATA[<head xmlns:wicket="http://wicket.apache.org">
+<![CDATA[<head xmlns:wicket="http://wicket.apache.org"><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <style type="text/css" id="org-apache-wicket-ajax-MockComponent1-0">
 /*<![CDATA[*/
 
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html
index 7171a53..66e3119 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html
@@ -1,2 +1,3 @@
-<![CDATA[<head xmlns:wicket="http://wicket.apache.org"><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.ajax.MockComponent3/mockStyleSheet3.css" />
+<![CDATA[<head xmlns:wicket="http://wicket.apache.org"><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.ajax.MockComponent3/mockStyleSheet3.css" />
 </head>]]>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
index cd1987a..30f6017 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html
@@ -1,5 +1,6 @@
 <html>
-	<head><script type="text/javascript" src="./resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+	<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="./resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="./resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
@@ -11,7 +12,7 @@ Wicket.Log.enabled=true;
 Wicket.Ajax.baseUrl="wicket/page?0";
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 Wicket.Ajax.ajax({"u":"./page?0-1.0-form-submit","m":"POST","c":"submit2","f":"form1","sc":"p::submit","e":"click","pd":true});;
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
index dd634cd..85fe23a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html
@@ -1,5 +1,6 @@
 <html>
-	<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+	<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
@@ -11,7 +12,7 @@ Wicket.Log.enabled=true;
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0";
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0-1.0-form-field","m":"POST","c":"field1","e":"input change"});;
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
index ce36c3b..3fb7030 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
@@ -1,5 +1,6 @@
 <html>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
@@ -11,7 +12,7 @@ Wicket.Log.enabled=true;
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkPage?0";
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkPage?0-1.0-ajaxLink","c":"ajaxLink1","e":"click"});;
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html
index 7795a29..1fe2d33 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPage-1ExpectedResult.html
@@ -1 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="ajaxLabel2" ><![CDATA[<span wicket:id="ajaxLabel" id="ajaxLabel2">Updated!</span>]]></component></ajax-response>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="ajaxLabel2" ><![CDATA[<span wicket:id="ajaxLabel" id="ajaxLabel2">Updated!</span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head>]]></header-contribution></ajax-response>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
index 77e9996..4f015bb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
@@ -1,5 +1,6 @@
 <html>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
@@ -11,7 +12,7 @@ Wicket.Log.enabled=true;
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkWithBorderPage?0";
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxLinkWithBorderPage?0-1.0-border-border_body-ajaxLink","c":"ajaxLink1","e":"click"});;
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html
index 85201df..aaf44ac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2-1_ExpectedResult.html
@@ -1 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="ajaxLabel" ><![CDATA[<span wicket:id="ajaxLabel" id="ajaxLabel">BBBBBBB</span>]]></component></ajax-response>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="ajaxLabel" ><![CDATA[<span wicket:id="ajaxLabel" id="ajaxLabel">BBBBBBB</span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head>]]></header-contribution></ajax-response>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
index 8163e78..f7d8ea2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
@@ -1,5 +1,6 @@
 <html>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
@@ -11,7 +12,7 @@ Wicket.Log.enabled=true;
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajaxLink.AjaxPage2?0";
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.ajaxLink.AjaxPage2?0-1.0-pageLayout-pageLayout_body-ajaxLink","c":"ajaxLink1","e":"click"});;
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
index ba09269..cb97669 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="linja11" ><![CDATA[<span wicket:id="linja1" id="linja11">1</span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><component id="linja11" ><![CDATA[<span wicket:id="linja1" id="linja11">1</span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
index 6a70125..2ad1137 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult.html
@@ -1,5 +1,6 @@
 <html>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
@@ -13,7 +14,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.comp
 </script>
 
   <title>ajax-test</title>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "load", function(event) { 
 Wicket.Timer.set('linja11.0', function(){Wicket.Ajax.ajax({"u":"./org.apache.wicket.ajax.markup.html.componentMap.SimpleTestPage?0-1.0-testPanel-baseSpan-linja1","c":"linja11"});}, 2000);;
diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest_renderHead_expected.html b/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest_renderHead_expected.html
index 775baa5..89949c7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest_renderHead_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest_renderHead_expected.html
@@ -1,3 +1,4 @@
-<html><head>
+<html><head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 Rendering header contribution for component with id: comp1
 Rendering header contribution for component with id: comp2</head><body><div wicket:id="comp1"></div><div wicket:id="comp2"></div></body></html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/DoctypeExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/DoctypeExpectedResult_1.html
index 59806fb..c44cc03 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/DoctypeExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/DoctypeExpectedResult_1.html
@@ -1,21 +1,22 @@
-<!DOCTYPE html>
-<!--
-    ====================================================================
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<html>
-<body>
-  <span wicket:id="label">my label test</span>
-  <wicket:child/>
-</body>
-</html>
+<!DOCTYPE html>
+<!--
+    ====================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  <span wicket:id="label">my label test</span>
+  <wicket:child/>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/DoctypeExpectedResult_1_Inherited.html b/wicket-core/src/test/java/org/apache/wicket/markup/DoctypeExpectedResult_1_Inherited.html
index 7e95803..d611697 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/DoctypeExpectedResult_1_Inherited.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/DoctypeExpectedResult_1_Inherited.html
@@ -14,7 +14,8 @@
     limitations under the License.
 -->
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="label">my label test</span>
   <wicket:child><wicket:extend></wicket:extend></wicket:child>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/DoctypeExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/DoctypeExpectedResult_2.html
index 57ed71a..85d380c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/DoctypeExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/DoctypeExpectedResult_2.html
@@ -1,20 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!--
-    ====================================================================
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<html>
-<body>
-  <span wicket:id="label">my label test</span>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+    ====================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  <span wicket:id="label">my label test</span>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/IEConditionalCommentsPage-expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/IEConditionalCommentsPage-expected.html
new file mode 100644
index 0000000..19f89bf
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/IEConditionalCommentsPage-expected.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<!--[if lt IE 7 ]> <html class="no-js ie6"> <![endif]-->
+<!--[if IE 7 ]>    <html class="no-js ie7"> <![endif]-->
+<!--[if IE 8 ]>    <html class="no-js ie8"> <![endif]-->
+<!--[if (gte IE 9)|!(IE)]><!--> <html class="no-js" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"> <!--<![endif]-->
+
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
+    <style>
+/*<![CDATA[*/
+
+        html {
+            font-family: Arial;
+        }
+    
+/*]]>*/
+    </style>
+</head>
+<body></body>
+
+<!--[if lt IE 7 ]> </html> <![endif]-->
+<!--[if IE 7 ]>    </html> <![endif]-->
+<!--[if IE 8 ]>    </html> <![endif]-->
+<!--[if (gte IE 9)|!(IE)]><!--> </html> <!--<![endif]-->
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_10.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_10.html
index 9e4e87c..549204a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_10.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_10.html
@@ -1,5 +1,6 @@
 <html>
-  <head>
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
     <link wicket:id="css" src="myStyle.css"/>
   </head>
   <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_11.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_11.html
index 987ae34..19f89e8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_11.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_11.html
@@ -1,5 +1,6 @@
 <html>
-  <head>
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
     <link wicket:id="css" src="myStyle.css"/>
   </head>
   <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html
index ba5a54f..d4d4b8c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_12.html
@@ -1,5 +1,6 @@
 <html>
-  <head>
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
     base head
   
   extension header
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_13.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_13.html
index 322a08c..1a14814 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_13.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_13.html
@@ -1,5 +1,6 @@
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   <link type="text/css" rel="stylesheet" href="../../basebase.css"/>
 
   <link type="text/css" rel="stylesheet" href="../../base.css"/>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html
index 31d0119..41f08a1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_5.html
@@ -1,5 +1,6 @@
 <html>
-  <head>
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
     base head
   </head>
   <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_6.html
index 5898b37..43a7d14 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_6.html
@@ -1,5 +1,6 @@
 <html>
-  <head>
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   base head
 
   extension head
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html
index 5e380d9..21ae654 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_7.html
@@ -1,5 +1,6 @@
 <html>
-  <head>
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
     base head
   
   <span wicket:id="headerLabel">my header</span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_9.html b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_9.html
index 429f782..f4dc696 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_9.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceExpectedResult_9.html
@@ -1,5 +1,6 @@
 <html>
-  <head>
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   extension head
 </head><body>
     <span wicket:id="panel"><wicket:panel>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
index 5f6651b..1cd4514 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
@@ -680,10 +680,10 @@ final class MarkupParserTest extends WicketTestCase
 		try
 		{
 			tester.getApplication().getMarkupSettings().setStripComments(false);
-			executeTest(IEConditionalCommentsPage.class, "IEConditionalCommentsPage.html");
+			executeTest(IEConditionalCommentsPage.class, "IEConditionalCommentsPage-expected.html");
 
 			tester.getApplication().getMarkupSettings().setStripComments(true);
-			executeTest(IEConditionalCommentsPage.class, "IEConditionalCommentsPage.html");
+			executeTest(IEConditionalCommentsPage.class, "IEConditionalCommentsPage-expected.html");
 		}
 		finally
 		{
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_1.html
index da58f5a..00e1f3c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_1.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="label">my label test</span>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_2.html
index 638ed64..15d4e1f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_2.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket="http://wicket.apache.org/">
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="label">my label test</span>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_3.html
index 88594df..a2134c9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_3.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wcn="http://wicket.apache.org/">
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wcn:id="label">my label test</span>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_4.html
index d938508..bb93d2b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_4.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wcn="http://wicket.apache.org/">
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <!-- not wicket namespace -->
   <span wicket:id="label">xxx</span>
   <span wcn:id="label">my label test</span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_5.html
index 8dee8aa..6e6731e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_5.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="label">my label test</span>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_6.html
index 9b6b918..566d4ee 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_6.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wcn>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wcn:id="label">my label test</span>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/head/ExpectedResult.html
index a70b68a..0cd1971 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/head/ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/ExpectedResult.html
@@ -4,6 +4,7 @@
 <title>HeaderPanel-PriorityHeaderItem</title>
 <title>PanelWithHeader-HeaderItem-Dependency</title>
 <title>PanelWithHeader-PriorityHeaderItem</title>
+<link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
 
 	<title>HeaderPanel-Head</title>
 <title>HeaderPanel-HeaderItem</title>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/ExpectedResultPageFirst.html b/wicket-core/src/test/java/org/apache/wicket/markup/head/ExpectedResultPageFirst.html
index bbed551..dfc4771 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/head/ExpectedResultPageFirst.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/ExpectedResultPageFirst.html
@@ -28,6 +28,7 @@
 </wicket:panel></wicket:container>
 <title>AbstractPage-HeaderItem</title>
 <title>ConcretePage-HeaderItem</title>
+<link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
 
 	<title>HeaderPanel-Head</title>
 <title>HeaderPanel-HeaderItem</title>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/PriorityDepthsPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/head/PriorityDepthsPage_expected.html
index f71b37a..d466fe8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/head/PriorityDepthsPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/PriorityDepthsPage_expected.html
@@ -1,9 +1,10 @@
-<head><title>x</title>
-<title>y</title>
-</head><body>
-	<div wicket:id="a"></div>
-
-	<div wicket:id="b">
-		<div wicket:id="c"></div>
-	</div>
-</body>
+<head><title>x</title>
+<title>y</title>
+<link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+	<div wicket:id="a"></div>
+
+	<div wicket:id="b">
+		<div wicket:id="c"></div>
+	</div>
+</body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/CspNoncePageExpected.html b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/CspNoncePageExpected.html
index 2c44fc9..72ba8eb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/CspNoncePageExpected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/CspNoncePageExpected.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd" >
     <head><meta http-equiv="Content-Security-Policy" content="script-src 'strict-dynamic' 'nonce-NONCE'; style-src 'nonce-NONCE';" />
+<link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" nonce="NONCE" />
 <script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js" nonce="NONCE"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js" nonce="NONCE"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable" nonce="NONCE">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/DeferredPageExpected.html b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/DeferredPageExpected.html
index be0f042..e7d2a53 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/DeferredPageExpected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/DeferredPageExpected.html
@@ -1,17 +1,18 @@
 <html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd" >
-    <head><script type="text/javascript" defer="defer" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+    <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" defer="defer" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" defer="defer" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 document.addEventListener('DOMContentLoaded', function() { Wicket.Log.enabled=true;; });
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 document.addEventListener('DOMContentLoaded', function() { Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.head.filter.DeferredPage?0";; });
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 document.addEventListener('DOMContentLoaded', function() { 
 Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.head.filter.DeferredPage?0-1.0-","e":"click"});;
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteredHeaderPageExpected.html b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteredHeaderPageExpected.html
index 159b2ba..4166c27 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteredHeaderPageExpected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteredHeaderPageExpected.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd" >
-    <head><script type="text/javascript" src="../resource/org.apache.wicket.markup.head.filter.FilteredHeaderPage/top.js"></script>
+    <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.markup.head.filter.FilteredHeaderPage/top.js"></script>
 </head><body>
     	<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.markup.head.filter.FilteredHeaderPage/bottom.js"></script>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstPage.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstPage.html
index 53e2011..7a20a62 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstPage.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstPage.html
@@ -1,2 +1,3 @@
-<html><head><script type="text/javascript" src="../../markup.js"></script><script type="text/javascript" src="../../java.js"></script>
+<html><head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../../markup.js"></script><script type="text/javascript" src="../../java.js"></script>
 </head><body><div wicket:id="panel"><wicket:panel>content for MyPanel goes here</wicket:panel></div></body></html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage_expected.html
index 7b1bc7a..83ae142 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage_expected.html
@@ -1,18 +1,19 @@
-<html>
-<head>
-<title>title</title>
-</head>
-<body>
-<div wicket:id="test1">test1</div>
-<wicket:child><wicket:extend>
-	<wicket:enclosure child="test2">
-		<div wicket:id="test2">test2</div>
-	</wicket:enclosure>
-	<wicket:child><wicket:extend>
-	<wicket:enclosure child="test3">
-		<div wicket:id="test3">test3</div>
-	</wicket:enclosure>
-</wicket:extend></wicket:child>
-</wicket:extend></wicket:child>
-</body>
+<html>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
+<title>title</title>
+</head>
+<body>
+<div wicket:id="test1">test1</div>
+<wicket:child><wicket:extend>
+	<wicket:enclosure child="test2">
+		<div wicket:id="test2">test2</div>
+	</wicket:enclosure>
+	<wicket:child><wicket:extend>
+	<wicket:enclosure child="test3">
+		<div wicket:id="test3">test3</div>
+	</wicket:enclosure>
+</wicket:extend></wicket:child>
+</wicket:extend></wicket:child>
+</body>
 </html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/Index_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/Index_ExpectedResult.html
index ab47fe4..81d433a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/Index_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/Index_ExpectedResult.html
@@ -1,5 +1,6 @@
 <html>
-    <head>
+    <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
         <title>QuickStart</title>
     </head>
     <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
index a1cd4cc..07e7ce8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-  <body>
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
     <wicket:link>
       <a disabled="disabled">My Page</a>
       <a href="./org.apache.wicket.markup.html.autolink.PageA">Page A</a>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
index 7952d47..63ec466 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-  <body>
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
     <wicket:link>
       <a href="./org.apache.wicket.markup.html.autolink.MyPage">My Page</a>
       <a disabled="disabled">Page A</a>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html
index 0fb5fac..d1655b7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-  <body>
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
     <wicket:link>
       <a disabled="disabled">Page B</a>
     </wicket:link>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
index b5328dc..d094693 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
@@ -39,7 +39,7 @@ class HomePageRedirectTest extends WicketTestCase
 
 		// Validate the document
 		String document = tester.getLastResponseAsString();
-		DiffUtil.validatePage(document, this.getClass(), "RedirectPage.html", true);
+		DiffUtil.validatePage(document, this.getClass(), "RedirectPage-expected1.html", true);
 	}
 
 	/**
@@ -53,6 +53,6 @@ class HomePageRedirectTest extends WicketTestCase
 		assertEquals(RedirectPage.class, tester.getLastRenderedPage().getClass());
 
 		String document = tester.getLastResponseAsString();
-		DiffUtil.validatePage(document, this.getClass(), "RedirectPage.html", true);
+		DiffUtil.validatePage(document, this.getClass(), "RedirectPage-expected2.html", true);
 	}
 }
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/RedirectPage-expected1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/RedirectPage-expected1.html
new file mode 100644
index 0000000..ea274e1
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/RedirectPage-expected1.html
@@ -0,0 +1,6 @@
+<html>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+REDIRECTED
+</body>
+</html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/RedirectPage-expected2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/RedirectPage-expected2.html
new file mode 100644
index 0000000..8182872
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/RedirectPage-expected2.html
@@ -0,0 +1,6 @@
+<html>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+REDIRECTED
+</body>
+</html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult.html
index 0e83e0e..b015ce2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="myLabel">Test Label</span>
   body<span wicket:id="myLabel2">Test Label2</span>
   <wicket:panel>Inside the panel<span wicket:id="label">mein Label</span></wicket:panel>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_10.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_10.html
index e948db5..939b149 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_10.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_10.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
  
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_11.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_11.html
index f56cd7e..b57ba65 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_11.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_11.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
  <span wicket:id="panel">panel</span>
  <span wicket:id="border">border</span>
  <span wicket:id="body">body</span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html
index 4bfb373..1b2da01 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_12.html
@@ -1,7 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
        "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   <title>CSS-basiertes Layout</title>
   <link rel="stylesheet" type="text/css" href="../../basis.css">
 
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
index 28588f0..bcb68f3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
@@ -2,7 +2,8 @@
 <! DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html wicket:id="html" xmlns:wicket="" xmlns="http://www.w3.org/1999/xhtml" xmlns:lang="[current language]" lang="de" id="html1">
-  <head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
@@ -15,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.basic.Sim
 /*]]>*/
 </script>
 <link rel="stylesheet" type="text/css" href="../../BasePage.css" />
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.basic.SimplePage_13?0-1.0-html","c":"html1","e":"click"});;
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_14.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_14.html
index b93d934..e124025 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_14.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_14.html
@@ -1,8 +1,9 @@
 <? xml version= "1.0" encoding ="UTF-8" ?>
 <! DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
-<html lang="de" wicket:id="html" xmlns:wicket="" xmlns="http://www.w3.org/1999/xhtml" xmlns:lang="[current language]">
-  <body>
+<html wicket:id="html" xmlns:wicket="" xmlns="http://www.w3.org/1999/xhtml" xmlns:lang="[current language]" lang="de">
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="label">label</span>
   </body>
 </html> 
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_15.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_15.html
index bbd58bb..94f2117 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_15.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_15.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<head><link rel="stylesheet" type="text/css" href="../../BasePage.css" />
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<link rel="stylesheet" type="text/css" href="../../BasePage.css" />
 </head><body>
  test
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_16.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_16.html
index 8b9edec..f83a6a5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_16.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_16.html
@@ -1,9 +1,10 @@
-<html xmlns:wicket>
-<body>
-  <test wicket:id="test1">test</test>
-  <test wicket:id="test2"/>
-  <!-- note that span tag are allows changed to open-body-close. See OpenCloseTagExpander -->
-  <test wicket:id="test3"></test>
-  <test wicket:id="test4"></test>
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  <test wicket:id="test1">test</test>
+  <test wicket:id="test2"/>
+  <!-- note that span tag are allows changed to open-body-close. See OpenCloseTagExpander -->
+  <test wicket:id="test3"></test>
+  <test wicket:id="test4"></test>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
index dd2009d..14a07f3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <wicket:message key="myKeyNotExsts">Default Text</wicket:message>
   <wicket:message key="myKey">myValue</wicket:message>
   <wicket:message key="myKeyNotExists">[Warning: Property for 'myKeyNotExists' not found]</wicket:message>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_9.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_9.html
index 5df8005..e03bf2a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_9.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_9.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
  <p wicket:id="test"><span wicket:id="test">myTest</span></p>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
index 080bead..19016b3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
@@ -11,7 +12,7 @@ Wicket.Log.enabled=true;
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.border.HideableBorderPage?0";
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.border.HideableBorderPage?0-1.0-hideable-hideLink","c":"hideLink1","e":"click"});;
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTestPage_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTestPage_ExpectedResult.html
index 62a6dc4..6f898c1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTestPage_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTestPage_ExpectedResult.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <span wicket:id="label1">test1</span>
 <span wicket:id="label2">test22</span>
 <span wicket:id="componentList"><wicket:panel>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
index 58aada7..5365407 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html
@@ -1,5 +1,6 @@
 <html>
-<head><title>CheckGroupTestPage1</title></head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<title>CheckGroupTestPage1</title></head>
 <body>
     <!--  In addition test that chars are not converted from upper to lower and vice versa -->
 	<FORM wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupDisabledTestPage?0-1.-form">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
index 7f1747b..601fbb0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html
@@ -1,5 +1,6 @@
 <html>
-<head><title>CheckGroupTestPage1</title></head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<title>CheckGroupTestPage1</title></head>
 <body>
     <!--  In addition test that chars are not converted from upper to lower and vice versa -->
 	<FORM wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage1?0-1.-form">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html
index 23a04c2..73e4954 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html
@@ -1,5 +1,6 @@
 <html>
-<head><title>CheckGroupTestPage2</title></head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<title>CheckGroupTestPage2</title></head>
 <body>
 	<form wicket:id="form" id="form4" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage2?1-1.-form">
 		
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html
index 6abb92e..472c16a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html
@@ -1,5 +1,6 @@
 <html>
-<head><title>CheckGroupTestPage3</title></head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<title>CheckGroupTestPage3</title></head>
 <body>
 	<form wicket:id="form" id="form7" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage3?2-1.-form">
 		
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html
index 2fc9396..955e3e4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html
@@ -1,5 +1,6 @@
 <html>
-<head><title>CheckGroupTestPage4</title></head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<title>CheckGroupTestPage4</title></head>
 <body>
 	<form wicket:id="form" id="forma" method="post" action="./org.apache.wicket.markup.html.form.CheckGroupTestPage4?3-1.-form">
 		
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
index 17d5584..0bc99ad 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_false_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <form wicket:id="form" id="form1" method="post" action="./page?0-1.-form">
     <select wicket:id="dropdown" name="dropdown">
 <option selected="selected" value="0">A</option>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
index 3f4c765..f712239 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_A_true_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <form wicket:id="form" id="form1" method="post" action="./page?0-1.-form">
     <select wicket:id="dropdown" name="dropdown">
 <option value=""></option>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
index a753ec1..141e0f2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_false_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <form wicket:id="form" id="form1" method="post" action="./page?0-1.-form">
     <select wicket:id="dropdown" name="dropdown">
 <option selected="selected" value="">Choose One</option>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
index ece03d5..1fc2247 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/DropDownChoiceTestPage_null_true_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <form wicket:id="form" id="form1" method="post" action="./page?0-1.-form">
     <select wicket:id="dropdown" name="dropdown">
 <option selected="selected" value=""></option>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html
index 9ab27de..0335591 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormDefaultButtonTestPage_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 	<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.FormDefaultButtonTestPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden" class="hidden-fields"><input type="text" tabindex="-1" autocomplete="off"/><input type="submit" tabindex="-1" name="default" onclick=" var b=document.getElementById('default2'); if (b!=null&amp;&amp;b.onclick!=null&amp;&amp;typeof(b.onclick) != 'undefined') {  var r = W [...]
 		<button wicket:id="default" name="default" id="default2"></button>
 	</form>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
index c7e4191..33daa65 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 	<form wicket:id="formpost" id="formpost1" method="post" action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.-formpost"></form>
 	<form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div id="formget2_hf_0" style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden" class="hidden-fields"><input type="hidden" name="0-1.-formget" value="" /></div></form>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
index 67a52bf..c60820c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html
@@ -1,5 +1,6 @@
 <html>
-<head><title>RadioGroupTestPage1</title></head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<title>RadioGroupTestPage1</title></head>
 <body>
 	<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.RadioGroupDisabledTestPage?0-1.-form">
 		<span wicket:id="group">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html
index ca5bed6..7804f04 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html
@@ -1,5 +1,6 @@
 <html>
-<head><title>RadioGroupTestPage1</title></head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<title>RadioGroupTestPage1</title></head>
 <body>
 	<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.RadioGroupTestPage1?0-1.-form">
 		
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html
index f836c9d..de193ba 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.RadioGroupTestPage3?0-1.-form">
 	
 		<input wicket:id="check1" type="radio" id="check12" name="radio" value="radio0" checked="checked">Yes
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html
index 6428a2e..bbb5599 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?0-1.-form">
 <span wicket:id="feedback"><wicket:border>
 		<wicket:body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html
index da1bfe0..7005944 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackFormPage?1-2.-form">
 <span wicket:id="feedback"><wicket:border>
 		<wicket:body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html
index 75a5b8e..1129641 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackIndicatorFormPage?0-1.-form">
 	<input type="text" wicket:id="input" value="" name="input">
 
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
index fa72247..f924a5c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.form.feedback.FeedbackIndicatorFormPage?1-2.-form">
 	<input type="text" wicket:id="input" value="" name="input">
 <span wicket:id="feedback"><wicket:panel><span style="color:red;">*</span></wicket:panel></span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
index 75ad75e..ad0989d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 	<form wicket:id="formpost" id="formpost1" method="post" action="./org.apache.wicket.markup.html.form.FormMethodTestPage?0-1.-formpost&amp;first=foo&amp;second=bar"></form>
 	<form wicket:id="formget" id="formget2" method="get" action="./org.apache.wicket.markup.html.form.FormMethodTestPage"><div id="formget2_hf_0" style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden" class="hidden-fields"><input type="hidden" name="0-1.-formget" value="" /><input type="hidden" name="first" value="foo" /><input type="hidden" name="second" value="bar" /></div></form>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html
index eb9e737..71b8e3f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd" >
-    <head>  
+    <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+  
         <title>Wicket Quickstart Archetype Homepage</title>
     </head>
     <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPage2_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPage2_ExpectedResult.html
index b359dcf..fdc57e9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPage2_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPage2_ExpectedResult.html
@@ -1,6 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-  <head>
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
     <title>My Page</title>
   <link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.markup.html.header.MyPage2/MyPage2.css" />
 </head>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html
index be3a42e..510ff9f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html
@@ -1,7 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html>
-  <head>
+  <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
     <script id="org-apache-wicket-markup-html-header-BasePanel-0">
 /*<![CDATA[*/
 
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/ExpectedResult2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/ExpectedResult2.html
index f80f1a6..4aa75de 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/ExpectedResult2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/ExpectedResult2.html
@@ -1,5 +1,6 @@
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   <script type="text/javascript" id="org-apache-wicket-markup-html-header-inheritance-MyPanel2-0">
 /*<![CDATA[*/
 
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/ExpectedResult3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/ExpectedResult3.html
index ad11181..6158b3a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/ExpectedResult3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/ExpectedResult3.html
@@ -1,5 +1,6 @@
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   MyPanel2_myStyle
 
   <title>AbstractPage_myStyle.html</title>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestPage_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestPage_ExpectedResult.html
index 3f3447e..e8a018e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestPage_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestPage_ExpectedResult.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
     <script languange="javascript" id="org-apache-wicket-markup-html-header-testing-TestExtendedPanel-0">
 /*<![CDATA[*/
 
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestExtendedPage2_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestExtendedPage2_ExpectedResult.html
index 7f54aee..07feff7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestExtendedPage2_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestExtendedPage2_ExpectedResult.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   <title>test page</title>
 </head>
 <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestExtendedPage_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestExtendedPage_ExpectedResult.html
index 7f54aee..07feff7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestExtendedPage_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestExtendedPage_ExpectedResult.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   <title>test page</title>
 </head>
 <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html
index 0540f9d..ca601b3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-1.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   <title>test page</title>
 </head>
 <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
index 6a1f8a3..ba7c582 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage_ExpectedResult-2.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   <title>test page</title>
 </head>
 <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/ExpectedResult.html
index e67b4a3..c0bada9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/ExpectedResult.html
@@ -1,5 +1,6 @@
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   <title>AbstractBasePage.html</title>
 </head>
 <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/ExpectedResult.html
index e67b4a3..c0bada9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/ExpectedResult.html
@@ -1,5 +1,6 @@
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   <title>AbstractBasePage.html</title>
 </head>
 <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
index 8a16f20..0564822 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java
@@ -42,7 +42,7 @@ class AjaxEnclosureTest extends WicketTestCase
 {
 	private final String inlineEnclosureIdPrefix = "wicket__InlineEnclosure_";
 	private final String inlineEnclosureHiddenPattern = "<div id=\"" + inlineEnclosureIdPrefix +
-		"\\w+\" style=\"display:none\" data-wicket-placeholder=\"\"></div>";
+		"\\w+\" class=\"wicket--hidden\" data-wicket-placeholder=\"\"></div>";
 	private final String inlineEnclosureVisiblePattern = "<div id=\"" + inlineEnclosureIdPrefix +
 		"\\w+\">";
 
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_1.html
index 0982d7a..601ff5b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_1.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <wicket:enclosure child="label1">
     <table><tr><span wicket:id="label1">Test Label 1</span></tr></table>
   </wicket:enclosure>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-2.html
index 382611c..39404d9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-2.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <wicket:enclosure child="input">
     <input wicket:id="input" type="checkbox" name="input"/>
     <span wicket:id="label"></span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-3.html
index 382611c..39404d9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10-3.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <wicket:enclosure child="input">
     <input wicket:id="input" type="checkbox" name="input"/>
     <span wicket:id="label"></span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10.html
index cb44afa..39404d9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_10.html
@@ -1,8 +1,9 @@
-<html xmlns:wicket>
-<body>
-  <wicket:enclosure child="input">
-    <input wicket:id="input" type="checkbox" name="input"/>
-    <span wicket:id="label"></span>
-  </wicket:enclosure>
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  <wicket:enclosure child="input">
+    <input wicket:id="input" type="checkbox" name="input"/>
+    <span wicket:id="label"></span>
+  </wicket:enclosure>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_11.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_11.html
index 7df5326..7e500ff 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_11.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_11.html
@@ -1,12 +1,13 @@
-<html xmlns:wicket>
-<body>
-	<wicket:enclosure child="autoCreatedPanel">
-		<div>
-			<span wicket:id="autoCreatedPanel"><wicket:panel>
-	This is a simple test panel.
-	With this component: <span wicket:id="label">hello world</span>
-</wicket:panel></span>
-		</div>
-	</wicket:enclosure>
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+	<wicket:enclosure child="autoCreatedPanel">
+		<div>
+			<span wicket:id="autoCreatedPanel"><wicket:panel>
+	This is a simple test panel.
+	With this component: <span wicket:id="label">hello world</span>
+</wicket:panel></span>
+		</div>
+	</wicket:enclosure>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_12.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_12.html
index 76b66bd..32684ce 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_12.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_12.html
@@ -1,6 +1,7 @@
-<!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org">
-<body>
-  
-</body>
-</html>
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org">
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_13.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_13.html
index 76b66bd..32684ce 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_13.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_13.html
@@ -1,6 +1,7 @@
-<!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org">
-<body>
-  
-</body>
-</html>
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org">
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_2.html
index 1b7e3d9..e3328b2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_2.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <div wicket:id="example3">
     <h3>Example 3 using wicket:enclosure</h3>
     <span wicket:id="label1">label 1</span><br />
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html
index bd8e800..4379785 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_3.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="border"><wicket:border>
   before <wicket:body>
     <wicket:enclosure child="newLink">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_4-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_4-1.html
index 3436ffe..76bbdae 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_4-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_4-1.html
@@ -1,9 +1,10 @@
-<html xmlns:wicket>
-<body>
-  <wicket:enclosure child="foo:bar">
-    <div wicket:id="foo">
-      <div wicket:id="bar">bazqux</div>
-    </div>
-  </wicket:enclosure>
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  <wicket:enclosure child="foo:bar">
+    <div wicket:id="foo">
+      <div wicket:id="bar">bazqux</div>
+    </div>
+  </wicket:enclosure>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_4.html
index 2dbd626..d9ab491 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_4.html
@@ -1,5 +1,6 @@
-<html xmlns:wicket>
-<body>
-  
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_5-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_5-1.html
index 184544c..7c5c151 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_5-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_5-1.html
@@ -1,14 +1,15 @@
-<html>
-<body>
-This is in the super markup.<br>
-<wicket:child><wicket:extend>  
-  <wicket:enclosure child="foo:bar">
-    <div wicket:id="foo">
-      <div wicket:id="bar">bazqux</div>
-    </div>
-  </wicket:enclosure>
-</wicket:extend></wicket:child>
-This is in the super markup.<br>
-</body>
-</html>
-
+<html>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+This is in the super markup.<br>
+<wicket:child><wicket:extend>  
+  <wicket:enclosure child="foo:bar">
+    <div wicket:id="foo">
+      <div wicket:id="bar">bazqux</div>
+    </div>
+  </wicket:enclosure>
+</wicket:extend></wicket:child>
+This is in the super markup.<br>
+</body>
+</html>
+
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_5.html
index 06a14a0..ae72cf8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_5.html
@@ -1,10 +1,11 @@
-<html>
-<body>
-This is in the super markup.<br>
-<wicket:child><wicket:extend>  
-  
-</wicket:extend></wicket:child>
-This is in the super markup.<br>
-</body>
-</html>
-
+<html>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+This is in the super markup.<br>
+<wicket:child><wicket:extend>  
+  
+</wicket:extend></wicket:child>
+This is in the super markup.<br>
+</body>
+</html>
+
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_8.html
index c273670..6dd6464 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_8.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_8.html
@@ -1,5 +1,6 @@
-<html xmlns:wicket>
-    <body>
-        <wicket:enclosure child="container"><div wicket:id="container"></div></wicket:enclosure>
-    </body>
-</html>
+<html xmlns:wicket>
+    <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+        <wicket:enclosure child="container"><div wicket:id="container"></div></wicket:enclosure>
+    </body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
index 46bebb1..7e0d213 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <form wicket:id="form" id="form1" method="post" action="./page?2-3.-form">
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     <wicket:enclosure child="label">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
index beac698..fb5d7a9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <form wicket:id="form" id="form1" method="post" action="./page?1-2.-form">
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
index e113306..f7b2f26 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <form wicket:id="form" id="form1" method="post" action="./page?2-3.-form">
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
index 4b1d415..5c1411c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <form wicket:id="form" id="form1" method="post" action="./page?4-5.-form">
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
index 215e6e6..7c65d75 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <form wicket:id="form" id="form1" method="post" action="./page?5-6.-form">
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     <wicket:enclosure child="label">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
index 3b89d1b..3d9d410 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <form wicket:id="form" id="form1" method="post" action="./page?6-7.-form">
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     <wicket:enclosure child="label">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
index 5aed66f..7eb0611 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <form wicket:id="form" id="form1" method="post" action="./page?3-4.-form">
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     <wicket:enclosure child="label">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
index 9081a9d..4d63ebd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <form wicket:id="form" id="form1" method="post" action="./page?1-2.-form">
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     <wicket:enclosure child="label">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
index 601179f..947eaa9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <form wicket:id="form" id="form1" method="post" action="./page?0-1.-form">
     <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing -->
     <wicket:enclosure child="label">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureDifferentNamespaceExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureDifferentNamespaceExpectedResult.html
index 245f47d..a472438 100755
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureDifferentNamespaceExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureDifferentNamespaceExpectedResult.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 
 <!-- nested inline enclosures with separate child depths. -->
 <div id="w__InlineEnclosure__11193264691"><span>Test Label 1</span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
index 4bc7e17..406b7a6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./wicket/resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 
 <span id="wicket__InlineEnclosure__15719789331"> <span>Test Label 1</span> </span>
 
@@ -11,7 +12,7 @@
 	</table>
 </div>
 
-<span id="wicket__InlineEnclosure__15719789313" style="display:none" data-wicket-placeholder=""></span>
+<span id="wicket__InlineEnclosure__15719789313" class="wicket--hidden" data-wicket-placeholder=""></span>
 
 <div id="wicket__InlineEnclosure__15719789304">
 	<table>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_2.html
index bc6e4c6..6fcc322 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_2.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 
 <!-- nested inline enclosures with separate child depths. -->
 <div id="wicket__InlineEnclosure__15719789021"><span>Test Label 1</span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePanelPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePanelPageExpectedResult.html
index 9b8cf1a..65d4910 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePanelPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePanelPageExpectedResult.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 	<div id="wicket__InlineEnclosure_12175729931">
 		<div>
 			<div>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
index a3ed468..1e84076 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java
@@ -25,6 +25,7 @@ import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.Page;
 import org.apache.wicket.markup.parser.filter.InlineEnclosureHandler;
 import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.resource.caching.NoOpResourceCachingStrategy;
 import org.apache.wicket.util.tester.WicketTestCase;
 import org.apache.wicket.util.visit.IVisit;
 import org.apache.wicket.util.visit.IVisitor;
@@ -154,6 +155,7 @@ class InlineEnclosureTest extends WicketTestCase
 			protected void init()
 			{
 				getMarkupSettings().setStripWicketTags(true);
+				getResourceSettings().setCachingStrategy(NoOpResourceCachingStrategy.INSTANCE);
 			}
 		};
 	}
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html
index 330445e..17dd172 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html
@@ -17,10 +17,11 @@
 -->
 <!DOCTYPE html>
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 	<title>Wicket 4520</title>
 </head>
 <body>
-	<div id="wicket__message__attr___4340036351" style="display:none" data-wicket-placeholder=""></div>
+	<div id="wicket__message__attr___4340036351" class="wicket--hidden" data-wicket-placeholder=""></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html
index e7f6a18..ffa14c0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html
@@ -17,7 +17,8 @@
 -->
 <!DOCTYPE html>
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 	<title>Wicket 4520</title>
 </head>
 <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java
index 12a09c3..8bd4eb8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java
@@ -162,7 +162,7 @@ class TogglePageTest extends WicketTestCase
 		String inlineEnclosureIdPrefix = "wicket__InlineEnclosure_";
 
 		String inlineEnclosureHiddenPattern = "<tr id=\"" + inlineEnclosureIdPrefix +
-			"\\w+\" style=\"display:none\" data-wicket-placeholder=\"\"></tr>";
+			"\\w+\" class=\"wicket--hidden\" data-wicket-placeholder=\"\"></tr>";
 
 		String inlineEnclosureVisiblePattern = "<tr bgcolor=\"red\" id=\"" +
 			inlineEnclosureIdPrefix + "\\w+\">";
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
index fcf1cad..5a26a54 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Mock Page</title>
 </head>
 <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html
index a1e1633..ab5f4d0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html
@@ -1,5 +1,6 @@
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Mock Page</title>
 </head>
 <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_3.html
index 537e845..53daf6c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_3.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <wicket:link autolink="true">
   <a href="./org.apache.wicket.markup.html.link.XmlPage">Home</a>
 </wicket:link>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_4.html
index c5d240a..bcd4b41 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_4.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <wicket:link autolink="true">
   <!-- File/page does not exist => Do not change href at all -->
   <a href="PageDoesNotExist.html">Home</a>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_5.html
index a8462cc..d4153c9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_5.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <wicket:link autolink="true">
   <img src="../resource/org.apache.wicket.markup.html.link.AutolinkPage_5/subdir/apache-wicket.png"/>
   <!-- image does not exist => Do not change at all -->
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
index bbbd6e1..3164262 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <a wicket:id="defaulthompage" href="../../"></a>
   <a wicket:id="defaulthompagewithparams" href="../..?param1=1&amp;param2=test"></a>
   <a wicket:id="defaulthompagewithpagemap" href="../../"></a>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
index 4988479..29269cf 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
@@ -82,7 +82,8 @@ class BookmarkablePageLinkTest extends WicketTestCase
 		tester.startComponentInPage(link, null);
 		String response = tester.getLastResponse().getDocument();
 		assertEquals(
-			"<html><body><span wicket:id=\"link\" onclick=\"var win = this.ownerDocument.defaultView || this.ownerDocument.parentWindow; if (win == window) { window.location.href=&#039;./bookmarkable/org.apache.wicket.MockPageWithLink?urlEscapeNeeded=someone%27s+%5Eb%25a%26d+pa%22rameter&#039;; } ;return false\"></span></body></html>",
+			"<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css\" />\n" + 
+			"</head><body><span wicket:id=\"link\" onclick=\"var win = this.ownerDocument.defaultView || this.ownerDocument.parentWindow; if (win == window) { window.location.href=&#039;./bookmarkable/org.apache.wicket.MockPageWithLink?urlEscapeNeeded=someone%27s+%5Eb%25a%26d+pa%22rameter&#039;; } ;return false\"></span></body></html>",
 			response);
 	}
 }
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapPageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapPageExpectedResult_1.html
index 6462b3d..55fbfd8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapPageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapPageExpectedResult_1.html
@@ -1,11 +1,12 @@
-<html xmlns:wicket>
-<head>
-<title>Mock Page</title>
-</head>
-<body>
-<img wicket:id="image" src="../resource/org.apache.wicket.markup.html.image.ImageTest/Beer.gif" usemap="#map1"/>
-<map wicket:id="map" id="map1" name="map1"><wicket:panel>
-		<area wicket:id="area" href="http://wicket.apache.org" shape="circle" coords="0,0,10"/><area wicket:id="area" href="http://wicket.apache.org" shape="rect" coords="0,0,10,10"/><area wicket:id="area" href="http://wicket.apache.org" shape="poly" coords="0,0,10,0,10,10,0,10"/><area wicket:id="area" href="http://wicket.apache.org" shape="poly" coords="0,0,10,0,10,10,0,10,0,0,0,0"/>
-	</wicket:panel></map>
-</body>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
+<title>Mock Page</title>
+</head>
+<body>
+<img wicket:id="image" src="../resource/org.apache.wicket.markup.html.image.ImageTest/Beer.gif" usemap="#map1"/>
+<map wicket:id="map" id="map1" name="map1"><wicket:panel>
+		<area wicket:id="area" href="http://wicket.apache.org" shape="circle" coords="0,0,10"/><area wicket:id="area" href="http://wicket.apache.org" shape="rect" coords="0,0,10,10"/><area wicket:id="area" href="http://wicket.apache.org" shape="poly" coords="0,0,10,0,10,10,0,10"/><area wicket:id="area" href="http://wicket.apache.org" shape="poly" coords="0,0,10,0,10,10,0,10,0,0,0,0"/>
+	</wicket:panel></map>
+</body>
 </html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_1.html
index 2a27ba0..180a5f1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_1.html
@@ -1,8 +1,9 @@
-<html xmlns:wicket>
-<head>
-<title>Mock Page</title>
-</head>
-<body>
-<a href="http://wicket.apache.org" wicket:id="myLink">myLink</a>
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
+<title>Mock Page</title>
+</head>
+<body>
+<a wicket:id="myLink" href="http://wicket.apache.org">myLink</a>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_2.html
index 3983b09..b45828c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkPageExpectedResult_2.html
@@ -1,8 +1,9 @@
-<html xmlns:wicket>
-<head>
-<title>Mock Page</title>
-</head>
-<body>
-
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
+<title>Mock Page</title>
+</head>
+<body>
+
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_1-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_1-1.html
index 3db78cd..8a7cf40 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_1-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_1-1.html
@@ -13,8 +13,9 @@
     limitations under the License.
 -->
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  <a href="myHref.html"></a>
   <a href="myHref.html"></a>
-  <a href="myHref.html"/>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_1.html
index 09e6859..1b36fa6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_1.html
@@ -13,8 +13,9 @@
     limitations under the License.
 -->
 <html>
-<body>
-  <a href="myHref.html" wicket:id="link1"></a>
-  <a href="myHref.html" wicket:id="link2"/>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  <a wicket:id="link1" href="myHref.html"></a>
+  <a wicket:id="link2" href="myHref.html"></a>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_2.html
index a1cac60..8a7cf40 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_2.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <a href="myHref.html"></a>
   <a href="myHref.html"></a>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_3.html
index bb945e4..edaa3d6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefExpectedResult_3.html
@@ -13,8 +13,9 @@
     limitations under the License.
 -->
 <html>
-<body>
-  <a href="myHref.html" wicket:id="link1"></a>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  <a wicket:id="link1" href="myHref.html"></a>
   
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
index 41bbbe0..3058a5f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-1.html
@@ -1,5 +1,6 @@
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
index 87dd203..29cbed5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1-2.html
@@ -1,5 +1,6 @@
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
index 7919591..026e02f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
@@ -1,5 +1,6 @@
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
index f12d478..8edcef2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
index 7e99d6b..1270d5e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
index ce5ecc1..2cbd359 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
index ef21d53..2c8a8d9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">seven</span></li><li wicket:id="table"><span wicket:id="txt">eight</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
index f923671..f9a0676 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
index 4dd54c4..2dff2d9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
index 67c5eda..387d234 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
index 16a0713..299dd62 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
index ef2d624..992fa88 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
@@ -35,7 +36,7 @@
 	</span><span wicket:id="navigation" class="goto">
 		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" rel="next" class="next"  href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-next" title="Go to next page">&gt;</a>
 	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
index fe5f497..b2dc5a7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
@@ -35,7 +36,7 @@
 	</span><span wicket:id="navigation" class="goto">
 		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" rel="next" class="next"  href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-next" title="Go to next page">&gt;</a>
 	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
index 9b9e17e..07f97ca 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
@@ -35,7 +36,7 @@
 	</span><span wicket:id="navigation" class="goto">
 		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" rel="next" class="next"  href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-next" title="Go to next page">&gt;</a>
 	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
index c134259..926ba0c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">thirteen</span></li><li wicket:id="table"><span wicket:id="txt">fourteen</span></li></ul>
@@ -35,7 +36,7 @@
 	</span><span wicket:id="navigation" class="goto">
 		<a wicket:id="pageLink" disabled="disabled" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" rel="next" class="next"  disabled="disabled" title="Go to next page">&gt;</a>
+	<a wicket:id="next" rel="next" class="next" disabled="disabled" title="Go to next page">&gt;</a>
 	<a wicket:id="last" class="last" disabled="disabled" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
index 17eb825..14ce01b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
@@ -35,7 +36,7 @@
 	</span><span wicket:id="navigation" class="goto">
 		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" rel="next" class="next"  href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-next" title="Go to next page">&gt;</a>
 	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
index e34cf49..8aadfc2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">seven</span></li><li wicket:id="table"><span wicket:id="txt">eight</span></li></ul>
@@ -35,7 +36,7 @@
 	</span><span wicket:id="navigation" class="goto">
 		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" rel="next" class="next"  href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-next" title="Go to next page">&gt;</a>
 	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
index 3002d40..4c4a302 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
@@ -35,7 +36,7 @@
 	</span><span wicket:id="navigation" class="goto">
 		<a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-6-pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
 	</span>
-	<a wicket:id="next" rel="next" class="next"  href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-next" title="Go to next page">&gt;</a>
+	<a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-next" title="Go to next page">&gt;</a>
 	<a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-last" title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
index 0aab7be..9ffc3bb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
index ef8fc2b..ca788ab 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li wicket:id="table"><span wicket:id="txt">four</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
index be86a2d..51982fc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
index da8b43a..099cbdb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">thirteen</span></li><li wicket:id="table"><span wicket:id="txt">fourteen</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
index b54a64a..e1dd6b9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
@@ -13,13 +13,14 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-	<a wicket:id="first" disabled="disabled" class="first" title="Go to first page">&lt;&lt;</a>
-	<a wicket:id="prev" rel="prev" disabled="disabled" class="prev" title="Go to previous page">&lt;</a>
+	<a wicket:id="first" class="first" disabled="disabled" title="Go to first page">&lt;&lt;</a>
+	<a wicket:id="prev" rel="prev" class="prev" disabled="disabled" title="Go to previous page">&lt;</a>
 	<span wicket:id="navigation" class="goto">
 		<a wicket:id="pageLink" disabled="disabled" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
 	</span>, <span wicket:id="navigation" class="goto">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html
index 8405f4d..ca0183c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">seven</span></li><li wicket:id="table"><span wicket:id="txt">eight</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html
index c7c162b..58d4cf8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePageExpectedResult_1.html
index f681cf9..f642267 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePageExpectedResult_1.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Simple Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li><li wicket:id="table"><span wicket:id="txt">three</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePageExpectedResult_2.html
index f681cf9..f642267 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePageExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTablePageExpectedResult_2.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 <title>Simple Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li wicket:id="table"><span wicket:id="txt">two</span></li><li wicket:id="table"><span wicket:id="txt">three</span></li></ul>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest_cssClasses_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest_cssClasses_expected.html
index 3aa7018..72976f8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest_cssClasses_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest_cssClasses_expected.html
@@ -1,4 +1,5 @@
-<body>
+<head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <div wicket:id="feedback"><wicket:panel>
   <ul wicket:id="feedbackul" class="feedbackPanel">
     <li wicket:id="messages" class="feedbackPanelERROR">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_1.html
index bf3d66f..7562841 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_1.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="myPanel1">panel 1</span>
   <span wicket:id="myPanel2">panel 2</span>
   
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_2.html
index 7e21ad6..d7e5858 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_2.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="myPanel1">
     aaa<span wicket:id="label1">my label text</span>bbb
   </span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_3.html
index 862093d..a753b29 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_3.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="test-panel"><wicket:panel><span wicket:id="child">child fragment</span></wicket:panel></span>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_4.html
index a705455..4e399d6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_4.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="myPanel"><wicket:panel>
   <span wicket:id="myPanel1">panel 1</span>
   <span wicket:id="myPanel2">panel 2</span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_5.html
index 84a8d46..96bf980 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_5.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="myPanel1">panel 1</span>
   <span wicket:id="myPanel2">panel 2</span>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_6.html
index 59b1848..03d5260 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_6.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="myPanel">fragment</span>
   <span wicket:id="markupcontainer">
     
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
index 365ba0f..4f9a4f9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
@@ -11,7 +12,7 @@ Wicket.Log.enabled=true;
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.InlinePanelPage_7?0";
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_7?0-1.0-provider-ajaxRefresh","c":"ajaxRefresh1","e":"click"});;
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
index 34ad3cc9..059de97 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" id="wicket-ajax-debug-enable">
 /*<![CDATA[*/
@@ -11,7 +12,7 @@ Wicket.Log.enabled=true;
 Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.InlinePanelPage_8?0";
 /*]]>*/
 </script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_8?0-1.0-add","c":"add1","e":"click"});;
@@ -23,7 +24,7 @@ Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND);
 
 <div wicket:id="first">
   <span wicket:id="number">0</span><br/>
-  <div id="nextContainer2" style="display:none" data-wicket-placeholder=""></div>
+  <div id="nextContainer2" class="wicket--hidden" data-wicket-placeholder=""></div>
 </div>
 <a wicket:id="add" id="add1" href="javascript:;">Add</a>
 
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_3.html
index ad5f571..4738bd6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_3.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="myPanel3"><wicket:panel>
 <table>
 <tr><td>Foo1</td><td><wicket:message key="foo1">panel.foo1 from page.properties</wicket:message></td></tr>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_4.html
index 8094471..fc70542 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_4.html
@@ -1,21 +1,22 @@
-<!--
-    ====================================================================
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<html xmlns:wicket>
-<body>
-  <span wicket:id="myPanel3" param1="xxx"><wicket:panel param1="xxx">
-  test 
-</wicket:panel></span>
-</body>
-</html>
+<!--
+    ====================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  <span wicket:id="myPanel3" param1="xxx"><wicket:panel param1="xxx">
+  test 
+</wicket:panel></span>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelWithAttributeModifierPageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelWithAttributeModifierPageExpectedResult_1.html
index bab5f2e..5e7a04c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelWithAttributeModifierPageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelWithAttributeModifierPageExpectedResult_1.html
@@ -1 +1,2 @@
-<html><body><span class="test" wicket:id="myPanel"><wicket:panel>test panel</wicket:panel></span></body></html>
\ No newline at end of file
+<html><head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body><span wicket:id="myPanel" class="test"><wicket:panel>test panel</wicket:panel></span></body></html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
index b0f896d..da4a51b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.tags.InputTagNotVisibleWebPage?0-1.-form">
 
 </form>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
index cef08bc..3243d3c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.tags.InputTagVisibleWebPage?0-1.-form">
 <input wicket:id="input" type="text" value="" name="input">
 </form>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/PageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/PageExpectedResult_1.html
index ecf5cbd..f753e2d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/PageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/PageExpectedResult_1.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+
 
 <!DOCTYPE html 
     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
@@ -8,7 +8,8 @@
     xmlns:wicket="http://wicket.apache.org" 
     xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="myLabel">Test Label</span>
   <span wicket:id="test">body<span wicket:id="myLabel2">Test Label2</span></span>
   <span wicket:id="test2">Whatever</span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/PageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/PageExpectedResult_2.html
index d1932d6..e6a8366 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/PageExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/PageExpectedResult_2.html
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+
 
 <!DOCTYPE html 
     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
@@ -8,7 +8,8 @@
     xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd" 
     xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="myLabel">Test Label</span>
   <span wicket:id="test">body<span wicket:id="myLabel2">Test Label2</span></span>
   <span wicket:id="test2">Whatever</span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/PageExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/PageExpectedResult_3.html
index 377ba9b..ec5bac9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/PageExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/PageExpectedResult_3.html
@@ -1,19 +1,20 @@
-<!--
-    ====================================================================
-    LICENSED UNDER THE APACHE LICENSE, VERSION 2.0 (THE "LICENSE");
-    YOU MAY NOT USE THIS FILE EXCEPT IN COMPLIANCE WITH THE LICENSE.
-    YOU MAY OBTAIN A COPY OF THE LICENSE AT
-
-     HTTP://WWW.APACHE.ORG/LICENSES/LICENSE-2.0
-
-    UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, SOFTWARE
-    DISTRIBUTED UNDER THE LICENSE IS DISTRIBUTED ON AN "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    SEE THE LICENSE FOR THE SPECIFIC LANGUAGE GOVERNING PERMISSIONS AND
-    LIMITATIONS UNDER THE LICENSE.
--->
-<HTML XMLNS:WICKET>
-<BODY>
-  THIS IS THE BODY
-</BODY>
-</HTML>
+<!--
+    ====================================================================
+    LICENSED UNDER THE APACHE LICENSE, VERSION 2.0 (THE "LICENSE");
+    YOU MAY NOT USE THIS FILE EXCEPT IN COMPLIANCE WITH THE LICENSE.
+    YOU MAY OBTAIN A COPY OF THE LICENSE AT
+
+     HTTP://WWW.APACHE.ORG/LICENSES/LICENSE-2.0
+
+    UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, SOFTWARE
+    DISTRIBUTED UNDER THE LICENSE IS DISTRIBUTED ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    SEE THE LICENSE FOR THE SPECIFIC LANGUAGE GOVERNING PERMISSIONS AND
+    LIMITATIONS UNDER THE LICENSE.
+-->
+<HTML XMLNS:WICKET>
+<HEAD><LINK REL="STYLESHEET" TYPE="TEXT/CSS" HREF="../RESOURCE/ORG.APACHE.WICKET.CSS.WICKETCORECSSRESOURCEREFERENCE/WICKET-CORE.CSS" />
+</HEAD><BODY>
+  THIS IS THE BODY
+</BODY>
+</HTML>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_1.html
index 0c74830..2088ef5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_1.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <a href="../../myImage.gif">mein Label</a>
   <a href="/myImage.gif">mein Label</a>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_2.html
index bf80b71..d6a7cda 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_2.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <a href="#1">mein Label</a>
   <a href="../../test.html#1">mein Label</a>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_3.html
index 150ee29..92a245d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/PageExpectedResult_3.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span background="../../images/bg.jpg"> 
     <p wicket:id="myname">Hello</p>
   </span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageExpectedResult.html
index ff42ef8..e59751f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageExpectedResult.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-    <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.markup.parser.filter.PanelWithHeaderPart/test.css" />
+    <head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.markup.parser.filter.PanelWithHeaderPart/test.css" />
 <script type="text/javascript" src="../resource/org.apache.wicket.markup.parser.filter.PanelWithHeaderPart/test.js"></script>
 
         <title wicket:id="title">Header Part Test</title>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DynamicMarkupPageWithNonClosedTags_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DynamicMarkupPageWithNonClosedTags_expected.html
index 462aa7c..b87bbab 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DynamicMarkupPageWithNonClosedTags_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DynamicMarkupPageWithNonClosedTags_expected.html
@@ -1 +1,2 @@
-<html><body><span wicket:id="label"><img alt="logo" src="../logo.png"><br>Some text<br>Some more text</span></body></html>
\ No newline at end of file
+<html><head><link rel="stylesheet" type="text/css" href="./resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body><span wicket:id="label"><img alt="logo" src="../logo.png"><br>Some text<br>Some more text</span></body></html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_1.html
index e904212..70ede85 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_1.html
@@ -14,6 +14,7 @@
 -->
 <html xmlns:wicket>
 <!-- no header section -->
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_10.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_10.html
index 2c04b8a..35919c0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_10.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_10.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<head>panel header
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+panel header
   <!-- insert header even though no <wicket:head> is given -->
 </head>
 <body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_11.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_11.html
index 5714909..b8b411d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_11.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_11.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<head>text added by contributor</head><body>
+<head>text added by contributor<link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
   <span wicket:id="label">mein Label</span>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_14.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_14.html
index 41e5bff..e348c77 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_14.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_14.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   <meta http-equiv="content-type" content="text/html;charset=UTF-8"></meta>
   <link rel="stylesheet" href="../../style.css" type="text/css"></link>
 
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_15.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_15.html
index ca76eb7..117d80f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_15.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_15.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   <span wicket:id="aContainer">
     <span wicket:id="aLabel">Mein Test</span>
   </span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_16.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_16.html
index 1dc941f..177e739 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_16.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_16.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<head>header<span wicket:id="label">my label text</span></head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+header<span wicket:id="label">my label text</span></head>
 <body>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_17.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_17.html
index 29e335a..703123f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_17.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_17.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   <span wicket:id="foo">Mein Test</span>
 </head><body>
   <span wicket:id="foo"><wicket:panel>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_18.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_18.html
index dc40585..e87a7a1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_18.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_18.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<head>header
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+header
    - wicket header 1 - 
    - wicket header 2 - 
 </head>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_19.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_19.html
index 6f8bc12..9486abe 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_19.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_19.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   <span wicket:id="foo1">1111</span>
 
   <span wicket:id="foo2">2222</span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_2.html
index 03bf5c9..8a493bd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_2.html
@@ -14,7 +14,8 @@
 -->
 <html xmlns:wicket>
 <!-- head without <wicket:head> -->
-<head>header</head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+header</head>
 <body>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_20.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_20.html
index 57bffc7..2c559d3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_20.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_20.html
@@ -1,21 +1,22 @@
-<!--
-    ====================================================================
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<html xmlns:wicket>
-<!-- no header section -->
-<head>should be rendered only once</head><body>
-	<span wicket:id="label1"></span>
-	<span wicket:id="label2"></span>
-</body>
-</html>
+<!--
+    ====================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html xmlns:wicket>
+<!-- no header section -->
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+should be rendered only once</head><body>
+	<span wicket:id="label1"></span>
+	<span wicket:id="label2"></span>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_3.html
index 3771438..e9be174 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_3.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<head>header - wicket header - </head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+header - wicket header - </head>
 <body>
 </body>
 </html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_4.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_4.html
index ae28a4e..aa564f9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_4.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_4.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<head>panel header - header - wicket header</head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+panel header - header - wicket header</head>
 <body>
   <span wicket:id="panel"><wicket:panel>
   panel
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_5.html
index 152523c..8f1df8e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_5.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<head> border header  - header - wicket header</head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+ border header  - header - wicket header</head>
 <body>
   <span wicket:id="border"><wicket:border>
   vorher <wicket:body> my body </wicket:body> nachher
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_6.html
index a8a9d08..6e47c03 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_6.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<head>panel header border header - header - wicket header</head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+panel header border header - header - wicket header</head>
 <body>
   <span wicket:id="panel1"><wicket:panel>
   panel
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_7.html
index c034a1b..e2bfa65 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_7.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_7.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<head>my Label header - header - wicket header</head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+my Label header - header - wicket header</head>
 <body>
   <span wicket:id="label">mein Label</span>
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_8.html
index e0830c3..2e3b937 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_8.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_8.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<head>panel header - header - wicket header
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+panel header - header - wicket header
   <!-- validate that components in <head> get resolved -->
   <link wicket:id="cssHref" media="print,type" type="css" href="myStyle.css"/>
 </head>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9.html
index 152cbee..16ac411 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   panel header 
   <link wicket:id="cssHref" media="print,type" type="css" href="myStyle.css"/>
   <wicket:link autolink="true">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9a.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9a.html
index 21001a5..aab84a0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9a.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPageExpectedResult_9a.html
@@ -13,7 +13,8 @@
     limitations under the License.
 -->
 <html xmlns:wicket>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
   panel header 
   
   <wicket:link autolink="true">
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderPageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderPageExpectedResult_1.html
index 22a4222..bc99674 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderPageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderPageExpectedResult_1.html
@@ -1,13 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket=http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-</head>
-<body class="background_image">
-
-<div id="container" style="display:block; position:absolute; top: 10px; left: 0px;width: 100%; margin: 0 auto;">
-	<div style="float: left;" id="left_top_border"></div>
-	<i style="display: none;"></i>
-</div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket=http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+</head>
+<body class="background_image">
+
+<div id="container" style="display:block; position:absolute; top: 10px; left: 0px;width: 100%; margin: 0 auto;">
+	<div style="float: left;" id="left_top_border"></div>
+	<i style="display: none;"></i>
+</div>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/PageWithScriptTemplate_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/PageWithScriptTemplate_expected.html
index b68cb50..1528e19 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/PageWithScriptTemplate_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/PageWithScriptTemplate_expected.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 	<meta charset="utf-8" />
 	<title>Apache Wicket Quickstart</title>
 	<link href='http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:regular,bold' rel='stylesheet' type='text/css' />
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1_ExpectedResult.html_2 b/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1_ExpectedResult.html_2
index 2d1f8b0..d06efa3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1_ExpectedResult.html_2
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1_ExpectedResult.html_2
@@ -1,38 +1,39 @@
-<html xmlns:wicket>
-<head><link rel="stylesheet" type="text/css" href="../../container1.css" />
-<link rel="stylesheet" type="text/css" href="../../container2_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container2.css" />
-<link rel="stylesheet" type="text/css" href="../../container3_1_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container3_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container3.css" />
-<link rel="stylesheet" type="text/css" href="../../container4_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container4_2_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container4_2.css" />
-<link rel="stylesheet" type="text/css" href="../../container4_3_1_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container4_3_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container4_3.css" />
-<link rel="stylesheet" type="text/css" href="../../container4.css" />
-<link rel="stylesheet" type="text/css" href="../../SimplePage1.css" />
-</head><body>
- <span wicket:id="container1"></span>
- <span wicket:id="container2">
- 	<span wicket:id="container2_1"></span>
- </span>
- <span wicket:id="container3">
-	<span wicket:id="container3_1">
- 		<span wicket:id="container3_1_1"></span>
- 	</span>
- </span>
- <span wicket:id="container4">
-	 <span wicket:id="container4_1"></span>
-	 <span wicket:id="container4_2">
-	 	<span wicket:id="container4_2_1"></span>
-	 </span>
-	 <span wicket:id="container4_3">
-		<span wicket:id="container4_3_1">
-	 		<span wicket:id="container4_3_1_1"></span>
-	 	</span>
-	 </span>
- </span>
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<link rel="stylesheet" type="text/css" href="../../container1.css" />
+<link rel="stylesheet" type="text/css" href="../../container2_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container2.css" />
+<link rel="stylesheet" type="text/css" href="../../container3_1_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container3_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container3.css" />
+<link rel="stylesheet" type="text/css" href="../../container4_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container4_2_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container4_2.css" />
+<link rel="stylesheet" type="text/css" href="../../container4_3_1_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container4_3_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container4_3.css" />
+<link rel="stylesheet" type="text/css" href="../../container4.css" />
+<link rel="stylesheet" type="text/css" href="../../SimplePage1.css" />
+</head><body>
+ <span wicket:id="container1"></span>
+ <span wicket:id="container2">
+ 	<span wicket:id="container2_1"></span>
+ </span>
+ <span wicket:id="container3">
+	<span wicket:id="container3_1">
+ 		<span wicket:id="container3_1_1"></span>
+ 	</span>
+ </span>
+ <span wicket:id="container4">
+	 <span wicket:id="container4_1"></span>
+	 <span wicket:id="container4_2">
+	 	<span wicket:id="container4_2_1"></span>
+	 </span>
+	 <span wicket:id="container4_3">
+		<span wicket:id="container4_3_1">
+	 		<span wicket:id="container4_3_1_1"></span>
+	 	</span>
+	 </span>
+ </span>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2_ExpectedResult.html_2 b/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2_ExpectedResult.html_2
index b643bcc..6126ac4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2_ExpectedResult.html_2
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2_ExpectedResult.html_2
@@ -1,96 +1,97 @@
-<html xmlns:wicket>
-<head><link rel="stylesheet" type="text/css" href="../../container1.css" />
-<link rel="stylesheet" type="text/css" href="../../container2_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container2.css" />
-<link rel="stylesheet" type="text/css" href="../../container3_1_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container3_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container3.css" />
-<link rel="stylesheet" type="text/css" href="../../container4_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container4_2_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container4_2.css" />
-<link rel="stylesheet" type="text/css" href="../../container4_3_1_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container4_3_1.css" />
-<link rel="stylesheet" type="text/css" href="../../container4_3.css" />
-<link rel="stylesheet" type="text/css" href="../../container4.css" />
-<link rel="stylesheet" type="text/css" href="../../pre_container1.css" />
-<link rel="stylesheet" type="text/css" href="../../pre_container2_1.css" />
-<link rel="stylesheet" type="text/css" href="../../pre_container2.css" />
-<link rel="stylesheet" type="text/css" href="../../pre_container3_1_1.css" />
-<link rel="stylesheet" type="text/css" href="../../pre_container3_1.css" />
-<link rel="stylesheet" type="text/css" href="../../pre_container3.css" />
-<link rel="stylesheet" type="text/css" href="../../pre_container4_1.css" />
-<link rel="stylesheet" type="text/css" href="../../pre_container4_2_1.css" />
-<link rel="stylesheet" type="text/css" href="../../pre_container4_2.css" />
-<link rel="stylesheet" type="text/css" href="../../pre_container4_3_1_1.css" />
-<link rel="stylesheet" type="text/css" href="../../pre_container4_3_1.css" />
-<link rel="stylesheet" type="text/css" href="../../pre_container4_3.css" />
-<link rel="stylesheet" type="text/css" href="../../pre_container4.css" />
-<link rel="stylesheet" type="text/css" href="../../SimplePanel1.css" />
-<link rel="stylesheet" type="text/css" href="../../SimplePage2.css" />
-</head><body>
- <span wicket:id="container1"></span>
- <span wicket:id="container2">
- 	<span wicket:id="container2_1"></span>
- </span>
- <span wicket:id="container3">
-	<span wicket:id="container3_1">
- 		<span wicket:id="container3_1_1"></span>
- 	</span>
- </span>
- <span wicket:id="container4">
-	 <span wicket:id="container4_1"></span>
-	 <span wicket:id="container4_2">
-	 	<span wicket:id="container4_2_1"></span>
-	 </span>
-	 <span wicket:id="container4_3">
-		<span wicket:id="container4_3_1">
-	 		<span wicket:id="container4_3_1_1"></span>
-	 	</span>
-	 </span>
- </span>
- <span wicket:id="panel1"><wicket:panel>
- <span wicket:id="container1"></span>
- <span wicket:id="container2">
- 	<span wicket:id="container2_1"></span>
- </span>
- <span wicket:id="container3">
-	<span wicket:id="container3_1">
- 		<span wicket:id="container3_1_1"></span>
- 	</span>
- </span>
- <span wicket:id="container4">
-	 <span wicket:id="container4_1"></span>
-	 <span wicket:id="container4_2">
-	 	<span wicket:id="container4_2_1"></span>
-	 </span>
-	 <span wicket:id="container4_3">
-		<span wicket:id="container4_3_1">
-	 		<span wicket:id="container4_3_1_1"></span>
-	 	</span>
-	 </span>
- </span>
- 
- <span wicket:id="pre_container1"></span>
- <span wicket:id="pre_container2">
- 	<span wicket:id="pre_container2_1"></span>
- </span>
- <span wicket:id="pre_container3">
-	<span wicket:id="pre_container3_1">
- 		<span wicket:id="pre_container3_1_1"></span>
- 	</span>
- </span>
- <span wicket:id="pre_container4">
-	 <span wicket:id="pre_container4_1"></span>
-	 <span wicket:id="pre_container4_2">
-	 	<span wicket:id="pre_container4_2_1"></span>
-	 </span>
-	 <span wicket:id="pre_container4_3">
-		<span wicket:id="pre_container4_3_1">
-	 		<span wicket:id="pre_container4_3_1_1"></span>
-	 	</span>
-	 </span>
- </span>
- 
-</wicket:panel></span>
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<link rel="stylesheet" type="text/css" href="../../container1.css" />
+<link rel="stylesheet" type="text/css" href="../../container2_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container2.css" />
+<link rel="stylesheet" type="text/css" href="../../container3_1_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container3_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container3.css" />
+<link rel="stylesheet" type="text/css" href="../../container4_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container4_2_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container4_2.css" />
+<link rel="stylesheet" type="text/css" href="../../container4_3_1_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container4_3_1.css" />
+<link rel="stylesheet" type="text/css" href="../../container4_3.css" />
+<link rel="stylesheet" type="text/css" href="../../container4.css" />
+<link rel="stylesheet" type="text/css" href="../../pre_container1.css" />
+<link rel="stylesheet" type="text/css" href="../../pre_container2_1.css" />
+<link rel="stylesheet" type="text/css" href="../../pre_container2.css" />
+<link rel="stylesheet" type="text/css" href="../../pre_container3_1_1.css" />
+<link rel="stylesheet" type="text/css" href="../../pre_container3_1.css" />
+<link rel="stylesheet" type="text/css" href="../../pre_container3.css" />
+<link rel="stylesheet" type="text/css" href="../../pre_container4_1.css" />
+<link rel="stylesheet" type="text/css" href="../../pre_container4_2_1.css" />
+<link rel="stylesheet" type="text/css" href="../../pre_container4_2.css" />
+<link rel="stylesheet" type="text/css" href="../../pre_container4_3_1_1.css" />
+<link rel="stylesheet" type="text/css" href="../../pre_container4_3_1.css" />
+<link rel="stylesheet" type="text/css" href="../../pre_container4_3.css" />
+<link rel="stylesheet" type="text/css" href="../../pre_container4.css" />
+<link rel="stylesheet" type="text/css" href="../../SimplePanel1.css" />
+<link rel="stylesheet" type="text/css" href="../../SimplePage2.css" />
+</head><body>
+ <span wicket:id="container1"></span>
+ <span wicket:id="container2">
+ 	<span wicket:id="container2_1"></span>
+ </span>
+ <span wicket:id="container3">
+	<span wicket:id="container3_1">
+ 		<span wicket:id="container3_1_1"></span>
+ 	</span>
+ </span>
+ <span wicket:id="container4">
+	 <span wicket:id="container4_1"></span>
+	 <span wicket:id="container4_2">
+	 	<span wicket:id="container4_2_1"></span>
+	 </span>
+	 <span wicket:id="container4_3">
+		<span wicket:id="container4_3_1">
+	 		<span wicket:id="container4_3_1_1"></span>
+	 	</span>
+	 </span>
+ </span>
+ <span wicket:id="panel1"><wicket:panel>
+ <span wicket:id="container1"></span>
+ <span wicket:id="container2">
+ 	<span wicket:id="container2_1"></span>
+ </span>
+ <span wicket:id="container3">
+	<span wicket:id="container3_1">
+ 		<span wicket:id="container3_1_1"></span>
+ 	</span>
+ </span>
+ <span wicket:id="container4">
+	 <span wicket:id="container4_1"></span>
+	 <span wicket:id="container4_2">
+	 	<span wicket:id="container4_2_1"></span>
+	 </span>
+	 <span wicket:id="container4_3">
+		<span wicket:id="container4_3_1">
+	 		<span wicket:id="container4_3_1_1"></span>
+	 	</span>
+	 </span>
+ </span>
+ 
+ <span wicket:id="pre_container1"></span>
+ <span wicket:id="pre_container2">
+ 	<span wicket:id="pre_container2_1"></span>
+ </span>
+ <span wicket:id="pre_container3">
+	<span wicket:id="pre_container3_1">
+ 		<span wicket:id="pre_container3_1_1"></span>
+ 	</span>
+ </span>
+ <span wicket:id="pre_container4">
+	 <span wicket:id="pre_container4_1"></span>
+	 <span wicket:id="pre_container4_2">
+	 	<span wicket:id="pre_container4_2_1"></span>
+	 </span>
+	 <span wicket:id="pre_container4_3">
+		<span wicket:id="pre_container4_3_1">
+	 		<span wicket:id="pre_container4_3_1_1"></span>
+	 	</span>
+	 </span>
+ </span>
+ 
+</wicket:panel></span>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleContainerPageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleContainerPageExpectedResult_1.html
index 1a25e20..9b9d7a0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleContainerPageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleContainerPageExpectedResult_1.html
@@ -1,10 +1,11 @@
-<html xmlns:wicket>
-<body>
-  <table>
-   <wicket:container wicket:id="repeater">
-    <tr><td>...</td></tr>
-    <tr><td>...</td></tr>
-   </wicket:container>
-</table>
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  <table>
+   <wicket:container wicket:id="repeater">
+    <tr><td>...</td></tr>
+    <tr><td>...</td></tr>
+   </wicket:container>
+</table>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_1.html
index 7254249..6024fb6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_1.html
@@ -1,18 +1,19 @@
-<html xmlns:wicket>
-<body>
-  <wicket:message key="myKeyNotExsts">Default Text</wicket:message>
-  <wicket:message key="myKey">myValue</wicket:message>
-  <wicket:message key="myKeyNotExsts">[Warning: Property for 'myKeyNotExsts' not found]</wicket:message>
-  <wicket:message key="myKey">myValue</wicket:message>
-
-  <!-- wicket message with some raw markup -->
-  <wicket:message key="myKey">myValue</wicket:message>
-
-  <span wicket:id="message">here it goes</span>
-  <span wicket:message="attr-name:i18n-key" attr-name="my i18n key">test 2</span>
-  <span wicket:id="message2" wicket:message="attr-name:i18n-key" attr-name="my i18n key">here it goes</span>
-  
-  <input type="image" src="../../test.gif">test 2</input>
-  <input type="image" src="../../test.gif" wicket:message="attr-name:i18n-key" attr-name="my i18n key">test 2</input>
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  <wicket:message key="myKeyNotExsts">Default Text</wicket:message>
+  <wicket:message key="myKey">myValue</wicket:message>
+  <wicket:message key="myKeyNotExsts">[Warning: Property for 'myKeyNotExsts' not found]</wicket:message>
+  <wicket:message key="myKey">myValue</wicket:message>
+
+  <!-- wicket message with some raw markup -->
+  <wicket:message key="myKey">myValue</wicket:message>
+
+  <span wicket:id="message">here it goes</span>
+  <span wicket:message="attr-name:i18n-key" attr-name="my i18n key">test 2</span>
+  <span wicket:id="message2" wicket:message="attr-name:i18n-key" attr-name="my i18n key">here it goes</span>
+  
+  <input type="image" src="../../test.gif">test 2</input>
+  <input type="image" src="../../test.gif" wicket:message="attr-name:i18n-key" attr-name="my i18n key">test 2</input>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html
index 8fc9b60..7680895 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <wicket:message key="myKey">Your balance is $5.00. Click <a wicket:id="link" href="./org.apache.wicket.markup.resolver.SimplePage_1">
     <wicket:message key="linkText">here</wicket:message>
   </a> to view the details.</wicket:message>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html
index d5821b9..bbcc5b2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 Your balance is $5.00. Click <a href="./org.apache.wicket.markup.resolver.SimplePage_1">
     here
   </a> to view the details.
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_3.html b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_3.html
index c97ccc1..c20412f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_3.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_3.html
@@ -1,6 +1,7 @@
-<html xmlns:wicket>
-<body>
-<wicket:message key="myKey1">sucessfully called SimplePage_3.getMyValue().</wicket:message>
-<wicket:message key="myKey2">sucessfully called 123456.</wicket:message>
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+<wicket:message key="myKey1">sucessfully called SimplePage_3.getMyValue().</wicket:message>
+<wicket:message key="myKey2">sucessfully called 123456.</wicket:message>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_5.html b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_5.html
index 79df79e..00c2b3c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_5.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_5.html
@@ -1,8 +1,9 @@
-<html xmlns:wicket>
-<head>
-  <wicket:message key="myKey">myValue</wicket:message>
-</head>
-<body>
-test
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
+  <wicket:message key="myKey">myValue</wicket:message>
+</head>
+<body>
+test
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_6.html
index 850bac0..2b83b3f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_6.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_6.html
@@ -1,13 +1,14 @@
-<html xmlns:wicket>
-<head>
-  title
-  <wicket:message key="myKey">myValue</wicket:message>
-</head>
-<body>
-  aaa
-  <wicket:child><wicket:extend>
- <wicket:child>test</wicket:child>
-</wicket:extend></wicket:child>
-  bbb
-</body>
-</html>
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
+  title
+  <wicket:message key="myKey">myValue</wicket:message>
+</head>
+<body>
+  aaa
+  <wicket:child><wicket:extend>
+ <wicket:child>test</wicket:child>
+</wicket:extend></wicket:child>
+  bbb
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverEscapePageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverEscapePageExpectedResult.html
index 01e3096..c3d9b1a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverEscapePageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverEscapePageExpectedResult.html
@@ -1,5 +1,6 @@
 <html xmlns:wicket>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <wicket:message key="keyEscapeNotSet"><strong>escapeNotSet</strong></wicket:message>
 <wicket:message key="keyEscapeSetFalse" escape="false"><strong>escapeSetFalse</strong></wicket:message>
 <wicket:message key="keyEscapeSetTrue" escape="true">&lt;strong&gt;escapeSetTrue&lt;/strong&gt;</wicket:message>
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/HomePageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/HomePageExpectedResult.html
index a0191e3..c2455bb 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/HomePageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/HomePageExpectedResult.html
@@ -1,26 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
-	<head>
-	    <title>Title</title>
-	</head>
-	<body>
-		<div wicket:id="myborder" id="page"><wicket:border>
-			<span>Marker for border start</span>
-			<wicket:body>
-			<wicket:child><wicket:extend>
-		<div id="pagebody">
-			<p>
-				<wicket:message key="item.pricedisclaimer1">Alle Preise enthalten die gesetzliche MwSt. von <span wicket:id="vat1value">19</span>% bzw. <span wicket:id="vat2value">7</span>%.</wicket:message>
-			    <wicket:message key="item.pricedisclaimer2">Bitte beachten Sie unsere</wicket:message>
-			    <a href="#">
-			        <wicket:message key="item.pricedisclaimer3">Versandkosten</wicket:message>
-			    </a>.
-			</p>
-        </div>
-	</wicket:extend></wicket:child>
-		</wicket:body>
-			<span>Marker for border end</span>
-		</wicket:border></div>
-	</body>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+	<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
+	    <title>Title</title>
+	</head>
+	<body>
+		<div wicket:id="myborder" id="page"><wicket:border>
+			<span>Marker for border start</span>
+			<wicket:body>
+			<wicket:child><wicket:extend>
+		<div id="pagebody">
+			<p>
+				<wicket:message key="item.pricedisclaimer1">Alle Preise enthalten die gesetzliche MwSt. von <span wicket:id="vat1value">19</span>% bzw. <span wicket:id="vat2value">7</span>%.</wicket:message>
+			    <wicket:message key="item.pricedisclaimer2">Bitte beachten Sie unsere</wicket:message>
+			    <a href="#">
+			        <wicket:message key="item.pricedisclaimer3">Versandkosten</wicket:message>
+			    </a>.
+			</p>
+        </div>
+	</wicket:extend></wicket:child>
+		</wicket:body>
+			<span>Marker for border end</span>
+		</wicket:border></div>
+	</body>
 </html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest$TestPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest$TestPage_expected.html
index 0d0234c..a4d8d3f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest$TestPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/model/ResourceModelTest$TestPage_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <span wicket:id="testlabel">A test label from a resource bundle</span>
 <span wicket:id="testlabelWithDefault">A test label from a resource bundle</span>
 <span wicket:id="otherlabel">A test label from a resource bundle</span>
diff --git a/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java b/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java
index ab82a41..3269c59 100644
--- a/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/page/XmlPartialPageUpdateTest.java
@@ -47,13 +47,13 @@ class XmlPartialPageUpdateTest extends WicketTestCase
 		MockWebResponse response = new MockWebResponse();
 		
 		update.writeTo(response, "UTF-8");
-		
-		String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><ajax-response><component id=\"container1\" ><![CDATA[<span wicket:id=\"container\" id=\"container1\"> two brackets: ]] greater than: > CDATA end: ]]]]><![CDATA[> </span>]]></component><header-contribution><![CDATA[<head xmlns:wicket=\"http://wicket.apache.org\"><script type=\"text/javascript\">\n" + 
-				"/*<![CDATA[*/\n" + 
-				"// two brackets: ]] greater than: > CDATA end: ]]]]><![CDATA[>\n" + 
-				"/*]]]]><![CDATA[>*/\n" + 
-				"</script>\n" + 
-				"</head>]]></header-contribution></ajax-response>";
+
+		String expected =
+			"<?xml version=\"1.0\" encoding=\"UTF-8\"?><ajax-response><component id=\"container1\" ><![CDATA[<span wicket:id=\"container\" id=\"container1\"> two brackets: ]] greater than: > CDATA end: ]]]]><![CDATA[> </span>]]></component><header-contribution><![CDATA[<head xmlns:wicket=\"http://wicket.apache.org\"><link rel=\"stylesheet\" type=\"text/css\" href=\"./wicket/resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css\" />\n"
+				+ "<script type=\"text/javascript\">\n" + "/*<![CDATA[*/\n"
+				+ "// two brackets: ]] greater than: > CDATA end: ]]]]><![CDATA[>\n"
+				+ "/*]]]]><![CDATA[>*/\n" + "</script>\n"
+				+ "</head>]]></header-contribution></ajax-response>";
 		assertEquals(expected, response.getTextResponse().toString());
 	}
 	
diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
index 8235682..c8051bf 100644
--- a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
@@ -601,7 +601,7 @@ class ComponentQueueingTest extends WicketTestCase
 
 		a.setVisible(false);
 		tester.startPage(p);
-		assertEquals("<div id=\"wicket__InlineEnclosure_20793898271\" style=\"display:none\" data-wicket-placeholder=\"\"></div>", tester.getLastResponseAsString());
+		assertEquals("<div id=\"wicket__InlineEnclosure_20793898271\" class=\"wicket--hidden\" data-wicket-placeholder=\"\"></div>", tester.getLastResponseAsString());
 	}
 	
 	/**
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_ext_result.html b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_ext_result.html
index 22b3d69..7df9985 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_ext_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_ext_result.html
@@ -1,5 +1,6 @@
 <html>
-<head><script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
 </head><body>
 
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_result.html b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_result.html
index 02caf0a..ef35fac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_result.html
@@ -1,5 +1,6 @@
 <html>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.request.resource.ResouceBundleTest/ab.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.request.resource.ResouceBundleTest/ab.js"></script>
 </head><body>
 
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_result_defer.html b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_result_defer.html
index ebaf99e..d741e9a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_result_defer.html
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/BundlesPage_result_defer.html
@@ -1,5 +1,6 @@
 <html>
-<head><script type="text/javascript" defer="defer" src="../resource/org.apache.wicket.request.resource.ResouceBundleTest/ab.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" defer="defer" src="../resource/org.apache.wicket.request.resource.ResouceBundleTest/ab.js"></script>
 </head><body>
 
 </body>
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html
index 4219248..f83d110 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest1Page_results.html
@@ -1,11 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>Insert title here</title>
 <script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 alert('Hello World!');;
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html
index 936343a..b960570 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceAggregatorTest2Page_results.html
@@ -1,12 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>Insert title here</title>
 <script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.resource.aggregator.ResourceAggregatorTest2Page/ResourceAggregatorTest2Page.js"></script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "domready", function(event) { 
 alert('Hello World!');;
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageTestPageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageTestPageExpectedResult_1.html
index afa4944..504a81b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageTestPageExpectedResult_1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/PackageTestPageExpectedResult_1.html
@@ -1,21 +1,22 @@
-<!--
-    ====================================================================
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<html xmlns:wicket>
-<body>
-  <span wicket:id="label1">test successful</span>
-  <span wicket:id="label2">test 222</span>
-  <span wicket:id="label3">not found</span>
-</body>
-</html>
+<!--
+    ====================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
+  <span wicket:id="label1">test successful</span>
+  <span wicket:id="label2">test 222</span>
+  <span wicket:id="label3">not found</span>
+</body>
+</html>
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
index 83e7ae6..4d9822e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../../wicket/resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <a href="./testValue2?-1.-link" wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
index 7e4e9d4..2c95958 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./wicket/resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <a href="./stateless?-1.-link&amp;testParam1=testValue1&amp;testParam2=testValue2" wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
index 63b427ac..01330a6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <a href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-1.-link&amp;testParam1=testValue1&amp;testParam2=testValue2" wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
index ac5f821..f9849b7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="./wicket/resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <a href="./stateless?-1.-link" wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
index 472458f..19eef73 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <a href="./org.apache.wicket.stateless.StatelessComponentPage?-1.-link" wicket:id="link">test</a>
 </body>
 </html>
\ No newline at end of file
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
index 88cce23..fd16ac1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
@@ -1,5 +1,6 @@
 <html>
-<body>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+</head><body>
 <form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.stateless.StatelessPageWithForm?-1.-form&amp;first=foo&amp;second=bar"></form>
 </body>
 </html>
\ No newline at end of file
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html
index 3cc020e..4d8009b 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterFormTestPage_expected.html
@@ -1,8 +1,9 @@
 <html xmlns:wicket>
-<head><script type="text/javascript" src="../resource/org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterForm/wicket-filterform.js"></script>
+<head><link rel="stylesheet" type="text/css" href="../resource/org.apache.wicket.css.WicketCoreCSSResourceReference/wicket-core.css" />
+<script type="text/javascript" src="../resource/org.apache.wicket.extensions.markup.html.repeater.data.table.filter.FilterForm/wicket-filterform.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery-3.4.1.js"></script>
 <script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-ajax-jquery.js"></script>
-<script type="text/javascript" >
+<script type="text/javascript">
 /*<![CDATA[*/
 Wicket.Event.add(window, "load", function(event) { 
 Wicket.FilterForm.restore('form1focus');;