diff --git a/reddinator/build.gradle b/reddinator/build.gradle
index ef3bfc8..d6c9da6 100644
--- a/reddinator/build.gradle
+++ b/reddinator/build.gradle
@@ -14,7 +14,7 @@ repositories {
     maven { url "http://dl.bintray.com/populov/maven" }
     maven { url 'http://guardian.github.com/maven/repo-releases' }
     mavenCentral()
-    jcenter({url "http://jcenter.bintray.com/"})
+    jcenter({ url "http://jcenter.bintray.com/" })
 }
 
 android {
@@ -24,6 +24,7 @@ android {
         minSdkVersion 11
         targetSdkVersion 25
         return
+        vectorDrawables.useSupportLibrary = true
     }
     signingConfigs {
         debug {
@@ -59,4 +60,5 @@ dependencies {
     compile 'com.sothree.slidinguppanel:library:3.3.1'
     compile 'com.gu:option:1.3'
     compile 'net.rdrei.android.dirchooser:library:3.2@aar'
+    compile 'com.android.support:support-vector-drawable:25.1.0'
 }
diff --git a/reddinator/reddinator-reddinator.iml b/reddinator/reddinator-reddinator.iml
index c03dbc7..20ceb1b 100644
--- a/reddinator/reddinator-reddinator.iml
+++ b/reddinator/reddinator-reddinator.iml
@@ -102,11 +102,18 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/de.cketti.library.changelog/ckchangelog/1.2.2/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/net.rdrei.android.dirchooser/library/3.2/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
diff --git a/reddinator/reddinator-release.apk b/reddinator/reddinator-release.apk
index c26503a..6be5031 100644
Binary files a/reddinator/reddinator-release.apk and b/reddinator/reddinator-release.apk differ
diff --git a/reddinator/src/main/AndroidManifest.xml b/reddinator/src/main/AndroidManifest.xml
index 3121904..e4e60ad 100644
--- a/reddinator/src/main/AndroidManifest.xml
+++ b/reddinator/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="au.com.wallaceit.reddinator"
-    android:versionCode="60"
-    android:versionName="3.21.0">
+    android:versionCode="61"
+    android:versionName="3.21.1">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- Needed by some activity_webview HTML5 video implementations (Bug report received for Android 4.1) -->
@@ -19,7 +19,6 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
         tools:replace="android:theme">
-
         <activity
             android:name=".activity.MainActivity"
             android:configChanges="orientation|screenSize"
@@ -41,21 +40,17 @@
                     android:scheme="https" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".activity.PrefsActivity"
             android:label="@string/preferences" />
-
         <activity
             android:name=".activity.ThemesActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_themes" />
-
         <activity
             android:name=".activity.ThemeEditorActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_theme_editor" />
-
         <activity
             android:name=".activity.SubredditSelectActivity"
             android:configChanges="orientation|screenSize"
@@ -64,12 +59,10 @@
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".activity.ViewAllSubredditsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/subreddits" />
-
         <activity
             android:name=".activity.ViewRedditActivity"
             android:configChanges="orientation|screenSize"
@@ -84,35 +77,29 @@
             </intent-filter>
             -->
         </activity>
-
         <activity
             android:name=".activity.WebViewActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
             android:windowSoftInputMode="adjustResize" />
-
         <activity
             android:name=".activity.AccountActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
             android:windowSoftInputMode="adjustResize" />
-
         <activity
             android:name=".activity.MessagesActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/messages"
             android:windowSoftInputMode="adjustResize" />
-
         <activity
             android:name=".activity.ComposeMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message" />
-
         <activity
             android:name=".activity.SearchActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/search" />
-
         <activity
             android:name=".activity.SubmitActivity"
             android:configChanges="orientation|screenSize"
@@ -126,7 +113,6 @@
                 <data android:mimeType="text/plain" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".activity.OAuthView"
             android:configChanges="orientation|screenSize"
@@ -143,46 +129,45 @@
 
         <receiver
             android:name=".service.WidgetProvider"
-            android:label="@string/list_widget"
-            android:enabled="true">
+            android:enabled="true"
+            android:label="@string/list_widget">
             <intent-filter>
-                <action android:name="au.com.wallaceit.redinator.WidgetCommon.ITEM_CLICK" />
-                <action android:name="au.com.wallaceit.redinator.WidgetCommon.APPWIDGET_AUTO_UPDATE" />
-                <action android:name="au.com.wallaceit.redinator.WidgetCommon.APPWIDGET_UPDATE_FEED" />
+                <action android:name="wallaceit.redinator.action.APPWIDGET_ITEM_CLICK" />
+                <action android:name="wallaceit.redinator.action.APPWIDGET_AUTO_UPDATE" />
+                <action android:name="wallaceit.redinator.action.APPWIDGET_UPDATE_FEED" />
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE_OPTIONS" />
                 <action android:name="android.appwidget.action.APPWIDGET_ENABLED" />
                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
+
             <meta-data
                 android:name="android.appwidget.provider"
                 android:resource="@xml/app_widget_provider_info" />
         </receiver>
-
         <receiver
             android:name=".service.StackWidgetProvider"
-            android:label="@string/stack_widget"
-            android:enabled="true">
+            android:enabled="true"
+            android:label="@string/stack_widget">
             <intent-filter>
-                <action android:name="au.com.wallaceit.redinator.WidgetCommon.ITEM_CLICK" />
-                <action android:name="au.com.wallaceit.redinator.WidgetCommon.APPWIDGET_AUTO_UPDATE" />
-                <action android:name="au.com.wallaceit.redinator.WidgetCommon.APPWIDGET_UPDATE_FEED" />
+                <action android:name="wallaceit.redinator.action.APPWIDGET_ITEM_CLICK" />
+                <action android:name="wallaceit.redinator.action.APPWIDGET_AUTO_UPDATE" />
+                <action android:name="wallaceit.redinator.action.APPWIDGET_UPDATE_FEED" />
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE_OPTIONS" />
                 <action android:name="android.appwidget.action.APPWIDGET_ENABLED" />
                 <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
+
             <meta-data
                 android:name="android.appwidget.provider"
                 android:resource="@xml/app_widget_stack_provider_info" />
         </receiver>
-
         <receiver
             android:name=".service.MailCheckReceiver"
             android:enabled="true" />
-
         <receiver
             android:name=".service.BootReceiver"
             android:enabled="true">
@@ -201,20 +186,17 @@
             android:noHistory="true"
             android:taskAffinity=".FeedItemDialogActivity"
             android:theme="@style/TransparentActivity" />
-
         <activity
             android:name=".activity.ViewImageDialogActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
             android:theme="@style/TransparentActivity" />
-
         <activity
             android:name=".activity.CommentsContextDialogActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
             android:theme="@style/TransparentActivity"
             android:windowSoftInputMode="adjustResize">
-
             <!--
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.VIEW" />
@@ -224,7 +206,6 @@
             </intent-filter>
             -->
         </activity>
-
         <activity
             android:name=".activity.WidgetMenuDialogActivity"
             android:configChanges="orientation|screenSize"
diff --git a/reddinator/src/main/assets/js/comments.js b/reddinator/src/main/assets/js/comments.js
index 1c5bc3e..6568a70 100644
--- a/reddinator/src/main/assets/js/comments.js
+++ b/reddinator/src/main/assets/js/comments.js
@@ -1,6 +1,5 @@
 // set article from document hash
 var articleId = document.location.hash.substring(1);
-var baseId;
 var username;
 var subAuthor;
 var isArchived = false;
@@ -19,7 +18,6 @@ function populateComments(author, archived, json){
     var data = JSON.parse(json);
     $("#loading_view").hide();
     $("#base").show();
-    baseId = data[0].data.parent_id;
     recursivePopulate(data);
 }
 
@@ -234,7 +232,7 @@ function appendComment(parentId, commentData, prepend){
         }
         flag.show();
     }
-    if (parentId.indexOf(baseId)!==-1){
+    if (parentId.indexOf("t3_")!==-1){
         if (prepend){
             commentElem.prependTo("#base");
         } else {
diff --git a/reddinator/src/main/java/au/com/wallaceit/reddinator/activity/PrefsActivity.java b/reddinator/src/main/java/au/com/wallaceit/reddinator/activity/PrefsActivity.java
index 0437144..305ecbc 100644
--- a/reddinator/src/main/java/au/com/wallaceit/reddinator/activity/PrefsActivity.java
+++ b/reddinator/src/main/java/au/com/wallaceit/reddinator/activity/PrefsActivity.java
@@ -21,7 +21,12 @@
 
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
+import android.view.KeyEvent;
 import android.view.MenuItem;
+import android.widget.Toast;
+
+import java.util.Date;
 
 public class PrefsActivity extends PreferenceActivity {
     private PrefsFragment fragment;
@@ -52,4 +57,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
         return true;
     }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if ((keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)){
+            Toast.makeText(this, "Last widget refresh: " + new Date(PreferenceManager.getDefaultSharedPreferences(this).getLong("last_auto_refresh", 0)).toString(), Toast.LENGTH_LONG).show();
+            return true;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
 }
diff --git a/reddinator/src/main/java/au/com/wallaceit/reddinator/activity/PrefsFragment.java b/reddinator/src/main/java/au/com/wallaceit/reddinator/activity/PrefsFragment.java
index 9b27209..8c0115b 100644
--- a/reddinator/src/main/java/au/com/wallaceit/reddinator/activity/PrefsFragment.java
+++ b/reddinator/src/main/java/au/com/wallaceit/reddinator/activity/PrefsFragment.java
@@ -285,7 +285,7 @@ private void saveSettingsAndFinish() {
         // check if refresh rate has changed and update if needed
         if (!mRefreshrate.equals(mSharedPreferences.getString(getString(R.string.refresh_rate_pref), "43200000"))) {
             //System.out.println("Refresh preference changed, updating alarm");
-            WidgetCommon.setUpdateSchedule(getActivity(), false);
+            WidgetCommon.setUpdateSchedule(getActivity());
         }
         // check if background mail check interval has changed
         if (!mMailRefresh.equals(mSharedPreferences.getString(getString(R.string.background_mail_pref), "43200000"))) {
diff --git a/reddinator/src/main/java/au/com/wallaceit/reddinator/service/BootReceiver.java b/reddinator/src/main/java/au/com/wallaceit/reddinator/service/BootReceiver.java
index c22b431..2807086 100644
--- a/reddinator/src/main/java/au/com/wallaceit/reddinator/service/BootReceiver.java
+++ b/reddinator/src/main/java/au/com/wallaceit/reddinator/service/BootReceiver.java
@@ -33,6 +33,6 @@ public void onReceive(Context context, Intent intent) {
         // set mail check alarm
         MailCheckReceiver.setAlarm(context);
         // set widget update alarm if widgets enabled
-        WidgetCommon.setUpdateSchedule(context, false);
+        WidgetCommon.setUpdateSchedule(context);
     }
 }
diff --git a/reddinator/src/main/java/au/com/wallaceit/reddinator/service/StackWidgetProvider.java b/reddinator/src/main/java/au/com/wallaceit/reddinator/service/StackWidgetProvider.java
index 2f61b7a..dd151a0 100644
--- a/reddinator/src/main/java/au/com/wallaceit/reddinator/service/StackWidgetProvider.java
+++ b/reddinator/src/main/java/au/com/wallaceit/reddinator/service/StackWidgetProvider.java
@@ -79,7 +79,7 @@ public static void updateAppWidgets(Context context, AppWidgetManager appWidgetM
 
             // REFRESH BUTTON
             Intent refreshIntent = new Intent(context, StackWidgetProvider.class);
-            refreshIntent.setAction(WidgetCommon.APPWIDGET_UPDATE_FEED);
+            refreshIntent.setAction(WidgetCommon.ACTION_UPDATE_FEED);
             refreshIntent.setPackage(context.getPackageName());
             refreshIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
             refreshIntent.setData(Uri.parse(refreshIntent.toUri(Intent.URI_INTENT_SCHEME)));
@@ -87,7 +87,7 @@ public static void updateAppWidgets(Context context, AppWidgetManager appWidgetM
 
             // ITEM CLICK
             Intent clickIntent = new Intent(context, StackWidgetProvider.class);
-            clickIntent.setAction(WidgetCommon.ITEM_CLICK);
+            clickIntent.setAction(WidgetCommon.ACTION_ITEM_CLICK);
             clickIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
             clickIntent.setData(Uri.parse(clickIntent.toUri(Intent.URI_INTENT_SCHEME)));
             PendingIntent clickPendingIntent = PendingIntent.getBroadcast(context, 0, clickIntent, PendingIntent.FLAG_UPDATE_CURRENT);
@@ -145,22 +145,6 @@ public static void updateAppWidgets(Context context, AppWidgetManager appWidgetM
     public void onReceive(@NonNull Context context, @NonNull Intent intent) {
         String action = intent.getAction();
 
-        if (action.equals(WidgetCommon.APPWIDGET_UPDATE_FEED)) {
-            // get widget id
-            int widgetId = intent.getExtras().getInt(AppWidgetManager.EXTRA_APPWIDGET_ID);
-            // show loader and update data
-            WidgetCommon.showLoaderAndUpdate(context, widgetId, false);
-        }
-
-        if (action.equals(WidgetCommon.APPWIDGET_AUTO_UPDATE)) {
-            AppWidgetManager mgr = AppWidgetManager.getInstance(context);
-            int[] appWidgetIds = mgr.getAppWidgetIds(new ComponentName(context, StackWidgetProvider.class));
-            // perform full update, just to refresh views
-            onUpdate(context, mgr, appWidgetIds);
-            // show loader and update data
-            WidgetCommon.updateAllWidgets(context, appWidgetIds);
-        }
-
         if (action.equals(Intent.ACTION_MY_PACKAGE_REPLACED)) {
             AppWidgetManager mgr2 = AppWidgetManager.getInstance(context);
             int[] appWidgetIds = mgr2.getAppWidgetIds(new ComponentName(context, StackWidgetProvider.class));
diff --git a/reddinator/src/main/java/au/com/wallaceit/reddinator/service/WidgetCommon.java b/reddinator/src/main/java/au/com/wallaceit/reddinator/service/WidgetCommon.java
index e651dd7..b692d7b 100644
--- a/reddinator/src/main/java/au/com/wallaceit/reddinator/service/WidgetCommon.java
+++ b/reddinator/src/main/java/au/com/wallaceit/reddinator/service/WidgetCommon.java
@@ -33,20 +33,23 @@
 import android.view.View;
 import android.widget.RemoteViews;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 import au.com.wallaceit.reddinator.R;
 import au.com.wallaceit.reddinator.Reddinator;
 
 public class WidgetCommon {
 
-    static final String ITEM_CLICK = "ITEM_CLICK";
+    static final String ACTION_UPDATE_FEED = "wallaceit.redinator.action.APPWIDGET_UPDATE_FEED";
+    static final String ACTION_AUTO_UPDATE = "wallaceit.redinator.action.APPWIDGET_AUTO_UPDATE";
+    static final String ACTION_ITEM_CLICK = "wallaceit.redinator.action.APPWIDGET_ITEM_CLICK";
+
     static final String ITEM_CLICK_MODE = "ITEM_CLICK_MODE";
     static final int ITEM_CLICK_OPEN = 0;
     static final int ITEM_CLICK_UPVOTE = 1;
     static final int ITEM_CLICK_DOWNVOTE = 2;
     static final int ITEM_CLICK_OPTIONS = 3;
     static final int ITEM_CLICK_IMAGE = 4;
-    static final String APPWIDGET_UPDATE_FEED = "APPWIDGET_UPDATE_FEED";
-    static final String APPWIDGET_AUTO_UPDATE = "APPWIDGET_AUTO_UPDATE_FEED";
 
     static final Class WIDGET_CLASS_LIST = WidgetProvider.class;
     static final Class WIDGET_CLASS_STACK = StackWidgetProvider.class;
@@ -54,7 +57,7 @@ public class WidgetCommon {
     static Class getWidgetProviderClass(Context context, int appWidgetId){
         AppWidgetProviderInfo widgetInfo = AppWidgetManager.getInstance(context).getAppWidgetInfo(appWidgetId);
         if (widgetInfo!=null) {
-            String className = widgetInfo.provider.getShortClassName();
+            String className = widgetInfo.provider.getClassName();
             className = className.substring(className.lastIndexOf(".") + 1);
             if (className.equals(WIDGET_CLASS_LIST.getSimpleName())) {
                 return WIDGET_CLASS_LIST;
@@ -72,7 +75,8 @@ static int getWidgetLayoutId(Class providerClass){
         return R.layout.widget;
     }
 
-    static void updateAllWidgets(Context context, int[] widgetIds) {
+    static void updateAllWidgets(Context context) {
+        int[] widgetIds = getAllAppWidgetIds(context);
         for (int widgetId : widgetIds) {
             WidgetCommon.showLoaderAndUpdate(context, widgetId, false);
         }
@@ -139,31 +143,34 @@ public static void hideLoaderAndRefreshViews(Context context, int widgetId, bool
         mgr.partiallyUpdateAppWidget(widgetId, views);
     }
 
-    public static void setUpdateSchedule(Context context, boolean widgetsDisabled){
-        WidgetCommon.setUpdateSchedule(context, WidgetProvider.class, widgetsDisabled);
-        WidgetCommon.setUpdateSchedule(context, StackWidgetProvider.class, widgetsDisabled);
+    private static int[] getAllAppWidgetIds(Context context){
+        AppWidgetManager mgr = AppWidgetManager.getInstance(context);
+        int listIds[] = mgr.getAppWidgetIds(new ComponentName(context, WidgetProvider.class));
+        int stackIds[] = mgr.getAppWidgetIds(new ComponentName(context, StackWidgetProvider.class));
+        return ArrayUtils.addAll(listIds, stackIds);
     }
 
-    static void setUpdateSchedule(Context context, Class providerClass, boolean widgetsDisabled){
+    public static void setUpdateSchedule(Context context){
 
-        Intent intent = new Intent(context.getApplicationContext(), providerClass);
-        intent.setAction(WidgetCommon.APPWIDGET_AUTO_UPDATE);
+        Intent intent = new Intent(context, WidgetProvider.class);
+        intent.setAction(WidgetCommon.ACTION_AUTO_UPDATE);
         intent.setPackage(context.getPackageName());
         intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)));
-        PendingIntent updateIntent = PendingIntent.getBroadcast(context.getApplicationContext(), 0, intent, 0);
+        PendingIntent updateIntent = PendingIntent.getBroadcast(context.getApplicationContext(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         final AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
 
-        // If there are no widgets for the provider class, disable the alarm
-        int ids[] = AppWidgetManager.getInstance(context).getAppWidgetIds(new ComponentName(context, providerClass));
-        if (ids.length==0) {
+        int ids[] = getAllAppWidgetIds(context);
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        long refreshRate = Long.valueOf(prefs.getString(context.getString(R.string.refresh_rate_pref), "43200000"));
 
-            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-            int refreshRate = Integer.valueOf(prefs.getString(context.getString(R.string.refresh_rate_pref), "43200000"));
-            if (!widgetsDisabled && refreshRate > 0) {
-                alarmManager.setRepeating(AlarmManager.RTC, System.currentTimeMillis() + refreshRate, refreshRate, updateIntent);
-                return;
-            }
+        // If there are no widgets for the provider class, or refresh is disabled, cancel the alarm
+        if (ids.length > 0 && refreshRate > 0) {
+            long next = prefs.getLong("last_auto_refresh", 0) + refreshRate;
+            next = (next < System.currentTimeMillis() ? (System.currentTimeMillis()) : next);
+            alarmManager.setRepeating(AlarmManager.RTC, next, refreshRate, updateIntent);
+            return;
         }
+
         alarmManager.cancel(updateIntent); // auto update disabled or all widgets removed
     }
 
diff --git a/reddinator/src/main/java/au/com/wallaceit/reddinator/service/WidgetProvider.java b/reddinator/src/main/java/au/com/wallaceit/reddinator/service/WidgetProvider.java
index d45c862..2d81800 100644
--- a/reddinator/src/main/java/au/com/wallaceit/reddinator/service/WidgetProvider.java
+++ b/reddinator/src/main/java/au/com/wallaceit/reddinator/service/WidgetProvider.java
@@ -79,7 +79,7 @@ public static void updateAppWidgets(Context context, AppWidgetManager appWidgetM
 
             // REFRESH BUTTON
             Intent refreshIntent = new Intent(context, WidgetProvider.class);
-            refreshIntent.setAction(WidgetCommon.APPWIDGET_UPDATE_FEED);
+            refreshIntent.setAction(WidgetCommon.ACTION_UPDATE_FEED);
             refreshIntent.setPackage(context.getPackageName());
             refreshIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
             refreshIntent.setData(Uri.parse(refreshIntent.toUri(Intent.URI_INTENT_SCHEME)));
@@ -87,7 +87,7 @@ public static void updateAppWidgets(Context context, AppWidgetManager appWidgetM
 
             // ITEM CLICK
             Intent clickIntent = new Intent(context, WidgetProvider.class);
-            clickIntent.setAction(WidgetCommon.ITEM_CLICK);
+            clickIntent.setAction(WidgetCommon.ACTION_ITEM_CLICK);
             clickIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
             clickIntent.setData(Uri.parse(clickIntent.toUri(Intent.URI_INTENT_SCHEME)));
             PendingIntent clickPendingIntent = PendingIntent.getBroadcast(context, 0, clickIntent, PendingIntent.FLAG_UPDATE_CURRENT);
@@ -145,21 +145,6 @@ public static void updateAppWidgets(Context context, AppWidgetManager appWidgetM
     public void onReceive(@NonNull Context context, @NonNull Intent intent) {
         String action = intent.getAction();
 
-        if (action.equals(WidgetCommon.APPWIDGET_UPDATE_FEED)) {
-            // show loader and update data
-            int widgetid = intent.getExtras().getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
-            WidgetCommon.showLoaderAndUpdate(context, widgetid, false);
-        }
-
-        if (action.equals(WidgetCommon.APPWIDGET_AUTO_UPDATE)) {
-            AppWidgetManager mgr = AppWidgetManager.getInstance(context);
-            int[] appWidgetIds = mgr.getAppWidgetIds(new ComponentName(context, WidgetProvider.class));
-            // perform full update, just to refresh views
-            onUpdate(context, mgr, appWidgetIds);
-            // show loader and update data
-            WidgetCommon.updateAllWidgets(context, appWidgetIds);
-        }
-
         if (action.equals(Intent.ACTION_MY_PACKAGE_REPLACED)) {
             AppWidgetManager mgr2 = AppWidgetManager.getInstance(context);
             int[] appWidgetIds = mgr2.getAppWidgetIds(new ComponentName(context, WidgetProvider.class));
diff --git a/reddinator/src/main/java/au/com/wallaceit/reddinator/service/WidgetProviderBase.java b/reddinator/src/main/java/au/com/wallaceit/reddinator/service/WidgetProviderBase.java
index 08b323d..45bac2b 100644
--- a/reddinator/src/main/java/au/com/wallaceit/reddinator/service/WidgetProviderBase.java
+++ b/reddinator/src/main/java/au/com/wallaceit/reddinator/service/WidgetProviderBase.java
@@ -63,7 +63,7 @@ public void onDeleted(Context context, int[] appWidgetIds) {
     @Override
     public void onDisabled(Context context) {
         // cancel the alarm for automatic updates
-        WidgetCommon.setUpdateSchedule(context, WidgetProviderBase.class, true);
+        WidgetCommon.setUpdateSchedule(context);
         //System.out.println("onDisabled();");
         super.onDisabled(context);
     }
@@ -71,7 +71,7 @@ public void onDisabled(Context context) {
     @Override
     public void onEnabled(Context context) {
         // set the pending intent for automatic update
-        WidgetCommon.setUpdateSchedule(context, WidgetProviderBase.class, false);
+        WidgetCommon.setUpdateSchedule(context);
         // System.out.println("onEnabled();");
         super.onEnabled(context);
     }
@@ -80,84 +80,102 @@ public void onEnabled(Context context) {
     public void onReceive(@NonNull Context context, @NonNull Intent intent) {
         String action = intent.getAction();
 
-        if (action.equals(WidgetCommon.ITEM_CLICK)) {
+        switch (action) {
+            case WidgetCommon.ACTION_UPDATE_FEED:
+                // get widget id
+                int widgetId = intent.getExtras().getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
+                // show loader and update data
+                WidgetCommon.showLoaderAndUpdate(context, widgetId, false);
+                break;
+            case WidgetCommon.ACTION_ITEM_CLICK:
 
-            int widgetid = intent.getExtras().getInt(AppWidgetManager.EXTRA_APPWIDGET_ID);
-            // check if its the load more button being clicked
-            String redditId = intent.getExtras().getString(Reddinator.ITEM_ID);
-            if (redditId!=null && redditId.equals("0")) {
-                // LOAD MORE FEED ITEM CLICKED
-                //System.out.println("loading more feed items...");
-                WidgetCommon.showLoaderAndUpdate(context, widgetid, true);
-            } else {
-                int clickMode = intent.getExtras().getInt(WidgetCommon.ITEM_CLICK_MODE);
-                switch (clickMode) {
-                    // NORMAL FEED ITEM CLICK
-                    case WidgetCommon.ITEM_CLICK_OPEN:
-                        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                        String clickPrefString = prefs.getString(context.getString(R.string.on_click_pref), "1");
-                        int clickPref = Integer.valueOf(clickPrefString);
-                        switch (clickPref) {
-                            case 1:
-                                // open in the reddinator view
-                                Intent clickIntent1 = new Intent(context, ViewRedditActivity.class);
-                                clickIntent1.putExtras(intent.getExtras());
-                                clickIntent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                clickIntent1.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-                                context.startActivity(clickIntent1);
-                                break;
-                            case 2:
-                                // open link in browser
-                                String url = intent.getStringExtra(Reddinator.ITEM_URL);
-                                Intent clickIntent2 = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-                                clickIntent2.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                context.startActivity(clickIntent2);
-                                break;
-                            case 3:
-                                // open reddit comments page in browser
-                                String permalink = intent.getStringExtra(Reddinator.ITEM_PERMALINK);
-                                Intent clickIntent3 = new Intent(Intent.ACTION_VIEW, Uri.parse(Reddinator.REDDIT_BASE_URL + permalink));
-                                clickIntent3.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                context.startActivity(clickIntent3);
-                                break;
-                        }
-                        break;
-                    // upvote
-                    case WidgetCommon.ITEM_CLICK_UPVOTE:
-                        new WidgetVoteTask(
-                                context,
-                                widgetid,
-                                1,
-                                intent.getIntExtra(Reddinator.ITEM_FEED_POSITION, -1),
-                                intent.getStringExtra(Reddinator.ITEM_ID)
-                        ).execute();
-                        break;
-                    // downvote
-                    case WidgetCommon.ITEM_CLICK_DOWNVOTE:
-                        new WidgetVoteTask(
-                                context,
-                                widgetid,
-                                -1,
-                                intent.getIntExtra(Reddinator.ITEM_FEED_POSITION, -1),
-                                intent.getStringExtra(Reddinator.ITEM_ID)
-                        ).execute();
-                        break;
-                    // post options
-                    case WidgetCommon.ITEM_CLICK_OPTIONS:
-                        Intent ointent = new Intent(context, FeedItemDialogActivity.class);
-                        ointent.putExtras(intent.getExtras());
-                        ointent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-                        context.startActivity(ointent);
-                        break;
-                    // open image view
-                    case WidgetCommon.ITEM_CLICK_IMAGE:
-                        Intent imageintent = new Intent(context, ViewImageDialogActivity.class);
-                        imageintent.putExtras(intent.getExtras());
-                        imageintent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-                        context.startActivity(imageintent);
-                        break;
+                int widgetid = intent.getExtras().getInt(AppWidgetManager.EXTRA_APPWIDGET_ID);
+                // check if its the load more button being clicked
+                String redditId = intent.getExtras().getString(Reddinator.ITEM_ID);
+                if (redditId != null && redditId.equals("0")) {
+                    // LOAD MORE FEED ITEM CLICKED
+                    //System.out.println("loading more feed items...");
+                    WidgetCommon.showLoaderAndUpdate(context, widgetid, true);
+                } else {
+                    int clickMode = intent.getExtras().getInt(WidgetCommon.ITEM_CLICK_MODE);
+                    switch (clickMode) {
+                        // NORMAL FEED ITEM CLICK
+                        case WidgetCommon.ITEM_CLICK_OPEN:
+                            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+                            String clickPrefString = prefs.getString(context.getString(R.string.on_click_pref), "1");
+                            int clickPref = Integer.valueOf(clickPrefString);
+                            switch (clickPref) {
+                                case 1:
+                                    // open in the reddinator view
+                                    Intent clickIntent1 = new Intent(context, ViewRedditActivity.class);
+                                    clickIntent1.putExtras(intent.getExtras());
+                                    clickIntent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                    clickIntent1.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                                    context.startActivity(clickIntent1);
+                                    break;
+                                case 2:
+                                    // open link in browser
+                                    String url = intent.getStringExtra(Reddinator.ITEM_URL);
+                                    Intent clickIntent2 = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+                                    clickIntent2.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                    context.startActivity(clickIntent2);
+                                    break;
+                                case 3:
+                                    // open reddit comments page in browser
+                                    String permalink = intent.getStringExtra(Reddinator.ITEM_PERMALINK);
+                                    Intent clickIntent3 = new Intent(Intent.ACTION_VIEW, Uri.parse(Reddinator.REDDIT_BASE_URL + permalink));
+                                    clickIntent3.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                    context.startActivity(clickIntent3);
+                                    break;
+                            }
+                            break;
+                        // upvote
+                        case WidgetCommon.ITEM_CLICK_UPVOTE:
+                            new WidgetVoteTask(
+                                    context,
+                                    widgetid,
+                                    1,
+                                    intent.getIntExtra(Reddinator.ITEM_FEED_POSITION, -1),
+                                    intent.getStringExtra(Reddinator.ITEM_ID)
+                            ).execute();
+                            break;
+                        // downvote
+                        case WidgetCommon.ITEM_CLICK_DOWNVOTE:
+                            new WidgetVoteTask(
+                                    context,
+                                    widgetid,
+                                    -1,
+                                    intent.getIntExtra(Reddinator.ITEM_FEED_POSITION, -1),
+                                    intent.getStringExtra(Reddinator.ITEM_ID)
+                            ).execute();
+                            break;
+                        // post options
+                        case WidgetCommon.ITEM_CLICK_OPTIONS:
+                            Intent ointent = new Intent(context, FeedItemDialogActivity.class);
+                            ointent.putExtras(intent.getExtras());
+                            ointent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                            context.startActivity(ointent);
+                            break;
+                        // open image view
+                        case WidgetCommon.ITEM_CLICK_IMAGE:
+                            Intent imageintent = new Intent(context, ViewImageDialogActivity.class);
+                            imageintent.putExtras(intent.getExtras());
+                            imageintent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                            context.startActivity(imageintent);
+                            break;
+                    }
                 }
-            }
+                break;
+            case WidgetCommon.ACTION_AUTO_UPDATE:
+                //AppWidgetManager mgr = AppWidgetManager.getInstance(context);
+                //int[] appWidgetIds = mgr.getAppWidgetIds(new ComponentName(context, WidgetProvider.class));
+                System.out.println("WIDGET AUTO UPDATE!!!");
+                // perform full update, just to refresh views
+                //onUpdate(context, mgr, appWidgetIds);
+                // show loader and update data
+                WidgetCommon.updateAllWidgets(context);
+                PreferenceManager.getDefaultSharedPreferences(context).edit().putLong("last_auto_refresh", System.currentTimeMillis()).apply();
+                break;
         }
 
         //System.out.println("broadcast received: " + action);
diff --git a/reddinator/src/main/java/au/com/wallaceit/reddinator/ui/RWebView.java b/reddinator/src/main/java/au/com/wallaceit/reddinator/ui/RWebView.java
index 3b10208..f99aeef 100644
--- a/reddinator/src/main/java/au/com/wallaceit/reddinator/ui/RWebView.java
+++ b/reddinator/src/main/java/au/com/wallaceit/reddinator/ui/RWebView.java
@@ -192,14 +192,19 @@ private void doFileDownload(String url, String downloadLocation){
         DownloadManager mgr = (DownloadManager) getContext().getSystemService(Context.DOWNLOAD_SERVICE);
         Uri downloadUri = Uri.parse(url);
         String filename = appendImageExtensionIfNeeded(downloadUri.getLastPathSegment());
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+
         DownloadManager.Request request = new DownloadManager.Request(downloadUri);
         request.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI | DownloadManager.Request.NETWORK_MOBILE)
-                .setAllowedOverRoaming(false)
-                .setTitle(filename)
-                .setDescription("Reddinator image download")
-                .setVisibleInDownloadsUi(true)
-                .setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-                .setDestinationInExternalPublicDir(downloadLocation.replace(Environment.getExternalStorageDirectory().getAbsolutePath(), ""), filename);
+            .setAllowedOverRoaming(false)
+            .setTitle(filename)
+            .setDescription("Reddinator download")
+            .setVisibleInDownloadsUi(prefs.getBoolean("download_nativeui", true))
+            .setDestinationInExternalPublicDir(downloadLocation.replace(Environment.getExternalStorageDirectory().getAbsolutePath(), ""), filename);
+
+        if (prefs.getBoolean("download_notify_complete", true))
+            request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+
         mgr.enqueue(request);
     }
 
diff --git a/reddinator/src/main/res/values-es/strings.xml b/reddinator/src/main/res/values-es/strings.xml
index 52dd6e7..7056424 100644
--- a/reddinator/src/main/res/values-es/strings.xml
+++ b/reddinator/src/main/res/values-es/strings.xml
@@ -329,4 +329,8 @@
     <string name="sync_data">Sincronizar datos</string>
     <string name="sync_data_summary">Refrescar subreddits, multis y filtros</string>
     <string name="updating_filter">Actualización del filtro</string>
+    <string name="download_nativeui_summary">Mostrar completado en la aplicación \"descargas\"</string>
+    <string name="download_nativeui_title">Mostrar Descargas</string>
+    <string name="download_notify_complete_summary">Mostrar notificación para las descargas completadas</string>
+    <string name="download_notify_complete_title">Notificación completada</string>
 </resources>
\ No newline at end of file
diff --git a/reddinator/src/main/res/values/strings.xml b/reddinator/src/main/res/values/strings.xml
index e248a6b..69d7fca 100644
--- a/reddinator/src/main/res/values/strings.xml
+++ b/reddinator/src/main/res/values/strings.xml
@@ -388,4 +388,8 @@
     <string name="sync_data">Sync Data</string>
     <string name="sync_data_summary"><![CDATA[Refresh subreddits, multis & filters]]></string>
     <string name="subscribed">Subscribed</string>
+    <string name="download_nativeui_title">Show In Downloads</string>
+    <string name="download_nativeui_summary">Show completed in the \"downloads\" app</string>
+    <string name="download_notify_complete_title">Completed Notification</string>
+    <string name="download_notify_complete_summary">Show notification for completed downloads</string>
 </resources>
\ No newline at end of file
diff --git a/reddinator/src/main/res/xml/changelog_master.xml b/reddinator/src/main/res/xml/changelog_master.xml
index 9b46b3d..123b904 100644
--- a/reddinator/src/main/res/xml/changelog_master.xml
+++ b/reddinator/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="3.21.1" versioncode="61">
+        <change>Added additional download preferences.</change>
+        <change>Fixed issue with auto refresh alarm manager cancelling.</change>
+        <change>Utility; volume down on preference screen shows last widget auto-refresh time.</change>
+        <change>Fixed bug causing first comment posted in an empty thread not to show.</change>
+    </release>
     <release version="3.21.0" versioncode="60">
         <change>Added integration with reddits new /r/all filter.</change>
         <change>Added background sync of subs, multis &amp; filters. Triggered daily when subreddit selection activity is opened.</change>
diff --git a/reddinator/src/main/res/xml/preferences.xml b/reddinator/src/main/res/xml/preferences.xml
index 3eb7773..29bce6a 100644
--- a/reddinator/src/main/res/xml/preferences.xml
+++ b/reddinator/src/main/res/xml/preferences.xml
@@ -177,7 +177,17 @@
             android:dialogTitle="@string/reddit_content_font_pref_title" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="Miscellaneous">
+    <PreferenceCategory android:title="Downloads">
+        <CheckBoxPreference
+            android:key="download_nativeui"
+            android:title="@string/download_nativeui_title"
+            android:defaultValue="true"
+            android:summary="@string/download_nativeui_summary" />
+        <CheckBoxPreference
+            android:key="download_notify_complete"
+            android:title="@string/download_notify_complete_title"
+            android:defaultValue="true"
+            android:summary="@string/download_notify_complete_summary" />
         <CheckBoxPreference
             android:key="download_ask_pref"
             android:title="@string/download_ask_pref_title"