diff --git a/CHANGELOG.md b/CHANGELOG.md
index 063a8a22..649e153d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # LunaSea Changelog
 
+## [Beta/TestFlight] v4.1.1 (40101001)
+
+#### NEW
+- None
+
+#### TWEAKS
+- None
+
+#### FIXES
+- `[Sonarr/v2]` Fix inability to interactively search for releases
+- `[Routing]` Fix black screen when popping back from nested calendar routes
+
+---
+
 ## [Stable/Production] v4.1.0 (40100007)
 
 #### NEW
diff --git a/lib/core/luna_ui/appbar/appbar.dart b/lib/core/luna_ui/appbar/appbar.dart
index 386441ec..0cbba0ac 100644
--- a/lib/core/luna_ui/appbar/appbar.dart
+++ b/lib/core/luna_ui/appbar/appbar.dart
@@ -5,7 +5,6 @@ class LunaAppBar extends AppBar {
     LunaAppBar({
         @required BuildContext context,
         @required String title,
-        @required String popUntil,
         List<Widget> actions,
         PreferredSizeWidget bottom,
         bool hideLeading = false,
@@ -20,9 +19,7 @@ class LunaAppBar extends AppBar {
         leading: hideLeading ? null : InkWell(
             child: Icon(Icons.arrow_back_ios),
             onTap: () async => Navigator.of(context).pop(),
-            onLongPress: () async => popUntil == null
-                ? Navigator.of(context).pop()
-                : Navigator.of(context).popUntil(ModalRoute.withName(popUntil)),
+            onLongPress: () async => Navigator.of(context).popUntil((route) => route.isFirst),
             borderRadius: BorderRadius.circular(28.0),
         ),
         centerTitle: false,
diff --git a/lib/core/ui/appbar/appbar_dropdown.dart b/lib/core/ui/appbar/appbar_dropdown.dart
index dc6a1b23..b3fcd6fe 100644
--- a/lib/core/ui/appbar/appbar_dropdown.dart
+++ b/lib/core/ui/appbar/appbar_dropdown.dart
@@ -8,7 +8,7 @@ Widget LSAppBarDropdown({
     @required List<String> profiles,
     List<Widget> actions
 }) => profiles != null && profiles.length < 2
-    ? LunaAppBar(context: context, title: title, actions: actions, popUntil: null, hideLeading: true)
+    ? LunaAppBar(context: context, title: title, actions: actions, hideLeading: true)
     : AppBar(
         title: PopupMenuButton<String>(
             shape: LunaSeaDatabaseValue.THEME_AMOLED.data && LunaSeaDatabaseValue.THEME_AMOLED_BORDER.data
diff --git a/lib/modules/home/routes/home.dart b/lib/modules/home/routes/home.dart
index 4670f8c8..6b04c5a8 100644
--- a/lib/modules/home/routes/home.dart
+++ b/lib/modules/home/routes/home.dart
@@ -59,7 +59,6 @@ class _State extends State<Home> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: Constants.APPLICATION_NAME,
-        popUntil: null,
         hideLeading: true,
         actions: Database.currentProfileObject.anyAutomationEnabled
             ? <Widget>[
diff --git a/lib/modules/lidarr/routes/add_details.dart b/lib/modules/lidarr/routes/add_details.dart
index d4df3215..f5fb3722 100644
--- a/lib/modules/lidarr/routes/add_details.dart
+++ b/lib/modules/lidarr/routes/add_details.dart
@@ -104,7 +104,6 @@ class _State extends State<LidarrAddDetails> {
         : LunaAppBar(
             context: context,
             title: _arguments.data.title,
-            popUntil: '/lidarr',
             actions: [
                 LSIconButton(
                     icon: Icons.link,
diff --git a/lib/modules/lidarr/routes/add_search.dart b/lib/modules/lidarr/routes/add_search.dart
index 69afca08..74c30b00 100644
--- a/lib/modules/lidarr/routes/add_search.dart
+++ b/lib/modules/lidarr/routes/add_search.dart
@@ -47,7 +47,6 @@ class _State extends State<LidarrAddSearch> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Add Artist',
-        popUntil: '/lidarr',
     );
 
     Widget get _body => LSRefreshIndicator(
diff --git a/lib/modules/lidarr/routes/details_album.dart b/lib/modules/lidarr/routes/details_album.dart
index 19cc5c6e..1af3147c 100644
--- a/lib/modules/lidarr/routes/details_album.dart
+++ b/lib/modules/lidarr/routes/details_album.dart
@@ -55,7 +55,6 @@ class _State extends State<LidarrDetailsAlbum> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/lidarr',
         title: _arguments == null ? 'Details Album' : _arguments.title,
         actions: <Widget>[
             InkWell(
diff --git a/lib/modules/lidarr/routes/details_artist.dart b/lib/modules/lidarr/routes/details_artist.dart
index 135de502..3b30105e 100644
--- a/lib/modules/lidarr/routes/details_artist.dart
+++ b/lib/modules/lidarr/routes/details_artist.dart
@@ -67,7 +67,6 @@ class _State extends State<LidarrDetailsArtist> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/lidarr',
         title: _arguments == null || _arguments.data == null
             ? 'Artist Details'
             : _arguments.data.title,
diff --git a/lib/modules/lidarr/routes/edit_artist.dart b/lib/modules/lidarr/routes/edit_artist.dart
index 7a8d04f8..89e6982d 100644
--- a/lib/modules/lidarr/routes/edit_artist.dart
+++ b/lib/modules/lidarr/routes/edit_artist.dart
@@ -95,7 +95,6 @@ class _State extends State<LidarrEditArtist> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/lidarr',
         title: _arguments?.entry?.title ?? 'Edit Artist',
     );
 
diff --git a/lib/modules/lidarr/routes/search_results.dart b/lib/modules/lidarr/routes/search_results.dart
index c6a85d2e..b45bcfe0 100644
--- a/lib/modules/lidarr/routes/search_results.dart
+++ b/lib/modules/lidarr/routes/search_results.dart
@@ -57,7 +57,6 @@ class _State extends State<LidarrSearchResults> {
         ? null
         : LunaAppBar(
             context: context,
-            popUntil: '/lidarr',
             title: _arguments.title,
         );
     
diff --git a/lib/modules/nzbget/routes/statistics.dart b/lib/modules/nzbget/routes/statistics.dart
index d1485782..682d0a56 100644
--- a/lib/modules/nzbget/routes/statistics.dart
+++ b/lib/modules/nzbget/routes/statistics.dart
@@ -58,7 +58,6 @@ class _State extends State<NZBGetStatistics> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/nzbget',
         title: 'Server Statistics',
     );
 
diff --git a/lib/modules/radarr/routes/add_details.dart b/lib/modules/radarr/routes/add_details.dart
index d3fca101..90daaeb3 100644
--- a/lib/modules/radarr/routes/add_details.dart
+++ b/lib/modules/radarr/routes/add_details.dart
@@ -94,7 +94,6 @@ class _State extends State<RadarrAddDetails> {
         ? null
         : LunaAppBar(
             context: context,
-            popUntil: '/radarr',
             title: _arguments.data.title,
             actions: [
                 LSIconButton(
diff --git a/lib/modules/radarr/routes/add_search.dart b/lib/modules/radarr/routes/add_search.dart
index b4597242..b8a8f221 100644
--- a/lib/modules/radarr/routes/add_search.dart
+++ b/lib/modules/radarr/routes/add_search.dart
@@ -46,7 +46,6 @@ class _State extends State<RadarrAddSearch> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/radarr',
         title: 'Add Movie',
     );
 
diff --git a/lib/modules/radarr/routes/details_movie.dart b/lib/modules/radarr/routes/details_movie.dart
index d9c55a5a..ba251782 100644
--- a/lib/modules/radarr/routes/details_movie.dart
+++ b/lib/modules/radarr/routes/details_movie.dart
@@ -68,7 +68,6 @@ class _State extends State<RadarrDetailsMovie> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/radarr',
         title: _arguments == null || _arguments.data == null
             ? 'Movie Details'
             : _arguments.data.title,
diff --git a/lib/modules/radarr/routes/edit_movie.dart b/lib/modules/radarr/routes/edit_movie.dart
index b51df15c..ed52d288 100644
--- a/lib/modules/radarr/routes/edit_movie.dart
+++ b/lib/modules/radarr/routes/edit_movie.dart
@@ -78,7 +78,6 @@ class _State extends State<RadarrEditMovie> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/radarr',
         title: _arguments?.data?.title ?? 'Edit Movie',
     );
 
diff --git a/lib/modules/radarr/routes/search_results.dart b/lib/modules/radarr/routes/search_results.dart
index 7bf78b42..724583e3 100644
--- a/lib/modules/radarr/routes/search_results.dart
+++ b/lib/modules/radarr/routes/search_results.dart
@@ -57,7 +57,6 @@ class _State extends State<RadarrSearchResults> {
         ? null
         : LunaAppBar(
             context: context,
-            popUntil: '/radarr',
             title: _arguments.title,
         );
 
diff --git a/lib/modules/sabnzbd/routes/history_stages.dart b/lib/modules/sabnzbd/routes/history_stages.dart
index c315dc62..c46012e3 100644
--- a/lib/modules/sabnzbd/routes/history_stages.dart
+++ b/lib/modules/sabnzbd/routes/history_stages.dart
@@ -39,7 +39,6 @@ class _State extends State<SABnzbdHistoryStages> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/sabnzbd',
         title: 'Stages',
     );
 
diff --git a/lib/modules/sabnzbd/routes/statistics.dart b/lib/modules/sabnzbd/routes/statistics.dart
index b0356f6e..b6d26fe6 100644
--- a/lib/modules/sabnzbd/routes/statistics.dart
+++ b/lib/modules/sabnzbd/routes/statistics.dart
@@ -38,7 +38,6 @@ class _State extends State<SABnzbdStatistics> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/sabnzbd',
         title: 'Server Statistics',
     );
 
diff --git a/lib/modules/search/routes/categories.dart b/lib/modules/search/routes/categories.dart
index 20f07eac..375f5073 100644
--- a/lib/modules/search/routes/categories.dart
+++ b/lib/modules/search/routes/categories.dart
@@ -36,7 +36,6 @@ class _State extends State<SearchCategories> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/search',
         title: Provider.of<SearchState>(context, listen: false)?.indexer?.displayName ?? 'Categories',
         actions: <Widget>[
             LSIconButton(
diff --git a/lib/modules/search/routes/indexers.dart b/lib/modules/search/routes/indexers.dart
index 3220e772..7fadf5ce 100644
--- a/lib/modules/search/routes/indexers.dart
+++ b/lib/modules/search/routes/indexers.dart
@@ -39,7 +39,6 @@ class _State extends State<Search> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: null,
         hideLeading: true,
         title: 'Search',
     );
diff --git a/lib/modules/search/routes/results.dart b/lib/modules/search/routes/results.dart
index c728374c..21b7b90a 100644
--- a/lib/modules/search/routes/results.dart
+++ b/lib/modules/search/routes/results.dart
@@ -41,7 +41,6 @@ class _State extends State<SearchResults> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/search',
         title: Provider.of<SearchState>(context, listen: false)?.searchTitle ?? 'Results',
         actions: <Widget>[
             LSIconButton(
diff --git a/lib/modules/search/routes/search.dart b/lib/modules/search/routes/search.dart
index 3ada9d3e..12fdc1c4 100644
--- a/lib/modules/search/routes/search.dart
+++ b/lib/modules/search/routes/search.dart
@@ -37,7 +37,6 @@ class _State extends State<SearchSearch> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/search',
         title: 'Search: ${Provider.of<SearchState>(context, listen: false)?.searchTitle ?? 'Unknown'}',
     );
 
diff --git a/lib/modules/search/routes/subcategories.dart b/lib/modules/search/routes/subcategories.dart
index 1b73961d..32bdca8b 100644
--- a/lib/modules/search/routes/subcategories.dart
+++ b/lib/modules/search/routes/subcategories.dart
@@ -21,7 +21,6 @@ class _State extends State<SearchSubcategories> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/search',
         title: Provider.of<SearchState>(context, listen: false)?.category?.name ?? 'Subcategories',
         actions: <Widget>[
             LSIconButton(
diff --git a/lib/modules/settings/modules/backuprestore/route.dart b/lib/modules/settings/modules/backuprestore/route.dart
index 74595bc3..579aeeb4 100644
--- a/lib/modules/settings/modules/backuprestore/route.dart
+++ b/lib/modules/settings/modules/backuprestore/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsBackupRestoreRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Backup & Restore',
     );
 
diff --git a/lib/modules/settings/modules/customization/route.dart b/lib/modules/settings/modules/customization/route.dart
index b285c051..5c0016f1 100644
--- a/lib/modules/settings/modules/customization/route.dart
+++ b/lib/modules/settings/modules/customization/route.dart
@@ -46,7 +46,6 @@ class _State extends State<_SettingsCustomizationRoute> with AutomaticKeepAliveC
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Customization',
     );
 
diff --git a/lib/modules/settings/modules/customization_appearance/route.dart b/lib/modules/settings/modules/customization_appearance/route.dart
index 8017e18b..5530b820 100644
--- a/lib/modules/settings/modules/customization_appearance/route.dart
+++ b/lib/modules/settings/modules/customization_appearance/route.dart
@@ -38,7 +38,6 @@ class _State extends State<_SettingsCustomizationAppearanceRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Appearance',
     );
 
diff --git a/lib/modules/settings/modules/customization_calendar/route.dart b/lib/modules/settings/modules/customization_calendar/route.dart
index 4500ef3e..b70e3ba1 100644
--- a/lib/modules/settings/modules/customization_calendar/route.dart
+++ b/lib/modules/settings/modules/customization_calendar/route.dart
@@ -38,7 +38,6 @@ class _State extends State<_SettingsCustomizationCalendarRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Calendar',
     );
 
diff --git a/lib/modules/settings/modules/customization_drawer/route.dart b/lib/modules/settings/modules/customization_drawer/route.dart
index 0eec50e9..af00b90f 100644
--- a/lib/modules/settings/modules/customization_drawer/route.dart
+++ b/lib/modules/settings/modules/customization_drawer/route.dart
@@ -38,7 +38,6 @@ class _State extends State<_SettingsCustomizationDrawerRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Drawer',
     );
 
diff --git a/lib/modules/settings/modules/customization_home/route.dart b/lib/modules/settings/modules/customization_home/route.dart
index e6e59246..bfaf0cb7 100644
--- a/lib/modules/settings/modules/customization_home/route.dart
+++ b/lib/modules/settings/modules/customization_home/route.dart
@@ -38,7 +38,6 @@ class _State extends State<_SettingsCustomizationHomeRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Home',
     );
 
diff --git a/lib/modules/settings/modules/customization_lidarr/route.dart b/lib/modules/settings/modules/customization_lidarr/route.dart
index 6db76047..d707da17 100644
--- a/lib/modules/settings/modules/customization_lidarr/route.dart
+++ b/lib/modules/settings/modules/customization_lidarr/route.dart
@@ -38,7 +38,6 @@ class _State extends State<_SettingsCustomizationLidarrRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Lidarr',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/customization_nzbget/route.dart b/lib/modules/settings/modules/customization_nzbget/route.dart
index 21f9374c..29472699 100644
--- a/lib/modules/settings/modules/customization_nzbget/route.dart
+++ b/lib/modules/settings/modules/customization_nzbget/route.dart
@@ -38,7 +38,6 @@ class _State extends State<_SettingsCustomizationNZBGetRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'NZBGet',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/customization_quickactions/route.dart b/lib/modules/settings/modules/customization_quickactions/route.dart
index 87f4ec92..f8e262e1 100644
--- a/lib/modules/settings/modules/customization_quickactions/route.dart
+++ b/lib/modules/settings/modules/customization_quickactions/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsCustomizationQuickActionsRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Quick Actions',
     );
 
diff --git a/lib/modules/settings/modules/customization_radarr/route.dart b/lib/modules/settings/modules/customization_radarr/route.dart
index 080f7e22..e3fb7c38 100644
--- a/lib/modules/settings/modules/customization_radarr/route.dart
+++ b/lib/modules/settings/modules/customization_radarr/route.dart
@@ -38,7 +38,6 @@ class _State extends State<_SettingsCustomizationRadarrRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Radarr',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/customization_sabnzbd/route.dart b/lib/modules/settings/modules/customization_sabnzbd/route.dart
index 54f93fe0..5a4b5ea8 100644
--- a/lib/modules/settings/modules/customization_sabnzbd/route.dart
+++ b/lib/modules/settings/modules/customization_sabnzbd/route.dart
@@ -38,7 +38,6 @@ class _State extends State<_SettingsCustomizationSABnzbdRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'SABnzbd',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/customization_search/route.dart b/lib/modules/settings/modules/customization_search/route.dart
index 6ff90686..adc552d3 100644
--- a/lib/modules/settings/modules/customization_search/route.dart
+++ b/lib/modules/settings/modules/customization_search/route.dart
@@ -38,7 +38,6 @@ class _State extends State<_SettingsCustomizationSearchRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Search',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/customization_sonarr/route.dart b/lib/modules/settings/modules/customization_sonarr/route.dart
index 798517b9..2d1de670 100644
--- a/lib/modules/settings/modules/customization_sonarr/route.dart
+++ b/lib/modules/settings/modules/customization_sonarr/route.dart
@@ -38,7 +38,6 @@ class _State extends State<_SettingsCustomizationSonarrRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Sonarr',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/customization_tautulli/route.dart b/lib/modules/settings/modules/customization_tautulli/route.dart
index d08f2fec..39fb2db6 100644
--- a/lib/modules/settings/modules/customization_tautulli/route.dart
+++ b/lib/modules/settings/modules/customization_tautulli/route.dart
@@ -38,7 +38,6 @@ class _State extends State<_SettingsCustomizationTautulliRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Tautulli',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/donations/route.dart b/lib/modules/settings/modules/donations/route.dart
index b2d746e0..5cd09527 100644
--- a/lib/modules/settings/modules/donations/route.dart
+++ b/lib/modules/settings/modules/donations/route.dart
@@ -74,7 +74,6 @@ class _State extends State<_SettingsDonationsRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Donations',
     );
 
diff --git a/lib/modules/settings/modules/donations_thankyou/route.dart b/lib/modules/settings/modules/donations_thankyou/route.dart
index 4fe77b12..75bc4f8f 100644
--- a/lib/modules/settings/modules/donations_thankyou/route.dart
+++ b/lib/modules/settings/modules/donations_thankyou/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsDonationsThankYouRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Donations',
     );
 
diff --git a/lib/modules/settings/modules/logs/route.dart b/lib/modules/settings/modules/logs/route.dart
index 7df0d5c0..18500cf5 100644
--- a/lib/modules/settings/modules/logs/route.dart
+++ b/lib/modules/settings/modules/logs/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsLogsRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Logs',
     );
 
diff --git a/lib/modules/settings/modules/logs_details/route.dart b/lib/modules/settings/modules/logs_details/route.dart
index 197c9c07..6396cddd 100644
--- a/lib/modules/settings/modules/logs_details/route.dart
+++ b/lib/modules/settings/modules/logs_details/route.dart
@@ -70,7 +70,6 @@ class _State extends State<_SettingsLogsDetailsRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: '${widget.type ?? 'Unknown'} Logs',
     );
 
diff --git a/lib/modules/settings/modules/modules/route.dart b/lib/modules/settings/modules/modules/route.dart
index 1ce84f0a..022883c6 100644
--- a/lib/modules/settings/modules/modules/route.dart
+++ b/lib/modules/settings/modules/modules/route.dart
@@ -45,7 +45,6 @@ class _State extends State<_SettingsModulesRoute> with AutomaticKeepAliveClientM
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Modules',
         actions: [
             SettingsModulesEnabledProfileButton(),
diff --git a/lib/modules/settings/modules/modules_lidarr/route.dart b/lib/modules/settings/modules/modules_lidarr/route.dart
index 0c890444..eb33f116 100644
--- a/lib/modules/settings/modules/modules_lidarr/route.dart
+++ b/lib/modules/settings/modules/modules_lidarr/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsModulesLidarrRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Lidarr',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/modules_lidarr_headers/route.dart b/lib/modules/settings/modules/modules_lidarr_headers/route.dart
index 0003935e..3f9843a5 100644
--- a/lib/modules/settings/modules/modules_lidarr_headers/route.dart
+++ b/lib/modules/settings/modules/modules_lidarr_headers/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsModulesLidarrHeadersRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Custom Headers',
     );
 
diff --git a/lib/modules/settings/modules/modules_nzbget/route.dart b/lib/modules/settings/modules/modules_nzbget/route.dart
index c7e5032f..88eda3b9 100644
--- a/lib/modules/settings/modules/modules_nzbget/route.dart
+++ b/lib/modules/settings/modules/modules_nzbget/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsModulesNZBGetRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'NZBGet',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/modules_nzbget_headers/route.dart b/lib/modules/settings/modules/modules_nzbget_headers/route.dart
index 75b99214..73bf94f9 100644
--- a/lib/modules/settings/modules/modules_nzbget_headers/route.dart
+++ b/lib/modules/settings/modules/modules_nzbget_headers/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsModulesNZBGetHeadersRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Custom Headers',
     );
 
diff --git a/lib/modules/settings/modules/modules_radarr/route.dart b/lib/modules/settings/modules/modules_radarr/route.dart
index c4fcb9f2..d7a6d21f 100644
--- a/lib/modules/settings/modules/modules_radarr/route.dart
+++ b/lib/modules/settings/modules/modules_radarr/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsModulesRadarrRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Radarr',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/modules_radarr_headers/route.dart b/lib/modules/settings/modules/modules_radarr_headers/route.dart
index 45eb8a1b..b756b106 100644
--- a/lib/modules/settings/modules/modules_radarr_headers/route.dart
+++ b/lib/modules/settings/modules/modules_radarr_headers/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsModulesRadarrHeadersRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Custom Headers',
     );
 
diff --git a/lib/modules/settings/modules/modules_sabnzbd/route.dart b/lib/modules/settings/modules/modules_sabnzbd/route.dart
index b70bdb28..48902991 100644
--- a/lib/modules/settings/modules/modules_sabnzbd/route.dart
+++ b/lib/modules/settings/modules/modules_sabnzbd/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsModulesSABnzbdRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'SABnzbd',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/modules_sabnzbd_headers/route.dart b/lib/modules/settings/modules/modules_sabnzbd_headers/route.dart
index 5fdae639..bc53f685 100644
--- a/lib/modules/settings/modules/modules_sabnzbd_headers/route.dart
+++ b/lib/modules/settings/modules/modules_sabnzbd_headers/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsModulesSABnzbdHeadersRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Custom Headers',
     );
 
diff --git a/lib/modules/settings/modules/modules_search/route.dart b/lib/modules/settings/modules/modules_search/route.dart
index e8fa6dbc..39940e0c 100644
--- a/lib/modules/settings/modules/modules_search/route.dart
+++ b/lib/modules/settings/modules/modules_search/route.dart
@@ -38,7 +38,6 @@ class _State extends State<_SettingsModulesSearchRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Search',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/modules_search_add/route.dart b/lib/modules/settings/modules/modules_search_add/route.dart
index b069417a..75f412da 100644
--- a/lib/modules/settings/modules/modules_search_add/route.dart
+++ b/lib/modules/settings/modules/modules_search_add/route.dart
@@ -40,7 +40,6 @@ class _State extends State<_SettingsModulesSearchAddRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Add Indexer',
     );
 
diff --git a/lib/modules/settings/modules/modules_search_add_headers/route.dart b/lib/modules/settings/modules/modules_search_add_headers/route.dart
index 50329154..91aec3df 100644
--- a/lib/modules/settings/modules/modules_search_add_headers/route.dart
+++ b/lib/modules/settings/modules/modules_search_add_headers/route.dart
@@ -27,8 +27,6 @@ class _State extends State<SettingsModulesSearchAddHeadersRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: null,
-        hideLeading: true,
         title: 'Custom Headers',
     );
 
diff --git a/lib/modules/settings/modules/modules_search_edit/route.dart b/lib/modules/settings/modules/modules_search_edit/route.dart
index 4975de92..52195a34 100644
--- a/lib/modules/settings/modules/modules_search_edit/route.dart
+++ b/lib/modules/settings/modules/modules_search_edit/route.dart
@@ -71,7 +71,6 @@ class _State extends State<_SettingsModulesSearchEditRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Edit Indexer',
     );
 
