diff --git a/Material.Avalonia.Demo/Pages/ComboBoxesDemo.axaml b/Material.Avalonia.Demo/Pages/ComboBoxesDemo.axaml
index 66b2fc0f..9e045c1f 100644
--- a/Material.Avalonia.Demo/Pages/ComboBoxesDemo.axaml
+++ b/Material.Avalonia.Demo/Pages/ComboBoxesDemo.axaml
@@ -6,6 +6,8 @@
              xmlns:showMeTheXaml="clr-namespace:ShowMeTheXaml;assembly=ShowMeTheXaml.Avalonia"
              xmlns:assist="clr-namespace:Material.Styles.Assists;assembly=Material.Styles"
              xmlns:system="clr-namespace:System;assembly=System.Runtime"
+             xmlns:generic="using:System.Collections.Generic"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
              x:Class="Material.Avalonia.Demo.Pages.ComboBoxesDemo">
   <StackPanel Margin="16, 0" HorizontalAlignment="Stretch">
     <TextBlock Classes="Headline4 Subheadline" Text="ComboBoxes" />
@@ -73,6 +75,79 @@
             </ComboBox>
           </showMeTheXaml:XamlDisplay>
         </WrapPanel>
+
+        <TextBlock Classes="Headline6 Subheadline2" Text="AutoComplete boxes" />
+        <WrapPanel Orientation="Horizontal">
+          <WrapPanel.Styles>
+            <Style Selector="AutoCompleteBox">
+              <Setter Property="Width" Value="180" />
+            </Style>
+          </WrapPanel.Styles>
+          <showMeTheXaml:XamlDisplay UniqueId="AutoCompleteBoxes0">
+            <AutoCompleteBox Watermark="Select a Item">
+              <AutoCompleteBox.ItemsSource>
+                <generic:List x:TypeArguments="x:String">
+                  <sys:String>Alabama</sys:String>
+                  <sys:String>Alaska</sys:String>
+                  <sys:String>Arizona</sys:String>
+                  <sys:String>Arkansas</sys:String>
+                  <sys:String>California</sys:String>
+                  <sys:String>Colorado</sys:String>
+                  <sys:String>Connecticut</sys:String>
+                  <sys:String>Delaware</sys:String>
+                </generic:List>
+              </AutoCompleteBox.ItemsSource>
+            </AutoCompleteBox>
+          </showMeTheXaml:XamlDisplay>
+          <showMeTheXaml:XamlDisplay UniqueId="AutoCompleteBoxes1">
+            <AutoCompleteBox Watermark="Select a Item">
+              <AutoCompleteBox.ItemsSource>
+                <generic:List x:TypeArguments="x:String">
+                  <sys:String>Alabama</sys:String>
+                  <sys:String>Alaska</sys:String>
+                  <sys:String>Arizona</sys:String>
+                  <sys:String>Arkansas</sys:String>
+                  <sys:String>California</sys:String>
+                  <sys:String>Colorado</sys:String>
+                  <sys:String>Connecticut</sys:String>
+                  <sys:String>Delaware</sys:String>
+                </generic:List>
+              </AutoCompleteBox.ItemsSource>
+            </AutoCompleteBox>
+          </showMeTheXaml:XamlDisplay>
+          <showMeTheXaml:XamlDisplay UniqueId="AutoCompleteBoxes2">
+            <AutoCompleteBox Theme="{StaticResource MaterialFilledAutoCompleteBox}" Watermark="Select a Item">
+              <AutoCompleteBox.ItemsSource>
+                <generic:List x:TypeArguments="x:String">
+                  <sys:String>Alabama</sys:String>
+                  <sys:String>Alaska</sys:String>
+                  <sys:String>Arizona</sys:String>
+                  <sys:String>Arkansas</sys:String>
+                  <sys:String>California</sys:String>
+                  <sys:String>Colorado</sys:String>
+                  <sys:String>Connecticut</sys:String>
+                  <sys:String>Delaware</sys:String>
+                </generic:List>
+              </AutoCompleteBox.ItemsSource>
+            </AutoCompleteBox>
+          </showMeTheXaml:XamlDisplay>
+          <showMeTheXaml:XamlDisplay UniqueId="AutoCompleteBoxes3">
+            <AutoCompleteBox Theme="{StaticResource MaterialOutlineAutoCompleteBox}" Watermark="Select a Item">
+              <AutoCompleteBox.ItemsSource>
+                <generic:List x:TypeArguments="x:String">
+                  <sys:String>Alabama</sys:String>
+                  <sys:String>Alaska</sys:String>
+                  <sys:String>Arizona</sys:String>
+                  <sys:String>Arkansas</sys:String>
+                  <sys:String>California</sys:String>
+                  <sys:String>Colorado</sys:String>
+                  <sys:String>Connecticut</sys:String>
+                  <sys:String>Delaware</sys:String>
+                </generic:List>
+              </AutoCompleteBox.ItemsSource>
+            </AutoCompleteBox>
+          </showMeTheXaml:XamlDisplay>
+        </WrapPanel>
       </StackPanel>
     </WrapPanel>
   </StackPanel>
