diff --git a/app/src/main/java/com/philliphsu/clock2/settings/SettingsFragment.java b/app/src/main/java/com/philliphsu/clock2/settings/SettingsFragment.java
index 1e6eb1a..871e893 100644
--- a/app/src/main/java/com/philliphsu/clock2/settings/SettingsFragment.java
+++ b/app/src/main/java/com/philliphsu/clock2/settings/SettingsFragment.java
@@ -7,7 +7,6 @@ import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.RingtonePreference;
@@ -61,14 +60,10 @@ public class SettingsFragment extends PreferenceFragment implements SharedPrefer
         Preference pref = findPreference(key);
         // Setting a ListPreference's summary value to "%s" in XML automatically updates the
         // preference's summary to display the selected value.
-        if (!(pref instanceof ListPreference)) {
-            String summary = prefs.getString(key, "");
-            if (pref instanceof RingtonePreference) {
-                Uri ringtoneUri = Uri.parse(summary);
-                Ringtone ringtone = RingtoneManager.getRingtone(getActivity(), ringtoneUri);
-                summary = ringtone.getTitle(getActivity());
-            }
-            pref.setSummary(summary);
+        if (pref instanceof RingtonePreference) {
+            Uri ringtoneUri = Uri.parse(prefs.getString(key, ""));
+            Ringtone ringtone = RingtoneManager.getRingtone(getActivity(), ringtoneUri);
+            pref.setSummary(ringtone.getTitle(getActivity()));
         }
     }
 }
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java b/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
index 7c22af8..c48bb32 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerRingtoneService.java
@@ -3,6 +3,7 @@ package com.philliphsu.clock2.timers;
 import android.app.Notification;
 import android.content.Intent;
 import android.net.Uri;
+import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.support.v4.app.NotificationCompat;
 
@@ -54,8 +55,9 @@ public class TimerRingtoneService extends RingtoneService<Timer> {
 
     @Override
     protected Uri getRingtoneUri() {
-        // TODO: Read Timer ringtone preference
-        return Settings.System.DEFAULT_ALARM_ALERT_URI;
+        String ringtone = PreferenceManager.getDefaultSharedPreferences(this).getString(
+                getString(R.string.key_timer_ringtone), Settings.System.ALARM_ALERT);
+        return Uri.parse(ringtone);
     }
 
     @Override
@@ -82,8 +84,8 @@ public class TimerRingtoneService extends RingtoneService<Timer> {
 
     @Override
     protected boolean doesVibrate() {
-        // TODO: Create new preference.
-        return false;
+        return PreferenceManager.getDefaultSharedPreferences(this).getBoolean(
+                getString(R.string.key_timer_vibrate), false);
     }
 
     @Override
diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java b/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java
index 818d4c1..19f135a 100644
--- a/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java
+++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java
@@ -22,7 +22,7 @@ import butterknife.OnClick;
  */
 public class TimerViewHolder extends BaseViewHolder<Timer> {
     private static final String TAG = "TimerViewHolder";
-    private static final int MAX_PROGRESS = 10000;
+    private static final int MAX_PROGRESS = 100000;
 
     private final AsyncTimersTableUpdateHandler mAsyncTimersTableUpdateHandler;
     private TimerController mController;
diff --git a/app/src/main/res/values/prefs_timers.xml b/app/src/main/res/values/prefs_timers.xml
index 0d0555b..d233a97 100644
--- a/app/src/main/res/values/prefs_timers.xml
+++ b/app/src/main/res/values/prefs_timers.xml
@@ -4,4 +4,7 @@
 
     <string name="key_timer_ringtone">key_timer_ringtone</string>
     <string name="title_timer_ringtone">Ringtone</string>
+
+    <string name="key_timer_vibrate">key_timer_vibrate</string>
+    <string name="title_timer_vibrate">Vibrate</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 0abea17..2b8cd48 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -62,5 +62,9 @@
             android:title="@string/title_timer_ringtone"
             android:ringtoneType="alarm"
             android:defaultValue="content://settings/system/alarm_alert"/>
+        <SwitchPreference
+            android:key="@string/key_timer_vibrate"
+            android:title="@string/title_timer_vibrate"
+            android:defaultValue="false"/>
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file