diff --git a/lib/modules/settings/modules/modules_search_edit_headers/route.dart b/lib/modules/settings/modules/modules_search_edit_headers/route.dart
index 4b9c63b8..20cf0f33 100644
--- a/lib/modules/settings/modules/modules_search_edit_headers/route.dart
+++ b/lib/modules/settings/modules/modules_search_edit_headers/route.dart
@@ -27,8 +27,6 @@ class _State extends State<SettingsModulesSearchEditHeadersRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: null,
-        hideLeading: true,
         title: 'Custom Headers',
     );
 
diff --git a/lib/modules/settings/modules/modules_sonarr/route.dart b/lib/modules/settings/modules/modules_sonarr/route.dart
index e3d576f5..a08a1c32 100644
--- a/lib/modules/settings/modules/modules_sonarr/route.dart
+++ b/lib/modules/settings/modules/modules_sonarr/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsModulesSonarrRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Sonarr',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/modules_sonarr_headers/route.dart b/lib/modules/settings/modules/modules_sonarr_headers/route.dart
index efc401c0..88a17ca9 100644
--- a/lib/modules/settings/modules/modules_sonarr_headers/route.dart
+++ b/lib/modules/settings/modules/modules_sonarr_headers/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsModulesSonarrHeadersRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Custom Headers',
     );
 
