From 3edbcf37b440a0e6e83f4e1a36dce1f0ea827a06 Mon Sep 17 00:00:00 2001
From: Eviral <flarive@hotmail.com>
Date: Tue, 26 Dec 2023 21:26:14 +0100
Subject: [PATCH] All themed controls now have a nice looking tab navigation
 focus adorner style + misc fixes

---
 .../Accents/BaseColorsPalette.xaml            |   8 +-
 .../Accents/SystemAccentColors.cs             |   2 +-
 .../Avalonia.Themes.Neumorphism.csproj        |   2 +-
 .../ColorPaletteResources.Properties.cs       |   4 +-
 .../Dialogs/Styles/AlertDialogControl.axaml   |   5 +-
 .../Themes/AdornerLayer.xaml                  |   4 +-
 .../Themes/ButtonSpinner.xaml                 |  14 +-
 .../Themes/CalendarDatePicker.xaml            | 203 +++++++++---------
 Avalonia.Themes.Neumorphism/Themes/Card.xaml  |   2 +-
 .../Themes/ComboBox.xaml                      |  44 +++-
 .../Themes/ComboBoxItem.xaml                  |   2 +-
 .../Themes/ListBox.xaml                       | 116 +++++++---
 .../Themes/ListBoxItem.xaml                   |  29 ++-
 .../Themes/MenuItem.xaml                      |  10 +-
 .../Themes/NumericUpDown.xaml                 |  98 ++-------
 .../Themes/RadioButton.xaml                   |  22 +-
 .../Themes/Slider.xaml                        |  48 ++++-
 .../Themes/TabItem.xaml                       |  15 +-
 .../Themes/TextBlock.xaml                     |   2 +
 .../Themes/TextBox.xaml                       |  58 +++--
 .../Themes/TimePicker.xaml                    |  16 +-
 Neumorphism.Avalonia.Demo/App.axaml           |  13 --
 .../Pages/ComboBoxesDemo.axaml                |  29 +--
 .../Pages/ComboBoxesDemo.axaml.cs             |   3 +-
 .../Pages/FieldsDemo.axaml                    |  45 ++--
 .../Pages/IconsDemo.axaml                     |   4 +-
 .../Pages/ListsDemo.axaml                     |  18 +-
 .../Pages/MenusDemo.axaml                     |  28 ++-
 .../ViewModels/DialogsDemoViewModel.cs        |   9 +-
 .../Windows/Dialogs/CustomFormDialog.axaml    |  10 +-
 .../Dialogs/CustomSettingsDialog.axaml        |  21 +-
 .../Dialogs/CustomFormDialogViewModel.cs      |   6 +-
 32 files changed, 505 insertions(+), 385 deletions(-)

diff --git a/Avalonia.Themes.Neumorphism/Accents/BaseColorsPalette.xaml b/Avalonia.Themes.Neumorphism/Accents/BaseColorsPalette.xaml
index d2c5956..54449c4 100644
--- a/Avalonia.Themes.Neumorphism/Accents/BaseColorsPalette.xaml
+++ b/Avalonia.Themes.Neumorphism/Accents/BaseColorsPalette.xaml
@@ -46,7 +46,7 @@
 			<Color x:Key="MaterialDesignBodyLight">#89000000</Color>
 			<Color x:Key="MaterialDesignColumnHeader">#BC000000</Color>
 			<Color x:Key="MaterialDesignCheckBoxOff">#89000000</Color>
-			<Color x:Key="MaterialDesignCheckBoxDisabled">#FFCFD4DA</Color>
+			
 			<Color x:Key="MaterialDesignTextBoxBorder">#89000000</Color>
 			<Color x:Key="MaterialDesignDivider">#1F000000</Color>
 			<Color x:Key="MaterialDesignSelection">#44888b8f</Color>
@@ -68,6 +68,8 @@
 			<Color x:Key="MaterialDesignShadowLight">#CCFFFFFF</Color>
 			<Color x:Key="MaterialDesignShadowDark">#33000000</Color>
 			<Color x:Key="MaterialDesignBorderShadow">#66C4C7CB</Color>
+      <Color x:Key="MaterialDesignDisabled">#FFCFD4DA</Color>
+      
 			<Color x:Key="MaterialDesignDisabledNoTransparency">#FFD3D8DE</Color>
 			<Color x:Key="MaterialDesignTransparent">#00FFFFFF</Color>
 			<Color x:Key="MaterialDesignSilverGray">#CCCCCCCC</Color>
@@ -121,7 +123,7 @@
 			<Color x:Key="MaterialDesignBodyLight">#89FFFFFF</Color>
 			<Color x:Key="MaterialDesignColumnHeader">#BCFFFFFF</Color>
 			<Color x:Key="MaterialDesignCheckBoxOff">#89FFFFFF</Color>
-			<Color x:Key="MaterialDesignCheckBoxDisabled">#FF647076</Color>
+			
 			<Color x:Key="MaterialDesignTextBoxBorder">#89FFFFFF</Color>
 			<Color x:Key="MaterialDesignDivider">#1FFFFFFF</Color>
 			<Color x:Key="MaterialDesignSelection">#44888b8f</Color>
@@ -143,6 +145,8 @@
 			<Color x:Key="MaterialDesignShadowLight">#22FFFFFF</Color>
 			<Color x:Key="MaterialDesignShadowDark">#88000000</Color>
 			<Color x:Key="MaterialDesignBorderShadow">#FF404548</Color>
+      <Color x:Key="MaterialDesignDisabled">#FF647076</Color>
+      
 			<Color x:Key="MaterialDesignDisabledNoTransparency">#FF42464A</Color>
 			<Color x:Key="MaterialDesignTransparent">#00FFFFFF</Color>
 			<Color x:Key="MaterialDesignSilverGray">#44333333</Color>
diff --git a/Avalonia.Themes.Neumorphism/Accents/SystemAccentColors.cs b/Avalonia.Themes.Neumorphism/Accents/SystemAccentColors.cs
index d089208..24397d6 100644
--- a/Avalonia.Themes.Neumorphism/Accents/SystemAccentColors.cs
+++ b/Avalonia.Themes.Neumorphism/Accents/SystemAccentColors.cs
@@ -41,7 +41,7 @@ internal class SystemAccentColors : IResourceProvider
         public const string MaterialDesignBodyLightKey = "MaterialDesignBodyLight";
         public const string MaterialDesignColumnHeaderKey = "MaterialDesignColumnHeader";
         public const string MaterialDesignCheckBoxOffKey = "MaterialDesignCheckBoxOff";
-        public const string MaterialDesignCheckBoxDisabledKey = "MaterialDesignCheckBoxDisabled";
+        public const string MaterialDesignDisabledKey = "MaterialDesignDisabled";
         public const string MaterialDesignTextBoxBorderKey = "MaterialDesignTextBoxBorder";
         public const string MaterialDesignDividerKey = "MaterialDesignDivider";
         public const string MaterialDesignSelectionKey = "MaterialDesignSelection";
diff --git a/Avalonia.Themes.Neumorphism/Avalonia.Themes.Neumorphism.csproj b/Avalonia.Themes.Neumorphism/Avalonia.Themes.Neumorphism.csproj
index bc0ae05..2288b7c 100644
--- a/Avalonia.Themes.Neumorphism/Avalonia.Themes.Neumorphism.csproj
+++ b/Avalonia.Themes.Neumorphism/Avalonia.Themes.Neumorphism.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
 	<TargetFramework>netstandard2.1</TargetFramework>
-	<Version>0.9.0</Version>
+	<Version>0.10.0</Version>
 	<Title>Neumorphism.Avalonia</Title>
 	<Authors>Eviral</Authors>
 	<Company>Eviral</Company>
diff --git a/Avalonia.Themes.Neumorphism/ColorPaletteResources.Properties.cs b/Avalonia.Themes.Neumorphism/ColorPaletteResources.Properties.cs
index 2c8ef85..103462c 100644
--- a/Avalonia.Themes.Neumorphism/ColorPaletteResources.Properties.cs
+++ b/Avalonia.Themes.Neumorphism/ColorPaletteResources.Properties.cs
@@ -213,9 +213,9 @@ public Color Accent
         public Color MaterialDesignCheckBoxOff { get => GetColor("MaterialDesignCheckBoxOff"); set => SetColor("MaterialDesignCheckBoxOff", value); }
 
         /// <summary>
-        /// Gets or sets the MaterialDesignCheckBoxDisabled color value.
+        /// Gets or sets the MaterialDesignDisabled color value.
         /// </summary>
-        public Color MaterialDesignCheckBoxDisabled { get => GetColor("MaterialDesignCheckBoxDisabled"); set => SetColor("MaterialDesignCheckBoxDisabled", value); }
+        public Color MaterialDesignDisabled { get => GetColor("MaterialDesignDisabled"); set => SetColor("MaterialDesignDisabled", value); }
 
         /// <summary>
         /// Gets or sets the MaterialDesignTextBoxBorder color value.
diff --git a/Avalonia.Themes.Neumorphism/Dialogs/Styles/AlertDialogControl.axaml b/Avalonia.Themes.Neumorphism/Dialogs/Styles/AlertDialogControl.axaml
index a07652d..30fecb2 100644
--- a/Avalonia.Themes.Neumorphism/Dialogs/Styles/AlertDialogControl.axaml
+++ b/Avalonia.Themes.Neumorphism/Dialogs/Styles/AlertDialogControl.axaml
@@ -34,7 +34,10 @@
                       
                         <DockPanel Name="{x:Static naming:PartNames.PartHeaderPanel}">
 
-                          <Button Theme="{StaticResource ButtonIcon}" Width="90" Height="90" IsHitTestVisible="False" HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
+                          <Button Theme="{StaticResource ButtonIcon}" Width="90" Height="90" IsHitTestVisible="False"
+                                  Focusable="False"
+                                  HorizontalContentAlignment="Center"
+                                  VerticalContentAlignment="Center">
 
                             <ContentPresenter Name="{x:Static naming:PartNames.PartHeaderIcon}"
                                               Content="{CompiledBinding DialogIcon}"
diff --git a/Avalonia.Themes.Neumorphism/Themes/AdornerLayer.xaml b/Avalonia.Themes.Neumorphism/Themes/AdornerLayer.xaml
index f0b6917..1a5a62d 100644
--- a/Avalonia.Themes.Neumorphism/Themes/AdornerLayer.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/AdornerLayer.xaml
@@ -4,12 +4,14 @@
 
   <!-- Neumorphism theme ok -->
 
+  
+  <!--Default focus adorner that should fit most common cases-->
   <ControlTheme x:Key="{x:Type AdornerLayer}" TargetType="AdornerLayer">
     <Setter Property="DefaultFocusAdorner">
       <FocusAdornerTemplate>
         <Border BorderThickness="1" CornerRadius="{Binding $self.(AdornerLayer.AdornedElement).(Border.CornerRadius)}"
                 BorderBrush="{DynamicResource MaterialDesignFocus}" Margin="0">
-		</Border>
+        </Border>
       </FocusAdornerTemplate>
     </Setter>
   </ControlTheme>
diff --git a/Avalonia.Themes.Neumorphism/Themes/ButtonSpinner.xaml b/Avalonia.Themes.Neumorphism/Themes/ButtonSpinner.xaml
index 5c8c873..fac1b33 100644
--- a/Avalonia.Themes.Neumorphism/Themes/ButtonSpinner.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/ButtonSpinner.xaml
@@ -53,7 +53,6 @@
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidForegroundBrush}"/>
 		<Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextAreaBorder}" />
-
 		<Style Selector="^ /template/ RepeatButton#PART_IncreaseButton">
 			<Setter Property="Content">
 				<Template>
@@ -84,6 +83,7 @@
 
 		<Style Selector="^:right">
 			<Setter Property="Margin" Value="10,0,0,0"/>
+      <Setter Property="Focusable" Value="False" />
 			<Setter Property="Template">
 				<ControlTemplate>
 					<Border Name="border"
@@ -103,12 +103,12 @@
 											  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
 											  Padding="{TemplateBinding Padding}" />
 							<Grid Grid.Column="1" RowDefinitions="*,*" IsVisible="{TemplateBinding ShowButtonSpinner}" Width="30">
-								<RepeatButton assist:ButtonAssist.CornerRadius="0" Theme="{StaticResource RepeatButtonMaterial}"
+								<RepeatButton assist:ButtonAssist.CornerRadius="0" Theme="{StaticResource RepeatButtonMaterial}" Focusable="{TemplateBinding Focusable}"
 											  Background="Transparent"
 											  assist:ShadowAssist.ShadowDepth="Depth0"
 											  Grid.Row="0"
 											  Name="PART_IncreaseButton" />
-								<RepeatButton assist:ButtonAssist.CornerRadius="0" Theme="{StaticResource RepeatButtonMaterial}"
+								<RepeatButton assist:ButtonAssist.CornerRadius="0" Theme="{StaticResource RepeatButtonMaterial}" Focusable="{TemplateBinding Focusable}"
 											  assist:ShadowAssist.ShadowDepth="Depth0"
 											  Background="Transparent"
 											  Grid.Row="1"
@@ -122,6 +122,7 @@
 
 		<Style Selector="^:left">
 			<Setter Property="Margin" Value="0,0,10,0"/>
+      <Setter Property="Focusable" Value="False" />
 			<Setter Property="Template">
 				<ControlTemplate>
 					<Border Name="border"
