diff --git a/Build/Gruntfile.js b/Build/Gruntfile.js
index 50d20c39e557f3e2c2f8fc3077428f9df97a8016..65b99fc1a5c0ba58e2622c2e7bd2b5c088781a27 100644
--- a/Build/Gruntfile.js
+++ b/Build/Gruntfile.js
@@ -34,29 +34,48 @@ module.exports = function(grunt) {
 			root      : '../',
 			sysext    : '<%= paths.root %>typo3/sysext/',
 			t3skin    : '<%= paths.sysext %>t3skin/Resources/',
+			form      : '<%= paths.sysext %>form/Resources/',
+			frontend  : '<%= paths.sysext %>frontend/Resources/',
 			install   : '<%= paths.sysext %>install/Resources/',
+			linkvalidator : '<%= paths.sysext %>linkvalidator/Resources/',
 			backend   : '<%= paths.sysext %>backend/Resources/',
 			core      : '<%= paths.sysext %>core/Resources/',
 			flags     : 'bower_components/region-flags/svg/',
 			t3icons   : 'bower_components/wmdbsystems-typo3-icons/dist/'
 		},
 		less: {
+			options: {
+				banner: '<%= banner %>',
+				outputSourceFiles: true
+			},
 			t3skin: {
-				options: {
-					banner: '<%= banner %>',
-					outputSourceFiles: true
-				},
 				files: {
 					"<%= paths.t3skin %>Public/Css/backend.css": "<%= paths.less %>backend.less"
 				}
 			},
-			InstallTool: {
-				options: {
-					banner: '<%= banner %>',
-					outputSourceFiles: true
-				},
+			core: {
+				files: {
+					"<%= paths.core %>Public/Css/errorpage.css": "<%= paths.less %>errorpage.less"
+				}
+			},
+			form: {
+				files: {
+					"<%= paths.form %>Public/Css/form.css": "<%= paths.less %>form.less"
+				}
+			},
+			frontend: {
+				files: {
+					"<%= paths.frontend %>Public/Css/adminpanel.css": "<%= paths.less %>adminpanel.less"
+				}
+			},
+			install: {
 				files: {
-					"<%= paths.install %>Public/Css/InstallTool.css": "<%= paths.less %>InstallTool.less"
+					"<%= paths.install %>Public/Css/install.css": "<%= paths.less %>install.less"
+				}
+			},
+			linkvalidator: {
+				files: {
+					"<%= paths.linkvalidator %>Public/Css/linkvalidator.css": "<%= paths.less %>linkvalidator.less"
 				}
 			}
 		},
@@ -76,8 +95,20 @@ module.exports = function(grunt) {
 			t3skin: {
 				src: '<%= paths.t3skin %>Public/Css/*.css'
 			},
-			InstallTool: {
-				src: '<%= paths.install %>Public/Css/InstallTool.css'
+			core: {
+				src: '<%= paths.core %>Public/Css/*.css'
+			},
+			form: {
+				src: '<%= paths.form %>Public/Css/*.css'
+			},
+			frontend: {
+				src: '<%= paths.frontend %>Public/Css/*.css'
+			},
+			install: {
+				src: '<%= paths.install %>Public/Css/*.css'
+			},
+			linkvalidator: {
+				src: '<%= paths.linkvalidator %>Public/Css/*.css'
 			}
 		},
 		watch: {
diff --git a/typo3/sysext/viewpage/Resources/Public/Css/main.css b/Build/Resources/Public/Less/TYPO3/_module_viewpage.less
similarity index 99%
rename from typo3/sysext/viewpage/Resources/Public/Css/main.css
rename to Build/Resources/Public/Less/TYPO3/_module_viewpage.less
index 4358d2b4bdafbbb992896130a7dfedd4e1d94a97..705f812dfcbc6463fa625649f340a7b37a2bc4cc 100644
--- a/typo3/sysext/viewpage/Resources/Public/Css/main.css
+++ b/Build/Resources/Public/Less/TYPO3/_module_viewpage.less
@@ -1,7 +1,6 @@
 /**
  * Style definitions for the whole viewpage module
  */
-
 #typo3-inner-docbody  {
     display: block;
     position: absolute;
@@ -55,4 +54,4 @@
     bottom: -15px;
     background-position: -80px -224px;
     border-width: 0;
-}
\ No newline at end of file
+}
diff --git a/Build/Resources/Public/Less/TYPO3/_module_workspaces.less b/Build/Resources/Public/Less/TYPO3/_module_workspaces.less
new file mode 100644
index 0000000000000000000000000000000000000000..b79e023b96bea4ce2f4e4288738581a0bf2d30f5
--- /dev/null
+++ b/Build/Resources/Public/Less/TYPO3/_module_workspaces.less
@@ -0,0 +1,290 @@
+ul.x-tab-strip.x-tab-strip-top {
+	margin-bottom: 0;
+	margin-top: 0;
+	padding-left: 0;
+}
+ul.x-tab-strip.x-tab-strip-top li.last {
+	float: right;
+}
+span.item-state-modified {
+	color: #f78f25;
+}
+span.item-state-moved {
+	color: #457fb8;
+}
+span.item-state-new {
+	color: #3c9934;
+}
+span.item-state-hidden {
+	color: #abaaaa;
+}
+span.item-state-deleted {
+	color: #000000;
+	text-decoration: line-through;
+}
+.legend {
+	margin: 5px;
+	height: 18px;
+	color: #888888;
+}
+.legend dd, .legend dt {
+	display: inline;
+	overflow: hidden;
+}
+.legend dd span {
+	display: inline-block;
+	padding: 4px 4px;
+}
+.x-toolbar {
+	background:none !important;
+}
+.x-grid3 {
+	background: none !important;
+}
+.x-grid3-row-expanded {
+	background-color: #ececec;
+}
+.x-grid3-row-selected {
+	color: #4D4D4D;
+}
+#typo3-mod-php div.typo3-noDoc {
+	margin: 0px 0px;
+}
+#typo3-mod-php div.typo3-noDoc #typo3-docbody {
+	padding: 0px 0px;
+	top: 0px;
+}
+.icon-hidden {
+	display: none;
+	visibility: hidden;
+}
+div.x-grid3-row img.x-action-col-icon {
+	display:none;
+}
+
+div.x-grid3-row-over img.x-action-col-icon,
+div.x-grid3-row img.x-action-col-icon.t3-visible {
+	display:inline-block;
+}
+
+div.t3-workspaces-foldoutWrapper {
+	padding: 10px;
+	margin-left: 40px;
+	background-color: #FFFFFF;
+	background-image: linear-gradient(center top, #ececec 0px, #f7f7f7 200px);
+	background-repeat: repeat-x;
+	color: #606060;
+}
+.x-grid3-row-selected div.t3-workspaces-foldoutWrapper {
+	background-image: linear-gradient(center top, #dedede 0px, #f7f7f7 200px);
+	background-repeat: repeat-x;
+}
+div.t3-workspaces-foldoutWrapper table {
+	border-collapse: collapse;
+	width: 100%;
+}
+div.t3-workspaces-foldoutWrapper tr.header {
+	background-color: #B5B5B5;
+	background-image: linear-gradient(center top, #7f7f7f 10%, #5b5b5b 100%);
+	background-repeat: repeat-x;
+}
+div.t3-workspaces-foldoutWrapper tr.header th {
+	padding: 4px 8px;
+	color: #FFFFFF;
+	line-height: 15px;
+}
+
+.t3-workspaces-foldout-subheaderLeft,
+.t3-workspaces-foldout-subheaderRight {
+	padding: 15px 0 10px 0;
+	margin: 10px;
+}
+.t3-workspaces-foldout-td-contentDiffLeft .t3-workspaces-foldout-contentDiff-container,
+.t3-workspaces-foldout-td-contentDiffRight .t3-workspaces-foldout-contentDiff-container {
+	padding-top: 10px;
+	border-top: 1px solid #cdcdcd;
+}
+.x-grid3-row .t3-workspaces-foldout-td-contentDiffLeft,
+.x-grid3-row .t3-workspaces-foldout-subheaderLeft {
+	padding-right: 10px;
+}
+.x-grid3-row .t3-workspaces-foldout-td-contentDiffRight,
+.x-grid3-row .t3-workspaces-foldout-subheaderRight {
+	padding-left: 10px;
+}
+.x-grid3-row .t3-workspaces-foldout-subheaderLeft .t3-workspaces-foldout-subheader-container {
+	padding-bottom: 10px;
+	border-bottom: 1px solid #cdcdcd;
+}
+table.t3-workspaces-foldout-contentDiff  {
+	padding: 8px 8px;
+	table-layout: auto;
+	background-color: #ffffff;
+}
+table.t3-workspaces-foldout-contentDiff th {
+	padding: 8px 0 8px 8px;
+	width: 80px;
+}
+table.t3-workspaces-foldout-contentDiff td {
+	padding: 8px 8px 8px 0;
+	line-height: 1.3em;
+}
+table.t3-workspaces-foldout-contentDiff .diff-r {
+	text-decoration: line-through;
+}
+.t3-workspaces-foldout-contentDiff .content ins > img {
+	padding: 1px;
+	margin-right: 2px;
+	border: 2px solid green;
+}
+.t3-workspaces-foldout-contentDiff .content del > img {
+	padding: 1px;
+	margin-right: 2px;
+	border: 2px solid red;
+}
+div.t3-workspaces-foldoutWrapper td.char_select_profile_stats {
+	padding-right: 10px;
+}
+div.t3-workspaces-comments {
+	background-color: #dedede;
+	padding: 10px 10px 10px 10px;
+}
+div.t3-workspaces-comments-singleComment {
+	overflow: hidden;
+	margin-bottom: 10px;
+	position: relative;
+}
+div.t3-workspaces-comments-singleComment:last-child {
+	margin: 0;
+}
+div .t3-workspaces-comments-singleComment-author {
+	width: 60px;
+	margin: 10px 0;
+	position: absolute;
+	left: 0px;
+	top: 0px;
+	font-weight: bold;
+	overflow: hidden;
+}
+div .t3-workspaces-comments-singleComment-content-wrapper {
+	background: url(../Images/workspaces-comments-arrow.gif) left 10px no-repeat;
+	margin-left: 70px;
+}
+div .t3-workspaces-comments-singleComment-content-date {
+	font-size: 10px;
+}
+div .t3-workspaces-comments-singleComment-content {
+	background-color: #ffffff;
+	padding: 10px 10px;
+	margin-left: 10px;
+}
+div .t3-workspaces-comments-singleComment-content-title {
+	padding: 8px 0 8px 0;
+	font-weight: bold;
+}
+
+.typo3-workspaces-row-disabled .x-grid3-td-checker {
+	visibility: hidden;
+}
+
+div.x-grid3-row img.t3-icon-extensions-workspaces {
+	display: inline-block !important;
+	width: 17px;
+	visibility: hidden;
+}
+
+div.x-grid3-row-over img.t3-icon-extensions-workspaces {
+	visibility: visible;
+}
+
+img.t3-icon-workspaces-sendtonextstage {
+	background: url(../Images/version-workspace-sendtonextstage.png) no-repeat;
+}
+
+img.t3-icon-workspaces-sendtoprevstage {
+	background: url(../Images/version-workspace-sendtoprevstage.png) no-repeat;
+}
+
+table.t3-workspaces-foldout-contentDiff td.content {
+	word-break: break-all;
+}
+
+.typo3-workspaces-collection-level-node,
+.typo3-workspaces-collection-level-leaf,
+.typo3-workspaces-collection-level-none {
+	float: left;
+	width: 18px;
+}
+
+.x-grid3-row-expander {
+	background-position: left top;
+	float: left;
+}
+.x-grid3-row-collapsed .x-grid3-row-expander {
+	background-position: left top;
+	background-image: url('../Images/zoom_in.png');
+}
+.x-grid3-row-expanded .x-grid3-row-expander {
+	background-position: left top;
+	background-image: url('../Images/zoom_out.png');
+}
+
+.typo3-workspaces-collection-child-collapsed {
+	display: none;
+}
+
+.typo3-workspaces-collection-child-expanded {
+	display: block;
+}
+
+.typo3-workspaces-collection-level-node {
+	width: 18px;
+	height: 18px;
+	background-position: 4px 2px;
+	background-color: transparent;
+	background-repeat: no-repeat;
+	background-image: url('../../../../t3skin/extjs/images/grid/row-expand-sprite.png');
+}
+.typo3-workspaces-collection-parent-collapsed .typo3-workspaces-collection-level-node {
+	background-position: 4px 2px;
+}
+.typo3-workspaces-collection-parent-expanded .typo3-workspaces-collection-level-node {
+	background-position: -21px 2px;
+}
+
+.x-menu.typo3-workspaces-menu {
+	background-image: none;
+}
+.x-menu.typo3-workspaces-menu a.x-menu-item {
+	padding: 3px 14px;
+}
+
+.x-tab-menu-right {
+	background: #dadada;
+	border-color: #adadad;
+	border-style: solid;
+	border-width: 1px;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
+	color: #666666;
+	background-position: center 6px;
+	padding: 4px;
+
+	background-image: url('../Images/menu.png');
+	background-repeat: no-repeat;
+	width: 16px;
+	position: absolute;
+	right: 0;
+	top: 0;
+	z-index: 10;
+	cursor:pointer;
+}
+
+.t3-workspaces-foldoutWrapper .char_select_profile_titleLeft .icon,
+.t3-workspaces-foldoutWrapper .char_select_profile_titleRight .icon{
+	float: left;
+}
+
+.t3-workspaces-foldoutWrapper .t3-workspaces-foldout-contentDiff {
+	text-align: left;
+}
diff --git a/typo3/sysext/frontend/Resources/Public/Css/admin_panel.css b/Build/Resources/Public/Less/adminpanel.less
similarity index 100%
rename from typo3/sysext/frontend/Resources/Public/Css/admin_panel.css
rename to Build/Resources/Public/Less/adminpanel.less
diff --git a/Build/Resources/Public/Less/backend.less b/Build/Resources/Public/Less/backend.less
index 2e58f7b90ae84b04a4b6a2c4060e52f38de6ea00..72c6cd804a6bcf1e94c64419d51b338157dcb8b8 100644
--- a/Build/Resources/Public/Less/backend.less
+++ b/Build/Resources/Public/Less/backend.less
@@ -69,6 +69,8 @@
 @import "TYPO3/_module_scheduler.less";
 @import "TYPO3/_module_tstemplate.less";
 @import "TYPO3/_module_web_page.less";
+@import "TYPO3/_module_viewpage.less";
+@import "TYPO3/_module_workspaces.less";
 @import "TYPO3/_topbar.less";
 @import "TYPO3/_debugconsole.less";
 
diff --git a/typo3/sysext/core/Resources/Public/Css/errorpage-message.css b/Build/Resources/Public/Less/errorpage.less
similarity index 100%
rename from typo3/sysext/core/Resources/Public/Css/errorpage-message.css
rename to Build/Resources/Public/Less/errorpage.less
diff --git a/typo3/sysext/form/Resources/Public/CSS/Wizard/_Wizard.less b/Build/Resources/Public/Less/form.less
similarity index 68%
rename from typo3/sysext/form/Resources/Public/CSS/Wizard/_Wizard.less
rename to Build/Resources/Public/Less/form.less
index af89446b8624f00d9f5a420d9f1d9e3011700ad7..1f30ccfba04e023b2102ffb59201313653276f80 100644
--- a/typo3/sysext/form/Resources/Public/CSS/Wizard/_Wizard.less
+++ b/Build/Resources/Public/Less/form.less
@@ -1,5 +1,281 @@
 @charset "UTF-8";
 
+.std-em-selector {
+  font-size: 90%;
+  font-style: normal;
+}
+
+.std-strong-selector {
+  display: block;
+  font-size: 90%;
+  font-weight: normal;
+  color: #C00;
+}
+
+.std-li-selector{
+  float: none;
+  width: auto;
+  margin-right: 0;
+  margin-left: 1em;
+}
+#fake-form {
+
+  ol {
+    padding-left: 0 !important;
+    list-style: none !important;
+  }
+
+  /* style for each form element */
+  li {
+    overflow: hidden;
+    padding: 0.5em;
+    margin-bottom: 0.5em;
+
+    &#element-placeholder{
+      padding: 0;
+      margin: 0;
+    }
+
+    input + label,
+    textarea + label,
+    select + label {
+      .std-li-selector;
+    }
+
+    textarea + label {
+      vertical-align: top;
+    }
+  }
+
+  textarea, input[type=text]{
+    border: 1px solid #c0c0c0;
+  }
+
+  input[type=text]{
+    // equal width like textareas
+    width:300px;
+    padding: 3px;
+  }
+
+  label {
+    display:block;
+    margin-right: 1em;
+    vertical-align: baseline;
+
+    em{
+      .std-em-selector;
+    }
+
+    strong{
+      .std-strong-selector;
+    }
+  }
+
+  .x-checkbox, .x-radio{
+    label{
+      display:inline-block;
+    }
+  }
+
+  legend {
+    border-bottom:0;
+    em{
+      .std-em-selector;
+    }
+
+    strong{
+      .std-strong-selector;
+    }
+  }
+
+  fieldset {
+    position: relative;
+    margin: 0;
+    padding: 0;
+
+    &.submit {
+      border-style: none;
+    }
+
+    &.fieldset-horizontal {
+      border-width: 0;
+
+      &.label-below label {
+        display: block;
+        margin-left: 0;
+        margin-top: 0.2em;
+        font-size: 90%;
+        text-align: left;
+        color: #999999;
+      }
+
+      label{
+        em {
+          display: inline;
+        }
+      }
+
+      ol {
+        padding: 0;
+      }
+
+      li {
+        float: left;
+        margin-right: 1em;
+        padding: 0;
+      }
+    }
+
+    &.fieldset-subgroup {
+      margin-bottom: -2em;
+      border-style: none;
+
+      ol {
+        position: relative;
+        top: -1.4em;
+        padding: 0;
+      }
+
+      li {
+        padding: 0;
+      }
+
+      legend {
+        margin-left: 0;
+        padding: 0;
+      }
+
+      input + label {
+        float: none;
+        width: auto;
+        display: inline;
+        margin: 0 0 0 1em;
+      }
+    }
+  }
+
+  legend {
+    font-size: 12px;
+    font-weight: bold;
+    color: #000000;
+
+    em {
+      position: absolute;
+    }
+
+    strong {
+      position: absolute;
+      top: 1.4em;
+    }
+  }
+
+  /* labels as block, labels displayed above or below the input fields */
+  .labels-block{
+    label {
+      display: block;
+      float: none;
+      margin: 0 0 0.5em;
+      width: auto;
+    }
+
+    input + label,
+    textarea + label{
+      margin: 0.5em 0 0;
+    }
+
+  }
+}
+
+/* labels alignment right */
+#fake-form .labels-alignment-right label,
+#fake-form .labels-alignment-right .fieldset-subgroup legend,
+#fake-form .labels-alignment-right.fieldset-subgroup legend {
+  text-align: right;
+}
+
+#fake-form .labels-block fieldset.fieldset-subgroup,
+#fake-form fieldset.labels-block.fieldset-subgroup {
+  margin-bottom: 0;
+}
+
+#fake-form .labels-block .fieldset-subgroup legend,
+#fake-form .labels-block.fieldset-subgroup legend {
+  width: auto;
+}
+
+#fake-form .labels-block .fieldset-subgroup legend em,
+#fake-form .labels-block.fieldset-subgroup legend em {
+  position: relative;
+}
+
+#fake-form .labels-block .fieldset-subgroup legend strong,
+#fake-form .labels-block.fieldset-subgroup legend strong {
+  position: relative;
+  top: 0;
+}
+
+#fake-form .labels-block .fieldset-subgroup ol,
+#fake-form .labels-block.fieldset-subgroup ol {
+  top: 0;
+  margin: 0;
+  padding: 0.5em 0 0;
+}
+
+/* element HIDDEN */
+#fake-form .formwizard-element.hidden-element {
+  cursor: default;
+}
+
+#fake-form .formwizard-element .hidden-dummy-element {
+  margin: 0;
+  padding: 5px;
+  border:1px dotted #A9A9A9;
+}
+
+/* styles for drag and drop content */
+.x-dd-drag-ghost .formwizard-element {
+  list-style:none;
+}
+
+.x-dd-drop-icon {
+  top: 7px;
+}
+
+.x-dd-drag-ghost ol {
+  margin: 5px 0;
+  padding: 0;
+  list-style: none;
+}
+
+.x-dd-drag-ghost .buttongroup,
+.x-dd-drag-ghost label em,
+.x-dd-drag-ghost label strong {
+  display: none;
+}
+
+.x-dd-drag-ghost label {
+  margin: 0 10px 0 5px;
+}
+
+.x-dd-drag-ghost legend {
+  margin: 0 5px;
+  font-size: 14px;
+  font-weight: bold;
+  color: #000;
+  border: none;
+}
+
+.x-grid-panel .remove {
+  background-image: url("../../Images/remove.gif");
+  width: 15px;
+  height: 16px;
+}
+
+.x-dd-drag-proxy,
+.x-dd-drop-nodrop {
+  background-color: #fff;
+  border-color: #c0c0c0;
+}
 .tab-content{
   fieldset{
 
diff --git a/Build/Resources/Public/Less/InstallTool.less b/Build/Resources/Public/Less/install.less
similarity index 100%
rename from Build/Resources/Public/Less/InstallTool.less
rename to Build/Resources/Public/Less/install.less
diff --git a/Build/Resources/Public/Less/linkvalidator.less b/Build/Resources/Public/Less/linkvalidator.less
new file mode 100644
index 0000000000000000000000000000000000000000..fc4a539e045a0fe6728e586f7c5889a2820e1a8c
--- /dev/null
+++ b/Build/Resources/Public/Less/linkvalidator.less
@@ -0,0 +1,61 @@
+/* - - - - - - - - - - - - - - - - - - - - -
+Info > Linkvalidator
+- - - - - - - - - - - - - - - - - - - - - */
+.linkvalidator-function-menu {
+  margin-bottom: 25px;
+  margin-left: 25px;
+  margin-top: 0;
+  float: left;
+}
+.linkvalidator-function-menu input {
+  margin-left: 5px;
+}
+.linkvalidator-function-menu div {
+  margin-top: 11px;
+}
+.linkvalidator-check-options {
+  float: left;
+  display: block;
+  margin-top: 0px;
+  width: 225px;
+}
+.linkvalidator-check-options div {
+  float: left;
+}
+.linkvalidator-button {
+  clear: both;
+}
+#linkvalidator-statistics-table {
+  width: 230px;
+  margin-top: 5px;
+  margin-bottom: 14px;
+}
+#linkvalidator-statistics-table th td.number {
+  padding-top: 4px;
+}
+#linkvalidator-statistics-table td {
+  border-left: 1px solid white;
+  vertical-align: middle;
+}
+#linkvalidator-statistics-table td:first-child {
+  border-left: none;
+}
+#linkvalidator-statistics-table .number {
+  padding-right: 6px;
+  text-align: center;
+}
+#linkvalidator-statistics-table span {
+  vertical-align: middle;
+}
+#linkvalidator-broken-links-table td {
+  border-left: 1px solid white;
+}
+#linkvalidator-broken-links-table td span.valid {
+  color: green;
+}
+#linkvalidator-broken-links-table td span.error {
+  color: red;
+}
+#linkvalidator-broken-links-table td:first-child {
+  border-left: none;
+}
diff --git a/typo3/sysext/core/Resources/Private/Templates/Page/Error.html b/typo3/sysext/core/Resources/Private/Templates/Page/Error.html
index 3232b903b09920a6d7396022cdc7a0478fff9d9c..dcd65d16f2d20c68ee38b736ecca5fdd2035517f 100644
--- a/typo3/sysext/core/Resources/Private/Templates/Page/Error.html
+++ b/typo3/sysext/core/Resources/Private/Templates/Page/Error.html
@@ -8,7 +8,7 @@
 
 	<base href="###BASEURL###" />
 