diff --git a/lib/modules/settings/modules/modules_tautulli/route.dart b/lib/modules/settings/modules/modules_tautulli/route.dart
index 158098f3..21fc3ad5 100644
--- a/lib/modules/settings/modules/modules_tautulli/route.dart
+++ b/lib/modules/settings/modules/modules_tautulli/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsModulesTautulliRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Tautulli',
         actions: [
             LSIconButton(
diff --git a/lib/modules/settings/modules/modules_tautulli_headers/route.dart b/lib/modules/settings/modules/modules_tautulli_headers/route.dart
index 618ee605..5b9057ed 100644
--- a/lib/modules/settings/modules/modules_tautulli_headers/route.dart
+++ b/lib/modules/settings/modules/modules_tautulli_headers/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsModulesTautulliHeadersRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Custom Headers',
     );
 
diff --git a/lib/modules/settings/modules/modules_wakeonlan/route.dart b/lib/modules/settings/modules/modules_wakeonlan/route.dart
index 1d7e61c2..4e1a3a0a 100644
--- a/lib/modules/settings/modules/modules_wakeonlan/route.dart
+++ b/lib/modules/settings/modules/modules_wakeonlan/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsModulesWakeOnLANRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Wake on LAN',
     );
 
diff --git a/lib/modules/settings/modules/profiles/route.dart b/lib/modules/settings/modules/profiles/route.dart
index bed06dcd..3c741cac 100644
--- a/lib/modules/settings/modules/profiles/route.dart
+++ b/lib/modules/settings/modules/profiles/route.dart
@@ -42,7 +42,6 @@ class _State extends State<_SettingsProfilesRoute> with AutomaticKeepAliveClient
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Profiles',
     );
 