@@ -133,12 +134,12 @@
 							VerticalAlignment="{TemplateBinding VerticalAlignment}">
 						<Grid ColumnDefinitions="Auto,*">
 							<Grid Grid.Column="0" RowDefinitions="*,*" IsVisible="{TemplateBinding ShowButtonSpinner}" Width="30">
-								<RepeatButton assist:ButtonAssist.CornerRadius="0" Theme="{StaticResource RepeatButtonMaterial}"
+								<RepeatButton assist:ButtonAssist.CornerRadius="0" Theme="{StaticResource RepeatButtonMaterial}" Focusable="{TemplateBinding Focusable}"
 											  assist:ShadowAssist.ShadowDepth="Depth0"
 											  Background="Transparent"
 											  Grid.Row="0"
 											  Name="PART_IncreaseButton" />
-								<RepeatButton assist:ButtonAssist.CornerRadius="0" Theme="{StaticResource RepeatButtonMaterial}"
+								<RepeatButton assist:ButtonAssist.CornerRadius="0" Theme="{StaticResource RepeatButtonMaterial}" Focusable="{TemplateBinding Focusable}"
 											  assist:ShadowAssist.ShadowDepth="Depth0"
 											  Background="Transparent"
 											  Grid.Row="1"
@@ -156,6 +157,5 @@
 				</ControlTemplate>
 			</Setter>
 		</Style>
-		
 	</ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Avalonia.Themes.Neumorphism/Themes/CalendarDatePicker.xaml b/Avalonia.Themes.Neumorphism/Themes/CalendarDatePicker.xaml
index 5155e4d..d971dcd 100644
--- a/Avalonia.Themes.Neumorphism/Themes/CalendarDatePicker.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/CalendarDatePicker.xaml
@@ -6,8 +6,8 @@
                     xmlns:converters="clr-namespace:Avalonia.Themes.Neumorphism.Converters">
 
   <!-- Neumorphism theme ok -->
-  
-  
+
+
   <Design.PreviewWith>
     <Border Margin="20, 20, 20, 200">
       <CalendarDatePicker Width="200" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" />
@@ -37,48 +37,49 @@
     </Setter>
   </ControlTheme>
 
-  
-  
-    <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
-      <Setter Property="Template">
-        <ControlTemplate>
-          <TextBlock Text="Please use ExtendedCalendarDatePicker instead of CalendarDatePicker"/>
-        </ControlTemplate>
-      </Setter>
-    </ControlTheme>
-
-
-
-
-    <ControlTheme x:Key="{x:Type controls:ExtendedCalendarDatePicker}" TargetType="controls:ExtendedCalendarDatePicker">
-        <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
-        <Setter Property="Foreground" Value="{DynamicResource MaterialDesignForeground}" />
-        <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="UseFloatingWatermark" Value="False"/>
-        <Setter Property="assist:DatePickerAssist.InnerRightBackground" Value="#22444444"/>
-        <Setter Property="assist:DatePickerAssist.InnerRightPadding" Value="0"/>
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Height" Value="40"/>
-        <Setter Property="Width" Value="240"/>
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Margin" Value="0,15,0,15" />
-        <Setter Property="CornerRadius" Value="10" />
-        <Setter Property="Watermark" Value="" />
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="ClipToBounds" Value="False" />
-        <Setter Property="Template">
-        <ControlTemplate>
-        <Grid RowDefinitions="*" Margin="0" VerticalAlignment="Top">
+
+
+  <ControlTheme x:Key="{x:Type CalendarDatePicker}" TargetType="CalendarDatePicker">
+    <Setter Property="Template">
+      <ControlTemplate>
+        <TextBlock Text="Please use ExtendedCalendarDatePicker instead of CalendarDatePicker"/>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+
+
+
+  <ControlTheme x:Key="{x:Type controls:ExtendedCalendarDatePicker}" TargetType="controls:ExtendedCalendarDatePicker">
+    <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
+    <Setter Property="Foreground" Value="{DynamicResource MaterialDesignForeground}" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="UseFloatingWatermark" Value="False"/>
+    <Setter Property="assist:DatePickerAssist.InnerRightBackground" Value="#22444444"/>
+    <Setter Property="assist:DatePickerAssist.InnerRightPadding" Value="0"/>
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Height" Value="40"/>
+    <Setter Property="Width" Value="240"/>
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="Margin" Value="0,15,0,15" />
+    <Setter Property="CornerRadius" Value="10" />
+    <Setter Property="Watermark" Value="" />
+    <Setter Property="FontSize" Value="14"/>
+    <Setter Property="ClipToBounds" Value="False" />
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <!--<Grid RowDefinitions="*" Margin="0" VerticalAlignment="Top">-->
 
           <Border x:Name="PART_RootBorder"
                     CornerRadius="{TemplateBinding Height, Converter={StaticResource ControlHeightToCornerRadiusConverter}, ConverterParameter=0}"
                     Height="{TemplateBinding Height}"
-                    BorderThickness="0"
-                    BorderBrush="Transparent"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
                     Background="{TemplateBinding Background}">
 
 
@@ -104,43 +105,43 @@
                         Foreground="{TemplateBinding Foreground}" Opacity="0.5"
                         RenderTransformOrigin="0, 0" />
 
-              
-				
-                <Grid Name="PART_Grid" ColumnDefinitions="*,Auto" Margin="0" VerticalAlignment="Center">
-                  <!--Main container-->
-                  <Panel Grid.Column="0" Name="PART_TextRoot" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                    <DataValidationErrors Name="DataValidation" VerticalContentAlignment="Center" VerticalAlignment="Stretch" Margin="0">
-                          <TextBox Name="PART_TextBox"
-                         Theme="{StaticResource TextBoxNoMaterial2}"
-                         Width="{TemplateBinding Width, Converter={StaticResource WidthMinusValueConverter}, ConverterParameter=50}"
-                         Foreground="{TemplateBinding Foreground}"
-                         Background="Transparent"
-                         BorderBrush="Transparent"
-                         BorderThickness="0"
-                         Padding="0"
-                         Margin="0"
-                         FontSize="{TemplateBinding FontSize}"
-                         UseFloatingWatermark="False"
-                         HorizontalAlignment="Left"
-                         VerticalAlignment="Stretch"
-                         VerticalContentAlignment="Center"
-                         HorizontalContentAlignment="Left"/>
-                    </DataValidationErrors>
-                  </Panel>
-                  
-                  <!--Right container-->
-                  <Border Grid.Column="1" Margin="0" Padding="0"
-				              Height="{TemplateBinding Height}"
-                      Background="{TemplateBinding assist:DatePickerAssist.InnerRightBackground}"
-                      CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource CustomCornerRadiusConverter}, ConverterParameter=0%|100%|100%|0%}"
-                      VerticalAlignment="Stretch">
-                    <Button Name="PART_Button" Width="40" Padding="{TemplateBinding assist:DatePickerAssist.InnerRightPadding}"
-                    Theme="{StaticResource CustomCalendarDatePickerButton}"
-                    Focusable="False" />
-                  </Border>
-                </Grid>
-					
-              
+
+
+              <Grid Name="PART_Grid" ColumnDefinitions="*,Auto" Margin="0" VerticalAlignment="Center">
+                <!--Main container-->
+                <Panel Grid.Column="0" Name="PART_TextRoot" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                  <DataValidationErrors Name="DataValidation" VerticalContentAlignment="Center" VerticalAlignment="Stretch" Margin="0">
+                    <TextBox Name="PART_TextBox"
+                   Theme="{StaticResource TextBoxNoMaterial2}"
+                   Width="{TemplateBinding Width, Converter={StaticResource WidthMinusValueConverter}, ConverterParameter=50}"
+                   Foreground="{TemplateBinding Foreground}"
+                   Background="Transparent"
+                   BorderBrush="Transparent"
+                   BorderThickness="0"
+                   Padding="0"
+                   Margin="0"
+                   FontSize="{TemplateBinding FontSize}"
+                   UseFloatingWatermark="False"
+                   HorizontalAlignment="Left"
+                   VerticalAlignment="Stretch"
+                   VerticalContentAlignment="Center"
+                   HorizontalContentAlignment="Left"/>
+                  </DataValidationErrors>
+                </Panel>
+
+                <!--Right container-->
+                <Border Grid.Column="1" Margin="0" Padding="0"
+                    Height="{TemplateBinding Height}"
+                    Background="{TemplateBinding assist:DatePickerAssist.InnerRightBackground}"
+                    CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource CustomCornerRadiusConverter}, ConverterParameter=0%|100%|100%|0%}"
+                    VerticalAlignment="Stretch">
+                  <Button Name="PART_Button" Width="40" Padding="{TemplateBinding assist:DatePickerAssist.InnerRightPadding}"
+                  Theme="{StaticResource CustomCalendarDatePickerButton}"
+                  Focusable="False" />
+                </Border>
+              </Grid>
+
+
 
               <Popup Name="PART_Popup"
                      PlacementTarget="{TemplateBinding}"
@@ -164,26 +165,24 @@
                           DisplayDateEnd="{TemplateBinding DisplayDateEnd}" />
                 </Border>
               </Popup>
-              
+
             </Grid>
           </Border>
-        </Grid>
+        <!--</Grid>-->
       </ControlTemplate>
     </Setter>
 
+    <!-- Focused State (custom FocusAdorner) -->
+    <Style Selector="^:focus-within /template/ Border#PART_RootBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignFocus}" />
+    </Style>
+
     <!-- Pressed State -->
     <Style Selector="^:pressed /template/ Border#PART_RootBorder">
       <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPressed}" />
       <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPressed}" />
     </Style>
 
-		<!--KEEP ????????????-->
-    <!-- Pointer-over State -->
-    <!--<Style Selector="^:pointerover /template/ Border#PART_RootBorder">
-      <Setter Property="Background" Value="{DynamicResource CalendarDatePickerBackgroundPointerOver}" />
-      <Setter Property="BorderBrush" Value="{DynamicResource CalendarDatePickerBorderBrushPointerOver}" />
-    </Style>-->
-
     <!-- Disabled State -->
     <Style Selector="^:disabled">
       <Style Selector="^ /template/ Border#PART_RootBorder">
@@ -207,27 +206,27 @@
       <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}" />
     </Style>
 
-      <Style Selector="^:error /template/ TextBox#PART_TextBox">
-        <Setter Property="Margin" Value="0,8,0,0" />
-      </Style>
+    <Style Selector="^:error /template/ TextBox#PART_TextBox">
+      <Setter Property="Margin" Value="0,8,0,0" />
+    </Style>
 
-      <!-- Transitions for all styles textfield -->
-      <Style Selector="^:error:not(.notransitions) /template/ TextBox#PART_TextBox">
-        <Setter Property="Transitions">
-          <Transitions>
-            <ThicknessTransition Duration="0:0:0.25" Property="Margin" Easing="CubicEaseOut" />
-            <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.25" Easing="CubicEaseOut" />
-          </Transitions>
-        </Setter>
-      </Style>
+    <!-- Transitions for all styles textfield -->
+    <Style Selector="^:error:not(.notransitions) /template/ TextBox#PART_TextBox">
+      <Setter Property="Transitions">
+        <Transitions>
+          <ThicknessTransition Duration="0:0:0.25" Property="Margin" Easing="CubicEaseOut" />
+          <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.25" Easing="CubicEaseOut" />
+        </Transitions>
+      </Setter>
+    </Style>
 
     <!--Floating watermark anim-->
     <Style Selector="^:not(^[Text=]):focus-within /template/ TextBlock#floatingWatermark,
                     ^:not(^[Text=]) /template/ TextBlock#floatingWatermark">
       <Setter Property="Margin" Value="1,-16,1,1" />
       <Setter Property="RenderTransform" Value="scale(0.75)" />
-	  <Setter Property="MaxWidth" Value="{TemplateBinding Width}" />
-	</Style>
+      <Setter Property="MaxWidth" Value="{TemplateBinding Width}" />
+    </Style>
 
 
     <Style Selector="^[Text=]:not(:focus) /template/ TextBlock#floatingWatermark">
@@ -238,7 +237,7 @@
     <Style Selector="^:focus-within /template/ TextBlock#floatingWatermark">
       <Setter Property="Margin" Value="1,-16,1,1" />
       <Setter Property="RenderTransform" Value="scale(0.75)" />
-  	  <Setter Property="MaxWidth" Value="{TemplateBinding Width}" />
+      <Setter Property="MaxWidth" Value="{TemplateBinding Width}" />
     </Style>
 
     <Style Selector="^ /template/ TextBlock#floatingWatermark">
@@ -265,4 +264,4 @@
       <Setter Property="Foreground" Value="{DynamicResource ValidationErrorBrush}" />
     </Style>
   </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Avalonia.Themes.Neumorphism/Themes/Card.xaml b/Avalonia.Themes.Neumorphism/Themes/Card.xaml
index 468e5fc..9d959c9 100644
--- a/Avalonia.Themes.Neumorphism/Themes/Card.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/Card.xaml
@@ -30,7 +30,7 @@
     <Setter Property="Template">
       <ControlTemplate>
         <Panel VerticalAlignment="Stretch" Margin="{TemplateBinding Margin}" Height="{TemplateBinding Height}">
