diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 032c73d18..0efb26e81 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -10,7 +10,43 @@
       </value>
     </option>
     <option name="RIGHT_MARGIN" value="200" />
+    <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+    <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+    <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+    <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_FOR" value="false" />
+    <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <option name="RESOURCE_LIST_WRAP" value="1" />
+    <option name="EXTENDS_LIST_WRAP" value="1" />
+    <option name="THROWS_LIST_WRAP" value="1" />
+    <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+    <option name="THROWS_KEYWORD_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+    <option name="BINARY_OPERATION_WRAP" value="5" />
+    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+    <option name="TERNARY_OPERATION_WRAP" value="1" />
+    <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+    <option name="FOR_STATEMENT_WRAP" value="1" />
+    <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+    <option name="ASSIGNMENT_WRAP" value="1" />
+    <option name="WRAP_COMMENTS" value="true" />
+    <option name="ASSERT_STATEMENT_WRAP" value="1" />
+    <option name="IF_BRACE_FORCE" value="1" />
+    <option name="DOWHILE_BRACE_FORCE" value="1" />
+    <option name="WHILE_BRACE_FORCE" value="1" />
+    <option name="METHOD_ANNOTATION_WRAP" value="1" />
+    <option name="CLASS_ANNOTATION_WRAP" value="1" />
+    <option name="FIELD_ANNOTATION_WRAP" value="1" />
+    <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
+    <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
+    <option name="ENUM_CONSTANTS_WRAP" value="1" />
     <AndroidXmlCodeStyleSettings>
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
       <option name="LAYOUT_SETTINGS">
         <value>
           <option name="INSERT_BLANK_LINE_BEFORE_TAG" value="false" />
@@ -198,28 +234,22 @@
           <section>
             <rule>
               <match>
-                <NAME>class</NAME>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <NAME>layout</NAME>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <NAME>xmlns:android</NAME>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
               </match>
             </rule>
           </section>
           <section>
             <rule>
               <match>
-                <NAME>xmlns:.*</NAME>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
               </match>
               <order>BY_NAME</order>
             </rule>
@@ -229,6 +259,7 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -239,6 +270,7 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -248,8 +280,9 @@
             <rule>
               <match>
                 <AND>
-                  <NAME>.*:layout_width</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
             </rule>
@@ -258,8 +291,9 @@
             <rule>
               <match>
                 <AND>
-                  <NAME>.*:layout_height</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
             </rule>
@@ -268,8 +302,9 @@
             <rule>
               <match>
                 <AND>
-                  <NAME>.*:layout_.*</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
               <order>BY_NAME</order>
@@ -280,27 +315,25 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
-              <order>BY_NAME</order>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
             </rule>
           </section>
           <section>
             <rule>
               <match>
-                <NAME>.*(?&lt;!style)$</NAME>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
               </match>
               <order>BY_NAME</order>
             </rule>
           </section>
-          <section>
-            <rule>
-              <match>
-                <NAME>style</NAME>
-              </match>
-            </rule>
-          </section>
         </rules>
       </arrangement>
     </codeStyleSettings>
@@ -313,9 +346,6 @@
       <option name="METHOD_ANNOTATION_WRAP" value="1" />
       <option name="FIELD_ANNOTATION_WRAP" value="1" />
       <option name="ENUM_CONSTANTS_WRAP" value="2" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
     </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/app/src/main/assets/web/info.html b/app/src/main/assets/web/info.html
index 3c6f38e0b..7e3fe492b 100644
--- a/app/src/main/assets/web/info.html
+++ b/app/src/main/assets/web/info.html
@@ -8,6 +8,16 @@
 </head>
 
 <body>
+<h4>2.0.13-beta1</h4>
+<ul>
+    <li>Continues where 2.0.12-beta6 left off</li>
+</ul>
+<h4>2.0.12</h4>
+<ul>
+    <li>Fixed an issue preventing playlists from showing up</li>
+    <li>Crash fixes</li>
+    <li>I've been rebuilding Shuttle from scratch for almost a year now! DM me your Play Store email address on Discord <a href="https://discord.gg/4Z5EU7K">Discord</a> if you're interested in testing the alpha :D</li>
+</ul>
 <h4>2.0.12-beta6</h4>
 <ul>
     <li>Fixed an issue where artwork didn't load on some devices</li>
