diff --git a/src/AutoHideDockContainer.cpp b/src/AutoHideDockContainer.cpp
index 14d3c8a..7cb2ee1 100644
--- a/src/AutoHideDockContainer.cpp
+++ b/src/AutoHideDockContainer.cpp
@@ -227,7 +227,7 @@ void CAutoHideDockContainer::updateSize()
 	auto dockContainerParent = parentContainer();
 	auto rect = dockContainerParent->contentRect();
 
-	switch (sideTabBarArea())
+	switch (sideBarLocation())
 	{
 	case SideBarLocation::Top:
 		 resize(rect.width(), qMin(rect.height(), d->Size.height() - ResizeMargin));
@@ -271,18 +271,23 @@ CAutoHideDockContainer::~CAutoHideDockContainer()
 		parentContainer()->removeAutoHideWidget(this);
 	}
 
+	if (d->SideTab)
+	{
+		delete d->SideTab;
+	}
+
 	delete d;
 }
 
 //============================================================================
-CAutoHideSideBar* CAutoHideDockContainer::sideTabBar() const
+CAutoHideSideBar* CAutoHideDockContainer::sideBar() const
 {
 	return parentContainer()->sideTabBar(d->SideTabBarArea);
 }
 
 
 //============================================================================
-CAutoHideTab* CAutoHideDockContainer::sideTab() const
+CAutoHideTab* CAutoHideDockContainer::autoHideTab() const
 {
 	return d->SideTab;
 }
@@ -327,7 +332,7 @@ void CAutoHideDockContainer::addDockWidget(CDockWidget* DockWidget)
 
 
 //============================================================================
-SideBarLocation CAutoHideDockContainer::sideTabBarArea() const
+SideBarLocation CAutoHideDockContainer::sideBarLocation() const
 {
 	return d->SideTabBarArea;
 }
@@ -356,9 +361,10 @@ void CAutoHideDockContainer::cleanupAndDelete()
 	const auto dockWidget = d->DockWidget;
 	if (dockWidget)
 	{
+
 		auto SideTab = d->SideTab;
         SideTab->removeFromSideBar();
-        SideTab->setParent(dockWidget);
+        SideTab->setParent(nullptr);
         SideTab->hide();
 	}
 
