diff --git a/src/stylesheets/default.css b/src/stylesheets/default.css
index dd2d5df..7952bd1 100644
--- a/src/stylesheets/default.css
+++ b/src/stylesheets/default.css
@@ -2,206 +2,95 @@
  * Default style sheet on Windows Platforms
  */
 ads--CDockContainerWidget {
-  background: palette(window);
+	background: palette(dark);
 }
-ads--CDockContainerWidget > QSplitter {
-  padding: 1 0 1 0;
+ads--CDockContainerWidget > QSplitter{
+        padding: 1 0 1 0;
 }
 
 ads--CDockContainerWidget ads--CDockSplitter::handle {
-  background: palette(dark);
-}
-
-ads--CDockAreaWidget {
-  background: palette(window);
-  border: 1px solid white;
-}
-
-ads--CDockWidgetTab {
-  background: palette(window);
-  border-color: palette(light);
-  border-style: solid;
-  border-width: 0 1px 0 0;
-  padding: 0 0px;
-}
-
-ads--CDockWidgetTab[activeTab="true"] {
-  background: qlineargradient(
-    spread: pad,
-    x1: 0,
-    y1: 0,
-    x2: 0,
-    y2: 0.5,
-    stop: 0 palette(window),
-    stop: 1 palette(light)
-  );
-  /*background: palette(highlight);*/
-}
-
-ads--CDockWidgetTab QLabel {
-  color: palette(dark);
-}
-
-ads--CDockWidgetTab[activeTab="true"] QLabel {
-  color: palette(foreground);
-}
-
-ads--CDockWidget {
-  background: palette(light);
-  border-color: palette(light);
-  border-style: solid;
-  border-width: 1px 0 0 0;
-}
-
-ads--CTitleBarButton {
-  padding: 0px 0px;
-}
-
-QScrollArea#dockWidgetScrollArea {
-  padding: 0px;
-  border: none;
-}
-
-
-#tabCloseButton {
-  margin-top: 2px;
-  background: none;
-  border: none;
-  padding: 0px -2px;
-  qproperty-icon: url(:/ads/images/close-button.svg),
-    url(:/ads/images/close-button-disabled.svg) disabled;
-  qproperty-iconSize: 16px;
-}
-
-#tabCloseButton:hover {
-  border: 1px solid rgba(0, 0, 0, 32);
-  background: rgba(0, 0, 0, 16);
-}
-
-#tabCloseButton:pressed {
-  background: rgba(0, 0, 0, 32);
-}
-
-#tabsMenuButton::menu-indicator {
-  image: none;
-}
-
-#tabsMenuButton {
-  qproperty-icon: url(:/ads/images/tabs-menu-button.svg);
-  qproperty-iconSize: 16px;
-}
-
-#dockAreaCloseButton {
-  qproperty-icon: url(:/ads/images/close-button.svg),
-    url(:/ads/images/close-button-disabled.svg) disabled;
-  qproperty-iconSize: 16px;
-}
-
-#detachGroupButton {
-  qproperty-icon: url(:/ads/images/detach-button.svg),
-    url(:/ads/images/detach-button-disabled.svg) disabled;
-  qproperty-iconSize: 16px;
-}
-
-/*-----------------------------------------------------------------------------
- * Styling of auto hide functionality
- *----------------------------------------------------------------------------
- */
-ads--CDockWidgetSideTab {
-  /*background: palette(window);*/
-  qproperty-iconSize: 16px 16px; /* this is optional in case you would like to change icon size*/
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="0"] {
-  border-top: 3px solid grey;
-  border-right: 1px solid white;
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="1"] {
-  border-left: 3px solid grey;
-  border-bottom: 1px solid white;
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="2"] {
-  border-right: 3px solid grey;
-  border-bottom: 1px solid white;
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="3"] {
-  border-bottom: 3px solid grey;
-  border-right: 1px solid white;
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="0"] {
-  border-top: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="1"] {
-  border-left: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="2"] {
-  border-right: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="3"] {
-  border-bottom: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="0"][activeTab="true"] {
-  border-top: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="1"][activeTab="true"] {
-  border-left: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="2"][activeTab="true"] {
-  border-right: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="3"][activeTab="true"] {
-  border-bottom: 3px solid palette(highlight);
-}
-
-/*
-ads--CAutoHideDockContainer::handle {
 	background: palette(dark);
 }
 
-ads--CAutoHideDockContainer::handle:vertical {
-	height: 4px;
+ads--CDockAreaWidget {
+	background: palette(window);
+	border: 1px solid white;
 }
 
-
-ads--CAutoHideDockContainer::handle:horizontal {
-	width: 4px;
+ads--CDockWidgetTab {
+	background: palette(window);
+	border-color: palette(light);
+	border-style: solid;
+	border-width: 0 1px 0 0;
+	padding: 0 0px;
 }
-*/
 
