diff --git a/app/src/main/java/nonphatic/quoz/MainActivity.java b/app/src/main/java/nonphatic/quoz/MainActivity.java
index 7c6e5fe..23e8628 100644
--- a/app/src/main/java/nonphatic/quoz/MainActivity.java
+++ b/app/src/main/java/nonphatic/quoz/MainActivity.java
@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.preference.PreferenceManager;
 import android.support.design.widget.FloatingActionButton;
@@ -98,6 +99,7 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_main);
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
         getPreferences();
         mContentView = findViewById(R.id.fullscreen_content);
@@ -313,7 +315,7 @@ public class MainActivity extends AppCompatActivity {
                         });
                     }
                 };
-                timer.schedule(timerTask, 180, 425);
+                timer.schedule(timerTask, 160, 425);
                 mediaPlayer = MediaPlayer.create(this, R.raw.nyan);
                 mediaPlayer.setLooping(true);
                 mediaPlayer.start();
diff --git a/app/src/main/java/nonphatic/quoz/preferences/SettingsActivity.java b/app/src/main/java/nonphatic/quoz/preferences/SettingsActivity.java
index 7177bb9..a362f96 100644
--- a/app/src/main/java/nonphatic/quoz/preferences/SettingsActivity.java
+++ b/app/src/main/java/nonphatic/quoz/preferences/SettingsActivity.java
@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -104,6 +105,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setupActionBar();
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
     }
 
     /**