diff --git a/src/AutoHideDockContainer.h b/src/AutoHideDockContainer.h
index 4943cd6..9823ac0 100644
--- a/src/AutoHideDockContainer.h
+++ b/src/AutoHideDockContainer.h
@@ -53,7 +53,7 @@ struct SideTabBarPrivate;
 class ADS_EXPORT CAutoHideDockContainer : public QFrame
 {
 	Q_OBJECT
-    Q_PROPERTY(int sideTabBarArea READ sideTabBarArea)
+    Q_PROPERTY(int sideBarLocation READ sideBarLocation)
 private:
 	AutoHideDockContainerPrivate* d; ///< private data (pimpl)
 	friend struct AutoHideDockContainerPrivate;
@@ -63,6 +63,10 @@ private:
 protected:
 	bool eventFilter(QObject* watched, QEvent* event) override;
 	void resizeEvent(QResizeEvent* event) override;
+
+	/**
+	 * Updates the size considering the size limits and the resize margins
+	 */
 	void updateSize();
 
 	/*
@@ -92,12 +96,12 @@ public:
 	/**
 	 * Get's the side tab bar
 	 */
-	CAutoHideSideBar* sideTabBar() const;
+	CAutoHideSideBar* sideBar() const;
 
 	/**
 	 * Returns the side tab
 	 */
-	CAutoHideTab* sideTab() const;
+	CAutoHideTab* autoHideTab() const;
 
 	/**
 	 * Get's the dock widget in this dock container
@@ -112,7 +116,7 @@ public:
     /**
 	 * Returns the side tab bar area of this Auto Hide dock container
 	 */
-	SideBarLocation sideTabBarArea() const;
+	SideBarLocation sideBarLocation() const;
 
 	/**
 	 * Returns the dock area widget of this Auto Hide dock container
diff --git a/src/AutoHideSideBar.cpp b/src/AutoHideSideBar.cpp
index 7b0a5c0..e384624 100644
--- a/src/AutoHideSideBar.cpp
+++ b/src/AutoHideSideBar.cpp
@@ -128,11 +128,10 @@ CAutoHideSideBar::~CAutoHideSideBar()
 
 
 //============================================================================
-void CAutoHideSideBar::insertSideTab(int Index, CAutoHideTab* SideTab)
+void CAutoHideSideBar::insertTab(int Index, CAutoHideTab* SideTab)
 {
 	SideTab->installEventFilter(this);
     SideTab->setSideBar(this);
-    SideTab->updateOrientationForArea(d->SideTabArea);
     d->TabsLayout->insertWidget(Index, SideTab);
     show();
 }
@@ -143,22 +142,14 @@ CAutoHideDockContainer* CAutoHideSideBar::insertDockWidget(int Index, CDockWidge
 {
 	auto AutoHideContainer = new CAutoHideDockContainer(DockWidget, d->SideTabArea, d->ContainerWidget);
 	DockWidget->dockManager()->dockFocusController()->clearDockWidgetFocus(DockWidget);
-	auto Tab = AutoHideContainer->sideTab();
-	insertSideTab(Index, Tab);
+	auto Tab = AutoHideContainer->autoHideTab();
+	insertTab(Index, Tab);
 	return AutoHideContainer;
 }
 
 
 //============================================================================
-void CAutoHideSideBar::removeDockWidget(CDockWidget* DockWidget)
-{
-	Q_UNUSED(DockWidget);
-	// TODO implement
-}
-
-
-//============================================================================
-void CAutoHideSideBar::removeSideTab(CAutoHideTab* SideTab)
+void CAutoHideSideBar::removeTab(CAutoHideTab* SideTab)
 {
 	SideTab->removeEventFilter(this);
     d->TabsLayout->removeWidget(SideTab);
@@ -226,19 +217,6 @@ bool CAutoHideSideBar::eventFilter(QObject *watched, QEvent *event)
 	return false;
 }
 
-
-//============================================================================
-void CAutoHideSideBar::paintEvent(QPaintEvent* event)
-{
-	Q_UNUSED(event)
-
-    QStyleOption option;
-    option.initFrom(this);
-    QPainter painter(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &option, &painter, this);
-}
-
-
 //============================================================================
 Qt::Orientation CAutoHideSideBar::orientation() const
 {
@@ -261,7 +239,7 @@ int CAutoHideSideBar::tabCount() const
 
 
 //============================================================================
-SideBarLocation CAutoHideSideBar::sideBarArea() const
+SideBarLocation CAutoHideSideBar::sideBarLocation() const
 {
 	return d->SideTabArea;
 }
@@ -276,7 +254,7 @@ void CAutoHideSideBar::saveState(QXmlStreamWriter& s) const
 	}
 
 	s.writeStartElement("SideBar");
-	s.writeAttribute("Area", QString::number(sideBarArea()));
+	s.writeAttribute("Area", QString::number(sideBarLocation()));
 	s.writeAttribute("Tabs", QString::number(tabCount()));
 
 	for (auto i = 0; i < tabCount(); ++i)
diff --git a/src/AutoHideSideBar.h b/src/AutoHideSideBar.h
index c27820c..385bd38 100644
--- a/src/AutoHideSideBar.h
+++ b/src/AutoHideSideBar.h
@@ -54,7 +54,7 @@ class CDockingStateReader;
 class ADS_EXPORT CAutoHideSideBar : public QFrame
 {
     Q_OBJECT
-    Q_PROPERTY(int sideBarArea READ sideBarArea)
+    Q_PROPERTY(int sideBarLocation READ sideBarLocation)
     Q_PROPERTY(Qt::Orientation orientation READ orientation)
 
 private:
@@ -64,7 +64,6 @@ private:
 	friend DockContainerWidgetPrivate;
 
 protected:
-    virtual void paintEvent(QPaintEvent* event) override;
 	virtual bool event(QEvent* e) override;
 	virtual bool eventFilter(QObject *watched, QEvent *event) override;
 
@@ -73,6 +72,12 @@ protected:
 	 */
 	void saveState(QXmlStreamWriter& Stream) const;
 
+	/**
+	 * Inserts the given dock widget tab at the given position.
+	 * An Index value of -1 appends the side tab at the end.
+	 */
+	void insertTab(int Index, CAutoHideTab* SideTab);
+
 public:
     using Super = QFrame;
 
@@ -86,26 +91,18 @@ public:
 	 */
 	virtual ~CAutoHideSideBar();
 
-	/**
-	 * Inserts the given dock widget tab at the given position.
-	 */
-	void insertSideTab(int Index, CAutoHideTab* SideTab);
-
 	/**
 	 * Removes the given DockWidgetSideTab from the tabbar
 	 */
-	void removeSideTab(CAutoHideTab* SideTab);
+	void removeTab(CAutoHideTab* SideTab);
 
 	/**
-	 * Insert dock widget
+	 * Insert dock widget into the side bar.
+	 * The function creates the auto hide dock container, inserts the
+	 * auto hide tab
 	 */
 	CAutoHideDockContainer* insertDockWidget(int Index, CDockWidget* DockWidget);
 
-	/**
-	 * Remove dock widget from sidebar
-	 */
-	void removeDockWidget(CDockWidget* DockWidget);
-
 	/**
 	 * Returns orientation of side tab.
 	 */
@@ -124,7 +121,7 @@ public:
 	/**
 	 * Getter for side tab bar area property
 	 */
-	SideBarLocation sideBarArea() const;
+	SideBarLocation sideBarLocation() const;
 
 Q_SIGNALS:
 	void sideTabAutoHideToggleRequested();
diff --git a/src/AutoHideTab.cpp b/src/AutoHideTab.cpp
index 8667657..4b901ef 100644
--- a/src/AutoHideTab.cpp
+++ b/src/AutoHideTab.cpp
@@ -53,6 +53,12 @@ struct AutoHideTabPrivate
 	 * Private data constructor
 	 */
 	AutoHideTabPrivate(CAutoHideTab* _public);
+
+	/**
+	 * Update the orientation, visibility and spacing based on the area of
+	 * the side bar
+	 */
+	void updateOrientation();
 }; // struct DockWidgetTabPrivate
 
 