diff --git a/Material.Styles/Resources/Themes/AutoCompleteBox.axaml b/Material.Styles/Resources/Themes/AutoCompleteBox.axaml
index 9eae3c30..d1750e7b 100644
--- a/Material.Styles/Resources/Themes/AutoCompleteBox.axaml
+++ b/Material.Styles/Resources/Themes/AutoCompleteBox.axaml
@@ -3,8 +3,9 @@
   <ControlTheme x:Key="MaterialAutoCompleteBox" TargetType="AutoCompleteBox">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="BorderBrush" Value="{DynamicResource MaterialTextBoxBorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderThickness" Value="0" />
     <Setter Property="Padding" Value="4" />
+    <Setter Property="Margin" Value="4" />
     <Setter Property="Template">
       <ControlTemplate>
         <Panel>
@@ -12,7 +13,9 @@
                    Background="{TemplateBinding Background}"
                    BorderBrush="{TemplateBinding BorderBrush}"
                    BorderThickness="{TemplateBinding BorderThickness}"
+                   CornerRadius="{TemplateBinding CornerRadius}"
                    Padding="{TemplateBinding Padding}"
+                   Margin="{TemplateBinding Margin}"
                    Watermark="{TemplateBinding Watermark}"
                    DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
 
@@ -25,7 +28,7 @@
                     BorderThickness="1">
               <ListBox Name="PART_SelectingItemsControl"
                        BorderThickness="0"
-                       Background="{TemplateBinding Background}"
+                       Background="{DynamicResource MaterialPaperBrush}"
                        Foreground="{TemplateBinding Foreground}"
                        ItemTemplate="{TemplateBinding ItemTemplate}"
                        ScrollViewer.HorizontalScrollBarVisibility="Auto"
@@ -39,4 +42,33 @@
 
   <ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox"
                 BasedOn="{StaticResource MaterialAutoCompleteBox}" />
+
+  <ControlTheme x:Key="MaterialFilledAutoCompleteBox"
+                BasedOn="{StaticResource MaterialAutoCompleteBox}"
+                TargetType="AutoCompleteBox">
+    <Setter Property="Background" Value="{DynamicResource MaterialTextFieldBoxBackgroundBrush}" />
+    <Setter Property="CornerRadius" Value="4,4,0,0" />
+    <Setter Property="Padding" Value="16,8" />
+  </ControlTheme>
+
+  <ControlTheme x:Key="MaterialOutlineAutoCompleteBox"
+                BasedOn="{StaticResource MaterialAutoCompleteBox}"
+                TargetType="AutoCompleteBox">
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="{DynamicResource MaterialTextBoxBorderBrush}" />
+    <Setter Property="CornerRadius" Value="4" />
+    <Setter Property="Padding" Value="16,8" />
+
+    <Style Selector="^">
+      <Setter Property="BorderThickness" Value="1" />
+    </Style>
+
+    <Style Selector="^:focus-within">
+      <Setter Property="BorderBrush" Value="{DynamicResource MaterialPrimaryMidBrush}" />
+      <Setter Property="BorderThickness" Value="2" />
+      <Style Selector="^ /template/ TextBlock#floatingWatermark">
+        <Setter Property="Foreground" Value="{DynamicResource MaterialPrimaryMidBrush}" />
+      </Style>
+    </Style>
+  </ControlTheme>
 </ResourceDictionary>
\ No newline at end of file