-          <Border Name="PART_BackgroundBorder" Margin="0" VerticalAlignment="Stretch"
+          <Border Name="PART_BackgroundBorder" Margin="0" VerticalAlignment="Stretch" Focusable="{TemplateBinding Focusable}"
                   Background="{TemplateBinding Background}"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
diff --git a/Avalonia.Themes.Neumorphism/Themes/ComboBox.xaml b/Avalonia.Themes.Neumorphism/Themes/ComboBox.xaml
index 47cf578..0a1c34e 100644
--- a/Avalonia.Themes.Neumorphism/Themes/ComboBox.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/ComboBox.xaml
@@ -47,6 +47,7 @@
 		<Setter Property="VerticalContentAlignment" Value="Center"/>
 		<Setter Property="BorderBrush" Value="Transparent" />
 		<Setter Property="BorderThickness" Value="0" />
+    <Setter Property="CornerRadius" Value="10"/>
 		<Setter Property="Padding" Value="8,4" />
 		<Setter Property="ClipToBounds" Value="False"/>
 		<Setter Property="Width" Value="NaN"/>
@@ -58,7 +59,7 @@
 		<Setter Property="FontWeight" Value="Normal"/>
 		<Setter Property="FontStyle" Value="Normal"/>
 		<Setter Property="Cursor" Value="Hand"/>
-		<Setter Property="assist:ComboBoxAssist.UseFloatingWatermark" Value="False"/>
+    <Setter Property="assist:ComboBoxAssist.UseFloatingWatermark" Value="False"/>
 		<Setter Property="assist:ComboBoxAssist.InnerLeftBackground" Value="#22444444"/>
 		<Setter Property="assist:ComboBoxAssist.InnerRightBackground" Value="#22444444"/>
 		<Setter Property="assist:ComboBoxAssist.InnerLeftPadding" Value="0"/>
@@ -94,7 +95,7 @@
 				<Grid HorizontalAlignment="Stretch" VerticalAlignment="Top" ClipToBounds="False" Focusable="False">
 
 					<Border Name="PART_Border" Height="{TemplateBinding Height}" HorizontalAlignment="Stretch"
-								CornerRadius="{TemplateBinding Height, Converter={StaticResource ControlHeightToCornerRadiusConverter}, ConverterParameter=0}"
+								CornerRadius="{TemplateBinding CornerRadius}"
 								Background="{TemplateBinding Background}"
 								BorderBrush="{TemplateBinding BorderBrush}"
 								BorderThickness="{TemplateBinding BorderThickness}">
@@ -230,7 +231,10 @@
 			</ControlTemplate>
 		</Setter>
 
-
+    
+    <Style Selector="^[CornerRadius=0] /template/ Border#PART_Border">
+      <Setter Property="CornerRadius" Value="{TemplateBinding Height, Converter={StaticResource ControlHeightToCornerRadiusConverter}, ConverterParameter=0}"/>
+    </Style>
 
 
 		<Style Selector="^ /template/ Border#PART_Border">
@@ -300,7 +304,6 @@
 			<Setter Property="Background" Value="#44CCCCCC"/>
 		</Style>
 
-		<!--, TextBlock:disabled-->
 		<Style Selector="^ /template/ Border#PART_Border:disabled">
 			<Setter Property="Opacity" Value="0.5" />
 		</Style>
@@ -318,7 +321,7 @@
 			<Setter Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxBackground}" />
 		</Style>
 
-		<Style Selector="^">
+		<Style Selector="^[CornerRadius=0]">
 			<Setter Property="FocusAdorner">
 				<FocusAdornerTemplate>
 					<Border BorderThickness="1" CornerRadius="{Binding $self.(AdornerLayer.AdornedElement).(Border.Height), Converter={StaticResource ControlHeightToCornerRadiusConverter}, ConverterParameter=0}}"
@@ -326,6 +329,15 @@
 				</FocusAdornerTemplate>
 			</Setter>
 		</Style>
+
+    <Style Selector="^">
+      <Setter Property="FocusAdorner">
+        <FocusAdornerTemplate>
+          <Border BorderThickness="1" CornerRadius="{Binding $self.(AdornerLayer.AdornedElement).(Border.CornerRadius)}"
+                  BorderBrush="{DynamicResource MaterialDesignFocus}"/>
+        </FocusAdornerTemplate>
+      </Setter>
+    </Style>
 	</ControlTheme>
 
 	<!-- Inset combobox theme -->
@@ -356,6 +368,7 @@
 		<Setter Property="VerticalAlignment" Value="Top"/>
 		<Setter Property="BorderBrush" Value="Transparent" />
 		<Setter Property="BorderThickness" Value="0" />
+    <Setter Property="CornerRadius" Value="10" />
 		<Setter Property="Padding" Value="8,4" />
 		<Setter Property="ClipToBounds" Value="False"/>
 		<Setter Property="Width" Value="NaN"/>
@@ -400,7 +413,7 @@
 							  Opacity="{TemplateBinding assist:ComboBoxAssist.UseFloatingWatermark, Converter={StaticResource BooleanValueToHalfDoubleConverter}, ConverterParameter=1}" />
 
 					<Border Name="PART_Border" Height="{TemplateBinding Height}" HorizontalAlignment="Stretch"
-							  CornerRadius="{TemplateBinding Height, Converter={StaticResource ControlHeightToCornerRadiusConverter}, ConverterParameter=0}"
+							  CornerRadius="{TemplateBinding CornerRadius}"
 							  Background="{TemplateBinding Background}"
 							  BorderBrush="{TemplateBinding BorderBrush}"
 							  BorderThickness="{TemplateBinding BorderThickness}">
@@ -413,7 +426,7 @@
 						</Border.BoxShadow>
 
 						<Border Name="PART_InnerBorder" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
-							  CornerRadius="{TemplateBinding Height, Converter={StaticResource ControlHeightToCornerRadiusConverter}, ConverterParameter=0}"
+							  CornerRadius="{TemplateBinding CornerRadius}"
 							  Background="Transparent"
 							  BorderBrush="Transparent"
 							  BorderThickness="8">
@@ -427,7 +440,7 @@
 
 
 
-							<ToggleButton Name="PART_Toggle" Theme="{StaticResource ToggleButtonNoFeedback}"
+							<ToggleButton Name="PART_Toggle" Theme="{StaticResource ToggleButtonNoFeedback}" Focusable="False"
 										  Width="{TemplateBinding Width}"
 										  Height="{TemplateBinding Height}"
 										  BorderThickness="0"
@@ -504,7 +517,12 @@
 			</ControlTemplate>
 		</Setter>
 
-		<Style Selector="^[IsDropDownOpen=true] /template/ Border#PART_PopupBorder">
+    <Style Selector="^[CornerRadius=0] /template/ Border#PART_InnerBorder">
+      <Setter Property="CornerRadius" Value="{TemplateBinding Height, Converter={StaticResource ControlHeightToCornerRadiusConverter}, ConverterParameter=0}"/>
+    </Style>
+
+
+    <Style Selector="^[IsDropDownOpen=true] /template/ Border#PART_PopupBorder">
 			<Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}"/>
 		</Style>
 
@@ -513,5 +531,13 @@
 			<Setter Property="RenderTransform" Value="scale(0.75)"/>
 		</Style>
 
+    <Style Selector="^">
+      <Setter Property="FocusAdorner">
+        <FocusAdornerTemplate>
+          <Border BorderThickness="1" CornerRadius="{Binding $self.(AdornerLayer.AdornedElement).(Border.Height), Converter={StaticResource ControlHeightToCornerRadiusConverter}, ConverterParameter=0}}"
+							BorderBrush="{DynamicResource MaterialDesignFocus}"/>
+        </FocusAdornerTemplate>
+      </Setter>
+    </Style>
 	</ControlTheme>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Avalonia.Themes.Neumorphism/Themes/ComboBoxItem.xaml b/Avalonia.Themes.Neumorphism/Themes/ComboBoxItem.xaml
index d0a06ce..91a761e 100644
--- a/Avalonia.Themes.Neumorphism/Themes/ComboBoxItem.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/ComboBoxItem.xaml
@@ -74,4 +74,4 @@
       <Setter Property="Background" Value="Gray" />
     </Style>
   </ControlTheme>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Avalonia.Themes.Neumorphism/Themes/ListBox.xaml b/Avalonia.Themes.Neumorphism/Themes/ListBox.xaml
index 540bf12..21e532d 100644
--- a/Avalonia.Themes.Neumorphism/Themes/ListBox.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/ListBox.xaml
@@ -1,10 +1,11 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:Avalonia.Themes.Neumorphism.Controls;assembly=Avalonia.Themes.Neumorphism">
+
+
+  <!-- Neumorphism theme ok -->
 
 
-	<!-- Neumorphism theme ok -->
-	
-	
   <Design.PreviewWith>
     <Border Padding="20">
       <ListBox>
@@ -18,47 +19,94 @@
 
 
 
-	<!--Default ListBox theme-->
-	<ControlTheme x:Key="{x:Type ListBox}" TargetType="ListBox">
-		<Setter Property="Padding" Value="0"/>
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
-		<Setter Property="Template">
-			<ControlTemplate>
-				<Border BorderBrush="{TemplateBinding BorderBrush}"
+  <!--Default ListBox theme-->
+  <ControlTheme x:Key="{x:Type ListBox}" TargetType="ListBox">
+    <Setter Property="Padding" Value="0"/>
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderBrush="{TemplateBinding BorderBrush}"
 						BorderThickness="{TemplateBinding BorderThickness}"
 						Background="{TemplateBinding Background}">
-					<ScrollViewer Name="PART_ScrollViewer"
+          <ScrollViewer Name="PART_ScrollViewer"
 								  Focusable="False"
 								  Padding="{TemplateBinding Padding}"
 								  HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
 								  VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
-						<ItemsPresenter Name="PART_ItemsPresenter"
+            <ItemsPresenter Name="PART_ItemsPresenter"
 										ItemsPanel="{TemplateBinding ItemsPanel}"
 										Margin="0" />
-					</ScrollViewer>
-				</Border>
-			</ControlTemplate>
-		</Setter>
-	</ControlTheme>
-	
+          </ScrollViewer>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+
+
+  <!--ListBoxCard theme-->
+  <ControlTheme x:Key="ListBoxCard" TargetType="ListBox">
+    <Setter Property="Padding" Value="0"/>
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="ClipToBounds" Value="False" />
+    <Setter Property="CornerRadius" Value="10" />
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
+    <Setter Property="Focusable" Value="True" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <controls:Card Name="PART_Card" Padding="0" CornerRadius="{TemplateBinding CornerRadius}" Focusable="{TemplateBinding Focusable}" Margin="{TemplateBinding Margin}">
+          <Border BorderBrush="{TemplateBinding BorderBrush}" ClipToBounds="{TemplateBinding ClipToBounds}" Focusable="False"
+							BorderThickness="{TemplateBinding BorderThickness}"
+							Background="{TemplateBinding Background}">
+            <ScrollViewer Name="PART_ScrollViewer"
+										Focusable="False"
+										Padding="{TemplateBinding Padding}"
+										HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+										VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+              <ItemsPresenter Name="PART_ItemsPresenter" Focusable="False"
+											ItemsPanel="{TemplateBinding ItemsPanel}"
+											Margin="0">
+              </ItemsPresenter>
+            </ScrollViewer>
+          </Border>
+        </controls:Card>
+      </ControlTemplate>
+    </Setter>
+
+    <!-- Focused State (custom FocusAdorner) -->
+    <Style Selector="^:focus">
+      <Style Selector="^ /template/ controls|Card#PART_Card">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignFocus}" />
+      </Style>
+    </Style>
+  </ControlTheme>
+
 
-	<!--Class NoScroll-->
-	<ControlTheme x:Key="ListBoxNoScroll" TargetType="ListBox">
-		<Setter Property="Template">
-			<ControlTemplate>
-				<Border BorderBrush="{TemplateBinding BorderBrush}"
+  <!--ListBoxNoScroll theme-->
+  <ControlTheme x:Key="ListBoxNoScroll" TargetType="ListBox">
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border BorderBrush="{TemplateBinding BorderBrush}"
 						BorderThickness="{TemplateBinding BorderThickness}"
 						Background="{TemplateBinding Background}">
-					<ItemsPresenter Name="PART_ItemsPresenter"
+          <ItemsPresenter Name="PART_ItemsPresenter"
 									ItemsPanel="{TemplateBinding ItemsPanel}"
 									Margin="{TemplateBinding Padding}" />
-				</Border>
-			</ControlTemplate>
-		</Setter>
-	</ControlTheme>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
 </ResourceDictionary>
diff --git a/Avalonia.Themes.Neumorphism/Themes/ListBoxItem.xaml b/Avalonia.Themes.Neumorphism/Themes/ListBoxItem.xaml
index dff5393..b964a92 100644
--- a/Avalonia.Themes.Neumorphism/Themes/ListBoxItem.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/ListBoxItem.xaml
@@ -30,6 +30,8 @@
     <Setter Property="FontSize" Value="8" />
 		<Setter Property="assist:SelectionControlAssist.Background" Value="{DynamicResource MaterialDesignSelection}"/>
 		<Setter Property="assist:SelectionControlAssist.Foreground" Value="{DynamicResource MaterialDesignForeground}"/>
+    <Setter Property="ClipToBounds" Value="True" />
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
 		<Setter Property="Template">
 			<ControlTemplate>
 				<Border Name="PART_RootBorder" Cursor="{TemplateBinding Cursor}"