diff --git a/lib/modules/settings/modules/resources/route.dart b/lib/modules/settings/modules/resources/route.dart
index 06197392..de994d52 100644
--- a/lib/modules/settings/modules/resources/route.dart
+++ b/lib/modules/settings/modules/resources/route.dart
@@ -39,7 +39,6 @@ class _State extends State<_SettingsResourcesRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'Resources',
     );
 
diff --git a/lib/modules/settings/modules/settings/route.dart b/lib/modules/settings/modules/settings/route.dart
index 0a498493..af3872da 100644
--- a/lib/modules/settings/modules/settings/route.dart
+++ b/lib/modules/settings/modules/settings/route.dart
@@ -54,7 +54,6 @@ class _State extends State<_SettingsRoute> {
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: null,
         hideLeading: true,
         title: SettingsConstants.MODULE_MAP.name,
     );
diff --git a/lib/modules/settings/modules/system/route.dart b/lib/modules/settings/modules/system/route.dart
index 9121795e..62471d1e 100644
--- a/lib/modules/settings/modules/system/route.dart
+++ b/lib/modules/settings/modules/system/route.dart
@@ -45,7 +45,6 @@ class _State extends State<_SettingsSystemRoute> with AutomaticKeepAliveClientMi
 
     Widget get _appBar => LunaAppBar(
         context: context,
-        popUntil: '/settings',
         title: 'System',
     );
 