-/*ads--CAutoHideDockContainer[sideTabBarArea="0"]:handle {
-	border: 1px solid palette(dark);
-	background: white;
-}*/
+ads--CDockWidgetTab[activeTab="true"] {
+	background: qlineargradient(spread : pad, x1 : 0, y1 : 0, x2 : 0, y2 : 0.5, stop : 0
+		palette(window), stop:1 palette(light));
+	/*background: palette(highlight);*/
+}
 
+ads--CDockWidgetTab QLabel {
+	color: palette(dark);
+}
 
-#dockAreaAutoHideButton {
-	qproperty-icon: url(:/ads/images/vs-pin-button.svg);
+ads--CDockWidgetTab[activeTab="true"] QLabel {
+	color: palette(foreground);
+}
+
+ads--CDockWidget {
+	background: palette(light);
+	border-color: palette(light);
+	border-style: solid;
+	border-width: 1px 0 0 0;
+}
+
+ads--CTitleBarButton {
+	padding: 0px 0px;
+}
+
+QScrollArea#dockWidgetScrollArea {
+	padding: 0px;
+	border: none;
+}
+
+#tabCloseButton {
+	margin-top: 2px;
+	background: none;
+	border: none;
+	padding: 0px -2px;
+	qproperty-icon: url(:/ads/images/close-button.svg),
+		url(:/ads/images/close-button-disabled.svg) disabled;
 	qproperty-iconSize: 16px;
 }
 
-ads--CAutoHideDockContainer #dockAreaAutoHideButton 
-{
-	qproperty-icon: url(:/ads/images/vs-pin-button-pinned.svg);
+#tabCloseButton:hover {
+	border: 1px solid rgba(0, 0, 0, 32);
+	background: rgba(0, 0, 0, 16);
+}
+
+#tabCloseButton:pressed {
+	background: rgba(0, 0, 0, 32);
+}
+
+#tabsMenuButton::menu-indicator {
+	image: none;
+}
+
+#tabsMenuButton {
+	qproperty-icon: url(:/ads/images/tabs-menu-button.svg);
 	qproperty-iconSize: 16px;
 }
 
-#autoHideTitleLabel {
-  padding-left: 4px;
+#dockAreaCloseButton {
+	qproperty-icon: url(:/ads/images/close-button.svg),
+		url(:/ads/images/close-button-disabled.svg) disabled;
+	qproperty-iconSize: 16px;
 }
 
-ads--CResizeHandle
-{
-	background: red;
-	border: 1px solid green;
-}
\ No newline at end of file
+#detachGroupButton {
+	qproperty-icon: url(:/ads/images/detach-button.svg),
+		url(:/ads/images/detach-button-disabled.svg) disabled;
+	qproperty-iconSize: 16px;	
+}
diff --git a/src/stylesheets/default_linux.css b/src/stylesheets/default_linux.css
index 19dfd4c..ac41491 100644
--- a/src/stylesheets/default_linux.css
+++ b/src/stylesheets/default_linux.css
@@ -43,67 +43,6 @@ ads--CDockWidgetTab[activeTab="true"] QLabel {
 	color: palette(foreground);
 }
 
