diff --git a/Maui.Tabs/BottomTabItem.xaml b/Maui.Tabs/BottomTabItem.xaml
index cd656ad..cbe50eb 100644
--- a/Maui.Tabs/BottomTabItem.xaml
+++ b/Maui.Tabs/BottomTabItem.xaml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<tabs:TabTextItem
-    x:Class="Sharpnado.Tabs.BottomTabItem"
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:effects="clr-namespace:Sharpnado.Tabs.Effects"
-    xmlns:tabs="clr-namespace:Sharpnado.Tabs"
-    x:Name="RootLayout">
+<tabs:TabTextItem x:Class="Sharpnado.Tabs.BottomTabItem"
+                  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                  xmlns:effects="clr-namespace:Sharpnado.Tabs.Effects"
+                  xmlns:tabs="clr-namespace:Sharpnado.Tabs"
+                  x:Name="RootLayout">
 
     <ContentView.Resources>
         <ResourceDictionary>
@@ -24,32 +23,29 @@
     </ContentView.Resources>
 
     <ContentView.Content>
-        <Grid
-            x:Name="Grid"
-            BackgroundColor="Transparent"
-            ColumnSpacing="0"
-            RowSpacing="0">
+        <Grid x:Name="Grid"
+              BackgroundColor="Transparent"
+              ColumnSpacing="0"
+              RowSpacing="0">
 
             <Grid.RowDefinitions>
                 <RowDefinition x:Name="IconRowDefinition" Height="8*" />
                 <RowDefinition x:Name="TextRowDefinition" Height="5*" />
             </Grid.RowDefinitions>
 
-            <Image
-                x:Name="Icon"
-                Grid.Row="0"
-                HeightRequest="{Binding Source={x:Reference RootLayout}, Path=IconSize}"
-                Source="{Binding Source={x:Reference RootLayout}, Path=IconImageSource}"
-                Style="{StaticResource TabIcon}"
-                WidthRequest="{Binding Source={x:Reference RootLayout}, Path=IconSize}" />
+            <Image x:Name="Icon"
+                   Grid.Row="0"
+                   Style="{StaticResource TabIcon}"
+                   WidthRequest="{Binding Source={x:Reference RootLayout}, Path=IconSize}"
+                   HeightRequest="{Binding Source={x:Reference RootLayout}, Path=IconSize}"
+                   Source="{Binding Source={x:Reference RootLayout}, Path=IconImageSource}" />
 
-            <Label
-                x:Name="IconText"
-                Grid.Row="1"
-                FontFamily="{Binding Source={x:Reference RootLayout}, Path=FontFamily}"
-                FontSize="{Binding Source={x:Reference RootLayout}, Path=LabelSize}"
-                Style="{StaticResource TabIconLabel}"
-                Text="{Binding Source={x:Reference RootLayout}, Path=Label}" />
+            <Label x:Name="IconText"
+                   Grid.Row="1"
+                   Style="{StaticResource TabIconLabel}"
+                   FontFamily="{Binding Source={x:Reference RootLayout}, Path=FontFamily}"
+                   FontSize="{Binding Source={x:Reference RootLayout}, Path=LabelSize}"
+                   Text="{Binding Source={x:Reference RootLayout}, Path=Label}" />
         </Grid>
     </ContentView.Content>
 </tabs:TabTextItem>
diff --git a/Maui.Tabs/Effects/Commands.cs b/Maui.Tabs/Effects/Commands.cs
index 135a892..2dac6dc 100644
--- a/Maui.Tabs/Effects/Commands.cs
+++ b/Maui.Tabs/Effects/Commands.cs
@@ -76,6 +76,17 @@ public static object GetLongTapParameter(BindableObject view) {
             return view.GetValue(LongTapParameterProperty);
         }
 
