diff --git a/app/src/main/res/drawable/folder_activated_background.xml b/app/src/main/res/drawable/folder_activated_background.xml
index cfbb9b1..a6a294b 100644
--- a/app/src/main/res/drawable/folder_activated_background.xml
+++ b/app/src/main/res/drawable/folder_activated_background.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/uva_color" android:state_activated="true" />
-    <item android:drawable="@color/uva_color" android:state_checked="true" />
-    <item android:drawable="@color/uva_color" android:state_pressed="true" />
-    <item android:drawable="@color/uva_color" android:state_selected="true" />
-    <item android:drawable="@color/default_color" />
+    <item android:drawable="@color/translucent_blue" android:state_activated="true" />
+    <item android:drawable="@color/translucent_blue" android:state_checked="true" />
+    <item android:drawable="@color/translucent_blue" android:state_pressed="true" />
+    <item android:drawable="@color/translucent_blue" android:state_selected="true" />
 </selector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f077f38..5cb0159 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".EmailListActivity" >
+    tools:context=".EmailListActivity">
 
     <!-- The mail list view -->
     <FrameLayout
@@ -19,7 +18,7 @@
         android:layout_width="240dp"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:background="#111" >
+        android:background="@color/background_floating_material_light">
 
         <ListView
             android:id="@+id/drawer"
@@ -36,7 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <FrameLayout
                 android:id="@+id/address_book"
@@ -46,17 +45,14 @@
 
                 <TextView
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/nav_entry_height"
                     android:gravity="center_vertical"
-                    android:minHeight="48dp"
-                    android:paddingLeft="16dp"
-                    android:paddingStart="16dp"
-                    android:paddingRight="16dp"
-                    android:paddingEnd="16dp"
-                    android:layout_marginRight="56dp"
-                    android:layout_marginEnd="56dp"
+                    android:paddingEnd="@dimen/nav_horizontal_margin"
+                    android:paddingLeft="@dimen/nav_horizontal_margin"
+                    android:paddingRight="@dimen/nav_horizontal_margin"
+                    android:paddingStart="@dimen/nav_horizontal_margin"
                     android:text="@string/address_book"
-                    android:textAppearance="?android:attr/textAppearanceMediumInverse" />
+                    android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
             </FrameLayout>
 
             <FrameLayout
@@ -68,19 +64,17 @@
                 <TextView
                     android:id="@+id/network_status_text"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/nav_entry_height"
                     android:drawableLeft="@android:drawable/presence_offline"
                     android:drawablePadding="10dp"
+                    android:drawableStart="@android:drawable/presence_offline"
                     android:gravity="center_vertical"
-                    android:minHeight="48dp"
-                    android:paddingLeft="16dp"
-                    android:paddingStart="16dp"
-                    android:paddingRight="16dp"
-                    android:paddingEnd="16dp"
-                    android:layout_marginRight="56dp"
-                    android:layout_marginEnd="56dp"
+                    android:paddingEnd="@dimen/nav_horizontal_margin"
+                    android:paddingLeft="@dimen/nav_horizontal_margin"
+                    android:paddingRight="@dimen/nav_horizontal_margin"
+                    android:paddingStart="@dimen/nav_horizontal_margin"
                     android:text="@string/network_status"
-                    android:textAppearance="?android:attr/textAppearanceMediumInverse" />
+                    android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
             </FrameLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/listitem_folder.xml b/app/src/main/res/layout/listitem_folder.xml
index 794595c..b133138 100644
--- a/app/src/main/res/layout/listitem_folder.xml
+++ b/app/src/main/res/layout/listitem_folder.xml
@@ -2,20 +2,18 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/folder_activated_background" >
+    android:background="@drawable/folder_activated_background">
+
     <TextView
         android:id="@+id/folder_name"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMediumInverse"
+        android:layout_height="@dimen/nav_entry_height"
         android:gravity="center_vertical"
-        android:minHeight="48dp"
-        android:paddingLeft="16dp"
-        android:paddingStart="16dp"
-        android:paddingRight="16dp"
-        android:paddingEnd="16dp"
-        android:layout_marginRight="56dp"
-        android:layout_marginEnd="56dp"
-        android:text="Folder Name" />
+        android:paddingEnd="@dimen/nav_horizontal_margin"
+        android:paddingLeft="@dimen/nav_horizontal_margin"
+        android:paddingRight="@dimen/nav_horizontal_margin"
+        android:paddingStart="@dimen/nav_horizontal_margin"
+        android:text="Folder Name"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 55c1e59..a07f8bd 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,7 +1,9 @@
 <resources>
-
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
 
+    <dimen name="nav_horizontal_margin">16dp</dimen>
+    <dimen name="nav_entry_height">48dp</dimen>
+
 </resources>