diff --git a/dist/bundle.es.js b/dist/bundle.es.js
index daeb4c4..d064928 100644
--- a/dist/bundle.es.js
+++ b/dist/bundle.es.js
@@ -665,6 +665,7 @@ const THEME = 'theme';
 const THEMES = 'themes';
 const AUTOMATIC_DARK_MODE_ENABLED = 'automatic_dark_mode_enabled';
 const AUTOPLAY = 'autoplay';
+const AUTOPLAY_NEXT = 'autoplay_next';
 const OS_NOTIFICATIONS_ENABLED = 'os_notifications_enabled';
 const AUTO_DOWNLOAD = 'auto_download';
 const AUTO_LAUNCH = 'auto_launch';
@@ -702,6 +703,7 @@ var settings = /*#__PURE__*/Object.freeze({
   THEMES: THEMES,
   AUTOMATIC_DARK_MODE_ENABLED: AUTOMATIC_DARK_MODE_ENABLED,
   AUTOPLAY: AUTOPLAY,
+  AUTOPLAY_NEXT: AUTOPLAY_NEXT,
   OS_NOTIFICATIONS_ENABLED: OS_NOTIFICATIONS_ENABLED,
   AUTO_DOWNLOAD: AUTO_DOWNLOAD,
   AUTO_LAUNCH: AUTO_LAUNCH,
@@ -959,12 +961,19 @@ var daemon_settings = /*#__PURE__*/Object.freeze({
  * See redux/settings/actions in the app for where this is used.
  */
 
-const WALLET_SERVERS = LBRYUM_SERVERS;
-const SHARE_USAGE_DATA$1 = SHARE_USAGE_DATA;
+// DAEMON
+const SDK_SYNC_KEYS = [LBRYUM_SERVERS, SHARE_USAGE_DATA];
+
+// CLIENT
+const CLIENT_SYNC_KEYS = [SHOW_MATURE, HIDE_REPOSTS, SHOW_ANONYMOUS, INSTANT_PURCHASE_ENABLED, INSTANT_PURCHASE_MAX, THEME, THEMES, AUTOPLAY, HIDE_BALANCE, HIDE_SPLASH_ANIMATION, FLOATING_PLAYER, DARK_MODE_TIMES, AUTOMATIC_DARK_MODE_ENABLED];
+
+/*
+
+ */
 
 var shared_preferences = /*#__PURE__*/Object.freeze({
-  WALLET_SERVERS: WALLET_SERVERS,
-  SHARE_USAGE_DATA: SHARE_USAGE_DATA$1
+  SDK_SYNC_KEYS: SDK_SYNC_KEYS,
+  CLIENT_SYNC_KEYS: CLIENT_SYNC_KEYS
 });
 
 const SEARCH_TYPES = {
diff --git a/src/constants/settings.js b/src/constants/settings.js
index 6d10806..75df8e1 100644
--- a/src/constants/settings.js
+++ b/src/constants/settings.js
@@ -18,6 +18,7 @@ export const THEME = 'theme';
 export const THEMES = 'themes';
 export const AUTOMATIC_DARK_MODE_ENABLED = 'automatic_dark_mode_enabled';
 export const AUTOPLAY = 'autoplay';
+export const AUTOPLAY_NEXT = 'autoplay_next';
 export const OS_NOTIFICATIONS_ENABLED = 'os_notifications_enabled';
 export const AUTO_DOWNLOAD = 'auto_download';
 export const AUTO_LAUNCH = 'auto_launch';
diff --git a/src/constants/shared_preferences.js b/src/constants/shared_preferences.js
index 58bee93..1c28aff 100644
--- a/src/constants/shared_preferences.js
+++ b/src/constants/shared_preferences.js
@@ -8,6 +8,28 @@
  */
 
 import * as DAEMON_SETTINGS from './daemon_settings';
+import * as SETTINGS from './settings';
 
-export const WALLET_SERVERS = DAEMON_SETTINGS.LBRYUM_SERVERS;
-export const SHARE_USAGE_DATA = DAEMON_SETTINGS.SHARE_USAGE_DATA;
+// DAEMON
+export const SDK_SYNC_KEYS = [DAEMON_SETTINGS.LBRYUM_SERVERS, DAEMON_SETTINGS.SHARE_USAGE_DATA];
+
+// CLIENT
+export const CLIENT_SYNC_KEYS = [
+  SETTINGS.SHOW_MATURE,
+  SETTINGS.HIDE_REPOSTS,
+  SETTINGS.SHOW_ANONYMOUS,
+  SETTINGS.INSTANT_PURCHASE_ENABLED,
+  SETTINGS.INSTANT_PURCHASE_MAX,
+  SETTINGS.THEME,
+  SETTINGS.THEMES,
+  SETTINGS.AUTOPLAY,
+  SETTINGS.HIDE_BALANCE,
+  SETTINGS.HIDE_SPLASH_ANIMATION,
+  SETTINGS.FLOATING_PLAYER,
+  SETTINGS.DARK_MODE_TIMES,
+  SETTINGS.AUTOMATIC_DARK_MODE_ENABLED,
+];
+
+/*
+
+ */