-	<link rel="stylesheet" href="###EXTPATH_CORE###Resources/Public/Css/errorpage-message.css" />
+	<link rel="stylesheet" href="###EXTPATH_CORE###Resources/Public/Css/errorpage.css" />
 </head>
 
 <body class="t3-message-page t3-###CSS_CLASS###page-message">
diff --git a/typo3/sysext/core/Resources/Public/Css/errorpage.css b/typo3/sysext/core/Resources/Public/Css/errorpage.css
new file mode 100644
index 0000000000000000000000000000000000000000..1a3ab54633995949fbff9eea9ac068d1a491eecb
--- /dev/null
+++ b/typo3/sysext/core/Resources/Public/Css/errorpage.css
@@ -0,0 +1,159 @@
+/*!
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+/*!
+ *  Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+/* FONT PATH
+ * -------------------------- */
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.4.0');
+  src: url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('../../../../../../typo3/sysext/t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+body {
+  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-size: 12px;
+  line-height: 1.5;
+  color: #000;
+  background-color: #fff;
+  word-break: normal;
+}
+* {
+  margin: 0;
+  padding: 0;
+}
+p {
+  margin-bottom: 10px;
+}
+.fa {
+  display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+.fa-stack {
+  position: relative;
+  display: inline-block;
+  width: 2em;
+  height: 2em;
+  line-height: 2em;
+  vertical-align: middle;
+}
+.fa-stack-1x,
+.fa-stack-2x {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  text-align: center;
+}
+.fa-stack-1x {
+  line-height: inherit;
+}
+.fa-stack-2x {
+  font-size: 2em;
+}
+.callout-danger .media .fa-stack {
+  color: #efc7c7;
+}
+.callout-danger .media .fa-stack > .fa:first-child {
+  color: #c83c3c;
+}
+.fa-circle:before {
+  content: "\f111";
+}
+.fa-warning:before,
+.fa-exclamation-triangle:before {
+  content: "\f071";
+}
+.media-right,
+.media > .pull-right {
+  padding-left: 10px;
+}
+.media-left,
+.media > .pull-left {
+  padding-right: 10px;
+}
+.media-left,
+.media-right,
+.media-body {
+  display: table-cell;
+  vertical-align: top;
+}
+.media-body {
+  vertical-align: middle;
+}
+.t3-message-page {
+  background-color: #eee;
+  display: table;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+.t3-message-page-container {
+  max-width: 600px;
+  margin: auto;
+}
+.typo3-error-image {
+  max-width: 150px;
+  display: block;
+  height: auto;
+}
+.t3-error-wrap {
+  display: table-cell;
+  vertical-align: middle;
+}
+.t3-message-page .t3-message-page-logo {
+  margin: 0 0 30px;
+}
+#typo3-messages {
+  margin-bottom: 10px;
+}
+#t3-footer {
+  border-top: 1px solid #5c5c5c;
+}
+#t3-copyright-notice {
+  text-align: justify;
+  word-break: normal;
+  color: #797878;
+  margin-top: 15px;
+  font-size: 10px;
+}
+#t3-copyright-notice a {
+  color: #797878;
+  text-decoration: underline;
+}
+#t3-copyright-notice a:hover {
+  color: #b0b0b0;
+}
+.callout {
+  background-color: #f0f0f0;
+  border-left: 3px solid #cccccc;
+  margin: 20px 0;
+  padding: 20px;
+  color: #333333;
+}
+.callout a {
+  color: #c83c3c;
+}
+.callout-danger {
+  background-color: #efc7c7;
+  border-color: #c83c3c;
+  color: #333333;
+}
diff --git a/typo3/sysext/form/Classes/View/Wizard/Element/FormWizardElement.php b/typo3/sysext/form/Classes/View/Wizard/Element/FormWizardElement.php
index 492525eb9499818c3c6cdbdd9277f158ca2d6f6a..2f3908ba32b51fbe25070b768be947c9116af6ce 100644
--- a/typo3/sysext/form/Classes/View/Wizard/Element/FormWizardElement.php
+++ b/typo3/sysext/form/Classes/View/Wizard/Element/FormWizardElement.php
@@ -163,9 +163,9 @@ class FormWizardElement extends AbstractFormElement
     protected function resultAddWizardCss()
     {
         $cssFiles = array(
-            'Wizard/Styles.css'
+            'form.css'
         );
-        $baseUrl = ExtensionManagementUtility::extRelPath('form') . 'Resources/Public/CSS/';
+        $baseUrl = ExtensionManagementUtility::extRelPath('form') . 'Resources/Public/Css/';
         // Load the wizards css
         foreach ($cssFiles as $cssFile) {
             $this->resultArray['stylesheetFiles'][] = $baseUrl . $cssFile;
diff --git a/typo3/sysext/form/Resources/Public/CSS/Wizard/Styles.less b/typo3/sysext/form/Resources/Public/CSS/Wizard/Styles.less
deleted file mode 100644
index 808c5a12f84ccf34cc14c501b461c76158aaa92c..0000000000000000000000000000000000000000
--- a/typo3/sysext/form/Resources/Public/CSS/Wizard/Styles.less
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "_Form";
-@import "_Wizard";
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Public/CSS/Wizard/_Form.less b/typo3/sysext/form/Resources/Public/CSS/Wizard/_Form.less
deleted file mode 100644
index 9d87d4c46a131c056584ae62a835de4e6ae80b45..0000000000000000000000000000000000000000
--- a/typo3/sysext/form/Resources/Public/CSS/Wizard/_Form.less
+++ /dev/null
@@ -1,261 +0,0 @@
-@import "_Variables";
-@charset "UTF-8";
-
-#fake-form {
-
-  ol {
-    padding-left: 0 !important;
-    list-style: none !important;
-  }
-
-  /* style for each form element */
-  li {
-    overflow: hidden;
-    padding: 0.5em;
-    margin-bottom: 0.5em;
-
-    &#element-placeholder{
-      padding: 0;
-      margin: 0;
-    }
-
-    input + label,
-    textarea + label,
-    select + label {
-      .std-li-selector;
-    }
-
-    textarea + label {
-      vertical-align: top;
-    }
-  }
-
-  textarea, input[type=text]{
-    border: 1px solid #c0c0c0;
-  }
-
-  input[type=text]{
-    // equal width like textareas
-    width:300px;
-    padding: 3px;
-  }
-
-  label {
-    display:block;
-    margin-right: 1em;
-    vertical-align: baseline;
-
-    em{
-      .std-em-selector;
-    }
-
-    strong{
-      .std-strong-selector;
-    }
-  }
-
-  .x-checkbox, .x-radio{
-    label{
-      display:inline-block;
-    }
-  }
-
-  legend {
-    border-bottom:0;
-    em{
-      .std-em-selector;
-    }
-
-    strong{
-      .std-strong-selector;
-    }
-  }
-
-  fieldset {
-    position: relative;
-    margin: 0;
-    padding: 0;
-
-    &.submit {
-      border-style: none;
-    }
-
-    &.fieldset-horizontal {
-      border-width: 0;
-
-      &.label-below label {
-        display: block;
-        margin-left: 0;
-        margin-top: 0.2em;
-        font-size: 90%;
-        text-align: left;
-        color: #999999;
-      }
-
-      label{
-        em {
-          display: inline;
-        }
-      }
-
-      ol {
-        padding: 0;
-      }
-
-      li {
-        float: left;
-        margin-right: 1em;
-        padding: 0;
-      }
-    }
-
-    &.fieldset-subgroup {
-      margin-bottom: -2em;
-      border-style: none;
-
-      ol {
-        position: relative;
-        top: -1.4em;
-        padding: 0;
-      }
-
-      li {
-        padding: 0;
-      }
-
-      legend {
-        margin-left: 0;
-        padding: 0;
-      }
-
-      input + label {
-        float: none;
-        width: auto;
-        display: inline;
-        margin: 0 0 0 1em;
-      }
-    }
-  }
-
-  legend {
-    font-size: 12px;
-    font-weight: bold;
-    color: #000000;
-
-    em {
-      position: absolute;
-    }
-
-    strong {
-      position: absolute;
-      top: 1.4em;
-    }
-  }
-
-  /* labels as block, labels displayed above or below the input fields */
-  .labels-block{
-    label {
-      display: block;
-      float: none;
-      margin: 0 0 0.5em;
-      width: auto;
-    }
-
-    input + label,
-    textarea + label{
-      margin: 0.5em 0 0;
-    }
-
-  }
-}
-
-/* labels alignment right */
-#fake-form .labels-alignment-right label,
-#fake-form .labels-alignment-right .fieldset-subgroup legend,
-#fake-form .labels-alignment-right.fieldset-subgroup legend {
-  text-align: right;
-}
-
-#fake-form .labels-block fieldset.fieldset-subgroup,
-#fake-form fieldset.labels-block.fieldset-subgroup {
-  margin-bottom: 0;
-}
-
-#fake-form .labels-block .fieldset-subgroup legend,
-#fake-form .labels-block.fieldset-subgroup legend {
-  width: auto;
-}
-
-#fake-form .labels-block .fieldset-subgroup legend em,
-#fake-form .labels-block.fieldset-subgroup legend em {
-  position: relative;
-}
-
-#fake-form .labels-block .fieldset-subgroup legend strong,
-#fake-form .labels-block.fieldset-subgroup legend strong {
-  position: relative;
-  top: 0;
-}
-
-#fake-form .labels-block .fieldset-subgroup ol,
-#fake-form .labels-block.fieldset-subgroup ol {
-  top: 0;
-  margin: 0;
-  padding: 0.5em 0 0;
-}
-
-/* element HIDDEN */
-#fake-form .formwizard-element.hidden-element {
-  cursor: default;
-}
-
-#fake-form .formwizard-element .hidden-dummy-element {
-  margin: 0;
-  padding: 5px;
-  border:1px dotted #A9A9A9;
-}
-
-/* styles for drag and drop content */
-.x-dd-drag-ghost .formwizard-element {
-  list-style:none;
-}
-
-.x-dd-drop-icon {
-  top: 7px;
-}
-
-.x-dd-drag-ghost ol {
-  margin: 5px 0;
-  padding: 0;
-  list-style: none;
-}
-
-.x-dd-drag-ghost .buttongroup,
-.x-dd-drag-ghost label em,
-.x-dd-drag-ghost label strong {
-  display: none;
-}
-
-.x-dd-drag-ghost label {
-  margin: 0 10px 0 5px;
-}
-
-.x-dd-drag-ghost legend {
-  margin: 0 5px;
-  font-size: 14px;
-  font-weight: bold;
-  color: #000;
-  border: none;
-}
-
-.x-grid-panel .remove {
-  background-image: url("../../Images/remove.gif");
-  width: 15px;
-  height: 16px;
-}
-
-.x-dd-drag-proxy,
-.x-dd-drop-nodrop {
-  background-color: #fff;
-  border-color: #c0c0c0;
-}
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Public/CSS/Wizard/_Variables.less b/typo3/sysext/form/Resources/Public/CSS/Wizard/_Variables.less
deleted file mode 100644
index 488a55582ab436d9cd60436f62656561c289f77b..0000000000000000000000000000000000000000
--- a/typo3/sysext/form/Resources/Public/CSS/Wizard/_Variables.less
+++ /dev/null
@@ -1,18 +0,0 @@
-.std-em-selector {
-  font-size: 90%;
-  font-style: normal;
-}
-
-.std-strong-selector {
-  display: block;
-  font-size: 90%;
-  font-weight: normal;
-  color: #C00;
-}
-
-.std-li-selector{
-  float: none;
-  width: auto;
-  margin-right: 0;
-  margin-left: 1em;
-}
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Public/CSS/Wizard/Styles.css b/typo3/sysext/form/Resources/Public/Css/form.css
similarity index 97%
rename from typo3/sysext/form/Resources/Public/CSS/Wizard/Styles.css
rename to typo3/sysext/form/Resources/Public/Css/form.css
index 0b3ea496730226dc593c19e3a5ad9547da1f58ed..7575d459e8e4148f01c2334e1d448f78a8b95909 100644
--- a/typo3/sysext/form/Resources/Public/CSS/Wizard/Styles.css
+++ b/typo3/sysext/form/Resources/Public/Css/form.css
@@ -1,4 +1,16 @@
 @charset "UTF-8";