@@ -62,13 +64,14 @@
 				</Border>
 			</ControlTemplate>
 		</Setter>
-	</ControlTheme>
+  </ControlTheme>
 
 	<!--Class Outset-->
 	<ControlTheme x:Key="ListBoxItemOutset" BasedOn="{StaticResource ListBoxItemShared}" TargetType="ListBoxItem">
 		<Setter Property="Foreground" Value="{DynamicResource MaterialDesignToolForeground}" />
 		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="Transparent" />
 		<Setter Property="Padding" Value="16,0,16,0" />
 		<Setter Property="CornerRadius" Value="0"/>
 		<Setter Property="Width" Value="NaN"/>
@@ -81,6 +84,7 @@
 		<Setter Property="ClipToBounds" Value="False" />
 		<Setter Property="assist:SelectionControlAssist.Background" Value="{DynamicResource MaterialDesignSelection}"/>
 		<Setter Property="assist:SelectionControlAssist.Foreground" Value="{DynamicResource MaterialDesignForeground}"/>
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
 		<Setter Property="Template">
 			<ControlTemplate>
 				<Border Name="PART_RootBorder"
@@ -147,6 +151,13 @@
 		<Style Selector="^[CornerRadius=0] /template/ Border#pointerOverBorder">
 			<Setter Property="CornerRadius" Value="{TemplateBinding Height, Converter={StaticResource ControlHeightToCornerRadiusConverter}, ConverterParameter=0}"/>
 		</Style>
+
+    <!-- Focused State (custom FocusAdorner) -->
+    <Style Selector="^:focus">
+      <Style Selector="^ /template/ Border#PART_RootBorder">
+        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignFocus}" />
+      </Style>
+    </Style>
 	</ControlTheme>
   
 
@@ -154,7 +165,8 @@
 	<ControlTheme x:Key="ListBoxItemInset" BasedOn="{StaticResource ListBoxItemShared}" TargetType="ListBoxItem">
 		<Setter Property="Foreground" Value="{DynamicResource MaterialDesignToolForeground}" />
 		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="Transparent" />
 		<Setter Property="Padding" Value="16,0,16,0" />
 		<Setter Property="CornerRadius" Value="0"/>
 		<Setter Property="Width" Value="NaN"/>
@@ -167,6 +179,7 @@
 		<Setter Property="ClipToBounds" Value="False" />
 		<Setter Property="assist:SelectionControlAssist.Background" Value="{DynamicResource MaterialDesignSelection}"/>
 		<Setter Property="assist:SelectionControlAssist.Foreground" Value="{DynamicResource MaterialDesignForeground}"/>
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
 		<Setter Property="Template">
 			<ControlTemplate>
 				<Border Name="PART_RootBorder"
@@ -234,6 +247,13 @@
 		<Style Selector="^[CornerRadius=0] /template/ Border#pointerOverBorder">
 			<Setter Property="CornerRadius" Value="{TemplateBinding Height, Converter={StaticResource ControlHeightToCornerRadiusConverter}, ConverterParameter=0}"/>
 		</Style>
+
+    <!-- Focused State (custom FocusAdorner) -->
+    <Style Selector="^:focus">
+      <Style Selector="^ /template/ Border#PART_RootBorder">
+        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignFocus}" />
+      </Style>
+    </Style>
 	</ControlTheme>
 
 
@@ -338,5 +358,4 @@
 			<Setter Property="Opacity" Value="0" />
 		</Style>
 	</ControlTheme>
-  
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Avalonia.Themes.Neumorphism/Themes/MenuItem.xaml b/Avalonia.Themes.Neumorphism/Themes/MenuItem.xaml
index dcd6412..d66e5f0 100644
--- a/Avalonia.Themes.Neumorphism/Themes/MenuItem.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/MenuItem.xaml
@@ -68,7 +68,6 @@
     <Setter Property="Foreground" Value="{DynamicResource MaterialDesignForeground}" />
     <Setter Property="Padding" Value="{DynamicResource MenuFlyoutItemThemePaddingNarrow}" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-
     <Setter Property="assist:MenuAssist.PopupAnchor" Value="TopRight" />
     <Setter Property="assist:MenuAssist.PopupPlacement" Value="RightEdgeAlignedTop" />
     <Setter Property="assist:MenuAssist.PopupHorizontalOffset" Value="0" />
@@ -79,6 +78,9 @@
     <Setter Property="Cursor" Value="Hand" />
     <Setter Property="CornerRadius" Value="10" />
     <Setter Property="Margin" Value="2" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Panel>
@@ -241,6 +243,11 @@
         </ControlTemplate>
       </Setter>
     </Style>
+
+    <!-- Focused State (custom FocusAdorner) -->
+    <Style Selector="^:focus /template/ Border#PART_LayoutRoot">
+      <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignFocus}" />
+    </Style>
   </ControlTheme>
 
 
@@ -259,7 +266,6 @@
     <Setter Property="assist:MenuAssist.PopupVerticalOffset" Value="0" />
     <Setter Property="assist:MenuAssist.PopupBorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
     <Setter Property="assist:MenuAssist.PopupBorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
-
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="PART_LayoutRoot"
diff --git a/Avalonia.Themes.Neumorphism/Themes/NumericUpDown.xaml b/Avalonia.Themes.Neumorphism/Themes/NumericUpDown.xaml
index 1536dca..2525c54 100644
--- a/Avalonia.Themes.Neumorphism/Themes/NumericUpDown.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/NumericUpDown.xaml
@@ -22,24 +22,22 @@
     </Border>
   </Design.PreviewWith>
 
-
-
-
-
 	<!--Default NumericUpDown theme-->
 	<ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
 		<Setter Property="BorderBrush" Value="Transparent"/>
-		<Setter Property="BorderThickness" Value="0"/>
+		<Setter Property="BorderThickness" Value="1"/>
+    <Setter Property="CornerRadius" Value="10"/>
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="HorizontalAlignment" Value="Left"/>
 		<Setter Property="VerticalAlignment" Value="Center"/>
 		<Setter Property="Height" Value="40"/>
 		<Setter Property="Width" Value="NaN"/>
 		<Setter Property="MinWidth" Value="80"/>
-		<Setter Property="CornerRadius" Value="10"/>
 		<Setter Property="Margin" Value="0"/>
 		<Setter Property="Padding" Value="0"/>
 		<Setter Property="Foreground" Value="Black"/>
+    <Setter Property="Focusable" Value="True" />
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
 		<Setter Property="Template">
 			<ControlTemplate>
 				<Border Name="PART_RootBorder"
@@ -59,9 +57,8 @@
 					        </Border.BoxShadow>
 					
 					<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0">
-						<Border Name="focusBorder"
-                                Background="{TemplateBinding Background}" Margin="0" />
-						<ButtonSpinner Name="PART_Spinner"
+						<Border Name="focusBorder" Background="{TemplateBinding Background}" Margin="0" />
+						<ButtonSpinner Name="PART_Spinner" Focusable="False"
                                       BorderThickness="0"
                                       BorderBrush="Transparent"
                                       IsEnabled="{TemplateBinding IsEnabled}"
@@ -72,7 +69,7 @@
                                       AllowSpin="{TemplateBinding AllowSpin}"
                                       ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
                                       ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}">
-							<TextBox Name="PART_TextBox"
+							<TextBox Name="PART_TextBox" Focusable="False"
                                     Theme="{StaticResource TextBoxNoMaterial}"
                                     IsEnabled="{TemplateBinding IsEnabled}"
                                     Background="Transparent"
@@ -92,80 +89,17 @@
 			</ControlTemplate>
 		</Setter>
 
-		<!--<Style Selector="^ /template/ Border#PART_RootBorder">
-            <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextBoxBorder}" />
-        </Style>-->
+    <Style Selector="^[CornerRadius=0] /template/ Border#PART_RootBorder">
+      <Setter Property="CornerRadius" Value="{TemplateBinding Height, Converter={StaticResource ControlHeightToCornerRadiusConverter}, ConverterParameter=0}"/>
+    </Style>
+
+    <!-- Focused State (custom FocusAdorner) -->
+    <Style Selector="^:focus-within /template/ Border#PART_RootBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignFocus}" />
+    </Style>
 
 		<Style Selector="^.Filled">
 			<Setter Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxBackground}" />
 		</Style>
 	</ControlTheme>
-
-
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-
-  <!--<ControlTheme x:Key="{x:Type NumericUpDown}" TargetType="NumericUpDown">
-    <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
-    <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
-    <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
-    <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
-    <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
-    <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-    <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
-    <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
-    <Setter Property="Template">
-      <ControlTemplate>
-        <ButtonSpinner Name="PART_Spinner"
-                       Background="{TemplateBinding Background}"
-                       BorderThickness="{TemplateBinding BorderThickness}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       CornerRadius="{TemplateBinding CornerRadius}"
-                       Padding="0"
-                       MinWidth="0"
-                       HorizontalContentAlignment="Stretch"
-                       VerticalContentAlignment="Stretch"
-                       AllowSpin="{TemplateBinding AllowSpin}"
-                       ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
-                       DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                       ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}">
-          <TextBox Name="PART_TextBox"
-                   Background="Transparent"
-                   BorderBrush="Transparent"
-                   Margin="-1"
-                   Padding="{TemplateBinding Padding}"
-                   MinWidth="0"
-                   Foreground="{TemplateBinding Foreground}"
-                   FontSize="{TemplateBinding FontSize}"
-                   Watermark="{TemplateBinding Watermark}"
-                   IsReadOnly="{TemplateBinding IsReadOnly}"
-                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                   Text="{TemplateBinding Text}"
-                   AcceptsReturn="False"
-                   TextWrapping="NoWrap" />
-        </ButtonSpinner>
-      </ControlTemplate>
-    </Setter>
-  </ControlTheme>-->
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Avalonia.Themes.Neumorphism/Themes/RadioButton.xaml b/Avalonia.Themes.Neumorphism/Themes/RadioButton.xaml
index ed89d3c..3747980 100644
--- a/Avalonia.Themes.Neumorphism/Themes/RadioButton.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/RadioButton.xaml
@@ -124,8 +124,8 @@
 
 
 		<Style Selector="^:disabled">
-			<Setter Property="assist:SelectionControlAssist.Foreground" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
-			<Setter Property="assist:SelectionControlAssist.InnerForeground" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
+			<Setter Property="assist:SelectionControlAssist.Foreground" Value="{DynamicResource MaterialDesignDisabled}" />
+			<Setter Property="assist:SelectionControlAssist.InnerForeground" Value="{DynamicResource MaterialDesignDisabled}" />
 			<Setter Property="Opacity" Value="0.26" />
 		</Style>
 
@@ -160,8 +160,8 @@
 	<ControlTheme x:Key="RadioButtonButton" TargetType="RadioButton">
 		<Setter Property="HorizontalContentAlignment" Value="Center" />
 		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="BorderThickness" Value="0"/>
-		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="1"/>
+		<Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignPaper}" />
 		<Setter Property="Foreground" Value="{DynamicResource MaterialDesignForeground}" />
 		<Setter Property="assist:RadioButtonAssist.CheckedBackground" Value="{DynamicResource MaterialDesignTextFieldBoxDisabledBackground}"/>
 		<Setter Property="assist:RadioButtonAssist.CheckedForeground" Value="{DynamicResource PrimaryHueMidBrush}"/>
@@ -179,11 +179,16 @@
 			<Setter.Value>
 				<ControlTemplate>
 					<Grid Name="templateRoot" Background="Transparent">
-						<Border Name="PART_SelectedIndicator" Margin="0" Padding="0" CornerRadius="{TemplateBinding CornerRadius}" Background="{TemplateBinding Background}" Cursor="{TemplateBinding Cursor}">
+						<Border Name="PART_SelectedIndicator" Margin="0" Padding="0" 
+                    BorderBrush="{TemplateBinding BorderBrush}"
+										BorderThickness="{TemplateBinding BorderThickness}" 
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    Background="{TemplateBinding Background}"
+                    Cursor="{TemplateBinding Cursor}">
 							<ripple:RippleEffect RippleFill="{DynamicResource MaterialDesignFlatButtonRipple}">
 								<ContentPresenter Name="PART_ContentPresenter"
-												  BorderBrush="{TemplateBinding BorderBrush}"
-												  BorderThickness="{TemplateBinding BorderThickness}"
+												  BorderBrush="Transparent"
+												  BorderThickness="0"
 												  Background="Transparent"
 												  ContentTemplate="{TemplateBinding ContentTemplate}"
 												  Content="{TemplateBinding Content}"
@@ -224,6 +229,7 @@
 		</Style>
 		<Style Selector="^:checked /template/ Border#PART_SelectedIndicator">
 			<Setter Property="Background" Value="{TemplateBinding assist:RadioButtonAssist.CheckedBackground}"/>
+      <Setter Property="BorderBrush" Value="{TemplateBinding assist:RadioButtonAssist.CheckedBackground}"/>
 		</Style>
 
 		<Style Selector="^:not(.Accent):checked /template/ ContentPresenter#PART_ContentPresenter">
@@ -234,11 +240,11 @@
 		<!-- Accent -->
 		<Style Selector="^.Accent">
 			<Setter Property="Foreground" Value="{DynamicResource SecondaryHueMidBrush}" />