-/*-----------------------------------------------------------------------------
- * Styling of auto hide functionality
- *----------------------------------------------------------------------------
- */
-ads--CDockWidgetSideTab {
-	background: palette(window);
-	qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="0"] {
-	border-top: 3px solid grey;
-	border-right: 1px solid white;
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="1"] {
-	border-left: 3px solid grey;
-	border-bottom: 1px solid white;
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="2"] {
-	border-right: 3px solid grey;
-	border-bottom: 1px solid white;
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="3"] {
-	border-bottom: 3px solid grey;
-	border-right: 1px solid white;
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="0"] {
-	border-top: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="1"] {
-	border-left: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="2"] {
-	border-right: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="3"] {
-	border-bottom: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="0"][activeTab="true"] {
-	border-top: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="1"][activeTab="true"] {
-	border-left: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="2"][activeTab="true"] {
-	border-right: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="3"][activeTab="true"] {
-	border-bottom: 3px solid palette(highlight);
-}
-
 ads--CDockWidget {
 	background: palette(light);
 	border-color: palette(light);
@@ -120,17 +59,6 @@ QScrollArea#dockWidgetScrollArea {
 	border: none;
 }
 
-#dockAreaAutoHideButton {
-	qproperty-icon: url(:/ads/images/vs-pin-button.svg);
-	qproperty-iconSize: 16px;
-}
-
-ads--CAutoHideDockContainer #dockAreaAutoHideButton 
-{
-	qproperty-icon: url(:/ads/images/vs-pin-button-pinned.svg);
-	qproperty-iconSize: 16px;
-}
-
 #tabCloseButton {
 	margin-top: 2px;
 	background: none;