diff --git a/app/src/main/assets/web/info_dark.html b/app/src/main/assets/web/info_dark.html
index 378a8cc92..7e287dca6 100644
--- a/app/src/main/assets/web/info_dark.html
+++ b/app/src/main/assets/web/info_dark.html
@@ -8,6 +8,16 @@
 </head>
 
 <body>
+<h4>2.0.13-beta1</h4>
+<ul>
+    <li>Continues where 2.0.12-beta6 left off</li>
+</ul>
+<h4>2.0.12</h4>
+<ul>
+    <li>Fixed an issue preventing playlists from showing up</li>
+    <li>Crash fixes</li>
+    <li>I've been rebuilding Shuttle from scratch for almost a year now! DM me your Play Store email address on Discord <a href="https://discord.gg/4Z5EU7K">Discord</a> if you're interested in testing the alpha :D</li>
+</ul>
 <h4>2.0.12-beta6</h4>
 <ul>
     <li>Fixed an issue where artwork didn't load on some devices</li>
diff --git a/app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java b/app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java
index 15308b915..bccf82d8e 100644
--- a/app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java
+++ b/app/src/main/java/com/simplecity/amp_library/notifications/MusicNotificationHelper.java
@@ -33,6 +33,7 @@
 import com.simplecity.amp_library.utils.SettingsManager;
 import com.simplecity.amp_library.utils.playlists.FavoritesPlaylistManager;
 import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 import java.util.ConcurrentModificationException;
 
@@ -52,6 +53,8 @@ public class MusicNotificationHelper extends NotificationHelper {
 
     private AnalyticsManager analyticsManager;
 
+    private CompositeDisposable compositeDisposable = new CompositeDisposable();
+
     public MusicNotificationHelper(Context context, AnalyticsManager analyticsManager) {
         super(context);
 
@@ -119,7 +122,7 @@ public void notify(
         notification = getBuilder(context, song, mediaSessionToken, bitmap, isPlaying, isFavorite).build();
         notify(NOTIFICATION_ID, notification);
 
-        favoritesPlaylistManager.isFavorite(song)
+        compositeDisposable.add(favoritesPlaylistManager.isFavorite(song)
                 .first(false)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -129,7 +132,7 @@ public void notify(
                     notify(notification);
                 }, error -> {
                     LogUtils.logException(TAG, "MusicNotificationHelper failed to present notification", error);
-                });
+                }));
 
         handler.post(() -> Glide.with(context)
                 .load(song)
@@ -194,4 +197,8 @@ public void notify(Notification notification) {
     public void cancel() {
         super.cancel(NOTIFICATION_ID);
     }
+
+    public void tearDown() {
+        compositeDisposable.clear();
+    }
 }
diff --git a/app/src/main/java/com/simplecity/amp_library/playback/MusicService.java b/app/src/main/java/com/simplecity/amp_library/playback/MusicService.java
index ac2f4e161..38a775207 100644
--- a/app/src/main/java/com/simplecity/amp_library/playback/MusicService.java
+++ b/app/src/main/java/com/simplecity/amp_library/playback/MusicService.java
@@ -336,6 +336,7 @@ public void onDestroy() {
         playbackManager.destroy();
 
         dummyNotificationHelper.teardown(this);
+        notificationHelper.tearDown();
 
         disposables.clear();
 
diff --git a/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.kt b/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.kt
index 50f3cabae..1d5efc7fd 100644
--- a/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.kt
+++ b/app/src/main/java/com/simplecity/amp_library/ui/dialog/ChangelogDialog.kt
@@ -3,6 +3,8 @@ package com.simplecity.amp_library.ui.dialog
 import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.support.v4.app.DialogFragment
 import android.support.v4.app.FragmentManager
@@ -48,6 +50,15 @@ class ChangelogDialog : DialogFragment() {
 
                 ViewUtils.fadeOut(progressBar) { ViewUtils.fadeIn(webView, null) }
             }
+
+            override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+                if (intent.resolveActivity(context!!.packageManager) != null) {
+                    context?.startActivity(intent)
+                    return true
+                }
+                return false
+            }
         }
 
         Aesthetic.get(context)
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 83f7dbf75..e5b0a5422 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -1,5 +1,5 @@
 object Config {
 
-    const val versionName = "2.0.12-beta6"
+    const val versionName = "2.0.13-beta1"
 
 }
\ No newline at end of file