-			<Setter Property="BorderBrush" Value="{DynamicResource SecondaryHueMidBrush}" />
 		</Style>
 
 		<Style Selector="^.Accent:checked">
 			<Setter Property="Foreground" Value="{DynamicResource SecondaryHueDarkBrush}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource SecondaryHueMidBrush}" />
 		</Style>
 
     <Style Selector="^:disabled">
diff --git a/Avalonia.Themes.Neumorphism/Themes/Slider.xaml b/Avalonia.Themes.Neumorphism/Themes/Slider.xaml
index 1f95b9b..d2387d6 100644
--- a/Avalonia.Themes.Neumorphism/Themes/Slider.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/Slider.xaml
@@ -121,6 +121,15 @@
       <Setter Property="MinWidth" Value="0"/>
       <Setter Property="MinHeight" Value="0"/>
     </Style>
+
+    <Style Selector="^">
+      <Setter Property="FocusAdorner">
+        <FocusAdornerTemplate>
+          <Border BorderThickness="1" CornerRadius="{Binding $self.(AdornerLayer.AdornedElement).(Border.Height), Converter={StaticResource HeightToCornerRadiusConverter}}"
+							BorderBrush="{DynamicResource MaterialDesignFocus}"/>
+        </FocusAdornerTemplate>
+      </Setter>
+    </Style>
   </ControlTheme>
 
   
@@ -201,6 +210,15 @@
       <Setter Property="MinWidth" Value="0"/>
       <Setter Property="MinHeight" Value="0"/>
     </Style>
+
+    <Style Selector="^">
+      <Setter Property="FocusAdorner">
+        <FocusAdornerTemplate>
+          <Border BorderThickness="1" CornerRadius="{Binding $self.(AdornerLayer.AdornedElement).(Border.Width), Converter={StaticResource HeightToCornerRadiusConverter}}"
+              BorderBrush="{DynamicResource MaterialDesignFocus}"/>
+        </FocusAdornerTemplate>
+      </Setter>
+    </Style>
   </ControlTheme>
   
 
@@ -276,6 +294,14 @@
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^">
+      <Setter Property="FocusAdorner">
+        <FocusAdornerTemplate>
+          <Border BorderThickness="1" CornerRadius="{Binding $self.(AdornerLayer.AdornedElement).(Border.Height), Converter={StaticResource HeightToCornerRadiusConverter}}"
+              BorderBrush="{DynamicResource MaterialDesignFocus}"/>
+        </FocusAdornerTemplate>
+      </Setter>
+    </Style>
   </ControlTheme>
 
   <!-- Vertical class Outset -->
@@ -350,6 +376,14 @@
         </Grid>
       </ControlTemplate>
     </Setter>
+    <Style Selector="^">
+      <Setter Property="FocusAdorner">
+        <FocusAdornerTemplate>
+          <Border BorderThickness="1" CornerRadius="{Binding $self.(AdornerLayer.AdornedElement).(Border.Width), Converter={StaticResource HeightToCornerRadiusConverter}}"
+              BorderBrush="{DynamicResource MaterialDesignFocus}"/>
+        </FocusAdornerTemplate>
+      </Setter>
+    </Style>
   </ControlTheme>
 
 
@@ -365,7 +399,7 @@
 
     <!-- Shared styles -->
     <Style Selector="^:disabled">
-      <Setter Property="Foreground" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
+      <Setter Property="Foreground" Value="{DynamicResource MaterialDesignDisabled}" />
     </Style>
 
     <Style Selector="^[TickPlacement=None] /template/ TickBar#TopTick">
@@ -478,8 +512,8 @@
 
   <ControlTheme x:Key="ThumbSliderBase" TargetType="Thumb">
     <Style Selector="^.SliderThumb:disabled /template/ Ellipse#grip">
-      <Setter Property="Fill" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
-      <Setter Property="Stroke" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
+      <Setter Property="Fill" Value="{DynamicResource MaterialDesignDisabled}" />
+      <Setter Property="Stroke" Value="{DynamicResource MaterialDesignDisabled}" />
     </Style>
     <Style Selector="^.SliderThumb /template/ Ellipse#shadow">
       <Setter Property="Opacity" Value="0" />
@@ -501,8 +535,8 @@
       <Setter Property="Fill" Value="{DynamicResource Foreground}" />
     </Style>
     <Style Selector="^:disabled /template/ Ellipse#grip">
-      <Setter Property="Fill" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
-      <Setter Property="Stroke" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
+      <Setter Property="Fill" Value="{DynamicResource MaterialDesignDisabled}" />
+      <Setter Property="Stroke" Value="{DynamicResource MaterialDesignDisabled}" />
     </Style>
     <Style Selector="^:pointerover /template/ Ellipse#shadow">
       <Setter Property="Opacity" Value="0.26" />
@@ -515,8 +549,8 @@
     </Style>
 
     <Style Selector="^[IsEnabled=False] /template/ Border#grip">
-      <Setter Property="Background" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
-      <Setter Property="assist:SliderAssist.ThumbForeground" Value="{DynamicResource MaterialDesignCheckBoxDisabled}"/>
+      <Setter Property="Background" Value="{DynamicResource MaterialDesignDisabled}" />
+      <Setter Property="assist:SliderAssist.ThumbForeground" Value="{DynamicResource MaterialDesignDisabled}"/>
     </Style>
 
     <!--Discrete thumb definitions and styles-->
diff --git a/Avalonia.Themes.Neumorphism/Themes/TabItem.xaml b/Avalonia.Themes.Neumorphism/Themes/TabItem.xaml
index c62a523..f70d588 100644
--- a/Avalonia.Themes.Neumorphism/Themes/TabItem.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/TabItem.xaml
@@ -38,6 +38,8 @@
     <Setter Property="FontWeight" Value="Normal" />
     <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
     <Setter Property="Foreground" Value="{DynamicResource MaterialDesignForeground}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="Transparent" />
     <Setter Property="Padding" Value="0" />
     <Setter Property="Margin" Value="0" />
     <Setter Property="Height" Value="NaN" />
@@ -49,8 +51,7 @@
     <Setter Property="assist:TabControlAssist.UseHighlightStroke" Value="False" />
     <Setter Property="assist:TabControlAssist.HighlightStrokeSize" Value="4" />
     <Setter Property="assist:TabControlAssist.HighlightStrokeBrush" Value="{DynamicResource PrimaryHueLightBrush}" />
-    
-    
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
     <Setter Property="Template">
       <ControlTemplate>
           <Border
@@ -268,6 +269,12 @@
       <Setter Property="Margin" Value="10"/>
       <Setter Property="CornerRadius" Value="{TemplateBinding CornerRadius, Converter={StaticResource CustomCornerRadiusConverter}, ConverterParameter=100%|100%|100%|100%}" />
     </Style>
-  </ControlTheme>
-</ResourceDictionary>
 
+    <!-- Focused State (custom FocusAdorner) -->
+    <Style Selector="^:focus">
+      <Style Selector="^ /template/ Border#PART_LayoutRoot">
+        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignFocus}" />
+      </Style>
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Avalonia.Themes.Neumorphism/Themes/TextBlock.xaml b/Avalonia.Themes.Neumorphism/Themes/TextBlock.xaml
index 0f72ddb..e0d2dc4 100644
--- a/Avalonia.Themes.Neumorphism/Themes/TextBlock.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/TextBlock.xaml
@@ -8,6 +8,8 @@
   <ControlTheme x:Key="{x:Type TextBlock}" TargetType="TextBlock">
     <Setter Property="FontFamily" Value="{DynamicResource NeumorphismFont2}" />
     <Setter Property="FontSize" Value="14" />
+    <Setter Property="Focusable" Value="False" />
+
 
     <Style Selector="^.Caption">
       <Setter Property="FontSize" Value="12" />
diff --git a/Avalonia.Themes.Neumorphism/Themes/TextBox.xaml b/Avalonia.Themes.Neumorphism/Themes/TextBox.xaml
index df36382..766c27c 100644
--- a/Avalonia.Themes.Neumorphism/Themes/TextBox.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/TextBox.xaml
@@ -81,6 +81,8 @@
 		<Setter Property="Watermark" Value=" "/>
 		<Setter Property="FontWeight" Value="Normal"/>
 		<Setter Property="Height" Value="40"/>
+    <Setter Property="MinHeight" Value="40"/>
+    <Setter Property="MaxHeight" Value="260"/>
 		<Setter Property="Width" Value="240"/>
 		<Setter Property="ClipToBounds" Value="False" />
 		<Setter Property="BorderThickness" Value="0"/>
@@ -122,11 +124,12 @@
 											FontStyle="{TemplateBinding FontStyle}"
 											Text="{TemplateBinding (assist:TextFieldAssist.Label)}"
 											Foreground="{TemplateBinding Foreground}" Opacity="0.5"
-											RenderTransformOrigin="0, 0" />
+											RenderTransformOrigin="0,0" />
 
 							<DataValidationErrors Name="DataValidation">
-								<Grid Name="PART_Grid" ColumnDefinitions="Auto,*,Auto" Margin="0" VerticalAlignment="Stretch" Height="{TemplateBinding Height}">
-									<ContentPresenter Grid.Column="0" Content="{TemplateBinding InnerLeftContent}" />
+								<Grid Name="PART_Grid" ColumnDefinitions="Auto,*,Auto" RowDefinitions="*" Margin="0" VerticalAlignment="Stretch"
+                      Height="{TemplateBinding Height}">
+									<ContentPresenter Grid.Column="0" Content="{TemplateBinding InnerLeftContent}" Focusable="False"/>
 									<Panel Grid.Column="1" Name="PART_TextRoot" VerticalAlignment="Top" HorizontalAlignment="Stretch">
 										<ScrollViewer Name="PART_Scroller" VerticalAlignment="Stretch" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="15,0,15,0"
 													  HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
@@ -167,7 +170,7 @@
 											</Panel>
 										</ScrollViewer>
 									</Panel>
-									<ContentPresenter Grid.Column="2" Content="{TemplateBinding InnerRightContent}"/>
+									<ContentPresenter Grid.Column="2" Content="{TemplateBinding InnerRightContent}" Focusable="False"/>
 								</Grid>
 							</DataValidationErrors>
 						</Grid>
@@ -210,7 +213,7 @@
 
 		<!-- Default TextBox style -->
 		<Style Selector="^ /template/ Panel#PART_TextRoot">
-			<Setter Property="Margin" Value="1, 0" />
+			<Setter Property="Margin" Value="1,0" />
 		</Style>
 
 		<Style Selector="^ /template/ TextBlock#floatingWatermark">
@@ -219,16 +222,16 @@
 
 		<!-- Default TextBox style -->
 		<Style Selector="^[UseFloatingWatermark=True] /template/ Panel#PART_TextRoot">
-			<Setter Property="Margin" Value="1, 10, 1, 0" />
+			<Setter Property="Margin" Value="1,10,1,0" />
 		</Style>
 
 		<Style Selector="^[UseFloatingWatermark=False] /template/ Panel#PART_TextRoot">
-			<Setter Property="Margin" Value="1, 10, 1, 0" />
+			<Setter Property="Margin" Value="1,10,1,0" />
 		</Style>
 
-		<Style Selector="^[AcceptsReturn=True][Height=NaN] /template/ Border#PART_RootBorder">
-			<Setter Property="MinHeight" Value="40" />
-		</Style>
+   
+
+		
 
 		<!-- Transitions for all styles textfield -->
 		<Style Selector="^:not(.notransitions) /template/ TextBlock#floatingWatermark, ^:not(.notransitions) /template/ Border#watermarkRoot">
@@ -257,6 +260,32 @@
 			<Setter Property="Width" Value="{TemplateBinding Width, Converter={StaticResource WidthMinusValueConverter}, ConverterParameter=50}" />
 		</Style>
 
+    <!--Dynamic height multiline-->
+    <Style Selector="^[AcceptsReturn=True][Height=NaN] /template/ Border#PART_RootBorder">
+      <Setter Property="MinHeight" Value="{TemplateBinding MinHeight}" />
+      <Setter Property="MaxHeight" Value="{TemplateBinding MaxHeight}" />
+    </Style>
+
+    <!--Dynamic height multiline-->
+    <Style Selector="^[AcceptsReturn=True][Height=NaN] /template/ Grid#PART_Grid">
+      <Setter Property="Margin" Value="0,0,0,15" />
+    </Style>
+
+    
+
+
+
+    <Style Selector="^[AcceptsReturn=True][Height=NaN]">
+      <Setter Property="FocusAdorner">
+        <FocusAdornerTemplate>
+          <Border BorderThickness="1" CornerRadius="{Binding $self.(AdornerLayer.AdornedElement).(Border.CornerRadius)}"
+                  BorderBrush="{DynamicResource MaterialDesignFocus}" Height="{Binding $self.(AdornerLayer.AdornedElement).(Border.Height)}"/>
+        </FocusAdornerTemplate>
+      </Setter>
+    </Style>
+    
+    
+
 		<!-- Invalid state -->
 		<!--<Style Selector="^:error /template/ controls|MaterialUnderline#PART_Underline">
 			<Setter Property="Background" Value="{DynamicResource ValidationErrorBrush}" />
@@ -377,7 +406,7 @@
 
 								<DataValidationErrors Name="DataValidation">
 									<Grid Name="PART_Grid" ColumnDefinitions="Auto,*,Auto" Margin="0" VerticalAlignment="Stretch" Height="{TemplateBinding Height}">