+/*!
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
 .std-em-selector {
   font-size: 90%;
   font-style: normal;
diff --git a/typo3/sysext/frontend/Classes/View/AdminPanelView.php b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
index 63a300847d0678651a5ffd98fb47218b77cf20ef..7a7cef0b1086ae77bc8d0217c63d22ccafb7ce8b 100755
--- a/typo3/sysext/frontend/Classes/View/AdminPanelView.php
+++ b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
@@ -336,7 +336,7 @@ class AdminPanelView
 					TSFEtypo3FormFieldSet(theField, evallist, is_in, checkbox, checkboxValue);
 				}') . '/*]]>*/</script><script language="javascript" type="text/javascript">' . $this->extJSCODE . '</script>';
         }
-        $cssPath = htmlspecialchars($this->getTypoScriptFrontendController()->absRefPrefix . ExtensionManagementUtility::siteRelPath('frontend')) . 'Resources/Public/Css/admin_panel.css';
+        $cssPath = htmlspecialchars($this->getTypoScriptFrontendController()->absRefPrefix . ExtensionManagementUtility::siteRelPath('frontend')) . 'Resources/Public/Css/adminpanel.css';
         $out .= '<script src="' . GeneralUtility::locationHeaderUrl(ExtensionManagementUtility::siteRelPath('frontend') . 'Resources/Public/JavaScript/AdminPanel.js') . '" type="text/javascript"></script><script type="text/javascript">/*<![CDATA[*/' . 'typo3AdminPanel = new TYPO3AdminPanel();typo3AdminPanel.init("typo3-adminPanel-header", "TSFE_ADMIN_PANEL_FORM");' . '/*]]>*/</script>
 <link type="text/css" rel="stylesheet" href="' . $cssPath . '" media="all" />
 <!--