@@ -64,10 +70,53 @@ AutoHideTabPrivate::AutoHideTabPrivate(CAutoHideTab* _public) :
 }
 
 
+//============================================================================
+void AutoHideTabPrivate::updateOrientation()
+{
+	auto area = SideBar->sideBarLocation();
+	_this->setOrientation((area == Bottom || area == Top) ? Qt::Horizontal : Qt::Vertical);
+
+	if (_this->icon().isNull())
+	{
+		return;
+	}
+
+	bool IconOnly = false;
+	switch (area)
+	{
+	case SideBarLocation::Left:
+		 IconOnly = CDockManager::testConfigFlag(CDockManager::LeftSideBarIconOnly);
+		 break;
+
+	case SideBarLocation::Right:
+		 IconOnly = CDockManager::testConfigFlag(CDockManager::RightSideBarIconOnly);
+		 break;
+
+	case SideBarLocation::Top:
+		 IconOnly = CDockManager::testConfigFlag(CDockManager::BottomSideBarIconOnly);
+		 break;
+
+	case SideBarLocation::Bottom:
+		 IconOnly = CDockManager::testConfigFlag(CDockManager::TopSideBarIconOnly);
+		 break;
+	}
+
+	if (IconOnly)
+	{
+		_this->setText("");
+		_this->setOrientation(Qt::Horizontal);
+	}
+}
+
+
 //============================================================================
 void CAutoHideTab::setSideBar(CAutoHideSideBar* SideTabBar)
 {
 	d->SideBar = SideTabBar;
+	if (d->SideBar)
+	{
+		d->updateOrientation();
+	}
 }
 
 
@@ -78,7 +127,7 @@ void CAutoHideTab::removeFromSideBar()
 	{
 		return;
 	}
-	d->SideBar->removeSideTab(this);
+	d->SideBar->removeTab(this);
     setSideBar(nullptr);
 }
 
@@ -109,11 +158,11 @@ void CAutoHideTab::updateStyle()
 
 
 //============================================================================
-SideBarLocation CAutoHideTab::sideTabBarArea() const
+SideBarLocation CAutoHideTab::sideBarLocation() const
 {
     if (d->SideBar)
 	{
-        return d->SideBar->sideBarArea();
+        return d->SideBar->sideBarLocation();
 	}
 
 	return Left;
@@ -137,44 +186,6 @@ Qt::Orientation CAutoHideTab::orientation() const
 }
 
 