-										<ContentPresenter Grid.Column="0" Content="{TemplateBinding InnerLeftContent}"/>
+										<ContentPresenter Grid.Column="0" Content="{TemplateBinding InnerLeftContent}" Focusable="False"/>
 										<Panel Grid.Column="1" Name="PART_TextRoot" VerticalAlignment="Top" HorizontalAlignment="Stretch">
 											<ScrollViewer Name="PART_Scroller" VerticalAlignment="Stretch" HorizontalAlignment="Left" Margin="15,0,15,0"
 														  HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
@@ -420,7 +449,7 @@
 											</ScrollViewer>
 										</Panel>
 										<StackPanel Grid.Column="2" Orientation="Horizontal">
-											<ContentPresenter Content="{TemplateBinding InnerRightContent}" Margin="0"/>
+											<ContentPresenter Content="{TemplateBinding InnerRightContent}" Margin="0" Focusable="False"/>
 										</StackPanel>
 									</Grid>
 								</DataValidationErrors>
@@ -527,7 +556,7 @@
 
                   <!--Left container-->
                   <Border Grid.Column="0" Name="PART_LeftContainer" Width="{TemplateBinding assist:TextFieldAssist.InnerLeftWidth}" Background="{TemplateBinding assist:TextFieldAssist.InnerLeftBackground}"
-                    CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource DoubleToLeftRightCornerRadiusConverter}, ConverterParameter=0}"
+                    CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource DoubleToLeftRightCornerRadiusConverter}, ConverterParameter=0}" Focusable="False"
                     VerticalAlignment="Stretch">
                     <ContentPresenter Background="Transparent" Content="{TemplateBinding InnerLeftContent}" Padding="{TemplateBinding assist:TextFieldAssist.InnerLeftPadding}" HorizontalContentAlignment="Left" />
                   </Border>
@@ -578,7 +607,7 @@
                   
                   <!--Right container-->
                   <Border Grid.Column="2" Name="PART_RightContainer" Width="{TemplateBinding assist:TextFieldAssist.InnerRightWidth}" Background="{TemplateBinding assist:TextFieldAssist.InnerRightBackground}"
-                    CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource DoubleToLeftRightCornerRadiusConverter}, ConverterParameter=1}"
+                    CornerRadius="{TemplateBinding CornerRadius, Converter={StaticResource DoubleToLeftRightCornerRadiusConverter}, ConverterParameter=1}" Focusable="False"
                     VerticalAlignment="Stretch">
                     <ContentPresenter Background="Transparent" Content="{TemplateBinding InnerRightContent}" Padding="{TemplateBinding assist:TextFieldAssist.InnerRightPadding}" HorizontalContentAlignment="Right" />
                   </Border>
@@ -815,6 +844,7 @@
 		<Setter Property="HorizontalAlignment" Value="Left" />
 		<Setter Property="VerticalAlignment" Value="Center" />
 		<Setter Property="CornerRadius" Value="0" />
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
 		<Setter Property="Template">
 			<ControlTemplate>
 						<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0">
diff --git a/Avalonia.Themes.Neumorphism/Themes/TimePicker.xaml b/Avalonia.Themes.Neumorphism/Themes/TimePicker.xaml
index a0234b0..45ac1cc 100644
--- a/Avalonia.Themes.Neumorphism/Themes/TimePicker.xaml
+++ b/Avalonia.Themes.Neumorphism/Themes/TimePicker.xaml
@@ -82,7 +82,7 @@
     <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
     <Setter Property="Foreground" Value="{DynamicResource MaterialDesignForeground}" />
     <Setter Property="BorderBrush" Value="Transparent" />
-    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="BorderThickness" Value="1" />
     <Setter Property="assist:TimePickerAssist.InnerRightBackground" Value="#22444444"/>
     <Setter Property="assist:TimePickerAssist.InnerRightPadding" Value="0"/>
     <Setter Property="HorizontalAlignment" Value="Left" />
@@ -98,13 +98,14 @@
     <Setter Property="FontSize" Value="14"/>
     <Setter Property="ClockIdentifier" Value="24HourClock"/>
     <Setter Property="ClipToBounds" Value="False" />
+    <Setter Property="FocusAdorner" Value="{x:Null}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid RowDefinitions="*" Margin="0" VerticalAlignment="Top">
+        <!--<Grid RowDefinitions="*" Margin="0" VerticalAlignment="Top">-->
           <Border x:Name="PART_RootBorder"
 							CornerRadius="{TemplateBinding Height, Converter={StaticResource ControlHeightToCornerRadiusConverter}, ConverterParameter=0}"
-							BorderThickness="0"
-							BorderBrush="Transparent"
+							BorderThickness="{TemplateBinding BorderThickness}"
+							BorderBrush="{TemplateBinding BorderBrush}"
 							Background="{TemplateBinding Background}">
             <Border.BoxShadow>
               <MultiBinding Converter="{StaticResource AutoBoxShadowsConverter}" ConverterParameter="2">
@@ -183,7 +184,7 @@
               </Popup>
             </Grid>
           </Border>
-				</Grid>
+				<!--</Grid>-->
       </ControlTemplate>
     </Setter>
     
@@ -195,6 +196,11 @@
       <Setter Property="BorderBrush" Value="{DynamicResource SystemControlErrorTextForegroundBrush}"/>
     </Style>
 
+    <!-- Focused State (custom FocusAdorner) -->
+    <Style Selector="^:focus-within /template/ Border#PART_RootBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignFocus}" />
+    </Style>
+
    
     <!-- Error State -->
     <Style Selector="^:error /template/ Border#PART_RootBorder">
diff --git a/Neumorphism.Avalonia.Demo/App.axaml b/Neumorphism.Avalonia.Demo/App.axaml
index 07b3f7d..43b504e 100644
--- a/Neumorphism.Avalonia.Demo/App.axaml
+++ b/Neumorphism.Avalonia.Demo/App.axaml
@@ -10,12 +10,6 @@
 			x:CompileBindings="True"
 			x:DataType="viewModels:ApplicationModelBase">
 
-	<!--<Application.Resources>
-		<StyleInclude x:Key="fluentDataGrid" Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml" />
-		<StyleInclude x:Key="simpleDataGrid" Source="avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml" />
-		<StyleInclude x:Key="neumorphismDataGrid" Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml" /> 
-	</Application.Resources>-->
-  
 	<Application.Styles>
 		<!--Neumorphism theme color setup-->
 		<theme:NeumorphismTheme BaseTheme="Light" PrimaryColor="Purple" SecondaryColor="Lime"/>
@@ -27,12 +21,5 @@
 		<StyleInclude Source="avares://ShowMeTheXaml.Avalonia/XamlDisplay.xaml"/>
 		<!--ShowMeTheXaml styling customization-->
 		<StyleInclude Source="avares://Neumorphism.Avalonia.Demo/NeumorphismXamlDisplay.axaml" />
-
-		<!--<Style Selector="showMeTheXaml|XamlDisplay">
-		  <Setter Property="ClipToBounds" Value="False"></Setter>
-		  <Setter Property="VerticalAlignment" Value="Top"></Setter>
-		  <Setter Property="Margin" Value="8" />
-		  <Setter Property="HorizontalAlignment" Value="Stretch"/>
-		</Style>-->
 	</Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/Neumorphism.Avalonia.Demo/Pages/ComboBoxesDemo.axaml b/Neumorphism.Avalonia.Demo/Pages/ComboBoxesDemo.axaml
index 552a368..c040453 100644
--- a/Neumorphism.Avalonia.Demo/Pages/ComboBoxesDemo.axaml
+++ b/Neumorphism.Avalonia.Demo/Pages/ComboBoxesDemo.axaml
@@ -30,12 +30,12 @@
 					</showMeTheXaml:XamlDisplay>
 					<!--****************************************************************-->
 					<showMeTheXaml:XamlDisplay UniqueId="ClassicComboBoxes1">
-						<ComboBox Width="500" PlaceholderText="Please select your favorite Beatles" Height="42" assist:ComboBoxAssist.UseFloatingWatermark="True"
+						<ComboBox Width="500" CornerRadius="100" PlaceholderText="Please select your favorite Beatles" Height="42" assist:ComboBoxAssist.UseFloatingWatermark="True"
 								  ToolTip.Tip='Floating label watermarked comboBox with default theme applied and custom inner left content'
                       ItemsSource="{CompiledBinding AllBeatles}"
 											SelectedValueBinding="{CompiledBinding Key}"
 											SelectedItem="{CompiledBinding MyFavoriteBeatle1}"
-								  SelectionChanged="ClassicComboBoxes1SelectionChanged">
+											SelectionChanged="ClassicComboBoxesSelectionChanged">
               <ComboBox.ItemTemplate>
                 <DataTemplate>
                   <TextBlock Text="{CompiledBinding Value}" VerticalAlignment="Center"/>
@@ -110,7 +110,7 @@
 				<StackPanel Orientation="Horizontal">
 					<!--****************************************************************-->
 					<showMeTheXaml:XamlDisplay UniqueId="OutsetComboBoxes0">
-						<ComboBox Theme="{StaticResource ComboBoxOutset}" PlaceholderText="Select an item" ToolTip.Tip='Disabled comboBox with theme "ComboBoxOutset" applied'>
+						<ComboBox Theme="{StaticResource ComboBoxOutset}" PlaceholderText="Select an item" ToolTip.Tip='Regular comboBox with theme "ComboBoxOutset" applied'>
 							<TextBlock Text="Item 1" />
 							<TextBlock Text="Item 2" />
 							<TextBlock Text="Item 3" />
@@ -119,13 +119,14 @@
 					</showMeTheXaml:XamlDisplay>
 					<!--****************************************************************-->
 					<showMeTheXaml:XamlDisplay UniqueId="OutsetComboBoxes1">
-						<ComboBox Theme="{StaticResource ComboBoxOutset}" Width="500" PlaceholderText="Please select a user" Height="42"
+						<ComboBox Theme="{StaticResource ComboBoxOutset}" Width="500" PlaceholderText="Choose the Beatles you like least" Height="42" CornerRadius="100"
 							  ToolTip.Tip='Floating label comboBox with theme "ComboBoxOutset" applied and custom left and right inner content'
 							  assist:ComboBoxAssist.InnerLeftBackground="{DynamicResource PrimaryHueMidBrush}"
 							  assist:ComboBoxAssist.InnerRightBackground="{DynamicResource SecondaryHueMidBrush}"
   							ItemsSource="{CompiledBinding AllBeatles}"
 								SelectedValueBinding="{CompiledBinding Key}"
 								SelectedItem="{CompiledBinding MyFavoriteBeatle2}"
+ 								SelectionChanged="ClassicComboBoxesSelectionChanged"
 							  assist:ComboBoxAssist.UseFloatingWatermark="True">
               <ComboBox.ItemTemplate>
                 <DataTemplate>
@@ -222,13 +223,13 @@
 					</showMeTheXaml:XamlDisplay>
 					<!--****************************************************************-->
 					<showMeTheXaml:XamlDisplay UniqueId="FilledComboBoxes1">
-						<ComboBox Classes="Filled" PlaceholderText="Please select a user"
+						<ComboBox Classes="Filled" PlaceholderText="Please select a user" CornerRadius="100"
 								  ToolTip.Tip='Floating label watermarked comboBox with theme "Filled" applied'
 								  assist:ComboBoxAssist.UseFloatingWatermark="True">
-							<TextBlock Text="John" />
-							<TextBlock Text="Paul" />
-							<TextBlock Text="Ringo" />
-							<TextBlock Text="Georges" />
+							<TextBlock Text="Raoul" />
+							<TextBlock Text="Bob" />
+							<TextBlock Text="Lindon" />
+							<TextBlock Text="Markus" />
 						</ComboBox>
 					</showMeTheXaml:XamlDisplay>
 					<!--****************************************************************-->
@@ -304,13 +305,13 @@
 					</showMeTheXaml:XamlDisplay>
 					<!--****************************************************************-->
 					<showMeTheXaml:XamlDisplay UniqueId="OutlinedComboBoxes1">
-						<ComboBox Theme="{StaticResource ComboBoxOutline}" PlaceholderText="Please select a user"
+						<ComboBox Theme="{StaticResource ComboBoxOutline}" PlaceholderText="Please select a user" CornerRadius="100"
 								  ToolTip.Tip='Floating label watermarked comboBox with theme "ComboBoxOutline" applied'
 								  assist:ComboBoxAssist.UseFloatingWatermark="True">
-							<TextBlock Text="John" />
-							<TextBlock Text="Paul" />
-							<TextBlock Text="Ringo" />
-							<TextBlock Text="Georges" />
+							<TextBlock Text="Raoul" />
+							<TextBlock Text="Bob" />
+							<TextBlock Text="Lindon" />
+							<TextBlock Text="Markus" />
 						</ComboBox>
 					</showMeTheXaml:XamlDisplay>
 					<!--****************************************************************-->
diff --git a/Neumorphism.Avalonia.Demo/Pages/ComboBoxesDemo.axaml.cs b/Neumorphism.Avalonia.Demo/Pages/ComboBoxesDemo.axaml.cs
index 3689b36..8fd2566 100644
--- a/Neumorphism.Avalonia.Demo/Pages/ComboBoxesDemo.axaml.cs
+++ b/Neumorphism.Avalonia.Demo/Pages/ComboBoxesDemo.axaml.cs
@@ -1,7 +1,6 @@
 using Avalonia.Controls;
 using Neumorphism.Avalonia.Demo.ViewModels;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Neumorphism.Avalonia.Demo.Pages
 {
@@ -14,7 +13,7 @@ public ComboBoxesDemo()
             DataContext = new ComboBoxesDemoViewModel();
         }
 
