diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
new file mode 100644
index 00000000..e8c73690
--- /dev/null
+++ b/.github/workflows/run_tests.yml
@@ -0,0 +1,105 @@
+name: CI
+
+on:
+  pull_request:
+    branches:
+      - develop
+      - master
+
+permissions:
+  contents: read
+
+jobs:
+  run_tests:
+    name: Run Unit & Acceptance Tests
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:8
+        env:
+          MYSQL_ROOT_PASSWORD: wordpress
+          MYSQL_USER: wordpress
+          MYSQL_PASSWORD: wordpress
+          MYSQL_DATABASE: wordpress_test
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
+          coverage: none
+          tools: wp-cli
+
+      - name: Install Composer dependencies
+        run: composer install
+
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '17'
+
+      - name: Prepare testing environment
+        run: |
+          # Move the plugin files to the separate folder
+          mkdir ssp && mv `ls -A | grep -v ssp` ssp
+
+          # Download WordPress
+          wp core download --allow-root
+
+          # Set up .env
+          echo "TEST_WP_ROOT=$(pwd)" > .env.testing
+          echo "TEST_DB_HOST=127.0.0.1" >> .env.testing
+          echo "TEST_DB_NAME=wordpress_test" >> .env.testing
+          echo "TEST_DB_USER=wordpress" >> .env.testing
+          echo "TEST_DB_PASSWORD=wordpress" >> .env.testing
+          echo "TEST_DOMAIN=localhost" >> .env.testing
+          mv .env.testing ssp/
+
+          # Move the plugin to the plugins folder
+          mv ssp ./wp-content/plugins/seriously-simple-podcasting
+          cd wp-content/plugins/seriously-simple-podcasting
+          npm install -g grunt-cli
+          npm install
+          npm rebuild node-sass
+          grunt uglify && grunt cssmin && npm run build
+
+      - name: Run Unit tests
+        run: cd wp-content/plugins/seriously-simple-podcasting && vendor/bin/codecept run wpunit
+
+      - name: Run Acceptance tests
+        run: |
+          wp config create --dbname=wordpress_test --dbuser=wordpress --dbpass=wordpress --dbhost=127.0.0.1 --dbprefix=wsy_ --allow-root
+          wp config set WP_SITEURL http://localhost:8000 --type=constant --allow-root
+          wp config set WP_HOME http://localhost:8000 --type=constant --allow-root
+          nohup php -S localhost:8000 &
+          cd wp-content/plugins/seriously-simple-podcasting
+          echo "SITE_URL=http://localhost:8000" >> .env.testing
+          echo "SITE_USER=autotest" >> .env.testing
+          echo "SITE_USER_PASS=password" >> .env.testing
+          echo "PODCAST_GUID=dd94465b-580a-501c-a892-caf224d23d7a" >> .env.testing
+          sudo apt-get update -qq
+          sudo env DEBIAN_FRONTEND=noninteractive apt-get install -qq mysql-client default-libmysqlclient-dev
+          gzip -d tests/seed.sql.gz && wp db import tests/seed.sql --allow-root
+          wp core update-db --allow-root
+          wp theme activate twentytwentyfour --allow-root
+          wp plugin install classic-editor --allow-root
+          vendor/bin/codecept run acceptance --steps
+
+      - name: Upload codeception output on failure
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: acceptance-tests
+          path: wp-content/plugins/seriously-simple-podcasting/tests/_output
+
+      - name: Upload PHP server logs on failure
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: acceptance-tests
+          path: nohup.out
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9caf71f3..c9b187e4 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,6 @@ unit_tests:
 
     # Prepare testing environment file
     - touch .env.testing
-    - echo "TEST_WP_ROOT=$(pwd)"
     - echo "TEST_WP_ROOT=$(pwd)" >> .env.testing
     - echo "TEST_DB_HOST=db" >> .env.testing
     - echo "TEST_DB_NAME=$MYSQL_DATABASE" >> .env.testing
@@ -151,6 +150,7 @@ acceptance_tests:
     - echo "SITE_URL=$SSH_USER" >> .env.testing
     - echo "SITE_USER=$SITE_USER" >> .env.testing
     - echo "SITE_USER_PASS=$SITE_USER_PASS" >> .env.testing
+    - echo "PODCAST_GUID=115e423a-72d2-531e-9d3c-ece7dd4b74fe" >> .env.testing
 
     # Run Acceptance tests
     - vendor/bin/codecept run acceptance --steps
diff --git a/assets/admin/css/admin.css b/assets/admin/css/admin.css
index e2597b1f..ca9cbd7c 100644
--- a/assets/admin/css/admin.css
+++ b/assets/admin/css/admin.css
@@ -204,6 +204,16 @@ textarea#episode_embed_code {
   font-size: 16px;
   top: -3px; }
 