+        public static void UnregisterEffect(BindableObject bindable)
+        {
+            if (!(bindable is View view))
+                return;
+
+            var eff = view.Effects.FirstOrDefault(e => e is CommandsRoutingEffect);
+
+            if (eff == null) return;
+            view.Effects.Remove(eff);
+        }
+
         static void PropertyChanged(BindableObject bindable, object oldValue, object newValue) {
             if (!(bindable is View view))
                 return;
@@ -93,7 +104,7 @@ static void PropertyChanged(BindableObject bindable, object oldValue, object new
                 }
             }
             else {
-                if (eff == null || view.BindingContext == null) return;
+                if (eff == null) return;
                 view.Effects.Remove(eff);
                 if (EffectsConfig.AutoChildrenInputTransparent && bindable is Layout &&
                     EffectsConfig.GetChildrenInputTransparent(view)) {
diff --git a/Maui.Tabs/Effects/TouchEffect.cs b/Maui.Tabs/Effects/TouchEffect.cs
index 88568bc..8a8d6f1 100644
--- a/Maui.Tabs/Effects/TouchEffect.cs
+++ b/Maui.Tabs/Effects/TouchEffect.cs
@@ -1,4 +1,6 @@
-namespace Sharpnado.Tabs.Effects {
+using Microsoft.Maui.Controls;
+
+namespace Sharpnado.Tabs.Effects {
     public static class TouchEffect {
 
         public static readonly BindableProperty ColorProperty =
@@ -6,7 +8,7 @@ public static class TouchEffect {
                 "Color",
                 typeof(Color),
                 typeof(TouchEffect),
-                Colors.Transparent,
+                KnownColor.Accent,
                 propertyChanged: PropertyChanged
             );
 
@@ -18,6 +20,17 @@ public static Color GetColor(BindableObject view) {
             return (Color)view.GetValue(ColorProperty);
         }
 
+        public static void UnregisterEffect(BindableObject bindable)
+        {
+            if (!(bindable is View view))
+                return;
+
+            var eff = view.Effects.FirstOrDefault(e => e is TouchRoutingEffect);
+
+            if (eff == null) return;
+            view.Effects.Remove(eff);
+        }
+
         static void PropertyChanged(BindableObject bindable, object oldValue, object newValue) {
             if (!(bindable is View view))
                 return;
@@ -34,7 +47,7 @@ static void PropertyChanged(BindableObject bindable, object oldValue, object new
                 }
             }
             else {
-                if (eff == null || view.BindingContext == null) return;
+                if (eff == null) return;
                 view.Effects.Remove(eff);
                 if (EffectsConfig.AutoChildrenInputTransparent && bindable is Layout &&
                     EffectsConfig.GetChildrenInputTransparent(view)) {
diff --git a/Maui.Tabs/MaterialUnderlinedTabItem.xaml b/Maui.Tabs/MaterialUnderlinedTabItem.xaml
index b70ec55..ed1222b 100644
--- a/Maui.Tabs/MaterialUnderlinedTabItem.xaml
+++ b/Maui.Tabs/MaterialUnderlinedTabItem.xaml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<tabs:UnderlinedTabItemBase
-    x:Class="Sharpnado.Tabs.MaterialUnderlinedTabItem"
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:tabs="clr-namespace:Sharpnado.Tabs"
-    x:Name="RootLayout">
+<tabs:UnderlinedTabItemBase x:Class="Sharpnado.Tabs.MaterialUnderlinedTabItem"
+                            xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                            xmlns:tabs="clr-namespace:Sharpnado.Tabs"
+                            x:Name="RootLayout">
 
     <ContentView.Resources>
         <ResourceDictionary>
@@ -44,33 +43,28 @@
         <Grid x:Name="Grid" RowSpacing="0">
 
             <StackLayout x:Name="MainLayout" Style="{StaticResource LayoutIconWithText}">
-                <Path
-                    x:Name="IconPath"
-                    Data="{Binding Source={x:Reference RootLayout}, Path=GeometryIcon}"
-                    Style="{StaticResource TabIconPath}" />
-                <Image
-                    x:Name="IconImage"
-                    HeightRequest="{Binding Source={x:Reference RootLayout}, Path=IconSize}"
-                    Source="{Binding Source={x:Reference RootLayout}, Path=IconImageSource}"
-                    Style="{StaticResource TabIconImage}"
-                    WidthRequest="{Binding Source={x:Reference RootLayout}, Path=IconSize}" />
-                <Label
-                    x:Name="InnerLabel"
-                    FontFamily="{Binding Source={x:Reference RootLayout}, Path=FontFamily}"
-                    FontSize="{Binding Source={x:Reference RootLayout}, Path=LabelSize}"
-                    Style="{StaticResource TabTextHeader}"
-                    Text="{Binding Source={x:Reference RootLayout}, Path=Label}" />
+                <Path x:Name="IconPath"
+                      Style="{StaticResource TabIconPath}"
+                      Data="{Binding Source={x:Reference RootLayout}, Path=GeometryIcon}" />
+                <Image x:Name="IconImage"
+                       Style="{StaticResource TabIconImage}"
+                       WidthRequest="{Binding Source={x:Reference RootLayout}, Path=IconSize}"
+                       HeightRequest="{Binding Source={x:Reference RootLayout}, Path=IconSize}"
+                       Source="{Binding Source={x:Reference RootLayout}, Path=IconImageSource}" />
+                <Label x:Name="InnerLabel"
+                       Style="{StaticResource TabTextHeader}"
+                       FontFamily="{Binding Source={x:Reference RootLayout}, Path=FontFamily}"
+                       FontSize="{Binding Source={x:Reference RootLayout}, Path=LabelSize}"
+                       Text="{Binding Source={x:Reference RootLayout}, Path=Label}" />
             </StackLayout>
-            <BoxView
-                x:Name="Underline"
-                HeightRequest="0"
-                HorizontalOptions="Center"
-                VerticalOptions="End">
+            <BoxView x:Name="Underline"
+                     HeightRequest="0"
+                     HorizontalOptions="Center"
+                     VerticalOptions="End">
                 <BoxView.Triggers>
-                    <DataTrigger
-                        Binding="{Binding Source={x:Reference RootLayout}, Path=IsSelected}"
-                        TargetType="BoxView"
-                        Value="true">
+                    <DataTrigger Binding="{Binding Source={x:Reference RootLayout}, Path=IsSelected}"
+                                 TargetType="BoxView"
+                                 Value="true">
                         <Setter Property="HeightRequest" Value="{Binding Source={x:Reference RootLayout}, Path=UnderlineHeight}" />
                     </DataTrigger>
                 </BoxView.Triggers>
diff --git a/Maui.Tabs/Maui.Tabs.csproj b/Maui.Tabs/Maui.Tabs.csproj
index 183d4f9..d034962 100644
--- a/Maui.Tabs/Maui.Tabs.csproj
+++ b/Maui.Tabs/Maui.Tabs.csproj
@@ -22,9 +22,9 @@
 
 	<PropertyGroup>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
-		<AssemblyVersion>3.0.1</AssemblyVersion>
-		<AssemblyFileVersion>3.0.1</AssemblyFileVersion>
-		<Version>3.0.1</Version>
+		<AssemblyVersion>3.1.0</AssemblyVersion>
+		<AssemblyFileVersion>3.1.0</AssemblyFileVersion>
+		<Version>3.1.0</Version>
 		<PackOnBuild>true</PackOnBuild>
 		<NeutralLanguage>en</NeutralLanguage>
 
@@ -41,7 +41,7 @@
 		<PackageReadmeFile>docs\ReadMe.md</PackageReadmeFile>
 		<PackageTags>maui dotnetmaui xamarin.forms android ios uwp netstandard tabs segmented control bottombar fixed tabs scrollable tabs badge</PackageTags>
 		<PackageReleaseNotes>
-			First MAUI release \o/
+			Fixes for touch effects on tabs
 		</PackageReleaseNotes>
 
 		<Title>"Pure" MAUI Tabs (no renderers)</Title>
diff --git a/Maui.Tabs/Platforms/Android/CommandsPlatform.cs b/Maui.Tabs/Platforms/Android/CommandsPlatform.cs
index e88da21..111e569 100644
--- a/Maui.Tabs/Platforms/Android/CommandsPlatform.cs
+++ b/Maui.Tabs/Platforms/Android/CommandsPlatform.cs
@@ -20,7 +20,8 @@
 namespace Sharpnado.Tabs.Effects.Droid {
     public class CommandsPlatform : PlatformEffect {
         public View View => Control ?? Container;
-        public bool IsDisposed => (Container as IVisualElementRenderer)?.Element == null;
+        public bool IsDisposed => Container is null 
+            || (Container is Java.Lang.Object javaContainer) && javaContainer.Handle == IntPtr.Zero;
 
         DateTime _tapTime;
         readonly Rect _rect = new Rect();
@@ -33,7 +34,7 @@ protected override void OnAttached() {
             View.Clickable = true;
             View.LongClickable = true;
             View.SoundEffectsEnabled = true;
-            TouchCollector.Add(View, OnTouch);
+            TouchCollector.Add(View, OnTouch, ActionType.Tap);
         }
 
         void OnTouch(View.TouchEventArgs args) {
@@ -83,7 +84,7 @@ void LongClickHandler() {
 
         protected override void OnDetached() {
             if (IsDisposed) return;
-            TouchCollector.Delete(View, OnTouch);
+            TouchCollector.Delete(View, OnTouch, ActionType.Tap);
         }
     }
 }
diff --git a/Maui.Tabs/Platforms/Android/TouchCollector.cs b/Maui.Tabs/Platforms/Android/TouchCollector.cs
index b9ed4cc..4cfbb44 100644
--- a/Maui.Tabs/Platforms/Android/TouchCollector.cs
+++ b/Maui.Tabs/Platforms/Android/TouchCollector.cs
@@ -11,37 +11,52 @@
 using View = Android.Views.View;
 
 namespace Sharpnado.Tabs.Effects.Droid.GestureCollectors {
+    enum ActionType
+    {
+        Ripple = 0,
+        Tap = 1,
+    }
+
+    record ActionSource(ActionType ActionType, Action<View.TouchEventArgs> Action);
+
     internal static class TouchCollector {
-        static Dictionary<View, List<Action<View.TouchEventArgs>>> Collection { get; } =
-            new Dictionary<View, List<Action<View.TouchEventArgs>>>();
+        static Dictionary<View, List<ActionSource>> Collection { get; } =
+            new ();
 
         static View _activeView;
 
-        public static void Add(View view, Action<View.TouchEventArgs> action) {
+        public static void Add(View view, Action<View.TouchEventArgs> action, ActionType actionType) {
             if (Collection.ContainsKey(view)) {
-                Collection[view].Add(action);
+                Collection[view].Add(new ActionSource(actionType, action));
             }
             else {
                 view.Touch += ActionActivator;
-                Collection.Add(view, new List<Action<View.TouchEventArgs>> { action });
+                Collection.Add(view, [ new(actionType, action) ] );
             }
         }
 
-        public static void Delete(View view, Action<View.TouchEventArgs> action) {
+        public static void Delete(View view, Action<View.TouchEventArgs> action, ActionType actionType) {
             if (!Collection.ContainsKey(view)) return;
 
             var actions = Collection[view];
-            actions.Remove(action);
+            actions.Remove(new ActionSource(actionType, action));
 
             if (actions.Count != 0) return;
             view.Touch -= ActionActivator;
             Collection.Remove(view);
         }
 
-        static void ActionActivator(object sender, View.TouchEventArgs e) {
+        static async void ActionActivator(object sender, View.TouchEventArgs e) {
             var view = (View)sender;
             if (!Collection.ContainsKey(view) || (_activeView != null && _activeView != view)) return;
 
+            var actions = Collection[view].ToArray();
+            bool rippleRan = false;
+            foreach (var valueAction in actions.Where(source => source.ActionType == ActionType.Ripple)) {
+                valueAction?.Action.Invoke(e);
+                rippleRan = true;
+            }
+
             switch (e.Event.Action) {
                 case MotionEventActions.Down:
                     _activeView = view;
@@ -55,9 +70,13 @@ static void ActionActivator(object sender, View.TouchEventArgs e) {
                     break;
             }
 
-            var actions = Collection[view].ToArray();
-            foreach (var valueAction in actions) {
-                valueAction?.Invoke(e);
+            if (rippleRan) 
+            {
+                await Task.Delay(200);
+            }
+
+            foreach (var valueAction in actions.Where(source => source.ActionType == ActionType.Tap)) {
+                valueAction?.Action.Invoke(e);
             }
         }
     }
diff --git a/Maui.Tabs/Platforms/Android/TouchEffectPlatform.cs b/Maui.Tabs/Platforms/Android/TouchEffectPlatform.cs
index e618481..33a5249 100644
--- a/Maui.Tabs/Platforms/Android/TouchEffectPlatform.cs
+++ b/Maui.Tabs/Platforms/Android/TouchEffectPlatform.cs
@@ -55,7 +55,7 @@ protected override void OnAttached() {
                 _viewOverlay.Background = CreateRipple(_color);
 
             SetEffectColor();
-            TouchCollector.Add(View, OnTouch);
+            TouchCollector.Add(View, OnTouch, ActionType.Ripple);
 
             group.AddView(_viewOverlay);
             _viewOverlay.BringToFront();
@@ -78,7 +78,7 @@ protected override void OnDetached() {
             if (EnableRipple)
                 _ripple?.Dispose();
 
-            TouchCollector.Delete(View, OnTouch);
+            TouchCollector.Delete(View, OnTouch, ActionType.Ripple);
         }
 
         protected override void OnElementPropertyChanged(PropertyChangedEventArgs e) {
diff --git a/Maui.Tabs/Platforms/iOS/TintableImageEffect.cs b/Maui.Tabs/Platforms/iOS/TintableImageEffect.cs
index a6e3292..b12abd9 100644
--- a/Maui.Tabs/Platforms/iOS/TintableImageEffect.cs
+++ b/Maui.Tabs/Platforms/iOS/TintableImageEffect.cs
@@ -88,7 +88,7 @@ private void UpdateColor()
         private async Task DelayedPost(int milliseconds, Action action)
         {
             await Task.Delay(milliseconds);
-            Device.BeginInvokeOnMainThread(action);
+            MainThread.BeginInvokeOnMainThread(action);
         }
     }
 }
diff --git a/Maui.Tabs/Platforms/iOS/TouchEffectPlatform.cs b/Maui.Tabs/Platforms/iOS/TouchEffectPlatform.cs
index 02397ce..e41cf2d 100644
--- a/Maui.Tabs/Platforms/iOS/TouchEffectPlatform.cs
+++ b/Maui.Tabs/Platforms/iOS/TouchEffectPlatform.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
-using Microsoft.Maui.Controls.Compatibility.Platform.iOS;
 using Microsoft.Maui.Controls.Platform;
+using Microsoft.Maui.Platform;
 using ObjCRuntime;
 using Sharpnado.Tabs.Effects.iOS.GestureCollectors;
 using Sharpnado.Tabs.Effects.iOS.GestureRecognizers;
@@ -80,7 +80,7 @@ void UpdateEffectColor() {
 
             InternalLogger.Debug($"UpdateEffectColor");
             _alpha = color.Alpha < 1.0 ? 1 : (float)0.3;
-            _layer.BackgroundColor = color.ToUIColor();
+            _layer.BackgroundColor = color.ToPlatform();
         }
 
         void BringLayer() {
diff --git a/Maui.Tabs/UnderlinedTabItem.xaml b/Maui.Tabs/UnderlinedTabItem.xaml
index 5470815..d4a0a91 100644
--- a/Maui.Tabs/UnderlinedTabItem.xaml
+++ b/Maui.Tabs/UnderlinedTabItem.xaml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<tabs:UnderlinedTabItemBase
-    x:Class="Sharpnado.Tabs.UnderlinedTabItem"
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:tabs="clr-namespace:Sharpnado.Tabs"
-    x:Name="RootLayout">
+<tabs:UnderlinedTabItemBase x:Class="Sharpnado.Tabs.UnderlinedTabItem"
+                            xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                            xmlns:tabs="clr-namespace:Sharpnado.Tabs"
+                            x:Name="RootLayout">
 
     <ContentView.Resources>
         <ResourceDictionary>
@@ -23,29 +22,26 @@
     <ContentView.Content>
         <Grid x:Name="Grid" RowSpacing="0">
 
-            <BoxView
-                x:Name="Underline"
-                HeightRequest="0"
-                HorizontalOptions="Center"
-                VerticalOptions="End">
+            <BoxView x:Name="Underline"
+                     HeightRequest="0"
+                     HorizontalOptions="Center"
+                     VerticalOptions="End">
                 <BoxView.Triggers>
-                    <DataTrigger
-                        Binding="{Binding Source={x:Reference RootLayout}, Path=IsSelected}"
-                        TargetType="BoxView"
-                        Value="true">
+                    <DataTrigger Binding="{Binding Source={x:Reference RootLayout}, Path=IsSelected}"
+                                 TargetType="BoxView"
+                                 Value="true">
                         <Setter Property="HeightRequest" Value="{Binding Source={x:Reference RootLayout}, Path=UnderlineHeight}" />
                     </DataTrigger>
                 </BoxView.Triggers>
             </BoxView>
 
-            <Label
-                x:Name="InnerLabel"
-                FontFamily="{Binding Source={x:Reference RootLayout}, Path=FontFamily}"
-                FontSize="{Binding Source={x:Reference RootLayout}, Path=LabelSize}"
-                HorizontalOptions="Center"
-                Style="{StaticResource TabTextHeader}"
-                Text="{Binding Source={x:Reference RootLayout}, Path=Label}"
-                VerticalOptions="Center" />
+            <Label x:Name="InnerLabel"
+                   Style="{StaticResource TabTextHeader}"
+                   HorizontalOptions="Center"
+                   VerticalOptions="Center"
+                   FontFamily="{Binding Source={x:Reference RootLayout}, Path=FontFamily}"
+                   FontSize="{Binding Source={x:Reference RootLayout}, Path=LabelSize}"
+                   Text="{Binding Source={x:Reference RootLayout}, Path=Label}" />
 
         </Grid>
     </ContentView.Content>
diff --git a/MauiSample/App.xaml.cs b/MauiSample/App.xaml.cs
index 9d81503..a0989ba 100644
--- a/MauiSample/App.xaml.cs
+++ b/MauiSample/App.xaml.cs
@@ -11,5 +11,6 @@ public App(BottomTabsPageViewModel mainViewModel)
         Current!.UserAppTheme = AppTheme.Dark;
 
 		MainPage = new MainPage(mainViewModel);
+        // MainPage = new Playground();
 	}
 }
diff --git a/MauiSample/MainPage.xaml b/MauiSample/MainPage.xaml
index 44e97e6..cfd9e30 100644
--- a/MauiSample/MainPage.xaml
+++ b/MauiSample/MainPage.xaml
@@ -29,9 +29,9 @@
                     <GradientStop Offset="1" Color="Transparent" />
                 </LinearGradientBrush>
             </ContentView.Background>
-            <Image Margin="0,20" Source="logo.png">
+            <Image Margin="0,20" Source="sharpnado.png">
                 <Image.Shadow>
-                    <Shadow Brush="{StaticResource Black}"
+                    <Shadow Brush="{StaticResource Primary}"
                             Opacity="0.9"
                             Radius="30"
                             Offset="0,10" />
@@ -77,7 +77,8 @@
                               Orientation="Horizontal"
                               SegmentedOutlineColor="{StaticResource Gray950}"
                               SelectedIndex="{Binding Source={x:Reference Switcher}, Path=SelectedIndex, Mode=TwoWay}"
-                              TabType="Fixed">
+                              TabType="Fixed"
+                              UseMauiTapGesture="True">
                 <tabs:TabHostView.Shadow>
                     <Shadow Brush="{StaticResource Primary}"
                             Opacity="0.7"
diff --git a/MauiSample/MainPage.xaml.cs b/MauiSample/MainPage.xaml.cs
index 7a753e6..d5c444a 100644
--- a/MauiSample/MainPage.xaml.cs
+++ b/MauiSample/MainPage.xaml.cs
@@ -1,4 +1,5 @@
-using MauiSample.Presentation.ViewModels;
+using Android.Widget;
+using MauiSample.Presentation.ViewModels;
 
 namespace MauiSample;
 
@@ -9,6 +10,7 @@ public MainPage(BottomTabsPageViewModel viewModel)
 		InitializeComponent();
 
         BindingContext = viewModel;
+        // Switcher.SelectedIndex = 3;
     }
 
     private BottomTabsPageViewModel ViewModel => (BottomTabsPageViewModel)BindingContext;
diff --git a/MauiSample/MauiSample.sln b/MauiSample/MauiSample.sln
index 8f2b1f7..e94d5a6 100644
--- a/MauiSample/MauiSample.sln
+++ b/MauiSample/MauiSample.sln
@@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "configuration", "configurat
 		..\Sharpnado.Tabs.nuspec = ..\Sharpnado.Tabs.nuspec
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MauiShellSample", "..\MauiShellSample\MauiShellSample.csproj", "{75F26D59-6560-4B75-94ED-7A1947BEBF9A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiShellSample", "..\MauiShellSample\MauiShellSample.csproj", "{75F26D59-6560-4B75-94ED-7A1947BEBF9A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,6 +35,7 @@ Global
 		{528FB5B5-CBFA-4820-B915-937F2578807C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75F26D59-6560-4B75-94ED-7A1947BEBF9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{75F26D59-6560-4B75-94ED-7A1947BEBF9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75F26D59-6560-4B75-94ED-7A1947BEBF9A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{75F26D59-6560-4B75-94ED-7A1947BEBF9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75F26D59-6560-4B75-94ED-7A1947BEBF9A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
diff --git a/MauiSample/Playground.xaml b/MauiSample/Playground.xaml
new file mode 100644
index 0000000..76b3f9d
--- /dev/null
+++ b/MauiSample/Playground.xaml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<ContentPage x:Class="MauiSample.Playground"
+             xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:mauiSample="clr-namespace:MauiSample"
+             xmlns:tabs="http://sharpnado.com"
+             BackgroundColor="#717272">
+    <ContentPage.Content>
+        <AbsoluteLayout>
+
+            <tabs:TabHostView AbsoluteLayout.LayoutFlags="HeightProportional"
+                              AbsoluteLayout.LayoutBounds="0, 0, 50, 1"
+                              Margin="0"
+                              Padding="0"
+                              BackgroundColor="#002DB3"
+                              Orientation="Vertical"
+                              TabType="Fixed">
+                <tabs:TabHostView.Tabs>
+                    <mauiSample:VerticalTabItem IsSelected="True"
+                                                Label="S1"
+                                                LabelSize="24"
+                                                SelectedTabColor="White"
+                                                SelectorColor="#0040FF"
+                                                UnselectedLabelColor="Gray" />
+                    <mauiSample:VerticalTabItem Label="S2"
+                                                LabelSize="24"
+                                                SelectedTabColor="White"
+                                                SelectorColor="#0040FF"
+                                                UnselectedLabelColor="Gray" />
+                    <mauiSample:VerticalTabItem Label="M1"
+                                                LabelSize="24"
+                                                SelectedTabColor="White"
+                                                SelectorColor="#0040FF"
+                                                UnselectedLabelColor="Gray">
+                        <tabs:TabItem.Badge>
+                            <tabs:BadgeView Margin="0,0,3,35"
+                                            HorizontalOptions="End"
+                                            VerticalOptions="Center"
+                                            BackgroundColor="Red"
+                                            ShowIndicator="True" />
+                        </tabs:TabItem.Badge>
+                    </mauiSample:VerticalTabItem>
+                </tabs:TabHostView.Tabs>
+            </tabs:TabHostView>
+
+            <!--  SelectedIndex="{Binding SelectedViewModelIndex, Mode=TwoWay}"  -->
+            <tabs:ViewSwitcher x:Name="ViewSwitcher"
+                               AbsoluteLayout.LayoutFlags="SizeProportional"
+                               AbsoluteLayout.LayoutBounds="160, 0, 1, 1"
+                               Animate="True" />
+        </AbsoluteLayout>
+    </ContentPage.Content>
+</ContentPage>
diff --git a/MauiSample/Playground.xaml.cs b/MauiSample/Playground.xaml.cs
new file mode 100644
index 0000000..a3d12de
--- /dev/null
+++ b/MauiSample/Playground.xaml.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MauiSample;
+
+public partial class Playground : ContentPage
+{
+    public Playground()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/MauiSample/Presentation/CustomViews/RichLabel.cs b/MauiSample/Presentation/CustomViews/RichLabel.cs
index ba9a56b..d345178 100644
--- a/MauiSample/Presentation/CustomViews/RichLabel.cs
+++ b/MauiSample/Presentation/CustomViews/RichLabel.cs
@@ -53,7 +53,6 @@ private static void OnMarkdownPropertyChanged(BindableObject bindable, object ol
 
         private static void OnBoldFontFamilyPropertyChanged(BindableObject bindable, object oldValue, object newValue)
         {
-            throw new System.NotImplementedException();
         }
 
         private void ProcessMarkdown(string markdown)
diff --git a/MauiSample/Presentation/ViewModels/TabsLayout/BottomTabsPageViewModel.cs b/MauiSample/Presentation/ViewModels/TabsLayout/BottomTabsPageViewModel.cs
index b8ab142..cf7d355 100644
--- a/MauiSample/Presentation/ViewModels/TabsLayout/BottomTabsPageViewModel.cs
+++ b/MauiSample/Presentation/ViewModels/TabsLayout/BottomTabsPageViewModel.cs
@@ -6,7 +6,7 @@ namespace MauiSample.Presentation.ViewModels
 {
     public class BottomTabsPageViewModel : ANavigableViewModel
     {
-        private int _selectedViewModelIndex = 0;
+        private int _selectedViewModelIndex;
 
         public BottomTabsPageViewModel(
             INavigationService navigationService,
@@ -16,6 +16,9 @@ public BottomTabsPageViewModel(
         {
             HomePageViewModel = new HomePageViewModel(navigationService, sillyDudeService);
             GridPageViewModel = new GridPageViewModel(navigationService, sillyDudeService);
+
+            // If you want to start at the 3rd page
+            // SelectedViewModelIndex = 2;
         }
 
         public int SelectedViewModelIndex
diff --git a/MauiSample/Presentation/Views/TabM.xaml b/MauiSample/Presentation/Views/TabM.xaml
index f6b96ff..b5b2786 100644
--- a/MauiSample/Presentation/Views/TabM.xaml
+++ b/MauiSample/Presentation/Views/TabM.xaml
@@ -7,7 +7,7 @@
 
     <ContentView.Resources>
         <ResourceDictionary>
-            <Style x:Key="ScrollableTabStyle" TargetType="tabs:UnderlinedTabItem">
+            <Style x:Key="ScrollableTabStyle" TargetType="tabs:MaterialUnderlinedTabItem">
                 <Setter Property="SelectedTabColor" Value="{StaticResource Primary}" />
                 <Setter Property="FontFamily" Value="OpenSansSemibold" />
                 <Setter Property="LabelSize" Value="14" />
@@ -168,16 +168,17 @@
                                       BackgroundColor="{StaticResource Gray900}"
                                       SelectedIndex="1"
                                       ShowScrollbar="False"
-                                      TabType="Scrollable">
-                        <tabs:UnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="Super" />
-                        <tabs:UnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="MAUI" />
-                        <tabs:UnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="Sample" />
-                        <tabs:UnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="Super" />
-                        <tabs:UnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="MAUI" />
-                        <tabs:UnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="Sample" />
-                        <tabs:UnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="Super" />
-                        <tabs:UnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="MAUI" />
-                        <tabs:UnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="Sample" />
+                                      TabType="Scrollable"
+                                      UseMauiTapGesture="true">
+                        <tabs:MaterialUnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="Super" />
+                        <tabs:MaterialUnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="MAUI" />
+                        <tabs:MaterialUnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="Sample" />
+                        <tabs:MaterialUnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="Super" />
+                        <tabs:MaterialUnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="MAUI" />
+                        <tabs:MaterialUnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="Sample" />
+                        <tabs:MaterialUnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="Super" />
+                        <tabs:MaterialUnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="MAUI" />
+                        <tabs:MaterialUnderlinedTabItem Style="{StaticResource ScrollableTabStyle}" Label="Sample" />
                     </tabs:TabHostView>
 
                     <Label Grid.Row="2"
diff --git a/MauiSample/Resources/Images/logo.png b/MauiSample/Resources/Images/sharpnado.png
similarity index 100%
rename from MauiSample/Resources/Images/logo.png
rename to MauiSample/Resources/Images/sharpnado.png
diff --git a/MauiSample/VerticalTabItem.xaml b/MauiSample/VerticalTabItem.xaml
new file mode 100644
index 0000000..f3e9bb0
--- /dev/null
+++ b/MauiSample/VerticalTabItem.xaml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<tabs:TabTextItem x:Class="MauiSample.VerticalTabItem"
+                  xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                  xmlns:tabs="http://sharpnado.com"
+                  x:Name="RootLayout">
+
+    <ContentView.Resources>
+        <ResourceDictionary>
+            <Color x:Key="HeaderTextColor">#acacac</Color>
+
+            <Style x:Key="TabTextHeader" TargetType="Label">
+                <Setter Property="TextColor" Value="{StaticResource HeaderTextColor}" />
+                <Setter Property="LineBreakMode" Value="WordWrap" />
+                <Setter Property="HorizontalTextAlignment" Value="Center" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+            </Style>
+        </ResourceDictionary>
+    </ContentView.Resources>
+
+    <ContentView.Content>
+        <Grid x:Name="Grid" RowSpacing="0">
+
+            <Frame x:Name="Selector"
+                   Margin="4"
+                   BorderColor="Transparent"
+                   CornerRadius="12"
+                   IsVisible="{Binding Source={x:Reference RootLayout}, Path=IsSelected}" />
+
+            <!--<Frame WidthRequest="40"
+                   HeightRequest="40"
+                   HorizontalOptions="Center"
+                   VerticalOptions="Center"
+                   BackgroundColor="White"
+                   BorderColor="Transparent"
+                   CornerRadius="5"
+                   IsVisible="{Binding Source={x:Reference RootLayout}, Path=IsSelected}" />-->
+
+            <!--<BoxView x:Name="Underline"
+                     WidthRequest="0"
+                     HorizontalOptions="End"
+                     VerticalOptions="Fill"
+                     IsVisible="{Binding Source={x:Reference RootLayout}, Path=IsSelected}" />-->
+
+            <Label x:Name="InnerLabel"
+                   Style="{StaticResource TabTextHeader}"
+                   HorizontalOptions="Center"
+                   VerticalOptions="Center"
+                   FontFamily="{Binding Source={x:Reference RootLayout}, Path=FontFamily}"
+                   FontSize="{Binding Source={x:Reference RootLayout}, Path=LabelSize}"
+                   Text="{Binding Source={x:Reference RootLayout}, Path=Label}" />
+
+        </Grid>
+    </ContentView.Content>
+</tabs:TabTextItem>
\ No newline at end of file
diff --git a/MauiSample/VerticalTabItem.xaml.cs b/MauiSample/VerticalTabItem.xaml.cs
new file mode 100644
index 0000000..d492058
--- /dev/null
+++ b/MauiSample/VerticalTabItem.xaml.cs
@@ -0,0 +1,58 @@
+using Sharpnado.Tabs;
+using System.Runtime.CompilerServices;
+
+namespace MauiSample
+{
+    public partial class VerticalTabItem : TabTextItem
+    {
+        public static readonly BindableProperty SelectorColorProperty = BindableProperty.Create(
+            nameof(SelectorColor),
+            typeof(Color),
+            typeof(TabTextItem),
+            Colors.DodgerBlue);
+
+        public Color SelectorColor
+        {
+            get => (Color)GetValue(SelectorColorProperty);
+            set => SetValue(SelectorColorProperty, value);
+        }
+
+        public VerticalTabItem()
+        {
+            InitializeComponent();
+
+        }
+
+        protected override void OnBadgeChanged(BadgeView oldBadge)
+        {
+            if (oldBadge != null)
+            {
+                Grid.Children.Remove(Badge);
+                return;
+            }
+
+            Grid.Children.Add(Badge);
+        }
+
+        protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            base.OnPropertyChanged(propertyName);
+
+            switch (propertyName)
+            {
+                case nameof(IsSelectable):
+                case nameof(UnselectedLabelColor):
+                case nameof(SelectedTabColor):
+                case nameof(IsSelected):
+                    UpdateColors();
+                    break;
+            }
+        }
+
+        private void UpdateColors()
+        {
+            InnerLabel.TextColor = IsSelectable ? IsSelected ? SelectedTabColor : UnselectedLabelColor : DisabledLabelColor;
+            Selector.BackgroundColor = SelectorColor;
+        }
+    }
+}
\ No newline at end of file
diff --git a/MauiShellSample/App.xaml b/MauiShellSample/App.xaml
index 76d14bc..6a00270 100644
--- a/MauiShellSample/App.xaml
+++ b/MauiShellSample/App.xaml
@@ -1,8 +1,8 @@
-<?xml version = "1.0" encoding = "UTF-8" ?>
-<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<?xml version="1.0" encoding="UTF-8" ?>
+<Application x:Class="MauiShellSample.App"
+             xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:MauiShellSample"
-             x:Class="MauiShellSample.App">
+             xmlns:local="clr-namespace:MauiShellSample">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/MauiShellSample/AppShell.xaml b/MauiShellSample/AppShell.xaml
index 701e557..2c333cc 100644
--- a/MauiShellSample/AppShell.xaml
+++ b/MauiShellSample/AppShell.xaml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<Shell
-    x:Class="MauiShellSample.AppShell"
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:MauiShellSample"
-    Shell.FlyoutBehavior="Disabled"
-    Title="MauiShellSample">
+<Shell x:Class="MauiShellSample.AppShell"
+       xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+       xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+       xmlns:local="clr-namespace:MauiShellSample"
+       Title="MauiShellSample"
+       Shell.FlyoutBehavior="Disabled">
 
     <TabBar>
         <Tab Title="One">
-            <ShellContent
-                Title="One"
-                ContentTemplate="{DataTemplate local:MainPage}"
-                Route="OnePage" /> 
+            <ShellContent Title="One"
+                          ContentTemplate="{DataTemplate local:MainPage}"
+                          Route="OnePage" />
         </Tab>
         <Tab Title="Two">
-            <ShellContent
-                Title="Two"
-                ContentTemplate="{DataTemplate local:MainPage}"
-                Route="TwoPage" /> 
+            <ShellContent Title="Two"
+                          ContentTemplate="{DataTemplate local:MainPage}"
+                          Route="TwoPage" />
         </Tab>
     </TabBar>
 
diff --git a/MauiShellSample/MainPage.xaml b/MauiShellSample/MainPage.xaml
index d858a21..28ee679 100644
--- a/MauiShellSample/MainPage.xaml
+++ b/MauiShellSample/MainPage.xaml
@@ -1,35 +1,29 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="MauiShellSample.MainPage">
+<ContentPage x:Class="MauiShellSample.MainPage"
+             xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
     <ScrollView>
-        <VerticalStackLayout
-            Padding="30,0"
-            Spacing="25">
-            <Image
-                Source="dotnet_bot.png"
-                HeightRequest="185"
-                Aspect="AspectFit"
-                SemanticProperties.Description="dot net bot in a race car number eight" />
+        <VerticalStackLayout Padding="30,0" Spacing="25">
+            <Image HeightRequest="185"
+                   Aspect="AspectFit"
+                   SemanticProperties.Description="dot net bot in a race car number eight"
+                   Source="dotnet_bot.png" />
 
-            <Label
-                Text="Hello, World!"
-                Style="{StaticResource Headline}"
-                SemanticProperties.HeadingLevel="Level1" />
+            <Label Style="{StaticResource Headline}"
+                   SemanticProperties.HeadingLevel="Level1"
+                   Text="Hello, World!" />
 
-            <Label
-                Text="Welcome to &#10;.NET Multi-platform App UI"
-                Style="{StaticResource SubHeadline}"
-                SemanticProperties.HeadingLevel="Level2"
-                SemanticProperties.Description="Welcome to dot net Multi platform App U I" />
+            <Label Style="{StaticResource SubHeadline}"
+                   SemanticProperties.Description="Welcome to dot net Multi platform App U I"
+                   SemanticProperties.HeadingLevel="Level2"
+                   Text="Welcome to &#10;.NET Multi-platform App UI" />
 
-            <Button
-                x:Name="CounterBtn"
-                Text="Click me" 
-                SemanticProperties.Hint="Counts the number of times you click"
-                Clicked="OnCounterClicked"
-                HorizontalOptions="Fill" />
+            <Button x:Name="CounterBtn"
+                    HorizontalOptions="Fill"
+                    Clicked="OnCounterClicked"
+                    SemanticProperties.Hint="Counts the number of times you click"
+                    Text="Click me" />
         </VerticalStackLayout>
     </ScrollView>
 
diff --git a/MauiShellSample/Resources/Styles/Colors.xaml b/MauiShellSample/Resources/Styles/Colors.xaml
index 6ab4277..9f5cdd5 100644
--- a/MauiShellSample/Resources/Styles/Colors.xaml
+++ b/MauiShellSample/Resources/Styles/Colors.xaml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <?xaml-comp compile="true" ?>
-<ResourceDictionary 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
-    <!-- Note: For Android please see also Platforms\Android\Resources\values\colors.xml -->
+    <!--  Note: For Android please see also Platforms\Android\Resources\values\colors.xml  -->
 
     <Color x:Key="Primary">#512BD4</Color>
     <Color x:Key="PrimaryDark">#ac99ea</Color>
@@ -28,18 +26,18 @@
     <Color x:Key="Gray900">#212121</Color>
     <Color x:Key="Gray950">#141414</Color>
 
-    <SolidColorBrush x:Key="PrimaryBrush" Color="{StaticResource Primary}"/>
-    <SolidColorBrush x:Key="SecondaryBrush" Color="{StaticResource Secondary}"/>
-    <SolidColorBrush x:Key="TertiaryBrush" Color="{StaticResource Tertiary}"/>
-    <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource White}"/>
-    <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource Black}"/>
+    <SolidColorBrush x:Key="PrimaryBrush" Color="{StaticResource Primary}" />
+    <SolidColorBrush x:Key="SecondaryBrush" Color="{StaticResource Secondary}" />
+    <SolidColorBrush x:Key="TertiaryBrush" Color="{StaticResource Tertiary}" />
+    <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource White}" />
+    <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource Black}" />
 
-    <SolidColorBrush x:Key="Gray100Brush" Color="{StaticResource Gray100}"/>
-    <SolidColorBrush x:Key="Gray200Brush" Color="{StaticResource Gray200}"/>
-    <SolidColorBrush x:Key="Gray300Brush" Color="{StaticResource Gray300}"/>
-    <SolidColorBrush x:Key="Gray400Brush" Color="{StaticResource Gray400}"/>
-    <SolidColorBrush x:Key="Gray500Brush" Color="{StaticResource Gray500}"/>
-    <SolidColorBrush x:Key="Gray600Brush" Color="{StaticResource Gray600}"/>
-    <SolidColorBrush x:Key="Gray900Brush" Color="{StaticResource Gray900}"/>
-    <SolidColorBrush x:Key="Gray950Brush" Color="{StaticResource Gray950}"/>
+    <SolidColorBrush x:Key="Gray100Brush" Color="{StaticResource Gray100}" />
+    <SolidColorBrush x:Key="Gray200Brush" Color="{StaticResource Gray200}" />
+    <SolidColorBrush x:Key="Gray300Brush" Color="{StaticResource Gray300}" />
+    <SolidColorBrush x:Key="Gray400Brush" Color="{StaticResource Gray400}" />
+    <SolidColorBrush x:Key="Gray500Brush" Color="{StaticResource Gray500}" />
+    <SolidColorBrush x:Key="Gray600Brush" Color="{StaticResource Gray600}" />
+    <SolidColorBrush x:Key="Gray900Brush" Color="{StaticResource Gray900}" />
+    <SolidColorBrush x:Key="Gray950Brush" Color="{StaticResource Gray950}" />
 </ResourceDictionary>
diff --git a/MauiShellSample/Resources/Styles/Styles.xaml b/MauiShellSample/Resources/Styles/Styles.xaml
index abfc935..6cdcb36 100644
--- a/MauiShellSample/Resources/Styles/Styles.xaml
+++ b/MauiShellSample/Resources/Styles/Styles.xaml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <?xaml-comp compile="true" ?>
-<ResourceDictionary 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
     <Style TargetType="ActivityIndicator">
         <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
     </Style>
 
     <Style TargetType="IndicatorView">
-        <Setter Property="IndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}"/>
-        <Setter Property="SelectedIndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray100}}"/>
+        <Setter Property="IndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
+        <Setter Property="SelectedIndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray100}}" />
     </Style>
 
     <Style TargetType="Border">
         <Setter Property="Stroke" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
-        <Setter Property="StrokeShape" Value="Rectangle"/>
-        <Setter Property="StrokeThickness" Value="1"/>
+        <Setter Property="StrokeShape" Value="Rectangle" />
+        <Setter Property="StrokeThickness" Value="1" />
     </Style>
 
     <Style TargetType="BoxView">
@@ -26,13 +24,13 @@
     <Style TargetType="Button">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}" />
         <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="BorderWidth" Value="0"/>
-        <Setter Property="CornerRadius" Value="8"/>
-        <Setter Property="Padding" Value="14,10"/>
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="BorderWidth" Value="0" />
+        <Setter Property="CornerRadius" Value="8" />
+        <Setter Property="Padding" Value="14,10" />
+        <Setter Property="MinimumHeightRequest" Value="44" />
+        <Setter Property="MinimumWidthRequest" Value="44" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -51,8 +49,8 @@
 
     <Style TargetType="CheckBox">
         <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="MinimumHeightRequest" Value="44" />
+        <Setter Property="MinimumWidthRequest" Value="44" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -70,10 +68,10 @@
     <Style TargetType="DatePicker">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="MinimumHeightRequest" Value="44" />
+        <Setter Property="MinimumWidthRequest" Value="44" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -91,11 +89,11 @@
     <Style TargetType="Editor">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="MinimumHeightRequest" Value="44" />
+        <Setter Property="MinimumWidthRequest" Value="44" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -113,11 +111,11 @@
     <Style TargetType="Entry">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="MinimumHeightRequest" Value="44" />
+        <Setter Property="MinimumWidthRequest" Value="44" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -141,11 +139,11 @@
 
     <Style TargetType="ImageButton">
         <Setter Property="Opacity" Value="1" />
-        <Setter Property="BorderColor" Value="Transparent"/>
-        <Setter Property="BorderWidth" Value="0"/>
-        <Setter Property="CornerRadius" Value="0"/>
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="BorderColor" Value="Transparent" />
+        <Setter Property="BorderWidth" Value="0" />
+        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="MinimumHeightRequest" Value="44" />
+        <Setter Property="MinimumWidthRequest" Value="44" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -184,14 +182,14 @@
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
     </Style>
 
-    <Style TargetType="Label" x:Key="Headline">
+    <Style x:Key="Headline" TargetType="Label">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
         <Setter Property="FontSize" Value="32" />
         <Setter Property="HorizontalOptions" Value="Center" />
         <Setter Property="HorizontalTextAlignment" Value="Center" />
     </Style>
 
-    <Style TargetType="Label" x:Key="SubHeadline">
+    <Style x:Key="SubHeadline" TargetType="Label">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
         <Setter Property="FontSize" Value="24" />
         <Setter Property="HorizontalOptions" Value="Center" />
@@ -207,10 +205,10 @@
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
         <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="MinimumHeightRequest" Value="44" />
+        <Setter Property="MinimumWidthRequest" Value="44" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -243,12 +241,12 @@
     </Style>
 
     <Style TargetType="RadioButton">
-        <Setter Property="BackgroundColor" Value="Transparent"/>
+        <Setter Property="BackgroundColor" Value="Transparent" />
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="MinimumHeightRequest" Value="44" />
+        <Setter Property="MinimumWidthRequest" Value="44" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -274,8 +272,8 @@
         <Setter Property="BackgroundColor" Value="Transparent" />
         <Setter Property="FontFamily" Value="OpenSansRegular" />
         <Setter Property="FontSize" Value="14" />
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="MinimumHeightRequest" Value="44" />
+        <Setter Property="MinimumWidthRequest" Value="44" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -329,9 +327,9 @@
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="MinimumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
-                            <Setter Property="MaximumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
-                            <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
+                            <Setter Property="MinimumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="MaximumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -374,11 +372,11 @@
 
     <Style TargetType="TimePicker">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
-        <Setter Property="BackgroundColor" Value="Transparent"/>
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="BackgroundColor" Value="Transparent" />
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="MinimumHeightRequest" Value="44" />
+        <Setter Property="MinimumWidthRequest" Value="44" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -393,12 +391,12 @@
         </Setter>
     </Style>
 
-    <Style TargetType="Page" ApplyToDerivedTypes="True">
-        <Setter Property="Padding" Value="0"/>
+    <Style ApplyToDerivedTypes="True" TargetType="Page">
+        <Setter Property="Padding" Value="0" />
         <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
     </Style>
 
-    <Style TargetType="Shell" ApplyToDerivedTypes="True">
+    <Style ApplyToDerivedTypes="True" TargetType="Shell">
         <Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
         <Setter Property="Shell.ForegroundColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource SecondaryDarkText}}" />
         <Setter Property="Shell.TitleColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource SecondaryDarkText}}" />
diff --git a/MauiShellSample/SecondaryPage.xaml b/MauiShellSample/SecondaryPage.xaml
index ebad48c..ad3c49b 100644
--- a/MauiShellSample/SecondaryPage.xaml
+++ b/MauiShellSample/SecondaryPage.xaml
@@ -1,21 +1,30 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<ContentPage x:Class="MauiShellSample.SecondaryPage"
+             xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:tabs="http://sharpnado.com"
-             x:Class="MauiShellSample.SecondaryPage"
              Title="SecondaryPage">
     <Grid RowDefinitions="Auto,*">
-        <tabs:TabHostView Grid.Row="0" TabType="Fixed" IsSegmented="True"
-                          HorizontalOptions="Center" VerticalOptions="Start"
-                          HeightRequest="40" WidthRequest="370" CornerRadius="10" Margin="0,2"
+        <tabs:TabHostView Grid.Row="0"
+                          WidthRequest="370"
+                          HeightRequest="40"
+                          Margin="0,2"
+                          HorizontalOptions="Center"
+                          VerticalOptions="Start"
+                          CornerRadius="10"
+                          IsSegmented="True"
                           SegmentedHasSeparator="True"
-                          SelectedIndex="{Binding Source={x:Reference switcher}, Path=SelectedIndex, Mode=TwoWay}">
+                          SelectedIndex="{Binding Source={x:Reference switcher}, Path=SelectedIndex, Mode=TwoWay}"
+                          TabType="Fixed">
             <tabs:TabHostView.Tabs>
-                <tabs:SegmentedTabItem Label="Uno" />
-                <tabs:SegmentedTabItem Label="Due" />
+                <tabs:SegmentedTabItem Label="Uno"
+                                       SelectedLabelColor="Green"
+                                       SelectedTabColor="Transparent" />
+                <tabs:SegmentedTabItem Label="Due"
+                                       SelectedLabelColor="Orange"
+                                       SelectedTabColor="Yellow" />
             </tabs:TabHostView.Tabs>
         </tabs:TabHostView>
-        <tabs:ViewSwitcher x:Name="switcher" Grid.Row="1">
-        </tabs:ViewSwitcher>
+        <tabs:ViewSwitcher x:Name="switcher" Grid.Row="1" />
     </Grid>
 </ContentPage>
diff --git a/Sharpnado.Tabs.2.2.0.nupkg.zip b/Sharpnado.Tabs.2.2.0.nupkg.zip
deleted file mode 100644
index 444fc58..0000000
Binary files a/Sharpnado.Tabs.2.2.0.nupkg.zip and /dev/null differ
diff --git a/Tabs/Tabs/DelayedView.cs b/Tabs/Tabs/DelayedView.cs
index 9b68f2a..3e28b70 100644
--- a/Tabs/Tabs/DelayedView.cs
+++ b/Tabs/Tabs/DelayedView.cs
@@ -13,18 +13,18 @@ public override void LoadView()
             async () =>
                 {
                     View? view = null;
-                    if (DeviceInfo.Platform == DevicePlatform.Android)
-                    {
-                        await Task.Run(
-                            () =>
-                                {
-                                    view = new TView
-                                        {
-                                            BindingContext = BindingContext,
-                                        };
-                                });
-                    }
-                    else
+                    //if (DeviceInfo.Platform == DevicePlatform.Android)
+                    //{
+                    //    await Task.Run(
+                    //        () =>
+                    //            {
+                    //                view = new TView
+                    //                    {
+                    //                        BindingContext = BindingContext,
+                    //                    };
+                    //            });
+                    //}
+                    //else
                     {
                         view = new TView
                             {
diff --git a/Tabs/Tabs/SegmentedTabItem.cs b/Tabs/Tabs/SegmentedTabItem.cs
index 7a1d364..96dca29 100644
--- a/Tabs/Tabs/SegmentedTabItem.cs
+++ b/Tabs/Tabs/SegmentedTabItem.cs
@@ -12,7 +12,7 @@ public class SegmentedTabItem : TabTextItem
             typeof(Color),
             typeof(SegmentedTabItem),
 #if NET6_0_OR_GREATER
-            Colors.DodgerBlue);
+            Colors.White);
 #else
             Color.Default);
 #endif
@@ -31,9 +31,11 @@ public Color SelectedLabelColor
         }
 
 #if NET6_0_OR_GREATER
-        protected override void OnHandlerChanged()
+        protected override async void OnHandlerChanged()
         {
             base.OnHandlerChanged();
+            Background = Colors.Transparent;
+            await Task.Delay(100);
             UpdateLabel();
         }
 #endif
@@ -78,36 +80,15 @@ private void UpdateLabel()
 
             if (IsSelected)
             {
-#if !NET6_0_OR_GREATER
-                if (SelectedTabColor != Color.Default)
-#endif
-                {
-                    BackgroundColor = SelectedTabColor;
-                }
-
-#if !NET6_0_OR_GREATER
-                if (SelectedLabelColor != Color.Default)
-#endif
-                {
-                    label.TextColor = SelectedLabelColor;
-                }
+                label.TextColor = SelectedLabelColor;
             }
             else
             {
-#if NET6_0_OR_GREATER
-                BackgroundColor = Colors.Transparent;
-#else
-                BackgroundColor = Color.Transparent;
-#endif
-
-#if !NET6_0_OR_GREATER
-                if (UnselectedLabelColor != Color.Default)
-#endif
-                {
-                    label.TextColor = UnselectedLabelColor;
-                }
+                label.TextColor = UnselectedLabelColor;
             }
 
+            Background = IsSelected ? SelectedTabColor : Colors.Transparent;
+
             Content = label;
         }
     }
diff --git a/Tabs/Tabs/TabHostView.cs b/Tabs/Tabs/TabHostView.cs
index fb5dd06..70e383c 100644
--- a/Tabs/Tabs/TabHostView.cs
+++ b/Tabs/Tabs/TabHostView.cs
@@ -7,6 +7,8 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Windows.Input;
+using Microsoft.Maui.Controls.Shapes;
+
 
 #if !NET6_0_OR_GREATER
 using Sharpnado.Shades;
@@ -80,6 +82,12 @@ public class TabHostView : Shadows
             defaultValue: 10f);
 #endif
 
+        public static readonly BindableProperty UseMauiTapGestureProperty = BindableProperty.Create(
+            nameof(UseMauiTapGesture),
+            typeof(bool),
+            typeof(TabHostView),
+            defaultValue: false);
+
         public static readonly BindableProperty SegmentedHasSeparatorProperty = BindableProperty.Create(
             nameof(SegmentedHasSeparator),
             typeof(bool),
@@ -122,7 +130,7 @@ public class TabHostView : Shadows
         private const string Tag = nameof(TabHostView);
 
         private readonly Grid _grid;
-        private readonly Frame _frame;
+        private readonly Border _frame;
         private List<TabItem> _selectableTabs = new();
 
         private INotifyCollectionChanged _currentNotifyCollection;
@@ -133,6 +141,30 @@ public class TabHostView : Shadows
 
         private RowDefinition _lastFillingRow;
 
+        private bool _hasBeenUnloaded = false;
+
+        private void TabHostView_HandlerChanged(object sender, EventArgs e)
+        {
+            InternalLogger.Debug(Tag, () => $"HandlerChanged");
+        }
+
+        private void TabHostView_Loaded(object sender, EventArgs e)
+        {
+            InternalLogger.Debug(Tag, () => $"Loaded");
+            if (_hasBeenUnloaded)
+            {
+                RegisterAllTabs();
+                _hasBeenUnloaded = false;
+            }
+        }
+
+        private void TabHostView_Unloaded(object sender, EventArgs e)
+        {
+            InternalLogger.Debug(Tag, () => $"Unloaded");
+            _hasBeenUnloaded = true;
+            UnregisterAllTabs();
+        }
+
         public TabHostView()
         {
             TabItemTappedCommand = new TapCommand(OnTabItemTapped);
@@ -158,12 +190,9 @@ public TabHostView()
                 BackgroundColor = BackgroundColor,
             };
 
-            _frame = new Frame
+            _frame = new Border
             {
                 Padding = 0,
-                HasShadow = false,
-                IsClippedToBounds = true,
-                CornerRadius = CornerRadius,
 #if NET6_0_OR_GREATER
                 BackgroundColor = Colors.Transparent,
 #else
@@ -171,7 +200,8 @@ public TabHostView()
 #endif
                 HorizontalOptions = LayoutOptions.Fill,
                 VerticalOptions = LayoutOptions.Fill,
-                BorderColor = SegmentedOutlineColor,
+                StrokeShape = new RoundRectangle { CornerRadius = CornerRadius },
+                Stroke = SegmentedOutlineColor,
             };
 
             UpdateTabType();
@@ -181,23 +211,10 @@ public TabHostView()
 #endif
         }
 
-        private void TabHostView_HandlerChanged(object sender, EventArgs e)
-        {
-            InternalLogger.Debug(Tag, () => $"HandlerChanged!");
-        }
-
-        private void TabHostView_Loaded(object sender, EventArgs e)
-        {
-            InternalLogger.Debug(Tag, () => $"Loaded!");
-        }
-
-        private void TabHostView_Unloaded(object sender, EventArgs e)
-        {
-            InternalLogger.Debug(Tag, () => $"Unloaded!");
-        }
-
         public event EventHandler<SelectedPositionChangedEventArgs> SelectedTabIndexChanged;
 
+        public Border Border => _frame;
+
         public IEnumerable ItemsSource
         {
             get => (IEnumerable)GetValue(ItemsSourceProperty);
@@ -216,6 +233,12 @@ public ObservableCollection<TabItem> Tabs
             set => SetValue(TabsProperty, value);
         }
 
+        public bool UseMauiTapGesture
+        {
+            get => (bool)GetValue(UseMauiTapGestureProperty);
+            set => SetValue(UseMauiTapGestureProperty, value);
+        }
+
         public bool IsSegmented
         {
             get => (bool)GetValue(IsSegmentedProperty);
@@ -470,7 +493,7 @@ private void UpdateSegmentedOutlineColor()
                 return;
             }
 
-            _frame.BorderColor = SegmentedOutlineColor;
+            _frame.Stroke = SegmentedOutlineColor;
             foreach (var separator in _grid.Children.Where(c => c is BoxView))
             {
 
@@ -520,7 +543,7 @@ private void UpdateCornerRadius()
                 return;
             }
 
-            _frame.CornerRadius = CornerRadius;
+            _frame.StrokeShape = new RoundRectangle { CornerRadius = CornerRadius };
         }
 
         private void AddSeparators()
@@ -722,13 +745,63 @@ private void OnTabsCollectionChanged(object sender, NotifyCollectionChangedEvent
         }
 
         private void AddTapCommand(TabItem tabItem)
+        {
+            RegisterEffects(tabItem);
+        }
+
+        private void UnregisterAllTabs()
+        {
+            InternalLogger.Info(Tag, "UnregisterAllTabs()");
+            foreach (var tab in Tabs)
+            {
+                UnregisterEffects(tab);
+            }
+        }
+
+        private void RegisterAllTabs()
+        {
+            InternalLogger.Info(Tag, "RegisterAllTabs()");
+            foreach (var tab in Tabs)
+            {
+                RegisterEffects(tab);
+            }
+        }
+
+        private void UnregisterEffects(TabItem tabItem)
+        {
+            if (tabItem is TabButton)
+            {
+                return;
+            }
+
+            InternalLogger.Info(Tag, () => $"UnregisterEffects( tabItem: {tabItem.GetType().Name} )");
+
+            if (UseMauiTapGesture || DeviceInfo.Platform == DevicePlatform.WinUI)
+            {
+                tabItem.GestureRecognizers.Remove(
+                    tabItem.GestureRecognizers.FirstOrDefault(
+                        g => g is TapGestureRecognizer tapGestureRecognizer && ReferenceEquals(tapGestureRecognizer.Command, TabItemTappedCommand)));
+            }
+            else
+            {
+#if NET6_0_OR_GREATER
+                Sharpnado.Tabs.Effects.TouchEffect.SetColor(tabItem, Colors.Transparent);
+                Sharpnado.Tabs.Effects.Commands.SetTap(tabItem, null);
+                Sharpnado.Tabs.Effects.Commands.SetTapParameter(tabItem, null);
+#endif
+            }
+        }
+
+        private void RegisterEffects(TabItem tabItem)
         {
             if (tabItem is TabButton)
             {
                 return;
             }
 
-            if (DeviceInfo.Platform == DevicePlatform.WinUI)
+            InternalLogger.Info(Tag, () => $"RegisterEffects( tabItem: {tabItem.GetType().Name} )");
+
+            if (UseMauiTapGesture || DeviceInfo.Platform == DevicePlatform.WinUI)
             {
                 tabItem.GestureRecognizers.Add(
                     new TapGestureRecognizer { Command = TabItemTappedCommand, CommandParameter = tabItem });
diff --git a/Tabs/Tabs/TabItem.cs b/Tabs/Tabs/TabItem.cs
index ff4e365..9e5f81a 100644
--- a/Tabs/Tabs/TabItem.cs
+++ b/Tabs/Tabs/TabItem.cs
@@ -16,7 +16,7 @@ public abstract class TabItem : ContentView
             typeof(Color),
             typeof(TabTextItem),
 #if NET6_0_OR_GREATER
-            Colors.DodgerBlue);
+            Colors.Magenta);
 #else
             Color.Default);
 #endif
@@ -39,7 +39,7 @@ public abstract class TabItem : ContentView
             typeof(Color),
             typeof(TabTextItem),
 #if NET6_0_OR_GREATER
-            Colors.DodgerBlue);
+            Colors.Grey);
 #else
             Color.Default);
 #endif
diff --git a/Tabs/Tabs/ViewSwitcher.cs b/Tabs/Tabs/ViewSwitcher.cs
index 7ac2bf5..07d6eab 100644
--- a/Tabs/Tabs/ViewSwitcher.cs
+++ b/Tabs/Tabs/ViewSwitcher.cs
@@ -96,7 +96,15 @@ protected override void OnChildAdded(Element child)
 
             if (child is View view)
             {
-                HideView(view, Children.Count - 1);
+                int childIndex = Children.Count - 1;
+                if (childIndex == SelectedIndex)
+                {
+                    ShowView(view, childIndex);
+                }
+                else
+                {
+                    HideView(view, childIndex);
+                }
             }
         }
 #else