--- a/application/inc/Podcast.hrh	Sat Nov 13 15:05:16 2010 +0000
+++ b/application/inc/Podcast.hrh	Mon Nov 22 15:41:41 2010 +0000
@@ -40,6 +40,8 @@
 	EPodcastImportExportFeeds,
 	EPodcastImportFeeds,
 	EPodcastExportFeeds,
+	EPodcastFeedFeedMenu,
+	EPodcastFeedHelpMenu,
 	// Show commands
 	EPodcastDownloadShow,
 	EPodcastDeleteShow,
@@ -53,6 +55,9 @@
 	EPodcastMarkAsPlayed,
 	EPodcastMarkAsUnplayed,
 	EPodcastShowInfo,
+	EPodcastDownloadAll,
+	EPodcastShowsShowMenu,
+	EPodcastQueueShowMenu,
 	// Common commands
 	EPodcastBack,
 	EPodcastSettings,
@@ -63,15 +68,9 @@
 	EPodcastSearch,
 	EPodcastAddSearchResult,
 	EPodcastResetDb,
-	EPodcastFilterShows,
-	EPodcastFilterShowsAll,
-	EPodcastFilterShowsNew,
-	EPodcastFilterShowsDownloaded,
-	EPodcastFilterShowsNewAndDownloaded,
-	EPodcastFeedFeedMenu,
-	EPodcastShowsShowMenu,
-	EPodcastQueueShowMenu,
-	EPodcastFeedHelpMenu
+	EPodcastTabFeeds,
+	EPodcastTabQueue,
+	EPodcastTabNew
 	};
 
 enum TPodcastControl
@@ -80,6 +79,7 @@
 	EPodcastSettingShowDir,
 	EPodcastSettingAutoDownload,
 	EPodcastSettingAutoUpdate,
+	EPodcastSettingAutoDelete,
 	EPodcastSettingMaxsimdls,
 	EPodcastSettingConnection,
 	EPodcastSettingIAPList,
@@ -92,13 +92,17 @@
 enum TShowsIconIndex
 	{
 	EShowIcon = 0,
-	ENewShowIcon,
+	EShowIconNew,
 	EQuedShowIcon,
+	EQuedShowIconNew,
 	EDownloadingShowIcon,
+	EDownloadingShowIconNew,
 	EDownloadedShowIcon,
-	EDownloadedNewShowIcon,
+	EDownloadedShowIconNew,
 	EFailedShowIcon,
-	ESuspendedShowIcon
+	EFailedShowIconNew,
+	ESuspendedShowIcon,
+	ESuspendedShowIconNew
 	};
 
 enum TConnectionSetting {