diff --git a/src/stylesheets/focus_highlighting.css b/src/stylesheets/focus_highlighting.css
index cb15762..5551721 100644
--- a/src/stylesheets/focus_highlighting.css
+++ b/src/stylesheets/focus_highlighting.css
@@ -2,7 +2,7 @@
  * Default style sheet on Windows Platforms with focus highlighting flag enabled
  */
 ads--CDockContainerWidget {
-	background: palette(window);
+	background: palette(dark);
 }
 ads--CDockContainerWidget > QSplitter{
         padding: 1 0 1 0;
@@ -10,7 +10,7 @@ ads--CDockContainerWidget > QSplitter{
 
 ads--CDockAreaWidget {
 	background: palette(window);
-	border: 1px solid white
+	border: 1px solid white;
 }
 
 ads--CDockWidgetTab {
@@ -36,67 +36,6 @@ ads--CDockWidgetTab[activeTab="true"] QLabel {
 	color: palette(foreground);
 }
 
-/*-----------------------------------------------------------------------------
- * Styling of auto hide functionality
- *----------------------------------------------------------------------------
- */
-ads--CDockWidgetSideTab {
-	background: palette(window);
-	qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="0"] {
-	border-top: 3px solid grey;
-	border-right: 1px solid white;
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="1"] {
-	border-left: 3px solid grey;
-	border-bottom: 1px solid white;
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="2"] {
-	border-right: 3px solid grey;
-	border-bottom: 1px solid white;
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="3"] {
-	border-bottom: 3px solid grey;
-	border-right: 1px solid white;
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="0"] {
-	border-top: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="1"] {
-	border-left: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="2"] {
-	border-right: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="3"] {
-	border-bottom: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="0"][activeTab="true"] {
-	border-top: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="1"][activeTab="true"] {
-	border-left: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="2"][activeTab="true"] {
-	border-right: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="3"][activeTab="true"] {
-	border-bottom: 3px solid palette(highlight);
-}
-
 ads--CDockWidget {
 	background: palette(light);
 	border-color: palette(light);
@@ -136,17 +75,6 @@ QScrollArea#dockWidgetScrollArea {
 	background: rgba(0, 0, 0, 48);
 }
 
-#dockAreaAutoHideButton {
-	qproperty-icon: url(:/ads/images/vs-pin-button.svg);
-	qproperty-iconSize: 16px;
-}
-
-ads--CAutoHideDockContainer #dockAreaAutoHideButton 
-{
-	qproperty-icon: url(:/ads/images/vs-pin-button-pinned.svg);
-	qproperty-iconSize: 16px;
-}
-
 #dockAreaCloseButton {
 	qproperty-icon: url(:/ads/images/close-button.svg),
 		url(:/ads/images/close-button-disabled.svg) disabled;
@@ -167,7 +95,7 @@ ads--CDockSplitter::handle {
 }
 
 /* Focus related styling */
-ads--CDockWidgetTab[activeTab="true"] {
+ads--CDockWidgetTab[focused="true"] {
 	background: palette(highlight);
 	border-color: palette(highlight);
 }
@@ -198,4 +126,4 @@ ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar {
 	background: transparent;
 	border-bottom: 2px solid palette(highlight);
 	padding-bottom: 0px;
-}
\ No newline at end of file
+}
diff --git a/src/stylesheets/focus_highlighting_linux.css b/src/stylesheets/focus_highlighting_linux.css
index 5c9e2d9..f16ab5e 100644
--- a/src/stylesheets/focus_highlighting_linux.css
+++ b/src/stylesheets/focus_highlighting_linux.css
@@ -44,67 +44,6 @@ ads--CDockWidgetTab[activeTab="true"] QLabel {
         color: palette(foreground);
 }
 
-/*-----------------------------------------------------------------------------
- * Styling of auto hide functionality
- *----------------------------------------------------------------------------
- */
-ads--CDockWidgetSideTab {
-	background: palette(window);
-	qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="0"] {
-	border-top: 3px solid grey;
-	border-right: 1px solid white;
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="1"] {
-	border-left: 3px solid grey;
-	border-bottom: 1px solid white;
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="2"] {
-	border-right: 3px solid grey;
-	border-bottom: 1px solid white;
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="3"] {
-	border-bottom: 3px solid grey;
-	border-right: 1px solid white;
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="0"] {
-	border-top: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="1"] {
-	border-left: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="2"] {
-	border-right: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab:hover[sideTabBarArea="3"] {
-	border-bottom: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="0"][activeTab="true"] {
-	border-top: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="1"][activeTab="true"] {
-	border-left: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="2"][activeTab="true"] {
-	border-right: 3px solid palette(highlight);
-}
-
-ads--CDockWidgetSideTab[sideTabBarArea="3"][activeTab="true"] {
-	border-bottom: 3px solid palette(highlight);
-}
-
 ads--CDockWidget {
         background: palette(light);
         border-color: palette(light);
@@ -133,17 +72,6 @@ QScrollArea#dockWidgetScrollArea {
         qproperty-iconSize: 16px;
 }
 
-#dockAreaAutoHideButton {
-	qproperty-icon: url(:/ads/images/vs-pin-button.svg);
-	qproperty-iconSize: 16px;
-}
-
-ads--CAutoHideDockContainer #dockAreaAutoHideButton 
-{
-	qproperty-icon: url(:/ads/images/vs-pin-button-pinned.svg);
-	qproperty-iconSize: 16px;
-}
-
 #tabCloseButton {
         margin-top: 2px;
         background: none;
@@ -171,6 +99,11 @@ ads--CAutoHideDockContainer #dockAreaAutoHideButton
 
 
 /* Focus related styling */
+ads--CDockWidgetTab[focused="true"] {
+        background: palette(highlight);
+        border-color: palette(highlight);
+}
+
 ads--CDockWidgetTab[focused="true"]>#tabCloseButton {
         qproperty-icon: url(:/ads/images/close-button-focused.svg)
 }