diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 7bbf9a201..54c048984 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -3,10 +3,10 @@
           package="com.adevinta.android.barista.sample"
     >
 
-  <uses-permission android:name="android.permission.READ_CONTACTS" />
-  <uses-permission android:name="android.permission.CAMERA" />
-  <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
-  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission android:name="android.permission.READ_CONTACTS"/>
+  <uses-permission android:name="android.permission.CAMERA"/>
+  <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS"/>
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
   <application
       android:allowBackup="true"
@@ -15,35 +15,29 @@
       android:supportsRtl="true"
       android:theme="@style/AppTheme"
       >
-    <activity
-        android:name=".MainActivity"
-        android:exported="true"
-        android:label="@string/title_activity_main"
-        android:theme="@style/AppTheme.NoActionBar"
-        />
-    <activity android:name=".SomeViewsWithDifferentVisibilitiesActivity" />
-    <activity android:name=".FlowFirstScreen" />
-    <activity android:name=".FlowSecondScreen" />
-    <activity android:name=".RadioButtonsActivity" />
-    <activity android:name=".CheckBoxActivity" />
-    <activity android:name=".EditTextActivity" />
-    <activity android:name=".PickersActivity" />
-    <activity android:name=".AutoCompleteTextViewActivity" />
-    <activity android:name=".SpinnerActivity" />
-    <activity android:name=".ListsActivity" />
-    <activity android:name=".LabelActivity" />
-    <activity android:name=".ViewPagerWithTwoDifferentPagesActivity" />
-    <activity android:name=".ViewPagerWithFiveSamePagesActivity" />
-    <activity android:name=".PartiallyVisibleViewPagerActivity" />
-    <activity android:name=".ViewPager2Activity" />
-    <activity android:name=".DialogActivity" />
-    <activity android:name=".PreferencesActivity" />
-    <activity android:name=".DatabaseActivity" />
-    <activity android:name=".FileActivity" />
-    <activity android:name=".HelloWorldActivity" />
-    <activity android:name=".WrappedViewActivity" />
-    <activity android:name=".SwipeRefreshActivity" />
-    <activity android:name=".MenuActivity" />
+    <activity android:name=".SomeViewsWithDifferentVisibilitiesActivity"/>
+    <activity android:name=".FlowFirstScreen"/>
+    <activity android:name=".FlowSecondScreen"/>
+    <activity android:name=".RadioButtonsActivity"/>
+    <activity android:name=".CheckBoxActivity"/>
+    <activity android:name=".EditTextActivity"/>
+    <activity android:name=".PickersActivity"/>
+    <activity android:name=".AutoCompleteTextViewActivity"/>
+    <activity android:name=".SpinnerActivity"/>
+    <activity android:name=".ListsActivity"/>
+    <activity android:name=".LabelActivity"/>
+    <activity android:name=".ViewPagerWithTwoDifferentPagesActivity"/>
+    <activity android:name=".ViewPagerWithFiveSamePagesActivity"/>
+    <activity android:name=".PartiallyVisibleViewPagerActivity"/>
+    <activity android:name=".ViewPager2Activity"/>
+    <activity android:name=".DialogActivity"/>
+    <activity android:name=".PreferencesActivity"/>
+    <activity android:name=".DatabaseActivity"/>
+    <activity android:name=".FileActivity"/>
+    <activity android:name=".HelloWorldActivity"/>
+    <activity android:name=".WrappedViewActivity"/>
+    <activity android:name=".SwipeRefreshActivity"/>
+    <activity android:name=".MenuActivity"/>
     <activity android:name=".ChipsActivity" />
     <activity
         android:name=".MenuSupportActionBarActivity"
@@ -53,15 +47,15 @@
         android:name=".NavigationDrawerActivity"
         android:theme="@style/AppTheme.NoActionBar"
         />
-    <activity android:name=".RecyclerViewsInsideViewPagerActivity" />
-    <activity android:name=".RecyclerViewsWithDifferentDataInsideViewPagerActivity" />
-    <activity android:name=".ListViewsWithDifferentDataInsideViewPagerActivity" />
-    <activity android:name=".NestedScrollViewActivity" />
+    <activity android:name=".RecyclerViewsInsideViewPagerActivity"/>
+    <activity android:name=".RecyclerViewsWithDifferentDataInsideViewPagerActivity"/>
+    <activity android:name=".ListViewsWithDifferentDataInsideViewPagerActivity"/>
+    <activity android:name=".NestedScrollViewActivity"/>
     <activity android:name=".CameraActivity">
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
+        <action android:name="android.intent.action.MAIN"/>
 
-        <category android:name="android.intent.category.LAUNCHER" />
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
 
@@ -77,9 +71,9 @@
           />
     </provider>
 
-    <activity android:name=".EmptyActivity" />
-    <activity android:name=".SeekBarActivity" />
-    <activity android:name=".SomeSeekBarsWithDifferentProgressesActivity" />
+    <activity android:name=".EmptyActivity"/>
+    <activity android:name=".SeekBarActivity"/>
+    <activity android:name=".SomeSeekBarsWithDifferentProgressesActivity"/>
     <activity
         android:name=".ColorsActivity"
         android:exported="true"