diff --git a/lib/modules/sonarr/modules/queue/route.dart b/lib/modules/sonarr/modules/queue/route.dart
index e5a6101d..ca2f6a9f 100644
--- a/lib/modules/sonarr/modules/queue/route.dart
+++ b/lib/modules/sonarr/modules/queue/route.dart
@@ -53,7 +53,6 @@ class _State extends State<_SonarrQueueRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Queue',
-        popUntil: '/sonarr',
     );
 
     Widget get _body => LSRefreshIndicator(
diff --git a/lib/modules/sonarr/modules/releases/widgets/appbar.dart b/lib/modules/sonarr/modules/releases/widgets/appbar.dart
index e16a9844..d222ae8c 100644
--- a/lib/modules/sonarr/modules/releases/widgets/appbar.dart
+++ b/lib/modules/sonarr/modules/releases/widgets/appbar.dart
@@ -11,7 +11,6 @@ Widget SonarrReleasesAppBar({
     context: context,
     title: 'Releases',
     bottom: _SearchBar(scrollController: scrollController),
-    popUntil: '/sonarr',
 );
 
 class _SearchBar extends StatefulWidget implements PreferredSizeWidget {
diff --git a/lib/modules/sonarr/modules/series_add/widgets/appbar.dart b/lib/modules/sonarr/modules/series_add/widgets/appbar.dart
index 754f6356..e996b618 100644
--- a/lib/modules/sonarr/modules/series_add/widgets/appbar.dart
+++ b/lib/modules/sonarr/modules/series_add/widgets/appbar.dart
@@ -9,7 +9,6 @@ Widget SonarrSeriesAddAppBar({
     context: context,
     title: 'Add Series',
     bottom: _SearchBar(),
-    popUntil: '/sonarr',
 );
 
 class _SearchBar extends StatefulWidget implements PreferredSizeWidget {
diff --git a/lib/modules/sonarr/modules/series_add_details/route.dart b/lib/modules/sonarr/modules/series_add_details/route.dart
index e20671c5..30d5ac62 100644
--- a/lib/modules/sonarr/modules/series_add_details/route.dart
+++ b/lib/modules/sonarr/modules/series_add_details/route.dart
@@ -68,7 +68,6 @@ class _State extends State<_SonarrSeriesAddDetailsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Add Series',
-        popUntil: '/sonarr',
         actions: [
             SonarrSeriesAddDetailsAppbarLinkAction(tvdbId: widget.tvdbId),
         ],
diff --git a/lib/modules/sonarr/modules/series_details/route.dart b/lib/modules/sonarr/modules/series_details/route.dart
index 840efe9f..36f33905 100644
--- a/lib/modules/sonarr/modules/series_details/route.dart
+++ b/lib/modules/sonarr/modules/series_details/route.dart
@@ -99,7 +99,6 @@ class _State extends State<_SonarrSeriesDetailsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Series Details',
-        popUntil: '/sonarr',
         actions: [
             SonarrAppBarSeriesSettingsAction(seriesId: widget.seriesId),
         ],
diff --git a/lib/modules/sonarr/modules/series_edit/route.dart b/lib/modules/sonarr/modules/series_edit/route.dart
index 6e6e53af..a33b30f4 100644
--- a/lib/modules/sonarr/modules/series_edit/route.dart
+++ b/lib/modules/sonarr/modules/series_edit/route.dart
@@ -67,7 +67,6 @@ class _State extends State<_SonarrSeriesEditRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Edit Series',
-        popUntil: '/sonarr',
     );
 
     Widget get _body => FutureBuilder(
diff --git a/lib/modules/sonarr/modules/series_season_details/route.dart b/lib/modules/sonarr/modules/series_season_details/route.dart
index a1a19c3f..d25c85f0 100644
--- a/lib/modules/sonarr/modules/series_season_details/route.dart
+++ b/lib/modules/sonarr/modules/series_season_details/route.dart
@@ -79,7 +79,6 @@ class _State extends State<_SonarrSeriesSeasonDetailsRoute> {
     Widget get _appBar =>  LunaAppBar(
         context: context,
         title: 'Season Details',
-        popUntil: '/sonarr',
     );
 
     Widget get _floatingActionButton => context.watch<SonarrState>().selectedEpisodes.length == 0
diff --git a/lib/modules/sonarr/modules/sonarr/widgets/appbar.dart b/lib/modules/sonarr/modules/sonarr/widgets/appbar.dart
index 98c43bba..45806713 100644
--- a/lib/modules/sonarr/modules/sonarr/widgets/appbar.dart
+++ b/lib/modules/sonarr/modules/sonarr/widgets/appbar.dart
@@ -11,7 +11,6 @@ Widget SonarrAppBar({
         context: context,
         title: 'Sonarr',
         actions: actions,
-        popUntil: null,
         hideLeading: true,
     )
     : AppBar(
diff --git a/lib/modules/sonarr/modules/tags/route.dart b/lib/modules/sonarr/modules/tags/route.dart
index 7a079641..a207e6cf 100644
--- a/lib/modules/sonarr/modules/tags/route.dart
+++ b/lib/modules/sonarr/modules/tags/route.dart
@@ -53,7 +53,6 @@ class _State extends State<_SonarrTagsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Tags',
-        popUntil: '/sonarr',
         actions: [
             SonarrTagsAppBarActionAddTag(),
         ],
diff --git a/lib/modules/tautulli/modules/activity_details/route.dart b/lib/modules/tautulli/modules/activity_details/route.dart
index 388c8453..6ceb9d6f 100644
--- a/lib/modules/tautulli/modules/activity_details/route.dart
+++ b/lib/modules/tautulli/modules/activity_details/route.dart
@@ -62,7 +62,6 @@ class _State extends State<_TautulliActivityDetailsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Activity Details',
-        popUntil: '/tautulli',
         actions: [
             TautulliActivityDetailsUser(sessionId: widget.sessionId),
             TautulliActivityDetailsMetadata(sessionId: widget.sessionId),
diff --git a/lib/modules/tautulli/modules/check_for_updates/route.dart b/lib/modules/tautulli/modules/check_for_updates/route.dart
index 50a55364..74d5ad83 100644
--- a/lib/modules/tautulli/modules/check_for_updates/route.dart
+++ b/lib/modules/tautulli/modules/check_for_updates/route.dart
@@ -61,7 +61,6 @@ class _State extends State<_TautulliCheckForUpdatesRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Check for Updates',
-        popUntil: '/tautulli',
     );
 
     Widget get _body => LSRefreshIndicator(
diff --git a/lib/modules/tautulli/modules/graphs/route.dart b/lib/modules/tautulli/modules/graphs/route.dart
index 8eacfa9f..506799db 100644
--- a/lib/modules/tautulli/modules/graphs/route.dart
+++ b/lib/modules/tautulli/modules/graphs/route.dart
@@ -50,7 +50,6 @@ class _State extends State<_TautulliGraphsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context, 
         title: 'Graphs',
-        popUntil: '/tautulli',
         actions: [
             TautulliGraphsTypeButton(),
         ],
diff --git a/lib/modules/tautulli/modules/history_details/route.dart b/lib/modules/tautulli/modules/history_details/route.dart
index f2d26a05..41c5d8a9 100644
--- a/lib/modules/tautulli/modules/history_details/route.dart
+++ b/lib/modules/tautulli/modules/history_details/route.dart
@@ -90,7 +90,6 @@ class _State extends State<_TautulliHistoryDetailsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'History Details',
-        popUntil: TautulliConstants.MODULE_MAP.route,
         actions: [
             TautulliHistoryDetailsUser(ratingKey: widget.ratingKey, sessionKey: widget.sessionKey, referenceId: widget.referenceId),
             TautulliHistoryDetailsMetadata(ratingKey: widget.ratingKey, sessionKey: widget.sessionKey, referenceId: widget.referenceId),
diff --git a/lib/modules/tautulli/modules/ipaddress_details/route.dart b/lib/modules/tautulli/modules/ipaddress_details/route.dart
index ca5404fc..c7e48c29 100644
--- a/lib/modules/tautulli/modules/ipaddress_details/route.dart
+++ b/lib/modules/tautulli/modules/ipaddress_details/route.dart
@@ -73,7 +73,6 @@ class _State extends State<_TautulliIPAddressRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'IP Address Details',
-        popUntil: '/tautulli',
     );
 
     Widget get _body => FutureBuilder(
diff --git a/lib/modules/tautulli/modules/libraries/route.dart b/lib/modules/tautulli/modules/libraries/route.dart
index aaee5cd2..c544b53a 100644
--- a/lib/modules/tautulli/modules/libraries/route.dart
+++ b/lib/modules/tautulli/modules/libraries/route.dart
@@ -56,7 +56,6 @@ class _State extends State<_TautulliLibrariesRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Libraries',
-        popUntil: '/tautulli',
     );
 
     Widget get _body => LSRefreshIndicator(
diff --git a/lib/modules/tautulli/modules/libraries_details/route.dart b/lib/modules/tautulli/modules/libraries_details/route.dart
index 10e6e6d4..42e07e53 100644
--- a/lib/modules/tautulli/modules/libraries_details/route.dart
+++ b/lib/modules/tautulli/modules/libraries_details/route.dart
@@ -63,7 +63,6 @@ class _State extends State<_TautulliLibrariesDetailsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Library Details',
-        popUntil: '/tautulli',
     );
 
     Widget get _body => PageView(
diff --git a/lib/modules/tautulli/modules/logs/route.dart b/lib/modules/tautulli/modules/logs/route.dart
index 846e5cd5..18b03aaa 100644
--- a/lib/modules/tautulli/modules/logs/route.dart
+++ b/lib/modules/tautulli/modules/logs/route.dart
@@ -42,7 +42,6 @@ class _State extends State<_TautulliLogsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Logs',
-        popUntil: '/tautulli',
     );
 
     Widget get _body => LSListView(
diff --git a/lib/modules/tautulli/modules/logs_logins/route.dart b/lib/modules/tautulli/modules/logs_logins/route.dart
index 4d78ff96..79d83026 100644
--- a/lib/modules/tautulli/modules/logs_logins/route.dart
+++ b/lib/modules/tautulli/modules/logs_logins/route.dart
@@ -56,7 +56,6 @@ class _State extends State<_TautulliLogsLoginsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Login Logs',
-        popUntil: '/tautulli',
     );
 
     Widget get _body => LSRefreshIndicator(
diff --git a/lib/modules/tautulli/modules/logs_newsletters/route.dart b/lib/modules/tautulli/modules/logs_newsletters/route.dart
index f674ccec..0a3380a7 100644
--- a/lib/modules/tautulli/modules/logs_newsletters/route.dart
+++ b/lib/modules/tautulli/modules/logs_newsletters/route.dart
@@ -56,7 +56,6 @@ class _State extends State<_TautulliLogsNewslettersRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Newsletter Logs',
-        popUntil: '/tautulli',
     );
 
     Widget get _body => LSRefreshIndicator(
diff --git a/lib/modules/tautulli/modules/logs_notifications/route.dart b/lib/modules/tautulli/modules/logs_notifications/route.dart
index 5eab762d..5a24bd41 100644
--- a/lib/modules/tautulli/modules/logs_notifications/route.dart
+++ b/lib/modules/tautulli/modules/logs_notifications/route.dart
@@ -56,7 +56,6 @@ class _State extends State<_TautulliLogsNotificationsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Notification Logs',
-        popUntil: '/tautulli',
     );
 
     Widget get _body => LSRefreshIndicator(
diff --git a/lib/modules/tautulli/modules/logs_plex_media_scanner/route.dart b/lib/modules/tautulli/modules/logs_plex_media_scanner/route.dart
index 833954a2..786b8630 100644
--- a/lib/modules/tautulli/modules/logs_plex_media_scanner/route.dart
+++ b/lib/modules/tautulli/modules/logs_plex_media_scanner/route.dart
@@ -56,7 +56,6 @@ class _State extends State<_TautulliLogsPlexMediaScannerRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Plex Media Scanner Logs',
-        popUntil: '/tautulli',
     );
 
     Widget get _body => LSRefreshIndicator(
diff --git a/lib/modules/tautulli/modules/logs_plex_media_server/route.dart b/lib/modules/tautulli/modules/logs_plex_media_server/route.dart
index 1a5e7b70..ac915041 100644
--- a/lib/modules/tautulli/modules/logs_plex_media_server/route.dart
+++ b/lib/modules/tautulli/modules/logs_plex_media_server/route.dart
@@ -56,7 +56,6 @@ class _State extends State<_TautulliLogsPlexMediaServerRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Plex Media Server Logs',
-        popUntil: '/tautulli',
     );
 
     Widget get _body => LSRefreshIndicator(
diff --git a/lib/modules/tautulli/modules/logs_tautulli/route.dart b/lib/modules/tautulli/modules/logs_tautulli/route.dart
index 046b56e4..fcabbaa3 100644
--- a/lib/modules/tautulli/modules/logs_tautulli/route.dart
+++ b/lib/modules/tautulli/modules/logs_tautulli/route.dart
@@ -56,7 +56,6 @@ class _State extends State<_TautulliLogsTautulliRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Tautulli Logs',
-        popUntil: '/tautulli',
     );
 
     Widget get _body => LSRefreshIndicator(
diff --git a/lib/modules/tautulli/modules/media_details/route.dart b/lib/modules/tautulli/modules/media_details/route.dart
index 07710a23..244ad81f 100644
--- a/lib/modules/tautulli/modules/media_details/route.dart
+++ b/lib/modules/tautulli/modules/media_details/route.dart
@@ -77,7 +77,6 @@ class _State extends State<_TautulliMediaDetailsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Media Details',
-        popUntil: '/tautulli',
     );
 
     Widget get _bottomNavigationBar {
diff --git a/lib/modules/tautulli/modules/recently_added/route.dart b/lib/modules/tautulli/modules/recently_added/route.dart
index d7f0fea5..cd7c058b 100644
--- a/lib/modules/tautulli/modules/recently_added/route.dart
+++ b/lib/modules/tautulli/modules/recently_added/route.dart
@@ -56,7 +56,6 @@ class _State extends State<_TautulliRecentlyAddedRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Recently Added',
-        popUntil: '/tautulli',
     );
 
     Widget get _body => LSRefreshIndicator(
diff --git a/lib/modules/tautulli/modules/search/widgets/search_appbar.dart b/lib/modules/tautulli/modules/search/widgets/search_appbar.dart
index 3bff3ffa..5112a4b8 100644
--- a/lib/modules/tautulli/modules/search/widgets/search_appbar.dart
+++ b/lib/modules/tautulli/modules/search/widgets/search_appbar.dart
@@ -9,7 +9,6 @@ Widget TautulliSearchAppBar({
     context: context,
     title: 'Search',
     bottom: _SearchBar(),
-    popUntil: '/tautulli',
 );
 
 class _SearchBar extends StatefulWidget implements PreferredSizeWidget {
diff --git a/lib/modules/tautulli/modules/statistics/route.dart b/lib/modules/tautulli/modules/statistics/route.dart
index 9a94a798..c0eb038e 100644
--- a/lib/modules/tautulli/modules/statistics/route.dart
+++ b/lib/modules/tautulli/modules/statistics/route.dart
@@ -56,7 +56,6 @@ class _State extends State<_TautulliStatisticsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Statistics',
-        popUntil: '/tautulli',
         actions: [
             TautulliStatisticsTypeButton(),
             TautulliStatisticsTimeRangeButton(),
diff --git a/lib/modules/tautulli/modules/synced_items/route.dart b/lib/modules/tautulli/modules/synced_items/route.dart
index fdace6d3..eea692b5 100644
--- a/lib/modules/tautulli/modules/synced_items/route.dart
+++ b/lib/modules/tautulli/modules/synced_items/route.dart
@@ -56,7 +56,6 @@ class _State extends State<_TautulliSyncedItemsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'Synced Items',
-        popUntil: '/tautulli',
     );
 
     Widget get _body => LSRefreshIndicator(
diff --git a/lib/modules/tautulli/modules/users_details/route.dart b/lib/modules/tautulli/modules/users_details/route.dart
index aef8f84f..c6062590 100644
--- a/lib/modules/tautulli/modules/users_details/route.dart
+++ b/lib/modules/tautulli/modules/users_details/route.dart
@@ -76,7 +76,6 @@ class _State extends State<_TautulliUserDetailsRoute> {
     Widget get _appBar => LunaAppBar(
         context: context,
         title: 'User Details',
-        popUntil: '/tautulli',
     );
 
     Widget get _bottomNavigationBar => TautulliUserDetailsNavigationBar(pageController: _pageController);
diff --git a/pubspec.lock b/pubspec.lock
index 36048e93..074dee5d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -56,14 +56,14 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.1"
+    version: "1.5.2"
   build_config:
     dependency: transitive
     description:
       name: build_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.4"
   build_daemon:
     dependency: transitive
     description:
@@ -77,21 +77,21 @@ packages:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.3"
+    version: "1.4.4"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.6"
+    version: "1.10.7"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.1"
+    version: "6.1.2"
   built_collection:
     dependency: transitive
     description:
@@ -647,7 +647,7 @@ packages:
       name: provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.3.2+2"
+    version: "4.3.2+3"
   pub_semver:
     dependency: transitive
     description:
@@ -736,14 +736,14 @@ packages:
       name: sonarr
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.4"
+    version: "0.0.5"
   source_gen:
     dependency: transitive
     description:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.8"
+    version: "0.9.9"
   source_span:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 315b9b45..c8e05259 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: lunasea
 description: Self Hosted Manager
-version: 4.1.0+40100007
+version: 4.1.1+40101001
 publish_to: 'none'
 environment:
   sdk: ">=2.7.0 <3.0.0"
@@ -31,7 +31,7 @@ dependencies:
   path_provider: ^1.6.24
   percent_indicator: ^2.1.8
   permission_handler: ^5.0.1+1
-  provider: ^4.3.2+2
+  provider: ^4.3.2+3
   quick_actions: ^0.4.0+10
   sentry: ^3.0.1
   share: ^0.6.5+4
@@ -42,7 +42,7 @@ dependencies:
   uuid: ^2.2.2
   xml_parser: ^0.1.2
   # Comet.Tools Packages
-  sonarr: ^0.0.4
+  sonarr: ^0.0.5
   tautulli: ^1.1.0
   wake_on_lan: ^1.1.1+2