diff --git a/CleanUI/src/main/java/devjdelasen/com/cleanui/SimpleToolbar.kt b/CleanUI/src/main/java/devjdelasen/com/cleanui/SimpleToolbar.kt
index 2e7e929..3851ba8 100644
--- a/CleanUI/src/main/java/devjdelasen/com/cleanui/SimpleToolbar.kt
+++ b/CleanUI/src/main/java/devjdelasen/com/cleanui/SimpleToolbar.kt
@@ -2,7 +2,6 @@ package devjdelasen.com.cleanui
 
 import android.content.Context
 import android.content.res.ColorStateList
-import android.graphics.Typeface
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.util.TypedValue
@@ -11,7 +10,7 @@ import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import androidx.core.content.ContextCompat
 import androidx.core.widget.ImageViewCompat
-import kotlinx.android.synthetic.main.simple_toolbar.view.*
+import kotlinx.android.synthetic.main.simple_toolbar_clean_ui.view.*
 
 
 class SimpleToolbar : LinearLayout {
@@ -80,7 +79,7 @@ class SimpleToolbar : LinearLayout {
     }
 
     private fun init() {
-        View.inflate(context, R.layout.simple_toolbar, this)
+        View.inflate(context, R.layout.simple_toolbar_clean_ui, this)
         setView()
         setListeners()
     }
diff --git a/CleanUI/src/main/java/devjdelasen/com/cleanui/TitleSection.kt b/CleanUI/src/main/java/devjdelasen/com/cleanui/TitleSection.kt
index ccf6425..f7244ac 100644
--- a/CleanUI/src/main/java/devjdelasen/com/cleanui/TitleSection.kt
+++ b/CleanUI/src/main/java/devjdelasen/com/cleanui/TitleSection.kt
@@ -2,12 +2,10 @@ package devjdelasen.com.cleanui
 
 import android.content.Context
 import android.util.AttributeSet
-import android.util.TypedValue
 import android.view.View
 import android.widget.LinearLayout
-import android.widget.TextView
 import androidx.core.content.ContextCompat
-import kotlinx.android.synthetic.main.title_section.view.*
+import kotlinx.android.synthetic.main.title_section_clean_ui.view.*
 
 
 class TitleSection : LinearLayout {
@@ -43,7 +41,7 @@ class TitleSection : LinearLayout {
     }
 
     private fun init() {
-        View.inflate(context, R.layout.title_section, this)
+        View.inflate(context, R.layout.title_section_clean_ui, this)
         setView()
     }
 
diff --git a/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRow.kt b/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRow.kt
index 56e980c..088e634 100644
--- a/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRow.kt
+++ b/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRow.kt
@@ -7,7 +7,7 @@ import androidx.core.content.ContextCompat
 import devjdelasen.com.cleanui.R
 import devjdelasen.com.cleanui.TextStyle
 import devjdelasen.com.cleanui.set
-import kotlinx.android.synthetic.main.title_section.view.*
+import kotlinx.android.synthetic.main.title_section_clean_ui.view.*
 
 
 abstract class SettingsRow: LinearLayout {
diff --git a/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowAction.kt b/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowAction.kt
index 1c65dff..558460b 100644
--- a/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowAction.kt
+++ b/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowAction.kt
@@ -4,12 +4,9 @@ import android.content.Context
 import android.content.res.ColorStateList
 import android.util.AttributeSet
 import android.view.View
-import androidx.core.content.ContextCompat
 import androidx.core.widget.ImageViewCompat
 import devjdelasen.com.cleanui.R
-import devjdelasen.com.cleanui.TextStyle
-import devjdelasen.com.cleanui.set
-import kotlinx.android.synthetic.main.settings_row_action.view.*
+import kotlinx.android.synthetic.main.settings_row_action_clean_ui.view.*
 
 
 class SettingsRowAction: SettingsRow {
@@ -51,7 +48,7 @@ class SettingsRowAction: SettingsRow {
 
 
     private fun setView() {
-        View.inflate(context, R.layout.settings_row_action, this)
+        View.inflate(context, R.layout.settings_row_action_clean_ui, this)
         if (icTintColor != -1) ImageViewCompat.setImageTintList(clean_ui_ivIcAction, ColorStateList.valueOf(icTintColor))
     }
 
diff --git a/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowCheckBox.kt b/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowCheckBox.kt
index 1455378..88d8abd 100644
--- a/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowCheckBox.kt
+++ b/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowCheckBox.kt
@@ -6,12 +6,10 @@ import android.content.res.ColorStateList
 import android.util.AttributeSet
 import android.view.View
 import android.widget.CompoundButton
-import android.widget.RadioGroup
 import androidx.core.content.ContextCompat
 import androidx.core.widget.CompoundButtonCompat
-import androidx.core.widget.ImageViewCompat
 import devjdelasen.com.cleanui.R
-import kotlinx.android.synthetic.main.settings_row_check.view.*
+import kotlinx.android.synthetic.main.settings_row_check_clean_ui.view.*
 
 
 class SettingsRowCheckBox: SettingsRow {
@@ -53,7 +51,7 @@ class SettingsRowCheckBox: SettingsRow {
     }
 
     private fun setView() {
-        View.inflate(context, R.layout.settings_row_check, this)
+        View.inflate(context, R.layout.settings_row_check_clean_ui, this)
         CompoundButtonCompat.setButtonTintList(clean_ui_cb, ColorStateList.valueOf(cbTintColor));
     }
 
diff --git a/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowSubtext.kt b/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowSubtext.kt
index 0a57122..62c37df 100644
--- a/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowSubtext.kt
+++ b/CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowSubtext.kt
@@ -7,7 +7,7 @@ import androidx.core.content.ContextCompat
 import devjdelasen.com.cleanui.R
 import devjdelasen.com.cleanui.TextStyle
 import devjdelasen.com.cleanui.set
-import kotlinx.android.synthetic.main.settings_row_subtext.view.*
+import kotlinx.android.synthetic.main.settings_row_subtext_clean_ui.view.*
 
 
 class SettingsRowSubtext: SettingsRow {
@@ -55,7 +55,7 @@ class SettingsRowSubtext: SettingsRow {
     }
 
     private fun setView() {
-        View.inflate(context, R.layout.settings_row_subtext, this)
+        View.inflate(context, R.layout.settings_row_subtext_clean_ui, this)
         clean_ui_tvSubtext?.set(subtext, subtextColor, subtextSize, subtextTextStyle)
     }
 
diff --git a/CleanUI/src/main/res/layout/settings_row_action.xml b/CleanUI/src/main/res/layout/settings_row_action_clean_ui.xml
similarity index 100%
rename from CleanUI/src/main/res/layout/settings_row_action.xml
rename to CleanUI/src/main/res/layout/settings_row_action_clean_ui.xml
diff --git a/CleanUI/src/main/res/layout/settings_row_check.xml b/CleanUI/src/main/res/layout/settings_row_check_clean_ui.xml
similarity index 100%
rename from CleanUI/src/main/res/layout/settings_row_check.xml
rename to CleanUI/src/main/res/layout/settings_row_check_clean_ui.xml
diff --git a/CleanUI/src/main/res/layout/settings_row_subtext.xml b/CleanUI/src/main/res/layout/settings_row_subtext_clean_ui.xml
similarity index 100%
rename from CleanUI/src/main/res/layout/settings_row_subtext.xml
rename to CleanUI/src/main/res/layout/settings_row_subtext_clean_ui.xml
diff --git a/CleanUI/src/main/res/layout/simple_toolbar.xml b/CleanUI/src/main/res/layout/simple_toolbar_clean_ui.xml
similarity index 100%
rename from CleanUI/src/main/res/layout/simple_toolbar.xml
rename to CleanUI/src/main/res/layout/simple_toolbar_clean_ui.xml
diff --git a/CleanUI/src/main/res/layout/title_section.xml b/CleanUI/src/main/res/layout/title_section_clean_ui.xml
similarity index 100%
rename from CleanUI/src/main/res/layout/title_section.xml
rename to CleanUI/src/main/res/layout/title_section_clean_ui.xml
diff --git a/app/src/main/res/layout/activity_toolbar_sample.xml b/app/src/main/res/layout/activity_toolbar_sample.xml
index 98b84c0..2136658 100644
--- a/app/src/main/res/layout/activity_toolbar_sample.xml
+++ b/app/src/main/res/layout/activity_toolbar_sample.xml
@@ -13,23 +13,25 @@
     <devjdelasen.com.cleanui.SimpleToolbar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:simple_toolbar_title="Left title + divider + tint icon"
-        app:simple_toolbar_title_to_left="true"
+        app:simple_toolbar_title="No tint icon"
+        app:simple_toolbar_title_to_left="false"
         app:simple_toolbar_left_icon="@drawable/ic_back_arrow"
         app:simple_toolbar_left_color="@color/clean_ui_title_default"
-        app:simple_toolbar_right1_icon="@drawable/ic_done"
-        app:simple_toolbar_right1_color="@color/clean_ui_colorPrimary"
+        app:simple_toolbar_right1_icon="@drawable/ic_chat_gradient"
+        app:simple_toolbar_hide_divider="false"
         android:layout_marginBottom="20dp"
         />
 
     <devjdelasen.com.cleanui.SimpleToolbar
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:simple_toolbar_title="Center + no divider + no tint icon"
-        app:simple_toolbar_title_to_left="false"
+        app:simple_toolbar_hide_divider="true"
+        app:simple_toolbar_title="No divider and tint icon"
+        app:simple_toolbar_title_to_left="true"
         app:simple_toolbar_left_icon="@drawable/ic_back_arrow"
-        app:simple_toolbar_right1_icon="@drawable/ic_chat_gradient"
-        app:simple_toolbar_hide_divider="false"
+        app:simple_toolbar_left_color="@color/clean_ui_title_default"
+        app:simple_toolbar_right1_icon="@drawable/ic_geo"
+        app:simple_toolbar_right1_color="@color/clean_ui_colorPrimary"
         android:layout_marginBottom="20dp"
         />
 
@@ -38,6 +40,7 @@
         android:layout_height="wrap_content"
         app:simple_toolbar_title="Changed size, text style and color"
         app:simple_toolbar_title_color="@color/clean_ui_colorPrimary"
+        app:simple_toolbar_right1_icon="@drawable/ic_options"
         app:simple_toolbar_title_style="italic"
         app:simple_toolbar_text_size="16"
         android:layout_marginBottom="20dp"
@@ -47,6 +50,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:simple_toolbar_title="Changed divider color"
+        app:simple_toolbar_title_color="@color/clean_ui_subtitle_dark"
+        app:simple_toolbar_left_icon="@drawable/ic_chat_gradient"
         app:simple_toolbar_divider_color="@color/clean_ui_icon_light"
         android:layout_marginBottom="20dp"
         />