-        private void ClassicComboBoxes1SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void ClassicComboBoxesSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (sender is ComboBox && e.AddedItems != null && e.AddedItems.Count > 0)
             {
diff --git a/Neumorphism.Avalonia.Demo/Pages/FieldsDemo.axaml b/Neumorphism.Avalonia.Demo/Pages/FieldsDemo.axaml
index aecf78e..cf6e09a 100644
--- a/Neumorphism.Avalonia.Demo/Pages/FieldsDemo.axaml
+++ b/Neumorphism.Avalonia.Demo/Pages/FieldsDemo.axaml
@@ -236,7 +236,7 @@
 					 ToolTip.Tip='Watermarked textbox with theme "TextBoxHeader" applied and right custom header'
 					 Watermark="Header field with right icon" Width="300">
               <TextBox.InnerRightContent>
-                <Button Classes="no-material" Margin="10,0,10,0" Width="48" Height="38" Cursor="Arrow"
+                <Button Classes="no-material" Margin="10,0,10,0" Width="48" Height="38" Cursor="Arrow" Focusable="False"
                         Command="{Binding ButtonSearchClick}" CommandParameter="{Binding ElementName=SearchTextbox}">
                   <icons:MaterialIcon Kind="Search" Width="24" Height="24" />
                 </Button>
@@ -271,14 +271,14 @@
                 </Style>
               </TextBox.Styles>
               <TextBox.InnerLeftContent>
-                <Button Classes="no-material" Height="38" Width="60" Cursor="Arrow">
+                <Button Classes="no-material" Height="38" Width="60" Cursor="Arrow" Focusable="False">
                   <Button.Content>
                     <icons:MaterialIcon Kind="Search" Width="24" Height="24" />
                   </Button.Content>
                 </Button>
               </TextBox.InnerLeftContent>
               <TextBox.InnerRightContent>
-                <Button Classes="no-material" Height="38" Width="80" Cursor="Hand">
+                <Button Classes="no-material" Height="38" Width="80" Cursor="Hand" Focusable="False">
                   <Button.Content>
                     <icons:MaterialIcon Kind="Settings" Width="24" Height="24" Foreground="DarkGray" />
                   </Button.Content>
@@ -302,22 +302,24 @@
           </showMeTheXaml:XamlDisplay>
           <!--****************************************************************-->
           <showMeTheXaml:XamlDisplay UniqueId="HeaderFields4">
-            <TextBox BorderBrush="{DynamicResource MaterialDesignBorderShadow}" BorderThickness="1" Theme="{StaticResource TextBoxHeader}" Width="350"
-                     Watermark="Enter your email"
-                     Text="{Binding Email}"
-					 ToolTip.Tip='Watermarked textbox with theme "TextBoxHeader" applied with validation and left and right custom header'
-                     CornerRadius="32" assist:TextFieldAssist.InnerLeftBackground="#22666666" assist:TextFieldAssist.InnerLeftPadding="10,0,0,0">
-              <TextBox.InnerLeftContent>
-                <Border Height="{Binding $parent[TextBox].Height}" Width="{Binding $self.Bounds.Height}">
-                  <icons:MaterialIcon HorizontalAlignment="Center" VerticalAlignment="Center" Kind="Email" Width="20" Height="20" Opacity="0.7" />
-                </Border>
-              </TextBox.InnerLeftContent>
-              <TextBox.InnerRightContent>
-                <Border Height="{Binding $parent[TextBox].Height}" Width="{Binding $self.Bounds.Height}">
-                  <icons:MaterialIcon HorizontalAlignment="Center" VerticalAlignment="Center" Kind="Email" Width="20" Height="20" Opacity="0.7" />
-                </Border>
-              </TextBox.InnerRightContent>
-            </TextBox>
+              <TextBox Name="zzz" BorderBrush="{DynamicResource MaterialDesignBorderShadow}" BorderThickness="1" Theme="{StaticResource TextBoxHeader}" Width="350"
+                       Watermark="Enter your email"
+                       Text="{Binding Email}"
+					             ToolTip.Tip='Watermarked textbox with theme "TextBoxHeader" applied with validation and left and right custom header'
+                       CornerRadius="32"
+                       assist:TextFieldAssist.InnerLeftBackground="#22666666" assist:TextFieldAssist.InnerLeftPadding="10,0,0,0"
+                       assist:TextFieldAssist.InnerRightBackground="#22666666" assist:TextFieldAssist.InnerRightPadding="0,0,10,0">
+                <TextBox.InnerLeftContent>
+                  <Border Height="{Binding $parent[TextBox].Height}" Width="{Binding $self.Bounds.Height}">
+                    <icons:MaterialIcon HorizontalAlignment="Center" VerticalAlignment="Center" Kind="Email" Width="20" Height="20" Opacity="0.7" />
+                  </Border>
+                </TextBox.InnerLeftContent>
+                <TextBox.InnerRightContent>
+                  <Border Height="{Binding $parent[TextBox].Height}" Width="{Binding $self.Bounds.Height}">
+                    <icons:MaterialIcon HorizontalAlignment="Center" VerticalAlignment="Center" Kind="QuestionAnswer" Width="20" Height="20" Opacity="0.7" />
+                  </Border>
+                </TextBox.InnerRightContent>
+              </TextBox>
           </showMeTheXaml:XamlDisplay>
           <!--****************************************************************-->
         </StackPanel>
@@ -341,6 +343,11 @@
           </showMeTheXaml:XamlDisplay>
           <!--****************************************************************-->
           <showMeTheXaml:XamlDisplay UniqueId="NumericUpDown2">
+            <NumericUpDown ButtonSpinnerLocation="Right" Minimum="0" Maximum="100" Width="90" Increment="1" CornerRadius="100" Watermark="%"
+						   ToolTip.Tip="Custom percent NumericUpDown with default theme applied"/>
+          </showMeTheXaml:XamlDisplay>
+          <!--****************************************************************-->
+          <showMeTheXaml:XamlDisplay UniqueId="NumericUpDown3">
             <NumericUpDown ButtonSpinnerLocation="Left" Minimum="-100" Maximum="100" Increment="10" IsEnabled="False"
 						   ToolTip.Tip="Regular disabled NumericUpDown with default theme applied"/>
           </showMeTheXaml:XamlDisplay>
diff --git a/Neumorphism.Avalonia.Demo/Pages/IconsDemo.axaml b/Neumorphism.Avalonia.Demo/Pages/IconsDemo.axaml
index f6b98c2..58e46e2 100644
--- a/Neumorphism.Avalonia.Demo/Pages/IconsDemo.axaml
+++ b/Neumorphism.Avalonia.Demo/Pages/IconsDemo.axaml
@@ -83,7 +83,7 @@
                   <TextBox Grid.Column="0" KeyDown="Search_OnKeyDown" Watermark="Search" Name="SearchBox" 
                             Width="300" Classes="Header" Text="{Binding SearchText}" Margin="0">
                       <TextBox.InnerRightContent>
-                          <Button Width="60"
+                          <Button Width="60" Focusable="False"
                                   Name="SearchButton" Foreground="{DynamicResource MaterialDesignCardBackground}"
                                   Classes="no-material" Command="{Binding SearchCommand}"
                                   CommandParameter="{Binding ElementName=SearchBox, Path=Text}">
@@ -100,7 +100,7 @@
                             Text="{Binding SelectedGroup.KindToCopy, FallbackValue='&lt;icons:MaterialIcon Kind=&quot;&quot; \/>'}">
                       <TextBox.InnerRightContent>
                           <Button Width="60" Foreground="{DynamicResource MaterialDesignCardBackground}" Click="CopyToClipboardAsync" Tag="{Binding SelectedGroup.Kind}"
-                                  Classes="no-material">
+                                  Classes="no-material" Focusable="False">
                               <icons:MaterialIcon Kind="ContentCopy" Width="24" Height="24" Foreground="Gray"/>
                           </Button>
                       </TextBox.InnerRightContent>
diff --git a/Neumorphism.Avalonia.Demo/Pages/ListsDemo.axaml b/Neumorphism.Avalonia.Demo/Pages/ListsDemo.axaml
index 1c02961..a824579 100644
--- a/Neumorphism.Avalonia.Demo/Pages/ListsDemo.axaml
+++ b/Neumorphism.Avalonia.Demo/Pages/ListsDemo.axaml
@@ -23,19 +23,16 @@
 				<StackPanel Orientation="Vertical">
 					<!--****************************************************************-->
 					<showMeTheXaml:XamlDisplay UniqueId="List1">
-						<controls:Card Padding="0" CornerRadius="10">
-							<ListBox Width="300" ToolTip.Tip="List box with just text blocks">
+							<ListBox Width="300" Theme="{StaticResource ListBoxCard}" ToolTip.Tip='List box with theme "ListBoxCard" applied and simple text blocks'>
                 <TextBlock Text="Text 1"/>
-								<TextBlock Text="Text 2" />
-								<TextBlock Text="Text 3" />
-								<TextBlock Text="Text 4" />
+								<TextBlock Text="Text 2"/>
+								<TextBlock Text="Text 3"/>
+								<TextBlock Text="Text 4"/>
 							</ListBox>
-						</controls:Card>
 					</showMeTheXaml:XamlDisplay>
 					<!--****************************************************************-->
 					<showMeTheXaml:XamlDisplay UniqueId="List2">
-						<controls:Card Padding="0" CornerRadius="10">
-							<ListBox Width="300" ToolTip.Tip='List box with ListBoxitems theme "ListBoxItemBorder" applied'>
+							<ListBox Width="300" Theme="{StaticResource ListBoxCard}" ToolTip.Tip='List box with theme "ListBoxCard" applied and with ListBoxitems theme "ListBoxItemBorder" applied'>
 								<ListBox.Styles>
 									<Style Selector="ListBoxItem > TextBlock">
 										<Setter Property="TextAlignment" Value="Center"/>
@@ -56,14 +53,12 @@
 									</ListBoxItem>
 								</ListBox.Items>
 							</ListBox>
-						</controls:Card>
 					</showMeTheXaml:XamlDisplay>
 					<!--****************************************************************-->
 					<TextBlock Classes="Headline6 Subheadline2" Margin="15,15,0,0" Text="Horizontal" Foreground="{DynamicResource MaterialDesignMediumGray}" />
 					<!--****************************************************************-->
 					<showMeTheXaml:XamlDisplay UniqueId="List3">
-						<controls:Card Padding="0" CornerRadius="10">
-							<ListBox Width="300" ToolTip.Tip='List box with wrapped text blocks'>
+							<ListBox Theme="{StaticResource ListBoxCard}" Width="300" ToolTip.Tip='List box theme "ListBoxCard" applied and with wrapped text blocks'>
 								<ListBox.ItemsPanel>
 									<ItemsPanelTemplate>
 										<WrapPanel />
@@ -78,7 +73,6 @@
 									<TextBlock Text="Text 6" />
 								</ListBox.Items>
 							</ListBox>
-						</controls:Card>
 					</showMeTheXaml:XamlDisplay>
 					<!--****************************************************************-->
 				</StackPanel>
diff --git a/Neumorphism.Avalonia.Demo/Pages/MenusDemo.axaml b/Neumorphism.Avalonia.Demo/Pages/MenusDemo.axaml
index a7abba6..6595a45 100644
--- a/Neumorphism.Avalonia.Demo/Pages/MenusDemo.axaml
+++ b/Neumorphism.Avalonia.Demo/Pages/MenusDemo.axaml
@@ -269,28 +269,32 @@
 			<showMeTheXaml:XamlDisplay UniqueId="Menu7" Width="380" Height="150"
                                  ToolTip.Tip='Fully custom image menu with default theme applied and custom template'>
 			  <Menu Padding="0" Margin="0" HorizontalAlignment="Center">
-				  <MenuItem Height="64" Width="64"
+				  <MenuItem Height="68" Width="68"
+            FocusAdorner="{x:Null}"
             assist:MenuAssist.PopupCornerRadius="10"
 					  assist:MenuAssist.PopupAnchor="TopRight"
 					  assist:MenuAssist.PopupHorizontalOffset="-140"
 					  assist:MenuAssist.PopupVerticalOffset="10">
 
+            <!--Fully redefined menu item template-->
 					  <MenuItem.Template>
 						  <ControlTemplate>
 							  <Panel Width="100" Height="100">
-								  <Border Width="64" Height="64" Margin="20" Cursor="Hand" CornerRadius="100" BorderBrush="{DynamicResource MaterialDesignToolBackground}" BorderThickness="3" ClipToBounds="False">
-									  <Border.BoxShadow>
-										  <MultiBinding Converter="{StaticResource AutoBoxShadowsConverter}" ConverterParameter="6">
+                  <Border Name="PART_RootBorder" Width="68" Height="68" Margin="20" Cursor="Hand" BorderBrush="Transparent" BorderThickness="1" CornerRadius="100">
+                    <Border.BoxShadow>
+                      <MultiBinding Converter="{StaticResource AutoBoxShadowsConverter}" ConverterParameter="6">
                         <DynamicResource ResourceKey="CustomBoxShadowRadius"/>
-											  <DynamicResource ResourceKey="MaterialDesignShadowLight" />
-											  <DynamicResource ResourceKey="MaterialDesignShadowDark" />
-										  </MultiBinding>
-									  </Border.BoxShadow>
+                        <DynamicResource ResourceKey="MaterialDesignShadowLight" />
+                        <DynamicResource ResourceKey="MaterialDesignShadowDark" />
+                      </MultiBinding>
+                    </Border.BoxShadow>
+								  <Border Width="64" Height="64" HorizontalAlignment="Center" VerticalAlignment="Center" CornerRadius="100" BorderBrush="{DynamicResource MaterialDesignToolBackground}" BorderThickness="4" ClipToBounds="False">
 									  <Border HorizontalAlignment="Stretch" VerticalAlignment="Stretch" CornerRadius="100" ClipToBounds="True">
 										  <Image HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0" ClipToBounds="True"
 													  Source="avares://Neumorphism.Avalonia.Demo/Assets/300.jpg" Stretch="Uniform" Width="64" Height="64" />
 									  </Border>
 								  </Border>
+                  </Border>
 								  <Popup Name="PART_Popup"
 						   WindowManagerAddShadowHint="False"
 						   Placement="RightEdgeAlignedTop"
@@ -317,6 +321,12 @@
 						  </ControlTemplate>
 					  </MenuItem.Template>
 
+            <MenuItem.Styles>
+                <Style Selector="MenuItem:focus /template/ Border#PART_RootBorder">
+                  <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignFocus}" />
+              </Style>
+            </MenuItem.Styles>
+
 				    <MenuItem Header="Hello !" Icon="{icons:MaterialIconExt Hand, Size=22}" Command="{Binding MenuItemClickMethod}" CommandParameter="{Binding $self.Header}"/>
             <Separator />
             <MenuItem Header="Follow us" Icon="{icons:MaterialIconExt Share, Size=22}">
