diff --git a/README.md b/README.md
index 3b45d5a2..6509dd08 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ A mod of the Twitch Android Mobile<sup><a href="#no-tv">1</a></sup> App adding B
 
 # Build it yourself
 
-> This patch is meant to be applied to version **17.9.0** of the official twitch app
+> This patch is meant to be applied to version **18.0.0** of the official twitch app
 > Make sure you use this version before you create an issue!
 
 ## Easy way: Docker
@@ -128,7 +128,7 @@ Made with ♥️ by [@FoseFx](https://github.com/FoseFx) and contributors. MIT L
 [license-badge]: https://img.shields.io/github/license/bttv-android/bttv?style=flat-square
 [license-file]: ./LICENSE
 [bttv-version]: https://img.shields.io/github/v/release/bttv-android/bttv?style=flat-square
-[base-version]: https://img.shields.io/badge/build%20on-v17.9.0-blueviolet?style=flat-square
+[base-version]: https://img.shields.io/badge/build%20on-v18.0.0-blueviolet?style=flat-square
 [downloads-latest]: https://img.shields.io/github/downloads/bttv-android/bttv/latest/total?color=yellow&style=flat-square
 [downloads-total]: https://img.shields.io/github/downloads/bttv-android/bttv/total?color=yellowgreen&label=downloads%20total&style=flat-square
 [latest-release]: https://github.com/bttv-android/bttv/releases/latest
diff --git a/patches/AndroidManifest.xml.patch b/patches/AndroidManifest.xml.patch
index 7d207a92..0cb4cc1a 100644
--- a/patches/AndroidManifest.xml.patch
+++ b/patches/AndroidManifest.xml.patch
@@ -65,10 +65,10 @@ diff --git a/AndroidManifest.xml b/AndroidManifest.xml
          <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
          <uses-library android:name="androidx.window.extensions" android:required="false"/>
          <uses-library android:name="androidx.window.sidecar" android:required="false"/>
-@@ -353,5 +365,18 @@
-                 <action android:name="com.amazon.dcp.sso.action.session.users.changed"/>
+@@ -354,5 +366,18 @@
              </intent-filter>
          </receiver>
+         <service android:exported="true" android:name="com.amazonaws.ivs.player.AnalyticsService" android:permission="android.permission.BIND_JOB_SERVICE"/>
 +        <activity android:name="bttv.updater.UpdaterActivity" />
 +        <provider
 +            android:name="androidx.core.content.FileProvider"
diff --git a/patches/anonchat/tv.twitch.android.shared.chat.ChatViewPresenter.smali.patch b/patches/anonchat/tv.twitch.android.shared.chat.ChatViewPresenter.smali.patch
index ad18a969..e5e34ae5 100644
--- a/patches/anonchat/tv.twitch.android.shared.chat.ChatViewPresenter.smali.patch
+++ b/patches/anonchat/tv.twitch.android.shared.chat.ChatViewPresenter.smali.patch
@@ -19,7 +19,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/chat/ChatViewPresenter.smal
  
  .field private final chatDialogRouter:Ltv/twitch/android/shared/chat/pub/ChatDialogRouter;
  
-@@ -1561,6 +1561,10 @@
+@@ -1563,6 +1563,10 @@
  
      iput-object v1, v0, Ltv/twitch/android/shared/chat/ChatViewPresenter;->messageInputListener:Ltv/twitch/android/shared/chat/ChatViewPresenter$messageInputListener$1;
  
@@ -30,7 +30,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/chat/ChatViewPresenter.smal
      return-void
  .end method
  
-@@ -2153,6 +2157,13 @@
+@@ -2173,6 +2177,13 @@
      :cond_0
      return-void
  .end method
diff --git a/patches/anonchat/tv.twitch.android.shared.chat.observables.ChatConnectionController.smali.patch b/patches/anonchat/tv.twitch.android.shared.chat.observables.ChatConnectionController.smali.patch
index 0bf6c2d3..9413a177 100644
--- a/patches/anonchat/tv.twitch.android.shared.chat.observables.ChatConnectionController.smali.patch
+++ b/patches/anonchat/tv.twitch.android.shared.chat.observables.ChatConnectionController.smali.patch
@@ -1,7 +1,7 @@
 diff --git a/smali_classes6/tv/twitch/android/shared/chat/observables/ChatConnectionController.smali b/smali_classes6/tv/twitch/android/shared/chat/observables/ChatConnectionController.smali
 --- a/smali_classes6/tv/twitch/android/shared/chat/observables/ChatConnectionController.smali
 +++ b/smali_classes6/tv/twitch/android/shared/chat/observables/ChatConnectionController.smali
-@@ -267,7 +267,7 @@
+@@ -279,7 +279,7 @@
  
  .field private viewer:Ltv/twitch/android/models/UserModel;
  
@@ -10,7 +10,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/chat/observables/ChatConnec
  
  
  # direct methods
-@@ -1374,6 +1374,11 @@
+@@ -1438,6 +1438,11 @@
  
      iget v1, p0, Ltv/twitch/android/shared/chat/observables/ChatConnectionController;->viewerId:I
  
@@ -22,7 +22,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/chat/observables/ChatConnec
      iget-object v2, p0, Ltv/twitch/android/shared/chat/observables/ChatConnectionController;->screenName:Ljava/lang/String;
  
      invoke-virtual {v0, v1, p1, v2}, Ltv/twitch/android/sdk/ChatController;->connect(IILjava/lang/String;)V
-@@ -1716,6 +1721,14 @@
+@@ -2104,6 +2109,14 @@
      return-object v0
  .end method
  
diff --git a/patches/bits/tv.twitch.android.shared.bits.BitsSpendingPresenter$maybeShowBuyBitsButton$1$2.smali.patch b/patches/bits/tv.twitch.android.shared.bits.BitsSpendingPresenter$maybeShowBuyBitsButton$1$2.smali.patch
index 864391c4..a06836f4 100644
--- a/patches/bits/tv.twitch.android.shared.bits.BitsSpendingPresenter$maybeShowBuyBitsButton$1$2.smali.patch
+++ b/patches/bits/tv.twitch.android.shared.bits.BitsSpendingPresenter$maybeShowBuyBitsButton$1$2.smali.patch
@@ -2,7 +2,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/bits/BitsSpendingPresenter$
 --- a/smali_classes6/tv/twitch/android/shared/bits/BitsSpendingPresenter$maybeShowBuyBitsButton$1$2.smali
 +++ b/smali_classes6/tv/twitch/android/shared/bits/BitsSpendingPresenter$maybeShowBuyBitsButton$1$2.smali
 @@ -67,6 +67,12 @@
-     .line 537
+     .line 516
      iget-object v0, p0, Ltv/twitch/android/shared/bits/BitsSpendingPresenter$maybeShowBuyBitsButton$1$2;->this$0:Ltv/twitch/android/shared/bits/BitsSpendingPresenter;
  
 +    # BTTV
diff --git a/patches/bits/tv.twitch.android.shared.bits.BitsSpendingPresenter.smali.patch b/patches/bits/tv.twitch.android.shared.bits.BitsSpendingPresenter.smali.patch
index 8473f14e..6a2431f6 100644
--- a/patches/bits/tv.twitch.android.shared.bits.BitsSpendingPresenter.smali.patch
+++ b/patches/bits/tv.twitch.android.shared.bits.BitsSpendingPresenter.smali.patch
@@ -10,7 +10,7 @@ diff --git a/smali_classes6/tv/twitch/android/shared/bits/BitsSpendingPresenter.
  
  .field private final availabilityTracker:Ltv/twitch/android/shared/analytics/availability/AvailabilityTracker;
  
-@@ -1105,7 +1105,9 @@
+@@ -933,7 +933,9 @@
  
      const/4 v1, 0x1
  
diff --git a/patches/emotes/tv.twitch.android.shared.chat.messagefactory.ChatMessageFactory.smali.patch b/patches/emotes/tv.twitch.android.shared.chat.messagefactory.ChatMessageFactory.smali.patch
index ac1aca3f..2ed3c602 100644
--- a/patches/emotes/tv.twitch.android.shared.chat.messagefactory.ChatMessageFactory.smali.patch
+++ b/patches/emotes/tv.twitch.android.shared.chat.messagefactory.ChatMessageFactory.smali.patch
@@ -1,7 +1,7 @@
 diff --git a/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageFactory.smali b/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageFactory.smali
 --- a/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageFactory.smali
 +++ b/smali_classes6/tv/twitch/android/shared/chat/messagefactory/ChatMessageFactory.smali
-@@ -1338,6 +1338,19 @@
+@@ -1496,6 +1496,19 @@
  
      invoke-static {v14, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
  
diff --git a/patches/emotes/tv.twitch.android.shared.chat.messagefactory.SubNoticeChatMessageFactory.smali.patch b/patches/emotes/tv.twitch.android.shared.chat.messagefactory.SubNoticeChatMessageFactory.smali.patch
index 5226aaac..e9a1541d 100644
--- a/patches/emotes/tv.twitch.android.shared.chat.messagefactory.SubNoticeChatMessageFactory.smali.patch
+++ b/patches/emotes/tv.twitch.android.shared.chat.messagefactory.SubNoticeChatMessageFactory.smali.patch
@@ -1,8 +1,8 @@
 diff --git a/smali_classes6/tv/twitch/android/shared/chat/messagefactory/SubNoticeChatMessageFactory.smali b/smali_classes6/tv/twitch/android/shared/chat/messagefactory/SubNoticeChatMessageFactory.smali
 --- a/smali_classes6/tv/twitch/android/shared/chat/messagefactory/SubNoticeChatMessageFactory.smali
 +++ b/smali_classes6/tv/twitch/android/shared/chat/messagefactory/SubNoticeChatMessageFactory.smali
-@@ -318,6 +318,11 @@
-     .line 62
+@@ -470,6 +470,11 @@
+     .line 65
      iget-object v4, v1, Ltv/twitch/chat/ChatSubscriptionNotice;->userMessage:Ltv/twitch/chat/ChatMessageInfo;
  
 +    # BTTV
diff --git a/patches/res.values.ids.xml.patch b/patches/res.values.ids.xml.patch
index 0c7cb3c5..7618842a 100644
--- a/patches/res.values.ids.xml.patch
+++ b/patches/res.values.ids.xml.patch
@@ -1,7 +1,7 @@
 diff --git a/res/values/ids.xml b/res/values/ids.xml
 --- a/res/values/ids.xml
 +++ b/res/values/ids.xml
-@@ -4618,4 +4618,8 @@
+@@ -4606,4 +4606,8 @@
      <item type="id" name="wrapper_states" />
      <item type="id" name="ximg" />
      <item type="id" name="year_published" />
diff --git a/patches/res.values.public.xml.patch b/patches/res.values.public.xml.patch
index 0661bbd0..4f5d7ec9 100644
--- a/patches/res.values.public.xml.patch
+++ b/patches/res.values.public.xml.patch
@@ -1,103 +1,103 @@
 diff --git a/res/values/public.xml b/res/values/public.xml
 --- a/res/values/public.xml
 +++ b/res/values/public.xml
-@@ -20041,4 +20041,98 @@
+@@ -20043,4 +20043,98 @@
      <public type="xml" name="file_paths" id="0x7f170002" />
      <public type="xml" name="image_share_filepaths" id="0x7f170003" />
      <public type="xml" name="splits0" id="0x7f170004" />
 +    <!-- BTTV -->
 +    <!-- generate ids using `build-companion ids <path/to/this/file>` -->
 +    <!-- spacing must be exact, so just c&p a line and change name and type -->
-+    <public type="id" name="bttv_updater_activity_title" id="0x7f0b138c" />
-+    <public type="id" name="bttv_updater_activity_body" id="0x7f0b138d" />
-+    <public type="id" name="bttv_updater_activity_pb" id="0x7f0b138e" />
-+    <public type="id" name="bttv_sleep_timer_button" id="0x7f0b138f" />
-+    <public type="id" name="bttv_highlight_dia_list" id="0x7f0b1390" />
-+    <public type="id" name="bttv_highlight_dia_input" id="0x7f0b1391" />
-+    <public type="id" name="bttv_highlight_dia_input_wrap" id="0x7f0b1392" />
-+    <public type="id" name="bttv_highlight_submit_btn" id="0x7f0b1393" />
-+    <public type="id" name="bttv_highlight_dia_title" id="0x7f0b1394" />
-+    <public type="id" name="bttv_highlight_dia_list_text" id="0x7f0b1395" />
-+    <public type="id" name="bttv_highlight_dia_list_btn" id="0x7f0b1396" />
-+    <public type="id" name="bttv_highlight_dia_list_empty" id="0x7f0b1397" />
-+    <public type="id" name="bttv_credits_into_tv" id="0x7f0b1398" />
-+    <public type="id" name="bttv_stream_settings_enable_bttv_emotes_toggle" id="0x7f0b1399" />
-+    <public type="id" name="bttv_stream_settings_gif_mode_spinner" id="0x7f0b139a" />
-+    <public type="id" name="bttv_stream_settings_enable_ffz_emotes_toggle" id="0x7f0b139b" />
-+    <public type="id" name="bttv_stream_settings_enable_7TV_emotes_toggle" id="0x7f0b139c" />
-+    <public type="id" name="bttv_stream_settings_enable_auto_redeem_toggle" id="0x7f0b139d" />
-+    <public type="id" name="bttv_stream_settings_enable_show_deleted_messages_toggle" id="0x7f0b139e" />
-+    <public type="id" name="bttv_stream_settings_open_highlight_button" id="0x7f0b139f" />
-+    <public type="id" name="bttv_stream_settings_open_highlight_button_primary" id="0x7f0b13a0" />
-+    <public type="id" name="bttv_stream_settings_open_highlight_button_secondary" id="0x7f0b13a1" />
-+    <public type="id" name="bttv_chat_settings_bs_title" id="0x7f0b13a2" />
-+    <public type="id" name="bttv_chat_settings_bs_container" id="0x7f0b13a3" />
-+    <public type="id" name="bttv_stream_settings_open_blacklist_button" id="0x7f0b13a4" />
-+    <public type="id" name="bttv_stream_settings_open_blacklist_button_primary" id="0x7f0b13a5" />
-+    <public type="id" name="bttv_stream_settings_open_blacklist_button_secondary" id="0x7f0b13a6" />
-+    <public type="layout" name="bttv_highlight_dialog" id="0x7f0e04e0" />
-+    <public type="layout" name="bttv_highlight_list_view" id="0x7f0e04e1" />
-+    <public type="layout" name="bttv_updater_activity" id="0x7f0e04e2" />
-+    <public type="layout" name="bttv_credits_dialog" id="0x7f0e04e3" />
++    <public type="id" name="bttv_updater_activity_title" id="0x7f0b1380" />
++    <public type="id" name="bttv_updater_activity_body" id="0x7f0b1381" />
++    <public type="id" name="bttv_updater_activity_pb" id="0x7f0b1382" />
++    <public type="id" name="bttv_sleep_timer_button" id="0x7f0b1383" />
++    <public type="id" name="bttv_highlight_dia_list" id="0x7f0b1384" />
++    <public type="id" name="bttv_highlight_dia_input" id="0x7f0b1385" />
++    <public type="id" name="bttv_highlight_dia_input_wrap" id="0x7f0b1386" />
++    <public type="id" name="bttv_highlight_submit_btn" id="0x7f0b1387" />
++    <public type="id" name="bttv_highlight_dia_title" id="0x7f0b1388" />
++    <public type="id" name="bttv_highlight_dia_list_text" id="0x7f0b1389" />
++    <public type="id" name="bttv_highlight_dia_list_btn" id="0x7f0b138a" />
++    <public type="id" name="bttv_highlight_dia_list_empty" id="0x7f0b138b" />
++    <public type="id" name="bttv_credits_into_tv" id="0x7f0b138c" />
++    <public type="id" name="bttv_stream_settings_enable_bttv_emotes_toggle" id="0x7f0b138d" />
++    <public type="id" name="bttv_stream_settings_gif_mode_spinner" id="0x7f0b138e" />
++    <public type="id" name="bttv_stream_settings_enable_ffz_emotes_toggle" id="0x7f0b138f" />
++    <public type="id" name="bttv_stream_settings_enable_7TV_emotes_toggle" id="0x7f0b1390" />
++    <public type="id" name="bttv_stream_settings_enable_auto_redeem_toggle" id="0x7f0b1391" />
++    <public type="id" name="bttv_stream_settings_enable_show_deleted_messages_toggle" id="0x7f0b1392" />
++    <public type="id" name="bttv_stream_settings_open_highlight_button" id="0x7f0b1393" />
++    <public type="id" name="bttv_stream_settings_open_highlight_button_primary" id="0x7f0b1394" />
++    <public type="id" name="bttv_stream_settings_open_highlight_button_secondary" id="0x7f0b1395" />
++    <public type="id" name="bttv_chat_settings_bs_title" id="0x7f0b1396" />
++    <public type="id" name="bttv_chat_settings_bs_container" id="0x7f0b1397" />
++    <public type="id" name="bttv_stream_settings_open_blacklist_button" id="0x7f0b1398" />
++    <public type="id" name="bttv_stream_settings_open_blacklist_button_primary" id="0x7f0b1399" />
++    <public type="id" name="bttv_stream_settings_open_blacklist_button_secondary" id="0x7f0b139a" />
++    <public type="layout" name="bttv_highlight_dialog" id="0x7f0e04e2" />
++    <public type="layout" name="bttv_highlight_list_view" id="0x7f0e04e3" />
++    <public type="layout" name="bttv_updater_activity" id="0x7f0e04e4" />
++    <public type="layout" name="bttv_credits_dialog" id="0x7f0e04e5" />
 +    <public type="color" name="bttv_mega" id="0x7f0605e1" />
 +    <public type="color" name="bttv_sonic" id="0x7f0605e2" />
-+    <public type="string" name="bttv_app_update_available_cta" id="0x7f1412b2" />
-+    <public type="string" name="bttv_app_update_available" id="0x7f1412b3" />
-+    <public type="string" name="bttv_emote_picker_global_bttv" id="0x7f1412b4" />
-+    <public type="string" name="bttv_emote_picker_channel_bttv" id="0x7f1412b5" />
-+    <public type="string" name="bttv_emote_picker_global_ffz" id="0x7f1412b6" />
-+    <public type="string" name="bttv_emote_picker_channel_ffz" id="0x7f1412b7" />
-+    <public type="string" name="bttv_emote_picker_global_7tv" id="0x7f1412b8" />
-+    <public type="string" name="bttv_emote_picker_channel_7tv" id="0x7f1412b9" />
-+    <public type="string" name="bttv_sleep_timer_button_descr" id="0x7f1412ba" />
-+    <public type="string" name="bttv_sleep_timer_select_dialog_title" id="0x7f1412bb" />
-+    <public type="string" name="bttv_sleep_timer_cancel_dialog_title" id="0x7f1412bc" />
-+    <public type="string" name="bttv_sleep_timer_cancel_dialog_message" id="0x7f1412bd" />
-+    <public type="string" name="bttv_emote_added_by_bttv" id="0x7f1412be" />
-+    <public type="string" name="bttv_emote_added_by_bttv_ffz" id="0x7f1412bf" />
-+    <public type="string" name="bttv_emote_added_by_bttv_stv" id="0x7f1412c0" />
-+    <public type="string" name="bttv_updater_downloading" id="0x7f1412c1" />
-+    <public type="string" name="bttv_updater_downloading_version" id="0x7f1412c2" />
-+    <public type="string" name="bttv_updater_notice" id="0x7f1412c3" />
-+    <public type="string" name="bttv_updater_manual_update_start_toast" id="0x7f1412c4" />
-+    <public type="string" name="bttv_updater_manual_update_no_update_toast" id="0x7f1412c5" />
-+    <public type="string" name="bttv_updater_manual_update_update_toast" id="0x7f1412c6" />
-+    <public type="string" name="bttv_updater_manual_update_error_toast" id="0x7f1412c7" />
-+    <public type="string" name="bttv_settings_open_highlights_dia_primary" id="0x7f1412c8" />
-+    <public type="string" name="bttv_settings_open_highlights_dia_secondary" id="0x7f1412c9" />
-+    <public type="string" name="bttv_settings_highlights_dia_input_hint" id="0x7f1412ca" />
-+    <public type="string" name="bttv_settings_highlights_dia_title" id="0x7f1412cb" />
-+    <public type="string" name="bttv_settings_gif_render_mode_title" id="0x7f1412cc" />
-+    <public type="string" name="bttv_settings_gif_render_mode_animate" id="0x7f1412cd" />
-+    <public type="string" name="bttv_settings_gif_render_mode_static" id="0x7f1412ce" />
-+    <public type="string" name="bttv_settings_gif_render_mode_disabled" id="0x7f1412cf" />
-+    <public type="string" name="bttv_settings_gif_render_mode_animate_forever" id="0x7f1412d0" />
-+    <public type="string" name="bttv_settings_gif_render_mode_descr" id="0x7f1412d1" />
-+    <public type="string" name="bttv_settings_open_credits_button_title" id="0x7f1412d2" />
-+    <public type="string" name="bttv_settings_enable_show_deleted_messages" id="0x7f1412d3" />
-+    <public type="string" name="bttv_settings_enable_split_chat" id="0x7f1412d4" />
-+    <public type="string" name="bttv_settings_enable_split_chat_descr" id="0x7f1412d5" />
-+    <public type="string" name="bttv_settings_enable_anon_chat_primary" id="0x7f1412d6" />
-+    <public type="string" name="bttv_settings_enable_anon_chat_secondary" id="0x7f1412d7" />
-+    <public type="string" name="bttv_settings_enable_dev_tools" id="0x7f1412d8" />
-+    <public type="string" name="bttv_settings_enable_dev_tools_secondary" id="0x7f1412d9" />
-+    <public type="string" name="bttv_settings_open_blacklist_dia_primary" id="0x7f1412da" />
-+    <public type="string" name="bttv_settings_open_blacklist_dia_secondary" id="0x7f1412db" />
-+    <public type="string" name="bttv_settings_blacklist_dia_title" id="0x7f1412dc" />
-+    <public type="string" name="bttv_auto_update_checks_enabled" id="0x7f1412dd" />
-+    <public type="string" name="bttv_auto_update_checks_enabled_secondary" id="0x7f1412de" />
-+    <public type="string" name="bttv_settings_invoke_update_check" id="0x7f1412df" />
-+    <public type="string" name="bttv_credits_title" id="0x7f1412e0" />
-+    <public type="string" name="bttv_credits_intro" id="0x7f1412e1" />
-+    <public type="string" name="bttv_credits_bugs" id="0x7f1412e2" />
-+    <public type="string" name="bttv_credits_ideas" id="0x7f1412e3" />
-+    <public type="string" name="bttv_credits_translations" id="0x7f1412e4" />
-+    <public type="string" name="bttv_credits_docs" id="0x7f1412e5" />
-+    <public type="string" name="bttv_highlight_dia_list_empty" id="0x7f1412e6" />
-+    <public type="string" name="bttv_highlight_user_notice" id="0x7f1412e7" />
-+    <public type="string" name="bttv_watchparty_twitch_missing" id="0x7f1412e8" />
-+    <public type="string" name="bttv_removed_by_mod" id="0x7f1412e9" />
-+    <public type="drawable" name="bttv_ic_bedtime" id="0x7f080895" />
++    <public type="string" name="bttv_app_update_available_cta" id="0x7f1412bd" />
++    <public type="string" name="bttv_app_update_available" id="0x7f1412be" />
++    <public type="string" name="bttv_emote_picker_global_bttv" id="0x7f1412bf" />
++    <public type="string" name="bttv_emote_picker_channel_bttv" id="0x7f1412c0" />
++    <public type="string" name="bttv_emote_picker_global_ffz" id="0x7f1412c1" />
++    <public type="string" name="bttv_emote_picker_channel_ffz" id="0x7f1412c2" />
++    <public type="string" name="bttv_emote_picker_global_7tv" id="0x7f1412c3" />
++    <public type="string" name="bttv_emote_picker_channel_7tv" id="0x7f1412c4" />
++    <public type="string" name="bttv_sleep_timer_button_descr" id="0x7f1412c5" />
++    <public type="string" name="bttv_sleep_timer_select_dialog_title" id="0x7f1412c6" />
++    <public type="string" name="bttv_sleep_timer_cancel_dialog_title" id="0x7f1412c7" />
++    <public type="string" name="bttv_sleep_timer_cancel_dialog_message" id="0x7f1412c8" />
++    <public type="string" name="bttv_emote_added_by_bttv" id="0x7f1412c9" />
++    <public type="string" name="bttv_emote_added_by_bttv_ffz" id="0x7f1412ca" />
++    <public type="string" name="bttv_emote_added_by_bttv_stv" id="0x7f1412cb" />
++    <public type="string" name="bttv_updater_downloading" id="0x7f1412cc" />
++    <public type="string" name="bttv_updater_downloading_version" id="0x7f1412cd" />
++    <public type="string" name="bttv_updater_notice" id="0x7f1412ce" />
++    <public type="string" name="bttv_updater_manual_update_start_toast" id="0x7f1412cf" />
++    <public type="string" name="bttv_updater_manual_update_no_update_toast" id="0x7f1412d0" />
++    <public type="string" name="bttv_updater_manual_update_update_toast" id="0x7f1412d1" />
++    <public type="string" name="bttv_updater_manual_update_error_toast" id="0x7f1412d2" />
++    <public type="string" name="bttv_settings_open_highlights_dia_primary" id="0x7f1412d3" />
++    <public type="string" name="bttv_settings_open_highlights_dia_secondary" id="0x7f1412d4" />
++    <public type="string" name="bttv_settings_highlights_dia_input_hint" id="0x7f1412d5" />
++    <public type="string" name="bttv_settings_highlights_dia_title" id="0x7f1412d6" />
++    <public type="string" name="bttv_settings_gif_render_mode_title" id="0x7f1412d7" />
++    <public type="string" name="bttv_settings_gif_render_mode_animate" id="0x7f1412d8" />
++    <public type="string" name="bttv_settings_gif_render_mode_static" id="0x7f1412d9" />
++    <public type="string" name="bttv_settings_gif_render_mode_disabled" id="0x7f1412da" />
++    <public type="string" name="bttv_settings_gif_render_mode_animate_forever" id="0x7f1412db" />
++    <public type="string" name="bttv_settings_gif_render_mode_descr" id="0x7f1412dc" />
++    <public type="string" name="bttv_settings_open_credits_button_title" id="0x7f1412dd" />
++    <public type="string" name="bttv_settings_enable_show_deleted_messages" id="0x7f1412de" />
++    <public type="string" name="bttv_settings_enable_split_chat" id="0x7f1412df" />
++    <public type="string" name="bttv_settings_enable_split_chat_descr" id="0x7f1412e0" />
++    <public type="string" name="bttv_settings_enable_anon_chat_primary" id="0x7f1412e1" />
++    <public type="string" name="bttv_settings_enable_anon_chat_secondary" id="0x7f1412e2" />
++    <public type="string" name="bttv_settings_enable_dev_tools" id="0x7f1412e3" />
++    <public type="string" name="bttv_settings_enable_dev_tools_secondary" id="0x7f1412e4" />
++    <public type="string" name="bttv_settings_open_blacklist_dia_primary" id="0x7f1412e5" />
++    <public type="string" name="bttv_settings_open_blacklist_dia_secondary" id="0x7f1412e6" />
++    <public type="string" name="bttv_settings_blacklist_dia_title" id="0x7f1412e7" />
++    <public type="string" name="bttv_auto_update_checks_enabled" id="0x7f1412e8" />
++    <public type="string" name="bttv_auto_update_checks_enabled_secondary" id="0x7f1412e9" />
++    <public type="string" name="bttv_settings_invoke_update_check" id="0x7f1412ea" />
++    <public type="string" name="bttv_credits_title" id="0x7f1412eb" />
++    <public type="string" name="bttv_credits_intro" id="0x7f1412ec" />
++    <public type="string" name="bttv_credits_bugs" id="0x7f1412ed" />
++    <public type="string" name="bttv_credits_ideas" id="0x7f1412ee" />
++    <public type="string" name="bttv_credits_translations" id="0x7f1412ef" />
++    <public type="string" name="bttv_credits_docs" id="0x7f1412f0" />
++    <public type="string" name="bttv_highlight_dia_list_empty" id="0x7f1412f1" />
++    <public type="string" name="bttv_highlight_user_notice" id="0x7f1412f2" />
++    <public type="string" name="bttv_watchparty_twitch_missing" id="0x7f1412f3" />
++    <public type="string" name="bttv_removed_by_mod" id="0x7f1412f4" />
++    <public type="drawable" name="bttv_ic_bedtime" id="0x7f080896" />
 +    <!-- /BTTV -->
  </resources>
 \ No newline at end of file
diff --git a/patches/settings/tv.twitch.android.app.consumer.dagger.DaggerAppComponent$AppComponentImpl.smali.patch b/patches/settings/tv.twitch.android.app.consumer.dagger.DaggerAppComponent$AppComponentImpl.smali.patch
index 2ccc0599..30619c8f 100644
--- a/patches/settings/tv.twitch.android.app.consumer.dagger.DaggerAppComponent$AppComponentImpl.smali.patch
+++ b/patches/settings/tv.twitch.android.app.consumer.dagger.DaggerAppComponent$AppComponentImpl.smali.patch
@@ -1,17 +1,15 @@
 diff --git a/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl.smali b/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl.smali
 --- a/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl.smali
 +++ b/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl.smali
-@@ -15582,6 +15582,13 @@
+@@ -15538,6 +15538,11 @@
  
-     iput-object v4, v0, Ltv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl;->pageViewTrackerProvider:Ljavax/inject/Provider;
+     iput-object v3, v0, Ltv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl;->pageViewTrackerProvider:Ljavax/inject/Provider;
  
 +    # BTTV
 +    # Set PageViewTracker Provider
-+    #   expects:
-+    #       v4: javax.inject.Provider<tv.twitch.android.shared.analytics.PageViewTracker>
-+    invoke-static {v4}, Lbttv/settings/SettingsFragmentBindingFactory;->setPageViewTrackerProvider(Ljavax/inject/Provider;)V
++    invoke-static {v3}, Lbttv/settings/SettingsFragmentBindingFactory;->setPageViewTrackerProvider(Ljavax/inject/Provider;)V
 +    # /BTTV
 +
-     .line 60308
-     iget-object v5, v0, Ltv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl;->provideTwitchAccountManagerProvider:Ljavax/inject/Provider;
+     .line 60490
+     iget-object v4, v0, Ltv/twitch/android/app/consumer/dagger/DaggerAppComponent$AppComponentImpl;->provideTwitchAccountManagerProvider:Ljavax/inject/Provider;
  
diff --git a/patches/settings/tv.twitch.android.app.consumer.dagger.DaggerAppComponent$SettingsActivitySubcomponentImpl.smali.patch b/patches/settings/tv.twitch.android.app.consumer.dagger.DaggerAppComponent$SettingsActivitySubcomponentImpl.smali.patch
index d2fabed4..077f0199 100644
--- a/patches/settings/tv.twitch.android.app.consumer.dagger.DaggerAppComponent$SettingsActivitySubcomponentImpl.smali.patch
+++ b/patches/settings/tv.twitch.android.app.consumer.dagger.DaggerAppComponent$SettingsActivitySubcomponentImpl.smali.patch
@@ -1,31 +1,26 @@
 diff --git a/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$SettingsActivitySubcomponentImpl.smali b/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$SettingsActivitySubcomponentImpl.smali
 --- a/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$SettingsActivitySubcomponentImpl.smali
 +++ b/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppComponent$SettingsActivitySubcomponentImpl.smali
-@@ -1017,9 +1017,23 @@
-     .line 16421
+@@ -1017,9 +1017,18 @@
+     .line 16484
      iput-object p2, p0, Ltv/twitch/android/app/consumer/dagger/DaggerAppComponent$SettingsActivitySubcomponentImpl;->settingsActivityModule:Ltv/twitch/android/settings/dagger/SettingsActivityModule;
  
 +    # BTTV
 +    #  Set SettingsActivityModule
-+    #     expects:
-+    #       p2: tv.twitch.android.settings.dagger.SettingsActivityModule
 +    invoke-static {p2}, Lbttv/settings/SettingsFragmentBindingFactory;->setSettingsActivityModule(Ltv/twitch/android/settings/dagger/SettingsActivityModule;)V
 +    # /BTTV
 +
-     .line 16422
+     .line 16485
      iput-object p3, p0, Ltv/twitch/android/app/consumer/dagger/DaggerAppComponent$SettingsActivitySubcomponentImpl;->activityModule:Ltv/twitch/android/app/core/dagger/modules/ActivityModule;
  
 +    # BTTV
-+    #  Set ActivityModule
-+    #     expects:
-+    #       p3: tv.twitch.android.app.core.dagger.modules.ActivityModule
 +    invoke-static {p3}, Lbttv/settings/SettingsFragmentBindingFactory;->setActivityModule(Ltv/twitch/android/app/core/dagger/modules/ActivityModule;)V
 +    # /BTTV
 +
-     .line 16423
+     .line 16486
      invoke-direct {p0, p2, p3, p4}, Ltv/twitch/android/app/consumer/dagger/DaggerAppComponent$SettingsActivitySubcomponentImpl;->initialize(Ltv/twitch/android/settings/dagger/SettingsActivityModule;Ltv/twitch/android/app/core/dagger/modules/ActivityModule;Ltv/twitch/android/settings/SettingsActivity;)V
  
-@@ -1490,6 +1504,12 @@
+@@ -1490,6 +1499,12 @@
      move-result-object p3
  
      iput-object p3, p0, Ltv/twitch/android/app/consumer/dagger/DaggerAppComponent$SettingsActivitySubcomponentImpl;->provideFragmentActivityProvider:Ljavax/inject/Provider;
@@ -36,9 +31,9 @@ diff --git a/smali_classes4/tv/twitch/android/app/consumer/dagger/DaggerAppCompo
 +    invoke-static {p3}, Lbttv/settings/SettingsFragmentBindingFactory;->setFragmentActivityProvider(Ljavax/inject/Provider;)V
 +    # /BTTV
  
-     .line 16861
+     .line 16924
      invoke-static {}, Ltv/twitch/android/shared/billing/postalcodecapture/PostalCodeEventDispatcher_Factory;->create()Ltv/twitch/android/shared/billing/postalcodecapture/PostalCodeEventDispatcher_Factory;
-@@ -2198,6 +2218,19 @@
+@@ -2198,6 +2213,19 @@
  
      move-result-object v0