diff --git a/NP_Custom_Templates/customer_templates/.DS_Store b/NP_Custom_Templates/customer_templates/.DS_Store
index 1b69e0bb..fde6e3cf 100644
Binary files a/NP_Custom_Templates/customer_templates/.DS_Store and b/NP_Custom_Templates/customer_templates/.DS_Store differ
diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_cards_categories.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_cards_categories.html.liquid
index cb7fd1ac..399bcfab 100644
--- a/NP_Custom_Templates/customer_templates/JnJVision/_cards_categories.html.liquid
+++ b/NP_Custom_Templates/customer_templates/JnJVision/_cards_categories.html.liquid
@@ -1,4 +1,4 @@
-<div class="row categories-row">
+<div class="row categories-row" id="popular-topics">
     <div class="{{ class }}">
         <a class="np-card" href="/app/catalog?filter%5Bcategory_uuid%5D%5Bin%5D%5B%5D=e2baf8b8-471a-43de-94f2-c8314395f4a9">
           <div class="category-card-container">
@@ -85,7 +85,7 @@
 }
 
 .category-card-container img {
-  position: absolute;
+    position: absolute;
   left: 50%;
   top: 50%;
   width: 100%;
diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_filter_dropdown.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_filter_dropdown.html.liquid
deleted file mode 100644
index e7a954bb..00000000
--- a/NP_Custom_Templates/customer_templates/JnJVision/_filter_dropdown.html.liquid
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="np-filter">
-  <div class="dropdown">
-    <button
-      class="np-button dropdown-button"
-      data-toggle-class="is-open"
-      data-toggle-escape
-      data-toggle-outside
-      data-toggle-target-next
-      type="button"
-    >
-      {% t shared.filters.filter %}
-    </button>
-
-    <div class="dropdown-menu" data-test="modal">
-      <form method="get">
-        {%
-          include "filter_select",
-          filters: filters,
-          key: key,
-          label: label
-        %}
-
-        <button
-          class="np-button dropdown-button-apply"
-          data-toggle-trigger-off
-          type="submit"
-        >
-          {% t shared.filters.apply %}
-        </button>
-      </form>
-    </div>
-  </div>
-</div>
diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_training_session_cta.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_training_session_cta.html.liquid
deleted file mode 100644
index 3404e88f..00000000
--- a/NP_Custom_Templates/customer_templates/JnJVision/_training_session_cta.html.liquid
+++ /dev/null
@@ -1,60 +0,0 @@
-{% if training_session.approved? %}
-  <div class="np-training-session-cta-note">
-    <i class="far fa-check np-training-session-icon"></i>
-    {% t .registered %}
-  </div>
-{% elsif training_session.pending? %}
-  <div class="np-training-session-cta-note np-training-session-cta-note-error">
-    {% t .pending %}
-  </div>
-{% elsif training_session.denied? %}
-  <div class="np-training-session-cta-note np-training-session-cta-note-error">
-    {% t .denied %}
-  </div>
-{% elsif training_session.too_late? %}
-  <div class="np-training-session-cta-note np-training-session-cta-note-error">
-    {% t .too_late %}
-  </div>
-{% elsif training_session.no_seats? %}
-  <div class="np-training-session-cta-note np-training-session-cta-note-error">
-    {% t .no_seats %}
-  </div>
-{% endif %}
-<div class="np-training-session-cta">
-  <div class="np-training-session-cta-buttons">
-    <form
-      action="{% route training_session_registration, id: training_session.id %}"
-      method="post"
-    >
-      {% form_authenticity_token %}
-
-      {% if training_session.internal? and training_session.approved? %}
-        {% if features.training_events_google_calendar? %}
-          {% include "training_session_calendars" %}
-          <button type="submit" class="np-top-button np-button np-button-big np-button-secondary">
-            {% t .unregister %}
-          </button>
-        {% else %}
-          <button type="submit" class="np-top-button np-button-font-color np-button np-button-big">
-            {% t .unregister %}
-          </button>
-        {% endif %}
-
-        <input type="hidden" name="_method" value="delete" />
-      {% endif %}
-
-      {% if training_session.not_registered? %}
-        <button type="submit" class="np-top-button np-button np-button-big">
-          {% t .register %}
-        </button>
-      {% endif %}
-    </form>
-  </div>
-</div>
-
-<style>
-  .np-button-big {
-    background: linear-gradient(90deg, #006161 0%, #006161 100%) !important;
-    border-radius: 8px !important;
-  }
-</style>
\ No newline at end of file
diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_training_session_date.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_training_session_date.html.liquid
deleted file mode 100644
index 7963ec43..00000000
--- a/NP_Custom_Templates/customer_templates/JnJVision/_training_session_date.html.liquid
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="np-card-training-session-date">
-  <div class="np-button-background-color np-card-training-session-date-bar"></div>
-  <div class="np-card-training-session-date-day" style='margin-right: 5px;'>
-    {{ training_session.day }}
-  </div>
-  <div>
-    <div class="np-card-training-session-date-month">
-      {{ training_session.month }}
-    </div>
-    <div class="np-card-training-session-date-year">
-      {{ training_session.year }}
-    </div>
-  </div>
-</div>
diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_training_session_details.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_training_session_details.html.liquid
deleted file mode 100644
index c53a7c5c..00000000
--- a/NP_Custom_Templates/customer_templates/JnJVision/_training_session_details.html.liquid
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="np-card-spacing-large">
-  {% include "training_session_date" %}
-
-  <div class="np-training-session-time">
-    <i class="fal fa-clock np-button-color np-training-session-icon" style='color: #006161;'></i>
-    {{ training_session.time_period }} {{ training_session.time_zone }}
-  </div>
-
-  {% if training_session.location %}
-    <div class="np-training-session-location">
-      <i class="fal fa-map-marker-alt np-button-color np-training-session-icon"></i>
-      {{ training_session.location }}
-    </div>
-  {% endif %}
-
-  {% if training_session.session_url %}
-    <div class="np-training-session-location">
-      <i class="fal fa-map-marker-alt np-button-color np-training-session-icon"></i>
-      <a href="{{ training_session.session_url }}" class="np-button-color" target="_blank" >
-        {{ training_session.session_url }}
-      </a>
-    </div>
-  {% endif %}
-</div>
diff --git a/NP_Custom_Templates/customer_templates/JnJVision/_training_session_header.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/_training_session_header.html.liquid
deleted file mode 100644
index c94dddd8..00000000
--- a/NP_Custom_Templates/customer_templates/JnJVision/_training_session_header.html.liquid
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="np-top-vocabulary np-text-title">
-  {% t shared.event_types, key: training_event.event_type %}
-  <i class="fal fa-users-class np-button-color np-training-session-icon" style='color: #006161;'></i>
-</div>
-<div class="np-top-title">
-  <a href="{% route home %}" class="np-back-button" aria-label="{% t shared.go_back %}">
-    <i class="far fa-arrow-left np-hidden-mobile np-icon-back"></i>
-  </a>
-  {{ training_event.title }}
-</div>
diff --git a/NP_Custom_Templates/customer_templates/JnJVision/training_events.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/training_events.html.liquid
deleted file mode 100644
index 3d49fd7d..00000000
--- a/NP_Custom_Templates/customer_templates/JnJVision/training_events.html.liquid
+++ /dev/null
@@ -1,46 +0,0 @@
-{% include "header" %}
-{% include "sub_navigation" %}
-<main class="np-main np-training-events np-subpage-container np-max-width">
-  <div class="row">
-    <div class="col-xs-12 col-sm-10">
-      <div class="np-resource-title">
-        {% t .title %}
-      </div>
-      <div class="np-resource-subtitle">
-        {% t .subtitle %}.
-      </div>
-    </div>
-    <div class="col-xs-12 col-sm-2">
-      {% include "training_events_filter" %}
-    </div>
-  </div>
-  {% include "training_events_index" %}
-</main>
-{% include "footer" %}
-
-<style>
-  @media only screen and (min-width: 768px) {
-    body {
-    display: grid;
-    grid-template-columns: 1fr;
-    grid-template-areas: "header" "subnav" "main" "footer" "powered";
-    grid-template-rows: 120px 50px 1fr 160px 60px;
-    }
-    header {
-      grid-area: header;
-    }
-    nav {
-      grid-area: subnav;
-    }
-    main {
-      grid-area: main;
-      margin-top: 0 !important;
-    }
-    footer {
-      grid-area: footer;
-    }
-    .np-powered-by {
-      grid-area: powered;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/NP_Custom_Templates/customer_templates/JnJVision/training_session.html.liquid b/NP_Custom_Templates/customer_templates/JnJVision/training_session.html.liquid
deleted file mode 100644
index 813a5a19..00000000
--- a/NP_Custom_Templates/customer_templates/JnJVision/training_session.html.liquid
+++ /dev/null
@@ -1,34 +0,0 @@
-{% include "header" %}
-<main class="np-main np-training-session np-max-width np-page-container">
-  <div class="np-hidden-mobile" id="training-session-desktop">
-    {% include "training_session_desktop_view" %}
-  </div>
-  <div class="np-hidden-desktop" id="training-session-mobile">
-    {% include "training_session_mobile_view" %}
-  </div>
-</main>
-{% include "footer" %}
-
-<style>
-  @media only screen and (min-width: 768px) {
-    body {
-    display: grid;
-    grid-template-columns: 1fr;
-    grid-template-areas: "header" "main" "footer" "powered";
-    grid-template-rows: 120px 1fr 160px 60px;
-    }
-    header {
-      grid-area: header;
-    }
-    main {
-      grid-area: main;
-      margin-top: 0 !important;
-    }
-    footer {
-      grid-area: footer;
-    }
-    .np-powered-by {
-      grid-area: powered;
-    }
-  }
-</style>
\ No newline at end of file