+#podmotor_account_api_token {
+  width: 100%;
+  min-width: 100%;
+  display: block;
+  margin-bottom: 8px; }
+
+.ssp-settings-integrations table label {
+  margin-top: 10px;
+  display: block; }
+
 .ssp-settings:not(.ssp-settings-extensions, .ssp-settings-integrations) {
   background: #FFFFFF;
   margin-top: 28px;
@@ -219,8 +229,6 @@ textarea#episode_embed_code {
   .ssp-settings table input.regular-text {
     max-width: 90%;
     background: #F1F5F9; }
-  .ssp-settings .validate-api-credentials-message {
-    margin-left: 30px; }
   .ssp-settings .loader {
     position: relative; }
     .ssp-settings .loader:after {
@@ -243,6 +251,32 @@ textarea#episode_embed_code {
     .ssp-settings .ssp-sync-msg.success .sync-overview {
       color: #4caf50; }
 
+.ssp-main-settings .error {
+  color: #DF4E4F; }
+
+.ssp-main-settings .hidden {
+  display: none; }
+
+.ssp-main-settings .disconnect-castos {
+  margin-right: 8px;
+  vertical-align: middle; }
+
+.ssp-main-settings.tab-castos-hosting .loader {
+  position: relative; }
+  .ssp-main-settings.tab-castos-hosting .loader:after {
+    content: '';
+    display: block;
+    background: url(../img/loader2.svg) no-repeat;
+    position: absolute;
+    right: -50px;
+    top: -9px;
+    background-size: contain;
+    width: 44px;
+    height: 44px; }
+
+.connect-castos-message {
+  margin-left: 20px; }
+
 .ssp-sync-podcast {
   display: flex;
   justify-content: space-between;
@@ -467,6 +501,8 @@ textarea#episode_embed_code {
     right: 350px; }
   .ssp-onboarding-step-4 .ssp-onboarding__steps::after {
     right: 180px; }
+  .ssp-onboarding-step-4 .ssp-onboarding__settings-body {
+    padding: 24px 24px 36px; }
   .ssp-onboarding-step-4__info {
     display: flex;
     flex-direction: column;
@@ -659,7 +695,7 @@ textarea#episode_embed_code {
     z-index: 0;
     visibility: hidden;
     transition: .6s;
-    margin-top: -444px; }
+    margin-top: -345px; }
     .ssp-onboarding-step-4__form--opened {
       visibility: visible;
       margin-top: 0; }
@@ -749,6 +785,10 @@ textarea#episode_embed_code {
     text-align: right;
     margin-top: 25px;
     position: relative; }
+    .ssp-onboarding__submit span.connect-castos-message {
+      display: block;
+      text-align: left;
+      margin: 20px 0 0; }
     .ssp-onboarding__submit button[type=submit], .ssp-onboarding__submit .button {
       position: relative;
       height: 50px;
@@ -794,39 +834,56 @@ textarea#episode_embed_code {
         background: #516178; }
     .ssp-onboarding__submit .button span {
       line-height: 50px; }
-    .ssp-onboarding__submit .validate-token {
+    .ssp-onboarding__submit .castos-connect {
       float: left;
       position: relative;
       padding: 0 20px 0 45px; }
-      .ssp-onboarding__submit .validate-token:after {
+      .ssp-onboarding__submit .castos-connect:after {
         content: '';
         display: block;
         position: absolute;
-        background: url(../img/validate.svg) no-repeat;
-        background-size: cover;
-        left: 19px;
-        top: 17px;
-        width: 14px;
-        height: 18px;
-        filter: none; }
-      .ssp-onboarding__submit .validate-token.validating {
-        background: #374151; }
-        .ssp-onboarding__submit .validate-token.validating:hover, .ssp-onboarding__submit .validate-token.validating:active, .ssp-onboarding__submit .validate-token.validating:focus {
-          background: #374151; }
-        .ssp-onboarding__submit .validate-token.validating:after {
+        background: url(../img/connect.svg) no-repeat;
+        left: 13px;
+        top: 13px;
+        width: 25px;
+        height: 23px;
+        filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(198deg) brightness(101%) contrast(102%);
+        background-size: contain; }
+      .ssp-onboarding__submit .castos-connect:disabled {
+        background: #9CA3AF !important;
+        color: #D1D5DB !important; }
+        .ssp-onboarding__submit .castos-connect:disabled:after {
+          filter: invert(94%) sepia(8%) saturate(150%) hue-rotate(177deg) brightness(90%) contrast(93%);
+          transition: none; }
+      .ssp-onboarding__submit .castos-connect.connecting {
+        background: #DE7373 !important;
+        color: #FFFFFF !important; }
+        .ssp-onboarding__submit .castos-connect.connecting:hover, .ssp-onboarding__submit .castos-connect.connecting:active, .ssp-onboarding__submit .castos-connect.connecting:focus, .ssp-onboarding__submit .castos-connect.connecting:disabled {
+          background: #DE7373; }
+        .ssp-onboarding__submit .castos-connect.connecting:after {
           width: 17px;
           height: 18px;
-          background-image: url(../img/validating.svg); }
-      .ssp-onboarding__submit .validate-token.valid {
-        background: #10B981;
-        padding: 0 16px 0 45px; }
-        .ssp-onboarding__submit .validate-token.valid:hover, .ssp-onboarding__submit .validate-token.valid:active, .ssp-onboarding__submit .validate-token.valid:focus {
+          background-image: url(../img/connecting.svg);
+          animation: rotation 2s infinite linear;
+          filter: none;
+          transition: none;
+          top: 15px;
+          left: 15px; }
+      .ssp-onboarding__submit .castos-connect.connected {
+        background: #10B981 !important;
+        color: #FFFFFF !important;
+        padding: 0 16px 0 45px;
+        opacity: .7; }
+        .ssp-onboarding__submit .castos-connect.connected:hover, .ssp-onboarding__submit .castos-connect.connected:active, .ssp-onboarding__submit .castos-connect.connected:focus {
           background: #10B981; }
-        .ssp-onboarding__submit .validate-token.valid:after {
-          width: 16px;
-          height: 12px;
-          top: 19px;
-          background-image: url(../img/checkbox.svg); }
+        .ssp-onboarding__submit .castos-connect.connected:after {
+          background-image: url(../img/connect.svg);
+          left: 13px;
+          top: 13px;
+          width: 25px;
+          height: 23px;
+          filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(198deg) brightness(101%) contrast(102%);
+          background-size: contain; }
   .ssp-onboarding__image-info {
     position: absolute;
     display: flex;
@@ -864,10 +921,6 @@ textarea#episode_embed_code {
       transform: rotate(-45deg); }
     .ssp-onboarding__delete-image:hover:before, .ssp-onboarding__delete-image:hover:after {
       background: #fff; }
-  .ssp-onboarding .validate-api-credentials-message {
-    position: absolute;
-    left: 0;
-    bottom: -18px; }
   .ssp-onboarding__links {
     display: flex;
     text-align: left; }
@@ -977,17 +1030,17 @@ textarea#episode_embed_code {
     font-family: dashicons, 'Inter', sans-serif; }
 
 /* Hide the WP bars */
-.admin_page_ssp-onboarding-1 #adminmenumain, .admin_page_ssp-onboarding-1 #wpadminbar, .admin_page_ssp-onboarding-1 #wpfooter, .admin_page_ssp-onboarding-2 #adminmenumain, .admin_page_ssp-onboarding-2 #wpadminbar, .admin_page_ssp-onboarding-2 #wpfooter, .admin_page_ssp-onboarding-3 #adminmenumain, .admin_page_ssp-onboarding-3 #wpadminbar, .admin_page_ssp-onboarding-3 #wpfooter, .admin_page_ssp-onboarding-4 #adminmenumain, .admin_page_ssp-onboarding-4 #wpadminbar, .admin_page_ssp-onboarding-4 #wpfooter, .admin_page_ssp-onboarding-5 #adminmenumain, .admin_page_ssp-onboarding-5 #wpadminbar, .admin_page_ssp-onboarding-5 #wpfooter {
+.podcast_page_ssp-onboarding-1 #adminmenumain, .podcast_page_ssp-onboarding-1 #wpadminbar, .podcast_page_ssp-onboarding-1 #wpfooter, .admin_page_ssp-onboarding-1 #adminmenumain, .admin_page_ssp-onboarding-1 #wpadminbar, .admin_page_ssp-onboarding-1 #wpfooter, .admin_page_ssp-onboarding-2 #adminmenumain, .admin_page_ssp-onboarding-2 #wpadminbar, .admin_page_ssp-onboarding-2 #wpfooter, .admin_page_ssp-onboarding-3 #adminmenumain, .admin_page_ssp-onboarding-3 #wpadminbar, .admin_page_ssp-onboarding-3 #wpfooter, .admin_page_ssp-onboarding-4 #adminmenumain, .admin_page_ssp-onboarding-4 #wpadminbar, .admin_page_ssp-onboarding-4 #wpfooter, .admin_page_ssp-onboarding-5 #adminmenumain, .admin_page_ssp-onboarding-5 #wpadminbar, .admin_page_ssp-onboarding-5 #wpfooter {
   display: none; }
 
-.admin_page_ssp-onboarding-1 #wpcontent, .admin_page_ssp-onboarding-2 #wpcontent, .admin_page_ssp-onboarding-3 #wpcontent, .admin_page_ssp-onboarding-4 #wpcontent, .admin_page_ssp-onboarding-5 #wpcontent {
+.podcast_page_ssp-onboarding-1 #wpcontent, .admin_page_ssp-onboarding-1 #wpcontent, .admin_page_ssp-onboarding-2 #wpcontent, .admin_page_ssp-onboarding-3 #wpcontent, .admin_page_ssp-onboarding-4 #wpcontent, .admin_page_ssp-onboarding-5 #wpcontent {
   margin-left: 0;
   padding-left: 0; }
 
-.admin_page_ssp-onboarding-1 #wpbody-content, .admin_page_ssp-onboarding-2 #wpbody-content, .admin_page_ssp-onboarding-3 #wpbody-content, .admin_page_ssp-onboarding-4 #wpbody-content, .admin_page_ssp-onboarding-5 #wpbody-content {
+.podcast_page_ssp-onboarding-1 #wpbody-content, .admin_page_ssp-onboarding-1 #wpbody-content, .admin_page_ssp-onboarding-2 #wpbody-content, .admin_page_ssp-onboarding-3 #wpbody-content, .admin_page_ssp-onboarding-4 #wpbody-content, .admin_page_ssp-onboarding-5 #wpbody-content {
   padding-bottom: 30px; }
 
-.admin_page_ssp-onboarding-1 .notice, .admin_page_ssp-onboarding-1 .error, .admin_page_ssp-onboarding-2 .notice, .admin_page_ssp-onboarding-2 .error, .admin_page_ssp-onboarding-3 .notice, .admin_page_ssp-onboarding-3 .error, .admin_page_ssp-onboarding-4 .notice, .admin_page_ssp-onboarding-4 .error, .admin_page_ssp-onboarding-5 .notice, .admin_page_ssp-onboarding-5 .error {
+.podcast_page_ssp-onboarding-1 .notice, .podcast_page_ssp-onboarding-1 .error, .admin_page_ssp-onboarding-1 .notice, .admin_page_ssp-onboarding-1 .error, .admin_page_ssp-onboarding-2 .notice, .admin_page_ssp-onboarding-2 .error, .admin_page_ssp-onboarding-3 .notice, .admin_page_ssp-onboarding-3 .error, .admin_page_ssp-onboarding-4 .notice, .admin_page_ssp-onboarding-4 .error, .admin_page_ssp-onboarding-5 .notice, .admin_page_ssp-onboarding-5 .error {
   display: none; }
 
 .ssp-review-notice {
diff --git a/assets/admin/img/connect.svg b/assets/admin/img/connect.svg
new file mode 100644
index 00000000..463acfb4
--- /dev/null
+++ b/assets/admin/img/connect.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px" viewBox="0 0 24 24">
+	<path fill="none" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M4.513 19.487c2.512 2.392 5.503 1.435 6.7.466c.618-.501.897-.825 1.136-1.065c.837-.777.784-1.555.24-2.177c-.219-.249-1.616-1.591-2.956-2.967c-.694-.694-1.172-1.184-1.582-1.58c-.547-.546-1.026-1.172-1.744-1.154c-.658 0-1.136.58-1.735 1.179c-.688.688-1.196 1.555-1.375 2.333c-.539 2.273.299 3.888 1.316 4.965m0 0L2 21.999M19.487 4.515c-2.513-2.394-5.494-1.42-6.69-.45c-.62.502-.898.826-1.138 1.066c-.837.778-.784 1.556-.239 2.178c.078.09.31.32.635.644m7.432-3.438c1.017 1.077 1.866 2.71 1.327 4.985c-.18.778-.688 1.645-1.376 2.334c-.598.598-1.077 1.179-1.735 1.179c-.718.018-1.09-.502-1.639-1.048m3.423-7.45L22 2m-5.936 9.964c-.41-.395-.994-.993-1.688-1.687c-.858-.882-1.74-1.75-2.321-2.325m4.009 4.012l-1.562 1.524m-3.99-3.983l1.543-1.553" color="currentColor"/>
+</svg>
diff --git a/assets/admin/img/connecting.svg b/assets/admin/img/connecting.svg
new file mode 100644
index 00000000..23295e5b
--- /dev/null
+++ b/assets/admin/img/connecting.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="20" viewBox="0 0 18 20" xmlns="http://www.w3.org/2000/svg">
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M1.8001 0.399902C2.11836 0.399902 2.42358 0.526331 2.64863 0.751374C2.87367 0.976418 3.0001 1.28164 3.0001 1.5999V4.1211C3.99855 3.10263 5.23981 2.35507 6.60699 1.94884C7.97416 1.54261 9.42224 1.49108 10.8148 1.79911C12.2074 2.10713 13.4987 2.76457 14.567 3.7095C15.6353 4.65443 16.4455 5.85575 16.9213 7.2003C16.979 7.35001 17.0061 7.50978 17.001 7.67015C16.9959 7.83052 16.9587 7.98824 16.8916 8.13397C16.8245 8.27971 16.7288 8.41051 16.6103 8.51863C16.4917 8.62675 16.3527 8.71 16.2014 8.76346C16.0501 8.81691 15.8896 8.83948 15.7295 8.82983C15.5693 8.82018 15.4127 8.77851 15.2689 8.70728C15.1252 8.63606 14.9971 8.53672 14.8924 8.41515C14.7877 8.29358 14.7084 8.15224 14.6593 7.9995C14.2971 6.97568 13.6638 6.06932 12.8271 5.37699C11.9904 4.68467 10.9815 4.23232 9.90797 4.06816C8.83444 3.904 7.73648 4.03416 6.73109 4.44479C5.7257 4.85542 4.85055 5.53113 4.1989 6.3999H7.8001C8.11836 6.3999 8.42358 6.52633 8.64863 6.75137C8.87367 6.97642 9.0001 7.28164 9.0001 7.5999C9.0001 7.91816 8.87367 8.22339 8.64863 8.44843C8.42358 8.67347 8.11836 8.7999 7.8001 8.7999H1.8001C1.48184 8.7999 1.17661 8.67347 0.951569 8.44843C0.726526 8.22339 0.600098 7.91816 0.600098 7.5999V1.5999C0.600098 1.28164 0.726526 0.976418 0.951569 0.751374C1.17661 0.526331 1.48184 0.399902 1.8001 0.399902ZM1.8097 11.2683C1.9583 11.2158 2.11579 11.1931 2.27316 11.2015C2.43054 11.2099 2.58473 11.2492 2.72691 11.3172C2.8691 11.3851 2.99651 11.4804 3.10186 11.5977C3.2072 11.7149 3.28843 11.8517 3.3409 12.0003C3.70313 13.0241 4.33635 13.9305 5.17308 14.6228C6.00981 15.3151 7.01869 15.7675 8.09222 15.9316C9.16576 16.0958 10.2637 15.9656 11.2691 15.555C12.2745 15.1444 13.1496 14.4687 13.8013 13.5999H10.2001C9.88184 13.5999 9.57661 13.4735 9.35157 13.2484C9.12653 13.0234 9.0001 12.7182 9.0001 12.3999C9.0001 12.0816 9.12653 11.7764 9.35157 11.5514C9.57661 11.3263 9.88184 11.1999 10.2001 11.1999H16.2001C16.5184 11.1999 16.8236 11.3263 17.0486 11.5514C17.2737 11.7764 17.4001 12.0816 17.4001 12.3999V18.3999C17.4001 18.7182 17.2737 19.0234 17.0486 19.2484C16.8236 19.4735 16.5184 19.5999 16.2001 19.5999C15.8818 19.5999 15.5766 19.4735 15.3516 19.2484C15.1265 19.0234 15.0001 18.7182 15.0001 18.3999V15.8787C14.0016 16.8972 12.7604 17.6447 11.3932 18.051C10.026 18.4572 8.57795 18.5087 7.18536 18.2007C5.79277 17.8927 4.5015 17.2352 3.43319 16.2903C2.36487 15.3454 1.55467 14.1441 1.0789 12.7995C1.02641 12.6509 1.00371 12.4934 1.01209 12.336C1.02047 12.1787 1.05977 12.0245 1.12774 11.8823C1.19572 11.7401 1.29104 11.6127 1.40825 11.5073C1.52547 11.402 1.66229 11.3208 1.8109 11.2683H1.8097Z" fill="#ffffff"/>
+</svg>
diff --git a/assets/admin/img/loader2.svg b/assets/admin/img/loader2.svg
new file mode 100644
index 00000000..25f1ca19
--- /dev/null
+++ b/assets/admin/img/loader2.svg
@@ -0,0 +1,57 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" style="shape-rendering: auto; display: block; background: transparent;" width="50" height="50" xmlns:xlink="http://www.w3.org/1999/xlink"><g><g transform="translate(71,50)">
+<g transform="rotate(0)">
+<circle fill-opacity="1" fill="#50575e" r="3" cy="0" cx="0">
+  <animateTransform repeatCount="indefinite" dur="1s" keyTimes="0;1" values="1.5 1.5;1 1" begin="-0.875s" type="scale" attributeName="transform"></animateTransform>
+  <animate begin="-0.875s" values="1;0" repeatCount="indefinite" dur="1s" keyTimes="0;1" attributeName="fill-opacity"></animate>
+</circle>
+</g>
+</g><g transform="translate(64.8492424049175,64.8492424049175)">
+<g transform="rotate(45)">
+<circle fill-opacity="0.875" fill="#50575e" r="3" cy="0" cx="0">
+  <animateTransform repeatCount="indefinite" dur="1s" keyTimes="0;1" values="1.5 1.5;1 1" begin="-0.75s" type="scale" attributeName="transform"></animateTransform>
+  <animate begin="-0.75s" values="1;0" repeatCount="indefinite" dur="1s" keyTimes="0;1" attributeName="fill-opacity"></animate>
+</circle>
+</g>
+</g><g transform="translate(50,71)">
+<g transform="rotate(90)">
+<circle fill-opacity="0.75" fill="#50575e" r="3" cy="0" cx="0">
+  <animateTransform repeatCount="indefinite" dur="1s" keyTimes="0;1" values="1.5 1.5;1 1" begin="-0.625s" type="scale" attributeName="transform"></animateTransform>
+  <animate begin="-0.625s" values="1;0" repeatCount="indefinite" dur="1s" keyTimes="0;1" attributeName="fill-opacity"></animate>
+</circle>
+</g>
+</g><g transform="translate(35.1507575950825,64.8492424049175)">
+<g transform="rotate(135)">
+<circle fill-opacity="0.625" fill="#50575e" r="3" cy="0" cx="0">
+  <animateTransform repeatCount="indefinite" dur="1s" keyTimes="0;1" values="1.5 1.5;1 1" begin="-0.5s" type="scale" attributeName="transform"></animateTransform>
+  <animate begin="-0.5s" values="1;0" repeatCount="indefinite" dur="1s" keyTimes="0;1" attributeName="fill-opacity"></animate>
+</circle>
+</g>
+</g><g transform="translate(29,50)">
+<g transform="rotate(180)">
+<circle fill-opacity="0.5" fill="#50575e" r="3" cy="0" cx="0">
+  <animateTransform repeatCount="indefinite" dur="1s" keyTimes="0;1" values="1.5 1.5;1 1" begin="-0.375s" type="scale" attributeName="transform"></animateTransform>
+  <animate begin="-0.375s" values="1;0" repeatCount="indefinite" dur="1s" keyTimes="0;1" attributeName="fill-opacity"></animate>
+</circle>
+</g>
+</g><g transform="translate(35.150757595082496,35.1507575950825)">
+<g transform="rotate(225)">
+<circle fill-opacity="0.375" fill="#50575e" r="3" cy="0" cx="0">
+  <animateTransform repeatCount="indefinite" dur="1s" keyTimes="0;1" values="1.5 1.5;1 1" begin="-0.25s" type="scale" attributeName="transform"></animateTransform>
+  <animate begin="-0.25s" values="1;0" repeatCount="indefinite" dur="1s" keyTimes="0;1" attributeName="fill-opacity"></animate>
+</circle>
+</g>
+</g><g transform="translate(49.99999999999999,29)">
+<g transform="rotate(270)">
+<circle fill-opacity="0.25" fill="#50575e" r="3" cy="0" cx="0">
+  <animateTransform repeatCount="indefinite" dur="1s" keyTimes="0;1" values="1.5 1.5;1 1" begin="-0.125s" type="scale" attributeName="transform"></animateTransform>
+  <animate begin="-0.125s" values="1;0" repeatCount="indefinite" dur="1s" keyTimes="0;1" attributeName="fill-opacity"></animate>
+</circle>
+</g>
+</g><g transform="translate(64.84924240491749,35.150757595082496)">
+<g transform="rotate(315)">
+<circle fill-opacity="0.125" fill="#50575e" r="3" cy="0" cx="0">
+  <animateTransform repeatCount="indefinite" dur="1s" keyTimes="0;1" values="1.5 1.5;1 1" begin="0s" type="scale" attributeName="transform"></animateTransform>
+  <animate begin="0s" values="1;0" repeatCount="indefinite" dur="1s" keyTimes="0;1" attributeName="fill-opacity"></animate>
+</circle>
+</g>
+</g><g></g></g><!-- [ldio] generated by https://loading.io --></svg>
\ No newline at end of file
diff --git a/assets/admin/js/onboarding.js b/assets/admin/js/onboarding.js
index 9c46ad01..d4866290 100644
--- a/assets/admin/js/onboarding.js
+++ b/assets/admin/js/onboarding.js
@@ -5,7 +5,7 @@ jQuery(document).ready(function($) {
 		$imgName = $imgInfo.find('.js-onboarding-img-name'),
 		$fields = $('.js-onboarding-field'),
 		$btn = $('.js-onboarding-btn'),
-		$validateTokenBtn = $('.js-onboarding-validate-token'),
+		$connectCastosBtn = $('.js-onboarding-castos-connect'),
 		$hostingStep2 = $('.js-hosting-form'),
 		$accordion = $('.js-accordion'),
 		$dragable = $('.js-onboarding-dragable'),
@@ -54,29 +54,33 @@ jQuery(document).ready(function($) {
 			});
 		},
 		initTokenValidation = function(){
-			$validateTokenBtn.on('validated', function () {
-				//don't use $btn since it has custom validation
-				var $form = $validateTokenBtn.closest('form'),
-					$nextButton = $form.find('button[type=submit]');
-				$(this).removeClass('validating');
-				if ($validateTokenBtn.hasClass('valid')) {
+			$connectCastosBtn.on('connected', function (e, response) {
+				var $form = $connectCastosBtn.closest('form'),
+					$nextButton = $form.find('button[type=submit]'),
+					$me = $(this),
+					$msg = $form.find('.connect-castos-message'),
+					$field = $('.js-onboarding-castos-connect-field');
+				$me.removeClass('connecting');
+				$msg.show();
+
+				if ("success" === response.status) {
+					$me.html($me.data('connected-txt'));
+					$field.attr('disabled', 'disabled');
 					$nextButton.removeAttr('disabled');
-					$form.find('.validate-api-credentials-message').html('');
-					$(this).html($(this).data('valid-txt'));
 				} else {
-					$(this).html($(this).data('initial-txt'));
+					$me.html($me.data('initial-txt'));
 					$nextButton.attr('disabled', 'disabled');
 				}
 			});
 
-			$validateTokenBtn.on('click', function(){
-				$(this).addClass('validating').html($(this).data('validating-txt'));
+			$connectCastosBtn.on('connecting', function(){
+				$(this).addClass('connecting').html($(this).data('connecting-txt'));
 			});
 
-			$('.js-onboarding-validate-token-field').on('change paste keyup', function(){
-				var $nextButton = $validateTokenBtn.closest('form').find('button[type=submit]');
-				$validateTokenBtn.html($validateTokenBtn.data('initial-txt'));
-				$validateTokenBtn.removeClass('valid');
+			$('.js-onboarding-castos-connect-field').on('change paste keyup', function(){
+				var $nextButton = $connectCastosBtn.closest('form').find('button[type=submit]');
+				$connectCastosBtn.html($connectCastosBtn.data('initial-txt'));
+				$connectCastosBtn.removeClass('valid');
 				$nextButton.attr('disabled', 'disabled');
 			});
 		},
diff --git a/assets/admin/scss/_admin.scss b/assets/admin/scss/_admin.scss
index ce7728fd..e85ff61b 100644
--- a/assets/admin/scss/_admin.scss
+++ b/assets/admin/scss/_admin.scss
@@ -271,6 +271,19 @@ textarea#episode_embed_code {
 	}
 }
 
+#podmotor_account_api_token {
+	width: 100%;
+	min-width: 100%;
+	display: block;
+	margin-bottom: 8px;
+}
+
+.ssp-settings-integrations {
+	table label {
+		margin-top: 10px;
+		display: block;
+	}
+}
 
 .ssp-settings:not(.ssp-settings-extensions,.ssp-settings-integrations) {
 	background: $clr_white;
@@ -298,10 +311,6 @@ textarea#episode_embed_code {
 		}
 	}
 
-	.validate-api-credentials-message {
-		margin-left: 30px;
-	}
-
 	.loader {
 		position: relative;
 		&:after {
@@ -334,6 +343,42 @@ textarea#episode_embed_code {
 	}
 }
 
+.ssp-main-settings {
+	.error {
+		color: $clr_red_400;
+	}
+
+	.hidden {
+		display: none;
+	}
+
+	.disconnect-castos {
+		margin-right: 8px;
+		vertical-align: middle;
+	}
+
+	&.tab-castos-hosting {
+		.loader {
+			position: relative;
+			&:after {
+				content: '';
+				display: block;
+				background: url(../img/loader2.svg) no-repeat;
+				position: absolute;
+				right: -50px;
+				top: -9px;
+				background-size: contain;
+				width: 44px;
+				height: 44px;
+			}
+		}
+	}
+}
+
+.connect-castos-message {
+	margin-left: 20px;
+}
+
 .ssp-sync-podcast {
 	display: flex;
 	justify-content: space-between;
diff --git a/assets/admin/scss/_onboarding.scss b/assets/admin/scss/_onboarding.scss
index a9bda3c3..7eb298af 100644
--- a/assets/admin/scss/_onboarding.scss
+++ b/assets/admin/scss/_onboarding.scss
@@ -156,7 +156,7 @@
 
 	&-step-2, &-step-3, &-step-4, &-step-5 {
 		.ssp-onboarding__steps::after {
-			background: #DF4E4F;
+			background: $clr_red_400;
 			width: initial;
 		}
 	}
@@ -191,6 +191,10 @@
 			right: 180px;
 		}
 
+		.ssp-onboarding__settings-body {
+			padding: 24px 24px 36px;
+		}
+
 		&__info {
 			display: flex;
 			flex-direction: column;
@@ -317,7 +321,7 @@
 				li {
 					&:hover {
 						svg path, svg rect {
-							fill: #DF4E4F;
+							fill: $clr_red_400;
 						}
 					}
 				}
@@ -452,7 +456,7 @@
 			z-index: 0;
 			visibility: hidden;
 			transition: .6s;
-			margin-top: -444px;
+			margin-top: -345px;
 
 			&--opened {
 				visibility: visible;
@@ -585,13 +589,19 @@
 		margin-top: 25px;
 		position: relative;
 
+		span.connect-castos-message {
+			display: block;
+			text-align: left;
+			margin: 20px 0 0;
+		}
+
 		button[type=submit], .button {
 			position: relative;
 			height: 50px;
 			border-radius: 6px;
 			border: 0;
 			color: #FFFFFF;
-			background: #DF4E4F;
+			background: $clr_red_400;
 			font-size: 18px;
 			padding: 0 55px 0 33px;
 			transition: .3s;
@@ -650,7 +660,7 @@
 			}
 		}
 
-		.validate-token {
+		.castos-connect {
 			float: left;
 			position: relative;
 			padding: 0 20px 0 45px;
@@ -659,42 +669,62 @@
 				content: '';
 				display: block;
 				position: absolute;
-				background: url(../img/validate.svg) no-repeat;
-				background-size: cover;
-				left: 19px;
-				top: 17px;
-				width: 14px;
-				height: 18px;
-				filter: none;
+				background: url(../img/connect.svg) no-repeat;
+				left: 13px;
+				top: 13px;
+				width: 25px;
+				height: 23px;
+				filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(198deg) brightness(101%) contrast(102%);
+				background-size: contain;
+			}
+
+			&:disabled {
+				background: #9CA3AF !important;
+				color: #D1D5DB !important;
+				&:after {
+					//filter: invert(92%) sepia(17%) saturate(74%) hue-rotate(176deg) brightness(92%) contrast(88%);
+					filter: invert(94%) sepia(8%) saturate(150%) hue-rotate(177deg) brightness(90%) contrast(93%);
+					transition: none;
+				}
 			}
 
-			&.validating {
-				background: #374151;
+			&.connecting {
+				background: #DE7373 !important;
+				color: #FFFFFF !important;
 
-				&:hover, &:active, &:focus {
-					background: #374151;
+				&:hover, &:active, &:focus, &:disabled {
+					background: #DE7373;
 				}
 
 				&:after {
 					width: 17px;
 					height: 18px;
-					background-image: url(../img/validating.svg);
+					background-image: url(../img/connecting.svg);
+					animation: rotation 2s infinite linear;
+					filter: none;
+					transition: none;
+					top: 15px;
+					left: 15px;
 				}
 			}
 
-			&.valid {
-				background: #10B981;
+			&.connected {
+				background: #10B981 !important;
+				color: $clr_white !important;
 				padding: 0 16px 0 45px;
-
 				&:hover, &:active, &:focus {
 					background: #10B981;
 				}
+				opacity: .7;
 
 				&:after {
-					width: 16px;
-					height: 12px;
-					top: 19px;
-					background-image: url(../img/checkbox.svg);
+					background-image: url(../img/connect.svg);
+					left: 13px;
+					top: 13px;
+					width: 25px;
+					height: 23px;
+					filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(198deg) brightness(101%) contrast(102%);
+					background-size: contain;
 				}
 			}
 		}
@@ -732,7 +762,7 @@
 			display: block;
 			height: 1.5px;
 			width: 14px;
-			background: #DF4E4F;
+			background: $clr_red_400;
 			position: absolute;
 			left: 7px;
 			top: 46%;
@@ -752,12 +782,6 @@
 		}
 	}
 
-	.validate-api-credentials-message {
-		position: absolute;
-		left: 0;
-		bottom: -18px;
-	}
-
 	&__links {
 		display: flex;
 		text-align: left;
@@ -822,7 +846,7 @@
 				width: 30px;
 				height: 30px;
 				background: #FFF;
-				color: #DF4E4F;
+				color: $clr_red_400;
 				font-size: 20px;
 				font-weight: 600;
 				border-radius: 50%;
@@ -907,7 +931,7 @@
 }
 
 /* Hide the WP bars */
-.admin_page_ssp-onboarding-1, .admin_page_ssp-onboarding-2, .admin_page_ssp-onboarding-3, .admin_page_ssp-onboarding-4, .admin_page_ssp-onboarding-5  {
+.podcast_page_ssp-onboarding-1, .admin_page_ssp-onboarding-1, .admin_page_ssp-onboarding-2, .admin_page_ssp-onboarding-3, .admin_page_ssp-onboarding-4, .admin_page_ssp-onboarding-5  {
 	#adminmenumain, #wpadminbar, #wpfooter {
 		display: none;
 	}
diff --git a/assets/css/settings.css b/assets/css/settings.css
index 95cb20c5..de8323bb 100644
--- a/assets/css/settings.css
+++ b/assets/css/settings.css
@@ -18,7 +18,7 @@
     height: auto;
 }
 
-#ssp-main-settings {
+#ssp-main-settings.castos-disconnected {
     width: 75%;
     float: left;
 }
@@ -36,11 +36,6 @@
     overflow: hidden;
 }
 
-#ssp-sidebar .sidebar-content.castos-connected {
-	border: none;
-	background: none;
-}
-
 #ssp-sidebar .sidebar-content h3 {
     color: #6c25d0;
     margin: -20px -20px 0 -20px;
diff --git a/assets/js/admin-menu.js b/assets/js/admin-menu.js
new file mode 100644
index 00000000..e75ddc8f
--- /dev/null
+++ b/assets/js/admin-menu.js
@@ -0,0 +1,11 @@
+jQuery( document ).ready( function( $ ) {
+	var initOnboardingMenu = function() {
+		var $firstMenuItem = $( '#menu-posts-podcast' ).find( '.wp-submenu a.wp-first-item' );
+
+		if ( $firstMenuItem.length && $firstMenuItem.attr( 'href' ).includes( 'page=ssp-onboarding-1' ) ) {
+			$firstMenuItem.closest('ul').find('li').not('.wp-first-item').hide();
+		}
+	}
+
+	initOnboardingMenu();
+} );
diff --git a/assets/js/admin.js b/assets/js/admin.js
index 65937b54..90888b60 100644
--- a/assets/js/admin.js
+++ b/assets/js/admin.js
@@ -257,5 +257,19 @@ jQuery(document).ready(function($) {
 		});
 	}
 
+	var initNotifications = function () {
+		$('.notice.is-constant').on( 'click', '.notice-dismiss', function () {
+			var $notice = $(this).closest('.notice'),
+				data = {
+					'action': 'remove_constant_notice',
+					'id': $notice.data('id'),
+					'nonce': $notice.data('nonce'),
+				};
+
+			$.post(ajaxurl, data);
+		});
+	};
+
 	initDynamoBtn();
+	initNotifications();
 });
diff --git a/assets/js/settings.js b/assets/js/settings.js
index d6bad924..b26e80ad 100644
--- a/assets/js/settings.js
+++ b/assets/js/settings.js
@@ -5,11 +5,8 @@
  */
 
 jQuery(document).ready(function($) {
-
-	var $podmotorAccountEmail = $("#podmotor_account_email"),
-		$podmotorAccountAPIToken = $("#podmotor_account_api_token"),
-		$parentCategories = $('.js-parent-category'),
-		$validateBtn = $("#validate_api_credentials");
+	var $podmotorAccountAPIToken = $("#podmotor_account_api_token"),
+		$parentCategories = $('.js-parent-category');
 
 	const { __ } = wp.i18n;
 
@@ -35,103 +32,106 @@ jQuery(document).ready(function($) {
 	}
 
 	function initCastosAPICredentials() {
-		var disableSubmitButton = function () {
-				/**
-				 * If either API field is empty, disable the submit button
-				 */
-				if ($podmotorAccountEmail.val() === '' || $podmotorAccountAPIToken.val() === '') {
-					$("#ssp-settings-submit").prop("disabled", "disabled");
-				}
-
-				/**
-				 * If the user changes the email, disable the submit button
-				 */
-				$podmotorAccountEmail.on("change paste keydown keyup", function () {
-					$("#ssp-settings-submit").prop("disabled", "disabled");
-				});
-
-				/**
-				 * If the user changes the account api key, disable the submit button
-				 */
-				$podmotorAccountAPIToken.on("change paste keydown keyup", function () {
-					$("#ssp-settings-submit").prop("disabled", "disabled");
-				});
-			},
-			/**
-			 * Validate the api credentials
-			 */
-			validateAPICredentials = function () {
-				$validateBtn.on("click", function () {
-
-					var podmotor_account_email = $("#podmotor_account_email").val(),
-						podmotor_account_api_token = $("#podmotor_account_api_token").val(),
-						nonce = $("#podcast_settings_tab_nonce").val(),
-						$msg = $('.validate-api-credentials-message');
-
-					if (!$msg.length) {
-						$msg = $('<span class="validate-api-credentials-message"></span>');
-						$validateBtn.parent().append($msg);
-					}
-
-					$msg.html("Validating API credentials...");
-
-					$validateBtn.addClass('loader');
-
-					$.ajax({
-						method: "GET",
-						url: ajaxurl,
-						data: {
-							action: "validate_castos_credentials",
-							api_token: podmotor_account_api_token,
-							email: podmotor_account_email,
-							nonce: nonce
-						}
-					})
-						.done(function (response) {
-							$validateBtn.removeClass('loader');
-							if (response.status === 'success') {
-								$(".validate-api-credentials-message").html("Credentials Valid. Please click 'Save Settings' to save Credentials.");
-								$("#ssp-settings-submit").prop("disabled", "");
-								$validateBtn.val('Valid Credentials');
-								$validateBtn.addClass('valid');
-							} else {
-								$validateBtn.addClass('invalid');
-								$(".validate-api-credentials-message").html(response.message);
-							}
-							$validateBtn.trigger('validated');
-						});
-				});
-			},
-			/**
-			 * Disconnect Castos checkbox on change, renders a confirmation message to the user.
-			 */
-			disconnectCastos = function () {
-				$('#podmotor_disconnect').on('change', function (event) {
-					var $checkbox = $(this);
-
-					// if the change is to uncheck the checkbox
-					if (!$checkbox.is(':checked')) {
-						return;
-					}
-
-					var $message = 'If you disconnect from Castos hosting you will no longer be able to upload media files to the Castos hosting platform. If you’re no longer a Castos customer your media files may no longer be available to your listeners.';
-					var user_input = confirm($message);
-					if (user_input !== true) {
-						// Ensures this code runs AFTER the browser handles click however it wants.
-						setTimeout(function () {
-							$checkbox.removeAttr('checked');
-						}, 0);
-						event.preventDefault();
-						event.stopPropagation();
-					}
-				});
-			}
-
-		if ($podmotorAccountEmail.length > 0 && $podmotorAccountAPIToken.length > 0) {
-			disableSubmitButton();
-			validateAPICredentials();
-			disconnectCastos();
+	  var $connectBtn = $(".castos-connect"),
+	  disableConnectButton = function(){
+		  $connectBtn.prop("disabled", "disabled");
+	  },
+	  enableConnectButton = function(){
+		  $connectBtn.prop("disabled", "").removeClass('disabled');
+	  },
+	  connectButtonStates = function () {
+		  if ($podmotorAccountAPIToken.length) {
+			  $connectBtn.show();
+		  }
+		  $podmotorAccountAPIToken.on("focus change paste keydown keyup", function () {
+			  $podmotorAccountAPIToken.val() ? enableConnectButton() : disableConnectButton();
+		  });
+
+		  $podmotorAccountAPIToken.on("focus", function(){
+			  $('.connect-castos-message').html('').removeClass('error');
+		  });
+	  },
+	  /**
+	   * Validate the api credentials
+	   */
+	  initConnect = function () {
+		  $connectBtn.on('click', function (e) {
+			  e.preventDefault();
+			  e.stopPropagation();
+			  $connectBtn.prop('disabled', 'disabled');
+			  $connectBtn.trigger('connecting');
+
+			  var podmotor_account_api_token = $('#podmotor_account_api_token').val(),
+				  nonce = $('#podcast_settings_tab_nonce').val(),
+				  $msg = $('.connect-castos-message');
+
+			  if ($msg.length) {
+				  $msg.html('').removeClass('error');
+			  } else {
+				  $msg = $('<span class="connect-castos-message"></span>');
+				  $connectBtn.parent().append($msg);
+			  }
+
+			  $connectBtn.addClass('loader');
+
+			  $.ajax({
+				  method: 'GET',
+				  url: ajaxurl,
+				  data: {
+					  action: 'connect_castos',
+					  api_token: podmotor_account_api_token,
+					  nonce: nonce,
+				  },
+			  })
+			  .done(function (response) {
+				  $connectBtn.trigger('connected', response);
+				  if (response.status === 'success') {
+					  $connectBtn.addClass('connected');
+					  if ( ! $connectBtn.data( 'no-reload' ) ) {
+						  window.location.reload();
+					  } else {
+						  $msg.html( response.message );
+					  }
+				  } else {
+					  $connectBtn.removeClass('loader');
+					  $msg.addClass('error');
+					  $msg.html(response.message);
+				  }
+			  })
+		  })
+	  },
+	  /**
+		* Disconnect Castos checkbox on change, renders a confirmation message to the user.
+		*/
+	  initDisconnect = function () {
+		  var $disconnect = $('#disconnect_castos');
+		  $disconnect.on('click', function (event) {
+			  var $message = 'If you disconnect from Castos hosting you will no longer be able to upload media files to the Castos hosting platform. If you’re no longer a Castos customer your media files may no longer be available to your listeners.';
+			  var user_input = confirm($message);
+			  if (user_input === true) {
+				  $disconnect.addClass('loader');
+				  $disconnect.parent().find('label').remove();
+				  $.ajax({
+					  method: 'GET',
+					  url: ajaxurl,
+					  data: {
+						  action: 'disconnect_castos',
+						  nonce:  $('#podcast_settings_tab_nonce').val(),
+					  },
+				  })
+					  .done(function (response) {
+						  window.location.reload();
+					  })
+			  }
+		  });
+	  }
+
+		if ($podmotorAccountAPIToken.length > 0) {
+			connectButtonStates();
+			initConnect();
 		}
+
+		initDisconnect();
 	}
 
 	function initSubcategoryFiltration(){
diff --git a/package.json b/package.json
index 86cfe793..73ec5df8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "seriously-simple-podcasting",
-  "version": "3.2.0",
+  "version": "3.5.0",
   "main": "build/index.js",
   "author": "CastosHQ",
   "devDependencies": {
diff --git a/php/classes/controllers/class-ads-controller.php b/php/classes/controllers/class-ads-controller.php
index 61b0a0e5..29f55e43 100644
--- a/php/classes/controllers/class-ads-controller.php
+++ b/php/classes/controllers/class-ads-controller.php
@@ -113,7 +113,7 @@ protected function is_ads_enabled_in_castos() {
 
 		$series_id = $this->get_current_feed_series_id();
 
-		if ( empty( $podcasts['data']['podcast_list'] ) ) {
+		if ( ! is_array( $podcasts ) || empty( $podcasts['data']['podcast_list'] ) ) {
 			return false;
 		}
 
diff --git a/php/classes/controllers/class-app-controller.php b/php/classes/controllers/class-app-controller.php
index bafc448a..a2dce628 100644
--- a/php/classes/controllers/class-app-controller.php
+++ b/php/classes/controllers/class-app-controller.php
@@ -259,7 +259,9 @@ protected function bootstrap() {
 
 		$this->episode_repository = new Episode_Repository( $this->feed_handler );
 
-		$this->castos_handler = new Castos_Handler( $this->feed_handler, $this->logger );
+		$this->admin_notices_handler = new Admin_Notifications_Handler();
+
+		$this->castos_handler = new Castos_Handler( $this->feed_handler, $this->logger, $this->admin_notices_handler );
 
 		$this->onboarding_controller = new Onboarding_Controller( $this->renderer, $this->settings_handler );
 
@@ -273,15 +275,13 @@ protected function bootstrap() {
 
 		$this->widgets_controller = new Widgets_Controller( $this->file, $this->version );
 
-		$this->ajax_handler = new Ajax_Handler( $this->castos_handler );
+		$this->ajax_handler = new Ajax_Handler( $this->castos_handler, $this->admin_notices_handler );
 
 		$this->podping_handler = new Podping_Handler( $this->logger );
 
-		$this->admin_notices_handler = new Admin_Notifications_Handler( $this->token );
-
 		$this->assets_controller = new Assets_Controller();
 
-		$this->series_handler    = new Series_Handler( $this->admin_notices_handler, $this->roles_handler, $this->castos_handler, $this->settings_handler, $this->episode_repository );
+		$this->series_handler = new Series_Handler( $this->admin_notices_handler, $this->roles_handler, $this->castos_handler, $this->settings_handler, $this->episode_repository );
 
 		$this->upgrade_handler = new Upgrade_Handler( $this->episode_repository, $this->castos_handler, $this->series_handler );
 
@@ -331,7 +331,7 @@ protected function bootstrap() {
 		$this->load_plugin_textdomain();
 	}
 
-	protected function init_integrations(){
+	protected function init_integrations() {
 		/*
 		 * Gutenberg integration.
 		 * Only load Blocks if the WordPress version is newer than 5.0.
@@ -393,7 +393,7 @@ public function get_available_services() {
 	 *
 	 * @return string
 	 * */
-	protected function get_wp_version(){
+	protected function get_wp_version() {
 		global $wp_version;
 
 		return $wp_version;
@@ -402,7 +402,7 @@ protected function get_wp_version(){
 	/**
 	 * Init REST API
 	 */
-	protected function init_rest_api(){
+	protected function init_rest_api() {
 		global $wp_version;
 
 		// Only load WP REST API Endpoints if the WordPress version is newer than 4.7.
@@ -494,7 +494,6 @@ public function get_settings_handler() {
 	}
 
 
-
 	/**
 	 * Register the Castos Blog dashboard widget
 	 * Hooks into the wp_dashboard_setup action hook
@@ -547,9 +546,9 @@ public function ssp_castos_dashboard_output( $widget_id, $feeds ) {
 		/**
 		 * Check if there is a cached version of the RSS Feed and output it
 		 */
-		$locale    = get_user_locale();
-		$cache_key = 'ssp_dash_v2_' . md5( $widget_id . '_' . $locale );
-		$rss_output    = get_transient( $cache_key );
+		$locale     = get_user_locale();
+		$cache_key  = 'ssp_dash_v2_' . md5( $widget_id . '_' . $locale );
+		$rss_output = get_transient( $cache_key );
 		if ( false !== $rss_output ) {
 			return $rss_output;
 		}
@@ -568,13 +567,14 @@ public function ssp_castos_dashboard_output( $widget_id, $feeds ) {
 		 * Set up the cached version to expire in 12 hours and output the content
 		 */
 		set_transient( $cache_key, $rss_output, 12 * HOUR_IN_SECONDS );
+
 		return $rss_output;
 	}
 
 	/**
 	 * Adding podcast episodes to 'At a glance' dashboard widget
 	 *
-	 * @param  array $items Existing items
+	 * @param array $items Existing items
 	 *
 	 * @return array        Updated items
 	 */
@@ -583,8 +583,8 @@ public function glance_items( $items = array() ) {
 		$num_posts = count( ssp_episodes( - 1, '', false, 'glance' ) );
 
 		$post_type_object = get_post_type_object( $this->token );
-		$text = _n( '%s Episode', '%s Episodes', $num_posts, 'seriously-simple-podcasting' );
-		$text = sprintf( $text, number_format_i18n( $num_posts ) );
+		$text             = _n( '%s Episode', '%s Episodes', $num_posts, 'seriously-simple-podcasting' );
+		$text             = sprintf( $text, number_format_i18n( $num_posts ) );
 
 		if ( $post_type_object && current_user_can( $post_type_object->cap->edit_posts ) ) {
 			$items[] = sprintf( '<a class="%1$s-count" href="edit.php?post_type=%1$s">%2$s</a>', $this->token, $text ) . "\n";
@@ -598,10 +598,10 @@ public function glance_items( $items = array() ) {
 	/**
 	 * Adding appreciation links to the SSP record in the plugin list table
 	 *
-	 * @param  array $plugin_meta Default plugin meta links
-	 * @param  string $plugin_file Plugin file
-	 * @param  array $plugin_data Array of plugin data
-	 * @param  string $status Plugin status
+	 * @param array $plugin_meta Default plugin meta links
+	 * @param string $plugin_file Plugin file
+	 * @param array $plugin_data Array of plugin data
+	 * @param string $status Plugin status
 	 *
 	 * @return array               Modified plugin meta links
 	 */
@@ -613,6 +613,7 @@ public function plugin_row_meta( $plugin_meta = array(), $plugin_file = '', $plu
 		$plugin_meta['docs']   = '<a href="https://support.castos.com/?utm_medium=sspodcasting&utm_source=wordpress&utm_campaign=wpplugin_08_2019" target="_blank">' . __( 'Documentation', 'seriously-simple-podcasting' ) . '</a>';
 		$plugin_meta['addons'] = '<a href="https://castos.com/add-ons/?utm_medium=sspodcasting&utm_source=wordpress&utm_campaign=wpplugin_08_2019" target="_blank">' . __( 'Add-ons', 'seriously-simple-podcasting' ) . '</a>';
 		$plugin_meta['review'] = '<a href="https://wordpress.org/support/view/plugin-reviews/' . $plugin_data['slug'] . '?rate=5#postform" target="_blank">' . __( 'Write a review', 'seriously-simple-podcasting' ) . '</a>';
+
 		return $plugin_meta;
 	}
 
@@ -650,7 +651,7 @@ public function load_plugin_textdomain() {
 	/**
 	 * Hide RSS footer created by WordPress SEO from podcast RSS feed
 	 *
-	 * @param  boolean $include_footer Default inclusion value
+	 * @param boolean $include_footer Default inclusion value
 	 *
 	 * @return boolean                 Modified inclusion value
 	 */
@@ -688,6 +689,7 @@ public function activate() {
 	public function deactivate() {
 		flush_rewrite_rules();
 		$this->roles_handler->remove_custom_roles();
+		$this->castos_handler->remove_api_credentials();
 	}
 
 	/**
@@ -710,7 +712,7 @@ public function maybe_run_plugin_updates() {
 	/**
 	 * Add rating link to admin footer on SSP settings pages
 	 *
-	 * @param  string $footer_text Default footer text
+	 * @param string $footer_text Default footer text
 	 *
 	 * @return string              Modified footer text
 	 */
@@ -722,7 +724,7 @@ public function admin_footer_text( $footer_text ) {
 			// Change the footer text
 			if ( ! get_option( 'ssp_admin_footer_text_rated' ) ) {
 				$footer_text = sprintf( __( 'If you like %1$sSeriously Simple Podcasting%2$s please leave a %3$s&#9733;&#9733;&#9733;&#9733;&#9733;%4$s rating. A huge thank you in advance!', 'seriously-simple-podcasting' ), '<strong>', '</strong>', '<a href="https://wordpress.org/support/plugin/seriously-simple-podcasting/reviews/?rate=5#new-post" target="_blank" class="ssp-rating-link" data-rated="' . __( 'Thanks!', 'seriously-simple-podcasting' ) . '">', '</a>' );
-				$footer_text .= sprintf("<script type='text/javascript'>
+				$footer_text .= sprintf( "<script type='text/javascript'>
 					(function($){
 					  $('a.ssp-rating-link').click(function() {
 						$.post( '" . admin_url( 'admin-ajax.php' ) . "', { action: 'ssp_rated', nonce: '%s' } );
@@ -741,8 +743,8 @@ public function admin_footer_text( $footer_text ) {
 	/**
 	 * Clear the cache on post save.
 	 *
-	 * @param  int $id POST ID
-	 * @param  object $post WordPress Post Object
+	 * @param int $id POST ID
+	 * @param object $post WordPress Post Object
 	 *
 	 * @return void
 	 */
@@ -788,7 +790,7 @@ public function submit_import_form() {
 		if ( $trigger_import_submit === $submit ) {
 			$import = sanitize_text_field( $_POST['ss_podcasting_podmotor_import'] );
 			if ( 'on' === $import ) {
-				$result         = $this->castos_handler->trigger_podcast_import();
+				$result = $this->castos_handler->trigger_podcast_import();
 				if ( 'success' !== $result['status'] ) {
 					add_action( 'admin_notices', array( $this, 'trigger_import_error' ) );
 				} else {
diff --git a/php/classes/controllers/class-assets-controller.php b/php/classes/controllers/class-assets-controller.php
index 890d7ad3..8e9e0925 100644
--- a/php/classes/controllers/class-assets-controller.php
+++ b/php/classes/controllers/class-assets-controller.php
@@ -105,6 +105,13 @@ public function enqueue_admin_styles( $hook ) {
 	 */
 	public function enqueue_admin_scripts( $hook ) {
 
+		wp_enqueue_script(
+			'ssp-admin-menu',
+			esc_url( $this->assets_url . 'js/admin-menu' . $this->script_suffix . '.js' ),
+			array( 'jquery' ),
+			$this->version
+		);
+
 		if ( ! $this->need_admin_scripts( $hook ) ) {
 			return;
 		}
diff --git a/php/classes/controllers/class-cron-controller.php b/php/classes/controllers/class-cron-controller.php
index afeadb00..3be3dfd6 100644
--- a/php/classes/controllers/class-cron-controller.php
+++ b/php/classes/controllers/class-cron-controller.php
@@ -35,6 +35,12 @@ class Cron_Controller {
 	 * */
 	protected $upgrade_handler;
 
+	const SYNC_SCHEDULE_META = 'podmotor_schedule_upload';
+
+	const ATTEMPTS_META = 'castos_sync_attempts';
+
+	const MAX_ATTEMPTS = 3;
+
 	/**
 	 * @param Castos_Handler $castos_handler
 	 * @param Episode_Repository $episodes_respository
@@ -42,9 +48,9 @@ class Cron_Controller {
 	 */
 	public function __construct( $castos_handler, $episodes_respository, $upgrade_handler ) {
 
-		$this->castos_handler = $castos_handler;
+		$this->castos_handler       = $castos_handler;
 		$this->episodes_respository = $episodes_respository;
-		$this->upgrade_handler = $upgrade_handler;
+		$this->upgrade_handler      = $upgrade_handler;
 
 		add_action( 'admin_init', array( $this, 'schedule_events' ) );
 		add_filter( 'cron_schedules', array( $this, 'add_cron_intervals' ) );
@@ -55,7 +61,7 @@ public function __construct( $castos_handler, $episodes_respository, $upgrade_ha
 	/**
 	 * @return void
 	 */
-	protected function run_actions(){
+	protected function run_actions() {
 		add_action( 'ssp_cron_hook', array( $this, 'upload_scheduled_episodes' ) );
 		$this->upgrade_handler->run_upgrade_actions();
 	}
@@ -80,7 +86,7 @@ public function schedule_events() {
 		if ( ! wp_next_scheduled( 'ssp_cron_hook' ) ) {
 			wp_schedule_event( time(), 'hourly', 'ssp_cron_hook' );
 		}
-		if( ! wp_next_scheduled('ssp_check_ads') ){
+		if ( ! wp_next_scheduled( 'ssp_check_ads' ) ) {
 			wp_schedule_event( time(), 'daily', 'ssp_check_ads' );
 		}
 	}
@@ -90,20 +96,36 @@ public function schedule_events() {
 	 */
 	public function upload_scheduled_episodes() {
 		$uploaded = 0;
-		$logger = new Log_Helper();
+		$logger   = new Log_Helper();
+
 		foreach ( $this->episodes_respository->get_scheduled_episodes() as $episode ) {
 			$response = $this->castos_handler->upload_episode_to_castos( $episode );
 
-			if ( 'success' === $response['status'] ) {
-				delete_post_meta( $episode->ID, 'podmotor_schedule_upload' );
+			if ( $response->success ) {
+				$this->unschedule_episode( $episode->ID );
 				$this->episodes_respository->update_episode_sync_status( $episode->ID, Sync_Status::SYNC_STATUS_SYNCED );
 				$this->episodes_respository->delete_episode_sync_error( $episode->ID );
-				$uploaded++;
+				$uploaded ++;
+			} else {
+				$attempts = get_post_meta( $episode->ID, self::ATTEMPTS_META, true );
+				if ( $attempts < self::MAX_ATTEMPTS ) {
+					update_post_meta( $episode->ID, self::ATTEMPTS_META, ++ $attempts );
+				} else {
+					$this->unschedule_episode( $episode->ID );
+				}
 			}
 
-			if ( 404 == $response['code'] ) {
-				delete_post_meta( $episode->ID, 'podmotor_schedule_upload' );
-				$logger->log( sprintf( 'Cron: could not upload episode %d', $episode->ID ) );
+			if ( 404 == $response->code ) {
+				$castos_episode_id = get_post_meta( $episode->ID, 'podmotor_episode_id', true );
+
+				// File does not exist anymore, remove connection
+				if ( $castos_episode_id ) {
+					delete_post_meta( $episode->ID, 'podmotor_episode_id' );
+					delete_post_meta( $episode->ID, 'podmotor_file_id' );
+				}
+
+				$this->unschedule_episode( $episode->ID );
+				$logger->log( sprintf( 'Cron: file does not exists on Castos, stop syncing: %d', $episode->ID ) );
 			}
 		}
 
@@ -113,4 +135,8 @@ public function upload_scheduled_episodes() {
 
 		return $uploaded;
 	}
+
+	protected function unschedule_episode( $episode_id ) {
+		delete_post_meta( $episode_id, self::SYNC_SCHEDULE_META );
+	}
 }
diff --git a/php/classes/controllers/class-frontend-controller.php b/php/classes/controllers/class-frontend-controller.php
index e5bde3b9..467923cf 100644
--- a/php/classes/controllers/class-frontend-controller.php
+++ b/php/classes/controllers/class-frontend-controller.php
@@ -1080,6 +1080,10 @@ public function podcast_episode ( $episode_id = 0, $content_items = array( 'titl
 			return '';
 		}
 
+		if ( '-1' == $episode_id ) {
+			$episode_id = $this->episode_repository->get_latest_episode_id();
+		}
+
 		// Get episode object
 		$episode = get_post( $episode_id );
 
diff --git a/php/classes/controllers/class-onboarding-controller.php b/php/classes/controllers/class-onboarding-controller.php
index c2abead0..390d5a3c 100644
--- a/php/classes/controllers/class-onboarding-controller.php
+++ b/php/classes/controllers/class-onboarding-controller.php
@@ -62,7 +62,7 @@ public function __construct( $renderer, $settings_handler ) {
 	 * Fix PHP deprecated warning for new WordPress installations on the first onboarding step.
 	 * */
 	public function fix_deprecated_warning() {
-		$page = filter_input(INPUT_GET, 'page');
+		$page = filter_input( INPUT_GET, 'page' );
 		if ( $page && ( false !== strpos( $page, self::ONBOARDING_BASE_SLUG ) ) ) {
 			global $title;
 			if ( ! isset( $title ) ) {
@@ -72,11 +72,10 @@ public function fix_deprecated_warning() {
 	}
 
 	public function maybe_start_onboarding( $plugin ) {
-		if ( $plugin !== plugin_basename( $this->file ) ) {
+		if ( $plugin !== plugin_basename( $this->file ) || wp_doing_ajax() ) {
 			return;
 		}
-		$title = ssp_get_option( 'data_title', '', ssp_get_default_series_id() );
-		if ( ! $title ) {
+		if ( ! ssp_onboarded() ) {
 			wp_redirect( admin_url( sprintf( 'admin.php?page=%s-1', self::ONBOARDING_BASE_SLUG ) ) );
 			exit();
 		}
@@ -87,16 +86,28 @@ public function enqueue_scripts() {
 		if ( false !== strpos( $screen->base, self::ONBOARDING_BASE_SLUG ) ) {
 			wp_enqueue_media();
 			wp_enqueue_script( 'ssp-onboarding', esc_url( $this->assets_url . 'admin/js/onboarding' . $this->script_suffix . '.js' ), array(
-				'jquery'
+				'jquery',
 			), $this->version );
 		}
 	}
 
 	public function register_pages() {
+		if ( ! ssp_onboarded() ) {
+			add_submenu_page(
+				'edit.php?post_type=' . SSP_CPT_PODCAST,
+				__( 'Onboarding Wizard', 'seriously-simple-podcasting' ),
+				__( 'Onboarding Wizard', 'seriously-simple-podcasting' ),
+				'manage_podcast',
+				'ssp-onboarding-1',
+				array( $this, 'step_1' ),
+				0
+			);
+		}
+
 		for ( $page_number = 1; $page_number <= self::STEPS_NUMBER; $page_number ++ ) {
-			$this->register_page( 'Onboarding wizzard', $this->get_page_slug( $page_number ), array(
+			$this->register_page( 'Onboarding wizard', $this->get_page_slug( $page_number ), array(
 				$this,
-				sprintf( 'step_%s', $page_number )
+				sprintf( 'step_%s', $page_number ),
 			) );
 		}
 	}
@@ -110,7 +121,18 @@ protected function register_page( $title, $slug, $callable ) {
 		add_submenu_page( '', __( $title, 'seriously-simple-podcasting' ), __( $title, 'seriously-simple-podcasting' ), Roles_Handler::MANAGE_PODCAST, $slug, $callable );
 	}
 
+	protected function maybe_update_feed_title() {
+		$default_series_id = ssp_get_default_series_id();
+		$title             = ssp_get_option( 'data_title', '', $default_series_id );
+		if ( ! $title ) {
+			$title = $this->settings_handler->get_feed_title( ssp_get_default_series_id() );
+			$title = $title ?: __( 'My First Show', 'seriously-simple-podcasting' );
+			ssp_update_option( 'data_title', $title, $default_series_id );
+		}
+	}
+
 	public function step_1() {
+		$this->maybe_update_feed_title();
 		$this->render( $this->get_step_data( 1 ), 'onboarding/step-1' );
 	}
 
@@ -174,7 +196,7 @@ protected function get_step_data( $step_number ) {
 			$step_urls[ $page_number ] = $this->get_step_url( $page_number );
 		}
 		$data['step_urls'] = $step_urls;
-		$series_id = ( 4 === $step_number ) ? 0 : ssp_get_default_series_id();
+		$series_id         = ( 4 === $step_number ) ? 0 : ssp_get_default_series_id();
 
 		foreach ( $this->get_step_fields( $step_number ) as $field_name ) {
 			$data[ $field_name ] = ssp_get_option( $field_name, '', $series_id );
@@ -232,11 +254,12 @@ protected function save_step( $step_number ) {
 		foreach ( $this->get_step_fields( $step_number ) as $field_id ) {
 			$val = filter_input( INPUT_POST, $field_id );
 			if ( $val ) {
+				$val = strip_tags( $val );
 				ssp_update_option( $field_id, $val, $series_id );
 			}
 		}
 
-		if( 1 === $step_number ){
+		if ( 1 === $step_number ) {
 			$this->update_default_series_name( $default_series_id );
 			ssp_add_option( 'series_slug', CPT_Podcast_Handler::DEFAULT_SERIES_SLUG );
 		}
@@ -249,8 +272,9 @@ protected function save_step( $step_number ) {
 	 */
 	protected function update_default_series_name( $series_id ) {
 		$series = get_term_by( 'id', $series_id, ssp_series_taxonomy() );
-		$name   = ssp_get_option( 'data_title', get_bloginfo('name'), $series_id );
+		$name   = ssp_get_option( 'data_title', get_bloginfo( 'name' ), $series_id );
 		$slug   = wp_unique_term_slug( sanitize_title( $name ), $series );
+
 		return wp_update_term( $series_id, ssp_series_taxonomy(), array(
 			'name' => $name,
 			'slug' => $slug,
diff --git a/php/classes/controllers/class-players-controller.php b/php/classes/controllers/class-players-controller.php
index 812745b5..6373f98b 100644
--- a/php/classes/controllers/class-players-controller.php
+++ b/php/classes/controllers/class-players-controller.php
@@ -131,10 +131,22 @@ public function get_ajax_playlist_items() {
 	 *
 	 * @return string
 	 */
-	public function render_html_player( $episode_id, $skip_empty_audio = true, $context = 'block' ) {
+	public function render_html_player( $episode_id, $skip_empty_audio = true, $context = 'block', $args = array() ) {
 		$template_data = $this->episode_repository->get_player_data( $episode_id, null, false );
-		if ( $skip_empty_audio && ! array_key_exists( 'audio_file', $template_data ) ) {
-			return '';
+		if ( isset( $args['className'] ) ) {
+			$template_data['class'] .= ' ' . $args['className'];
+		}
+
+		if ( $skip_empty_audio && empty( $template_data['audio_file'] ) ) {
+			$show_with_warning = is_admin() ||
+			                     'edit' === filter_input( INPUT_GET, 'context' ) ||
+			                     'elementor' === filter_input( INPUT_GET, 'action' );
+
+			if ( $show_with_warning ) {
+				$template_data['add_empty_warning'] = true;
+			} else {
+				return '';
+			}
 		}
 
 		$this->enqueue_player_assets();
@@ -267,6 +279,7 @@ public function render_playlist_player( $episodes, $atts ) {
 		global $wp;
 		$template_data['current_url'] = home_url( $wp->request );
 		$template_data['player_id']   = $player_id;
+		$template_data['class']       = $atts['class'];
 
 		if ( in_array( $atts['style'], array( 'light', 'dark' ) ) ) {
 			$template_data['player_mode'] = $atts['style'];
@@ -276,7 +289,7 @@ public function render_playlist_player( $episodes, $atts ) {
 			$template_data['playlist'][] = $this->episode_repository->get_player_data( $episode->ID );
 		}
 
-		return $this->renderer->render_deprecated( $template_data, 'players/castos-player' );
+		return $this->renderer->fetch( 'players/castos-player', $template_data );
 	}
 
 	/**
@@ -308,6 +321,7 @@ public function render_playlist_compact_player( $tracks, $atts, $width, $height
 
 		$safe_type  = esc_attr( $atts['type'] );
 		$safe_style = esc_attr( $atts['style'] );
+		$class      = $atts['class'];
 
 		static $instance = 0;
 		$instance ++;
@@ -317,9 +331,9 @@ public function render_playlist_compact_player( $tracks, $atts, $width, $height
 			do_action( 'wp_playlist_scripts', $atts['type'], $atts['style'] );
 		}
 
-		return $this->renderer->render_deprecated(
-			compact('safe_style', 'safe_type', 'data', 'width', 'height'),
-			'players/playlist-compact-player'
+		return $this->renderer->fetch(
+			'players/playlist-compact-player',
+			compact('safe_style', 'safe_type', 'data', 'width', 'height', 'class')
 		);
 	}
 
diff --git a/php/classes/controllers/class-podcast-post-types-controller.php b/php/classes/controllers/class-podcast-post-types-controller.php
index 8cc111db..f8557084 100644
--- a/php/classes/controllers/class-podcast-post-types-controller.php
+++ b/php/classes/controllers/class-podcast-post-types-controller.php
@@ -129,9 +129,37 @@ protected function register_hooks_and_filters() {
 		add_action( 'ssp_triggered_podcast_sync', array( $this, 'update_podcast_episodes_status' ), 10, 2 );
 
 		add_action( 'ssp_check_episode_sync_status', array( $this, 'maybe_update_sync_status' ), 10, 2 );
+
+		// Handle translations
+		add_filter( 'pll_copy_post_metas', array( $this, 'handle_polylang_translations' ), 10, 3 );
+	}
+
+	/**
+	 * Handle Polylang translations - prevent copying episode meta fields.
+	 *
+	 * @param array $metas
+	 *
+	 * @return array
+	 */
+	public function handle_polylang_translations( $metas, $sync, $post_id ) {
+		$post = get_post( $post_id );
+		if ( ! in_array( $post->post_type, ssp_post_types() ) ) {
+			return $metas;
+		}
+		$fields  = array_keys( $this->custom_fields( true ) );
+		$fields  = array_merge( $fields, array(
+			'enclosure',
+			'castos_sync_attempts',
+			'podmotor_episode_id',
+			'podmotor_file_id',
+		) );
+		$allowed = array( 'cover_image', 'cover_image_id' );
+		$fields  = array_diff( $fields, $allowed );
+
+		return array_diff( $metas, $fields );
 	}
 
-	public function add_custom_columns(){
+	public function add_custom_columns() {
 		$ssp_post_types = ssp_post_types();
 		foreach ( $ssp_post_types as $post_type ) {
 			add_filter( 'manage_edit-' . $post_type . '_columns', array( $this, 'register_custom_column_headings' ), 20, 2 );
@@ -163,7 +191,7 @@ public function maybe_update_sync_status( $episode_id, $episode_status ) {
 
 		// First, let's check if the podcast is still syncing and maybe update the status
 		if ( $syncing === $podcast_status || ! $podcast_status ) {
-			$sync_status = $this->castos_handler->get_podcast_sync_status( $series_id );
+			$sync_status    = $this->castos_handler->get_podcast_sync_status( $series_id );
 			$podcast_status = $sync_status->status;
 			$this->series_handler->update_sync_status( $series_id, $podcast_status );
 		}
@@ -238,9 +266,9 @@ public function notify_podping_on_series_added( $post_id, $term_id, $taxonomy )
 	 * This function is needed for such cases:
 	 *  - when a new episode without series is created
 	 *  - when a new episode with series was first created as draft and then published.
-	 * For all other cases, @see notify_podping_on_series_added()
+	 * For all other cases, @param \WP_Post $post
+	 * @see notify_podping_on_series_added()
 	 *
-	 * @param \WP_Post $post
 	 */
 	public function notify_podping( $post_id, $post, $update, $post_before ) {
 
@@ -315,12 +343,12 @@ public function prevent_copy_meta() {
 				return;
 			}
 
-			$remove_redundant_metas = function ( $post_id ){
+			$remove_redundant_metas = function ( $post_id ) {
 				$exclusions = [
 					'podmotor_file_id',
 					'podmotor_episode_id',
 					'audio_file',
-					'enclosure'
+					'enclosure',
 				];
 
 				foreach ( $exclusions as $exclusion ) {
@@ -336,7 +364,7 @@ public function prevent_copy_meta() {
 			} );
 
 			// This is for Post Duplicator plugin
-			add_action( 'mtphr_post_duplicator_created', function() use ( $remove_redundant_metas, $post_id ) {
+			add_action( 'mtphr_post_duplicator_created', function () use ( $remove_redundant_metas, $post_id ) {
 				$remove_redundant_metas( $post_id );
 			} );
 
@@ -414,7 +442,7 @@ public function meta_box_save( $post_id, $post ) {
 
 		$old_data = array();
 
-		$enclosure = '';
+		$enclosure     = '';
 		$old_enclosure = '';
 
 		foreach ( $field_data as $k => $field ) {
@@ -433,7 +461,7 @@ public function meta_box_save( $post_id, $post ) {
 			}
 
 			if ( $k == 'audio_file' ) {
-				$enclosure = $val;
+				$enclosure     = $val;
 				$old_enclosure = get_post_meta( $post_id, $k, true );
 			}
 
@@ -490,11 +518,11 @@ public function meta_box_save( $post_id, $post ) {
 	 *
 	 * @return bool
 	 */
-	public function save_podcast_action_check( $post ){
+	public function save_podcast_action_check( $post ) {
 		$podcast_post_types = ssp_post_types();
 
 		// Post type check
-		if (  ( 'trash' === $post->post_status ) || ! in_array( $post->post_type, $podcast_post_types ) ) {
+		if ( ( 'trash' === $post->post_status ) || ! in_array( $post->post_type, $podcast_post_types ) ) {
 			return false;
 		}
 
@@ -517,13 +545,13 @@ public function meta_box_setup( $post ) {
 		global $pagenow;
 		add_meta_box( 'podcast-episode-data', __( 'Podcast Episode Details', 'seriously-simple-podcasting' ), array(
 			$this,
-			'meta_box_content'
+			'meta_box_content',
 		), $post->post_type, 'normal', 'high' );
 
 		if ( 'post.php' == $pagenow && 'publish' == $post->post_status && function_exists( 'get_post_embed_html' ) ) {
 			add_meta_box( 'episode-embed-code', __( 'Episode Embed Code', 'seriously-simple-podcasting' ), array(
 				$this,
-				'embed_code_meta_box_content'
+				'embed_code_meta_box_content',
 			), $post->post_type, 'side', 'low' );
 		}
 
@@ -569,7 +597,7 @@ public function meta_box_content( $post ) {
 
 		if ( 0 < count( $field_data ) ) {
 
-			$html .= '<input id="seriouslysimple_post_id" type="hidden" value="' . $post_id . '" />';
+			$html     .= '<input id="seriouslysimple_post_id" type="hidden" value="' . $post_id . '" />';
 			$renderer = ssp_renderer();
 
 			foreach ( $field_data as $k => $v ) {
@@ -603,16 +631,16 @@ public function meta_box_content( $post ) {
 						$file_data = new Castos_File_Data(
 							json_decode( get_post_meta( $post_id, 'castos_file_data', true ), true )
 						);
-						$html .= $renderer->fetch(
+						$html      .= $renderer->fetch(
 							'metafields/episode_file',
 							compact( 'k', 'v', 'data', 'is_castos', 'file_data' )
 						);
 						break;
 
 					case 'image':
-						$label = $v['name'];
+						$label       = $v['name'];
 						$description = $v['description'];
-						$html .= $renderer->fetch( 'metafields/image', compact( 'label', 'description', 'data', 'k' ) );
+						$html        .= $renderer->fetch( 'metafields/image', compact( 'label', 'description', 'data', 'k' ) );
 						break;
 
 					case 'checkbox':
@@ -656,10 +684,13 @@ public function meta_box_content( $post ) {
 
 	/**
 	 * Setup custom fields for episodes
+	 *
+	 * @param bool $all
+	 *
 	 * @return array Custom fields
 	 */
-	public function custom_fields() {
-		return $this->cpt_podcast_handler->custom_fields();
+	public function custom_fields( $all = false ) {
+		return $this->cpt_podcast_handler->custom_fields( $all );
 	}
 
 	/**
@@ -700,15 +731,17 @@ public function sync_episode( $id, $post ) {
 			return;
 		}
 
+		$this->episode_repository->delete_episode_sync_error( $post->ID );
+
 		$response = $this->castos_handler->upload_episode_to_castos( $post );
 
-		if ( 'success' === $response['status'] ) {
-			$podmotor_episode_id = $response['episode_id'];
-			if ( $podmotor_episode_id ) {
-				update_post_meta( $id, 'podmotor_episode_id', $podmotor_episode_id );
+		if ( $response->success ) {
+			if ( $response->castos_episode_id ) {
+				update_post_meta( $id, 'podmotor_episode_id', $response->castos_episode_id );
 			}
-			$this->admin_notices_handler->add_predefined_flash_notice(
-				Admin_Notifications_Handler::NOTICE_API_EPISODE_SUCCESS
+			$this->admin_notices_handler->add_flash_notice(
+				$response->message,
+				Admin_Notifications_Handler::SUCCESS
 			);
 
 			// if uploading was scheduled before, lets unschedule it
@@ -716,15 +749,23 @@ public function sync_episode( $id, $post ) {
 			$this->episode_repository->update_episode_sync_status( $post->ID, Sync_Status::SYNC_STATUS_SYNCED );
 			$this->episode_repository->delete_sync_error( $post->ID );
 		} else {
-			// Schedule uploading with a cronjob.1
+			// Schedule uploading with a cronjob.
 			// If it's 404, something wrong with the file ID. We don't try to reupload it since result will be the same.
-			if ( 404 != $response['code'] ) {
-				update_post_meta( $id, 'podmotor_schedule_upload', true );
+			if ( in_array( $response->code, array( 403, 404 ) ) ) {
+				$this->admin_notices_handler->add_flash_notice(
+					$response->message,
+					Admin_Notifications_Handler::ERROR
+				);
+			} else {
+				update_post_meta( $id, Cron_Controller::SYNC_SCHEDULE_META, true );
+				update_post_meta( $id, Cron_Controller::ATTEMPTS_META, 1 );
+				$this->admin_notices_handler->add_predefined_flash_notice(
+					Admin_Notifications_Handler::NOTICE_API_EPISODE_ERROR
+				);
 			}
-			$this->admin_notices_handler->add_predefined_flash_notice(
-				Admin_Notifications_Handler::NOTICE_API_EPISODE_ERROR
-			);
+
 			$this->episode_repository->update_episode_sync_status( $post->ID, Sync_Status::SYNC_STATUS_FAILED );
+			$this->episode_repository->update_episode_sync_error( $post->ID, $response->message );
 		}
 	}
 
diff --git a/php/classes/controllers/class-settings-controller.php b/php/classes/controllers/class-settings-controller.php
index d7db25c1..9f1ae7a9 100644
--- a/php/classes/controllers/class-settings-controller.php
+++ b/php/classes/controllers/class-settings-controller.php
@@ -143,6 +143,20 @@ public function register_hooks_and_filters() {
 		add_filter( 'ssp_field_data', array( $this, 'provide_podcasts_sync_status' ), 10, 2 );
 
 		$this->generate_dynamic_color_scheme();
+
+		add_shortcode( 'castos_email', array( $this, 'castos_email' ) );
+	}
+
+	/**
+	 * Gets castos email to show in the Hosting tab.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
+	public function castos_email() {
+		return ssp_is_connected_to_castos() ? $this->castos_handler->get_email() : '';
 	}
 
 	/**
@@ -156,7 +170,7 @@ public function provide_podcasts_sync_status( $data, $args ) {
 		if ( isset( $args['field']['id'] ) && 'podcasts_sync' === $args['field']['id'] ) {
 			$data = (array) $data;
 			$res = $this->castos_handler->get_podcasts();
-			if ( empty( $res['status'] ) || 'success' !== $res['status'] || ! isset( $res['data']['podcast_list'] ) ) {
+			if ( ! is_array( $res ) || empty( $res['status'] ) || 'success' !== $res['status'] || ! isset( $res['data']['podcast_list'] ) ) {
 				$data['statuses'] = null;
 
 				return $data;
@@ -348,7 +362,7 @@ public function register_settings() {
 				$is_section_valid = true;
 				if ( isset( $section_data['condition_callback'] ) ) {
 					$callback = $section_data['condition_callback'];
-					if ( is_string( $callback ) && function_exists( $callback ) ) {
+					if ( is_callable( $callback ) ) {
 						$is_section_valid = call_user_func( $callback );
 					}
 				}
@@ -619,7 +633,10 @@ public function settings_page() {
 		$tab = empty( $q_args['tab'] ) ? 'general' : $q_args['tab'];
 
 		$html .= $this->show_page_messages();
-		$html .= '<div id="ssp-main-settings">' . "\n";
+
+		$class = 'ssp-main-settings tab-' . esc_attr( $tab ) . ' ';
+		$class .= ssp_is_connected_to_castos() ? 'castos-connected' : 'castos-disconnected';
+		$html .= '<div id="ssp-main-settings" class="' . $class . '">' . "\n";
 		$html .= $this->show_page_tabs();
 		$html .= $this->show_tab_before_settings( $tab );
 		$html .= $this->show_tab_settings( $tab );
@@ -805,10 +822,18 @@ protected function show_tab_after_settings( $tab ) {
 		$disable_save_button_on_tabs = array( 'extensions', 'import' );
 
 		if ( ! in_array( $tab, $disable_save_button_on_tabs ) ) {
+			$button_text = isset( $this->settings[$tab]['button_text'] ) ?
+				$this->settings[$tab]['button_text'] :
+				__( 'Save Settings', 'seriously-simple-podcasting' );
+			$button_class = 'button-primary ssp-settings-submit';
+			$button_class .= isset( $this->settings[$tab]['button_class'] ) ?
+				' ' . $this->settings[$tab]['button_class'] : '';
+
 			// Submit button
 			$html .= '<p class="submit">' . "\n";
 			$html .= '<input type="hidden" name="tab" value="' . esc_attr( $tab ) . '" />' . "\n";
-			$html .= '<input id="ssp-settings-submit" name="Submit" type="submit" class="button-primary" value="' . esc_attr( __( 'Save Settings', 'seriously-simple-podcasting' ) ) . '" />' . "\n";
+			$html .= '<button id="ssp-settings-submit" name="Submit" type="submit" class="' .
+			         esc_attr($button_class) . '">' . esc_attr( $button_text ) . '</button>' . "\n";
 			$html .= '</p>' . "\n";
 		}
 
@@ -953,14 +978,13 @@ public function maybe_disconnect_from_castos( $new_value ) {
 	 * @return string
 	 */
 	public function render_seriously_simple_sidebar() {
+		if(ssp_is_connected_to_castos()){
+			return '';
+		}
 		$image_dir = $this->assets_url . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR;
-		$link      = 'https://castos.com/1ksubs?utm_source=WordPress&utm_medium=Settings&utm_campaign=Banner';
-		$is_connected = ssp_is_connected_to_castos();
-		$img = $is_connected ?
-			'<a href="' . $link . '" target="_blank"><img src="' . $image_dir . 'castos-connected-banner.jpg"></a>' :
-			'<img src="' . $image_dir . 'castos-plugin-settings-banner.jpg">';
+		$img = '<img src="' . esc_attr( $image_dir ) . 'castos-plugin-settings-banner.jpg">';
 
-		return $this->renderer->fetch( 'settings-sidebar', compact( 'img', 'is_connected' ) );
+		return $this->renderer->fetch( 'settings-sidebar', compact( 'img' ) );
 	}
 
 	public function render_seriously_simple_extensions() {
@@ -1148,7 +1172,10 @@ public function render_external_import_process( $progress ) {
 	 * @return string
 	 */
 	public function render_external_import_form() {
-		$post_types = ssp_post_types( true );
+		$post_types = array( SSP_CPT_PODCAST ); // Make sure that podcast is the first in the list.
+		$post_types = array_merge( $post_types, ssp_post_types( false ) );
+
+
 		$series     = get_terms( 'series', array( 'hide_empty' => false ) );
 
 		return $this->renderer->fetch( 'settings/import-rss-form', compact( 'post_types', 'series' ) );
diff --git a/php/classes/entities/class-abstract-entity.php b/php/classes/entities/class-abstract-entity.php
index 02f528f8..6dbd76eb 100644
--- a/php/classes/entities/class-abstract-entity.php
+++ b/php/classes/entities/class-abstract-entity.php
@@ -26,7 +26,7 @@ abstract class Abstract_Entity {
      *
      * @param array $properties Array of message properties.
      */
-    public function __construct( $properties ) {
+    public function __construct( $properties = array() ) {
         foreach ( get_object_vars( $this ) as $k => $v ) {
             if ( is_array( $properties ) ) {
                 $this->fill_with_array( $properties, $k );
diff --git a/php/classes/entities/class-castos-response-episode.php b/php/classes/entities/class-castos-response-episode.php
new file mode 100644
index 00000000..c41bacca
--- /dev/null
+++ b/php/classes/entities/class-castos-response-episode.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Castos_Response_Episode Entity.
+ *
+ * @package SeriouslySimplePodcasting
+ * */
+namespace SeriouslySimplePodcasting\Entities;
+
+/**
+ * Class Castos_Response_Episode. Is used instead of response array in Castos_Handler class.
+ * @since 3.5.0
+ */
+class Castos_Response_Episode extends Castos_Response {
+
+	public $castos_episode_id;
+
+	public function update( $raw_response ) {
+		parent::update( $raw_response );
+		if( $this->body && isset( $this->body['episode']['id'] ) ){
+			$this->castos_episode_id = $this->body['episode']['id'];
+		}
+	}
+}
diff --git a/php/classes/entities/class-castos-response.php b/php/classes/entities/class-castos-response.php
new file mode 100644
index 00000000..938e5a51
--- /dev/null
+++ b/php/classes/entities/class-castos-response.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Castos_Response Entity.
+ *
+ * @package SeriouslySimplePodcasting
+ * */
+
+namespace SeriouslySimplePodcasting\Entities;
+
+/**
+ * Class Castos_Response. Is used instead of response array in Castos_Handler class.
+ * @since 3.5.0
+ */
+class Castos_Response extends Abstract_API_Entity {
+
+	/**
+	 * @var string $id
+	 * */
+	public $message = 'An unknown error occurred. Please try again later.';
+
+	public $status = 'error';
+
+	protected $body;
+
+	public function update( $raw_response ) {
+		if ( ! is_array( $raw_response ) || ! isset( $raw_response['response']['code'] ) ) {
+			return;
+		}
+		$this->code    = wp_remote_retrieve_response_code( $raw_response );
+		$this->body    = json_decode( wp_remote_retrieve_body( $raw_response ), true );
+		$this->message = isset( $this->body['message'] ) ? $this->translate( $this->body['message'] ) : '';
+		$this->success = 200 === $this->code ? true : $this->success;
+		$this->status  = 200 === $this->code ? 'success' : $this->status;
+	}
+
+	public function translate( $text ) {
+		try {
+			$translations = array (
+				wp_hash( 'Authentication failed! Invalid or missing Access Token!' ) => __( 'Authentication failed! Invalid or missing Access Token!' ),
+				wp_hash( 'Seriously Simple Podcasting has successfully connected to your Castos account.' ) => __( 'Seriously Simple Podcasting has successfully connected to your Castos account.' ),
+			);
+			$msg_key = wp_hash( $text );
+			if ( ! array_key_exists( $msg_key, $translations ) ) {
+				throw new \Exception( 'Text is not translatable' );
+			}
+
+			return $translations[ $msg_key ];
+
+		} catch ( \Exception $e ) {
+			return $text;
+		}
+	}
+}
diff --git a/php/classes/handlers/class-admin-notifications-handler.php b/php/classes/handlers/class-admin-notifications-handler.php
index dacfd80f..157a4f09 100644
--- a/php/classes/handlers/class-admin-notifications-handler.php
+++ b/php/classes/handlers/class-admin-notifications-handler.php
@@ -14,10 +14,10 @@
 /**
  * Main plugin class
  *
- * @author      Hugh Lashbrooke
+ * @since       1.0
  * @category    Class
  * @package     SeriouslySimplePodcasting/Controllers
- * @since       1.0
+ * @author      Hugh Lashbrooke
  */
 class Admin_Notifications_Handler implements Service {
 
@@ -29,6 +29,11 @@ class Admin_Notifications_Handler implements Service {
 	 * */
 	const NOTICES_KEY = 'ssp_notices';
 
+	/**
+	 * Option key to store constant notices that can be removed by closing the notice manually.
+	 * */
+	const CONSTANT_NOTICES_KEY = 'ssp_constant_notices';
+
 	/**
 	 * Predefined notices
 	 * */
@@ -45,21 +50,13 @@ class Admin_Notifications_Handler implements Service {
 	const ERROR = 'error';
 	const SUCCESS = 'success';
 
-	/**
-	 * @var Castos_Handler $castos_handler
-	 * */
-	protected $castos_handler;
 
 	/**
 	 * Admin_Notifications_Handler constructor.
-	 *
-	 * @param Castos_Handler $castos_handler
-	 */
-	public function __construct( $castos_handler ) {
+	 **/
+	public function __construct() {
 		$this->init_useful_variables();
 
-		$this->castos_handler = $castos_handler;
-
 		return $this;
 	}
 
@@ -71,16 +68,9 @@ public function bootstrap() {
 
 		add_action( 'current_screen', array( $this, 'maybe_show_nginx_error_notice' ) );
 
-		add_action( 'admin_init', array( $this, 'revalidate_api_credentials' ) );
-
-		add_action( 'admin_init', array( $this, 'show_revalidate_api_credentials_for_20' ) );
-
 		// Check if a valid permalink structure is set and show a message
 		add_action( 'admin_init', array( $this, 'check_valid_permalink' ) );
 
-		// Check if the podcast feed category update message needs to trigger
-		add_action( 'admin_init', array( $this, 'check_category_update_required' ) );
-
 		// Trigger the Elementor Templates message
 		add_action( 'admin_init', array( $this, 'show_elementor_templates_available' ) );
 
@@ -88,7 +78,7 @@ public function bootstrap() {
 		add_action( 'series_pre_add_form', array( $this, 'show_series_helper_text' ) );
 
 		// Print flash notices
-		add_action( 'admin_notices', array( $this, 'display_flash_notices' ), 12 );
+		add_action( 'admin_notices', array( $this, 'display_notices' ), 12 );
 
 		return $this;
 	}
@@ -145,7 +135,7 @@ public function maybe_show_nginx_error_notice() {
 	 * */
 	protected function show_nginx_error_notice() {
 		$messages = $this->get_predefined_notices();
-		$notice   = $messages[ self::NOTICE_NGINX_ERROR ];
+		$notice = $messages[ self::NOTICE_NGINX_ERROR ];
 
 		$this->add_flash_notice( $notice['msg'], $notice['type'], false );
 	}
@@ -159,7 +149,7 @@ protected function is_nginx() {
 		$server_type = get_transient( 'ssp_server_type' );
 		if ( ! $server_type ) {
 			$response = $this->get_response( site_url( '/test.mp3' ) );
-			$server   = $response ? $response->get_headers()->offsetGet( 'server' ) : '';
+			$server = $response ? $response->get_headers()->offsetGet( 'server' ) : '';
 			$server_type = is_string( $server ) && ( false !== strpos( $server, 'nginx' ) ) ? 'nginx' : $server;
 
 			set_transient( 'ssp_server_type', $server_type, DAY_IN_SECONDS );
@@ -198,7 +188,7 @@ protected function get_response( $url ) {
 		$response = $res['http_response'];
 
 		if ( in_array( $response->get_status(), array( 301, 302 ) ) ) {
-			$headers  = $response->get_headers();
+			$headers = $response->get_headers();
 			$location = isset( $headers['location'] ) ? $headers['location'] : '';
 
 			return $location ? $this->get_response( $location ) : $response;
@@ -246,7 +236,7 @@ public function remove_predefined_flash_notice( $notice ) {
 		$messages = $this->get_predefined_notices();
 
 		if ( isset( $messages[ $notice ] ) ) {
-			$this->remove_flash_notice (
+			$this->remove_flash_notice(
 				$messages[ $notice ]['msg']
 			);
 
@@ -256,6 +246,45 @@ public function remove_predefined_flash_notice( $notice ) {
 		return false;
 	}
 
+	/**
+	 * @uses Ajax_Handler::remove_constant_notice;
+	 *
+	 * @param string $id
+	 *
+	 * @return bool
+	 */
+	public function remove_constant_notice( $id ) {
+		$notices = $this->get_constant_notices();
+
+		$res = false;
+
+		if ( array_key_exists( $id, $notices ) ) {
+			unset( $notices[ $id ] );
+			$res = update_option( self::CONSTANT_NOTICES_KEY, $notices );
+		}
+
+		return $res;
+	}
+
+	/**
+	 * Adds constant notice that is closed manually to make sure users have read it.
+	 *
+	 * @param string $notice
+	 * @param string $type
+	 *
+	 * @return void
+	 */
+	public function add_constant_notice( $notice, $type ) {
+		$notices = $this->get_constant_notices();
+		$notices[ $this->get_notice_hash( $notice ) ] = array(
+			"notice" => $notice,
+			"type" => $type,
+			"dismissible" => "is-dismissible is-constant",
+		);
+
+		update_option( self::CONSTANT_NOTICES_KEY, $notices );
+	}
+
 	/**
 	 * Add a flash notice
 	 *
@@ -274,9 +303,9 @@ public function add_flash_notice( $notice = "", $type = "warning", $dismissible
 		$dismissible_text = ( $dismissible ) ? "is-dismissible" : "";
 
 		$notices[ $this->get_notice_hash( $notice ) ] = array(
-			"notice"      => $notice,
-			"type"        => $type,
-			"dismissible" => $dismissible_text
+			"notice" => $notice,
+			"type" => $type,
+			"dismissible" => $dismissible_text,
 		);
 
 		set_transient( self::NOTICES_KEY, $notices, DAY_IN_SECONDS );
@@ -302,38 +331,58 @@ public function remove_flash_notice( $notice = "" ) {
 		$notices = get_transient( self::NOTICES_KEY );
 		$hash = $this->get_notice_hash( $notice );
 
-		if( is_array( $notices ) && array_key_exists( $hash, $notices ) ){
+		if ( is_array( $notices ) && array_key_exists( $hash, $notices ) ) {
 			unset( $notices[ $hash ] );
 		}
 
 		set_transient( self::NOTICES_KEY, $notices, DAY_IN_SECONDS );
 	}
 
+	/**
+	 * @return array
+	 */
+	public function get_constant_notices() {
+		$notices = get_option( self::CONSTANT_NOTICES_KEY, array() );
+
+		return is_array( $notices ) ? $notices : array();
+	}
+
 	/**
 	 * Prints flash notices
 	 */
-	public function display_flash_notices() {
+	public function display_notices() {
 		if ( ! $this->is_ssp_post_page() && ! $this->is_ssp_admin_page() ) {
 			return;
 		}
 
-		$notices = get_transient( self::NOTICES_KEY );
+		$notices = $this->get_flash_notices();
+
+		$notices = array_merge( $notices, $this->get_constant_notices() );
 
-		if ( ! is_array( $notices ) ) {
+		if ( empty( $notices ) ) {
 			return;
 		}
 
-		foreach ( $notices as $notice ) {
-			printf( '<div class="notice notice-%1$s %2$s"><p>%3$s</p></div>',
+		foreach ( $notices as $hash => $notice ) {
+			printf( '<div class="notice notice-%1$s %2$s" data-id="%3$s" data-nonce="%4$s"><p>%5$s</p></div>',
 				$notice['type'],
 				$notice['dismissible'],
+				$hash,
+				wp_create_nonce( 'notice-' . $hash ),
 				$notice['notice']
 			);
 		}
 
-		if ( ! empty( $notices ) ) {
-			delete_transient( self::NOTICES_KEY );
-		}
+		delete_transient( self::NOTICES_KEY );
+	}
+
+	/**
+	 * @return array
+	 */
+	public function get_flash_notices() {
+		$notices = get_transient( self::NOTICES_KEY );
+
+		return is_array( $notices ) ? $notices : array();
 	}
 
 	/**
@@ -398,15 +447,15 @@ public function check_existing_podcasts() {
 	 * Show 'existing podcast' notice
 	 */
 	public function existing_episodes_notice() {
-		$hosting_tab_url    = ssp_get_tab_url( 'castos-hosting' );
+		$hosting_tab_url = ssp_get_tab_url( 'castos-hosting' );
 		$ignore_message_url = add_query_arg( array(
 			'podcast_import_action' => 'ignore',
-			'nonce'                 => wp_create_nonce( 'podcast_import_action' ),
+			'nonce' => wp_create_nonce( 'podcast_import_action' ),
 		) );
-		$message            = '';
-		$message            .= '<p>You\'ve connected to your Castos account, and you have existing podcasts that can be synced.</p>';
-		$message            .= '<p>You can <a href="' . $hosting_tab_url . '">sync your existing podcasts to Castos now.</a></p>';
-		$message            .= '<p>Alternatively you can <a href="' . $ignore_message_url . '">dismiss this message.</a></p>';
+		$message = '';
+		$message .= '<p>You\'ve connected to your Castos account, and you have existing podcasts that can be synced.</p>';
+		$message .= '<p>You can <a href="' . $hosting_tab_url . '">sync your existing podcasts to Castos now.</a></p>';
+		$message .= '<p>Alternatively you can <a href="' . $ignore_message_url . '">dismiss this message.</a></p>';
 		?>
 		<div class="notice notice-info">
 			<p><?php _e( $message, 'seriousy-simple-podcasting' ); ?></p>
@@ -414,107 +463,6 @@ public function existing_episodes_notice() {
 		<?php
 	}
 
-	/**
-	 * Trigger an admin notice to require a user to revalidate their API
-	 */
-	public function show_revalidate_api_credentials_for_20() {
-		/**
-		 * Only trigger this if we're connected to Seriously Simple Hosting
-		 */
-		if ( ! ssp_is_connected_to_castos() ) {
-			return;
-		}
-		$castos_podmotor_account_id = get_option( 'ss_podcasting_podmotor_account_id', '' );
-		if ( empty( $castos_podmotor_account_id ) ) {
-			return;
-		}
-		if ( '2.0' === $castos_podmotor_account_id ) {
-			add_action( 'admin_notices', array( $this, 'revalidate_api_credentials_for_20_notice' ) );
-		}
-	}
-
-	/**
-	 * Show the admin notice to trigger re-validating the Castos API credentials
-	 */
-	public function revalidate_api_credentials_for_20_notice() {
-		$revalidate_api_credentials_url  = wp_nonce_url(
-			add_query_arg(
-				array( 'ssp_revalidate_api_credentials' => 'true' ),
-				admin_url( 'edit.php?post_type=' . SSP_CPT_PODCAST )
-			),
-			'revalidate-api-credentials'
-		);
-		$revalidate_api_credentials_link = sprintf(
-			wp_kses(
-			// translators: Placeholder is the url to trigger the action
-				__( 'In order to ensure that your WordPress site continues to connect to Castos, please click <a href="%s">this link</a> to re-validate your API credentials.', 'seriously-simple-podcasting' ),
-				array(
-					'a' => array(
-						'href' => array(),
-					),
-				)
-			),
-			esc_url( $revalidate_api_credentials_url )
-		);
-
-		$message = __( 'You\'ve recently upgraded Seriously Simple Podcasting to version 2.0 (or newer). This update includes some changes to how the plugin interacts with your Castos account.', 'seriously-simple-podcasting' );
-
-		?>
-		<div class="notice notice-info">
-			<p><?php echo $message; ?></p>
-			<p><?php echo $revalidate_api_credentials_link; ?></p>
-		</div>
-		<?php
-	}
-
-	/**
-	 * Attempt to revalidate API credentials
-	 */
-	public function revalidate_api_credentials() {
-		if ( ! isset( $_GET['ssp_revalidate_api_credentials'] ) || ! current_user_can( 'manage_podcast' ) ) {
-			return;
-		}
-		check_admin_referer( 'revalidate-api-credentials' );
-		$ssp_revalidate_api_credentials = sanitize_key( $_GET['ssp_revalidate_api_credentials'] );
-		if ( 'true' !== $ssp_revalidate_api_credentials ) {
-			return;
-		}
-		$account_email     = get_option( 'ss_podcasting_podmotor_account_email', '' );
-		$account_api_token = get_option( 'ss_podcasting_podmotor_account_api_token', '' );
-		$response          = $this->castos_handler->validate_api_credentials( $account_api_token, $account_email );
-		if ( 'success' === $response['status'] ) {
-			// Reset the details because they are cleared on validation
-			update_option( 'ss_podcasting_podmotor_account_email', $account_email );
-			update_option( 'ss_podcasting_podmotor_account_api_token', $account_api_token );
-			add_action( 'admin_notices', array( $this, 'api_credentials_revalidated' ) );
-		} else {
-			add_action( 'admin_notices', array( $this, 'api_credentials_invalid' ) );
-		}
-	}
-
-	/**
-	 * Show API credentials valid message
-	 */
-	public function api_credentials_revalidated() {
-		$message = __( 'Castos API credentials validated.', 'seriously-simple-podcasting' );
-		?>
-		<div class="notice notice-info is-dismissible">
-			<p><?php echo $message; ?></p>
-		</div>
-		<?php
-	}
-
-	/**
-	 * Show API credentials invalid message
-	 */
-	public function api_credentials_invalid() {
-		$message = __( 'Castos API credentials could not be validated. Please check your credentials from the Hosting tab of the Seriously Simple Podcasting Settings', 'seriously-simple-podcasting' );
-		?>
-		<div class="notice notice-error is-dismissible">
-			<p><?php echo $message; ?></p>
-		</div>
-		<?php
-	}
 
 	/**
 	 * Checks to see if a valid permalink structure is in place
@@ -540,80 +488,6 @@ public function invalid_permalink_structure_notice() {
 		<?php
 	}
 
-	/**
-	 * Checks to see if we need to notify the user about the category update
-	 */
-	public function check_category_update_required() {
-		// check if we're on version higher than 1.20.6, if so, dismiss and ignore this message
-		$ssp_version = get_option( 'ssp_version', '1.0.0' );
-		if ( version_compare( $ssp_version, '1.20.6', '>' ) ) {
-			update_option( 'ssp_categories_update_dismissed', 'true' );
-
-			return;
-		}
-
-		// check if the user has dismissed this notice previously
-		$ssp_categories_update_dismissed = get_option( 'ssp_categories_update_dismissed', 'false' );
-		if ( 'true' === $ssp_categories_update_dismissed ) {
-			return;
-		}
-		// trigger the notice
-		add_action( 'admin_notices', array( $this, 'categories_update_notice' ) );
-	}
-
-	/**
-	 * Show 'categories need updating' notice
-	 */
-	public function categories_update_notice() {
-		$feed_settings_url = add_query_arg(
-			array(
-				'post_type'                     => $this->token,
-				'page'                          => 'podcast_settings',
-				'tab'                           => 'feed-details',
-				'ssp_dismiss_categories_update' => 'true',
-			),
-			admin_url( 'edit.php' )
-		);
-
-		$ignore_message_url = add_query_arg( array(
-			'ssp_dismiss_categories_update' => 'true',
-			'nonce'                         => wp_create_nonce( 'dismiss_categories_update' ),
-		) );
-
-		$message             = __( 'Seriously Simple Podcasting\'s feed categories have been updated.', 'seriously-simple-podcasting' );
-		$feed_settings_link  = sprintf(
-			wp_kses(
-			// translators: Placeholder is the url to the Feed details
-				__( 'Please check your <a href="%s">Feed details</a>  to update your categories.', 'seriously-simple-podcasting' ),
-				array(
-					'a' => array(
-						'href' => array(),
-					),
-				)
-			),
-			esc_url( $feed_settings_url )
-		);
-		$ignore_message_link = sprintf(
-			wp_kses(
-			// translators: Placeholder is the url to dismiss the message
-				__( 'Alternatively you can <a href="%s">dismiss this message</a>.', 'seriously-simple-podcasting' ),
-				array(
-					'a' => array(
-						'href' => array(),
-					),
-				)
-			),
-			esc_url( $ignore_message_url )
-		);
-		?>
-		<div class="notice notice-info">
-			<p><?php echo $message; ?></p>
-			<p><?php echo $feed_settings_link; ?></p>
-			<p><?php echo $ignore_message_link; ?></p>
-		</div>
-		<?php
-	}
-
 	public function show_elementor_templates_available() {
 		// only show this on podcast list pages
 		$post_type = ( isset( $_GET['post_type'] ) ? filter_var( $_GET['post_type'], FILTER_DEFAULT ) : '' );
@@ -641,7 +515,7 @@ public function show_elementor_templates_notice() {
 				__( 'Using Elementor? Seriously Simple Podcasting now has built in Elementor templates to build podcast specific pages. <a href="%s">Click here to install them now.</a> ', 'seriously-simple-podcasting' ),
 				array(
 					'a' => array(
-						'href'   => array(),
+						'href' => array(),
 						'target' => true,
 					),
 				)
@@ -649,7 +523,7 @@ public function show_elementor_templates_notice() {
 			esc_url( admin_url( 'edit.php?post_type=' . SSP_CPT_PODCAST . '&page=podcast_settings&tab=extensions' ) )
 		);
 
-		$ignore_message_url  = add_query_arg( array( 'ssp_disable_elementor_template_notice' => 'true' ) );
+		$ignore_message_url = add_query_arg( array( 'ssp_disable_elementor_template_notice' => 'true' ) );
 		$ignore_message_link = sprintf(
 			wp_kses(
 			// translators: Placeholder is the url to dismiss the message
@@ -678,17 +552,17 @@ public function show_elementor_templates_notice() {
 	public function get_predefined_notices() {
 		$notices = array(
 			self::NOTICE_API_EPISODE_SUCCESS => array(
-				'msg'  => __( 'Your episode was successfully synced to your Castos account', 'seriously-simple-podcasting' ),
+				'msg' => __( 'Your episode was successfully synced to your Castos account', 'seriously-simple-podcasting' ),
 				'type' => self::SUCCESS,
 			),
-			self::NOTICE_API_EPISODE_ERROR   => array(
-				'msg'  => __( "An error occurred in syncing this episode to your Castos account. <br>
+			self::NOTICE_API_EPISODE_ERROR => array(
+				'msg' => __( "An error occurred in syncing this episode to your Castos account. <br>
 								We will keep attempting to sync your episode over the next 24 hours. <br>
 								If you don't see this episode in your Castos account at that time please contact our support team at hello@castos.com", 'seriously-simple-podcasting' ),
 				'type' => self::ERROR,
 			),
-			self::NOTICE_NGINX_ERROR         => array(
-				'msg'  => sprintf( __(
+			self::NOTICE_NGINX_ERROR => array(
+				'msg' => sprintf( __(
 					"We've detected that your website is using NGINX.
 					In order for Seriously Simple Podcasting to play your episodes, you'll need to reach out to your web host or system administrator and follow the instructions outlined in this <a href='%s'>help document.</a>",
 					'seriously-simple-podcasting'
diff --git a/php/classes/handlers/class-ajax-handler.php b/php/classes/handlers/class-ajax-handler.php
index 310af068..e2b85851 100644
--- a/php/classes/handlers/class-ajax-handler.php
+++ b/php/classes/handlers/class-ajax-handler.php
@@ -2,9 +2,7 @@
 
 namespace SeriouslySimplePodcasting\Handlers;
 
-use SeriouslySimplePodcasting\Controllers\Podcast_Post_Types_Controller as PPT_Controller;
 use SeriouslySimplePodcasting\Entities\Sync_Status;
-use SeriouslySimplePodcasting\Repositories\Episode_Repository;
 
 class Ajax_Handler {
 
@@ -14,13 +12,20 @@ class Ajax_Handler {
 	 * */
 	protected $castos_handler;
 
+	/**
+	 * @var Admin_Notifications_Handler $admin_notices_handler
+	 * */
+	protected $admin_notices_handler;
+
 	/**
 	 * Ajax_Handler constructor.
 	 *
 	 * @param Castos_Handler $castos_handler
+	 * @param Admin_Notifications_Handler $admin_notices_handler
 	 */
-	public function __construct( $castos_handler ) {
+	public function __construct( $castos_handler, $admin_notices_handler ) {
 		$this->castos_handler = $castos_handler;
+		$this->admin_notices_handler = $admin_notices_handler;
 
 		$this->bootstrap();
 	}
@@ -32,8 +37,9 @@ public function bootstrap() {
 		// Add ajax action for plugin rating
 		add_action( 'wp_ajax_ssp_rated', array( $this, 'rated' ) );
 
-		// Add ajax action for plugin rating.
-		add_action( 'wp_ajax_validate_castos_credentials', array( $this, 'validate_podmotor_api_credentials' ) );
+		add_action( 'wp_ajax_connect_castos', array( $this, 'connect_castos' ) );
+
+		add_action( 'wp_ajax_disconnect_castos', array( $this, 'disconnect_castos' ) );
 
 		// Add ajax action for customising episode embed code
 		add_action( 'wp_ajax_update_episode_embed_code', array( $this, 'update_episode_embed_code' ) );
@@ -49,6 +55,30 @@ public function bootstrap() {
 
 		// Add ajax action to the Castos sync process
 		add_action( 'wp_ajax_sync_castos', array( $this, 'sync_castos' ) );
+
+		// Ajax action to removing the constant notice
+		add_action( 'wp_ajax_remove_constant_notice', array( $this, 'remove_constant_notice' ) );
+	}
+
+	/**
+	 * Removes constant notice
+	 *
+	 * @return void
+	 */
+	public function remove_constant_notice() {
+		try {
+			$id = $_POST['id'];
+
+			if ( empty( $_POST['nonce'] ) && ! wp_verify_nonce( 'nonce-' . $_POST['id'] ) ) {
+				throw new \Exception();
+			}
+
+			$this->admin_notices_handler->remove_constant_notice( $id );
+
+			wp_send_json_success();
+		} catch ( \Exception $e ) {
+			wp_send_json_error();
+		}
 	}
 
 	/**
@@ -168,30 +198,50 @@ protected function get_podcast_name( $podcast_id ) {
 		return __( 'Error', 'seriously-simple-podcasting' );
 	}
 
+	public function disconnect_castos() {
+		$this->castos_handler->remove_api_credentials();
+		$this->admin_notices_handler->add_flash_notice(
+			__( 'Castos account successfully disconnected.', 'seriously-simple-podcasting' )
+		);
+		wp_send_json_success();
+	}
+
 	/**
 	 * Validate the Seriously Simple Hosting api credentials
 	 */
-	public function validate_podmotor_api_credentials() {
+	public function connect_castos() {
 		try {
 			$this->nonce_check('ss_podcasting_castos-hosting');
 			$this->user_capability_check();
 
-			if ( ! isset( $_GET['api_token'] ) || ! isset( $_GET['email'] ) ) {
+			if ( ! isset( $_GET['api_token'] ) ) {
 				throw new \Exception( __('Castos arguments not set', 'seriously-simple-podcasting') );
 			}
 
 			$account_api_token = sanitize_text_field( $_GET['api_token'] );
-			$account_email     = sanitize_text_field( $_GET['email'] );
 
-			$response       = $this->castos_handler->validate_api_credentials( $account_api_token, $account_email );
-			wp_send_json( $response );
+			$response = $this->castos_handler->connect( $account_api_token );
+			if ( ! $response->success ) {
+				throw new \Exception( $response->message );
+			}
+
+			$this->castos_handler->set_token( $account_api_token );
+
+			$this->admin_notices_handler->add_flash_notice( $response->message, Admin_Notifications_Handler::SUCCESS );
+
+			wp_send_json( [
+				'status'  => $response->status,
+				'message' => $response->message,
+			] );
 		} catch ( \Exception $e ) {
+			usleep( 500000 ); // Add a 0.5s delay to ensure smoother transitions on the frontend.
+			$this->castos_handler->remove_api_credentials();
 			$this->send_json_error( $e->getMessage() );
 		}
 	}
 
 	/**
-	 * Update the epiaode embed code via ajax
+	 * Update the episode embed code via ajax
 	 * @return void
 	 */
 	public function update_episode_embed_code() {
diff --git a/php/classes/handlers/class-castos-handler.php b/php/classes/handlers/class-castos-handler.php
index ff5325f6..5b43e206 100644
--- a/php/classes/handlers/class-castos-handler.php
+++ b/php/classes/handlers/class-castos-handler.php
@@ -6,6 +6,8 @@
 use Exception;
 use SeriouslySimplePodcasting\Entities\API_File_Data;
 use SeriouslySimplePodcasting\Entities\API_Podcast;
+use SeriouslySimplePodcasting\Entities\Castos_Response;
+use SeriouslySimplePodcasting\Entities\Castos_Response_Episode;
 use SeriouslySimplePodcasting\Entities\Sync_Status;
 use SeriouslySimplePodcasting\Entities\Episode_File_Data;
 use SeriouslySimplePodcasting\Helpers\Log_Helper;
@@ -28,6 +30,12 @@ class Castos_Handler implements Service {
 	 * */
 	const TIMEOUT = 45;
 
+	const API_EMAIL_OPTION = 'ss_podcasting_podmotor_account_email';
+
+	const API_TOKEN_OPTION = 'ss_podcasting_podmotor_account_api_token';
+
+	const TRANSIENT_PODCASTS = 'ssp_castos_podcasts';
+
 	/**
 	 * @var string
 	 */
@@ -52,16 +60,16 @@ class Castos_Handler implements Service {
 	 * */
 	protected $feed_handler;
 
-
 	/**
-	 * @var Sync_Status[] $cached_podcast_statuses
+	 * @var Admin_Notifications_Handler
 	 * */
-	protected $cached_podcast_statuses;
+	protected $notifications_handler;
+
 
 	/**
-	 * @var array $cached_podcasts_response
+	 * @var Sync_Status[] $cached_podcast_statuses
 	 * */
-	protected $cached_podcasts_response;
+	protected $cached_podcast_statuses;
 
 
 	/**
@@ -69,19 +77,51 @@ class Castos_Handler implements Service {
 	 *
 	 * @param Feed_Handler $feed_handler
 	 * @param Log_Helper $log_helper
+	 * @param Admin_Notifications_Handler $log_helper
 	 */
-	public function __construct( $feed_handler, $log_helper ) {
+	public function __construct( $feed_handler, $log_helper, $notifications_handler ) {
 		$this->feed_handler = $feed_handler;
-		$this->logger       = $log_helper;
+		$this->logger = $log_helper;
+		$this->notifications_handler = $notifications_handler;
+
+		add_filter( 'http_request_args', array( $this, 'authorization_headers' ), 10, 2 );
+	}
+
+
+	/**
+	 * Adds authorization headers
+	 *
+	 * @since 3.4.1
+	 *
+	 * @param $args
+	 * @param $url
+	 *
+	 * @return mixed
+	 */
+	public function authorization_headers( $args, $url ) {
+		if ( false === strpos( $url, SSP_CASTOS_APP_URL ) ) {
+			return $args;
+		}
+
+		$ssp_headers = array(
+			'Authorization' => 'Bearer ' . $this->api_token,
+			'X-SSP-Website' => home_url(),
+			'X-SSP-Version' => SSP_VERSION,
+			'X-SSP-WP-Version' => get_bloginfo( 'version' ),
+		);
+		$args['headers'] = array_merge( $ssp_headers, $args['headers'] );
+
+		return $args;
 	}
 
 	/**
 	 * @return string
 	 */
-	protected function api_token(){
+	protected function api_token() {
 		if ( ! isset( $this->api_token ) ) {
-			$this->api_token = get_option( 'ss_podcasting_podmotor_account_api_token', '' );
+			$this->api_token = get_option( self::API_TOKEN_OPTION, '' );
 		}
+
 		return $this->api_token;
 	}
 
@@ -90,7 +130,7 @@ protected function api_token(){
 	 */
 	protected function setup_default_response() {
 		$this->response = array(
-			'status'  => 'error',
+			'status' => 'error',
 			'message' => 'An error occurred.',
 		);
 	}
@@ -105,6 +145,87 @@ protected function update_response( $key, $value ) {
 		$this->response[ $key ] = $value;
 	}
 
+	public function remove_api_credentials() {
+		delete_option( self::API_EMAIL_OPTION ); // Not used since 3.5.0
+		delete_option( self::API_TOKEN_OPTION );
+	}
+
+	/**
+	 * Connect to Castos API and validate API credentials
+	 *
+	 * @param string $account_api_token
+	 *
+	 * @return Castos_Response
+	 */
+	public function connect( $account_api_token ) {
+
+		$response = new Castos_Response();
+
+		if ( empty( $account_api_token ) ) {
+			$response->message = 'Invalid API Token.';
+
+			return $response;
+		}
+
+		$api_url = SSP_CASTOS_APP_URL . 'api/v2/ssp/connect';
+
+		$this->logger->log( 'Connecting to Castos : API URL', $api_url );
+
+		$args = array(
+			'timeout' => 45,
+			'body' => array(
+				'website' => get_home_url(),
+			),
+			'headers' => array(
+				'Authorization' => 'Bearer ' . $account_api_token,
+			),
+		);
+
+		$app_response = wp_remote_post( $api_url, $args );
+
+		$this->logger->log( 'Connect to Castos: App Response', $app_response );
+
+		$response->update( $app_response );
+
+		return $response;
+	}
+
+	/**
+	 * Gets connected user email.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @return string
+	 */
+	public function get_email() {
+		try {
+			$this->logger->log( __METHOD__ );
+
+			$cache_key = 'ssp_castos_api_email';
+
+			$email = wp_cache_get( $cache_key );
+
+			if ( $email ) {
+				return $email;
+			}
+
+			$res = $this->send_request( 'api/v2/' );
+
+			$email = isset( $res['email'] ) ? $res['email'] : '';
+
+			wp_cache_add( $cache_key, $email, '', MINUTE_IN_SECONDS );
+
+			return $email;
+		} catch ( \Exception $e ) {
+			return '';
+		}
+	}
+
+	public function set_token( $token ) {
+		update_option( self::API_TOKEN_OPTION, $token );
+	}
+
+
 	/**
 	 * Connect to Castos API and validate API credentials
 	 *
@@ -126,9 +247,7 @@ public function validate_api_credentials( $account_api_token = '', $account_emai
 		/**
 		 * Clear out existing values
 		 */
-		delete_option( 'ss_podcasting_podmotor_account_email' );
-		delete_option( 'ss_podcasting_podmotor_account_api_token' );
-		delete_option( 'ss_podcasting_podmotor_account_id' );
+		$this->remove_api_credentials();
 
 		$api_url = SSP_CASTOS_APP_URL . 'api/v2/users/validate';
 
@@ -136,10 +255,10 @@ public function validate_api_credentials( $account_api_token = '', $account_emai
 
 		$api_payload = array(
 			'timeout' => 45,
-			'body'    => array(
+			'body' => array(
 				'api_token' => $account_api_token,
-				'email'     => $account_email,
-				'website'   => get_home_url(),
+				'email' => $account_email,
+				'website' => get_home_url(),
 			),
 		);
 
@@ -204,7 +323,7 @@ public function trigger_podcast_import() {
 			$api_url,
 			array(
 				'timeout' => 45,
-				'body'    => $post_body,
+				'body' => $post_body,
 			)
 		);
 
@@ -228,127 +347,103 @@ public function trigger_podcast_import() {
 	 *
 	 * @param \WP_Post $post
 	 *
-	 * @return array
+	 * @return Castos_Response_Episode
 	 */
 	public function upload_episode_to_castos( $post ) {
 
-		$this->setup_default_response();
-
-		if ( empty( $post ) || empty( $post->ID ) || empty( $post->post_title ) ) {
-			$this->update_response( 'message', 'Invalid Podcast data' );
-			$this->logger->log( 'Invalid Podcast data when uploading podcast data' );
-
-			return $this->response;
-		}
-
-		/**
-		 * Don't trigger this unless we have a valid PodcastMotor file id
-		 */
-		$podmotor_file_id = get_post_meta( $post->ID, 'podmotor_file_id', true );
-		if ( empty( $podmotor_file_id ) ) {
-			$this->update_response( 'message', 'Invalid Podcast file data' );
-			$this->logger->log( 'Invalid Podcast file data when uploading podcast data' );
-
-			return $this->response;
-		}
-
-		$api_url             = SSP_CASTOS_APP_URL . 'api/v2/posts/create';
-		$podmotor_episode_id = get_post_meta( $post->ID, 'podmotor_episode_id', true );
-		if ( $podmotor_episode_id ) {
-			$api_url = SSP_CASTOS_APP_URL . 'api/v2/posts/update';
-		}
-
-		$series_id = ssp_get_episode_series_id( $post->ID );
+		$response = new Castos_Response_Episode();
 
-		$post_body = array(
-			'token'          => $this->api_token(),
-			'post_id'        => $post->ID,
-			'post_title'     => $post->post_title,
-			'post_content'   => $this->get_episode_content( $post->ID, $series_id ),
-			'keywords'       => get_keywords_for_episode( $post->ID ),
-			'series_number'  => get_post_meta( $post->ID, 'itunes_season_number', true ),
-			'episode_number' => get_post_meta( $post->ID, 'itunes_episode_number', true ),
-			'episode_type'   => get_post_meta( $post->ID, 'itunes_episode_type', true ),
-			'post_date'      => $post->post_date,
-			'post_date_gmt'  => $post->post_date_gmt,
-			'file_id'        => $podmotor_file_id,
-			'series_id'      => $series_id,
-		);
+		try {
+			if ( empty( $post ) || empty( $post->ID ) || empty( $post->post_title ) ) {
+				throw new \Exception( __( 'Invalid episode data when uploading to Castos', 'seriously-simple-podcasting' ) );
+			}
 
-		if ( ! empty( $podmotor_episode_id ) ) {
-			$post_body['id'] = $podmotor_episode_id;
-		}
+			$api_url = SSP_CASTOS_APP_URL . 'api/v2/posts/create';
 
-		$this->logger->log( 'API URL', $api_url );
+			/**
+			 * Don't trigger this unless we have a valid file id
+			 */
+			$podmotor_file_id = get_post_meta( $post->ID, 'podmotor_file_id', true );
+			if ( empty( $podmotor_file_id ) ) {
+				throw new \Exception( __( 'Invalid file data when uploading the episode to Castos', 'seriously-simple-podcasting' ) );
+			}
 
-		$episode_image_url = $this->get_episode_image_url( $post );
-		if ( ! empty( $episode_image_url ) ) {
-			// Todo: change 'featured_image_url' to 'cover_image_url' after API update
-			$post_body['featured_image_url'] = $episode_image_url;
-		}
+			/**
+			 * Don't trigger this unless we have a valid file id
+			 */
+			$podmotor_episode_id = get_post_meta( $post->ID, 'podmotor_episode_id', true );
+			if ( $podmotor_episode_id ) {
+				$api_url = SSP_CASTOS_APP_URL . 'api/v2/posts/update';
+			}
 
-		$this->logger->log( 'Parameter post_body Contents', $post_body );
+			$series_id = ssp_get_episode_series_id( $post->ID );
+
+			$post_body = array(
+				'token' => $this->api_token(),
+				'post_id' => $post->ID,
+				'post_title' => $post->post_title,
+				'post_content' => $this->get_episode_content( $post->ID, $series_id ),
+				'keywords' => get_keywords_for_episode( $post->ID ),
+				'series_number' => get_post_meta( $post->ID, 'itunes_season_number', true ),
+				'episode_number' => get_post_meta( $post->ID, 'itunes_episode_number', true ),
+				'episode_type' => get_post_meta( $post->ID, 'itunes_episode_type', true ),
+				'post_date' => $post->post_date,
+				'post_date_gmt' => $post->post_date_gmt,
+				'file_id' => $podmotor_file_id,
+				'series_id' => $series_id,
+			);
 
-		/**
-		 * Convert to JSON so that we send it with the Content-Type of application/json
-		 * On some WordPress installs the Content-Type defaults to text/html
-		 * Just setting the Content-Type to application/json was not enough, so the post_body has to be converted
-		 * to JSON as well.
-		 */
-		$post_body = wp_json_encode( $post_body );
+			if ( ! empty( $podmotor_episode_id ) ) {
+				$post_body['id'] = $podmotor_episode_id;
+			}
 
-		$options = array(
-			'body'    => $post_body,
-			'headers' => array(
-				'Content-Type' => 'application/json',
-			),
-			'timeout' => 60,
-		);
+			$this->logger->log( 'API URL', $api_url );
 
-		$app_response = wp_remote_post( $api_url, $options );
+			$episode_image_url = $this->get_episode_image_url( $post );
+			if ( ! empty( $episode_image_url ) ) {
+				$post_body['featured_image_url'] = $episode_image_url;
+			}
 
-		if ( isset( $app_response['response']['code'] ) ) {
-			$this->update_response( 'code', intval( $app_response['response']['code'] ) );
-		}
+			$this->logger->log( 'Post body', $post_body );
 
-		$this->logger->log( 'Upload Podcast app_response', $app_response );
+			$options = array(
+				'body' => wp_json_encode( $post_body ),
+				'headers' => array(
+					'Content-Type' => 'application/json',
+				),
+				'timeout' => 60,
+			);
 
-		if ( is_wp_error( $app_response ) ) {
-			$this->logger->log( 'An unknown error occurred sending podcast data to castos: ' . $app_response->get_error_message() );
-			$this->update_response( 'message', 'An unknown error occurred: ' . $app_response->get_error_message() );
+			$app_response = wp_remote_post( $api_url, $options );
 
-			return $this->response;
-		}
+			$this->logger->log( 'Upload episode app_response', $app_response );
 
-		$response_object = json_decode( wp_remote_retrieve_body( $app_response ) );
+			if ( is_wp_error( $app_response ) ) {
+				throw new \Exception( $app_response->get_error_message() );
+			}
 
-		$this->logger->log( 'Upload Podcast Response', $response_object );
+			$response->update( $app_response );
 
-		if ( ! isset( $response_object->status ) || ! $response_object->status || empty( $response_object->success ) ) {
-			$this->logger->log( 'An error occurred uploading the episode data to Castos', $response_object );
-			$this->update_response( 'message', 'An error occurred uploading the episode data to Castos' );
+			return $response;
+		} catch ( \Exception $e ) {
+			$this->logger->log( __METHOD__ . ': ' . $e->getMessage() . '; $post:' . serialize( $post ) );
+			$response->message = $e->getMessage();
 
-			return $this->response;
+			return $response;
 		}
-
-		$this->logger->log( 'Podcast episode successfully uploaded to Castos with episode id ' . $response_object->episode->id );
-		$this->update_response( 'status', 'success' );
-		$this->update_response( 'message', 'Podcast episode successfully uploaded to Castos' );
-		$this->update_response( 'episode_id', $response_object->episode->id );
-
-		return $this->response;
 	}
 
 
 	/**
 	 * Get episode content.
 	 *
-	 * @param int $episode_id
+	 * @since 2.11.0
+	 *
 	 * @param int $series_id
 	 *
-	 * @return string
-	 * @since 2.11.0
+	 * @param int $episode_id
 	 *
+	 * @return string
 	 */
 	public function get_episode_content( $episode_id, $series_id ) {
 		$is_excerpt_mode = $this->feed_handler->is_excerpt_mode( $series_id );
@@ -364,7 +459,7 @@ public function get_episode_content( $episode_id, $series_id ) {
 	 * @return string
 	 */
 	public function get_episode_image_url( $post ) {
-		$key    = 'cover_image';
+		$key = 'cover_image';
 		$id_key = 'cover_image_id';
 
 		$episode_image = filter_input( INPUT_POST, $key, FILTER_VALIDATE_URL );
@@ -403,7 +498,7 @@ public function is_valid_episode_image( $attachment_id ) {
 			return false;
 		}
 
-		$width  = $image[1];
+		$width = $image[1];
 		$height = $image[2];
 
 		return ( $width === $height ) && $width >= self::MIN_IMG_SIZE;
@@ -453,15 +548,15 @@ public function delete_episode( $post ) {
 
 		$post_body = array(
 			'token' => $this->api_token(),
-			'id'    => $episode_id,
+			'id' => $episode_id,
 		);
 
 		$api_response = wp_remote_request(
 			$api_url,
 			array(
-				'method'  => 'DELETE',
+				'method' => 'DELETE',
 				'timeout' => 45,
-				'body'    => $post_body,
+				'body' => $post_body,
 				'headers' => array(
 					'X-SSP-VERSION' => ssp_version(),
 				),
@@ -500,7 +595,7 @@ public function update_podcast_data( $podcast_data ) {
 			$api_url,
 			array(
 				'timeout' => 45,
-				'body'    => $podcast_data,
+				'body' => $podcast_data,
 				'headers' => array(
 					'X-SSP-VERSION' => ssp_version(),
 				),
@@ -535,22 +630,23 @@ public function update_podcast_data( $podcast_data ) {
 	/**
 	 * @return API_Podcast[]
 	 */
-	public function get_podcast_items(){
-		$podcasts              = $this->get_podcasts();
+	public function get_podcast_items() {
+		$podcasts = $this->get_podcasts();
 		$items = array();
-		if( ! isset( $podcasts['data']['podcast_list'] ) || !is_array($podcasts['data']['podcast_list']) ) {
+		if ( ! isset( $podcasts['data']['podcast_list'] ) || ! is_array( $podcasts['data']['podcast_list'] ) ) {
 			return $items;
 		}
 
 		foreach ( $podcasts['data']['podcast_list'] as $data ) {
 			$items[] = new API_Podcast( $data );
 		}
+
 		return $items;
 	}
 
 	public function get_podcasts() {
-		if ( $this->cached_podcasts_response ) {
-			return $this->cached_podcasts_response;
+		if ( $cache = get_transient( self::TRANSIENT_PODCASTS ) ) {
+			return $cache;
 		}
 
 		$this->setup_default_response();
@@ -561,8 +657,8 @@ public function get_podcasts() {
 
 		$api_payload = array(
 			'timeout' => 45,
-			'body'    => array(
-				'token'        => $this->api_token(),
+			'body' => array(
+				'token' => $this->api_token(),
 				'show_details' => true,
 			),
 			'headers' => array(
@@ -576,22 +672,28 @@ public function get_podcasts() {
 			$this->update_response( 'message', 'An error occurred connecting to the Castos server to get podcasts lists.' );
 			$this->logger->log( 'response', $this->response );
 
+			set_transient( self::TRANSIENT_PODCASTS, $this->response, MINUTE_IN_SECONDS );
+
 			return $this->response;
 		}
 
 		$this->update_response( 'status', 'success' );
 		$this->update_response( 'message', 'Successfully retrieved podcasts.' );
 
-		$podcasts      = isset( $app_response['body'] ) ? json_decode( $app_response['body'], true ) : array();
+		$podcasts = isset( $app_response['body'] ) ? json_decode( $app_response['body'], true ) : array();
 		$podcasts_data = isset( $podcasts['data'] ) ? $podcasts['data'] : array();
 
 		$this->update_response( 'data', $podcasts_data );
 
-		$this->cached_podcasts_response = $this->response;
+		set_transient( self::TRANSIENT_PODCASTS, $this->response, 5 * MINUTE_IN_SECONDS );
 
 		return $this->response;
 	}
 
+	public function clear_podcasts_cache() {
+		delete_transient( self::TRANSIENT_PODCASTS );
+	}
+
 
 	/**
 	 * @param int $series_id
@@ -624,7 +726,7 @@ public function get_podcast_by_series( $series_id ) {
 		$podcasts = $this->get_podcast_items();
 
 		foreach ( $podcasts as $podcast ) {
-			if( $series_id === $podcast->series_id){
+			if ( $series_id === $podcast->series_id ) {
 				return $podcast;
 			}
 		}
@@ -644,7 +746,7 @@ public function get_podcast_sync_status( $series_id ) {
 			return $this->cached_podcast_statuses[ $series_id ];
 		}
 		$status = new Sync_Status( Sync_Status::SYNC_STATUS_NONE );
-		$res    = $this->get_podcasts();
+		$res = $this->get_podcasts();
 		if ( ! empty( $res['data']['podcast_list'] ) ) {
 			foreach ( $res['data']['podcast_list'] as $podcast ) {
 				if ( isset( $podcast['series_id'] ) && $podcast['series_id'] === $series_id ) {
@@ -666,12 +768,12 @@ public function get_podcast_sync_status( $series_id ) {
 	 * @throws Exception
 	 */
 	public function retrieve_sync_status_by_podcast_data( $castos_podcast ) {
-		$map    = array(
-			'none'                  => Sync_Status::SYNC_STATUS_NONE,
-			'in_progress'           => Sync_Status::SYNC_STATUS_SYNCING,
-			'completed'             => Sync_Status::SYNC_STATUS_SYNCED,
+		$map = array(
+			'none' => Sync_Status::SYNC_STATUS_NONE,
+			'in_progress' => Sync_Status::SYNC_STATUS_SYNCING,
+			'completed' => Sync_Status::SYNC_STATUS_SYNCED,
 			'completed_with_errors' => Sync_Status::SYNC_STATUS_SYNCED_WITH_ERRORS,
-			'failed'                => Sync_Status::SYNC_STATUS_FAILED,
+			'failed' => Sync_Status::SYNC_STATUS_FAILED,
 		);
 		$status = new Sync_Status( Sync_Status::SYNC_STATUS_NONE );
 		if ( isset( $castos_podcast['ssp_import_status'] ) && array_key_exists( $castos_podcast['ssp_import_status'], $map ) ) {
@@ -690,10 +792,12 @@ public function retrieve_sync_status_by_podcast_data( $castos_podcast ) {
 	 * @return array
 	 * @throws Exception
 	 */
-	public function get_podcast_subscribers( $podcast_id ) {
+	public function get_podcast_subscribers( $podcast_id = null ) {
 		$this->logger->log( __METHOD__ );
 
-		$res = $this->send_request( 'api/v2/private-subscribers', [ 'podcast_id' => $podcast_id ] );
+		$args = $podcast_id ? [ 'podcast_id' => $podcast_id ] : array();
+
+		$res = $this->send_request( 'api/v2/private-subscribers', $args );
 
 		return ! empty( $res['subscribers'] ) ? $res['subscribers'] : array();
 	}
@@ -793,7 +897,7 @@ public function add_subscriber_to_podcasts( $podcast_ids, $email, $name ) {
 		$subscribers = array(
 			array(
 				'email' => $email,
-				'name'  => $name,
+				'name' => $name,
 			),
 		);
 
@@ -844,7 +948,7 @@ public function add_subscribers_to_podcasts( $podcast_ids, $subscribers ) {
 
 				return array(
 					'email' => $s['email'],
-					'name'  => $s['name'],
+					'name' => $s['name'],
 				);
 			}, $subscribers_group );
 
@@ -853,7 +957,7 @@ public function add_subscribers_to_podcasts( $podcast_ids, $subscribers ) {
 			$res = $this->send_request(
 				'api/v2/create-private-subscribers',
 				array(
-					'podcasts'    => $podcasts,
+					'podcasts' => $podcasts,
 					'subscribers' => $subscribers_to_send,
 				),
 				'POST'
@@ -889,7 +993,7 @@ public function revoke_subscribers_from_podcasts( $podcast_ids, $emails ) {
 				$subscribers = array();
 				foreach ( $email_group as $email ) {
 					$subscribers[] = array(
-						'email'      => $email,
+						'email' => $email,
 						'podcast_id' => $podcast_id,
 					);
 				}
@@ -922,7 +1026,7 @@ public function revoke_subscriber_from_podcasts( $podcast_ids, $email ) {
 
 		foreach ( $podcast_ids as $podcast_id ) {
 			$subscribers[] = array(
-				'email'      => $email,
+				'email' => $email,
 				'podcast_id' => $podcast_id,
 			);
 		}
@@ -938,6 +1042,7 @@ public function revoke_subscriber_from_podcasts( $podcast_ids, $email ) {
 	 * @param array $args
 	 *
 	 * @return array Response object or the default errors array.
+	 * @throws Exception
 	 */
 	protected function send_request( $api_url, $args = array(), $method = 'GET' ) {
 
@@ -955,7 +1060,7 @@ protected function send_request( $api_url, $args = array(), $method = 'GET' ) {
 
 		// Some endpoints ask for token, some - for api_token. Let's provide both.
 		$default_args = array(
-			'token'     => $token,
+			'token' => $token,
 			'api_token' => $token,
 		);
 
@@ -965,8 +1070,8 @@ protected function send_request( $api_url, $args = array(), $method = 'GET' ) {
 			$api_url,
 			array(
 				'timeout' => self::TIMEOUT,
-				'method'  => $method,
-				'body'    => $body,
+				'method' => $method,
+				'body' => $body,
 				'headers' => array(
 					'X-SSP-VERSION' => ssp_version(),
 				),
@@ -989,9 +1094,22 @@ protected function send_request( $api_url, $args = array(), $method = 'GET' ) {
 			$res = array_merge( $app_response['response'], $res );
 		}
 
+		// If user disconnected on Castos side, disconnect it in SSP
+		if ( 400 === $res['code'] && isset( $res['message'] ) && strpos( $res['message'], 'disconnected' ) ) {
+			$this->disconnect( $res['message'] );
+		}
+
 		return $res;
 	}
 
+	public function disconnect( $notification = '' ) {
+		$this->remove_api_credentials();
+
+		if ( $notification ) {
+			$this->notifications_handler->add_constant_notice( $notification, Admin_Notifications_Handler::WARNING );
+		}
+	}
+
 
 	/**
 	 * Get series data for Castos.
@@ -1004,23 +1122,23 @@ public function generate_series_data_for_castos( $series_id ) {
 
 		$podcast = array();
 
-		$podcast['podcast_title']       = $this->feed_handler->get_podcast_title( $series_id );
+		$podcast['podcast_title'] = $this->feed_handler->get_podcast_title( $series_id );
 		$podcast['podcast_description'] = $this->feed_handler->get_podcast_description( $series_id );
-		$podcast['author_name']         = $this->feed_handler->get_podcast_author( $series_id );
-		$podcast['podcast_owner']       = $this->feed_handler->get_podcast_owner_name( $series_id );
-		$podcast['owner_email']         = $this->feed_handler->get_podcast_owner_email( $series_id );
-		$podcast['explicit']            = 'on' == $this->feed_handler->get_feed_item_explicit_flag( $series_id ) ? 1 : 0;
-		$podcast['language']            = $this->feed_handler->get_podcast_language( $series_id );
-		$podcast['cover_image']         = $this->feed_handler->get_feed_image( $series_id );
-		$podcast['copyright']           = $this->feed_handler->get_podcast_copyright( $series_id );
+		$podcast['author_name'] = $this->feed_handler->get_podcast_author( $series_id );
+		$podcast['podcast_owner'] = $this->feed_handler->get_podcast_owner_name( $series_id );
+		$podcast['owner_email'] = $this->feed_handler->get_podcast_owner_email( $series_id );
+		$podcast['explicit'] = 'on' == $this->feed_handler->get_feed_item_explicit_flag( $series_id ) ? 1 : 0;
+		$podcast['language'] = $this->feed_handler->get_podcast_language( $series_id );
+		$podcast['cover_image'] = $this->feed_handler->get_feed_image( $series_id );
+		$podcast['copyright'] = $this->feed_handler->get_podcast_copyright( $series_id );
 
 		// Podcast Categories
 		$podcast['itunes_category1'] = $this->get_castos_category( 1, $series_id );
 		$podcast['itunes_category2'] = $this->get_castos_category( 2, $series_id );
 		$podcast['itunes_category3'] = $this->get_castos_category( 3, $series_id );
-		$podcast['itunes']           = ssp_get_option( 'itunes_url', '', $series_id );
-		$podcast['google_play']      = ssp_get_option( 'google_play_url', '', $series_id );
-		$guid                        = ssp_get_option( 'data_guid', '', $series_id );
+		$podcast['itunes'] = ssp_get_option( 'itunes_url', '', $series_id );
+		$podcast['google_play'] = ssp_get_option( 'google_play_url', '', $series_id );
+		$guid = ssp_get_option( 'data_guid', '', $series_id );
 
 		if ( $guid ) {
 			$podcast['guid'] = $guid;
diff --git a/php/classes/handlers/class-cpt-podcast-handler.php b/php/classes/handlers/class-cpt-podcast-handler.php
index 45f2bc8e..35122a53 100644
--- a/php/classes/handlers/class-cpt-podcast-handler.php
+++ b/php/classes/handlers/class-cpt-podcast-handler.php
@@ -137,14 +137,18 @@ protected function register_meta() {
 
 	/**
 	 * Setup custom fields for episodes
+	 *
+	 * @param bool $all
+	 *
 	 * @return array Custom fields
 	 */
-	public function custom_fields() {
-		$is_itunes_fields_enabled = get_option( 'ss_podcasting_itunes_fields_enabled' );
+	public function custom_fields( $all = false ) {
+		$itunes_fields_enabled = get_option( 'ss_podcasting_itunes_fields_enabled' );
+		$is_itunes_fields_enabled = $itunes_fields_enabled && ( $itunes_fields_enabled === 'on' );
 		$fields                   = array();
 		$is_connected_to_castos = ssp_is_connected_to_castos();
 
-		if ( $is_connected_to_castos ) {
+		if ( $is_connected_to_castos || $all ) {
 			$fields['sync_status'] = array(
 				'name'             => __( 'Sync status:', 'seriously-simple-podcasting' ),
 				'type'             => 'sync_status',
@@ -177,7 +181,7 @@ public function custom_fields() {
 		);
 
 		//
-		if ( $is_connected_to_castos ) {
+		if ( $is_connected_to_castos || $all ) {
 			$fields['castos_file_data'] = array(
 				'type' => 'hidden',
 			);
@@ -244,7 +248,7 @@ public function custom_fields() {
 			'meta_description' => __( 'The size of the podcast episode for display purposes.', 'seriously-simple-podcasting' ),
 		);
 
-		if ( $is_connected_to_castos ) {
+		if ( $is_connected_to_castos || $all ) {
 			$fields['filesize_raw'] = array(
 				'type'             => 'hidden',
 				'default'          => '',
@@ -280,7 +284,7 @@ public function custom_fields() {
 			'meta_description' => __( 'Indicates whether this specific episode should be blocked from the iTunes and Google Play Podcast libraries.', 'seriously-simple-podcasting' ),
 		);
 
-		if ( $is_itunes_fields_enabled && $is_itunes_fields_enabled == 'on' ) {
+		if ( $is_itunes_fields_enabled || $all ) {
 			/**
 			 * New iTunes Tag Announced At WWDC 2017
 			 */
diff --git a/php/classes/handlers/class-settings-handler.php b/php/classes/handlers/class-settings-handler.php
index d14e2abc..c94264f4 100644
--- a/php/classes/handlers/class-settings-handler.php
+++ b/php/classes/handlers/class-settings-handler.php
@@ -259,6 +259,11 @@ public function get_feed_option( $field, $series_id, $default = '' ) {
 
 		$data = ssp_get_option( $option, null, $series_id );
 
+		if ( 'data_description' === $option && ! isset( $data ) ) {
+			$description = get_term_field( 'description', $series_id, ssp_series_taxonomy(), 'edit' );
+			$data        = $description ?: null;
+		}
+
 		// For empty values, propagate some settings from the default feed
 		if ( ! isset( $data ) ) {
 			$propagate_exclusions = array( 'exclude_feed', 'redirect_feed' );
diff --git a/php/classes/integrations/blocks/class-castos-blocks.php b/php/classes/integrations/blocks/class-castos-blocks.php
index 0a8a4c11..eb87f355 100644
--- a/php/classes/integrations/blocks/class-castos-blocks.php
+++ b/php/classes/integrations/blocks/class-castos-blocks.php
@@ -273,7 +273,7 @@ public function register_castos_blocks() {
 				),
 			),
 			'render_callback' => function ( $args ) {
-				return ssp_frontend_controller()->players_controller->render_html_player( $args['episodeId'], false );
+				return ssp_frontend_controller()->players_controller->render_html_player( $args['episodeId'], true, 'block', $args );
 			}
 		) );
 
@@ -449,6 +449,10 @@ protected function register_playlist_player() {
 						$args['order'] = $attributes['order'];
 					}
 
+					if ( ! empty( $attributes['className'] ) ) {
+						$args['class'] = $attributes['className'];
+					}
+
 					$podcast_playlist = new Podcast_Playlist();
 
 					return $podcast_playlist->shortcode( $args );
diff --git a/php/classes/integrations/elementor/widgets/elementor-html-player-widget.php b/php/classes/integrations/elementor/widgets/elementor-html-player-widget.php
index 1a44e913..66eda947 100644
--- a/php/classes/integrations/elementor/widgets/elementor-html-player-widget.php
+++ b/php/classes/integrations/elementor/widgets/elementor-html-player-widget.php
@@ -49,12 +49,12 @@ public function get_categories() {
 	public function get_episodes() {
 		$args = array(
 			'fields'         => array( 'post_title, id' ),
-			'posts_per_page' => -1,
+			'posts_per_page' => - 1,
 			'post_type'      => ssp_post_types( true ),
 			'post_status'    => array( 'publish', 'draft', 'future' ),
 		);
 
-		$episodes       = get_posts( $args );
+		$episodes        = get_posts( $args );
 		$episode_options = [
 			'-1' => __( 'Current Episode', 'seriously-simple-podcasting' ),
 			'0'  => __( 'Latest Episode', 'seriously-simple-podcasting' ),
@@ -84,7 +84,7 @@ protected function register_controls() {
 				'label'   => __( 'Select Episode', 'seriously-simple-podcasting' ),
 				'type'    => \Elementor\Controls_Manager::SELECT2,
 				'options' => $episode_options,
-				'default' => '-1'
+				'default' => '-1',
 			]
 		);
 
@@ -92,8 +92,7 @@ protected function register_controls() {
 	}
 
 	protected function render() {
-		global $ss_podcasting;
-		$players_controller = $ss_podcasting->players_controller;
+		$players_controller = ssp_app()->players_controller;
 		$settings           = $this->get_settings_for_display();
 		$episode_id         = $settings['show_elements'];
 		if ( '-1' === $episode_id ) {
@@ -102,15 +101,15 @@ protected function render() {
 		if ( empty( $episode_id ) ) {
 			$episode_id = $players_controller->get_latest_episode_id();
 		}
-		$html_player = $players_controller->render_html_player( $episode_id );
-		echo $html_player;
+
+		echo $players_controller->render_html_player( $episode_id );
 	}
 
 	protected function _content_template() {
 		?>
-        <# _.each( settings.show_elements, function( element ) { #>
-        <div>{{{ element }}}</div>
-        <# } ) #>
+		<# _.each( settings.show_elements, function( element ) { #>
+		<div>{{{ element }}}</div>
+		<# } ) #>
 		<?php
 	}
 
diff --git a/php/classes/integrations/paid-memberships-pro/class-paid-memberships-pro-integrator.php b/php/classes/integrations/paid-memberships-pro/class-paid-memberships-pro-integrator.php
index 279faa4a..335f9c63 100644
--- a/php/classes/integrations/paid-memberships-pro/class-paid-memberships-pro-integrator.php
+++ b/php/classes/integrations/paid-memberships-pro/class-paid-memberships-pro-integrator.php
@@ -20,9 +20,9 @@
  * Paid Memberships Pro controller
  *
  *
- * @author Sergiy Zakharchenko
- * @package SeriouslySimplePodcasting
  * @since 2.9.3
+ * @package SeriouslySimplePodcasting
+ * @author Sergiy Zakharchenko
  */
 class Paid_Memberships_Pro_Integrator extends Abstract_Integrator {
 
@@ -34,6 +34,8 @@ class Paid_Memberships_Pro_Integrator extends Abstract_Integrator {
 
 	const REVOKE_LIST_OPTION = 'ssp_pmpro_revoke_subscribers';
 
+	const MEMBERSHIP_SERIES_OPTION = 'ssp_pmpro_membership_series';
+
 	const EVENT_BULK_SYNC_SUBSCRIBERS = 'ssp_pmpro_bulk_sync_subscribers';
 
 	const EVENT_ADD_SUBSCRIBERS = 'ssp_pmpro_add_subscribers';
@@ -57,9 +59,9 @@ public function init( $feed_handler, $castos_handler, $logger, $notices_handler
 			return;
 		}
 
-		$this->feed_handler    = $feed_handler;
-		$this->castos_handler  = $castos_handler;
-		$this->logger          = $logger;
+		$this->feed_handler = $feed_handler;
+		$this->castos_handler = $castos_handler;
+		$this->logger = $logger;
 		$this->notices_handler = $notices_handler;
 
 		if ( is_admin() && ! ssp_is_ajax() ) {
@@ -85,26 +87,14 @@ public function init( $feed_handler, $castos_handler, $logger, $notices_handler
 	protected function init_subscribers_sync() {
 
 		// Sync users when their Membership Level is changed (from admin panel, when registered or cancelled).
-		add_filter( 'pmpro_change_level', array(
+		add_filter( 'pmpro_before_change_membership_level', array(
 			$this,
-			'sync_subscribers_on_change_membership_level'
+			'sync_subscribers_on_change_membership_level',
 		), 10, 2 );
 
 
 		// Schedule the bulk sync when Series -> Membership Level association is changed.
-		add_filter( 'allowed_options', function ( $allowed_options ) {
-			// Option ss_podcasting_is_pmpro_integration is just a marker that PMPro integration settings have been saved.
-			// If so, we can do the sync magic.
-			if ( isset( $allowed_options['ss_podcasting'] ) ) {
-				$key = array_search( 'ss_podcasting_is_pmpro_integration', $allowed_options['ss_podcasting'] );
-				if ( false !== $key ) {
-					unset( $allowed_options['ss_podcasting'][ $key ] );
-					$this->schedule_bulk_sync_subscribers();
-				}
-			}
-
-			return $allowed_options;
-		}, 20 );
+		add_filter( 'allowed_options', array( $this, 'schedule_bulk_sync_on_settings_update' ), 20 );
 
 		// Step 1. Run the scheduled bulk sync. Prepare add and remove lists, and run add process.
 		add_action( self::EVENT_BULK_SYNC_SUBSCRIBERS, array( $this, 'bulk_sync_subscribers' ) );
@@ -116,6 +106,273 @@ protected function init_subscribers_sync() {
 		add_action( self::EVENT_REVOKE_SUBSCRIBERS, array( $this, 'bulk_revoke_subscribers' ) );
 	}
 
+	/**
+	 * Schedules bulk sync cronjob when integration settings are updated.
+	 *
+	 * @since 3.4.1
+	 *
+	 * @param array $allowed_options
+	 *
+	 * @return array
+	 */
+	public function schedule_bulk_sync_on_settings_update( $allowed_options ) {
+		// Option ss_podcasting_is_pmpro_integration is a marker that PMPro integration settings have been saved.
+		if ( ! isset( $allowed_options['ss_podcasting'] ) ) {
+			return $allowed_options;
+		}
+
+		$key = array_search( 'ss_podcasting_is_pmpro_integration', $allowed_options['ss_podcasting'] );
+		if ( false !== $key ) {
+			unset( $allowed_options['ss_podcasting'][ $key ] );
+			$this->update_membership_series();
+			$this->schedule_bulk_sync_subscribers();
+		}
+
+		return $allowed_options;
+	}
+
+	/**
+	 * To prevent unexpected revokes from Castos when PMPro integration is enabled,
+	 * sync only series that were connected to PMPro membership levels before or connected now.
+	 * */
+	protected function update_membership_series() {
+
+		$series_ids = $this->get_current_membership_series_ids();
+
+		$old_sync_series = $this->get_saved_membership_series();
+
+		$new_sync_series = array_unique( array_merge( $old_sync_series, $series_ids ) );
+
+		$this->save_membership_series_data( $new_sync_series );
+	}
+
+	/**
+	 * Save membership series option to determine later which series can be synchronized with Castos.
+	 *
+	 * @since 3.4.1
+	 *
+	 * @param $series
+	 *
+	 * @return void
+	 */
+	protected function save_membership_series_data( $series ) {
+		update_option( self::MEMBERSHIP_SERIES_OPTION, $series, false );
+	}
+
+	/**
+	 * Get saved membership series option to determine which series can be synchronized with Castos.
+	 *
+	 * @since 3.4.1
+	 *
+	 * @return false|mixed|null
+	 */
+	protected function get_saved_membership_series() {
+		return get_option( self::MEMBERSHIP_SERIES_OPTION, array() );
+	}
+
+	/**
+	 * Gets membership series using previous and current membership series data.
+	 * It's needed to make sure we sync only series that are or were involved with PMPro integration.
+	 * */
+	protected function get_membership_series_ids() {
+		$ssp_membership_series_ids = $this->get_current_membership_series_ids();
+		$castos_sync_series = $this->get_saved_membership_series();
+
+		return array_unique( array_merge( $ssp_membership_series_ids, $castos_sync_series ) );
+	}
+
+	/**
+	 * Bulk sync subscribers after settings change.
+	 * Modified version of @see parent::bulk_sync_subscribers() that uses current Castos emails instead of the previous settings state.
+	 *
+	 * @since 3.4.1
+	 */
+	public function bulk_sync_subscribers() {
+		try {
+			if ( $this->bulk_update_started() ) {
+				throw new \Exception('Another bulk update has already started');
+			}
+			$users_series_map = $this->generate_users_series_map();
+			$membership_series_ids = $this->get_membership_series_ids();
+
+			$series_emails_map = $this->get_series_emails_map( $users_series_map );
+
+			$list_to_add = array();
+			$list_to_revoke = array();
+
+			foreach ( $membership_series_ids as $series_id ) {
+				$ssp_series_emails = isset ( $series_emails_map[ $series_id ] ) ? $series_emails_map[ $series_id ] : array();
+				$castos_series_emails = $this->get_castos_series_emails( $series_id );
+				$list_to_add[ $series_id ] = array_diff( $ssp_series_emails, $castos_series_emails );
+				$list_to_revoke[ $series_id ] = array_diff( $castos_series_emails, $ssp_series_emails );
+			}
+
+			// Convert emails to ids for Add for backward compatibility,
+			// and because we'll need not only email but also username.
+			update_option( static::ADD_LIST_OPTION, $this->convert_emails_to_ids( $list_to_add ) );
+
+			// For revoke, we'll need a list of emails, so don't convert it and use directly.
+			// Also, this approach allows removing emails that are not associated with any user in WordPress.
+			update_option( static::REVOKE_LIST_OPTION, $list_to_revoke );
+
+			$this->schedule_bulk_add_subscribers( 0 );
+		} catch ( \Exception $e ) {
+			$this->logger->log( __METHOD__ . ': Something went wrong! Bulk sync process rescheduled. ' . $e->getMessage() );
+
+			// Another process is running, try to sync later.
+			if ( ! wp_next_scheduled( static::EVENT_BULK_SYNC_SUBSCRIBERS ) ) {
+				wp_schedule_single_event( time() + 5 * MINUTE_IN_SECONDS, static::EVENT_BULK_SYNC_SUBSCRIBERS );
+			}
+		}
+	}
+
+	/**
+	 * Recursively converts user emails in the list to ids.
+	 * We need the user ids format for the backward compatibility and to determine emails and user names in the bulk add function.
+	 *
+	 * @since 3.4.1
+	 *
+	 * @param array $list
+	 *
+	 * @return array
+	 */
+	protected function convert_emails_to_ids( $list ) {
+		$converted = array();
+		foreach ( $list as $k => $v ) {
+			if ( is_array( $v ) ) {
+				$converted[ $k ] = $this->convert_emails_to_ids( $v );
+			}
+			if ( is_string( $v ) && filter_var( $v, FILTER_VALIDATE_EMAIL ) ) {
+				$user = get_user_by( 'email', $v );
+				if ( $user ) {
+					$converted[ $k ] = $user->ID;
+				}
+			}
+		}
+
+		return $converted;
+	}
+
+	/**
+	 * Revoke subscribers from Castos podcasts. Uses emails list instead of IDs.
+	 *
+	 * @since 3.4.1
+	 *
+	 * @see parent::revoke_subscribers_from_podcast()
+	 *
+	 * @param int $series_id
+	 * @param string[] $emails
+	 *
+	 * @return int
+	 */
+	protected function revoke_subscribers_from_podcast( $series_id, $emails ) {
+		$podcast_ids = $this->convert_series_ids_to_podcast_ids( array( $series_id ) );
+
+		$count = $this->castos_handler->revoke_subscribers_from_podcasts( $podcast_ids, $emails );
+
+		$this->logger->log( __METHOD__ . ' Revoked subscribers: ' . $count . PHP_EOL . print_r( $emails, true ) );
+
+		return $count;
+	}
+
+	/**
+	 * Converts "user_ids->series_ids" map to "series_ids->emails" map.
+	 *
+	 * @since 3.4.1
+	 *
+	 * @param array $users_series_map
+	 *
+	 * @return array
+	 */
+	public function get_series_emails_map( $users_series_map ) {
+		$users_data = $this->get_users_data( array_keys( $users_series_map ) );
+
+		$series_emails_map = array();
+		foreach ( $users_series_map as $user_id => $series_ids ) {
+			$user_email = isset( $users_data[ $user_id ]['user_email'] ) ? $users_data[ $user_id ]['user_email'] : '';
+			if ( ! $series_ids || ! $user_email ) {
+				continue;
+			}
+			foreach ( $series_ids as $series_id ) {
+				$series_emails_map[ $series_id ][] = $user_email;
+			}
+		}
+		foreach ( $series_emails_map as $series_id => $user_emails ) {
+			$series_emails_map[ $series_id ] = array_unique( $user_emails );
+		}
+
+		return $series_emails_map;
+	}
+
+	/**
+	 * Gets all series ids currently involved in PMPro integration.
+	 *
+	 * @since 3.4.1
+	 *
+	 * @return array
+	 * */
+	public function get_current_membership_series_ids() {
+		$membership_levels = $this->get_membership_levels();
+
+		$membership_series_ids = array();
+		foreach ( $membership_levels as $level ) {
+			$membership_series_ids = array_unique( array_merge(
+				$membership_series_ids,
+				$this->get_series_ids_by_level( $level->id )
+			) );
+		}
+
+		return $membership_series_ids;
+	}
+
+	/**
+	 * Gets Castos series active subscriber emails
+	 *
+	 * @since 3.4.1
+	 *
+	 * @param int $series_id
+	 *
+	 * @return array
+	 * @throws \Exception
+	 */
+	public function get_castos_series_emails( $series_id ) {
+		$subscribers = [];
+		$podcast = $this->get_castos_podcast_by_series_id( $series_id );
+		if ( $podcast ) {
+			$subscribers = $this->castos_handler->get_podcast_subscribers( $podcast['id'] );
+		}
+		$emails = array();
+		foreach ( $subscribers as $subscriber ) {
+			if ( 'active' === $subscriber['status'] ) {
+				$emails[] = $subscriber['email'];
+			}
+		}
+
+		return $emails;
+	}
+
+	/**
+	 * Gets Castos podcast by SSP series ID.
+	 *
+	 * @since 3.4.1
+	 *
+	 * @param int $series_id
+	 *
+	 * @return array
+	 */
+	public function get_castos_podcast_by_series_id( $series_id ) {
+		$castos_podcasts = $this->get_castos_podcasts();
+
+		foreach ( $castos_podcasts as $castos_podcast ) {
+			if ( isset( $castos_podcast['series_id'] ) && $series_id === $castos_podcast['series_id'] ) {
+				return $castos_podcast;
+			}
+		}
+
+		return array();
+	}
+
+
 	/**
 	 * Gets users series map.
 	 *
@@ -159,7 +416,7 @@ protected function generate_users_series_map() {
 	/**
 	 * @return string
 	 */
-	protected function get_successfully_finished_notice(){
+	protected function get_successfully_finished_notice() {
 		return __( 'PMPro data successfully synchronized!', 'seriously-simple-podcasting' );
 	}
 
@@ -263,7 +520,7 @@ protected function print_private_podcast_feeds() {
 	 * @return string[]
 	 */
 	protected function get_private_feed_urls() {
-		$current_user     = wp_get_current_user();
+		$current_user = wp_get_current_user();
 		$users_series_map = $this->generate_users_series_map();
 
 		$feed_urls = get_transient( 'ssp_pmpro_feed_urls_user_' . $current_user->ID );
@@ -328,7 +585,7 @@ public function protect_feed_access() {
 		$series = get_term_by( 'slug', $this->feed_handler->get_series_slug(), 'series' );
 
 		$series_levels = $this->get_series_level_ids( $series->term_id );
-		$has_access    = $this->has_access( wp_get_current_user(), $series_levels );
+		$has_access = $this->has_access( wp_get_current_user(), $series_levels );
 
 		if ( ! $has_access ) {
 			$description = wp_strip_all_tags( pmpro_get_no_access_message( '', $series_levels ) );
@@ -355,7 +612,7 @@ public function access_filter( $access, $post, $user, $post_levels ) {
 			return isset( $item->id ) ? $item->id : null;
 		}, (array) $post_levels ) );
 
-		$is_admin   = is_admin() && ! ssp_is_ajax();
+		$is_admin = is_admin() && ! ssp_is_ajax();
 		$is_podcast = in_array( $post->post_type, ssp_post_types() );
 
 		if ( $is_admin || ! $is_podcast || ! $access ) {
@@ -405,7 +662,7 @@ protected function has_access( $user, $related_level_ids ) {
 	 * @return int[]
 	 */
 	protected function get_series_level_ids( $term_id ) {
-		$levels    = (array) ssp_get_option( sprintf( 'series_%s_pmpro_levels', $term_id ), null );
+		$levels = (array) ssp_get_option( sprintf( 'series_%s_pmpro_levels', $term_id ), null );
 		$level_ids = array();
 		foreach ( $levels as $level ) {
 			$level_ids[] = (int) str_replace( 'lvl_', '', $level );
@@ -431,7 +688,7 @@ public function integration_settings() {
 			$msg = sprintf( $msg, admin_url( 'edit.php?post_type=podcast&page=podcast_settings&tab=castos-hosting' ) );
 
 			$args['description'] = $msg;
-			$args['fields']      = array();
+			$args['fields'] = array();
 		} else {
 			if ( 'podcast_settings' === filter_input( INPUT_GET, 'page' ) && $this->bulk_update_started() ) {
 				$this->notices_handler->add_flash_notice( __( 'Synchronizing Paid Memberships Pro data with Castos...', 'seriously-simple-podcasting' ) );
@@ -464,20 +721,20 @@ protected function get_integration_settings() {
 		$levels = $this->get_membership_levels();
 
 		$settings = array(
-			'id'          => 'paid_memberships_pro',
-			'title'       => __( 'Paid Memberships Pro', 'seriously-simple-podcasting' ),
+			'id' => 'paid_memberships_pro',
+			'title' => __( 'Paid Memberships Pro', 'seriously-simple-podcasting' ),
 			'description' => __( 'Select which Podcast you would like to be available only
 								to Members via Paid Memberships Pro.', 'seriously-simple-podcasting' ),
-			'fields'      => array(
+			'fields' => array(
 				array(
-					'id'   => 'is_pmpro_integration',
+					'id' => 'is_pmpro_integration',
 					'type' => 'hidden',
 				),
 				array(
-					'id'          => 'enable_pmpro_integration',
-					'type'        => 'checkbox',
-					'default'     => 'on',
-					'label'       => __( 'Enable integration', 'seriously-simple-podcasting' ),
+					'id' => 'enable_pmpro_integration',
+					'type' => 'checkbox',
+					'default' => 'on',
+					'label' => __( 'Enable integration', 'seriously-simple-podcasting' ),
 					'description' => __( 'Enable Paid Memberships Pro integration', 'seriously-simple-podcasting' ),
 				),
 			),
@@ -490,7 +747,7 @@ protected function get_integration_settings() {
 		}
 
 		if ( ! $levels ) {
-			$levels_url              = admin_url( 'admin.php?page=pmpro-membershiplevels' );
+			$levels_url = admin_url( 'admin.php?page=pmpro-membershiplevels' );
 			$settings['description'] = sprintf( __( 'To require membership to access a podcast please <a href="%s">set up a
 										membership level</a> first.', 'seriously-simple-podcasting' ), $levels_url );
 
@@ -505,15 +762,15 @@ protected function get_integration_settings() {
 
 		foreach ( $series as $series_item ) {
 			$series_item_settings = array(
-				'id'          => sprintf( 'series_%s_pmpro_levels', $series_item->term_id ),
-				'label'       => $series_item->name,
-				'type'        => 'select2_multi',
-				'options'     => $checkbox_options,
+				'id' => sprintf( 'series_%s_pmpro_levels', $series_item->term_id ),
+				'label' => $series_item->name,
+				'type' => 'select2_multi',
+				'options' => $checkbox_options,
 				'description' => 'Require enrollment to level',
 			);
 
 			if ( ! $this->is_series_protected_in_castos( $series_item->term_id ) ) {
-				$series_item_settings['type']        = 'info';
+				$series_item_settings['type'] = 'info';
 				$series_item_settings['description'] = 'Please first make this podcast private in your Castos dashboard';
 			}
 
diff --git a/php/classes/repositories/class-episode-repository.php b/php/classes/repositories/class-episode-repository.php
index 36242a1f..9848d50e 100644
--- a/php/classes/repositories/class-episode-repository.php
+++ b/php/classes/repositories/class-episode-repository.php
@@ -26,6 +26,7 @@ class Episode_Repository implements Service {
 	use Useful_Variables;
 
 	const META_SYNC_STATUS = 'sync_status';
+
 	const META_SYNC_ERROR = 'ssp_sync_episode_error';
 
 	/**
@@ -477,6 +478,7 @@ public function update_episode_sync_status( $episode_id, $status ) {
 		return update_post_meta( $episode_id, self::META_SYNC_STATUS, $status );
 	}
 
+
 	/**
 	 * @param int $episode_id
 	 *
@@ -629,6 +631,8 @@ public function get_player_data( $id, $current_post = null, $skip_empty_audio =
 				'title'                 => $episode->post_title,
 				'excerpt'               => ssp_get_episode_excerpt( $episode->ID ),
 				'player_id'             => wp_rand(),
+				'add_empty_warning'     => false,
+				'class'                 => '',
 			);
 
 			return apply_filters( 'ssp_html_player_data', $template_data );
diff --git a/php/classes/rest/class-episodes-rest-controller.php b/php/classes/rest/class-episodes-rest-controller.php
index ea189ee4..0671dfbc 100644
--- a/php/classes/rest/class-episodes-rest-controller.php
+++ b/php/classes/rest/class-episodes-rest-controller.php
@@ -2,7 +2,6 @@
 
 namespace SeriouslySimplePodcasting\Rest;
 
-use SeriouslySimplePodcasting\Controllers\Podcast_Post_Types_Controller as PPT_Controller;
 use SeriouslySimplePodcasting\Entities\Sync_Status;
 use SeriouslySimplePodcasting\Repositories\Episode_Repository;
 use WP_REST_Controller;
diff --git a/php/classes/rest/class-rest-api-controller.php b/php/classes/rest/class-rest-api-controller.php
index 4c15bec2..20464f06 100644
--- a/php/classes/rest/class-rest-api-controller.php
+++ b/php/classes/rest/class-rest-api-controller.php
@@ -2,6 +2,7 @@
 
 namespace SeriouslySimplePodcasting\Rest;
 
+use SeriouslySimplePodcasting\Entities\Sync_Status;
 use SeriouslySimplePodcasting\Handlers\Options_Handler;
 use SeriouslySimplePodcasting\Handlers\Series_Handler;
 use SeriouslySimplePodcasting\Repositories\Episode_Repository;
@@ -520,15 +521,27 @@ public function get_rest_audio_player( $object, $field_name, $request ) {
 	 */
 	public function get_episode_player_data( $object, $field_name, $request ) {
 		if ( ! empty( $object['id'] ) ) {
-			$options_handler    = new Options_Handler();
-			$episode_id         = $object['id'];
-			$player_data        = array(
+			$options_handler = new Options_Handler();
+			$episode_id      = $object['id'];
+			$sync_status     = ssp_episode_sync_status( $episode_id );
+
+			$player_data = array(
 				'playerMode'    => get_option( 'ss_podcasting_player_mode', 'dark' ),
 				'subscribeUrls' => $options_handler->get_subscribe_urls( $episode_id, 'rest_api' ),
 				'rssFeedUrl'    => $this->episode_repository->get_feed_url( $episode_id ),
 				'embedCode'     => preg_replace( '/(\r?\n){2,}/', '\n\n', get_post_embed_html( 500, 350, $episode_id ) ),
 			);
 
+			if ( ssp_is_connected_to_castos() ) {
+				$player_data['syncStatus'] = array(
+					'isSynced' => Sync_Status::SYNC_STATUS_SYNCED === $sync_status->status,
+					'status' => $sync_status->status,
+					'error' => $sync_status->error,
+					'message' => $sync_status->message,
+					'title' => $sync_status->title,
+				);
+			}
+
 			return $player_data;
 		}
 
diff --git a/php/classes/shortcodes/class-podcast-playlist.php b/php/classes/shortcodes/class-podcast-playlist.php
index 5d94b1fd..e51d75cc 100644
--- a/php/classes/shortcodes/class-podcast-playlist.php
+++ b/php/classes/shortcodes/class-podcast-playlist.php
@@ -49,7 +49,7 @@ public function shortcode( $params ) {
 		$this->prepare_properties();
 
 		$atts     = $this->prepare_atts( $params );
-		$episodes = $this->ss_podcasting->players_controller->get_playlist_episodes( $atts );
+		$episodes = $this->ss_podcasting->episode_repository->get_episodes( $atts );
 
 		if ( empty ( $episodes ) ) {
 			return '';
@@ -111,13 +111,14 @@ protected function prepare_atts( $params ) {
 				'orderby'      => 'menu_order ID',
 				'include'      => '',
 				'exclude'      => '',
-				'style'        => 'light',
+				'style'        => get_option( 'ss_podcasting_player_mode', 'light' ),
 				'player_style' => 'standard',
 				'tracklist'    => true,
 				'tracknumbers' => true,
 				'images'       => true,
 				'limit'        => 10,
 				'page'         => 1,
+				'class'        => '',
 			),
 			$params,
 			'podcast_playlist'
diff --git a/php/config/settings/hosting.php b/php/config/settings/hosting.php
index 3d77049d..a347540e 100644
--- a/php/config/settings/hosting.php
+++ b/php/config/settings/hosting.php
@@ -1,79 +1,75 @@
 <?php
+
 /**
  * @var array $podcast_options
  * */
 return array(
-	'title'    => __( 'Hosting', 'seriously-simple-podcasting' ),
+	'title' => __( 'Hosting', 'seriously-simple-podcasting' ),
+	'button_text' => __( 'Connect', 'seriously-simple-podcasting' ),
+	'button_class' => 'castos-connect disabled hidden',
 	'sections' => array(
 		'credentials' => array(
-			'title'       => __( 'Podcast Hosting', 'seriously-simple-podcasting' ),
+			'condition_callback' => function () {
+				return ! ssp_is_connected_to_castos();
+			},
+			'title' => __( 'Podcast Hosting', 'seriously-simple-podcasting' ),
 			'description' => sprintf( __( 'Connect your WordPress site to your %s account.', 'seriously-simple-podcasting' ), '<a target="_blank" href="' . SSP_CASTOS_APP_URL . '">Castos</a>' ),
-			'fields'      => array(
+			'fields' => array(
 				array(
-					'id'          => 'podmotor_account_email',
-					'type'        => 'text',
-					'label'       => __( 'Your email', 'seriously-simple-podcasting' ),
-					'description' => __( 'The email address you used to register your Castos account.', 'seriously-simple-podcasting' ),
-					'default'     => '',
-					'placeholder' => __( 'email@domain.com', 'seriously-simple-podcasting' ),
-					'callback'    => 'esc_email',
-					'class'       => 'regular-text',
-				),
-				array(
-					'id'          => 'podmotor_account_api_token',
-					'type'        => 'text',
-					'label'       => __( 'Castos API key', 'seriously-simple-podcasting' ),
-					'description' => __( 'Your Castos API key. Available from your Castos account dashboard.', 'seriously-simple-podcasting' ),
-					'default'     => '',
-					'placeholder' => __( 'Enter your api key', 'seriously-simple-podcasting' ),
-					'callback'    => 'sanitize_text_field',
-					'class'       => 'regular-text',
-				),
-				array(
-					'id'    => 'validate_api_credentials',
-					'type'  => 'button',
-					'label' => esc_attr( __( 'Verify Credentials', 'seriously-simple-podcasting' ) ),
-					'class' => 'button-primary',
+					'id' => 'podmotor_account_api_token',
+					'type' => 'text',
+					'label' => __( 'Castos API token', 'seriously-simple-podcasting' ),
+					'description' => sprintf( __( 'Your Castos API token. Available from your %s.', 'seriously-simple-podcasting' ), '<a target="_blank" href="' . SSP_CASTOS_APP_URL . 'integrations/api-details' . '">Castos dashboard</a>' ),
+					'default' => '',
+					'placeholder' => __( 'Enter your API token', 'seriously-simple-podcasting' ),
+					'callback' => 'sanitize_text_field',
+					'class' => 'regular-text',
 				),
 			),
 		),
-		'sync'        => array(
+		'sync' => array(
 			'condition_callback' => 'ssp_is_connected_to_castos',
-			'title'              => __( 'Sync to Castos', 'seriously-simple-podcasting' ),
-			'no_store'           => true,
-			'description'        => sprintf(
-				__( 'Use this option for a one time sync of your existing WordPress podcast to your Castos account. If you encounter any problems with it, please contact support at hello@castos.com.', 'seriously-simple-podcasting' ),
-				'<a href="' . SSP_CASTOS_APP_URL . '">Castos</a>'
-			),
-			'fields'             => array(
+			'title' => __( 'Sync to Castos', 'seriously-simple-podcasting' ),
+			'no_store' => true,
+			'fields' => array(
+				array(
+					'id' => 'castos_sync_info',
+					'label' => __( 'Castos Account', 'seriously-simple-podcasting' ),
+					'description' => do_shortcode( '[castos_email]' ),
+					'type' => 'info',
+				),
 				array(
-					'id'          => 'podcasts_sync',
-					'label'       => __( 'Podcast', 'seriously-simple-podcasting' ),
+					'id' => 'podcasts_sync',
+					'label' => __( 'Podcast', 'seriously-simple-podcasting' ),
 					'description' => __( 'Select the podcast you want to sync to your Castos hosting account.', 'seriously-simple-podcasting' ),
-					'type'        => 'podcasts_sync',
-					'options'     => $podcast_options,
+					'type' => 'podcasts_sync',
+					'options' => $podcast_options,
 				),
 				array(
-					'id'    => 'trigger_sync',
-					'type'  => 'button',
+					'id' => 'trigger_sync',
+					'type' => 'button',
 					'label' => esc_attr( __( 'Trigger Sync', 'seriously-simple-podcasting' ) ),
+					'description' => '<br><br>' . sprintf(
+							__( 'Use this option for a one time sync of your existing WordPress podcast to your %s. If you encounter any problems with it, please contact support at hello@castos.com.', 'seriously-simple-podcasting' ),
+							'<a target="_blank" rel="noopener" href="' . esc_attr( SSP_CASTOS_APP_URL ) . '">' . __( 'Castos account', 'seriously-simple-podcasting' ) . '</a>'
+						),
 					'class' => 'button-primary',
 				),
 			),
 		),
-		'disconnect'  => array(
+		'disconnect' => array(
 			'condition_callback' => 'ssp_is_connected_to_castos',
-			'title'              => __( 'Danger Zone', 'seriously-simple-podcasting' ),
-			'no_store'           => true,
-			'fields'             => array(
+			'title' => __( 'Danger Zone', 'seriously-simple-podcasting' ),
+			'no_store' => true,
+			'fields' => array(
 				array(
-					'id'          => 'podmotor_disconnect',
-					'label'       => __( 'Disconnect Castos', 'seriously-simple-podcasting' ),
+					'id' => 'disconnect_castos',
+					'label' => __( 'Disconnect', 'seriously-simple-podcasting' ),
 					'description' => __( 'Select this if you wish to disconnect your Castos account.', 'seriously-simple-podcasting' ),
-					'type'        => 'checkbox',
-					'default'     => '',
-					'callback'    => 'wp_strip_all_tags',
-					'class'       => 'disconnect-castos',
+					'type' => 'button',
+					'default' => '',
+					'callback' => 'wp_strip_all_tags',
+					'class' => 'disconnect-castos button',
 				),
 			),
 		),
diff --git a/php/includes/ssp-functions.php b/php/includes/ssp-functions.php
index fe22a219..62636cfa 100644
--- a/php/includes/ssp-functions.php
+++ b/php/includes/ssp-functions.php
@@ -7,8 +7,10 @@
 use SeriouslySimplePodcasting\Handlers\Castos_Handler;
 use SeriouslySimplePodcasting\Handlers\CPT_Podcast_Handler;
 use SeriouslySimplePodcasting\Handlers\Images_Handler;
+use SeriouslySimplePodcasting\Helpers\Log_Helper;
 use SeriouslySimplePodcasting\Interfaces\Service;
 use SeriouslySimplePodcasting\Renderers\Renderer;
+use SeriouslySimplePodcasting\Repositories\Episode_Repository;
 use SeriouslySimplePodcasting\Repositories\Series_Repository;
 
 // Exit if accessed directly.
@@ -220,7 +222,7 @@ function ss_get_podcast( $args = '' ) {
 			$podcast_series = empty( $args['series'] ) ? null : $args['series'];
 
 			// Get query args
-			$query_args = apply_filters( 'ssp_get_podcast_query_args', ssp_episodes( -1, $podcast_series, true ) );
+			$query_args = apply_filters( 'ssp_get_podcast_query_args', ssp_episodes( - 1, $podcast_series, true ) );
 
 			// The Query
 			$query = get_posts( $query_args );
@@ -229,7 +231,7 @@ function ss_get_podcast( $args = '' ) {
 			if ( ! is_wp_error( $query ) && is_array( $query ) && count( $query ) > 0 ) {
 				foreach ( $query as $k => $v ) {
 					// Get the URL
-					$query[$k]->url = get_permalink( $v->ID );
+					$query[ $k ]->url = get_permalink( $v->ID );
 				}
 			} else {
 				$query = false;
@@ -239,18 +241,18 @@ function ss_get_podcast( $args = '' ) {
 
 			$terms = get_terms( 'series' );
 
-			if ( count( $terms ) > 0) {
+			if ( count( $terms ) > 0 ) {
 
 				foreach ( $terms as $term ) {
-					$query[ $term->term_id ] = new stdClass();
+					$query[ $term->term_id ]        = new stdClass();
 					$query[ $term->term_id ]->title = $term->name;
-					$query[ $term->term_id ]->url = get_term_link( $term );
+					$query[ $term->term_id ]->url   = get_term_link( $term );
 
-					$query_args = apply_filters( 'ssp_get_podcast_series_query_args', ssp_episodes( -1, $term->slug, true, '' ) );
+					$query_args = apply_filters( 'ssp_get_podcast_series_query_args', ssp_episodes( - 1, $term->slug, true, '' ) );
 
 					$posts = get_posts( $query_args );
 
-					$count = count( $posts );
+					$count                          = count( $posts );
 					$query[ $term->term_id ]->count = $count;
 				}
 			}
@@ -547,7 +549,7 @@ function ssp_episodes( $n = 10, $series = '', $return_args = false, $context = '
 	 *
 	 * @param boolean $include_podcast Include the `podcast` post type or not
 	 *
-	 * @param bool $verify	Verify if the post type has been registered by register_post_type
+	 * @param bool $verify Verify if the post type has been registered by register_post_type
 	 *
 	 * @return array                    Array of podcast post types
 	 * @since  1.8.7
@@ -640,7 +642,7 @@ function ssp_get_feed_category_output( $level, $series_id ) {
 
 		} else {
 			// If there is no series ID, it's a deprecated default feed settings, which are not used anymore
-			$category = get_option( 'ss_podcasting_data_category' . $level, '' );
+			$category    = get_option( 'ss_podcasting_data_category' . $level, '' );
 			$subcategory = $category ? get_option( 'ss_podcasting_data_subcategory' . $level, '' ) : '';
 		}
 
@@ -668,33 +670,39 @@ function ssp_get_feed_category_output( $level, $series_id ) {
 	 * @since     1.0.0
 	 */
 	function ssp_readfile_chunked( $file, $retbytes = true ) {
+		try {
+			$chunksize = 1 * ( 1024 * 1024 );
+			$cnt       = 0;
 
-		$chunksize = 1 * ( 1024 * 1024 );
-		$cnt       = 0;
+			$handle = fopen( $file, 'r' );
+			if ( false === $handle ) {
+				return false;
+			}
 
-		$handle = fopen( $file, 'r' );
-		if ( false === $handle ) {
-			return false;
-		}
+			while ( ! feof( $handle ) ) {
+				$buffer = fread( $handle, $chunksize );
+				echo $buffer;
+				ob_flush();
+				flush();
 
-		while ( ! feof( $handle ) ) {
-			$buffer = fread( $handle, $chunksize );
-			echo $buffer;
-			ob_flush();
-			flush();
+				if ( $retbytes ) {
+					$cnt += strlen( $buffer );
+				}
+			}
+
+			$status = fclose( $handle );
 
-			if ( $retbytes ) {
-				$cnt += strlen( $buffer );
+			if ( $retbytes && $status ) {
+				return $cnt;
 			}
-		}
 
-		$status = fclose( $handle );
+			return $status;
+		} catch ( \Throwable $e ) {
+			$logger = new Log_Helper();
+			$logger->log( 'Error in ' . __FUNCTION__ . ': ' . $e->getMessage(), 'File: ' . $file );
 
-		if ( $retbytes && $status ) {
-			return $cnt;
+			return false;
 		}
-
-		return $status;
 	}
 }
 
@@ -742,9 +750,8 @@ function ssp_is_connected_to_castos() {
 		if ( $cache = wp_cache_get( $cache_key ) ) {
 			return $cache;
 		}
-		$podmotor_email     = get_option( 'ss_podcasting_podmotor_account_email', '' );
 		$podmotor_api_token = get_option( 'ss_podcasting_podmotor_account_api_token', '' );
-		if ( ! empty( $podmotor_email ) && ! empty( $podmotor_api_token ) ) {
+		if ( ! empty( $podmotor_api_token ) ) {
 			$is_connected = true;
 		}
 
@@ -760,7 +767,7 @@ function ssp_is_connected_to_castos() {
 	 *
 	 * @return WP_Query
 	 */
-	function ssp_get_not_synced_episodes( $posts_per_page = -1 ) {
+	function ssp_get_not_synced_episodes( $posts_per_page = - 1 ) {
 		$podcast_post_types = ssp_post_types();
 		$args               = array(
 			'post_type'      => $podcast_post_types,
@@ -945,7 +952,7 @@ function ssp_email_podcasts_imported() {
 		/* translators: %s: Site Name */
 		$message .= sprintf( __( 'The Podcast import for %1$s has completed.' ), $site_name ) . PHP_EOL;
 		$message .= __( 'Thank you for using Castos to host your podcasts.' );
-		$from     = sprintf( 'From: "%1$s" <%2$s>', _x( 'Site Admin', 'email "From" field' ), $to );
+		$from    = sprintf( 'From: "%1$s" <%2$s>', _x( 'Site Admin', 'email "From" field' ), $to );
 
 		return wp_mail( $to, $subject, $message, $from );
 	}
@@ -975,12 +982,13 @@ function ssp_setup_upload_credentials() {
 if ( ! function_exists( 'ssp_get_image_id_from_url' ) ) {
 	/**
 	 * Get image ID when only the URL of the image is known
-	 * @deprecated Do not use this function. Use attachment_url_to_postid() instead
-	 * @todo: remove it in the next versions
 	 *
 	 * @param $image_url
 	 *
 	 * @return mixed
+	 * @deprecated Do not use this function. Use attachment_url_to_postid() instead
+	 * @todo: remove it in the next versions
+	 *
 	 */
 	function ssp_get_image_id_from_url( $image_url ) {
 		$relative_image_url = str_replace( get_site_url(), '', $image_url );
@@ -1159,6 +1167,7 @@ function ssp_is_elementor_ok() {
 		if ( array_key_exists( 'elementor/elementor.php', $active_plugins ) || in_array( 'elementor/elementor.php', $active_plugins, true ) ) {
 			return true;
 		}
+
 		return false;
 	}
 }
@@ -1173,7 +1182,9 @@ function ssp_is_elementor_ok() {
 	 * @return bool
 	 */
 	function ssp_is_feed_image_valid( $image_url ) {
-		global $images_handler; /** @var Images_Handler $images_handler */
+		global $images_handler;
+
+		/** @var Images_Handler $images_handler */
 		return $images_handler->is_feed_image_valid( $image_url );
 	}
 }
@@ -1188,7 +1199,9 @@ function ssp_is_feed_image_valid( $image_url ) {
 	 * @return bool
 	 * */
 	function ssp_is_image_square( $image_data_array = array() ) {
-		global $images_handler; /** @var Images_Handler $images_handler */
+		global $images_handler;
+
+		/** @var Images_Handler $images_handler */
 		return $images_handler->is_image_square( $image_data_array );
 	}
 }
@@ -1204,9 +1217,11 @@ function ssp_is_image_square( $image_data_array = array() ) {
 	 *
 	 * @return array
 	 */
-	function  ssp_get_attachment_image_src( $attachment_id, $size = "full" ) {
-		global $images_handler; /** @var Images_Handler $images_handler */
-		return $images_handler->get_attachment_image_src( $attachment_id, $size  );
+	function ssp_get_attachment_image_src( $attachment_id, $size = "full" ) {
+		global $images_handler;
+
+		/** @var Images_Handler $images_handler */
+		return $images_handler->get_attachment_image_src( $attachment_id, $size );
 	}
 }
 
@@ -1236,7 +1251,7 @@ function ssp_get_the_feed_item_content( $post = null ) {
 		 * The same as in @see excerpt_remove_blocks() plus 'core/block',
 		 * */
 		if ( $blocks and is_array( $blocks ) ) {
-			$content = '';
+			$content        = '';
 			$allowed_blocks = array(
 				null,
 				'core/freeform',
@@ -1280,7 +1295,7 @@ function ssp_get_the_feed_item_content( $post = null ) {
 				$block_content = render_block( $block );
 
 				// Strip tags with content inside (styles, scripts)
-				$strip_tags = array('style', 'script');
+				$strip_tags = array( 'style', 'script' );
 
 				foreach ( $strip_tags as $strip_tag ) {
 					$strip_pattern = sprintf( '/<%s[^>]*>([\s\S]*?)<\/%s[^>]*>/', $strip_tag, $strip_tag );
@@ -1300,7 +1315,8 @@ function ssp_get_the_feed_item_content( $post = null ) {
 		$content = preg_replace( '/<style>(.|\s)*?<\/style>/', '', $content );
 		$content = preg_replace( '/<script>(.|\s)*?<\/script>/', '', $content );
 		$content = str_replace( '<br>', PHP_EOL, $content );
-		$content = strip_tags( $content, '<p>,<a>,<ul>,<ol>,<li>,<strong>,<em>,<h2>,<h3>,<h4>,<h5>,<label>' );
+		$allowed_tags = apply_filters('ssp_feed_item_content_allowed_tags', '<p>,<a>,<ul>,<ol>,<li>,<strong>,<em>,<h2>,<h3>,<h4>,<h5>,<label>');
+		$content = strip_tags( $content, $allowed_tags );
 
 		// Remove empty paragraphs as well.
 		$content = trim( str_replace( '<p></p>', '', $content ) );
@@ -1475,6 +1491,7 @@ function ssp_is_ajax() {
 	 */
 	function ssp_frontend_controller() {
 		global $ss_podcasting;
+
 		return $ss_podcasting;
 	}
 }
@@ -1504,9 +1521,9 @@ function ssp_episode_controller() {
 	/**
 	 * Get base slug for Series taxonomy.
 	 * Since 2.14.0, Series taxonomy was renamed to Podcasts.
+	 * @return string
 	 * @since 2.14.0
 	 *
-	 * @return string
 	 */
 	function ssp_series_slug() {
 		if ( $slug = ssp_get_option( 'series_slug' ) ) {
@@ -1704,6 +1721,7 @@ function ssp_get_episode_podcasts( $post_id ) {
 	 */
 	function ssp_get_podcasts( $hide_empty = false ) {
 		$podcasts = get_terms( ssp_series_taxonomy(), array( 'hide_empty' => $hide_empty ) );
+
 		return is_array( $podcasts ) ? $podcasts : array();
 	}
 }
@@ -1746,11 +1764,11 @@ function ssp_series_taxonomy() {
 	 * @return Renderer|Service
 	 */
 	function ssp_renderer() {
-		return ssp_app()->get_service('renderer');
+		return ssp_app()->get_service( 'renderer' );
 	}
 }
 
-if( ! function_exists('ssp_config') ){
+if ( ! function_exists( 'ssp_config' ) ) {
 	/**
 	 * @param string $name
 	 * @param array $args
@@ -1766,7 +1784,7 @@ function ssp_config( $name, $args = array() ) {
 	}
 }
 
-if( ! function_exists('ssp_get_tab_url') ){
+if ( ! function_exists( 'ssp_get_tab_url' ) ) {
 	/**
 	 * @param string $tab
 	 *
@@ -1776,13 +1794,13 @@ function ssp_get_tab_url( $tab ) {
 		return add_query_arg( array(
 			'post_type' => SSP_CPT_PODCAST,
 			'page'      => 'podcast_settings',
-			'tab'       => $tab
+			'tab'       => $tab,
 		), admin_url( 'edit.php' ) );
 	}
 }
 
 
-if( ! function_exists('ssp_get_default_series_id') ){
+if ( ! function_exists( 'ssp_get_default_series_id' ) ) {
 	/**
 	 *
 	 * @return int
@@ -1792,7 +1810,7 @@ function ssp_get_default_series_id() {
 	}
 }
 
-if( ! function_exists('ssp_get_default_series') ){
+if ( ! function_exists( 'ssp_get_default_series' ) ) {
 	/**
 	 *
 	 * @return WP_Term|null
@@ -1807,7 +1825,7 @@ function ssp_get_default_series() {
 	}
 }
 
-if( ! function_exists('ssp_get_default_series_slug') ){
+if ( ! function_exists( 'ssp_get_default_series_slug' ) ) {
 	/**
 	 *
 	 * @return string
@@ -1833,7 +1851,7 @@ function ssp_get_default_series_name( $name ) {
 	}
 }
 
-if( ! function_exists('ssp_series_repository') ){
+if ( ! function_exists( 'ssp_series_repository' ) ) {
 	/**
 	 * @return Series_Repository
 	 */
@@ -1841,3 +1859,24 @@ function ssp_series_repository() {
 		return Series_Repository::instance();
 	}
 }
+
+if ( ! function_exists( 'ssp_onboarded' ) ) {
+	/**
+	 * @return bool
+	 */
+	function ssp_onboarded() {
+		return ! empty( ssp_get_option( 'data_title', '', ssp_get_default_series_id() ) );
+	}
+}
+
+
+if ( ! function_exists( 'ssp_episode_sync_error' ) ) {
+	/**
+	 * @return \SeriouslySimplePodcasting\Entities\Sync_Status
+	 */
+	function ssp_episode_sync_status( $episode_id ) {
+		/** @var Episode_Repository $episode_repository **/
+		$episode_repository = ssp_get_service('episode_repository');
+		return $episode_repository->get_episode_sync_status( $episode_id );
+	}
+}
diff --git a/readme.txt b/readme.txt
index 110eb509..6055240d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,9 +2,9 @@
 Contributors: PodcastMotor, psykro, zahardoc, simondowdles, hlashbrooke, whyisjake
 Tags: podcast, audio, itunes, podcasting, playlist
 Requires at least: 5.3
-Tested up to: 6.4
+Tested up to: 6.6
 Requires PHP: 7.4
-Stable tag: 3.2.0
+Stable tag: 3.5.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -27,7 +27,7 @@ With other podcast providers, you’ll need to make updates to your podcast’s
 
 Getting started with Seriously Simple Podcasting is a seriously simple process. In just four steps, you’ll go from installing the plugin to your WordPress site to submitting a functioning RSS feed to every podcast directory.
 
-[youtube https://www.youtube.com/watch?v=sKjZTx02Ng0]
+[youtube https://www.youtube.com/watch?v=4Ekj4W9hljA]
 
 1. Install the Seriously Simple Podcasting plugin to your WordPress site.
 2. Begin the onboarding wizard, and create your first podcast. Here you’ll give details like the Podcast Title, Description, and upload your cover image.
@@ -165,6 +165,45 @@ You can find complete user and developer documentation (along with the FAQs) on
 
 == Changelog ==
 
+= 3.5.0 =
+2024-09-11
+[UPDATE] Enhanced UX/UI for Hosting (Castos connection) settings
+[UPDATE] Display success and error messages for Castos connection
+[UPDATE] Auto-disconnect SSP when users are disconnected on Castos
+[UPDATE] Display Castos sync status after saving episodes
+[UPDATE] Added filter for allowed tags in the feed description
+[UPDATE] Removed the "1,000 Subscriber Challenge" from the settings sidebar
+[FIX] Handle PHP exceptions in the ssp_readfile_chunked() function
+[FIX] Catch potential PHP errors during episode file downloads
+[FIX] Support additional classes in the player and podcast playlist blocks
+[FIX] Use dark mode for the playlist block when dark mode is set in the settings
+
+= 3.4.1 =
+2024-07-31
+[UPDATE] Improved and fixed synchronization with the latest version of Paid Memberships Pro.
+
+= 3.4.0 =
+2024-05-28
+[UPDATE] Polylang compatibility
+[UPDATE] Clear Castos API Credentials upon plugin deactivation
+[UPDATE] Carry over podcast description to feed details when creating a new podcast
+[UPDATE] Improved [podcast_episode] shortcode - possibility to show the latest episode
+[FIX] Use podcast post type by default instead of post when importing from RSS
+[FIX] Improved player rendering, allowing links in the player title
+[FIX] Removed outdated plugin messages
+
+= 3.3.1 =
+2024-05-08
+[FIX] Fixed the plugin activation issue in WordPress 6.5.3
+
+= 3.3.0 =
+2024-05-08
+[UPDATE] Show the "Onboarding wizard" menu item for new users
+[UPDATE] Improved scheduled episodes sync - maximum 3 attempts
+[UPDATE] Hide player if no file provided
+[UPDATE] Cache Castos ads settings
+[FIX] Security improvements
+
 = 3.2.0 =
 2024-03-20
 UPDATE SUMMARY: Improved WC Memberships integration, small fixes
diff --git a/seriously-simple-podcasting.php b/seriously-simple-podcasting.php
index 0ec799dc..cb1a7967 100644
--- a/seriously-simple-podcasting.php
+++ b/seriously-simple-podcasting.php
@@ -1,14 +1,14 @@
 <?php
 /**
  * Plugin Name: Seriously Simple Podcasting
- * Version: 3.2.0
+ * Version: 3.5.0
  * Plugin URI: https://castos.com/seriously-simple-podcasting/?utm_medium=sspodcasting&utm_source=wordpress&utm_campaign=wpplugin_08_2019
  * Description: Podcasting the way it's meant to be. No mess, no fuss - just you and your content taking over the world.
  * Author: Castos
  * Author URI: https://castos.com/?utm_medium=sspodcasting&utm_source=wordpress&utm_campaign=wpplugin_08_2019
  * Requires PHP: 7.4
  * Requires at least: 5.3
- * Tested up to: 6.4
+ * Tested up to: 6.6
  *
  * Text Domain: seriously-simple-podcasting
  *
@@ -22,7 +22,7 @@
 	exit;
 }
 
-define( 'SSP_VERSION', '3.2.0' );
+define( 'SSP_VERSION', '3.5.0' );
 define( 'SSP_PLUGIN_FILE', __FILE__ );
 define( 'SSP_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 define( 'SSP_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
diff --git a/src/components/EpisodeSyncStatus.js b/src/components/EpisodeSyncStatus.js
new file mode 100644
index 00000000..fdc3aa63
--- /dev/null
+++ b/src/components/EpisodeSyncStatus.js
@@ -0,0 +1,105 @@
+import { useDispatch, useSelect } from '@wordpress/data'
+import { useRef} from '@wordpress/element'
+import apiFetch from '@wordpress/api-fetch';
+
+const EpisodeSyncStatus = () => {
+	if(!isEpisode(useSelect((select) => select('core/editor')))){
+		return;
+	}
+
+	const isSavingPost = useSelect((select) => select('core/editor').isSavingPost(), [])
+	const previousIsSaving = useRef(isSavingPost)
+	const currentPost = useSelect((select) => select('core/editor').getCurrentPost(), [])
+	const { createWarningNotice, createInfoNotice } = useDispatch('core/notices')
+	const isPostJustSaved = previousIsSaving.current && ! isSavingPost
+	previousIsSaving.current = isSavingPost
+
+	if (isPostJustSaved) {
+		setTimeout(async () => {
+			await displaySyncData(currentPost)
+		}, 1000)
+	}
+
+	const displaySyncData = async (currentPost) => {
+		try {
+			const updatedPost = await fetchPostData(currentPost);
+
+			if (updatedPost && updatedPost[ 'episode_data' ]) {
+				let syncStatus = updatedPost[ 'episode_data' ].syncStatus
+				if ( 'none' === syncStatus.status ) {
+					return; // Do not show redundant "Not Synced yet" status.
+				}
+				displayNotice(syncStatus)
+				updateSyncStatus(syncStatus)
+			}
+
+		} catch (error) {
+			console.error('Error:', error)
+			return null
+		}
+	}
+
+	const updateSyncStatus = (syncStatus) => {
+		let syncLabel = document.querySelector('.js-ssp-sync-label')
+		syncLabel.textContent = syncStatus.title
+		syncLabel.setAttribute('title', syncStatus.title)
+		syncLabel.classList.remove('failed', 'synced', 'syncing')
+		syncLabel.classList.add(syncStatus.status)
+
+		let syncMessage = document.querySelector('.js-ssp-sync-message')
+		syncMessage.textContent = syncStatus.message
+
+		let description = document.querySelector('.js-ssp-sync-description')
+		description.textContent = syncStatus.error
+	}
+
+	const displayNotice = (syncStatus) => {
+		const noticeId = 'ssp-sync-notice'
+		let msg = syncStatus.message
+		if ( ! syncStatus.isSynced) {
+			if (syncStatus.error) {
+				msg += ' ' + syncStatus.error
+			}
+			createWarningNotice(msg, { id: noticeId })
+		} else {
+			createInfoNotice(msg, { type: 'snackbar', id: noticeId })
+		}
+	}
+
+	const getRestBaseForPostType = async (postType)=> {
+		try {
+			// Fetch the post types data from the REST API
+			const types = await apiFetch({ path: '/wp/v2/types' });
+
+			// Check if the specified post type exists in the fetched data
+			if (types[postType] && types[postType].rest_base) {
+				console.log('Returning rest base:', types[postType].rest_base);
+				return types[postType].rest_base;
+			} else {
+				console.warn(`Post type "${postType}" not found.`);
+				return null;
+			}
+		} catch (error) {
+			console.error('There was a problem with the fetch operation:', error);
+			return null;
+		}
+	}
+
+	const fetchPostData = async (post) => {
+		const restBase = await getRestBaseForPostType(post.type)
+		return await apiFetch({ path: `/wp/v2/${restBase}/${post.id}` })
+	}
+}
+
+const isEpisode = (editor) => {
+	if(!editor){
+		return false;
+	}
+	const sspPostTypes = sspAdmin.sspPostTypes
+	let currentPost = editor.getCurrentPost();
+	return (sspPostTypes instanceof Array) && currentPost && sspPostTypes.includes(currentPost.type)
+}
+
+
+
+export default EpisodeSyncStatus
diff --git a/src/index.js b/src/index.js
index 39713a88..f3ed6659 100644
--- a/src/index.js
+++ b/src/index.js
@@ -147,3 +147,9 @@ registerBlockType('seriously-simple-podcasting/playlist-player', {
 registerPlugin( 'post-publish-panel', {
 	render: PostPublishPanel
 } );
+
+import EpisodeSyncStatus from './components/EpisodeSyncStatus';
+
+registerPlugin('episode-sync-status', {
+	render: EpisodeSyncStatus,
+});
diff --git a/templates/metafields/sync-status.php b/templates/metafields/sync-status.php
index be9f123f..71d28f3e 100644
--- a/templates/metafields/sync-status.php
+++ b/templates/metafields/sync-status.php
@@ -10,13 +10,13 @@
 		</label>
 	</div>
 	<div class="ssp-episode-sync-status__data">
-			<span class="ssp-sync-label ssp-full-label <?php echo esc_attr( $status->status ) ?>"
+			<span class="ssp-sync-label js-ssp-sync-label ssp-full-label <?php echo esc_attr( $status->status ) ?>"
 				  title="<?php echo esc_html( $status->title ) ?>">
 			<?php echo esc_html( $status->title ) ?>
 			</span>
-		<span><?php echo esc_html( $status->message ) ?></span>
+		<span class="js-ssp-sync-message"><?php echo esc_html( $status->message ) ?></span>
 	</div>
-	<div class="ssp-episode-sync-status__description">
+	<div class="ssp-episode-sync-status__description js-ssp-sync-description">
 		<?php echo $status->error; ?>
 	</div>
 </div>
diff --git a/templates/onboarding/step-4.php b/templates/onboarding/step-4.php
index 4ca62f8a..e6a9e09c 100644
--- a/templates/onboarding/step-4.php
+++ b/templates/onboarding/step-4.php
@@ -2,7 +2,6 @@
 /**
  * @var int $step_number
  * @var array $step_urls
- * @var string $podmotor_account_email
  * @var string $podmotor_account_api_token
  * */
 
@@ -48,7 +47,7 @@
 				</ul>
 			</div>
 			<div class="ssp-onboarding-step-4__start-trial">
-				<a href="<?php echo $trial_url; ?>">
+				<a target="_blank" rel="noopener" href="<?php echo $trial_url; ?>">
 					<?php _e( 'Start Free Trial on Castos', 'seriously-simple-podcasting' ) ?>
 					<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 						<path d="M21.5 12H3.5M14.5 5L21.5 12L14.5 5ZM21.5 12L14.5 19L21.5 12Z" stroke="#F3C2C2" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
@@ -73,41 +72,34 @@
 				</div>
 
 				<div class="ssp-onboarding__hosting-step">
-					<a href="https://app.castos.com/account/publish" target="_blank">
+					<a href="https://app.castos.com/integrations/api-details" target="_blank" rel="noopener">
 						<span class="ssp-onboarding__hosting-step--header">
 							<?php _e( 'Complete details below', 'seriously-simple-podcasting' ); ?>
 						</span>
 						<span class="ssp-onboarding__hosting-step--info">
-							<?php printf( __( 'Get your API key from %s', 'seriously-simple-podcasting' ), '<span>Castos</span>' ); ?>
+							<?php printf( __( 'Get your API token from %s', 'seriously-simple-podcasting' ), '<span>Castos</span>' ); ?>
 						</span>
 					</a>
 				</div>
 			</div>
 			<form class="ssp-onboarding__settings-body" action="<?php echo $step_urls[ $step_number + 1 ] ?>" method="post">
 				<div class="ssp-onboarding__settings-item">
-					<h2><?php _e( 'Your Email', 'seriously-simple-podcasting' ); ?></h2>
-					<label for="podmotor_account_email" class="description">
-						<?php _e( 'The email address you used to register your Castos account.', 'seriously-simple-podcasting' ); ?>
-					</label>
-					<input id="podmotor_account_email" type="text" class="js-onboarding-validate-token-field" name="podmotor_account_email" value="<?php echo $podmotor_account_email ?>">
-				</div>
-
-				<div class="ssp-onboarding__settings-item">
-					<h2><?php _e( 'Castos API Key', 'seriously-simple-podcasting' ); ?></h2>
+					<h2><?php _e( 'Castos API Token', 'seriously-simple-podcasting' ); ?></h2>
 					<label for="podmotor_account_api_token" class="description">
 						<?php _e( 'Available from your Castos account dashboard.', 'seriously-simple-podcasting' ); ?>
 					</label>
-					<input id="podmotor_account_api_token" type="text" class="js-onboarding-validate-token-field" name="podmotor_account_api_token" value="<?php echo $podmotor_account_api_token ?>">
+					<input id="podmotor_account_api_token" type="text" class="js-onboarding-castos-connect-field" name="podmotor_account_api_token" value="<?php echo $podmotor_account_api_token ?>" <?php disabled( !! $podmotor_account_api_token ) ?>>
 				</div>
 
 				<div class="ssp-onboarding__submit">
 					<?php wp_nonce_field( 'ssp_onboarding_' . $step_number, 'nonce', false ); ?>
-					<button id="validate_api_credentials" type="button" class="button validate-token js-onboarding-validate-token" data-validating-txt="Validating Credentials" data-valid-txt="Valid Credentials" data-initial-txt="Validate Credentials" >
-						<?php _e( 'Verify Credentials', 'seriously-simple-podcasting' ); ?>
+					<button id="castos-connect" type="button" class="button castos-connect js-onboarding-castos-connect <?php if( $podmotor_account_api_token ) : ?>connected<?php endif ?>" data-connected-txt="<?php _e('Connected', 'seriously-simple-podcasting') ?>" data-connecting-txt="<?php
+						_e('Connecting Castos', 'seriously-simple-podcasting') ?>" data-no-reload="true" data-initial-txt="<?php _e('Connect Castos', 'seriously-simple-podcasting') ?>" disabled >
+						<?php echo $podmotor_account_api_token ? __('Connected', 'seriously-simple-podcasting') : __( 'Connect Castos', 'seriously-simple-podcasting' ) ?>
 					</button>
 					<?php wp_nonce_field( 'ss_podcasting_castos-hosting', 'podcast_settings_tab_nonce', false ); ?>
-					<span class="validate-api-credentials-message"></span>
-					<button type="submit" disabled="disabled"><?php _e( 'Proceed', 'seriously-simple-podcasting' ); ?></button>
+					<button type="submit" <?php disabled( ! $podmotor_account_api_token ) ?>><?php _e( 'Proceed', 'seriously-simple-podcasting' ); ?></button>
+					<span class="connect-castos-message"></span>
 				</div>
 			</form>
 		</div>
diff --git a/templates/players/castos-player.php b/templates/players/castos-player.php
index 73c76b5f..5db0d8b7 100644
--- a/templates/players/castos-player.php
+++ b/templates/players/castos-player.php
@@ -19,153 +19,158 @@
  * @var bool $show_subscribe_button
  * @var bool $show_share_button
  * @var int $player_id
+ * @var bool $add_empty_warning
+ * @var bool $class
  **/
 
 ?>
-
-<div id="<?php echo $player_id; ?>" class="castos-player <?php echo $player_mode ?>-mode" data-episode="<?php echo $episode_id ?>" data-player_id="<?php echo $player_id; ?>">
+<div id="<?php echo esc_attr( $player_id ); ?>" class="castos-player <?php echo esc_attr( $player_mode ) ?>-mode <?php echo esc_attr( $class ) ?>"
+	 data-episode="<?php echo esc_attr( $episode_id ) ?>" data-player_id="<?php echo esc_attr( $player_id ); ?>">
 	<div class="player">
 		<div class="player__main">
-			<div class="player__artwork player__artwork-<?php echo $episode_id?>">
-				<img src="<?php echo apply_filters( 'ssp_album_art_cover', $album_art['src'], get_the_ID() ); ?>" alt="<?php echo $album_art['alt'] ?: $podcast_title ?>" title="<?php echo $podcast_title ?>">
+			<div class="player__artwork player__artwork-<?php echo esc_attr( $episode_id ) ?>">
+				<img src="<?php echo esc_attr( apply_filters( 'ssp_album_art_cover', $album_art['src'], get_the_ID() ) ); ?>"
+					 alt="<?php echo ! empty( $album_art['alt'] ) ? esc_attr( $album_art['alt'] ) : esc_attr( strip_tags( $podcast_title ) ); ?>"
+					 title="<?php echo esc_attr( strip_tags( $podcast_title ) ) ?>">
 			</div>
 			<div class="player__body">
 				<div class="currently-playing">
 					<div class="show player__podcast-title">
-						<?php echo $podcast_title ?>
+						<?php echo wp_kses_post( $podcast_title ) ?>
 					</div>
-					<div class="episode-title player__episode-title"><?php echo $episode->post_title ?></div>
+					<div class="episode-title player__episode-title"><?php echo wp_kses_post( $episode->post_title ); ?></div>
 				</div>
 				<div class="play-progress">
 					<div class="play-pause-controls">
-						<button title="<?php _e( 'Play', 'seriously-simple-podcasting' ) ?>" class="play-btn">
-							<span class="screen-reader-text"><?php _e( 'Play Episode', 'seriously-simple-podcasting' ) ?></span>
+						<button title="<?php esc_attr_e( 'Play', 'seriously-simple-podcasting' ) ?>" class="play-btn">
+							<span class="screen-reader-text"><?php esc_attr_e( 'Play Episode', 'seriously-simple-podcasting' ) ?></span>
 						</button>
-						<button title="<?php _e( 'Pause', 'seriously-simple-podcasting' ) ?>" class="pause-btn hide">
-							<span class="screen-reader-text"><?php _e( 'Pause Episode', 'seriously-simple-podcasting' ) ?></span>
+						<button title="<?php esc_attr_e( 'Pause', 'seriously-simple-podcasting' ) ?>" class="pause-btn hide">
+							<span class="screen-reader-text"><?php esc_attr_e( 'Pause Episode', 'seriously-simple-podcasting' ) ?></span>
 						</button>
-						<img src="<?php echo SSP_PLUGIN_URL ?>assets/css/images/player/images/icon-loader.svg" alt="<?php _e( 'Loading', 'seriously-simple-podcasting' ) ?>" class="ssp-loader hide"/>
+						<img src="<?php echo SSP_PLUGIN_URL ?>assets/css/images/player/images/icon-loader.svg" alt="<?php esc_attr_e( 'Loading', 'seriously-simple-podcasting' ) ?>" class="ssp-loader hide"/>
 					</div>
 					<div>
 						<audio preload="none" class="clip clip-<?php echo $episode_id ?>">
 							<source src="<?php echo $audio_file ?>">
 						</audio>
-						<div class="ssp-progress" role="progressbar" title="<?php _e( 'Seek', 'seriously-simple-podcasting' ) ?>">
+						<div class="ssp-progress" role="progressbar" title="<?php esc_attr_e( 'Seek', 'seriously-simple-podcasting' ) ?>">
 							<span class="progress__filled"></span>
 						</div>
 						<div class="ssp-playback playback">
 							<div class="playback__controls">
-								<button class="player-btn__volume" title="<?php _e( 'Mute/Unmute', 'seriously-simple-podcasting' ) ?>">
-									<span class="screen-reader-text"><?php _e( 'Mute/Unmute Episode', 'seriously-simple-podcasting' ) ?></span>
+								<button class="player-btn__volume" title="<?php esc_attr_e( 'Mute/Unmute', 'seriously-simple-podcasting' ) ?>">
+									<span class="screen-reader-text"><?php esc_attr_e( 'Mute/Unmute Episode', 'seriously-simple-podcasting' ) ?></span>
 								</button>
-								<button data-skip="-10" class="player-btn__rwd" title="<?php _e( 'Rewind 10 seconds', 'seriously-simple-podcasting' ) ?>">
-								<span class="screen-reader-text"><?php _e( 'Rewind 10 Seconds', 'seriously-simple-podcasting' ) ?></span>
+								<button data-skip="-10" class="player-btn__rwd" title="<?php esc_attr_e( 'Rewind 10 seconds', 'seriously-simple-podcasting' ) ?>">
+									<span class="screen-reader-text"><?php esc_attr_e( 'Rewind 10 Seconds', 'seriously-simple-podcasting' ) ?></span>
 								</button>
-								<button data-speed="1" class="player-btn__speed" title="<?php _e( 'Playback Speed', 'seriously-simple-podcasting' ) ?>">1x</button>
-								<button data-skip="30" class="player-btn__fwd" title="<?php _e( 'Fast Forward 30 seconds', 'seriously-simple-podcasting' ) ?>">
-									<span class="screen-reader-text"><?php _e( 'Fast Forward 30 seconds', 'seriously-simple-podcasting' ) ?></span>
+								<button data-speed="1" class="player-btn__speed" title="<?php esc_attr_e( 'Playback Speed', 'seriously-simple-podcasting' ) ?>">1x</button>
+								<button data-skip="30" class="player-btn__fwd" title="<?php esc_attr_e( 'Fast Forward 30 seconds', 'seriously-simple-podcasting' ) ?>">
+									<span class="screen-reader-text"><?php esc_attr_e( 'Fast Forward 30 seconds', 'seriously-simple-podcasting' ) ?></span>
 								</button>
 							</div>
 							<div class="playback__timers">
 								<time class="ssp-timer">00:00</time>
 								<span>/</span>
 								<!-- We need actual duration here from the server -->
-								<time class="ssp-duration"><?php echo $duration ?></time>
+								<time class="ssp-duration"><?php echo esc_html( $duration ) ?></time>
 							</div>
 						</div>
 					</div>
 				</div>
 				<?php if ( $show_subscribe_button || $show_share_button ) : ?>
-				<nav class="player-panels-nav">
-					<?php if ( $show_subscribe_button ) : ?>
-						<button class="subscribe-btn" id="subscribe-btn-<?php echo $episode_id ?>" title="<?php _e( 'Subscribe', 'seriously-simple-podcasting' ) ?>"><?php _e( 'Subscribe', 'seriously-simple-podcasting' ) ?></button>
-					<?php endif; ?>
-					<?php if ( $show_share_button ) : ?>
-						<button class="share-btn" id="share-btn-<?php echo $episode_id ?>" title="<?php _e( 'Share', 'seriously-simple-podcasting' ) ?>"><?php _e( 'Share', 'seriously-simple-podcasting' ) ?></button>
-					<?php endif; ?>
-				</nav>
+					<nav class="player-panels-nav">
+						<?php if ( $show_subscribe_button ) : ?>
+							<button class="subscribe-btn" id="subscribe-btn-<?php echo esc_attr( $episode_id ) ?>" title="<?php esc_attr_e( 'Subscribe', 'seriously-simple-podcasting' ) ?>"><?php esc_attr_e( 'Subscribe', 'seriously-simple-podcasting' ) ?></button>
+						<?php endif; ?>
+						<?php if ( $show_share_button ) : ?>
+							<button class="share-btn" id="share-btn-<?php echo esc_attr( $episode_id ) ?>" title="<?php esc_attr_e( 'Share', 'seriously-simple-podcasting' ) ?>"><?php esc_attr_e( 'Share', 'seriously-simple-podcasting' ) ?></button>
+						<?php endif; ?>
+					</nav>
 				<?php endif; ?>
 			</div>
 		</div>
 	</div>
 	<?php if ( $show_subscribe_button || $show_share_button ) : ?>
-	<div class="player-panels player-panels-<?php echo $episode_id ?>">
-		<?php if ( $show_subscribe_button ) : ?>
-		<div class="subscribe player-panel subscribe-<?php echo $episode_id ?>">
-			<div class="close-btn close-btn-<?php echo $episode_id ?>">
-				<span></span>
-				<span></span>
-			</div>
-			<div class="panel__inner">
-				<div class="subscribe-icons">
-					<?php foreach ( $subscribe_links as $key => $subscribe_link ) : ?>
-						<?php if ( ! empty( $subscribe_link['url'] ) ) : ?>
-							<a href="<?php echo $subscribe_link['url'] ?>" target="_blank" rel="noopener noreferrer" class="<?php echo esc_attr( $subscribe_link['class']) ?>" title="Subscribe on  <?php echo $subscribe_link['label'] ?>">
-								<span></span>
-								<?php echo $subscribe_link['label'] ?>
-							</a>
-						<?php endif ?>
-					<?php endforeach ?>
-				</div>
-				<div class="player-panel-row" area-label="RSS Feed URL">
-					<div class="title">
-						<?php _e( 'RSS Feed', 'seriously-simple-podcasting' ) ?>
+		<div class="player-panels player-panels-<?php echo esc_attr( $episode_id ) ?>">
+			<?php if ( $show_subscribe_button ) : ?>
+				<div class="subscribe player-panel subscribe-<?php echo esc_attr( $episode_id ) ?>">
+					<div class="close-btn close-btn-<?php echo esc_attr( $episode_id ) ?>">
+						<span></span>
+						<span></span>
 					</div>
-					<div>
-						<input value="<?php echo $feed_url ?>" class="input-rss input-rss-<?php echo $episode_id ?>" title="<?php _e( 'RSS Feed URL', 'seriously-simple-podcasting' ) ?>" readonly />
+					<div class="panel__inner">
+						<div class="subscribe-icons">
+							<?php foreach ( $subscribe_links as $key => $subscribe_link ) : ?>
+								<?php if ( ! empty( $subscribe_link['url'] ) ) : ?>
+									<a href="<?php echo esc_attr( $subscribe_link['url'] ) ?>" target="_blank" rel="noopener noreferrer"
+									   class="<?php echo esc_attr( $subscribe_link['class'] ) ?>"
+									   title="Subscribe on  <?php echo esc_attr( $subscribe_link['label'] ) ?>">
+										<span></span>
+										<?php echo esc_html( $subscribe_link['label'] ) ?>
+									</a>
+								<?php endif ?>
+							<?php endforeach ?>
+						</div>
+						<div class="player-panel-row" area-label="RSS Feed URL">
+							<div class="title"><?php esc_attr_e( 'RSS Feed', 'seriously-simple-podcasting' ) ?></div>
+							<div>
+								<input value="<?php echo esc_attr( $feed_url ) ?>" class="input-rss input-rss-<?php echo esc_attr( $episode_id ) ?>" title="<?php esc_attr_e( 'RSS Feed URL', 'seriously-simple-podcasting' ) ?>" readonly />
+							</div>
+							<button class="copy-rss copy-rss-<?php echo esc_attr( $episode_id ) ?>" title="<?php esc_attr_e( 'Copy RSS Feed URL', 'seriously-simple-podcasting' ) ?>"></button>
+						</div>
 					</div>
-					<button class="copy-rss copy-rss-<?php echo $episode_id ?>" title="<?php _e('Copy RSS Feed URL', 'seriously-simple-podcasting') ?>"></button>
 				</div>
-			</div>
-		</div>
-		<?php endif ?>
-		<?php if ( $show_share_button ) : ?>
-		<div class="share share-<?php echo $episode_id ?> player-panel">
-			<div class="close-btn close-btn-<?php echo $episode_id ?>">
-				<span></span>
-				<span></span>
-			</div>
-			<div class="player-panel-row">
-				<div class="title">
-					<?php _e( 'Share', 'seriously-simple-podcasting' ) ?>
-				</div>
-				<div class="icons-holder">
-					<a href="https://www.facebook.com/sharer/sharer.php?u=<?php echo $current_url; ?>&t=<?php echo $episode->post_title; ?>"
-					   target="_blank" rel="noopener noreferrer" class="share-icon facebook" title="<?php _e( 'Share on Facebook', 'seriously-simple-podcasting' ) ?>">
-						<span></span>
-					</a>
-					<a href="https://twitter.com/intent/tweet?text=<?php echo $current_url; ?>&url=<?php echo $episode->post_title; ?>"
-					   target="_blank" rel="noopener noreferrer" class="share-icon twitter" title="<?php _e( 'Share on Twitter', 'seriously-simple-podcasting' ) ?>">
+			<?php endif ?>
+			<?php if ( $show_share_button ) : ?>
+				<div class="share share-<?php echo esc_attr( $episode_id ) ?> player-panel">
+					<div class="close-btn close-btn-<?php echo esc_attr( $episode_id ) ?>">
 						<span></span>
-					</a>
-					<a href="<?php echo $audio_file ?>"
-					   target="_blank" rel="noopener noreferrer" class="share-icon download" title="<?php _e( 'Download', 'seriously-simple-podcasting' ) ?>" download>
 						<span></span>
-					</a>
-				</div>
-			</div>
-			<div class="player-panel-row">
-				<div class="title">
-					<?php _e( 'Link', 'seriously-simple-podcasting' ) ?>
-				</div>
-				<div>
-					<input value="<?php echo $current_url ?>" class="input-link input-link-<?php echo $episode_id ?>" title="<?php _e('Episode URL', 'seriously-simple-podcasting') ?>" readonly />
-				</div>
-				<button class="copy-link copy-link-<?php echo $episode_id ?>" title="<?php _e('Copy Episode URL', 'seriously-simple-podcasting') ?>" readonly=""></button>
-			</div>
-			<div class="player-panel-row">
-				<div class="title">
-					<?php _e( 'Embed', 'seriously-simple-podcasting' ) ?>
-				</div>
-				<div style="height: 10px;">
-					<input type="text" value='<?php echo esc_attr( $embed_code) ?>' title="<?php _e('Embed Code', 'seriously-simple-podcasting') ?>"
-					       class="input-embed input-embed-<?php echo $episode_id ?>" readonly/>
+					</div>
+					<div class="player-panel-row">
+						<div class="title">
+							<?php esc_attr_e( 'Share', 'seriously-simple-podcasting' ) ?>
+						</div>
+						<div class="icons-holder">
+							<a href="https://www.facebook.com/sharer/sharer.php?u=<?php echo esc_attr( $current_url ); ?>&t=<?php echo esc_attr( $episode->post_title ); ?>"
+							   target="_blank" rel="noopener noreferrer" class="share-icon facebook" title="<?php esc_attr_e( 'Share on Facebook', 'seriously-simple-podcasting' ) ?>">
+								<span></span>
+							</a>
+							<a href="https://twitter.com/intent/tweet?text=<?php echo esc_attr( $current_url ); ?>&url=<?php echo esc_attr( $episode->post_title ); ?>"
+							   target="_blank" rel="noopener noreferrer" class="share-icon twitter" title="<?php esc_attr_e( 'Share on Twitter', 'seriously-simple-podcasting' ) ?>">
+								<span></span>
+							</a>
+							<a href="<?php echo esc_attr( $audio_file ) ?>"
+							   target="_blank" rel="noopener noreferrer" class="share-icon download" title="<?php esc_attr_e( 'Download', 'seriously-simple-podcasting' ) ?>" download>
+								<span></span>
+							</a>
+						</div>
+					</div>
+					<div class="player-panel-row">
+						<div class="title">
+							<?php esc_attr_e( 'Link', 'seriously-simple-podcasting' ) ?>
+						</div>
+						<div>
+							<input value="<?php echo esc_attr( $current_url ) ?>" class="input-link input-link-<?php echo esc_attr( $episode_id ) ?>" title="<?php esc_attr_e( 'Episode URL', 'seriously-simple-podcasting' ) ?>" readonly />
+						</div>
+						<button class="copy-link copy-link-<?php echo esc_attr( $episode_id ) ?>" title="<?php esc_attr_e( 'Copy Episode URL', 'seriously-simple-podcasting' ) ?>" readonly=""></button>
+					</div>
+					<div class="player-panel-row">
+						<div class="title">
+							<?php esc_attr_e( 'Embed', 'seriously-simple-podcasting' ) ?>
+						</div>
+						<div style="height: 10px;">
+							<input type="text" value='<?php echo esc_attr( $embed_code ) ?>'
+								   title="<?php esc_attr_e( 'Embed Code', 'seriously-simple-podcasting' ) ?>"
+								   class="input-embed input-embed-<?php echo $episode_id ?>" readonly/>
+						</div>
+						<button class="copy-embed copy-embed-<?php echo esc_attr( $episode_id ) ?>" title="<?php esc_attr_e( 'Copy Embed Code', 'seriously-simple-podcasting' ) ?>"></button>
+					</div>
 				</div>
-				<button class="copy-embed copy-embed-<?php echo $episode_id ?>" title="<?php _e('Copy Embed Code', 'seriously-simple-podcasting') ?>"></button>
-			</div>
+			<?php endif ?>
 		</div>
-		<?php endif ?>
-	</div>
 	<?php endif; ?>
 
 	<?php if ( ! empty( $playlist ) ) : ?>
@@ -174,21 +179,28 @@ class="input-embed input-embed-<?php echo $episode_id ?>" readonly/>
 			<ul class="playlist__items">
 				<?php foreach ( $playlist as $k => $item ) : ?>
 					<li class="playlist__item<?php if ( 0 === $k ): ?> active<?php endif ?>"
-						data-episode="<?php echo $item['episode_id']; ?>">
+						data-episode="<?php echo esc_attr( $item['episode_id'] ); ?>">
 						<div class="playlist__item__cover">
-							<img src="<?php echo $item['album_art']['src'] ?>" title="<?php echo $item['title']; ?>" alt="<?php echo $item['title'] ?>" />
+							<img src="<?php echo esc_attr( $item['album_art']['src'] ) ?>" title="<?php echo esc_attr( strip_tags( $item['title'] ) ); ?>" alt="<?php echo esc_attr( strip_tags( $item['title'] ) ) ?>"/>
 						</div>
 						<div class="playlist__item__details">
-							<h2 class="playlist__episode-title" data-podcast="<?php echo $item['podcast_title']; ?>"><?php echo $item['title'] ?></h2>
+							<h2 class="playlist__episode-title" data-podcast="<?php echo esc_attr( $item['podcast_title'] ); ?>"><?php echo wp_kses_post( $item['title'] ) ?></h2>
 							<p><?php echo $item['date'] . ' • ' . $item['duration']; ?></p>
-							<p class="playlist__episode-description"><?php echo $item['excerpt']; ?></p>
+							<p class="playlist__episode-description"><?php echo wp_kses_post( $item['excerpt'] ); ?></p>
 						</div>
-						<audio preload="none" class="clip clip-<?php echo $item['episode_id'] ?>">
-							<source src="<?php echo $item['audio_file'] ?>">
+						<audio preload="none" class="clip clip-<?php echo esc_attr( $item['episode_id'] ) ?>">
+							<source src="<?php echo esc_attr( $item['audio_file'] ) ?>">
 						</audio>
 					</li>
 				<?php endforeach ?>
 			</ul>
 		</div>
 	<?php endif; ?>
+
+
+	<?php if ( $add_empty_warning ) : ?>
+		<p style="color:#BE123C"><em><?php
+			_e( 'Warning: the player will not be shown to users because the episode file is missing, please upload a file or provide a URL to an existing audio file.', 'seriously-simple-podcasting' ); ?>
+		</em></p>
+	<?php endif; ?>
 </div>
diff --git a/templates/players/playlist-compact-player.php b/templates/players/playlist-compact-player.php
index ee154c91..633e8859 100644
--- a/templates/players/playlist-compact-player.php
+++ b/templates/players/playlist-compact-player.php
@@ -7,10 +7,11 @@
  * @var string $width
  * @var string $height
  * @var array $data
+ * @var string $class
  **/
 ?>
 
-<div class="wp-playlist wp-<?php echo $safe_type ?>-playlist wp-playlist-<?php echo $safe_style ?>">
+<div class="wp-playlist wp-<?php echo $safe_type ?>-playlist wp-playlist-<?php echo $safe_style ?> <?php echo esc_attr( $class ) ?>">
 	<<?php echo $safe_type ?> controls="controls" preload="none" width="<?php echo (int) $width; ?>"<?php
 	if ( 'video' === $safe_type ):
 		echo ' height="', (int) $height, '"';
diff --git a/templates/settings-sidebar.php b/templates/settings-sidebar.php
index b3627e77..450f3af4 100644
--- a/templates/settings-sidebar.php
+++ b/templates/settings-sidebar.php
@@ -7,39 +7,36 @@
  * */
 ?>
 <div id="ssp-sidebar">
-	<div class="sidebar-content <?php echo $is_connected ? 'castos-connected' : '' ?>">
+	<div class="sidebar-content">
 		<?php echo $img; ?>
-
-		<?php if ( ! $is_connected ) : ?>
-			<form action="https://www.getdrip.com/forms/38739479/submissions" method="post"
-				  data-drip-embedded-form="38739479">
-				<h3 data-drip-attribute="headline"><?php _e( 'Castos Hosting Discount - Get 20% off', 'seriously-simple-podcasting' ); ?></h3>
-				<p data-drip-attribute="description"><?php
-					_e( 'Drop in your name and email and we’ll send you a coupon for 20% off your subscription to Castos Podcast Hosting.',
-						'seriously-simple-podcasting' );
-					?></p>
-				<div>
-					<label for="drip-first-name"><?php _e( 'First Name', 'seriously-simple-podcasting' ); ?></label>
-					<input type="text" id="drip-first-name" name="fields[first_name]" value=""/>
-				</div>
-				<div>
-					<label for="drip-last-name"><?php _e( 'Last Name', 'seriously-simple-podcasting' ); ?></label>
-					<input type="text" id="drip-last-name" name="fields[last_name]" value=""/>
-				</div>
-				<div>
-					<label for="drip-email"><?php _e( 'Email Address', 'seriously-simple-podcasting' ); ?></label>
-					<input type="email" id="drip-email" name="fields[email]" value=""/>
-				</div>
-				<div style="display: none;" aria-hidden="true">
-					<label for="website"><?php _e( 'Website', 'seriously-simple-podcasting' ); ?></label>
-					<input type="text" id="website" name="website" tabindex="-1" autocomplete="false" value=""/>
-				</div>
-				<div>
-					<input type="submit" value="Send me the coupon" data-drip-attribute="sign-up-button"/>
-				</div>
-				<p><?php _e( 'Spam sucks. We will not use your email for anything else and you can unsubscribe with just a click,
-					anytime.', 'seriously-simple-podcasting' ); ?></p>
-			</form>
-		<?php endif; ?>
+		<form action="https://www.getdrip.com/forms/38739479/submissions" method="post"
+			  data-drip-embedded-form="38739479">
+			<h3 data-drip-attribute="headline"><?php _e( 'Castos Hosting Discount - Get 20% off', 'seriously-simple-podcasting' ); ?></h3>
+			<p data-drip-attribute="description"><?php
+				_e( 'Drop in your name and email and we’ll send you a coupon for 20% off your subscription to Castos Podcast Hosting.',
+					'seriously-simple-podcasting' );
+				?></p>
+			<div>
+				<label for="drip-first-name"><?php _e( 'First Name', 'seriously-simple-podcasting' ); ?></label>
+				<input type="text" id="drip-first-name" name="fields[first_name]" value=""/>
+			</div>
+			<div>
+				<label for="drip-last-name"><?php _e( 'Last Name', 'seriously-simple-podcasting' ); ?></label>
+				<input type="text" id="drip-last-name" name="fields[last_name]" value=""/>
+			</div>
+			<div>
+				<label for="drip-email"><?php _e( 'Email Address', 'seriously-simple-podcasting' ); ?></label>
+				<input type="email" id="drip-email" name="fields[email]" value=""/>
+			</div>
+			<div style="display: none;" aria-hidden="true">
+				<label for="website"><?php _e( 'Website', 'seriously-simple-podcasting' ); ?></label>
+				<input type="text" id="website" name="website" tabindex="-1" autocomplete="false" value=""/>
+			</div>
+			<div>
+				<input type="submit" value="Send me the coupon" data-drip-attribute="sign-up-button"/>
+			</div>
+			<p><?php _e( 'Spam sucks. We will not use your email for anything else and you can unsubscribe with just a click,
+				anytime.', 'seriously-simple-podcasting' ); ?></p>
+		</form>
 	</div>
 </div>
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index 269a6c2e..340d8454 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -473,7 +473,7 @@ protected function isAbsoluteUrl( $url ) {
 	}
 
 	protected function createEpisode( $args ) {
-		$this->iClickMenuSubmenu( 'Podcast', "Add New" );
+		$this->iClickMenuSubmenu( 'Podcast', "Add New Episode" );
 		$this->iFillTheFieldWith( 'Episode title', $args[0] );
 		$this->iFillTheFieldWith( 'Episode content', $args[1] );
 
@@ -490,6 +490,15 @@ public function iCanSeeInSource( $arg1 ) {
 		if ( false !== strpos( $arg1, '{{base_url}}' ) ) {
 			$arg1 = str_replace( '{{base_url}}', $this->getConfig( 'url' ), $arg1 );
 		}
+		elseif ( false !== strpos( $arg1, '{{base_url_without_port}}' ) ) {
+			$parts =  parse_url($this->getConfig( 'url' ));
+			$url = $parts['scheme'] . '://' . $parts['host'];
+			$arg1 = str_replace( '{{base_url_without_port}}', $url, $arg1 );
+		}
+		elseif ( false !== strpos( $arg1, '{{podcast_guid}}' ) ) {
+			$arg1 = str_replace( '{{podcast_guid}}', $this->getConfig( 'podcastGuid' ), $arg1 );
+		}
+
 		$this->seeInSource( $arg1 );
 	}
 }
diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml
index 68911396..9cdf995b 100644
--- a/tests/acceptance.suite.yml
+++ b/tests/acceptance.suite.yml
@@ -7,24 +7,13 @@
 actor: AcceptanceTester
 modules:
     enabled:
-#        - WPBrowser
         - PhpBrowser:
-#            url: http://castos.loc
         - \Helper\Acceptance
-#        - WPWebDriver:
-#            url: 'http://castos.loc'
-#            browser: phantomjs
-#            port: 4444
-#            restart: true
-#            wait: 2
-#            adminUsername: admin
-#            adminPassword: password
-#            adminUrl: /wp-admin
-
     config:
       PhpBrowser:
         url: '%SITE_URL%'
         adminPath: '%SITE_URL%/wp-admin'
+        podcastGuid: '%PODCAST_GUID%'
 
 step_decorators: ~
 
diff --git a/tests/acceptance/1_onboarding.feature b/tests/acceptance/0_onboarding.feature
similarity index 100%
rename from tests/acceptance/1_onboarding.feature
rename to tests/acceptance/0_onboarding.feature
diff --git a/tests/acceptance/0_default_podcast.feature b/tests/acceptance/1_default_podcast.feature
similarity index 52%
rename from tests/acceptance/0_default_podcast.feature
rename to tests/acceptance/1_default_podcast.feature
index 05bd3179..96de09ad 100644
--- a/tests/acceptance/0_default_podcast.feature
+++ b/tests/acceptance/1_default_podcast.feature
@@ -5,20 +5,15 @@ Feature: Login
 
 	Background:
 		Given I login as admin
-		And I am on the plugins page
-		And I can see SSP plugin is deactivated
-		Then I activate the SSP plugin
 
 	Scenario: Check the default feed
 		When I go to the "/wp-admin/edit-tags.php?taxonomy=series&post_type=podcast"
-		Then I can see "My WordPress (default)"
-		And I can see "my-wordpress"
-		And I can see "/feed/podcast/my-wordpress"
+		Then I can see "Automated test show (default)"
+		And I can see "automated-test-show"
+		And I can see "/feed/podcast/automated-test-show"
 
 		Given I want to "Be redirected from the old default feed URL to the term-based URL"
 		When I go to the "/feed/podcast"
-		Then I can see that current url is "/feed/podcast/my-wordpress"
+		Then I can see that current url is "/feed/podcast/automated-test-show"
 		When I go to the "/feed/podcast/not-existing-feed"
-		Then I can see that current url is "/feed/podcast/my-wordpress"
-		Then I am on the plugins page
-		And I deactivate the SSP plugin
+		Then I can see that current url is "/feed/podcast/automated-test-show"
diff --git a/tests/acceptance/2_settings-episode-itunes.feature b/tests/acceptance/2_settings-episode-itunes.feature
index 110f4b0d..360fd3e7 100644
--- a/tests/acceptance/2_settings-episode-itunes.feature
+++ b/tests/acceptance/2_settings-episode-itunes.feature
@@ -7,7 +7,7 @@ Feature: Create new episode
 		Given I login as admin
 
 	Scenario: "Enable iTunes fields" option works properly
-		When I click "Podcast" submenu "Add New"
+		When I click "Podcast" submenu "Add New Episode"
 		Then I can see "Add New Episode"
 		And I can not see "iTunes Episode Number:"
 		And I can not see "The iTunes Episode Number. Leave Blank If None."
@@ -22,7 +22,7 @@ Feature: Create new episode
 		Then I check "Enable iTunes fields" checkbox
 		And I save settings
 
-		When I click "Podcast" submenu "Add New"
+		When I click "Podcast" submenu "Add New Episode"
 		Then I can see "Add New Episode"
 		And I can see "iTunes Episode Number:"
 		And I can see "The iTunes Episode Number. Leave Blank If None."
diff --git a/tests/acceptance/2_settings-hosting.feature b/tests/acceptance/2_settings-hosting.feature
index bca393c3..527031d0 100644
--- a/tests/acceptance/2_settings-hosting.feature
+++ b/tests/acceptance/2_settings-hosting.feature
@@ -12,8 +12,6 @@ Feature: SSP Plugin Hosting Settings
 
 	Scenario: All hosting settings exist
 		Then I can see "Podcast Hosting"
-		And I can see "Your email"
-		And I can see "The email address you used to register your Castos account."
-		And I can see "Castos API key"
-		And I can see "Your Castos API key. Available from your Castos account dashboard."
-		And I can see "Verify Credentials"
+		And I can see "Castos API token"
+		And I can see "Your Castos API token. Available from your"
+		And I can see "Connect"
diff --git a/tests/acceptance/3_main-feed.feature b/tests/acceptance/3_main-feed.feature
index 81e88d49..d8a8c124 100644
--- a/tests/acceptance/3_main-feed.feature
+++ b/tests/acceptance/3_main-feed.feature
@@ -54,8 +54,7 @@ Feature: Login
 		And I can see in source "<googleplay:description>This show is to test some SSP functionality</googleplay:description>"
 		And I can see in source "<googleplay:explicit>No</googleplay:explicit>"
 		And I can see in source "<podcast:locked>yes</podcast:locked>"
-		And I can see in source "<podcast:guid>115e423a-72d2-531e-9d3c-ece7dd4b74fe</podcast:guid>"
-
+		And I can see in source "<podcast:guid>"
 
 		# Check items
 		And I can see in source "<title>Episode3</title>"
diff --git a/tests/seed.sql.gz b/tests/seed.sql.gz
new file mode 100644
index 00000000..9356c971
Binary files /dev/null and b/tests/seed.sql.gz differ
diff --git a/tests/wpunit/Players_Controller_Test.php b/tests/wpunit/Players_Controller_Test.php
index 512e2eb8..0655ecce 100644
--- a/tests/wpunit/Players_Controller_Test.php
+++ b/tests/wpunit/Players_Controller_Test.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace wpunit;
+
 use Codeception\TestCase\WPTestCase;
 use SeriouslySimplePodcasting\Controllers\Players_Controller;
 use SeriouslySimplePodcasting\Handlers\Options_Handler;
@@ -24,11 +26,11 @@ public function tearDown(): void {
 	 * @covers Players_Controller::render_html_player() method returns the new html player code
 	 */
 	public function test_player_controller_html_player_method() {
-		$renderer = new Renderer();
-		$options_handler = new Options_Handler();
+		$renderer           = new Renderer();
+		$options_handler    = new Options_Handler();
 		$episode_repository = $this->episode_repository();
 
-		$this->players_controller = new Players_Controller($renderer, $options_handler, $episode_repository);
+		$this->players_controller = new Players_Controller( $renderer, $options_handler, $episode_repository );
 		$episode_id               = $this->factory->post->create(
 			array(
 				'title'       => 'My Custom Podcast',
@@ -37,12 +39,24 @@ public function test_player_controller_html_player_method() {
 			)
 		);
 		$episode                  = get_post( $episode_id );
+
 		$html_player_content      = $this->players_controller->render_html_player( $episode->ID );
+
+		// Empty, because the file is not assigned
+		$this->assertEmpty( $html_player_content );
+
+		// Now, let's check that it's not empty for admin
+		define( 'WP_ADMIN', true );
+		$html_player_content      = $this->players_controller->render_html_player( $episode->ID );
+		$this->assertNotEmpty( $html_player_content );
+
 		$permalink                = get_post_permalink( $episode_id );
 		$site_url                 = site_url();
 
+		$this->assertStringContainsString( 'Warning: the player will not be shown', $html_player_content );
+
 		$player_parts = array(
-			'class="castos-player dark-mode"',
+			'class="castos-player dark-mode',
 			'<div class="currently-playing">',
 			sprintf( '<div class="episode-title player__episode-title">%s</div>', $episode->post_title ),
 			'<div class="play-progress">',
@@ -84,7 +98,7 @@ public function test_player_controller_html_player_method() {
 			'<div class="player-panel-row">',
 
 			'RSS Feed',
-			sprintf( '<input value="%s/?feed=podcast&podcast_series=wordpress-test" class="input-rss input-rss-%s" title="RSS Feed URL" readonly />', $site_url, $episode_id ),
+			sprintf( '<input value="%s/?feed=podcast&amp;podcast_series=wordpress-test" class="input-rss input-rss-%s" title="RSS Feed URL" readonly />', $site_url, $episode_id ),
 
 			sprintf( '<button class="copy-rss copy-rss-%s" title="Copy RSS Feed URL"></button>', $episode_id ),
 
@@ -110,7 +124,7 @@ public function test_player_controller_html_player_method() {
 			'target="_blank" rel="noopener noreferrer" class="share-icon download" title="Download" download>',
 			'<div class="title">',
 			'Link',
-			sprintf( '<input value="%s" class="input-link input-link-%s" title="Episode URL" readonly />', $permalink, $episode_id ),
+			sprintf( '<input value="%s" class="input-link input-link-%d" title="Episode URL" readonly />', $permalink, $episode_id ),
 			sprintf( '<button class="copy-link copy-link-%s" title="Copy Episode URL" readonly=""></button>', $episode_id ),
 			'<div class="player-panel-row">',
 			'Embed',