@@ -88,10 +82,11 @@
         android:name=".ColorsSecondActivity"
         android:exported="true"
         />
-    <activity android:name=".KeyboardActivity" />
-    <activity android:name=".HintAndErrorActivity" />
-    <activity android:name=".WrappedEditTextActivity" />
-    <activity android:name=".ContentDescriptionActivity" />
+    <activity android:name=".KeyboardActivity"/>
+    <activity android:name=".HintAndErrorActivity"/>
+    <activity android:name=".WrappedEditTextActivity"/>
+    <activity android:name=".ContentDescriptionActivity"/>
+
   </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/sample/src/main/java/com/adevinta/android/barista/sample/ui/theme/Color.kt b/sample/src/main/java/com/adevinta/android/barista/sample/ui/theme/Color.kt
deleted file mode 100644
index 469de4ae3..000000000
--- a/sample/src/main/java/com/adevinta/android/barista/sample/ui/theme/Color.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.adevinta.android.barista.sample.ui.theme
-
-import androidx.compose.ui.graphics.Color
-
-val Purple200 = Color(0xFFBB86FC)
-val Purple500 = Color(0xFF6200EE)
-val Purple700 = Color(0xFF3700B3)
-val Teal200 = Color(0xFF03DAC5)
\ No newline at end of file
diff --git a/sample/src/main/java/com/adevinta/android/barista/sample/ui/theme/Shape.kt b/sample/src/main/java/com/adevinta/android/barista/sample/ui/theme/Shape.kt
deleted file mode 100644
index f1b98e070..000000000
--- a/sample/src/main/java/com/adevinta/android/barista/sample/ui/theme/Shape.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.adevinta.android.barista.sample.ui.theme
-
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Shapes
-import androidx.compose.ui.unit.dp
-
-val Shapes = Shapes(
-  small = RoundedCornerShape(4.dp),
-  medium = RoundedCornerShape(4.dp),
-  large = RoundedCornerShape(0.dp)
-)
\ No newline at end of file
diff --git a/sample/src/main/java/com/adevinta/android/barista/sample/ui/theme/Theme.kt b/sample/src/main/java/com/adevinta/android/barista/sample/ui/theme/Theme.kt
deleted file mode 100644
index 8730a2457..000000000
--- a/sample/src/main/java/com/adevinta/android/barista/sample/ui/theme/Theme.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.adevinta.android.barista.sample.ui.theme
-
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.darkColors
-import androidx.compose.material.lightColors
-import androidx.compose.runtime.Composable
-
-private val DarkColorPalette = darkColors(
-  primary = Purple200,
-  primaryVariant = Purple700,
-  secondary = Teal200
-)
-
-private val LightColorPalette = lightColors(
-  primary = Purple500,
-  primaryVariant = Purple700,
-  secondary = Teal200
-
-  /* Other default colors to override
-    background = Color.White,
-    surface = Color.White,
-    onPrimary = Color.White,
-    onSecondary = Color.Black,
-    onBackground = Color.Black,
-    onSurface = Color.Black,
-    */
-)
-
-@Composable
-fun BaristaTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable() () -> Unit) {
-  val colors = if (darkTheme) {
-    DarkColorPalette
-  } else {
-    LightColorPalette
-  }
-
-  MaterialTheme(
-    colors = colors,
-    typography = Typography,
-    shapes = Shapes,
-    content = content
-  )
-}
\ No newline at end of file
diff --git a/sample/src/main/java/com/adevinta/android/barista/sample/ui/theme/Type.kt b/sample/src/main/java/com/adevinta/android/barista/sample/ui/theme/Type.kt
deleted file mode 100644
index 6916afa5b..000000000
--- a/sample/src/main/java/com/adevinta/android/barista/sample/ui/theme/Type.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.adevinta.android.barista.sample.ui.theme
-
-import androidx.compose.material.Typography
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
-
-// Set of Material typography styles to start with
-val Typography = Typography(
-  body1 = TextStyle(
-    fontFamily = FontFamily.Default,
-    fontWeight = FontWeight.Normal,
-    fontSize = 16.sp
-  )
-  /* Other default text styles to override
-    button = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.W500,
-        fontSize = 14.sp
-    ),
-    caption = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 12.sp
-    )
-    */
-)
\ No newline at end of file
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index 770695d51..d00d9ec01 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -47,6 +47,5 @@
 
   <string name="content_description_image_color_green">Image color green</string>
   <string name="content_description_text_green">Text green</string>
-  <string name="title_activity_main">MainActivity</string>
 
 </resources>
diff --git a/sample/src/main/res/values/themes.xml b/sample/src/main/res/values/themes.xml
deleted file mode 100644
index a794356c9..000000000
--- a/sample/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<resources>
-
-  <style name="AppTheme.AppBarOverlay"
-         parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-  <style name="AppTheme.PopupOverlay"
-         parent="ThemeOverlay.AppCompat.Light" />
-</resources>
\ No newline at end of file