@@ -351,7 +361,7 @@
 			<!--****************************************************************-->
       <showMeTheXaml:XamlDisplay UniqueId="Menu9" Width="380" Height="150"
                                  ToolTip.Tip='Custom icons based menu with theme "NoMaterialMenu" applied'>
-        <Menu Height="48" Padding="0" Margin="0" HorizontalAlignment="Center" Theme="{StaticResource NoMaterialMenu}" VerticalAlignment="Bottom">
+        <Menu Height="48" Padding="0" Margin="0" HorizontalAlignment="Center" Theme="{StaticResource NoMaterialMenu}" VerticalAlignment="Center">
           <MenuItem Height="48" Width="48" CornerRadius="6" Header="{icons:MaterialIconExt RocketLaunchOutline, Size=34}" Foreground="{DynamicResource MaterialDesignBodyLight}" Margin="10,0,10,0"
 											assist:MenuAssist.PopupAnchor="TopLeft"
 											assist:MenuAssist.PopupPlacement="Top"
diff --git a/Neumorphism.Avalonia.Demo/ViewModels/DialogsDemoViewModel.cs b/Neumorphism.Avalonia.Demo/ViewModels/DialogsDemoViewModel.cs
index 25429cc..297336b 100644
--- a/Neumorphism.Avalonia.Demo/ViewModels/DialogsDemoViewModel.cs
+++ b/Neumorphism.Avalonia.Demo/ViewModels/DialogsDemoViewModel.cs
@@ -262,17 +262,18 @@ private async IAsyncEnumerable<string> CreateImageDialog()
 
             var dialog = DialogHelper.CreateCommonDialog(new CommonDialogBuilderParams
             {
-                ContentHeader = "Welcome to use Material.Avalonia",
-                SupportingText = "Enjoy Material Design in AvaloniaUI!",
+                ContentHeader = "Sample title with image icon",
+                SupportingText = "Sample sub title, choose what you want...",
                 StartupLocation = WindowStartupLocation.CenterOwner,
                 Borderless = true,
+                Width = 500,
                 DialogIcon = new Bitmap(icon),
                 CenterDialogButtons = new[]
                 {
                     new DialogButton
                     {
-                        Content = "READ MORE",
-                        Result = "read_more"
+                        Content = "OK",
+                        Result = "ok"
                     }
                 }
             });
diff --git a/Neumorphism.Avalonia.Demo/Windows/Dialogs/CustomFormDialog.axaml b/Neumorphism.Avalonia.Demo/Windows/Dialogs/CustomFormDialog.axaml
index e9cd3d5..227eb16 100644
--- a/Neumorphism.Avalonia.Demo/Windows/Dialogs/CustomFormDialog.axaml
+++ b/Neumorphism.Avalonia.Demo/Windows/Dialogs/CustomFormDialog.axaml
@@ -27,7 +27,7 @@
 
           <Grid ColumnDefinitions="*, Auto" RowDefinitions="*, 3">
             <TextBlock Grid.Row="0" Grid.Column="0" Foreground="{DynamicResource MaterialDesignDarkGray}" Padding="40,0,0,0" HorizontalAlignment="Stretch" TextAlignment="Center" VerticalAlignment="Center" FontSize="15" FontWeight="Bold" Text="{CompiledBinding ContentHeader, FallbackValue=''}" />
-            <Button Grid.Row="0" Grid.Column="1" Margin="0,0,15,0" Theme="{StaticResource ButtonNoMaterial}" Command="{Binding CloseWindow}">
+            <Button Grid.Row="0" Grid.Column="1" Width="24" Height="24" Margin="0,0,15,0" CornerRadius="5" Theme="{StaticResource ButtonNoMaterial}" Command="{Binding CloseWindow}">
               <icons:MaterialIcon Kind="Close" Width="22" Height="22" VerticalAlignment="Center" Opacity="0.6" Foreground="{DynamicResource MaterialDesignMediumGray}" />
             </Button>
             <Rectangle Grid.Row="1" Grid.ColumnSpan="2" Fill="{DynamicResource PrimaryHueLightBrush}" HorizontalAlignment="Stretch" Height="3"/>
@@ -63,17 +63,17 @@
                   assist:ShadowAssist.ShadowDepth="Depth5"
                   Mode="Standard" Background="Transparent">
 
-        <Grid ColumnDefinitions="Auto,*,Auto" Background="Transparent">
-            <Button Grid.Column="0" Height="32" Width="NaN" Margin="20" FontWeight="Normal" DataContext="{CompiledBinding ButtonCancel}" Background="{DynamicResource MaterialDesignCheckBoxDisabled}"
+        <Grid ColumnDefinitions="20,Auto,*,Auto,20" Background="Transparent" Margin="20">
+            <Button Grid.Column="1" Height="36" Width="NaN" Margin="0" FontWeight="Normal" DataContext="{CompiledBinding ButtonCancel}" Background="{DynamicResource MaterialDesignPaper}"
                 Command="{CompiledBinding Command}"
                 CommandParameter="{CompiledBinding}">
               <StackPanel Orientation="Horizontal" Spacing="4">
-                <icons:MaterialIcon Kind="Cancel" Margin="0,0,3,0"/>
+                <icons:MaterialIcon Kind="CancelBold" Margin="0,0,3,0"/>
                 <TextBlock Text="{CompiledBinding Content}" Margin="0,0,3,0"/>
               </StackPanel>
             </Button>
 
-            <Button Grid.Column="2" Height="32" Width="NaN" Margin="20" FontWeight="Normal" DataContext="{CompiledBinding ButtonOk}" Background="{DynamicResource PrimaryHueMidBrush}" Foreground="White"
+            <Button Grid.Column="3" Height="36" Width="NaN" Margin="0" FontWeight="Normal" DataContext="{CompiledBinding ButtonOk}" Background="{DynamicResource PrimaryHueMidBrush}" Foreground="White"
                     Command="{CompiledBinding Command}"
                     CommandParameter="{CompiledBinding}">
               <StackPanel Orientation="Horizontal" Spacing="4">
diff --git a/Neumorphism.Avalonia.Demo/Windows/Dialogs/CustomSettingsDialog.axaml b/Neumorphism.Avalonia.Demo/Windows/Dialogs/CustomSettingsDialog.axaml
index 7a2c70d..c3be7b9 100644
--- a/Neumorphism.Avalonia.Demo/Windows/Dialogs/CustomSettingsDialog.axaml
+++ b/Neumorphism.Avalonia.Demo/Windows/Dialogs/CustomSettingsDialog.axaml
@@ -30,13 +30,16 @@
       <Grid RowDefinitions="*,Auto" Margin="20">
 				<StackPanel Orientation="Vertical" Grid.Row="0" Spacing="20">
 
-					<ToggleSwitch IsThreeState="False" IsChecked="{Binding UseDarkTheme}" OnContent="Dark" OffContent="Light" HorizontalAlignment="Center" Foreground="{DynamicResource MaterialDesignBody}"
+          <StackPanel Orientation="Horizontal" Margin="10,0,0,0">
+            <TextBlock Text="Theme" VerticalAlignment="Center" Foreground="{DynamicResource MaterialDesignForeground}" Opacity="0.5" Margin="0,0,15,0"/>
+            <ToggleSwitch IsThreeState="False" IsChecked="{Binding UseDarkTheme}" OnContent="Dark" OffContent="Light" HorizontalAlignment="Center" Foreground="{DynamicResource MaterialDesignBody}"
 								  assist:ToggleSwitchAssist.SwitchTrackOffForeground="{DynamicResource SecondaryHueDarkBrush}"
 								  assist:ToggleSwitchAssist.SwitchTrackOnForeground="{DynamicResource SecondaryHueMidBrush}"
 								  assist:ToggleSwitchAssist.SwitchTrackOverForeground="{DynamicResource SecondaryHueDarkBrush}"
 								  Content="Dark"/>
+          </StackPanel>
 
-					<ComboBox x:Name="cboCulture" PlaceholderText="Select a language" Width="200" HorizontalAlignment="Center" ItemsSource="{Binding AvailableLanguages}" SelectedItem="{Binding SelectedLanguage}">
+					<ComboBox x:Name="cboCulture" PlaceholderText="Select a language" Width="200" CornerRadius="100" HorizontalAlignment="Center" ItemsSource="{Binding AvailableLanguages}" SelectedItem="{Binding SelectedLanguage}">
 						<ComboBox.ItemTemplate>
 							<DataTemplate>
 								<TextBlock Text="{CompiledBinding Value}" Tag="{CompiledBinding Key}"/>
@@ -44,28 +47,20 @@
 						</ComboBox.ItemTemplate>
 					</ComboBox>
 
-          <Grid ColumnDefinitions="Auto,*,Auto" Background="Transparent">
-            <Button Grid.Column="0" Height="32" Width="NaN" Margin="20" FontWeight="Normal" DataContext="{CompiledBinding ButtonCancel}" Background="{DynamicResource MaterialDesignPaper}"
+          <Grid ColumnDefinitions="10,Auto,*,Auto,10" Margin="0,15,0,0" Background="Transparent">
+            <Button Grid.Column="1" Height="32" Width="NaN" Margin="0" FontWeight="Normal" DataContext="{CompiledBinding ButtonCancel}" Background="{DynamicResource MaterialDesignPaper}"
 								Command="{CompiledBinding Command}"
 								CommandParameter="{CompiledBinding}">
               <TextBlock Text="{CompiledBinding Content}" Margin="0,0,3,0"/>
             </Button>
 
-            <Button Grid.Column="2" Height="32" Width="NaN" Margin="20" FontWeight="Normal" DataContext="{CompiledBinding ButtonOk}" Background="{DynamicResource SecondaryHueMidBrush}" Foreground="White"
+            <Button Grid.Column="3" Height="32" Width="NaN" Margin="0" FontWeight="Normal" DataContext="{CompiledBinding ButtonOk}" Background="{DynamicResource SecondaryHueMidBrush}" Foreground="White"
 										Command="{CompiledBinding Command}"
 										CommandParameter="{CompiledBinding}">
               <TextBlock Text="{CompiledBinding Content}" Margin="0,0,3,0"/>
             </Button>
           </Grid>
-
-					
-			
 				</StackPanel>
-
-
-
-          
-
       </Grid>
 		</Border>
 
diff --git a/Neumorphism.Avalonia.Demo/Windows/ViewModels/Dialogs/CustomFormDialogViewModel.cs b/Neumorphism.Avalonia.Demo/Windows/ViewModels/Dialogs/CustomFormDialogViewModel.cs
index 3095fd9..71f8901 100644
--- a/Neumorphism.Avalonia.Demo/Windows/ViewModels/Dialogs/CustomFormDialogViewModel.cs
+++ b/Neumorphism.Avalonia.Demo/Windows/ViewModels/Dialogs/CustomFormDialogViewModel.cs
@@ -115,9 +115,9 @@ public CustomFormDialogViewModel(CustomFormDialog dialog) : base(dialog)
         {
             Civilities =
             [
-                new KeyValuePair<int, string>(1, "Mr"),
-                new KeyValuePair<int, string>(2, "Mme"),
-                new KeyValuePair<int, string>(3, "Melle"),
+                new KeyValuePair<int, string>(1, "Mr."),
+                new KeyValuePair<int, string>(2, "Ms."),
+                new KeyValuePair<int, string>(3, "Miss")
             ];
 
             ButtonOk = new ObsoleteDialogButtonViewModel(this, "OK", "ok");