-//============================================================================
-void CAutoHideTab::updateOrientationForArea(SideBarLocation area)
-{
-	setOrientation((area == Bottom || area == Top) ? Qt::Horizontal : Qt::Vertical);
-
-	if (icon().isNull())
-	{
-		return;
-	}
-
-	bool IconOnly = false;
-	switch (area)
-	{
-	case SideBarLocation::Left:
-		 IconOnly = CDockManager::testConfigFlag(CDockManager::LeftSideBarIconOnly);
-		 break;
-
-	case SideBarLocation::Right:
-		 IconOnly = CDockManager::testConfigFlag(CDockManager::RightSideBarIconOnly);
-		 break;
-
-	case SideBarLocation::Top:
-		 IconOnly = CDockManager::testConfigFlag(CDockManager::BottomSideBarIconOnly);
-		 break;
-
-	case SideBarLocation::Bottom:
-		 IconOnly = CDockManager::testConfigFlag(CDockManager::TopSideBarIconOnly);
-		 break;
-	}
-
-	if (IconOnly)
-	{
-		setText("");
-		setOrientation(Qt::Horizontal);
-	}
-}
-
-
 //============================================================================
 bool CAutoHideTab::isActiveTab() const
 {
diff --git a/src/AutoHideTab.h b/src/AutoHideTab.h
index d616415..ba20bad 100644
--- a/src/AutoHideTab.h
+++ b/src/AutoHideTab.h
@@ -50,7 +50,7 @@ class ADS_EXPORT CAutoHideTab : public CPushButton
 {
     Q_OBJECT
 
-    Q_PROPERTY(int sideTabBarArea READ sideTabBarArea)
+    Q_PROPERTY(int sideBarLocation READ sideBarLocation)
     Q_PROPERTY(Qt::Orientation orientation READ orientation)
 	Q_PROPERTY(bool activeTab READ isActiveTab)
 
@@ -91,7 +91,7 @@ public:
 	/**
 	 * Getter for side tab bar area property
 	 */
-	SideBarLocation sideTabBarArea() const;
+	SideBarLocation sideBarLocation() const;
 
 	/**
 	 * Set orientation vertical or horizontal
@@ -104,12 +104,8 @@ public:
 	Qt::Orientation orientation() const;
 
 	/**
-	 * Update the orientation, visibility and spacing based on the area and the config
-	 */
-	void updateOrientationForArea(SideBarLocation area);
-
-	/**
-	 * Returns true, if this is the active tab. The tab is active if the auto hide widget is visible
+	 * Returns true, if this is the active tab. The tab is active if the auto
+	 * hide widget is visible
 	 */
 	bool isActiveTab() const;
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 70c0276..ba62e48 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,8 +27,8 @@ set(ads_SRCS
     FloatingDragPreview.cpp
     IconProvider.cpp
     DockComponentsFactory.cpp
-    SideTabBar.cpp
-    DockWidgetSideTab.cpp
+    AutoHideSideBar.cpp
+    AutoHideTab.cpp
     AutoHideDockContainer.cpp
     PushButton.cpp
 	ResizeHandle.cpp
@@ -53,8 +53,8 @@ set(ads_HEADERS
     FloatingDragPreview.h
     IconProvider.h
     DockComponentsFactory.h
-    SideTabBar.h
-    DockWidgetSideTab.h
+    AutoHideSideBar.h
+    AutoHideTab.h
     AutoHideDockContainer.h
     PushButton.h
 	ResizeHandle.h
diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
index 4a6ef86..459b166 100644
--- a/src/DockContainerWidget.cpp
+++ b/src/DockContainerWidget.cpp
@@ -1714,7 +1714,7 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi
 	auto autoHideWidgets = FloatingWidget->dockContainer()->autoHideWidgets();
 	for (const auto autohideWidget : autoHideWidgets)
 	{
-		createAndSetupAutoHideContainer(autohideWidget->sideTabBarArea(), autohideWidget->dockWidget(), autohideWidget->dockWidget()->autoHideInsertOrder());
+		createAndSetupAutoHideContainer(autohideWidget->sideBarLocation(), autohideWidget->dockWidget(), autohideWidget->dockWidget()->autoHideInsertOrder());
 	}
 
 	if (DockArea)
diff --git a/src/stylesheets/default.css b/src/stylesheets/default.css
index c7e067b..155de9e 100644
--- a/src/stylesheets/default.css
+++ b/src/stylesheets/default.css
@@ -142,66 +142,66 @@ ads--CAutoHideTab {
 }
 
 
-ads--CAutoHideTab[sideTabBarArea="0"],
-ads--CAutoHideTab[sideTabBarArea="2"]  {
+ads--CAutoHideTab[sideBarLocation="0"],
+ads--CAutoHideTab[sideBarLocation="2"]  {
 	border-top: 5px solid rgba(0, 0, 0, 48);
 
 }
 
 
-ads--CAutoHideTab[sideTabBarArea="1"],
-ads--CAutoHideTab[sideTabBarArea="3"] {
+ads--CAutoHideTab[sideBarLocation="1"],
+ads--CAutoHideTab[sideBarLocation="3"] {
 	border-bottom: 5px solid rgba(0, 0, 0, 48);
 }
 
 
 
-ads--CAutoHideTab:hover[sideTabBarArea="0"],
-ads--CAutoHideTab:hover[sideTabBarArea="2"]  {
+ads--CAutoHideTab:hover[sideBarLocation="0"],
+ads--CAutoHideTab:hover[sideBarLocation="2"]  {
 	border-top: 5px solid palette(highlight);
 	color: palette(highlight);
 }
 
 
-ads--CAutoHideTab:hover[sideTabBarArea="1"],
-ads--CAutoHideTab:hover[sideTabBarArea="3"]  {
+ads--CAutoHideTab:hover[sideBarLocation="1"],
+ads--CAutoHideTab:hover[sideBarLocation="3"]  {
 	border-bottom: 5px solid palette(highlight);
 	color: palette(highlight);
 }
 
-ads--CAutoHideTab[sideTabBarArea="0"][activeTab="true"],
-ads--CAutoHideTab[sideTabBarArea="2"][activeTab="true"]  {
+ads--CAutoHideTab[sideBarLocation="0"][activeTab="true"],
+ads--CAutoHideTab[sideBarLocation="2"][activeTab="true"]  {
 	border-top: 5px solid palette(highlight);
 }
 
 
-ads--CAutoHideTab[sideTabBarArea="1"][activeTab="true"],
-ads--CAutoHideTab[sideTabBarArea="3"][activeTab="true"] {
+ads--CAutoHideTab[sideBarLocation="1"][activeTab="true"],
+ads--CAutoHideTab[sideBarLocation="3"][activeTab="true"] {
 	border-bottom: 5px solid palette(highlight);
 }
 
 
 /*****************************************************************************
- * CAutoHideBar
+ * CAutoHideSideBar
  *****************************************************************************/
-ads--CAutoHideBar{
+ads--CAutoHideSideBar{
 	background: palette(window);
 }
 
 
-ads--CAutoHideBar[sideTabBarArea="0"] {
+ads--CAutoHideSideBar[sideBarLocation="0"] {
 	border-bottom: 1px solid palette(dark);
 }
 
-ads--CAutoHideBar[sideTabBarArea="1"] {
+ads--CAutoHideSideBar[sideBarLocation="1"] {
 	border-right: 1px solid palette(dark);
 }
 
-ads--CAutoHideBar[sideTabBarArea="2"] {
+ads--CAutoHideSideBar[sideBarLocation="2"] {
 	border-left: 1px solid palette(dark);
 }
 
-ads--CAutoHideBar[sideTabBarArea="3"] {
+ads--CAutoHideSideBar[sideBarLocation="3"] {
 	border-top: 1px solid palette(dark);
 }
 
@@ -278,19 +278,19 @@ ads--CResizeHandle {
 }
 
 
-ads--CAutoHideDockContainer[sideTabBarArea="0"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="0"] ads--CResizeHandle {
 	border-top: 1px solid palette(dark);
 }
 
-ads--CAutoHideDockContainer[sideTabBarArea="1"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="1"] ads--CResizeHandle {
 	border-left: 1px solid palette(dark);
 }
 
-ads--CAutoHideDockContainer[sideTabBarArea="2"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="2"] ads--CResizeHandle {
 	border-right: 1px solid palette(dark);
 }
 
-ads--CAutoHideDockContainer[sideTabBarArea="3"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="3"] ads--CResizeHandle {
 	border-top: 1px solid palette(dark);
 }
 
diff --git a/src/stylesheets/default_linux.css b/src/stylesheets/default_linux.css
index 0fac1fc..28d2b5a 100644
--- a/src/stylesheets/default_linux.css
+++ b/src/stylesheets/default_linux.css
@@ -176,64 +176,64 @@ ads--CAutoHideTab {
     border: none;
 }
 
-ads--CAutoHideTab[sideTabBarArea="1"],
-ads--CAutoHideTab[sideTabBarArea="3"] {
+ads--CAutoHideTab[sideBarLocation="1"],
+ads--CAutoHideTab[sideBarLocation="3"] {
     border-bottom: 5px solid rgba(0, 0, 0, 48);
 }
 
 
-ads--CAutoHideTab[sideTabBarArea="0"],
-ads--CAutoHideTab[sideTabBarArea="2"]  {
+ads--CAutoHideTab[sideBarLocation="0"],
+ads--CAutoHideTab[sideBarLocation="2"]  {
     border-top: 5px solid rgba(0, 0, 0, 48);
 }
 
 
-ads--CAutoHideTab:hover[sideTabBarArea="0"],
-ads--CAutoHideTab:hover[sideTabBarArea="2"]  {
+ads--CAutoHideTab:hover[sideBarLocation="0"],
+ads--CAutoHideTab:hover[sideBarLocation="2"]  {
     border-top: 5px solid palette(highlight);
     color: palette(highlight);
 }
 
 
-ads--CAutoHideTab:hover[sideTabBarArea="1"],
-ads--CAutoHideTab:hover[sideTabBarArea="3"]  {
+ads--CAutoHideTab:hover[sideBarLocation="1"],
+ads--CAutoHideTab:hover[sideBarLocation="3"]  {
     border-bottom: 5px solid palette(highlight);
     color: palette(highlight);
 }
 
-ads--CAutoHideTab[sideTabBarArea="0"][activeTab="true"],
-ads--CAutoHideTab[sideTabBarArea="2"][activeTab="true"]  {
+ads--CAutoHideTab[sideBarLocation="0"][activeTab="true"],
+ads--CAutoHideTab[sideBarLocation="2"][activeTab="true"]  {
     border-top: 5px solid palette(highlight);
 }
 
 
-ads--CAutoHideTab[sideTabBarArea="1"][activeTab="true"],
-ads--CAutoHideTab[sideTabBarArea="3"][activeTab="true"] {
+ads--CAutoHideTab[sideBarLocation="1"][activeTab="true"],
+ads--CAutoHideTab[sideBarLocation="3"][activeTab="true"] {
     border-bottom: 5px solid palette(highlight);
 }
 
 
 /*****************************************************************************
- * CAutoHideBar
+ * CAutoHideSideBar
  *****************************************************************************/
-ads--CAutoHideBar{
+ads--CAutoHideSideBar{
         background: palette(window);
 }
 
 
-ads--CAutoHideBar[sideTabBarArea="0"] {
+ads--CAutoHideSideBar[sideBarLocation="0"] {
     border-bottom: 1px solid palette(dark);
 }
 
-ads--CAutoHideBar[sideTabBarArea="1"] {
+ads--CAutoHideSideBar[sideBarLocation="1"] {
     border-right: 1px solid palette(dark);
 }
 
-ads--CAutoHideBar[sideTabBarArea="2"] {
+ads--CAutoHideSideBar[sideBarLocation="2"] {
     border-left: 1px solid palette(dark);
 }
 
-ads--CAutoHideBar[sideTabBarArea="3"] {
+ads--CAutoHideSideBar[sideBarLocation="3"] {
     border-top: 1px solid palette(dark);
 }
 
@@ -310,19 +310,19 @@ ads--CResizeHandle {
 }
 
 
-ads--CAutoHideDockContainer[sideTabBarArea="0"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="0"] ads--CResizeHandle {
     border-top: 1px solid palette(dark);
 }
 
-ads--CAutoHideDockContainer[sideTabBarArea="1"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="1"] ads--CResizeHandle {
     border-left: 1px solid palette(dark);
 }
 
-ads--CAutoHideDockContainer[sideTabBarArea="2"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="2"] ads--CResizeHandle {
     border-right: 1px solid palette(dark);
 }
 
-ads--CAutoHideDockContainer[sideTabBarArea="3"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="3"] ads--CResizeHandle {
     border-top: 1px solid palette(dark);
 }
 
diff --git a/src/stylesheets/focus_highlighting.css b/src/stylesheets/focus_highlighting.css
index a1ebd5a..1e09c43 100644
--- a/src/stylesheets/focus_highlighting.css
+++ b/src/stylesheets/focus_highlighting.css
@@ -182,16 +182,16 @@ ads--CAutoHideTab {
 }
 
 
-ads--CAutoHideTab[sideTabBarArea="0"],
-ads--CAutoHideTab[sideTabBarArea="2"]  {
+ads--CAutoHideTab[sideBarLocation="0"],
+ads--CAutoHideTab[sideBarLocation="2"]  {
 	border-top: 5px solid rgba(0, 0, 0, 48);
 	margin-right: 6px;
 	min-height: 20;
 }
 
 
-ads--CAutoHideTab[sideTabBarArea="1"],
-ads--CAutoHideTab[sideTabBarArea="3"] {
+ads--CAutoHideTab[sideBarLocation="1"],
+ads--CAutoHideTab[sideBarLocation="3"] {
 	border-bottom: 5px solid rgba(0, 0, 0, 48);
 	margin-right: 6px;
 	min-height: 20;
@@ -199,52 +199,52 @@ ads--CAutoHideTab[sideTabBarArea="3"] {
 
 
 
-ads--CAutoHideTab:hover[sideTabBarArea="0"],
-ads--CAutoHideTab:hover[sideTabBarArea="2"]  {
+ads--CAutoHideTab:hover[sideBarLocation="0"],
+ads--CAutoHideTab:hover[sideBarLocation="2"]  {
 	border-top: 5px solid palette(highlight);
 	color: palette(highlight);
 }
 
 
-ads--CAutoHideTab:hover[sideTabBarArea="1"],
-ads--CAutoHideTab:hover[sideTabBarArea="3"]  {
+ads--CAutoHideTab:hover[sideBarLocation="1"],
+ads--CAutoHideTab:hover[sideBarLocation="3"]  {
 	border-bottom: 5px solid palette(highlight);
 	color: palette(highlight);
 }
 
-ads--CAutoHideTab[sideTabBarArea="0"][activeTab="true"],
-ads--CAutoHideTab[sideTabBarArea="2"][activeTab="true"]  {
+ads--CAutoHideTab[sideBarLocation="0"][activeTab="true"],
+ads--CAutoHideTab[sideBarLocation="2"][activeTab="true"]  {
 	border-top: 5px solid palette(highlight);
 }
 
 
-ads--CAutoHideTab[sideTabBarArea="1"][activeTab="true"],
-ads--CAutoHideTab[sideTabBarArea="3"][activeTab="true"] {
+ads--CAutoHideTab[sideBarLocation="1"][activeTab="true"],
+ads--CAutoHideTab[sideBarLocation="3"][activeTab="true"] {
 	border-bottom: 5px solid palette(highlight);
 }
 
 
 /*****************************************************************************
- * CAutoHideBar
+ * CAutoHideSideBar
  *****************************************************************************/
-ads--CAutoHideBar{
+ads--CAutoHideSideBar{
 	background: palette(window);
 }
 
 
-ads--CAutoHideBar[sideTabBarArea="0"] {
+ads--CAutoHideSideBar[sideBarLocation="0"] {
 	border-bottom: 1px solid palette(dark);
 }
 
-ads--CAutoHideBar[sideTabBarArea="1"] {
+ads--CAutoHideSideBar[sideBarLocation="1"] {
 	border-right: 1px solid palette(dark);
 }
 
-ads--CAutoHideBar[sideTabBarArea="2"] {
+ads--CAutoHideSideBar[sideBarLocation="2"] {
 	border-left: 1px solid palette(dark);
 }
 
-ads--CAutoHideBar[sideTabBarArea="3"] {
+ads--CAutoHideSideBar[sideBarLocation="3"] {
 	border-top: 1px solid palette(dark);
 }
 
@@ -321,19 +321,19 @@ ads--CResizeHandle {
 }
 
 
-ads--CAutoHideDockContainer[sideTabBarArea="0"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="0"] ads--CResizeHandle {
 	border-top: 1px solid palette(dark);
 }
 
-ads--CAutoHideDockContainer[sideTabBarArea="1"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="1"] ads--CResizeHandle {
 	border-left: 1px solid palette(dark);
 }
 
-ads--CAutoHideDockContainer[sideTabBarArea="2"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="2"] ads--CResizeHandle {
 	border-right: 1px solid palette(dark);
 }
 
-ads--CAutoHideDockContainer[sideTabBarArea="3"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="3"] ads--CResizeHandle {
 	border-top: 1px solid palette(dark);
 }
 
diff --git a/src/stylesheets/focus_highlighting_linux.css b/src/stylesheets/focus_highlighting_linux.css
index 03e88e9..3a78cef 100644
--- a/src/stylesheets/focus_highlighting_linux.css
+++ b/src/stylesheets/focus_highlighting_linux.css
@@ -252,64 +252,64 @@ ads--CAutoHideTab {
     border: none;
 }
 
-ads--CAutoHideTab[sideTabBarArea="1"],
-ads--CAutoHideTab[sideTabBarArea="3"] {
+ads--CAutoHideTab[sideBarLocation="1"],
+ads--CAutoHideTab[sideBarLocation="3"] {
     border-bottom: 5px solid rgba(0, 0, 0, 48);
 }
 
 
-ads--CAutoHideTab[sideTabBarArea="0"],
-ads--CAutoHideTab[sideTabBarArea="2"]  {
+ads--CAutoHideTab[sideBarLocation="0"],
+ads--CAutoHideTab[sideBarLocation="2"]  {
     border-top: 5px solid rgba(0, 0, 0, 48);
 }
 
 
-ads--CAutoHideTab:hover[sideTabBarArea="0"],
-ads--CAutoHideTab:hover[sideTabBarArea="2"]  {
+ads--CAutoHideTab:hover[sideBarLocation="0"],
+ads--CAutoHideTab:hover[sideBarLocation="2"]  {
     border-top: 5px solid palette(highlight);
     color: palette(highlight);
 }
 
 
-ads--CAutoHideTab:hover[sideTabBarArea="1"],
-ads--CAutoHideTab:hover[sideTabBarArea="3"]  {
+ads--CAutoHideTab:hover[sideBarLocation="1"],
+ads--CAutoHideTab:hover[sideBarLocation="3"]  {
     border-bottom: 5px solid palette(highlight);
     color: palette(highlight);
 }
 
-ads--CAutoHideTab[sideTabBarArea="0"][activeTab="true"],
-ads--CAutoHideTab[sideTabBarArea="2"][activeTab="true"]  {
+ads--CAutoHideTab[sideBarLocation="0"][activeTab="true"],
+ads--CAutoHideTab[sideBarLocation="2"][activeTab="true"]  {
     border-top: 5px solid palette(highlight);
 }
 
 
-ads--CAutoHideTab[sideTabBarArea="1"][activeTab="true"],
-ads--CAutoHideTab[sideTabBarArea="3"][activeTab="true"] {
+ads--CAutoHideTab[sideBarLocation="1"][activeTab="true"],
+ads--CAutoHideTab[sideBarLocation="3"][activeTab="true"] {
     border-bottom: 5px solid palette(highlight);
 }
 
 
 /*****************************************************************************
- * CAutoHideBar
+ * CAutoHideSideBar
  *****************************************************************************/
-ads--CAutoHideBar{
+ads--CAutoHideSideBar{
         background: palette(window);
 }
 
 
-ads--CAutoHideBar[sideTabBarArea="0"] {
+ads--CAutoHideSideBar[sideBarLocation="0"] {
     border-bottom: 1px solid palette(dark);
 }
 
-ads--CAutoHideBar[sideTabBarArea="1"] {
+ads--CAutoHideSideBar[sideBarLocation="1"] {
     border-right: 1px solid palette(dark);
 }
 
-ads--CAutoHideBar[sideTabBarArea="2"] {
+ads--CAutoHideSideBar[sideBarLocation="2"] {
     border-left: 1px solid palette(dark);
 }
 
-ads--CAutoHideBar[sideTabBarArea="3"] {
+ads--CAutoHideSideBar[sideBarLocation="3"] {
     border-top: 1px solid palette(dark);
 }
 
@@ -386,19 +386,19 @@ ads--CResizeHandle {
 }
 
 
-ads--CAutoHideDockContainer[sideTabBarArea="0"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="0"] ads--CResizeHandle {
     border-top: 1px solid palette(dark);
 }
 
-ads--CAutoHideDockContainer[sideTabBarArea="1"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="1"] ads--CResizeHandle {
     border-left: 1px solid palette(dark);
 }
 
-ads--CAutoHideDockContainer[sideTabBarArea="2"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="2"] ads--CResizeHandle {
     border-right: 1px solid palette(dark);
 }
 
-ads--CAutoHideDockContainer[sideTabBarArea="3"] ads--CResizeHandle {
+ads--CAutoHideDockContainer[sideBarLocation="3"] ads--CResizeHandle {
     border-top: 1px solid palette(dark);
 }
 
diff --git a/src/stylesheets/visual_studio_light.css b/src/stylesheets/visual_studio_light.css
index 892ab07..845c3d6 100644
--- a/src/stylesheets/visual_studio_light.css
+++ b/src/stylesheets/visual_studio_light.css
@@ -164,8 +164,8 @@ ads--CAutoHideTab
 	text-align: center;
 }
 
-ads--CAutoHideTab[sideTabBarArea="0"],
-ads--CAutoHideTab[sideTabBarArea="2"] 
+ads--CAutoHideTab[sideBarLocation="0"],
+ads--CAutoHideTab[sideBarLocation="2"] 
 {
 	border-top: 5px solid rgba(0, 0, 0, 48);
 	margin-right: 6px;
@@ -173,8 +173,8 @@ ads--CAutoHideTab[sideTabBarArea="2"]
 }
 
 
-ads--CAutoHideTab[sideTabBarArea="1"],
-ads--CAutoHideTab[sideTabBarArea="3"] 
+ads--CAutoHideTab[sideBarLocation="1"],
+ads--CAutoHideTab[sideBarLocation="3"] 
 {
 	border-bottom: 5px solid rgba(0, 0, 0, 48);
 	margin-right: 6px;
@@ -183,30 +183,30 @@ ads--CAutoHideTab[sideTabBarArea="3"]
 
 
 
-ads--CAutoHideTab:hover[sideTabBarArea="0"],
-ads--CAutoHideTab:hover[sideTabBarArea="2"]  
+ads--CAutoHideTab:hover[sideBarLocation="0"],
+ads--CAutoHideTab:hover[sideBarLocation="2"]  
 {
 	border-top: 5px solid palette(highlight);
 	color: palette(highlight);
 }
 
 
-ads--CAutoHideTab:hover[sideTabBarArea="1"],
-ads--CAutoHideTab:hover[sideTabBarArea="3"]  
+ads--CAutoHideTab:hover[sideBarLocation="1"],
+ads--CAutoHideTab:hover[sideBarLocation="3"]  
 {
 	border-bottom: 5px solid palette(highlight);
 	color: palette(highlight);
 }
 
-ads--CAutoHideTab[sideTabBarArea="0"][activeTab="true"],
-ads--CAutoHideTab[sideTabBarArea="2"][activeTab="true"]  
+ads--CAutoHideTab[sideBarLocation="0"][activeTab="true"],
+ads--CAutoHideTab[sideBarLocation="2"][activeTab="true"]  
 {
 	border-top: 5px solid palette(highlight);
 }
 
 
-ads--CAutoHideTab[sideTabBarArea="1"][activeTab="true"],
-ads--CAutoHideTab[sideTabBarArea="3"][activeTab="true"] 
+ads--CAutoHideTab[sideBarLocation="1"][activeTab="true"],
+ads--CAutoHideTab[sideBarLocation="3"][activeTab="true"] 
 {
 	border-bottom: 5px solid palette(highlight);
 }
@@ -227,7 +227,7 @@ ads--CAutoHideDockContainer::handle:horizontal {
 }
 */
 
-/*ads--CAutoHideDockContainer[sideTabBarArea="0"]:handle {
+/*ads--CAutoHideDockContainer[sideBarLocation="0"]:handle {
 	border: 1px solid palette(dark);
 	background: white;
 }*/