diff --git a/typo3/sysext/frontend/Resources/Public/Css/adminpanel.css b/typo3/sysext/frontend/Resources/Public/Css/adminpanel.css
new file mode 100644
index 0000000000000000000000000000000000000000..a12b3dc3f1fc803f1ba910a05de76f5b447847d2
--- /dev/null
+++ b/typo3/sysext/frontend/Resources/Public/Css/adminpanel.css
@@ -0,0 +1,485 @@
+/*!
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+/*!
+ *  Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+/* FONT PATH
+ * -------------------------- */
+@font-face {
+  font-family: 'TYPO3FontAwesome';
+  src: url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?v=4.3.0');
+  src: url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.eot?#iefix&v=4.3.0') format('embedded-opentype'), url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff2?v=4.3.0') format('woff2'), url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.woff?v=4.3.0') format('woff'), url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.ttf?v=4.3.0') format('truetype'), url('../../../../t3skin/Resources/Public/Fonts/FontAwesome/fontawesome-webfont.svg?v=4.3.0#fontawesomeregular') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+/*!
+ * Font Awesome icons are prefixed with #TSFE_ADMIN_PANEL_FORM to prevent issues with
+ * CSS from the website that uses Font Awesome too.
+ */
+#TSFE_ADMIN_PANEL_FORM .fa,
+#TSFE_ADMIN_PANEL_FORM .fa:before,
+.frontEndEditIconLinks .fa,
+.frontEndEditIconLinks .fa:before,
+.typo3-editPanel .fa,
+.typo3-editPanel .fa:before {
+  display: inline-block;
+  font: normal normal normal 14px/1 TYPO3FontAwesome;
+  font-size: 15px;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-transform: translate(0, 0);
+          transform: translate(0, 0);
+}
+#TSFE_ADMIN_PANEL_FORM .fa-pencil:before,
+.typo3-feedit-element .fa-pencil:before {
+  content: "\f040";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-angle-up:before,
+.typo3-editPanel .fa-angle-up:before {
+  content: "\f106";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-angle-down:before,
+.typo3-editPanel .fa-angle-down:before {
+  content: "\f107";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-toggle-off:before,
+.typo3-editPanel .fa-toggle-off:before {
+  content: "\f204";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-toggle-on:before,
+.typo3-editPanel .fa-toggle-on:before {
+  content: "\f205";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-google-plus-square:before,
+.typo3-editPanel .fa-google-plus-square:before {
+  content: "\f0d4";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-trash:before,
+.typo3-editPanel .fa-trash:before {
+  content: "\f1f8";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-history:before,
+.typo3-editPanel .fa-history:before {
+  content: "\f1da";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-list-alt:before,
+.typo3-editPanel .fa-list-alt:before {
+  content: "\f022";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-plus-square:before,
+.typo3-feedit-element .fa-plus-square:before {
+  content: "\f0fe";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-arrows:before,
+.typo3-editPanel .fa-arrows:before {
+  content: "\f047";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-exclamation-circle:before {
+  content: "\f06a";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-exclamation-triangle:before {
+  content: "\f071";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-info-circle:before {
+  content: "\f05a";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-caret-down:before {
+  content: "\f0d7";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-caret-up:before {
+  content: "\f0d8";
+}
+#TSFE_ADMIN_PANEL_FORM .fa-bolt:before {
+  content: "\f0e7";
+}
+/**
+ * General Styles
+ **/
+#TSFE_ADMIN_PANEL_FORM *:before,
+#TSFE_ADMIN_PANEL_FORM *:after {
+  box-sizing: border-box;
+}
+/**
+ * Frontend Editing Styles
+ **/
+.typo3-editPanel {
+  background: #ccc;
+  padding: 5px 10px;
+}
+.typo3-editPanel a {
+  text-decoration: none;
+}
+.typo3-editPanel-label {
+  display: inline;
+  margin: 0 10px;
+}
+.typo3-editPanel .t3-icon {
+  display: inline-block;
+  position: relative;
+  overflow: hidden;
+}
+.typo3-feedit-element .btn-default.content-link {
+  background-color: #eee;
+  margin: 3px;
+}
+.typo3-feedit-element-hidden {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=20);
+  opacity: 0.2;
+}
+/**
+ * Admin Panel Styles
+ **/
+#TSFE_ADMIN_PANEL_FORM {
+  display: block;
+  max-width: 50%;
+}
+#TSFE_ADMIN_PANEL_FORM {
+  background-color: #fff;
+  box-shadow: 0 3px 15px #808080;
+  margin: 0;
+  padding: 0;
+  z-index: 10002;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel {
+  border: 1px solid #ccc;
+  border-spacing: 0;
+  border-collapse: separate;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+  margin: 0;
+  min-width: 315px;
+  padding: 0;
+  line-height: 0.8;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel * {
+  line-height: 1;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel .typo3-adminPanel-table * {
+  line-height: 1.55;
+}
+#TSFE_ADMIN_PANEL_FORM,
+#TSFE_ADMIN_PANEL_FORM table,
+#TSFE_ADMIN_PANEL_FORM a {
+  color: black;
+  font-family: Verdana, Arial, sans-serif;
+  font-size: 12px;
+  text-decoration: none;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-header {
+  line-height: 0.5;
+}
+#TSFE_ADMIN_PANEL_FORM #typo3-adminPanel-header {
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+  cursor: move;
+}
+#TSFE_ADMIN_PANEL_FORM #typo3-adminPanel-header {
+  display: inline-block;
+  width: 100%;
+  background-color: #222;
+  color: white;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-header a {
+  color: #fff;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-header-title {
+  float: left;
+  padding-top: 11px;
+  padding-left: 15px;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-header-buttonWrapper {
+  display: inline-block;
+  float: right;
+  margin-left: 10px;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-panel-open .typo3-adminPanel-header-button:before,
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-panel-closed .typo3-adminPanel-header-button:before {
+  display: inline-block;
+  float: right;
+  padding: 10px 15px;
+  font-size: 16px;
+  content: "\f106";
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-panel-closed .typo3-adminPanel-header-button:before {
+  content: "\f107";
+}
+#TSFE_ADMIN_PANEL_FORM .updatebutton {
+  text-align: right;
+  background-color: #222;
+  width: 100%;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-section-title .wrapper {
+  clear: left;
+  margin: 0;
+  padding: 0;
+  border-top: 1px solid #888;
+  border-bottom: 1px solid #888;
+  background-color: #ddd;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-section-title a {
+  display: block;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  line-height: 25px;
+}
+#TSFE_ADMIN_PANEL_FORM label {
+  display: inline;
+  line-height: 16px;
+  font-weight: 500;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-section-title a .typo3-adminPanel-label {
+  padding-top: 4px;
+  white-space: nowrap;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-section-title .wrapper:hover {
+  color: #fff;
+  background-color: #7e7e7e;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-section-title .wrapper:hover a {
+  color: #fff;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-section-title .typo3-adminPanel-section-open,
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-section-title .typo3-adminPanel-section-closed {
+  display: inline-block;
+  width: 100%;
+  padding-left: 26px;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-section-title .typo3-adminPanel-section-open:before,
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-section-title .typo3-adminPanel-section-closed:before {
+  margin-left: -13px;
+  padding-right: 13px;
+  font-size: 14px;
+  content: "\f0d8";
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-section-title .typo3-adminPanel-section-closed:before {
+  content: "\f0d7";
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-itemRow .typo3-adminPanel-section-content {
+  padding: 7px 15px;
+  line-height: 16px;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-section-content {
+  padding-right: 11px;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-section-content .toolbar span {
+  padding: 1px;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-section-content label {
+  padding-right: 5px;
+}
+#TSFE_ADMIN_PANEL_FORM #typo3-adminPanel-tsLog {
+  border: 1px solid #7e7e7e;
+  border-spacing: 0;
+}
+#TSFE_ADMIN_PANEL_FORM .clear-cache-icon:before {
+  position: absolute;
+  left: 26px;
+  top: -11px;
+}
+#TSFE_ADMIN_PANEL_FORM .btn.clear-cache {
+  margin-left: 15px;
+  padding-left: 25px;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-table {
+  width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+  border: 1px solid #ccc;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-table tr {
+  margin: 0;
+  padding: 0;
+  vertical-align: inherit;
+  border-color: inherit;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-table td {
+  margin: 0;
+  vertical-align: inherit;
+  border-color: inherit;
+  padding: 0 15px;
+  text-align: left;
+  white-space: nowrap;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-table th {
+  padding: 10px 10px 10px 15px;
+  border-bottom: 1px solid #aaa;
+  text-align: left;
+  background-color: #ededed;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-table th span[style] {
+  color: #fff !important;
+}
+#TSFE_ADMIN_PANEL_FORM #typo3-adminPanel-tsLog .typo3-adminPanel-logRow-highlight {
+  background-color: #fcd3cf;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-table-wrapper {
+  padding: 10px 0;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-table-wrapper.scroll-table {
+  overflow-x: scroll;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-table .line-odd,
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-table .line-even {
+  background-color: #f0f0f0;
+  text-align: left;
+  vertical-align: top;
+}
+#TSFE_ADMIN_PANEL_FORM .typo3-adminPanel-table .line-even {
+  background-color: #dedede;
+}
+#TSFE_ADMIN_PANEL_FORM #typo3-adminPanel-tsLog .stackPointer {
+  color: maroon;
+  vertical-align: top;
+}
+/**
+ * General Form and Button Styles
+ **/
+.t3-icon {
+  display: inline-block;
+  position: relative;
+  vertical-align: middle;
+  text-align: center;
+}
+.btn .t3-icon {
+  margin: 0;
+}
+#TSFE_ADMIN_PANEL_FORM input,
+#TSFE_ADMIN_PANEL_FORM select {
+  position: static;
+  padding: 0;
+}
+#TSFE_ADMIN_PANEL_FORM input[type="checkbox"] {
+  display: block;
+  float: left;
+  margin-top: 1px;
+  margin-left: 0;
+  margin-right: 5px;
+}
+#TSFE_ADMIN_PANEL_FORM input[type="text"],
+#TSFE_ADMIN_PANEL_FORM select {
+  display: block;
+  width: 100%;
+  margin-top: 5px;
+  padding: 6px;
+  box-sizing: border-box;
+}
+#TSFE_ADMIN_PANEL_FORM input {
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+  color: inherit;
+  margin: 0;
+}
+#TSFE_ADMIN_PANEL_FORM .btn {
+  display: inline-block;
+  margin-bottom: 0;
+  padding: 6px 8px;
+  border: 1px solid transparent;
+  border-radius: 2px;
+  font-weight: normal;
+  font-size: 12px;
+  line-height: 1.5;
+  text-align: center;
+  vertical-align: middle;
+  -ms-touch-action: manipulation;
+      touch-action: manipulation;
+  cursor: pointer;
+  background-image: none;
+  white-space: nowrap;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+#TSFE_ADMIN_PANEL_FORM .btn:hover {
+  background-color: #c4c4c4;
+}
+#TSFE_ADMIN_PANEL_FORM .btn-default {
+  color: #333333;
+  background-color: #eeeeee;
+  border-color: #bbbbbb;
+  cursor: pointer;
+}
+#TSFE_ADMIN_PANEL_FORM .btn-group {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+}
+#TSFE_ADMIN_PANEL_FORM .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+  border-radius: 0;
+}
+#TSFE_ADMIN_PANEL_FORM .btn-group > .btn:first-child {
+  margin-left: 0;
+}
+#TSFE_ADMIN_PANEL_FORM input[type="text"] {
+  font-size: 12px;
+  line-height: 1.5;
+  color: #333333;
+  background-color: #fefefe;
+  background-image: none;
+  border: 1px solid #bbbbbb;
+  border-radius: 2px;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon {
+  position: relative;
+  display: inline-block;
+  margin-right: 2px;
+  padding: 0;
+  height: 18px;
+  width: 16px;
+  white-space: nowrap;
+  overflow: hidden;
+  vertical-align: middle;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon:after,
+#TSFE_ADMIN_PANEL_FORM .treeline-icon:before {
+  position: absolute;
+  content: '';
+  left: 50%;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon:before {
+  top: 0;
+  height: 100%;
+  width: 2px;
+  margin-left: -1px;
+  border-left: 1px dotted #666666;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon:after {
+  border-top: 1px dotted #666666;
+  height: 2px;
+  width: 100%;
+  top: 50%;
+  margin-top: -1px;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon-jointop:before {
+  top: 50%;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon-joinbottom:before {
+  top: -50%;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon-line:after {
+  display: none;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon-blank {
+  display: none;
+}
+#TSFE_ADMIN_PANEL_FORM .treeline-icon-clear:before,
+#TSFE_ADMIN_PANEL_FORM .treeline-icon-clear:after {
+  display: none;
+}
diff --git a/typo3/sysext/install/Classes/Controller/BackendModuleController.php b/typo3/sysext/install/Classes/Controller/BackendModuleController.php
index f36453c852c5a1cf917970bd86d3955b3fbdb7c9..36fa7e6cf4411e30391661456f7617dce34d442a 100644
--- a/typo3/sysext/install/Classes/Controller/BackendModuleController.php
+++ b/typo3/sysext/install/Classes/Controller/BackendModuleController.php
@@ -73,9 +73,6 @@ class BackendModuleController
             $view->assign('installToolEnableToken', $token);
             /** @var ModuleTemplate $moduleTemplate */
             $moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class);
-            $cssFile = 'EXT:install/Resources/Public/Css/BackendModule/ShowEnableInstallToolButton.css';
-            $cssFile = GeneralUtility::getFileAbsFileName($cssFile);
-            $moduleTemplate->getPageRenderer()->addCssFile(PathUtility::getAbsoluteWebPath($cssFile));
             $moduleTemplate->setContent($view->render());
             $response->getBody()->write($moduleTemplate->renderContent());
         }
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Common/Headers.html b/typo3/sysext/install/Resources/Private/Partials/Action/Common/Headers.html
index bb090369be0d90b05134dbf2c168363f95a6177a..d7d063ff6b537a1fe4c23d0c9805f292b99cf532 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Common/Headers.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Common/Headers.html
@@ -1,6 +1,6 @@
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<link rel="stylesheet" type="text/css" href="../Resources/Public/Css/InstallTool.css?{time}" />
+<link rel="stylesheet" type="text/css" href="../Resources/Public/Css/install.css?{time}" />
 <link rel="icon" type="image/vnd.microsoft.icon" href="../Resources/Public/Icons/favicon.ico?{time}" />
 <script type="text/javascript" src="../../core/Resources/Public/JavaScript/Contrib/jquery/jquery-2.2.1.min.js?{time}"></script>
 <script type="text/javascript" src="../../backend/Resources/Public/JavaScript/jquery.clearable.js?{time}"></script>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Action/Common/FirstInstall.html b/typo3/sysext/install/Resources/Private/Templates/Action/Common/FirstInstall.html
index c0ef76ac20253bf3dac517b19fa12556d456c8c5..f8b295c3b8b4d655318ceb354b3aea5cbcb67a22 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Action/Common/FirstInstall.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Action/Common/FirstInstall.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 	<title>The Access to the Install Tool blocked</title>
-	<link rel="stylesheet" type="text/css" href="../Resources/Public/Css/InstallTool.css?{time}" />
+	<link rel="stylesheet" type="text/css" href="../Resources/Public/Css/install.css?{time}" />
 </head>
 <body>
 <div class="container">
diff --git a/typo3/sysext/install/Resources/Private/Templates/Action/Common/InstallToolDisabled.html b/typo3/sysext/install/Resources/Private/Templates/Action/Common/InstallToolDisabled.html
index d7132aed3cb20addcb7c414ee1fcad8d524e0c06..dceeb8fa1dd2b1ef0c42e54c281aa309f9842b74 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Action/Common/InstallToolDisabled.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Action/Common/InstallToolDisabled.html
@@ -3,7 +3,7 @@
 <head>
 	<title>The Install Tool is locked</title>
 	<link rel="icon" type="image/vnd.microsoft.icon" href="../Resources/Public/Icons/favicon.ico?{time}"/>
-	<link rel="stylesheet" type="text/css" href="../Resources/Public/Css/InstallTool.css?{time}" />
+	<link rel="stylesheet" type="text/css" href="../Resources/Public/Css/install.css?{time}" />
 </head>
 <body>
 <div class="container">
diff --git a/typo3/sysext/install/Resources/Private/Templates/Action/Common/InstallToolPasswordNotSet.html b/typo3/sysext/install/Resources/Private/Templates/Action/Common/InstallToolPasswordNotSet.html
index 13c264635adaad6dad8f3b401a047b8a8f0beb98..5de5762d501d7c5af6887316ee927e73b0491478 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Action/Common/InstallToolPasswordNotSet.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Action/Common/InstallToolPasswordNotSet.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 	<title>The Access to the Install Tool blocked</title>
-	<link rel="stylesheet" type="text/css" href="../Resources/Public/Css/InstallTool.css?{time}" />
+	<link rel="stylesheet" type="text/css" href="../Resources/Public/Css/install.css?{time}" />
 </head>
 <body>
 <div class="container">
diff --git a/typo3/sysext/install/Resources/Private/Templates/Action/Common/Login.html b/typo3/sysext/install/Resources/Private/Templates/Action/Common/Login.html
index bb9aa17e379fa12a351e20b9245f964e9ec4916d..0f1e443f64feafa61cfd1b8d5cfe62f2bb5dad6d 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Action/Common/Login.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Action/Common/Login.html
@@ -12,7 +12,7 @@
 <head>
 	<title>Install tool login</title>
 	<f:render partial="Action/Common/Headers" arguments="{_all}" />
-	<link rel="stylesheet" type="text/css" href="../Resources/Public/Css/InstallTool.css?{time}" />
+	<link rel="stylesheet" type="text/css" href="../Resources/Public/Css/install.css?{time}" />
 </head>
 <body class="{context}">
 	<f:if condition="{contextService.backendContext}">
diff --git a/typo3/sysext/install/Resources/Private/Templates/BackendModule/ShowEnableInstallToolButton.html b/typo3/sysext/install/Resources/Private/Templates/BackendModule/ShowEnableInstallToolButton.html
index 1288489360f9ff88e0f3daf4c0c8b00c45feca97..77bdddc92ccd5270fce9d29e57160dfa04d98058 100644
--- a/typo3/sysext/install/Resources/Private/Templates/BackendModule/ShowEnableInstallToolButton.html
+++ b/typo3/sysext/install/Resources/Private/Templates/BackendModule/ShowEnableInstallToolButton.html
@@ -1,7 +1,7 @@
 <form action="" method="post" id="t3-install-form-unlock">
 	<input type="hidden" name="action" value="enableInstallTool" />
 	<input type="hidden" name="installToolEnableToken" value="{installToolEnableToken}" />
-	<div id="container">
+	<div class="container container-small">
 		<f:be.infobox state="-1" title="{f:translate(key: 'LLL:EXT:install/Resources/Private/Language/BackendModule.xlf:confirmUnlockInstallToolTitle')}">
 			<f:translate
 				key="LLL:EXT:install/Resources/Private/Language/BackendModule.xlf:confirmUnlockInstallToolMessage"
diff --git a/typo3/sysext/install/Resources/Public/Css/BackendModule/ShowEnableInstallToolButton.css b/typo3/sysext/install/Resources/Public/Css/BackendModule/ShowEnableInstallToolButton.css
deleted file mode 100644
index 8c34fca2ea361d1dcd1a6e80fbfd0539cd678499..0000000000000000000000000000000000000000
--- a/typo3/sysext/install/Resources/Public/Css/BackendModule/ShowEnableInstallToolButton.css
+++ /dev/null
@@ -1,8 +0,0 @@
-#container {
-	margin: 11em auto 0;
-	width: 41em;
-}
-
-button {
-	margin-top: 1em;
-}
diff --git a/typo3/sysext/install/Resources/Public/Css/InstallTool.css b/typo3/sysext/install/Resources/Public/Css/install.css
similarity index 100%
rename from typo3/sysext/install/Resources/Public/Css/InstallTool.css
rename to typo3/sysext/install/Resources/Public/Css/install.css
diff --git a/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php b/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
index 56890b3da97818b0cb4c01ea7dffdae8afa05188..97538f5847f719e4838c759fbea424c8c8205e01 100644
--- a/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
+++ b/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
@@ -253,7 +253,7 @@ class LinkValidatorReport extends \TYPO3\CMS\Backend\Module\AbstractFunctionModu
             $this->isAccessibleForCurrentUser = true;
         }
 
-        $this->doc->addStyleSheet('module', ExtensionManagementUtility::extRelPath('linkvalidator') . 'Resources/Public/Css/styles.css');
+        $this->doc->addStyleSheet('module', ExtensionManagementUtility::extRelPath('linkvalidator') . 'Resources/Public/Css/linkvalidator.css');
         $this->getPageRenderer()->loadJquery();
         $this->getPageRenderer()->loadRequireJsModule('TYPO3/CMS/Linkvalidator/Linkvalidator');
 
diff --git a/typo3/sysext/linkvalidator/Resources/Public/Css/styles.css b/typo3/sysext/linkvalidator/Resources/Public/Css/linkvalidator.css
similarity index 99%
rename from typo3/sysext/linkvalidator/Resources/Public/Css/styles.css
rename to typo3/sysext/linkvalidator/Resources/Public/Css/linkvalidator.css
index 575cf2d4b7395e9e1296e83fc711e751dbcefd79..29bce5ed97574661a0f0c7176555874adbea920a 100644
--- a/typo3/sysext/linkvalidator/Resources/Public/Css/styles.css
+++ b/typo3/sysext/linkvalidator/Resources/Public/Css/linkvalidator.css
@@ -1,4 +1,4 @@
-/*
+/*!
  * This file is part of the TYPO3 CMS project.
  *
  * It is free software; you can redistribute it and/or modify it under
diff --git a/typo3/sysext/t3skin/Resources/Public/Css/backend.css b/typo3/sysext/t3skin/Resources/Public/Css/backend.css
index 013dd399c206e5fa1858528f3dc6200c643f2188..d095ed629cd549f5c492fd95ab28c6bcab9eb01a 100644
--- a/typo3/sysext/t3skin/Resources/Public/Css/backend.css
+++ b/typo3/sysext/t3skin/Resources/Public/Css/backend.css
@@ -12376,6 +12376,331 @@ iframe {
 .t3-page-ce-dropzone-possible {
   max-height: 225px;
 }
+/**
+ * Style definitions for the whole viewpage module
+ */
+#typo3-inner-docbody {
+  display: block;
+  position: absolute;
+  height: auto;
+  bottom: 0;
+  top: 0;
+  left: 0;
+  right: 0;
+  padding: 30px;
+}
+#resizeable {
+  height: 100%;
+}
+#tx_viewpage_iframe {
+  box-shadow: 0px 0px 15px 0px #888888;
+}
+/**
+ * adjust jquery-ui resize handles
+ */
+.ui-resizable-handle {
+  border: solid #dadada;
+}
+.ui-resizable-handle:hover {
+  border-color: #585858;
+}
+.ui-resizable-s {
+  cursor: row-resize;
+  height: 2px;
+  width: 40%;
+  bottom: -15px;
+  left: 30%;
+  border-width: 2px 0;
+}
+.ui-resizable-e {
+  cursor: col-resize;
+  width: 2px;
+  right: -15px;
+  top: 30%;
+  height: 40%;
+  border-width: 0 2px;
+}
+.ui-resizable-se {
+  cursor: nwse-resize;
+  width: 12px;
+  height: 12px;
+  right: -15px;
+  bottom: -15px;
+  background-position: -80px -224px;
+  border-width: 0;
+}
+ul.x-tab-strip.x-tab-strip-top {
+  margin-bottom: 0;
+  margin-top: 0;
+  padding-left: 0;
+}
+ul.x-tab-strip.x-tab-strip-top li.last {
+  float: right;
+}
+span.item-state-modified {
+  color: #f78f25;
+}
+span.item-state-moved {
+  color: #457fb8;
+}
+span.item-state-new {
+  color: #3c9934;
+}
+span.item-state-hidden {
+  color: #abaaaa;
+}
+span.item-state-deleted {
+  color: #000000;
+  text-decoration: line-through;
+}
+.legend {
+  margin: 5px;
+  height: 18px;
+  color: #888888;
+}
+.legend dd,
+.legend dt {
+  display: inline;
+  overflow: hidden;
+}
+.legend dd span {
+  display: inline-block;
+  padding: 4px 4px;
+}
+.x-toolbar {
+  background: none !important;
+}
+.x-grid3 {
+  background: none !important;
+}
+.x-grid3-row-expanded {
+  background-color: #ececec;
+}
+.x-grid3-row-selected {
+  color: #4D4D4D;
+}
+#typo3-mod-php div.typo3-noDoc {
+  margin: 0px 0px;
+}
+#typo3-mod-php div.typo3-noDoc #typo3-docbody {
+  padding: 0px 0px;
+  top: 0px;
+}
+.icon-hidden {
+  display: none;
+  visibility: hidden;
+}
+div.x-grid3-row img.x-action-col-icon {
+  display: none;
+}
+div.x-grid3-row-over img.x-action-col-icon,
+div.x-grid3-row img.x-action-col-icon.t3-visible {
+  display: inline-block;
+}
+div.t3-workspaces-foldoutWrapper {
+  padding: 10px;
+  margin-left: 40px;
+  background-color: #FFFFFF;
+  background-image: linear-gradient(center top, #ececec 0px, #f7f7f7 200px);
+  background-repeat: repeat-x;
+  color: #606060;
+}
+.x-grid3-row-selected div.t3-workspaces-foldoutWrapper {
+  background-image: linear-gradient(center top, #dedede 0px, #f7f7f7 200px);
+  background-repeat: repeat-x;
+}
+div.t3-workspaces-foldoutWrapper table {
+  border-collapse: collapse;
+  width: 100%;
+}
+div.t3-workspaces-foldoutWrapper tr.header {
+  background-color: #B5B5B5;
+  background-image: linear-gradient(center top, #7f7f7f 10%, #5b5b5b 100%);
+  background-repeat: repeat-x;
+}
+div.t3-workspaces-foldoutWrapper tr.header th {
+  padding: 4px 8px;
+  color: #FFFFFF;
+  line-height: 15px;
+}
+.t3-workspaces-foldout-subheaderLeft,
+.t3-workspaces-foldout-subheaderRight {
+  padding: 15px 0 10px 0;
+  margin: 10px;
+}
+.t3-workspaces-foldout-td-contentDiffLeft .t3-workspaces-foldout-contentDiff-container,
+.t3-workspaces-foldout-td-contentDiffRight .t3-workspaces-foldout-contentDiff-container {
+  padding-top: 10px;
+  border-top: 1px solid #cdcdcd;
+}
+.x-grid3-row .t3-workspaces-foldout-td-contentDiffLeft,
+.x-grid3-row .t3-workspaces-foldout-subheaderLeft {
+  padding-right: 10px;
+}
+.x-grid3-row .t3-workspaces-foldout-td-contentDiffRight,
+.x-grid3-row .t3-workspaces-foldout-subheaderRight {
+  padding-left: 10px;
+}
+.x-grid3-row .t3-workspaces-foldout-subheaderLeft .t3-workspaces-foldout-subheader-container {
+  padding-bottom: 10px;
+  border-bottom: 1px solid #cdcdcd;
+}
+table.t3-workspaces-foldout-contentDiff {
+  padding: 8px 8px;
+  table-layout: auto;
+  background-color: #ffffff;
+}
+table.t3-workspaces-foldout-contentDiff th {
+  padding: 8px 0 8px 8px;
+  width: 80px;
+}
+table.t3-workspaces-foldout-contentDiff td {
+  padding: 8px 8px 8px 0;
+  line-height: 1.3em;
+}
+table.t3-workspaces-foldout-contentDiff .diff-r {
+  text-decoration: line-through;
+}
+.t3-workspaces-foldout-contentDiff .content ins > img {
+  padding: 1px;
+  margin-right: 2px;
+  border: 2px solid green;
+}
+.t3-workspaces-foldout-contentDiff .content del > img {
+  padding: 1px;
+  margin-right: 2px;
+  border: 2px solid red;
+}
+div.t3-workspaces-foldoutWrapper td.char_select_profile_stats {
+  padding-right: 10px;
+}
+div.t3-workspaces-comments {
+  background-color: #dedede;
+  padding: 10px 10px 10px 10px;
+}
+div.t3-workspaces-comments-singleComment {
+  overflow: hidden;
+  margin-bottom: 10px;
+  position: relative;
+}
+div.t3-workspaces-comments-singleComment:last-child {
+  margin: 0;
+}
+div .t3-workspaces-comments-singleComment-author {
+  width: 60px;
+  margin: 10px 0;
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  font-weight: bold;
+  overflow: hidden;
+}
+div .t3-workspaces-comments-singleComment-content-wrapper {
+  background: url(../Images/workspaces-comments-arrow.gif) left 10px no-repeat;
+  margin-left: 70px;
+}
+div .t3-workspaces-comments-singleComment-content-date {
+  font-size: 10px;
+}
+div .t3-workspaces-comments-singleComment-content {
+  background-color: #ffffff;
+  padding: 10px 10px;
+  margin-left: 10px;
+}
+div .t3-workspaces-comments-singleComment-content-title {
+  padding: 8px 0 8px 0;
+  font-weight: bold;
+}
+.typo3-workspaces-row-disabled .x-grid3-td-checker {
+  visibility: hidden;
+}
+div.x-grid3-row img.t3-icon-extensions-workspaces {
+  display: inline-block !important;
+  width: 17px;
+  visibility: hidden;
+}
+div.x-grid3-row-over img.t3-icon-extensions-workspaces {
+  visibility: visible;
+}
+img.t3-icon-workspaces-sendtonextstage {
+  background: url(../Images/version-workspace-sendtonextstage.png) no-repeat;
+}
+img.t3-icon-workspaces-sendtoprevstage {
+  background: url(../Images/version-workspace-sendtoprevstage.png) no-repeat;
+}
+table.t3-workspaces-foldout-contentDiff td.content {
+  word-break: break-all;
+}
+.typo3-workspaces-collection-level-node,
+.typo3-workspaces-collection-level-leaf,
+.typo3-workspaces-collection-level-none {
+  float: left;
+  width: 18px;
+}
+.x-grid3-row-expander {
+  background-position: left top;
+  float: left;
+}
+.x-grid3-row-collapsed .x-grid3-row-expander {
+  background-position: left top;
+  background-image: url('../Images/zoom_in.png');
+}
+.x-grid3-row-expanded .x-grid3-row-expander {
+  background-position: left top;
+  background-image: url('../Images/zoom_out.png');
+}
+.typo3-workspaces-collection-child-collapsed {
+  display: none;
+}
+.typo3-workspaces-collection-child-expanded {
+  display: block;
+}
+.typo3-workspaces-collection-level-node {
+  width: 18px;
+  height: 18px;
+  background-position: 4px 2px;
+  background-color: transparent;
+  background-repeat: no-repeat;
+  background-image: url('../../../../t3skin/extjs/images/grid/row-expand-sprite.png');
+}
+.typo3-workspaces-collection-parent-collapsed .typo3-workspaces-collection-level-node {
+  background-position: 4px 2px;
+}
+.typo3-workspaces-collection-parent-expanded .typo3-workspaces-collection-level-node {
+  background-position: -21px 2px;
+}
+.x-menu.typo3-workspaces-menu {
+  background-image: none;
+}
+.x-menu.typo3-workspaces-menu a.x-menu-item {
+  padding: 3px 14px;
+}
+.x-tab-menu-right {
+  background: #dadada;
+  border-color: #adadad;
+  border-style: solid;
+  border-width: 1px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+  color: #666666;
+  background-position: center 6px;
+  padding: 4px;
+  background-image: url('../Images/menu.png');
+  background-repeat: no-repeat;
+  width: 16px;
+  position: absolute;
+  right: 0;
+  top: 0;
+  z-index: 10;
+  cursor: pointer;
+}
+.t3-workspaces-foldoutWrapper .char_select_profile_titleLeft .icon,
+.t3-workspaces-foldoutWrapper .char_select_profile_titleRight .icon {
+  float: left;
+}
+.t3-workspaces-foldoutWrapper .t3-workspaces-foldout-contentDiff {
+  text-align: left;
+}
 [id="typo3-topbar"],
 [id="typo3-topbar"] .x-panel-body {
   min-width: 1000px;
diff --git a/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html b/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html
index 57b217735604cc588a65b0ccce2f9287914f8f5b..b6b0c5f94d585c113abc8451302ad616303eb019 100644
--- a/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html
+++ b/typo3/sysext/viewpage/Resources/Private/Layouts/DocHeader.html
@@ -1,8 +1,7 @@
 {namespace core=TYPO3\CMS\Core\ViewHelpers}
 <f:be.pageRenderer
 	includeCssFiles="{
-		0:'{f:uri.resource(path:\'Css/ui-lightness/jquery-ui-1.10.3.custom.min.css\')}',
-		1:'{f:uri.resource(path:\'Css/main.css\')}'
+		0:'{f:uri.resource(path:\'Css/ui-lightness/jquery-ui-1.10.3.custom.min.css\')}'
 	}"
 	includeRequireJsModules="{
 		0:'TYPO3/CMS/Viewpage/Main'
diff --git a/typo3/sysext/workspaces/Classes/Controller/AbstractController.php b/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
index 4da60821a33826ee2c340bd6dcd2e46a53169646..6235cee61c35814cb67a1ea44ddd3a3c2879bbd6 100644
--- a/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
@@ -74,9 +74,6 @@ class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
         $this->pageRenderer->addInlineSetting('Workspaces', 'id', $this->pageId);
         $this->pageRenderer->addInlineSetting('Workspaces', 'depth', $this->pageId === 0 ? 999 : 1);
         $this->pageRenderer->addInlineSetting('Workspaces', 'language', $this->getLanguageSelection());
-        $cssFile = 'EXT:workspaces/Resources/Public/Css/module.css';
-        $cssFile = GeneralUtility::getFileAbsFileName($cssFile);
-        $this->pageRenderer->addCssFile(PathUtility::getAbsoluteWebPath($cssFile));
         $this->pageRenderer->addInlineLanguageLabelArray(array(
             'title' => $GLOBALS['LANG']->getLL('title'),
             'path' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.path'),