diff --git a/sample_app/src/main/res/layout/list_item_view_adrecord.xml b/sample_app/src/main/res/layout/list_item_view_adrecord.xml
index b020ead..c28b426 100644
--- a/sample_app/src/main/res/layout/list_item_view_adrecord.xml
+++ b/sample_app/src/main/res/layout/list_item_view_adrecord.xml
@@ -4,7 +4,7 @@
               android:layout_height="wrap_content"
               android:gravity="top"
               android:orientation="vertical"
-              android:paddingBottom="5dp">
+    android:paddingBottom="@dimen/space_between_sections">
 
     <TextView
         android:id="@+id/title"
diff --git a/sample_app/src/main/res/layout/list_item_view_device_info.xml b/sample_app/src/main/res/layout/list_item_view_device_info.xml
index 239480f..37df21c 100644
--- a/sample_app/src/main/res/layout/list_item_view_device_info.xml
+++ b/sample_app/src/main/res/layout/list_item_view_device_info.xml
@@ -4,7 +4,7 @@
               android:layout_height="wrap_content"
               android:gravity="top"
               android:orientation="vertical"
-              android:paddingBottom="5dp">
+    android:paddingBottom="@dimen/space_between_sections">
 
     <GridLayout
         android:layout_width="match_parent"
diff --git a/sample_app/src/main/res/layout/list_item_view_header.xml b/sample_app/src/main/res/layout/list_item_view_header.xml
index 133d44f..315960b 100644
--- a/sample_app/src/main/res/layout/list_item_view_header.xml
+++ b/sample_app/src/main/res/layout/list_item_view_header.xml
@@ -4,7 +4,7 @@
               android:layout_height="wrap_content"
               android:gravity="top"
               android:orientation="vertical"
-              android:paddingBottom="5dp">
+    android:paddingBottom="6dp">
 
     <TextView
         android:id="@+id/text"
@@ -15,9 +15,4 @@
         android:textSize="14sp"
         android:textStyle="bold"/>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorSeparator" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/sample_app/src/main/res/layout/list_item_view_ibeacon_details.xml b/sample_app/src/main/res/layout/list_item_view_ibeacon_details.xml
index aaddcc1..8f7e40b 100644
--- a/sample_app/src/main/res/layout/list_item_view_ibeacon_details.xml
+++ b/sample_app/src/main/res/layout/list_item_view_ibeacon_details.xml
@@ -4,7 +4,7 @@
               android:layout_height="wrap_content"
               android:gravity="top"
               android:orientation="vertical"
-              android:paddingBottom="5dp">
+    android:paddingBottom="@dimen/space_between_sections">
 
     <GridLayout
         android:layout_width="match_parent"
diff --git a/sample_app/src/main/res/layout/list_item_view_rssi_info.xml b/sample_app/src/main/res/layout/list_item_view_rssi_info.xml
index 4e1163d..c234717 100644
--- a/sample_app/src/main/res/layout/list_item_view_rssi_info.xml
+++ b/sample_app/src/main/res/layout/list_item_view_rssi_info.xml
@@ -4,7 +4,7 @@
               android:layout_height="wrap_content"
               android:gravity="top"
               android:orientation="vertical"
-              android:paddingBottom="5dp">
+    android:paddingBottom="@dimen/space_between_sections">
 
     <GridLayout
         android:layout_width="match_parent"
diff --git a/sample_app/src/main/res/layout/list_item_view_textview.xml b/sample_app/src/main/res/layout/list_item_view_textview.xml
index 4c6cade..015c556 100644
--- a/sample_app/src/main/res/layout/list_item_view_textview.xml
+++ b/sample_app/src/main/res/layout/list_item_view_textview.xml
@@ -4,7 +4,7 @@
               android:layout_height="wrap_content"
               android:gravity="top"
               android:orientation="vertical"
-              android:paddingBottom="5dp">
+    android:paddingBottom="@dimen/space_between_sections">
 
     <TextView
         android:id="@+id/text"
diff --git a/sample_app/src/main/res/values-v21/styles.xml b/sample_app/src/main/res/values-v21/styles.xml
index 7b9a811..79edc9c 100644
--- a/sample_app/src/main/res/values-v21/styles.xml
+++ b/sample_app/src/main/res/values-v21/styles.xml
@@ -7,5 +7,9 @@
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
         <item name="android:windowSharedElementEnterTransition">@android:transition/move</item>
         <item name="android:windowSharedElementExitTransition">@android:transition/move</item>
+
+        <item name="android:colorPrimary">@color/colorPrimary</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/sample_app/src/main/res/values/colors.xml b/sample_app/src/main/res/values/colors.xml
index 0065566..8399d14 100644
--- a/sample_app/src/main/res/values/colors.xml
+++ b/sample_app/src/main/res/values/colors.xml
@@ -1,9 +1,10 @@
 <resources>
+    <color name="bluetooth_blue">#0082FC</color>
     <color name="light_gray">#66e0e0e0</color>
-    <color name="colorPrimary">#0000FF</color>
-    <color name="colorPrimaryDark">#4400FF</color>
-    <color name="colorAccent">#F06292</color>
 
+    <color name="colorPrimary">@color/bluetooth_blue</color>
+    <color name="colorPrimaryDark">#0069E3</color>
+    <color name="colorAccent">#F06292</color>
 
     <color name="colorSeparator">@color/colorAccent</color>
 </resources>
diff --git a/sample_app/src/main/res/values/dimens.xml b/sample_app/src/main/res/values/dimens.xml
index 55c1e59..d72218f 100644
--- a/sample_app/src/main/res/values/dimens.xml
+++ b/sample_app/src/main/res/values/dimens.xml
@@ -4,4 +4,5 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
 
+    <dimen name="space_between_sections">8dp</dimen>
 </resources>
diff --git a/sample_app/src/main/res/values/styles.xml b/sample_app/src/main/res/values/styles.xml
index d8baf48..c3f501b 100644
--- a/sample_app/src/main/res/values/styles.xml
+++ b/sample_app/src/main/res/values/styles.xml
@@ -4,7 +4,7 @@
 
     <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>