diff --git a/SukiUI.Demo/Common/ViewLocator.cs b/SukiUI.Demo/Common/ViewLocator.cs
index c9d0a5302..4f12def8b 100644
--- a/SukiUI.Demo/Common/ViewLocator.cs
+++ b/SukiUI.Demo/Common/ViewLocator.cs
@@ -12,23 +12,23 @@ public class ViewLocator : IDataTemplate
 
     public Control Build(object? data)
     {
-        var fullName = data?.GetType().FullName;
-        if (fullName is null)
-        {
-            return new TextBlock { Text = "Data is null or has no name." };
-        }
+        if(data is null) 
+            return new TextBlock { Text = "Data is null." };
+        
+        var fullName = data.GetType().FullName;
+        
+        if (string.IsNullOrWhiteSpace(fullName)) 
+            return new TextBlock { Text = "Type has no name, or name is empty." };
         
         var name = fullName.Replace("ViewModel", "View");
         var type = Type.GetType(name);
         if (type is null)
-        {
             return new TextBlock { Text = $"No View For {name}." };
-        }
 
-        if (!_controlCache.TryGetValue(data!, out var res))
+        if (!_controlCache.TryGetValue(data, out var res))
         {
             res ??= (Control)Activator.CreateInstance(type)!;
-            _controlCache[data!] = res;
+            _controlCache[data] = res;
         }
 
         res.DataContext = data;
diff --git a/SukiUI.Demo/Features/ControlsLibrary/TabControl/TabControlView.axaml b/SukiUI.Demo/Features/ControlsLibrary/TabControl/TabControlView.axaml
index 43e7673fd..d2d588e29 100644
--- a/SukiUI.Demo/Features/ControlsLibrary/TabControl/TabControlView.axaml
+++ b/SukiUI.Demo/Features/ControlsLibrary/TabControl/TabControlView.axaml
@@ -65,6 +65,16 @@
                         <TabControl TabStripPlacement="Bottom" />
                     </suki:GroupBox>
                 </suki:GlassCard>
+                <suki:GlassCard>
+                    <suki:GroupBox Header="Horizontal Left Tab Control">
+                        <TabControl Classes="HorizontalTabs" TabStripPlacement="Left" />
+                    </suki:GroupBox>
+                </suki:GlassCard>
+                <suki:GlassCard>
+                    <suki:GroupBox Header="Horizontal Right Tab Control">
+                        <TabControl Classes="HorizontalTabs" TabStripPlacement="Right" />
+                    </suki:GroupBox>
+                </suki:GlassCard>
             </WrapPanel>
         </ScrollViewer>
     </Grid>
diff --git a/SukiUI/Theme/TabControl.axaml b/SukiUI/Theme/TabControl.axaml
index a420bf404..49ac2c187 100644
--- a/SukiUI/Theme/TabControl.axaml
+++ b/SukiUI/Theme/TabControl.axaml
@@ -28,7 +28,7 @@
 
         <Style Selector="^[TabStripPlacement=Left] /template/ LayoutTransformControl#PART_LayoutTransform">
             <Setter Property="LayoutTransform" Value="rotate(-90deg)" />
-            <Style Selector="^ ItemsPresenter#PART_ItemsPresenter &gt; WrapPanel">
+            <Style Selector="^ ItemsPresenter#PART_ItemsPresenter WrapPanel">
                 <Setter Property="Orientation" Value="Horizontal" />
                 <Setter Property="FlowDirection" Value="RightToLeft" />
             </Style>
@@ -42,7 +42,24 @@
         <Style Selector="^[TabStripPlacement=Top] /template/ ItemsPresenter#PART_ItemsPresenter">
             <Setter Property="Margin" Value="{DynamicResource TabControlTopPlacementItemMargin}" />
         </Style>
+        
+        <Style Selector="^.HorizontalTabs">
+            <Style Selector="^[TabStripPlacement=Left] /template/ LayoutTransformControl#PART_LayoutTransform">
+                <Setter Property="LayoutTransform" Value="rotate(0)" />
+                <Style Selector="^ ItemsPresenter#PART_ItemsPresenter WrapPanel">
+                    <Setter Property="Orientation" Value="Vertical" />
+                    <Setter Property="FlowDirection" Value="RightToLeft" />
+                </Style>
+            </Style>
+            <Style Selector="^[TabStripPlacement=Right] /template/ LayoutTransformControl#PART_LayoutTransform">
+                <Setter Property="LayoutTransform" Value="rotate(0)" />
+                <Style Selector="^ ItemsPresenter#PART_ItemsPresenter WrapPanel">
+                    <Setter Property="Orientation" Value="Vertical" />
+                </Style>
+            </Style>
+        </Style>
     </ControlTheme>
+    
     <ControlTheme x:Key="{x:Type TabControl}"
                   BasedOn="{StaticResource SukiTabControlStyle}"
                   TargetType="TabControl" />