diff --git a/designsystem/build.gradle b/designsystem/build.gradle
index 46aef9854..e306163ff 100644
--- a/designsystem/build.gradle
+++ b/designsystem/build.gradle
@@ -13,6 +13,7 @@ android {
         targetSdkVersion rootProject.targetSdkVersion
         vectorDrawables.useSupportLibrary = true
         consumerProguardFiles 'consumer-rules.pro'
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -20,6 +21,7 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {}
     }
 
     sourceSets {
diff --git a/designsystem/src/main/kotlin/com/natura/android/widget/TextInputHighlight.kt b/designsystem/src/main/kotlin/com/natura/android/widget/ValueTextHighlight.kt
similarity index 96%
rename from designsystem/src/main/kotlin/com/natura/android/widget/TextInputHighlight.kt
rename to designsystem/src/main/kotlin/com/natura/android/widget/ValueTextHighlight.kt
index c5cffc8e3..6853a3cab 100644
--- a/designsystem/src/main/kotlin/com/natura/android/widget/TextInputHighlight.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/widget/ValueTextHighlight.kt
@@ -7,7 +7,7 @@ import android.view.LayoutInflater
 import android.widget.TextView
 import com.natura.android.R
 
-class TextInputHighlight @JvmOverloads constructor(
+class ValueTextHighlight @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
diff --git a/designsystem/src/main/res/color/ds_mtrl_colored_stroke_color_selector.xml b/designsystem/src/main/res/color/ds_mtrl_colored_stroke_color_selector.xml
new file mode 100644
index 000000000..a61db46aa
--- /dev/null
+++ b/designsystem/src/main/res/color/ds_mtrl_colored_stroke_color_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?colorPrimary" android:state_enabled="true"/>
+    <item android:alpha="0.12" android:color="@android:color/black"/>
+</selector>
diff --git a/designsystem/src/main/res/color/ds_mtrl_default_btn_text_color_selector.xml b/designsystem/src/main/res/color/ds_mtrl_default_btn_text_color_selector.xml
index 5df2cf0c3..6dabd2a41 100644
--- a/designsystem/src/main/res/color/ds_mtrl_default_btn_text_color_selector.xml
+++ b/designsystem/src/main/res/color/ds_mtrl_default_btn_text_color_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/black" android:state_enabled="true"/>
+    <item android:color="@color/colorHighEmphasis" android:state_enabled="true"/>
     <item android:color="@color/mtrlBtnTextColorDisabled"/>
 </selector>
diff --git a/designsystem/src/main/res/color/ds_mtrl_sec_btn_background_selector.xml b/designsystem/src/main/res/color/ds_mtrl_sec_btn_background_selector.xml
deleted file mode 100644
index 239a2595e..000000000
--- a/designsystem/src/main/res/color/ds_mtrl_sec_btn_background_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?colorSecondary" android:state_enabled="true"/>
-    <item android:color="@color/colorBrdBlack_12"/>
-</selector>
diff --git a/designsystem/src/main/res/color/ds_mtrl_sec_btn_text_color_selector.xml b/designsystem/src/main/res/color/ds_mtrl_sec_btn_text_color_selector.xml
deleted file mode 100644
index 5df2cf0c3..000000000
--- a/designsystem/src/main/res/color/ds_mtrl_sec_btn_text_color_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/black" android:state_enabled="true"/>
-    <item android:color="@color/mtrlBtnTextColorDisabled"/>
-</selector>
diff --git a/designsystem/src/main/res/color/ds_mtrl_sec_colored_btn_text_color_selector.xml b/designsystem/src/main/res/color/ds_mtrl_sec_colored_btn_text_color_selector.xml
deleted file mode 100644
index 67efe7c28..000000000
--- a/designsystem/src/main/res/color/ds_mtrl_sec_colored_btn_text_color_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?colorSecondary" android:state_enabled="true"/>
-    <item android:color="@color/mtrlBtnTextColorDisabled"/>
-</selector>
diff --git a/designsystem/src/main/res/color/ds_mtrl_sec_colored_ripple_color_selector.xml b/designsystem/src/main/res/color/ds_mtrl_sec_colored_ripple_color_selector.xml
deleted file mode 100644
index 3c7de66ce..000000000
--- a/designsystem/src/main/res/color/ds_mtrl_sec_colored_ripple_color_selector.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.16" android:color="?attr/colorSecondary" android:state_pressed="true"/>
-    <item android:alpha="0.12" android:color="?attr/colorSecondary" android:state_focused="true" android:state_hovered="true"/>
-    <item android:alpha="0.12" android:color="?attr/colorSecondary" android:state_focused="true"/>
-    <item android:alpha="0.04" android:color="?attr/colorSecondary" android:state_hovered="true"/>
-    <item android:alpha="0.00" android:color="?attr/colorSecondary"/>
-</selector>
diff --git a/designsystem/src/main/res/values/button_styles.xml b/designsystem/src/main/res/values/button_styles.xml
index e6b09f415..3b1d8a3c4 100644
--- a/designsystem/src/main/res/values/button_styles.xml
+++ b/designsystem/src/main/res/values/button_styles.xml
@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Widget.Natura.Button" parent="Widget.MaterialComponents.Button">
+    <style name="Widget.Natura.Button" parent="Widget.MaterialComponents.Button"/>
+
+    <style name="Widget.Natura.Button.DarkText" parent="Widget.Natura.Button">
         <item name="android:textColor">@color/ds_mtrl_default_btn_text_color_selector</item>
     </style>
 
-    <style name="Widget.Natura.Button.Secondary" parent="Widget.Natura.Button">
-        <item name="backgroundTint">@color/ds_mtrl_sec_btn_background_selector</item>
+    <style name="Widget.Natura.Button.Outlined.DarkText" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="android:textColor">@color/ds_mtrl_default_btn_text_color_selector</item>
     </style>
 
-    <style name="Widget.Natura.Button.Outlined" parent="Widget.MaterialComponents.Button.OutlinedButton"/>
-
-    <style name="Widget.Natura.Button.Outlined.Secondary" parent="Widget.Natura.Button.Outlined">
-        <item name="android:textColor">@color/ds_mtrl_sec_colored_btn_text_color_selector</item>
-        <item name="rippleColor">@color/ds_mtrl_sec_colored_ripple_color_selector</item>
+    <style name="Widget.Natura.Button.Outlined.StrokeColored" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="strokeColor">@color/ds_mtrl_colored_stroke_color_selector</item>
     </style>
 
     <style name="Widget.Natura.Button.TextButton" parent="Widget.MaterialComponents.Button.TextButton"/>
 
-    <style name="Widget.Natura.Button.TextButton.Secondary" parent="Widget.Natura.Button.TextButton">
-        <item name="android:textColor">@color/ds_mtrl_sec_colored_btn_text_color_selector</item>
-        <item name="rippleColor">@color/ds_mtrl_sec_colored_ripple_color_selector</item>
+    <style name="Widget.Natura.Button.TextButton.DarkText" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">@color/ds_mtrl_default_btn_text_color_selector</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/designsystem/src/main/res/values/custom_theme_attrs.xml b/designsystem/src/main/res/values/custom_theme_attrs.xml
new file mode 100644
index 000000000..328e866fc
--- /dev/null
+++ b/designsystem/src/main/res/values/custom_theme_attrs.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- To be replaced with default attr from google:material lib -->
+    <!-- Style to use for Material Outlined Buttons in this theme. -->
+    <!-- Since it's not available in support:design lib -->
+    <attr name="materialButtonOutlinedStyle" format="reference"/>
+    <attr name="materialBorderlessButtonStyle" format="reference"/>
+
+</resources>
\ No newline at end of file
diff --git a/designsystem/src/main/res/values/themes.xml b/designsystem/src/main/res/values/themes.xml
index c20177fe3..faf9ec0f2 100644
--- a/designsystem/src/main/res/values/themes.xml
+++ b/designsystem/src/main/res/values/themes.xml
@@ -17,10 +17,31 @@
 
         <!--Remap legacy AppCompat attributes to MaterialComponent attributes-->
         <item name="colorAccent">?colorPrimary</item>
+
+        <!--Material buttons style-->
+        <item name="materialButtonStyle">@style/Widget.Natura.Button.DarkText</item>
+        <item name="materialButtonOutlinedStyle">@style/Widget.Natura.Button.Outlined.DarkText</item>
+        <item name="materialBorderlessButtonStyle">@style/Widget.Natura.Button.TextButton.DarkText</item>
     </style>
 
+    <!--Not supported officialy-->
     <style name="Theme.Avon" parent="Theme.Natura">
         <item name="colorPrimary">#DE0085</item>
-        <item name="colorSecondary">#A70058</item>
+        <item name="colorSecondary">#E9E9E9</item>
+
+        <!--Material buttons style-->
+        <item name="materialButtonStyle">@style/Widget.Natura.Button</item>
+        <item name="materialButtonOutlinedStyle">@style/Widget.Natura.Button.Outlined.StrokeColored</item>
+        <item name="materialBorderlessButtonStyle">@style/Widget.Natura.Button.TextButton</item>
+    </style>
+
+    <!--Not supported officialy-->
+    <style name="Theme.BodyShop" parent="Theme.Natura">
+        <item name="colorPrimary">#004236</item>
+        <item name="colorSecondary">#A55F53</item>
+
+        <item name="materialButtonStyle">@style/Widget.Natura.Button</item>
+        <item name="materialButtonOutlinedStyle">@style/Widget.Natura.Button.Outlined.StrokeColored</item>
+        <item name="materialBorderlessButtonStyle">@style/Widget.Natura.Button.TextButton</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/sample/src/androidTest/kotlin/com/natura/android/sample/components/TextInputHighlightActivityTest.kt b/sample/src/androidTest/kotlin/com/natura/android/sample/components/ValueTextHighlightActivityTest.kt
similarity index 94%
rename from sample/src/androidTest/kotlin/com/natura/android/sample/components/TextInputHighlightActivityTest.kt
rename to sample/src/androidTest/kotlin/com/natura/android/sample/components/ValueTextHighlightActivityTest.kt
index beeb33aa7..5150efd3c 100644
--- a/sample/src/androidTest/kotlin/com/natura/android/sample/components/TextInputHighlightActivityTest.kt
+++ b/sample/src/androidTest/kotlin/com/natura/android/sample/components/ValueTextHighlightActivityTest.kt
@@ -14,11 +14,11 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class TextInputHighlightActivityTest {
+class ValueTextHighlightActivityTest {
 
     @Before
     fun setup() {
-        ActivityScenario.launch(TextInputHighlightActivity::class.java)
+        ActivityScenario.launch(ValueTextHighlightActivity::class.java)
     }
 
     @Test
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index f5921552b..f2ed6dd1e 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -39,7 +39,7 @@
             android:name=".components.LoadingActivity"
             android:theme="@style/Theme.Natura" />
         <activity
-            android:name=".components.TextInputHighlightActivity"
+            android:name=".components.ValueTextHighlightActivity"
             android:theme="@style/Theme.Natura" />
         <activity
             android:name=".components.StyleButtonActivity"
diff --git a/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
index 541a425a0..5d4c167f2 100644
--- a/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
+++ b/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
@@ -45,7 +45,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         findViewById<Button>(R.id.btn_input_text_highlight).setOnClickListener {
-            startActivity(Intent(this, TextInputHighlightActivity::class.java))
+            startActivity(Intent(this, ValueTextHighlightActivity::class.java))
         }
 
         findViewById<Button>(R.id.btn_style_buttons).setOnClickListener {
diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/StyleButtonActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/StyleButtonActivity.kt
index 8b45191f8..fbe7b5ce3 100644
--- a/sample/src/main/kotlin/com/natura/android/sample/components/StyleButtonActivity.kt
+++ b/sample/src/main/kotlin/com/natura/android/sample/components/StyleButtonActivity.kt
@@ -27,5 +27,12 @@ class StyleButtonActivity : AppCompatActivity() {
             startActivity(intent)
             finish()
         }
+
+        findViewById<View>(R.id.bodyShopThemeBtn).setOnClickListener {
+            val intent = Intent(baseContext, StyleButtonActivity::class.java)
+            intent.putExtra("theme", R.style.Theme_BodyShop)
+            startActivity(intent)
+            finish()
+        }
     }
 }
\ No newline at end of file
diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/TextInputHighlightActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/ValueTextHighlightActivity.kt
similarity index 73%
rename from sample/src/main/kotlin/com/natura/android/sample/components/TextInputHighlightActivity.kt
rename to sample/src/main/kotlin/com/natura/android/sample/components/ValueTextHighlightActivity.kt
index fdc15ba10..97a24d7e0 100644
--- a/sample/src/main/kotlin/com/natura/android/sample/components/TextInputHighlightActivity.kt
+++ b/sample/src/main/kotlin/com/natura/android/sample/components/ValueTextHighlightActivity.kt
@@ -3,14 +3,14 @@ package com.natura.android.sample.components
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import com.natura.android.sample.R
-import com.natura.android.widget.TextInputHighlight
+import com.natura.android.widget.ValueTextHighlight
 
-class TextInputHighlightActivity: AppCompatActivity() {
+class ValueTextHighlightActivity: AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_text_input_highlight)
 
-        val inputHighlight = findViewById<TextInputHighlight>(R.id.highlightInitViaCode)
+        val inputHighlight = findViewById<ValueTextHighlight>(R.id.highlightInitViaCode)
         inputHighlight.setDescription("Add description via code")
         inputHighlight.setHighlightedInfo("$ 00.00")
     }
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 1aab14dc3..f91fe2f63 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -78,7 +78,7 @@
             android:id="@+id/btn_input_text_highlight"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Input Text Highlight"
+            android:text="Value Text Highlight"
             android:textColor="@color/colorBrdNatGray" />
 
     </LinearLayout>
diff --git a/sample/src/main/res/layout/activity_styled_button.xml b/sample/src/main/res/layout/activity_styled_button.xml
index a160e9507..391e0aae6 100644
--- a/sample/src/main/res/layout/activity_styled_button.xml
+++ b/sample/src/main/res/layout/activity_styled_button.xml
@@ -15,14 +15,14 @@
             android:orientation="vertical">
 
             <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button"
+                style="?materialButtonStyle"
                 android:text="Default Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"/>
 
             <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button"
+                style="?materialButtonStyle"
                 android:text="Default Button Disabled"
                 android:enabled="false"
                 android:layout_width="wrap_content"
@@ -30,29 +30,14 @@
                 android:layout_marginBottom="10dp"/>
 
             <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.Secondary"
-                android:text="Secondary Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"/>
-
-            <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.Secondary"
-                android:text="Secondary Button Disabled"
-                android:enabled="false"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"/>
-
-            <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.Outlined"
+                style="?materialButtonOutlinedStyle"
                 android:text="Outlined Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"/>
 
             <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.Outlined"
+                style="?materialButtonOutlinedStyle"
                 android:text="Outlined Button Disabled"
                 android:enabled="false"
                 android:layout_width="wrap_content"
@@ -60,52 +45,33 @@
                 android:layout_marginBottom="10dp"/>
 
             <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.Outlined.Secondary"
-                android:text="Secondary Outlined"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"/>
-
-            <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.Outlined.Secondary"
-                android:text="Secondary Outlined Disabled"
-                android:enabled="false"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"/>
-
-            <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.TextButton"
+                style="?materialBorderlessButtonStyle"
                 android:text="Text Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"/>
 
             <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.TextButton"
+                style="?materialBorderlessButtonStyle"
                 android:text="Text Button Disabled"
                 android:enabled="false"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"/>
-
-            <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.TextButton.Secondary"
-                android:text="Secondary Text Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"/>
-
-            <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.TextButton.Secondary"
-                android:text="Secondary Text Button Disabled"
-                android:enabled="false"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"/>
         </LinearLayout>
     </ScrollView>
 
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/bodyShopThemeBtn"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        app:fabSize="mini"
+        app:backgroundTint="#004236"
+        android:layout_marginRight="40dp"
+        android:layout_marginBottom="40dp"
+        app:layout_constraintBottom_toTopOf="@id/naturaThemeBtn"
+        app:layout_constraintRight_toRightOf="parent"/>
+
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/avonThemeBtn"
         android:layout_width="24dp"
diff --git a/sample/src/main/res/layout/activity_text_input_highlight.xml b/sample/src/main/res/layout/activity_text_input_highlight.xml
index 878a5029e..7f0f4b837 100644
--- a/sample/src/main/res/layout/activity_text_input_highlight.xml
+++ b/sample/src/main/res/layout/activity_text_input_highlight.xml
@@ -5,9 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:padding="16dp"
     android:theme="@style/Theme.Natura">
 
-    <com.natura.android.widget.TextInputHighlight
+    <com.natura.android.widget.ValueTextHighlight
         android:id="@+id/highlightInitOnXml"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -18,7 +19,7 @@
         android:layout_width="0dp"
         android:layout_height="20dp"/>
 
-    <com.natura.android.widget.TextInputHighlight
+    <com.natura.android.widget.ValueTextHighlight
         android:id="@+id/highlightInitViaCode"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
diff --git a/tools/publish.gradle b/tools/publish.gradle
index f94caa042..417b8f4b0 100644
--- a/tools/publish.gradle
+++ b/tools/publish.gradle
@@ -6,7 +6,7 @@ if (file("github_credentials.properties").file) {
 }
 
 def getVersionName = { ->
-    return "0.0.9"
+    return "0.0.10"
 }
 
 def getGroupId = { ->