From 72715d9d49c62a8d1299a06561ef7bc10b5e6a7e Mon Sep 17 00:00:00 2001
From: Norm Rasmussen <norman.rasmussen@me.com>
Date: Tue, 13 May 2025 16:55:51 -0400
Subject: [PATCH] SPS' V3 templates. Updated Harri's templates too to update
 the workato endpoints.

---
 Custom_Templates/customer_templates/.DS_Store | Bin 20484 -> 20484 bytes
 .../Harri - McDonalds/_head.html.liquid       |  51 --
 .../_mcdonalds_theme.html.liquid              |  29 -
 .../_sub_navigation.html.liquid               |  13 -
 .../Harri - McDonalds/catalog.html.liquid     |  23 -
 .../Harri - McDonalds/dashboard.html.liquid   |  31 -
 .../Harri - McDonalds/homepage.html.liquid    |  52 --
 .../Harri - McDonalds/master.html.liquid      |   5 -
 .../second-login.html.liquid                  | 341 ---------
 .../Harri - McDonalds/styles.css.liquid       |  59 --
 .../training_events.html.liquid               |  19 -
 .../_account_avatar.html.liquid               |   0
 .../_account_desktop_view.html.liquid         |   0
 .../_account_form.html.liquid                 |   0
 .../_account_mobile_view.html.liquid          |   0
 .../_account_tabs.html.liquid                 |  23 +
 .../_arabic_lang.html.liquid                  |   0
 .../_banner.html.liquid                       |  42 ++
 .../_cards_course.html.liquid                 |  24 +-
 .../_cards_course_horizontal.html.liquid      |  43 ++
 .../_cards_course_new_styles.html.liquid      |  47 ++
 .../_cards_course_videos.html.liquid          |  27 +
 .../_cards_learning_path.html.liquid          |  17 +-
 ...cards_learning_path_new_styles.html.liquid | 112 +++
 .../_cards_learning_path_vertical.html.liquid |  33 +
 .../_cards_training_event.html.liquid         |   2 +-
 ...ards_training_event_horizontal.html.liquid |  41 +
 .../_catalog_filters.html.liquid              | 182 +++++
 .../_certificates_info_column.html.liquid     |   0
 .../_certificates_metadata.html.liquid        |   0
 .../_certificates_preview.html.liquid         |   0
 .../_certificates_top_bar.html.liquid         |   0
 .../_certificates_verification.html.liquid    |   0
 .../_contact_us_block.html.liquid             |  46 ++
 .../_course_activity_locked.html.liquid       |   0
 .../_course_activity_unlocked.html.liquid     |   0
 .../_course_categories.html.liquid            |   0
 .../_course_description.html.liquid           |   0
 .../_course_desktop_view.html.liquid          |   0
 .../_course_events.html.liquid                |   0
 .../_course_header.html.liquid                |   0
 .../_course_instructors.html.liquid           |   0
 .../_course_mobile_view.html.liquid           |   0
 .../_course_outline.html.liquid               |  37 +-
 .../_course_progress_and_cta.html.liquid      |   0
 ..._course_version_outdated_alert.html.liquid |   0
 ..._course_version_outdated_popup.html.liquid |   0
 .../_courses_catalog.html.liquid              |  55 ++
 .../_courses_index.html.liquid                |   0
 .../_courses_zero_state.html.liquid           |   0
 .../_dashboard_courses_block.html.liquid      | 111 +++
 .../_dashboard_lps_block.html.liquid          | 178 +++++
 .../_filter_checkbox.html.liquid              |   0
 .../_filter_dropdown.html.liquid              |   0
 .../_filter_select.html.liquid                |   0
 .../_footer.html.liquid                       |  21 +-
 .../_french_lang.html.liquid                  |  32 +-
 .../_head.html.liquid                         |  16 +
 .../_header.html.liquid                       | 322 +++++---
 .../_header_minimal.html.liquid               |   0
 .../_homepage_featured_content.html.liquid    | 109 +++
 .../_homepage_featured_my_points.html.liquid  |  98 +++
 .../_homepage_getting_started.html.liquid     | 253 +++++++
 .../_homepage_learning_progress.html.liquid   | 191 +++++
 .../_learning_path_banners.html.liquid        |   0
 .../_learning_path_certificate.html.liquid    |   0
 ...rning_path_certificate_content.html.liquid |   0
 ...learning_path_completed_banner.html.liquid |   0
 .../_learning_path_course.html.liquid         |   6 -
 .../_learning_path_description.html.liquid    |   0
 ..._learning_path_desktop_content.html.liquid |   0
 .../_learning_path_desktop_header.html.liquid |   0
 .../_learning_path_desktop_view.html.liquid   |   0
 .../_learning_path_instructors.html.liquid    |   0
 .../_learning_path_mobile_content.html.liquid |   0
 .../_learning_path_mobile_header.html.liquid  |   0
 .../_learning_path_mobile_view.html.liquid    |   0
 ...arning_path_new_content_banner.html.liquid |   0
 .../_learning_path_outline.html.liquid        |   0
 ...learning_path_progress_and_cta.html.liquid |   0
 ...ning_path_summary_desktop_view.html.liquid |   0
 ...rning_path_summary_mobile_view.html.liquid |   0
 ...learning_path_training_session.html.liquid |   0
 .../_learning_paths_index.html.liquid         |   2 +-
 .../_messages.html.liquid                     |   0
 .../_popup2.html.liquid                       |   1 +
 .../_progress_circle.html.liquid              |  80 ++
 .../_russian_lang.html.liquid                 |   0
 .../_search_result.html.liquid                |   0
 .../_search_zero_state.html.liquid            |   0
 .../_spanish_lang.html.liquid                 | 415 ++++++++++-
 .../_sub_navigation.html.liquid               |  15 +
 .../_training_events_dashboard.html.liquid    |   0
 .../_training_events_filter.html.liquid       |  55 ++
 .../_training_events_index.html.liquid        |   0
 .../_training_events_zero_state.html.liquid   |   9 +
 .../_training_filter.html.liquid              |  58 ++
 .../_training_session_calendars.html.liquid   |  58 ++
 .../_training_session_cta.html.liquid         |   0
 .../_training_session_date.html.liquid        |   0
 .../_training_session_description.html.liquid |   0
 ..._training_session_desktop_view.html.liquid |   0
 .../_training_session_details.html.liquid     |  33 +
 .../_training_session_header.html.liquid      |   2 +-
 .../_training_session_mobile_view.html.liquid |   0
 ...training_session_more_sessions.html.liquid |   0
 .../_training_session_status.html.liquid      |   6 +
 .../_training_session_tile.html.liquid        |   0
 .../_video_catalog_filters.html.liquid        | 165 ++++
 .../_video_courses_catalog.html.liquid        |  39 +
 .../_video_sub_filters.html.liquid            |  89 +++
 .../account.html.liquid                       |   0
 .../asset-manager.html.liquid                 |   7 +
 .../auth_url_email.html.liquid                |   5 +-
 .../auth_url_employee.html.liquid             |   0
 .../auth_url_phone_number.html.liquid         |   0
 .../auth_url_terms.html.liquid                |   0
 .../catalog.html.liquid                       | 142 ++++
 .../course.html.liquid                        |  18 +
 .../courses.html.liquid                       |   0
 .../dashboard.html.liquid                     | 435 +++++++++++
 .../forgot_password.html.liquid               |   0
 .../homepage.html.liquid                      | 129 ++++
 .../learning_path.html.liquid                 |   0
 .../learning_path_summary.html.liquid         |   0
 .../learning_paths.html.liquid                |   0
 .../login.html.liquid                         |   0
 .../master.html.liquid                        |   1 +
 .../not_found.html.liquid                     |   0
 .../private_certificate.html.liquid           |   0
 .../public_certificate.html.liquid            |   0
 .../reset_password.html.liquid                |   0
 .../search.html.liquid                        |   0
 .../sign_up.html.liquid                       |   0
 .../styles.css.liquid                         | 343 +++++++++
 .../training.html.liquid                      | 705 ++++++++++++++++++
 .../training_events.html.liquid               | 657 ++++++++++++++++
 .../training_session.html.liquid              |  94 +++
 .../training_session_attendance.html.liquid   |   0
 .../transcript.html.liquid                    |   8 +
 .../unsubscribe.html.liquid                   |   0
 .../videos.html.liquid                        | 190 +++++
 .../_account_deletion.html.liquid             |  10 +-
 .../_cookie_banner.html.liquid                |   6 +-
 .../Pipedrive - Learn/_head.html.liquid       |  32 +-
 .../Pipedrive - Learn/course.html.liquid      |   4 +-
 .../profile-settings.html.liquid              |  10 +-
 .../Pipedrive - Learn/welcome.html.liquid     |  12 +-
 .../customer_templates/SPS_Commerce/.DS_Store | Bin 6148 -> 6148 bytes
 .../SPS-New/_cards_course_new.html.liquid     |  57 --
 .../SPS-New/_cards_learning_path.html.liquid  |  23 -
 .../_cards_learning_path_new.html.liquid      |  44 --
 .../SPS-New/_cards_other_event.html.liquid    |  23 -
 .../SPS-New/_cards_training_event.html.liquid |  36 -
 .../SPS-New/_course_events.html.liquid        |  29 -
 .../SPS-New/_course_outline.html.liquid       |  69 --
 .../SPS_Commerce/SPS-New/_footer.html.liquid  |  70 --
 .../_fullfilment_events_index.html.liquid     |  12 -
 .../SPS_Commerce/SPS-New/_head.html.liquid    |   8 -
 .../SPS_Commerce/SPS-New/_header.html.liquid  | 429 -----------
 .../SPS-New/_learning_path_course.html.liquid |  55 --
 ...learning_path_training_session.html.liquid |  52 --
 .../SPS-New/_learning_paths_index.html.liquid |  16 -
 .../SPS-New/_other_events_index.html.liquid   |  13 -
 .../SPS-New/_sub_navigation.html.liquid       |   0
 .../_training_events_index.html (1).liquid    |  41 -
 .../_training_events_index.html.liquid        |  41 -
 .../SPS_Commerce/SPS-New/catalog.html.liquid  |  34 -
 .../SPS_Commerce/SPS-New/course.html.liquid   |  60 --
 .../SPS-New/dashboard.html.liquid             | 291 --------
 .../SPS_Commerce/SPS-New/homepage.html.liquid |   3 -
 .../SPS-New/learning_path.html.liquid         |  50 --
 .../SPS-New/learning_paths.html.liquid        |  23 -
 .../SPS_Commerce/SPS-New/styles.css.liquid    |  21 -
 .../SPS-New/training_events.html.liquid       | 130 ----
 .../SPS_Commerce/_account_avatar.html.liquid  |  66 ++
 .../_account_desktop_view.html.liquid         |  19 +
 .../SPS_Commerce/_account_form.html.liquid    | 139 ++++
 .../_account_mobile_view.html.liquid          |  17 +
 .../SPS_Commerce/_account_tabs.html.liquid    |  32 +
 .../_bundle_description.html.liquid           |   6 +
 .../_bundle_desktop_header.html.liquid        |  12 +
 .../_bundle_product_desktop_view.html.liquid  |  21 +
 .../_bundle_product_mobile_view.html.liquid   |  27 +
 .../_bundle_product_outline.html.liquid       |  12 +
 .../_cards_catalog_item.html.liquid           |  38 +
 .../SPS_Commerce/_cards_course.html.liquid    |  34 +
 .../_cards_course_new.html.liquid             |  57 --
 .../_cards_learning_path.html.liquid          |  82 +-
 .../_cards_learning_path_new.html.liquid      |  44 --
 .../_cards_other_event.html.liquid            |  23 -
 .../_cards_training_event.html.liquid         |  75 +-
 .../_certificates_info_column.html.liquid     |   4 +
 .../_certificates_metadata.html.liquid        |  59 ++
 .../_certificates_preview.html.liquid         |  35 +
 .../_certificates_top_bar.html.liquid         |  44 ++
 .../_certificates_verification.html.liquid    |  15 +
 .../_course_activity_locked.html.liquid       |   4 +
 .../_course_activity_unlocked.html.liquid     |  15 +
 .../_course_categories.html.liquid            |  10 +
 .../_course_description.html.liquid           |   6 +
 .../_course_desktop_view.html.liquid          |  16 +-
 .../SPS_Commerce/_course_header.html.liquid   |  16 +
 .../_course_instructors.html.liquid           |  22 +
 .../_course_mobile_view.html.liquid           |  40 +
 .../SPS_Commerce/_course_outline.html.liquid  |  31 +-
 ... _course_product_desktop_view.html.liquid} |  23 +-
 .../_course_product_mobile_view.html.liquid   |  31 +
 .../_course_progress_and_cta.html.liquid      |  48 ++
 ..._course_version_outdated_alert.html.liquid |   7 +
 ..._course_version_outdated_popup.html.liquid |  33 +
 .../_courses_catalog.html.liquid              |   0
 .../_courses_homepage.html.liquid             |  38 +
 .../SPS_Commerce/_courses_index.html.liquid   |  16 +
 .../_courses_zero_state.html.liquid           |   6 +
 .../_custom_events_card.html.liquid           |  25 +
 .../SPS_Commerce/_filter_checkbox.html.liquid |  10 +
 .../SPS_Commerce/_filter_dropdown.html.liquid |  33 +
 .../SPS_Commerce/_filter_select.html.liquid   |  22 +
 .../SPS_Commerce/_footer.html.liquid          |  76 +-
 .../_fulfillment_webinars.html.liquid         |   7 +
 .../_fullfilment_events_index.html.liquid     |   8 -
 .../SPS_Commerce/_head.html.liquid            |   5 -
 .../SPS_Commerce/_header.html.liquid          | 595 +++++----------
 .../SPS_Commerce/_header_minimal.html.liquid  |  17 +
 .../_learning_path_banners.html.liquid        |   5 +
 .../_learning_path_certificate.html.liquid    |  17 +
 ...rning_path_certificate_content.html.liquid |  19 +
 ...learning_path_completed_banner.html.liquid |  13 +
 .../_learning_path_course.html.liquid         |   3 +-
 .../_learning_path_description.html.liquid    |   6 +
 ..._learning_path_desktop_content.html.liquid |  21 +
 .../_learning_path_desktop_header.html.liquid |  12 +
 .../_learning_path_desktop_view.html.liquid   |   2 +
 .../_learning_path_instructors.html.liquid    |  26 +
 .../_learning_path_mobile_content.html.liquid |  19 +
 .../_learning_path_mobile_header.html.liquid  |  17 +
 .../_learning_path_mobile_view.html.liquid    |   2 +
 ...arning_path_new_content_banner.html.liquid |  12 +
 .../_learning_path_outline.html.liquid        |  10 +
 ...ning_path_product_desktop_view.html.liquid |  22 +
 ...rning_path_product_mobile_view.html.liquid |  34 +
 ..._learning_path_product_outline.html.liquid |  10 +
 ...learning_path_progress_and_cta.html.liquid |  23 +
 ...ning_path_summary_desktop_view.html.liquid |   3 +
 ...rning_path_summary_mobile_view.html.liquid |   5 +
 ...learning_path_training_session.html.liquid |   1 +
 .../_learning_paths_index.html.liquid         |  28 +-
 .../SPS_Commerce/_lp_homepage.html.liquid     |  40 +
 .../SPS_Commerce/_messages.html.liquid        |  19 +
 .../SPS_Commerce/_other_events.html.liquid    |   8 +
 .../_other_events_index.html.liquid           |  13 -
 .../_product_expiration_date.html.liquid      |   7 +
 .../SPS_Commerce/_product_outline.html.liquid |  25 +
 .../_product_outline_course.html.liquid       |  82 ++
 .../_product_outline_event.html.liquid        |  49 ++
 .../_product_outline_lp.html.liquid           |  65 ++
 .../_product_price_and_cta.html.liquid        |  12 +
 .../SPS_Commerce/_search_result.html.liquid   |  19 +
 .../_search_zero_state.html.liquid            |  13 +
 .../SPS_Commerce/_sub_navigation.html.liquid  |  60 ++
 .../_training_event_desktop_view.html.liquid  |  42 ++
 .../_training_event_mobile_view.html.liquid   |  23 +
 ...ing_event_preview_desktop_view.html.liquid |  42 ++
 ...ning_event_preview_mobile_view.html.liquid |  23 +
 ...ng_event_preview_more_sessions.html.liquid |   3 +
 ...ing_event_preview_session_tile.html.liquid |  18 +
 .../_training_events_dashboard.html.liquid    |   9 +
 .../_training_events_filter.html.liquid       |   0
 .../_training_events_index.html.liquid        |  30 +-
 .../_training_events_zero_state.html.liquid   |   2 +-
 .../_training_session_calendars.html.liquid   |   0
 .../_training_session_cta.html.liquid         |  35 +
 .../_training_session_date.html.liquid        |  16 +
 .../_training_session_description.html.liquid |   6 +
 ..._training_session_desktop_view.html.liquid |  43 ++
 .../_training_session_details.html.liquid     |   9 +-
 .../_training_session_header.html.liquid      |   7 +
 .../_training_session_mobile_view.html.liquid |  27 +
 ...training_session_more_sessions.html.liquid |   3 +
 .../_training_session_status.html.liquid      |   6 +
 .../_training_session_tile.html.liquid        |  24 +
 .../SPS_Commerce/account.html.liquid          |  15 +
 .../SPS_Commerce/auth_url_email.html.liquid   |  59 ++
 .../auth_url_employee.html.liquid             |  59 ++
 .../auth_url_phone_number.html.liquid         |  40 +
 .../SPS_Commerce/auth_url_terms.html.liquid   |  74 ++
 .../SPS_Commerce/bundle_product.html.liquid   |  10 +
 .../SPS_Commerce/catalog.html.liquid          |  13 +-
 .../SPS_Commerce/commerce_cart.html.liquid    |   7 +
 .../SPS_Commerce/commerce_catalog.html.liquid |  28 +
 .../commerce_checkout.html.liquid             |   7 +
 .../commerce_order_details.html.liquid        |   7 +
 .../commerce_order_history.html.liquid        |   8 +
 .../SPS_Commerce/commerce_redeem.html.liquid  |   7 +
 .../SPS_Commerce/commerce_return.html.liquid  |   7 +
 .../SPS_Commerce/course.html.liquid           |  54 +-
 .../course_product.html.liquid}               |   4 +-
 .../SPS_Commerce/courses.html.liquid          |  11 +
 .../SPS_Commerce/dashboard.html.liquid        | 290 +------
 .../SPS_Commerce/forgot_password.html.liquid  |  25 +
 .../SPS_Commerce/homepage.html.liquid         | 135 +++-
 .../SPS_Commerce/learning_path.html.liquid    |  44 +-
 .../learning_path_product.html.liquid         |  10 +
 .../learning_path_summary.html.liquid         |  10 +
 .../SPS_Commerce/learning_paths.html.liquid   |  25 +-
 .../SPS_Commerce/login.html.liquid            |  53 ++
 .../SPS_Commerce/master.html.liquid           |   1 +
 .../SPS_Commerce/not_found.html.liquid        |  10 +
 .../private_certificate.html.liquid           |  10 +
 .../public_certificate.html.liquid            |  10 +
 .../SPS_Commerce/reset_password.html.liquid   |  43 ++
 .../SPS_Commerce/search.html.liquid           |  27 +
 .../SPS_Commerce/sign_up.html.liquid          |  72 ++
 .../SPS_Commerce/styles.css.liquid            |  36 +-
 .../training_event_preview.html.liquid        |  10 +
 .../SPS_Commerce/training_events.html.liquid  | 109 +--
 .../training_session.html.liquid              |   0
 .../training_session_attendance.html.liquid   |  43 ++
 .../SPS_Commerce/transcript.html.liquid       |   8 +
 .../SPS_Commerce/unsubscribe.html.liquid      |  30 +
 Scripts/Zenjob/workato-webhook-gsheets.py     |  48 +-
 322 files changed, 8995 insertions(+), 3731 deletions(-)
 delete mode 100644 Custom_Templates/customer_templates/Harri - McDonalds/_head.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/Harri - McDonalds/_mcdonalds_theme.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/Harri - McDonalds/_sub_navigation.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/Harri - McDonalds/catalog.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/Harri - McDonalds/dashboard.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/Harri - McDonalds/homepage.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/Harri - McDonalds/master.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/Harri - McDonalds/second-login.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/Harri - McDonalds/styles.css.liquid
 delete mode 100644 Custom_Templates/customer_templates/Harri - McDonalds/training_events.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_account_avatar.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_account_desktop_view.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_account_form.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_account_mobile_view.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_account_tabs.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_arabic_lang.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_banner.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_cards_course.html.liquid (57%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course_horizontal.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course_new_styles.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course_videos.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_cards_learning_path.html.liquid (88%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_learning_path_new_styles.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_learning_path_vertical.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_cards_training_event.html.liquid (96%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_training_event_horizontal.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_catalog_filters.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_certificates_info_column.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_certificates_metadata.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_certificates_preview.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_certificates_top_bar.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_certificates_verification.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_contact_us_block.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_course_activity_locked.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_course_activity_unlocked.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_course_categories.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_course_description.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_course_desktop_view.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_course_events.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_course_header.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_course_instructors.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_course_mobile_view.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_course_outline.html.liquid (72%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_course_progress_and_cta.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_course_version_outdated_alert.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_course_version_outdated_popup.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_courses_catalog.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_courses_index.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_courses_zero_state.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_dashboard_courses_block.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_dashboard_lps_block.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_filter_checkbox.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_filter_dropdown.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_filter_select.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_footer.html.liquid (87%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_french_lang.html.liquid (91%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_head.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_header.html.liquid (58%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_header_minimal.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_featured_content.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_featured_my_points.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_getting_started.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_learning_progress.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_banners.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_certificate.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_certificate_content.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_completed_banner.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_course.html.liquid (87%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_description.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_desktop_content.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_desktop_header.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_desktop_view.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_instructors.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_mobile_content.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_mobile_header.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_mobile_view.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_new_content_banner.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_outline.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_progress_and_cta.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_summary_desktop_view.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_summary_mobile_view.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_path_training_session.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_learning_paths_index.html.liquid (83%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_messages.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_popup2.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_progress_circle.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_russian_lang.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_search_result.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_search_zero_state.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_spanish_lang.html.liquid (50%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_sub_navigation.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_training_events_dashboard.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_events_filter.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_training_events_index.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_events_zero_state.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_filter.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_calendars.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_training_session_cta.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_training_session_date.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_training_session_description.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_training_session_desktop_view.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_details.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_training_session_header.html.liquid (78%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_training_session_mobile_view.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_training_session_more_sessions.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_status.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/_training_session_tile.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_video_catalog_filters.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_video_courses_catalog.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/_video_sub_filters.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/account.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/asset-manager.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/auth_url_email.html.liquid (89%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/auth_url_employee.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/auth_url_phone_number.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/auth_url_terms.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/catalog.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/course.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/courses.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/dashboard.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/forgot_password.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/homepage.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/learning_path.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/learning_path_summary.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/learning_paths.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/login.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/master.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/not_found.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/private_certificate.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/public_certificate.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/reset_password.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/search.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/sign_up.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/styles.css.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/training.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/training_events.html.liquid
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/training_session.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/training_session_attendance.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/transcript.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => Harri McDonalds Corp Field}/unsubscribe.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/Harri McDonalds Corp Field/videos.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_course_new.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_learning_path.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_learning_path_new.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_other_event.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_training_event.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_course_events.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_course_outline.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_footer.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_fullfilment_events_index.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_head.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_header.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_learning_path_course.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_learning_path_training_session.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_learning_paths_index.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_other_events_index.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_sub_navigation.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_training_events_index.html (1).liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_training_events_index.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/catalog.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/course.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/dashboard.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/homepage.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/learning_path.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/learning_paths.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/styles.css.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/SPS-New/training_events.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_account_avatar.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_account_desktop_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_account_form.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_account_mobile_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_account_tabs.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_bundle_description.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_bundle_desktop_header.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_bundle_product_desktop_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_bundle_product_mobile_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_bundle_product_outline.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_cards_catalog_item.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_cards_course.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_cards_course_new.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_cards_learning_path_new.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_cards_other_event.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_certificates_info_column.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_certificates_metadata.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_certificates_preview.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_certificates_top_bar.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_certificates_verification.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_course_activity_locked.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_course_activity_unlocked.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_course_categories.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_course_description.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_course_header.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_course_instructors.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_course_mobile_view.html.liquid
 rename Custom_Templates/customer_templates/SPS_Commerce/{SPS-New/_course_desktop_view.html.liquid => _course_product_desktop_view.html.liquid} (57%)
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_course_product_mobile_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_course_progress_and_cta.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_course_version_outdated_alert.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_course_version_outdated_popup.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => SPS_Commerce}/_courses_catalog.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_courses_homepage.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_courses_index.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_courses_zero_state.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_custom_events_card.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_filter_checkbox.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_filter_dropdown.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_filter_select.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_fulfillment_webinars.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_fullfilment_events_index.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_header_minimal.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_banners.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_certificate.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_certificate_content.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_completed_banner.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_description.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_desktop_content.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_desktop_header.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_desktop_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_instructors.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_mobile_content.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_mobile_header.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_mobile_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_new_content_banner.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_outline.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_product_desktop_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_product_mobile_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_product_outline.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_progress_and_cta.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_summary_desktop_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_learning_path_summary_mobile_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_lp_homepage.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_messages.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_other_events.html.liquid
 delete mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_other_events_index.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_product_expiration_date.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_product_outline.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_product_outline_course.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_product_outline_event.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_product_outline_lp.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_product_price_and_cta.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_search_result.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_search_zero_state.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_event_desktop_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_event_mobile_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_desktop_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_mobile_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_more_sessions.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_session_tile.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_events_dashboard.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => SPS_Commerce}/_training_events_filter.html.liquid (100%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => SPS_Commerce}/_training_events_zero_state.html.liquid (75%)
 rename Custom_Templates/customer_templates/{Harri - McDonalds => SPS_Commerce}/_training_session_calendars.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_session_cta.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_session_date.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_session_description.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_session_desktop_view.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => SPS_Commerce}/_training_session_details.html.liquid (70%)
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_session_header.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_session_mobile_view.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_session_more_sessions.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_session_status.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/_training_session_tile.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/account.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/auth_url_email.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/auth_url_employee.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/auth_url_phone_number.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/auth_url_terms.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/bundle_product.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/commerce_cart.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/commerce_catalog.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/commerce_checkout.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/commerce_order_details.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/commerce_order_history.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/commerce_redeem.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/commerce_return.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds/course.html.liquid => SPS_Commerce/course_product.html.liquid} (70%)
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/courses.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/forgot_password.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/learning_path_product.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/learning_path_summary.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/login.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/master.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/not_found.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/private_certificate.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/public_certificate.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/reset_password.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/search.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/sign_up.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/training_event_preview.html.liquid
 rename Custom_Templates/customer_templates/{Harri - McDonalds => SPS_Commerce}/training_session.html.liquid (100%)
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/training_session_attendance.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/transcript.html.liquid
 create mode 100644 Custom_Templates/customer_templates/SPS_Commerce/unsubscribe.html.liquid

diff --git a/Custom_Templates/customer_templates/.DS_Store b/Custom_Templates/customer_templates/.DS_Store
index 31ee91848306307e08bd989b275d6bbb698395f8..7c557de6dd3f3b72dc3855db686e47bcaa019698 100644
GIT binary patch
delta 188
zcmZo!z}T{Yae_Z1_r?HL#>w)IvXieciZilJ<`K}D{6#=;@?uBZ&4NtdSSL2{Zf56T
z;b8RG%p%CnKUsn4$7XJYd;Am2l{Rx5uyJnwX!(P6@_KvC$u*4PlYJf3C!0AmPArjP
zRGlp2sIZyC@jlz+t?se{1sR6H$@#ej3?RVHzyP#p@8+-WEUc3w-J~~vaQ)7RQyG6A
SLkUAFLlHwBLn1>?Zax5#891i^

delta 365
zcmZo!z}T{Yae_Z1|Hc4T#>p4$)F&I+i!-uK=5p7coXDs#+1WvAvk=o))`<<go7p*7
zI2e5<cQNWrPH~?&d8@nj<ZX<Cn|TG;_&0Ma+~c48QBG+yw*ebxy&!`JLn1>F5N0wc
zFz5oYFGDhe3qw9b9#A}oA%&qhC*3eOIX}060R))JB7r0kx^nYfT#|C~lYpu@7Kk1Y
zPri555mRR@HVbp}Q;5)tO=m#{l2h3mHuGBkVFme>QFZb;JFUqD_Km<`lAT<{C=Q}G
c>p0wJo4nRsdNY&9cb3hvF7KE?Jf_@y0NyEF-v9sr

diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_head.html.liquid b/Custom_Templates/customer_templates/Harri - McDonalds/_head.html.liquid
deleted file mode 100644
index 0bfaed3d..00000000
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_head.html.liquid	
+++ /dev/null
@@ -1,51 +0,0 @@
-{% styles default %}
-{% styles colors %}
-{% styles custom %}
-
-{% comment %} {% unless current_person.email contains "preview" %}
-
-      {% assign group_count = 0 %}
-      {% assign is_in_all_group = false %}
-
-      {% if current_person.signed_in? %}
-        {% assign groups = current_person.groups %}
-        {% for item in groups %}
-          {% assign group_count = group_count | plus: 1 %}
-          {% if group_count <= 1 and item.id contains 'd8b83557-aad1-4a4e-85ee-ddbde5d1e507' %}
-            {% assign is_in_all_group = true %}
-            <script>
-              document.addEventListener('DOMContentLoaded', function() {
-                console.log("{{group_count}}")
-                setTimeout(function() {
-                  if (window.location.pathname !== '/app/second-login') {
-                    window.location.replace('/app/second-login');
-                  }
-                }, 1000);
-              }            </script>
-          {% endif %}
-        {% endfor %}
-      {% endif %}
-
-      {% if current_person.signed_in? %}
-        {% for item in current_person.groups %}
-        {% endfor %}
-        {% if current_person.groups.any? %}
-        {% else %}
-          <script>
-            document.addEventListener('DOMContentLoaded', function() {
-              setTimeout(function() {
-                if (window.location.pathname !== '/app/second-login') {
-                  window.location.replace('/app/second-login');
-                }
-              }, 1000);
-            });
-          </script>
-        {% endif %}
-      {% endif %}
-
-{% endunless %} {% endcomment %}
-
-<script
-  src="https://code.jquery.com/jquery-3.5.1.min.js"
-  integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0="
-  crossorigin="anonymous"></script>
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_mcdonalds_theme.html.liquid b/Custom_Templates/customer_templates/Harri - McDonalds/_mcdonalds_theme.html.liquid
deleted file mode 100644
index ef02451a..00000000
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_mcdonalds_theme.html.liquid	
+++ /dev/null
@@ -1,29 +0,0 @@
-{% if current_person.properties.company == "McDonalds" %}
-  <style>
-    .np-header-color {
-      background: #DE352A;
-    }
-    *[class^="np-button"]:not(i),
-    .np-sub-navigation-content-item-bar {
-      background-color: #DE352A;
-    }
-    .np-button-color {
-      color: #DE352A;
-    }
-    .np-button:hover {
-      background-color: #F9BB30;
-    }
-    .np-button, .np-button-background-color {
-      background-color: #DE352A;
-    }
-    .dropbtn
-    {
-      background-color: #F9BB30;
-      color: #DE352A;
-    }
-  </style>
-  <script>
-    document.getElementsByClassName("np-footer-logo-image")[0].src = "https://s3.amazonaws.com/static.northpass.com/Harri/lockup-mcdonalds.png"
-    document.getElementsByClassName("np-header-logo-image")[0].src = "https://s3.amazonaws.com/static.northpass.com/Harri/lockup-mcdonalds.png"
-  </script>
-{% endif %}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_sub_navigation.html.liquid b/Custom_Templates/customer_templates/Harri - McDonalds/_sub_navigation.html.liquid
deleted file mode 100644
index d814e519..00000000
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_sub_navigation.html.liquid	
+++ /dev/null
@@ -1,13 +0,0 @@
-<nav class="np-sub-navigation">
-  <div class="np-sub-navigation-content">
-    {% for link in navigations.sub_navigation %}
-      <div class="np-sub-navigation-content-item {{ link.active_class }}">
-        <a class="np-sub-navigation-content-item-link" href="{{ link.url }}">
-          <i class="{{ link.icon }} np-button-color np-sub-navigation-content-item-icon"></i>
-          <p class="{{ link.label }} sub-navigation-label" style="margin-top:0px;"> {{ link.label }} </p>
-        </a>
-        <div class="np-sub-navigation-content-item-bar np-button-background-color"></div>
-      </div>
-    {% endfor %}
-  </div>
-</nav>
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/catalog.html.liquid b/Custom_Templates/customer_templates/Harri - McDonalds/catalog.html.liquid
deleted file mode 100644
index d7b380b8..00000000
--- a/Custom_Templates/customer_templates/Harri - McDonalds/catalog.html.liquid	
+++ /dev/null
@@ -1,23 +0,0 @@
-{% include "header" %}
-{% include "course_version_outdated_alert", courses: courses.in_catalog %}
-{% include "sub_navigation" %}
-<main class="np-main np-catalog np-subpage-container np-max-width">
-  <div class="np-catalog-header-wrapper">
-    <div class="np-catalog-header">
-      <div class="np-resource-title">{{ catalog.headline }}</div>
-      <div class="np-resource-subtitle">{{ catalog.subheadline }}</div>
-    </div>
-    {% capture label %}{% t shared.filters.by_category %}{% endcapture %}
-
-    {% if courses.in_catalog.any? %}
-      {%
-        include "filter_dropdown",
-        filters: courses.filters,
-        key: "category_uuid",
-        label: label
-      %}
-    {% endif %}
-  </div>
-  {% include "courses_catalog" %}
-</main>
-{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/dashboard.html.liquid b/Custom_Templates/customer_templates/Harri - McDonalds/dashboard.html.liquid
deleted file mode 100644
index 4da771ae..00000000
--- a/Custom_Templates/customer_templates/Harri - McDonalds/dashboard.html.liquid	
+++ /dev/null
@@ -1,31 +0,0 @@
-{% include "header" %}
-
-{% include "sub_navigation" %}
-<main class="np-main np-dashboard np-subpage-container np-max-width">
-  <div class="row np-flex-center">
-    <div class="col-xs-12 col-sm-8">
-      {% if features.learning_paths? %}
-        <div class="np-dashboard-resources-title lp">
-          {% t shared.learning_paths %}
-        </div>
-        {% include "learning_paths_index", items: learning_paths.enrolled %}
-      {% endif %}
-      <div class="np-dashboard-resources-title modules">
-        {% t shared.course_vocabulary.plural, key: current_school.course_vocabulary %}
-      </div>
-      {% include "courses_index", class: "col-xs-12 col-sm-6 np-stretch-content" %}
-    </div>
-    {% if features.training_events? %}
-      <div class="np-grid-spacing col-xs-12 col-sm-4">
-        <div class="np-dashboard-resources-title events">
-          {% t .upcoming_events %}
-        </div>
-          {% include "training_events_dashboard" %}
-          <div class="points-container">
-            Total Points: <br> <span class="total-points">{{current_person.properties.points}}</span>
-          </div>
-      </div>
-    {% endif %}
-  </div>
-</main>
-{% include "footer" %}
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/homepage.html.liquid b/Custom_Templates/customer_templates/Harri - McDonalds/homepage.html.liquid
deleted file mode 100644
index 77559cc9..00000000
--- a/Custom_Templates/customer_templates/Harri - McDonalds/homepage.html.liquid	
+++ /dev/null
@@ -1,52 +0,0 @@
-{% include "header" %}
-{% include "course_version_outdated_alert", courses: courses.featured %}
-<main class="np-main np-homepage">
-  <div class="np-homepage-hero">
-    <img class="np-homepage-hero-image"
-      src="{{ homepage.artwork_url }}"
-      alt="{{ homepage.headline }}"
-    />
-    <div class="np-homepage-hero-content">
-      <div class="np-homepage-headline np-header-font-color">
-        {{ homepage.headline }}
-      </div>
-      <div class="np-homepage-subheadline np-header-font-color">
-        {{ homepage.subheadline }}
-      </div>
-      <a class="np-homepage-hero-cta np-button" href="{% route catalog %}">
-        {% t .discover %}
-      </a>
-    </div>
-  </div>
-  {% include "sub_navigation" %}
-  <div class="np-homepage-featured np-max-width">
-    <div class="np-homepage-featured-text">
-      <div class="np-homepage-headline">
-        {{ homepage.featured_courses_headline }}
-      </div>
-      <div class="np-homepage-subheadline">
-        {{ homepage.featured_courses_subheadline }}
-      </div>
-    </div>
-    {% if courses.featured.any? %}
-      <div class="np-homepage-featured-courses row">
-        {% for course in courses.featured %}
-          <div class="col-xs-12 col-md-6 col-lg-4 np-stretch-content">
-            {% include "cards_course" with course %}
-          </div>
-        {% endfor %}
-      </div>
-    {% else %}
-      <div class="np-homepage-featured-empty">
-        <div class="np-zero-state-text">
-          {% t .empty, key: current_school.course_vocabulary %}
-        </div>
-        <img
-          class="np-zero-state-courses"
-          alt="{% t .empty, key: current_school.course_vocabulary %}"
-        />
-      </div>
-    {% endif %}
-  </div>
-</main>
-{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/master.html.liquid b/Custom_Templates/customer_templates/Harri - McDonalds/master.html.liquid
deleted file mode 100644
index f4a68a10..00000000
--- a/Custom_Templates/customer_templates/Harri - McDonalds/master.html.liquid	
+++ /dev/null
@@ -1,5 +0,0 @@
-{% body %}
-
-{% if current_person.signed_in? %}
-  {% include "mcdonalds_theme" %}
-{% endif %}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/second-login.html.liquid b/Custom_Templates/customer_templates/Harri - McDonalds/second-login.html.liquid
deleted file mode 100644
index 8364bcf4..00000000
--- a/Custom_Templates/customer_templates/Harri - McDonalds/second-login.html.liquid	
+++ /dev/null
@@ -1,341 +0,0 @@
-{% assign group_count = 0 %}
-{% assign groups = current_person.groups %}
-
-{% for item in groups %}
-  {% assign group_count = group_count | plus: 1 %}
-  {% if group_count >= 2 and item.id contains 'd8b83557-aad1-4a4e-85ee-ddbde5d1e507'%}
-    <script>
-      document.addEventListener('DOMContentLoaded', function() {
-        setTimeout(function() {
-          if (window.location.pathname == '/app/second-login') {
-            window.location.replace('/app');
-          }
-        }, 1000);
-      });
-    </script>
-  {% endif %}
-{% endfor %}
-
-  {% include "header" %}
-  <main class="np-main np-box-container">
-    <div class="np-box">
-      <div class="np-box-content-container">
-        <form id="register-form" class="np-form np-box-content" novalidate>
-          <div class="np-form-title text-center"> Welcome! </div>
-          <div class="np-form-subtitle"> Please choose the option that best matches your current role to enroll in the 
-          appropriate learning path.  </div>
-          {% form_authenticity_token %}
-            <div class="np-form-field">
-              <label class="np-input-label" for="learner_role">
-              </label>
-              <select
-                class="np-input"
-                type="text"
-                name="learner[role]"
-                id="learner_role"
-                required
-               
-              >
-                <option class="default-option" disabled selected id="default-option">Your role</option>
-                <option value="General Manager">General Manager</option>
-                <option value="Kitchen Manager">Kitchen Manager</option>
-                <option value="People Manager">People Manager</option>
-                <option value="Guest Services Manager">Guest Services Manager</option>
-                <option value="Swing/Shift Manager">Swing/Shift Manager</option>
-                <option value="Manager Trainees">Manager Trainees</option>
-                <option value="Supervisor">Supervisor</option>
-                <option value="Supervisor/Role Assigment">Supervisor w/Role Assignment</option>
-                <option value="Org Admin">Org Admin/Back Office Admin</option>
-                <option value="Owner Operator">Owner/Operator</option>
-                <option value="Crew Trainer">Crew Trainer</option>
-                <option value="Corporate/Field Staff">McDonalds Corporate/Field Staff</option>
-    
-              </select>
-            </div>
-          <div class="np-form-subtitle">Please provide your store number</div>
-          <div class="np-form-field">
-            <label class="np-input-label" for="store_number">
-            </label>
-            <input
-              class="np-input"
-              type="text"
-              name="store[number]"
-              id="store_number"
-              placeholder="Store Number(NSN)"
-              required
-            >
-          </div>
-        </form>
-        <button id="send_button" class="np-button np-button-big np-button-large-font np-form-action">
-          Update Information
-        </button>
-      </div>
-    </div>
-  </main>
-  {% include "footer" %}
-
-<style>
-  @media (min-width: 1440px) {
-    #password-too-short-alert {
-      position: absolute;
-      right: 25.5%;
-      bottom: 23%;
-      color: salmon;
-      font-size: 13px;
-    }
-
-    #passwords-dont-match-alert {
-      position: absolute;
-      right: 23%;
-      bottom: 14.5%;
-      color: salmon;
-      font-size: 13px;
-    }
-  }
-
-  @media (min-width: 769px) and (max-width: 1024px) {
-    #password-too-short-alert {
-      position: absolute;
-      right: 24%;
-      bottom: 23%;
-      color: salmon;
-      font-size: 13px;
-    }
-
-    #passwords-dont-match-alert {
-      position: absolute;
-      right: 21.5%;
-      bottom: 14.5%;
-      color: salmon;
-      font-size: 13px;
-    }
-  }
-
-  @media (min-width: 426px) and (max-width: 768px) {
-    .np-box-content-container {
-      align-items: center;
-    }
-  }
-
-  @media (min-width: 376px) and (max-width: 425px) {
-    .np-input {
-      padding: 0 0.75rem;
-    }
-  }
-
-
-  @media (min-width: 326px) and (max-width: 375px) {
-    .np-input {
-      padding: 0 0.75rem;
-    }
-  }
-
-  @media (max-width: 325px) {
-    .np-input {
-      padding: 0 0.75rem;
-    }
-  }
-
-  .np-main {
-    margin: 25px 0;
-  }
-  .np-box {
-    display: flex;
-    flex-direction: row;
-    width: unset !important;
-    box-shadow: none;
-  }
-  .np-box-container {
-    height: unset !important;
-    background: none;
-  }
-  .hero-image-left-desktop {
-    width: 60%;
-  }
-  .hero-image-left-mobile {
-    width: 100%;
-    display: none;
-  }
-  .np-box-content-container {
-    margin-top: 0;
-    margin-bottom: 0;
-    padding: 2rem;
-    display: flex;
-    flex-direction: column;
-  }
-  .np-form-subtitle {
-    margin-bottom: 1.25rem;
-  }
-  .np-input {
-    background-color: #FFF6F0;
-    border: none;
-    border-radius: 4px;
-  }
-  .np-input::placeholder {
-    color: #6F7277;
-    font-size: 16px;
-  }
-  #default-option {
-    color: #6F7277;
-    font-size: 16px;
-  }
-  .selection-option {
-    font-family: Inter;
-  }
-  .body {
-    height: 100%;
-  }
-  #learner_role {
-    color: #1B1C1D;
-    text-align: left;
-  }
-  @media only screen and (min-width: 1190px) {
-    .hero-image-left-desktop {
-      min-width: 60%;
-    }
-  }
-  @media only screen and (max-width: 768px) {
-    .np-box-content-container {
-      padding: 2rem 2rem 2.25rem;
-    }
-    .hero-image-left-desktop {
-      display: none;
-    }
-    .hero-image-left-mobile {
-      display: block;
-    }
-    .np-box {
-      flex-direction: column;
-      margin: 0;
-    }
-    .np-main {
-      margin: 0;
-    }
-    .np-box-content-container {
-      margin-left: 0;
-    }
-  }
-  #send_button {
-    pointer-events: none;
-    background: #6F7277;
-  }
-
-  .loader {
-    border: 16px solid #f3f3f3;
-    border-radius: 50%;
-    border-top: 16px solid #00bf8f;
-    border-bottom: 16px solid #00bf8f;
-    width: 120px;
-    height: 120px;
-    -webkit-animation: spin 2s linear infinite;
-    animation: spin 2s linear infinite;
-    
-    
-    position: absolute;
-    top:0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: auto;
-  }
-  
-  @-webkit-keyframes spin {
-    0% { -webkit-transform: rotate(0deg); }
-    100% { -webkit-transform: rotate(360deg); }
-  }
-  
-  @keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-  }
-</style>
-
-
-<style>
-  .np-box-container {
-      background: none;
-  }
-</style>
-
-<script>
-  function checkIfInputsExist (){
-    window.setTimeout(function(){
-      if ($("#store_number")[0].value.length > 0 && $("#learner_role")[0].value != "Your Role") {
-        $("#send_button").css("background-color","#de352a");
-        $("#send_button").css("pointer-events","auto");
-      }
-      else {
-        $("#send_button").css("background-color","#6F7277");
-        $("#send_button").css("pointer-events","none");
-      }
-    }, 500)
-  }
-  document.addEventListener('keydown', checkIfInputsExist);
-  document.getElementById("learner_role").addEventListener('change', checkIfInputsExist);
-  
-  document.getElementById("send_button").addEventListener("click", function() {
-    var selectedRole = document.getElementById("learner_role").value;
-    var groupUuid ="";
-
-    switch (selectedRole) {
-      case "General Manager":
-        groupUuid = "0f977347-6e60-4de1-bad3-f6b413ab7eef";
-        break;
-      case "Kitchen Manager":
-        groupUuid = "df0b4cea-fac6-4991-8902-b2202b9c71c5";
-        break;
-      case "People Manager":
-        groupUuid = "ed4ae611-ed12-41c1-b1ff-03d339813f70";
-        break;
-      case "Guest Services Manager":
-        groupUuid = "df0b4cea-fac6-4991-8902-b2202b9c71c5";
-        break;
-      case "Swing/Shift Manager":
-        groupUuid = "9b5674c8-e5f1-47ad-a380-cc9fb1a73c02";
-        break;
-      case "Manager Trainees":
-        groupUuid = "1bed05ca-c5e6-4874-8e14-e2815ccdba7f";
-        break;
-      case "Supervisor":
-        groupUuid = "1e63de54-0676-427a-a3f8-da2625f47ce5";
-        break;
-      case "Supervisor/Role Assigment":
-        groupUuid = "1e63de54-0676-427a-a3f8-da2625f47ce5";
-        break;
-      case "Org Admin":
-        groupUuid = "007d0b66-092d-4fda-a706-6b34cf1dddf4";
-        break;
-      case "Owner Operator":
-        groupUuid = "bbd256f2-48e2-407d-85b6-d016010c9649";
-        break;
-      case "Crew Trainer":
-        groupUuid = "afc4049d-7363-4301-a729-527cfbe5ef61";
-        break;
-      case "Corporate/Field Staff":
-        groupUuid = "bbd256f2-48e2-407d-85b6-d016010c9649";
-        break;
-    };
-
-    console.log("Selected Role: " + selectedRole);
-    console.log("Group UUID: " + groupUuid);
-
-      SendInfos(selectedRole, groupUuid);
-  });
-
-  function SendInfos(role, groupUuid) {
-    var xhr = new XMLHttpRequest();
-    url = "https://webhooks.workato.com/webhooks/rest/aa37cb7d-653d-43fe-a7b0-e4f9c2d6bd1e/harrimc-collect-learner-information"
-    xhr.addEventListener("load", e => {
-      window.sessionStorage.propertiesAdded = 'true';
-      window.location.replace('/app');
-    });
-    xhr.open("POST", url, true);
-    xhr.send(JSON.stringify({
-      user_id: '{{ current_person.id }}',
-      mc_d_role: role,
-      store_number_nsn: $("#store_number")[0].value,
-      group_uuid: groupUuid
-    }));
-  };
-  
-</script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/styles.css.liquid b/Custom_Templates/customer_templates/Harri - McDonalds/styles.css.liquid
deleted file mode 100644
index c52f7503..00000000
--- a/Custom_Templates/customer_templates/Harri - McDonalds/styles.css.liquid	
+++ /dev/null
@@ -1,59 +0,0 @@
- /*
- Put your custom overlay styles in here
- You can use your northpass color palette in this file
-
-{{ color_palette.button_font_color }}
-{{ color_palette.button_color }}
-{{ color_palette.button_hover_color }}
-{{ color_palette.header_font_color }}
-{{ color_palette.header_font_hover_color }}
-{{ color_palette.header_color }}
-*/
-
-.red-bar{
-    background: red;
-}
-
-.red-text,
-.red-status{
-    color: red;
-}
-
-.yellow-bar{
-    background: yellow;
-}
-
-.yellow-text,
-.yellow-status{
-    color: yellow;
-}
-
-.green-bar{
-    background: green;
-}
-
-.green-text,
-.green-status{
-    color: green;
-}
-
-.course-duration-lp {
-    color: #de352a;
-    font-size: .75rem;
-    font-weight: 900;
-    text-transform: uppercase;
-    margin-top: 5px;
-}
-
-.text-center {
-    text-align: center;
-}
-.points-container {
-    border: 2px solid #bac4ca;
-    border-radius: 4px;
-    padding: 60px 32px;
-    text-align: center;
-  }
-  .total-points {
-    font-size: 2rem;
-  }
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/training_events.html.liquid b/Custom_Templates/customer_templates/Harri - McDonalds/training_events.html.liquid
deleted file mode 100644
index 239ef9e5..00000000
--- a/Custom_Templates/customer_templates/Harri - McDonalds/training_events.html.liquid	
+++ /dev/null
@@ -1,19 +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 events">
-        {% t .title %}
-      </div>
-      <div class="np-resource-subtitle events">
-        {% 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" %}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_account_avatar.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_account_avatar.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_account_avatar.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_account_avatar.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_account_desktop_view.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_account_desktop_view.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_account_desktop_view.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_account_desktop_view.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_account_form.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_account_form.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_account_form.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_account_form.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_account_mobile_view.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_account_mobile_view.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_account_mobile_view.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_account_mobile_view.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_account_tabs.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_account_tabs.html.liquid
new file mode 100644
index 00000000..f4de6c8e
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_account_tabs.html.liquid	
@@ -0,0 +1,23 @@
+{% capture settings_path %}{% route account %}{% endcapture %}
+{% capture transcript_path %}{% route transcript %}{% endcapture %}
+
+{% if current_person.signed_in? %}
+{% unless current_school.sso_active? %}
+  <nav class="np-tabs np-account-tabs">
+    <div class="np-tabs-content">
+      <div class="np-tab{% if page.path == settings_path %} np-tab-active{% endif %}">
+        <a class="np-tab-link" href="{{ settings_path}}">
+          {% t .profile_settings %}
+        </a>
+        <div class="np-tab-indicator np-button-background-color"></div>
+      </div>
+      <div class="np-tab{% if page.path == transcript_path %} np-tab-active{% endif %}">
+        <a class="np-tab-link" href="{{ transcript_path }}">
+          {% t .transcript %}
+        </a>
+        <div class="np-tab-indicator np-button-background-color"></div>
+      </div>
+    </div>
+  </nav>
+{% endunless %}
+{% endif %}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_arabic_lang.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_arabic_lang.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_arabic_lang.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_arabic_lang.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_banner.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_banner.html.liquid
new file mode 100644
index 00000000..b6b795ba
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_banner.html.liquid	
@@ -0,0 +1,42 @@
+
+<div id="banner" class="banner np-hidden-mobile">
+        <span class="banner-message">Please note that the academy will undergo an update <strong>Thursday, August 1st from 2:00 PM to 4:00PM Eastern Time</strong>. You will still be able to access the academy during this time.</span>
+        <button class="close-btn" onclick="closeBanner()">X</button>
+
+</div>
+
+<style>
+.banner {
+    background-color: #f2d7d9;
+    color: #333;
+    padding: 30px 20px;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-shadow: 0px 4px 6px rgba(0, 0, 0, 0.1);
+    z-index: 1000;
+}
+
+.banner-message {
+    font-size: 24px;
+}
+
+.close-btn {
+    background: none;
+    border: none;
+    font-size: 16px;
+    cursor: pointer;
+    color: #333;
+}
+
+.close-btn:hover {
+    color: #ff0000;
+}
+</style>
+
+<script>
+function closeBanner() {
+    document.getElementById('banner').style.display = 'none';
+}
+</script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_cards_course.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course.html.liquid
similarity index 57%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_cards_course.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course.html.liquid
index d50faa2c..602cef00 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_cards_course.html.liquid	
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course.html.liquid	
@@ -18,27 +18,15 @@
         {{ course.instructor_names }}
       </div>
       <div class="np-card-content-footer">
-      <div class="course-details">
-        {% if course.started? %}
-          <div class="np-card-content-progress np-button-color">
-            {{ course.progress }}% Complete
-          </div>
-        {% else %}
-          <div class="np-card-content-progress np-button-color notstarted">
-            Not started
-          </div>
-        {% endif %}
+      {% if course.started? %}
         <div class="np-card-content-progress np-button-color">
-          {% if course.properties.course_time > 0 %}
-            {{course.properties.course_time}} Min
-          {% endif %}
+          {{ course.progress }}%&nbsp;<span class="course-completion">Complete</span>
         </div>
-        <div class="np-card-content-progress np-button-color">
-          {% unless course.properties.course_points == 0 or course.properties.course_points =='missing property: course_points'%}
-            Points: {{course.properties.course_points}}
-          {% endunless %}
+      {% else %}
+        <div class="np-card-content-progress np-button-color notstarted">
+          Not started
         </div>
-      </div>
+      {% endif %}
         {% capture course_path %}{% route course, id: course.id %}{% endcapture %}
         {% if course.has_to_restart? %}
           {% include "course_version_outdated_popup", path: course_path %}
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course_horizontal.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course_horizontal.html.liquid
new file mode 100644
index 00000000..8a00ec62
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course_horizontal.html.liquid	
@@ -0,0 +1,43 @@
+<div class="np-card np-card-horizontal">
+  <div class="np-card-container">
+    {% if course.ribbon %}
+      <div class="np-card-ribbon">
+        {{ course.ribbon }}
+      </div>
+    {% endif %}
+    <div class="np-card-image-wrapper">
+      <img
+        class="np-card-image"
+        alt="{{ course.name }}"
+        src="{{ course.image_url }}"
+      >
+    </div>
+    <div class="np-card-content np-card-content-vertical np-card-padding">
+      <h3 class="np-card-content-title">
+        {{ course.name }}
+      </h3>
+      <div class="np-card-content-short-description">
+        {{ course.short_description}}
+      </div>
+      <div class="np-card-content-subtitle">
+        {{ course.instructor_names }}
+      </div>
+      <div class="np-card-content-footer">
+        {% comment %} <div class="np-card-content-progress np-button-color">
+          {{ course.progress }}
+        </div> {% endcomment %}
+        {% capture course_path %}{% route course, id: course.id %}{% endcapture %}
+        
+        <a class="np-button np-button-wide" href="{{ course_path }}">
+          {% t shared.view %}
+        </a>
+        {% if course.has_to_restart? %}
+          {% include "course_version_outdated_popup", path: course_path %}
+        {% endif %}
+        {% if course.properties.course_time != "none" %}
+          <div class="course-time">{{course.properties.course_time}} min</div>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course_new_styles.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course_new_styles.html.liquid
new file mode 100644
index 00000000..f9bbf7e5
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course_new_styles.html.liquid	
@@ -0,0 +1,47 @@
+{% capture course_path %}{% route course, id: course.id %}{% endcapture %}
+<a class="np-card card-vertical np-card-new-styles" href="{{course_path}}">
+  <div class="np-card-container">
+    {% if course.ribbon %}
+      <div class="np-card-ribbon">
+        {{ course.ribbon }}
+      </div>
+    {% endif %}
+    <img
+      class="np-card-image"
+      alt="{{ course.name }}"
+      src="{{ course.image_url }}"
+    >
+    <div class="np-card-content np-card-content-vertical np-card-padding">
+      <h3 class="np-card-content-title">
+        {{ course.name }}
+      </h3>
+      <div class="np-card-content-short-description">
+        {{ course.short_description }}
+      </div>
+      <div class="np-card-content-subtitle">
+        {{ course.instructor_names }}
+      </div>
+      <div class="np-card-content-footer">
+      {% if course.started? %}
+        <div class="np-card-content-progress">
+          <span style="margin-bottom:-30px">{{ course.progress }}%</span> <span class="course-completion">Complete</span>
+        </div>
+      {% else %}
+        <div class="np-card-content-progress notstarted">
+          Not started
+        </div>
+      {% endif %}
+   
+        {% if course.has_to_restart? %}
+          {% include "course_version_outdated_popup", path: course_path %}
+        {% endif %}
+        {% if course.properties.course_time != "none" %}
+          <div class="course-time">{{course.properties.course_time}} min</div>
+        {% endif %}
+        {% comment %} <a class="np-button np-button-wide" href="{{ course_path }}">
+          {% t shared.view %}
+        </a> {% endcomment %}
+      </div>
+    </div>
+  </div>
+</a>
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course_videos.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course_videos.html.liquid
new file mode 100644
index 00000000..259a143d
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_course_videos.html.liquid	
@@ -0,0 +1,27 @@
+{% capture course_path %}{% route course, id: course.id %}{% endcapture %}
+<a class="np-card card-vertical np-card-new-styles video-card" href="{{course_path}}">
+  <div class="np-card-container">
+    {% if course.ribbon %}
+      <div class="np-card-ribbon">
+        {{ course.ribbon }}
+      </div>
+    {% endif %}
+    <div class="img-wrapper">
+        <img class="np-card-image" alt="{{ course.name }}" src="{{ course.image_url }}">
+        <i class="fas fa-play"></i>
+    </div>
+    <div class="np-card-content np-card-content-vertical np-card-padding">
+      <h3 class="np-card-content-title">
+        {{ course.name }}
+      </h3>
+      <div class="np-card-content-short-description">
+        {{ course.short_description }}
+      </div>
+      <div class="np-card-content-footer">
+        {% if course.properties.course_length != "none" %}
+          <div class="course-length">{{course.properties.course_length}}</div>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+</a>
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_cards_learning_path.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_learning_path.html.liquid
similarity index 88%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_cards_learning_path.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_learning_path.html.liquid
index aad780fe..a1b88b8e 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_cards_learning_path.html.liquid	
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_learning_path.html.liquid	
@@ -29,10 +29,6 @@
 {% else %}
 {% assign lp_progress = 0 %}
 {% endif %}
-{% comment %} 
-{% for group in current_person.groups %}
-    {{group.id}}
-{% endfor %}  {% endcomment %}
 
 
 <div class="np-card np-no-horizontal-padding">
@@ -70,11 +66,11 @@
           </div>
 
           {% if lp_progress > 0 %}
-          <div class="np-card-content-progress np-button-color">
-            <p style="margin-bottom:-25px">{{ lp_progress }}%</p> <p class="course-completion" style="margin-left:25px"><span>Complete</span></p>
+          <div class="np-card-content-progress np-button-color np-hidden-mobile">
+            {{ lp_progress }}%&nbsp;<span class="course-completion">Complete</span>
           </div>
           {% else %}
-            <div class="np-card-content-progress np-button-color">
+            <div class="np-card-content-progress np-button-color notstarted np-hidden-mobile">
               Not started
             </div>
           {% endif %}
@@ -88,19 +84,16 @@
 
           <div class="np-card-content-footer">
             <div class="np-hidden-desktop np-card-content-progress
-            np-button-color">
+            np-button-color notstarted">
               {% t shared.progress, count: lp_progress %}
             </div>
             <a class="np-button lp" href="{% route learning_path, id: learning_path.id %}">
               {% t shared.view %}
             </a>
-            <div class="points np-learning-path-items-count">
-              {% comment %} Points: 2500  {% endcomment %}
-            </div>
             <span class="np-hidden-mobile np-learning-path-items">
               <i class="np-button-color np-learning-path-items-icon far fa-graduation-cap"></i>
               <span class="np-learning-path-items-count">
-                {{ learning_path.items.count }} {% t .items %}
+                {{ learning_path.items.count }} <div class="learning-path-items-definition" style="display: inline-flex;">{% t .items %}</div>
               </span>
             </span>
           </div>
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_learning_path_new_styles.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_learning_path_new_styles.html.liquid
new file mode 100644
index 00000000..a10ad51d
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_learning_path_new_styles.html.liquid	
@@ -0,0 +1,112 @@
+{%comment%}{% if learning_path.progress == 0%}
+  {% assign wrapperClassBar =  "np-button-background-color np-card-progress-bar red-bar"%}
+  {% assign wrapperClassText =  "np-card-content-progress np-button-color red-text"%}
+  {% assign wrapperClassStatus =  "np-card-content-progress np-button-color red-text"%}
+{% else if learning_path.progress > 0 and learning_path.progress < 100%}
+  {% assign wrapperClassBar =  "np-button-background-color np-card-progress-bar yellow-bar"%}
+  {% assign wrapperClassText =  "np-card-content-progress np-button-color yellow-text"%}
+  {% assign wrapperClassStatus =  "np-card-content-progress np-button-color yellow-text"%}
+{% else %}
+  {% assign wrapperClassBar =  "np-button-background-color np-card-progress-bar green-bar"%}
+  {% assign wrapperClassText =  "np-card-content-progress np-button-color green-text"%}
+  {% assign wrapperClassStatus =  "np-card-content-progress np-button-color green-text"%}
+{% endif %}{%endcomment%}
+
+{% comment %} 
+{% assign lp_progress = 0 %}
+{% if learning_path.enrolled? %}
+  {% assign lp_courses_count = 0 | times: 1 %}
+  {% assign sum_of_progress = 0.0 | times: 1 %}
+  
+  {% for item in learning_path.items %}
+    {% if item.course? %}
+      {% assign lp_courses_count = lp_courses_count | plus: 1 %}
+      {% assign sum_of_progress = sum_of_progress | plus: item.progress %}
+    {% endif %}
+  {% endfor %}
+
+  {% if lp_courses_count == 0 %}
+    {% assign lp_progress = 0 %}
+  {% else %}
+    {% assign lp_progress = sum_of_progress | divided_by: lp_courses_count | round %}
+  {% endif %}
+{% else %}
+  {% assign lp_progress = 0 %}
+{% endif %} {% endcomment %}
+
+<div class="np-card np-no-horizontal-padding learning-path-new-styles">
+  <div class="np-card-container">
+    <div class="np-learning-path">
+      <img
+        alt="{{ learning_path.name }}"
+        class="np-card-image np-learning-path-image"
+        src="{{ learning_path.image_url }}"
+      />
+      <div class="np-card-text-wrapper">
+        <div class="np-hidden-desktop np-card-header">
+          <i class="np-card-header-icon far fa-road"></i>
+          <div class="np-card-header-type">{% t shared.learning_path.title %}</div>
+          <div class="np-hidden-desktop  np-card-header-items-count">
+            {{ learning_path.items.count }} {% t .items %}
+          </div>
+        </div>
+        <div class="np-hidden-mobile np-card-header">
+          <div class="np-card-header-type">{% t shared.learning_path.title %}</div>
+          <i class="np-card-header-icon far fa-road"></i>
+        </div>
+
+        <div class="np-card-content np-card-padding np-card-content-vertical">
+          <h3 class="np-card-content-title">
+            {{ learning_path.name }}
+          </h3>
+
+          <div class="np-card-content-subtitle">
+            {{ learning_path.instructor_names }}
+          </div>
+
+          <div class="np-hidden-mobile np-card-content-description">
+            {{ learning_path.description }}
+          </div>
+
+          {% comment %} {% if lp_progress > 0 %}
+          <div class="np-card-content-progress np-button-color">
+            <p style="margin-bottom:-25px">{{ lp_progress }}%</p> 
+            <p class="course-completion" style="margin-left:25px"><span>Complete</span></p>
+          </div>
+          {% else %}
+            <div class="np-card-content-progress np-button-color">
+              Not started
+            </div>
+          {% endif %} {% endcomment %}
+
+          {% comment %} <div class="np-hidden-mobile np-card-progress-bar-container">
+            <div
+              style="width: {{lp_progress}}%;"
+              class="np-button-background-color np-card-progress-bar">
+            </div>
+          </div> {% endcomment %}
+
+          <div class="np-card-content-footer">
+            {% comment %} <div class="np-hidden-desktop np-card-content-progress
+            np-button-color">
+              {% t shared.progress, count: lp_progress %}
+            </div> {% endcomment %}
+            <a class="np-button lp" href="{% route learning_path, id: learning_path.id %}">
+              {% t shared.view %}
+            </a>
+            <span class="np-hidden-mobile np-learning-path-items">
+              {% comment %} <i class="np-button-color np-learning-path-items-icon far fa-graduation-cap"></i> {% endcomment %}
+              <span class="np-learning-path-items-count">
+                {{ learning_path.items.count }} Items
+              </span>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="np-card-stack">
+    <div class="np-card-stack-level-1"></div>
+    <div class="np-card-stack-level-2"></div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_learning_path_vertical.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_learning_path_vertical.html.liquid
new file mode 100644
index 00000000..09751e5a
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_learning_path_vertical.html.liquid	
@@ -0,0 +1,33 @@
+<a class="np-card card-vertical np-card-new-styles" href="{% route learning_path, id: learning_path.id %}">
+  <div class="np-card-container">   
+    <img
+      class="np-card-image"
+      alt="{{ learning_path.name }}"
+      src="{{ learning_path.image_url }}"
+    >
+    <div class="np-card-content np-card-content-vertical np-card-padding">
+      <h3 class="np-card-content-title">
+        {{ learning_path.name }}
+      </h3>
+      <div class="np-card-content-subtitle">
+        {{ learning_path.instructor_names }}
+      </div>
+      <div class="np-card-content-footer">
+      {% if learning_path.started? %}
+        <div class="np-card-content-progress">
+          <span style="margin-bottom:-30px">{{ learning_path.progress }}%</span> <span class="course-completion">Complete</span>
+        </div>
+      {% else %}
+        <div class="np-card-content-progress notstarted">
+          Not started
+        </div>
+      {% endif %}
+      <div class="course-length"> {{ learning_path.items.count }} Courses</div>
+      </div>
+    </div>
+  </div>
+  <div class="np-card-stack">
+    <div class="np-card-stack-level-1"></div>
+    <div class="np-card-stack-level-2"></div>
+  </div>
+</a>
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_cards_training_event.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_training_event.html.liquid
similarity index 96%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_cards_training_event.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_training_event.html.liquid
index 1176157e..277e1279 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_cards_training_event.html.liquid	
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_training_event.html.liquid	
@@ -2,7 +2,7 @@
   <div class="np-card-container">
     <div class="np-card-content-training-event">
       <h3 class="np-card-content-title">
-        {{ training_event.title }}
+        {{ training_event.title | remove: "[FEATURED]" }}
       </h3>
       <div class="np-card-content-subtitle">
         {% t shared.event_types, key: training_event.event_type %}
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_training_event_horizontal.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_training_event_horizontal.html.liquid
new file mode 100644
index 00000000..a5bff4aa
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_cards_training_event_horizontal.html.liquid	
@@ -0,0 +1,41 @@
+{% assign session_id = training_event.sessions.first.id %}
+{% assign session_month = training_event.sessions.first.abbreviated_month %}
+{% assign session_day = training_event.sessions.first.day %}
+{% for session in training_event.sessions %}
+  {% if session.registered? %}
+    {% assign session_id = session.id %}
+    {% assign session_month = session.abbreviated_month %}
+    {% assign session_day = session.day %}
+  {% endif %}
+{% endfor %}
+
+<div class="np-card card-training-event-horizontal">
+  <div class="np-card-container">
+    <div class="upcoming-date">
+      {% comment %} <i class="fal fa-calendar"></i> {% endcomment %}
+      <div class="np-card-training-session-date-month">
+        {{ session_month }}
+      </div>
+      <div class="np-card-training-session-date-day">
+        {{ session_day }}
+      </div>
+    </div>
+    <div class="np-card-content np-card-content-vertical np-card-padding">
+      <h3 class="np-card-content-title">
+        {{ training_event.title | remove: "[FEATURED]" }}
+      </h3>
+      <div class="np-card-content-time">
+        {{ training_event.sessions.first.starts }} {{ training_event.sessions.first.time_zone }}
+      </div>
+      <div class="flex-content card-footer">
+        <a
+          class="np-button np-button-wide"
+          href="{% route training_session, id: session_id %}"
+        >
+          {% t shared.view %}
+        </a>
+        {{ training_event.sessions.size }} Session{% if training_event.sessions.size > 1 %}s{% endif %}
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_catalog_filters.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_catalog_filters.html.liquid
new file mode 100644
index 00000000..bfc4c746
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_catalog_filters.html.liquid	
@@ -0,0 +1,182 @@
+{% assign role_filters = "GENERAL MANAGER, INVENTORY/GUEST SERVICES MANAGER, SCHEDULING MANAGER, SHIFT MANAGER, MANAGER TRAINEE, SUPERVISOR, ORG ADMIN/BACK OFFICE ADMIN, OWNER OPERATOR, CREW TRAINER" %}
+{% assign topic_filters = "WORKFORCE MANAGEMENT, MANAGING THE SCHEDULE, AUTO-GENERATED SCHEDULES, SCHEDULING BASICS, FAIR WORKWEEK SCHEDULING, PUBLISHING SCHEDULES, TIMECLOCKS & TIMEKEEPING, TEAM REQUESTS, LOCATING EMPLOYEES, EMPLOYEE RECORDS, PERFORMANCE REVIEWS, PROJECTING, PAYROLL & REPORTING" %}
+
+<div class="catalog-filters">
+  <div class="filter-wrapper">
+    <i class="fa fa-chevron-left close-tray np-hidden-desktop"></i>
+    <div id="clearAll">Clear All</div>
+  </div>
+ <div class="filter-group">
+    <div class="filter-group-name">Role</div>
+    {% for category in categories.in_catalog %}
+      {% assign category_name_upcase = category.name | upcase %}
+      {% if role_filters contains category_name_upcase %}
+        <label class="checkbox-container">{{category.name}}
+          <input type="checkbox" name="{{category_name_upcase}}">
+          <span class="checkmark"></span>
+        </label>
+      {% endif %}
+    {% endfor %}
+  </div> 
+
+  <div class="filter-group">
+    <div class="filter-group-name">Topic</div>
+    {% for category in categories.in_catalog %}
+      {% assign category_name_upcase = category.name | upcase %}
+      {% if topic_filters contains category_name_upcase %}
+        <label class="checkbox-container">{{category.name}}
+          <input type="checkbox" name="{{category_name_upcase}}">
+          <span class="checkmark"></span>
+        </label>
+      {% endif %}
+    {% endfor %}
+
+
+  <div class="filter-group">
+    <div class="filter-group-name">Content Type</div>
+          <label class="checkbox-container">Learning Gems
+      <input type="checkbox" name="LEARNING GEMS">
+      <span class="checkmark"></span>
+    </label>
+    <label class="checkbox-container">New Content
+      <input type="checkbox" name="NEW">
+      <span class="checkmark"></span>
+    </label>
+    <label class="checkbox-container">Updated Content
+      <input type="checkbox" name="UPDATED">
+      <span class="checkmark"></span>
+    </label>
+    <label class="checkbox-container">Completed Content
+      <input type="checkbox" name="COMPLETED">
+      <span class="checkmark"></span>
+    </label>
+    <label class="checkbox-container">Learning Paths
+      <input type="checkbox" name="LEARNING-PATH">
+      <span class="checkmark"></span>
+    </label>
+</div>
+  </div>
+
+
+
+<style>
+  .catalog-filters {
+    box-shadow: 0 10px 25px 0 rgb(14 27 46 / 18%);
+    padding: 24px;
+    position: fixed;
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    z-index: 300;
+    background: #fff;
+    border-top-left-radius: 30px;
+    border-top-right-radius: 30px;
+    transform: translateX(-1000px);
+    transition: all 0.3s;
+    height: 60vh;
+    overflow: scroll;
+  }
+
+  .catalog-filters.show {
+    transform: translateX(0);
+  }
+
+  .close-tray {
+    color:#0088dd;
+    font-size: 22px;
+  }
+
+  .filter-wrapper {
+    display:flex;
+    justify-content:space-between;
+  }
+
+  #clearAll {
+    color:#0088DD;
+    display: block;
+    cursor: pointer;
+  }
+
+  .filter-group .filter-group-name {
+    margin: 22px 0 16px;
+    color: #000;
+    font-weight: 700;
+    font-size: 22px;
+  }
+
+  .checkbox-container {
+    display: block;
+    position: relative;
+    padding-left: 35px;
+    margin-bottom: 20px;
+    cursor: pointer;
+    font-size: 16px;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+  }
+
+  .checkbox-container input {
+    position: absolute;
+    opacity: 0;
+    cursor: pointer;
+    height: 0;
+    width: 0;
+  }
+
+  .checkbox-container .checkmark {
+    position: absolute;
+    top: -4px;
+    left: 0;
+    height: 25px;
+    width: 25px;
+    border: 3px solid #00E79A;
+    border-radius: 50%;
+    background-color: #fff;
+  }
+
+  .checkbox-container input:checked ~ .checkmark {
+    background-color: #00E79A;
+  }
+
+  .checkbox-container .checkmark:after {
+    content: "";
+    position: absolute;
+    display: none;
+  }
+
+  .checkbox-container input:checked ~ .checkmark:after {
+    display: block;
+  }
+
+  .checkbox-container .checkmark:after {
+    left: 6px;
+    top: 2px;
+    width: 5px;
+    height: 10px;
+    border: solid white;
+    border-width: 0 3px 3px 0;
+    -webkit-transform: rotate(45deg);
+    -ms-transform: rotate(45deg);
+    transform: rotate(45deg);
+  }
+
+  @media (min-width:768px) {
+    .catalog-filters {
+      margin-right:32px;
+      padding: 20px;
+      position: static;
+      width: auto;
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+      transform: translateX(0);
+      height: auto;
+      overflow: unset;
+    }
+
+    .filter-wrapper {
+      justify-content:flex-end;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_certificates_info_column.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_certificates_info_column.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_certificates_info_column.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_certificates_info_column.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_certificates_metadata.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_certificates_metadata.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_certificates_metadata.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_certificates_metadata.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_certificates_preview.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_certificates_preview.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_certificates_preview.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_certificates_preview.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_certificates_top_bar.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_certificates_top_bar.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_certificates_top_bar.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_certificates_top_bar.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_certificates_verification.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_certificates_verification.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_certificates_verification.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_certificates_verification.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_contact_us_block.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_contact_us_block.html.liquid
new file mode 100644
index 00000000..9f41e34c
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_contact_us_block.html.liquid	
@@ -0,0 +1,46 @@
+<div class="contact-us-block">
+  <div class="contact-us-block-content">
+   <div class="contact-us-block-title">Need More Help?</div>
+   <div class="contact-us-block-subtitle">Contact ATOS at:
+1-800-515-3636</div>
+   {% comment %}<a class="np-button contact-us-block-cta" href="tel:18005153636" target="_blank">Contact Us</a> {% endcomment %}
+  </div>  
+</div>
+
+<style>
+
+  .contact-us-block {
+    background-color:#f8fbff;
+    padding:64px 24px;
+  }
+
+  .contact-us-block-content {
+    box-shadow: 0 10px 25px 0 rgb(14 27 46 / 18%);
+    padding:32px 16px;
+    max-width: 700px;
+    margin: auto;
+    text-align: center;
+    background:#fff;
+  }
+
+  .contact-us-block-title {
+    font-weight:900;
+    font-size: 18px;
+    margin-bottom: 24px;
+  }
+
+  .contact-us-block-cta {
+    margin-top:24px;
+  }
+
+  @media (min-width:768px) {
+    .contact-us-block {
+      padding:80px 24px;
+
+    }
+
+    .contact-us-block-title {
+      font-size: 28px;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_course_activity_locked.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_activity_locked.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_course_activity_locked.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_activity_locked.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_course_activity_unlocked.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_activity_unlocked.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_course_activity_unlocked.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_activity_unlocked.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_course_categories.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_categories.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_course_categories.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_categories.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_course_description.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_description.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_course_description.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_description.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_course_desktop_view.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_desktop_view.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_course_desktop_view.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_desktop_view.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_course_events.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_events.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_course_events.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_events.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_course_header.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_header.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_course_header.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_header.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_course_instructors.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_instructors.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_course_instructors.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_instructors.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_course_mobile_view.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_mobile_view.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_course_mobile_view.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_mobile_view.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_course_outline.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_outline.html.liquid
similarity index 72%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_course_outline.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_outline.html.liquid
index fce14737..972208b9 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_course_outline.html.liquid	
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_outline.html.liquid	
@@ -1,41 +1,16 @@
+{% assign outline_class = "" %}
+{% if course.name == "Getting Started with Workforce Management" or course.name == "Getting Started with Talent Acquisition" %}
+{% assign outline_class = "np-hidden" %}
+{% endif %}
+
 <script src="https://kit.fontawesome.com/41a3aee3ad.js" crossorigin="anonymous"></script>
-<div class="np-course-outline">
+<div class="np-course-outline {{outline_class}}">
   <div class="np-text-title np-course-outline-title">
     {% t .header, key: current_school.course_vocabulary %}
   </div>
   <div class="np-course-outline-content">
     <ol class="np-course-outline-content-section">
       {% for section in course.sections %}
-        {% comment %}<li class="np-course-outline-content-section-list">
-          <div class="np-course-outline-content-section-name np-text-title-bold np-text-title-bold">
-            {{ section.name }}
-          </div>
-          <ol class="np-course-outline-content-activity">
-            {% for activity in section.activities %}
-
-              <li class="np-course-outline-content-activity-list" >
-                {% if activity.completed? %}
-                  <i class="fas fa-circle np-course-outline-content-activity-icon np-button-color" style="color: green; font-weight: 900"></i>
-                  {% if activity.locked? %}
-                    {% include "course_activity_locked" %}
-                  {% else %}
-                    {% include "course_activity_unlocked", class: "np-course-outline-content-activity-link-completed" %}
-                  {% endif %}
-                  <div class="np-course-outline-content-activity-list-bar" style="background: green"></div>
-                  <div class="np-button-background-color np-course-outline-content-activity-list-bar" style="color: green"></div>
-                {% else %}
-                  <i class="far fa-circle np-course-outline-content-activity-icon" style="color: red; font-weight: 900"></i>
-                  {% if activity.locked? %}
-                    {% include "course_activity_locked" %}
-                  {% else %}
-                    {% include "course_activity_unlocked", class: "np-course-outline-content-activity-link" %}
-                  {% endif %}
-                  <div class="np-course-outline-content-activity-list-bar" style="background: red"></div>
-                {% endif %}
-              </li>
-            {% endfor %}
-          </ol>
-        </li>{% endcomment %}
         <div class="np-accordion">
           <div class="accordion-btn">
               <i class="fal fa-plus"></i>
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_course_progress_and_cta.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_progress_and_cta.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_course_progress_and_cta.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_progress_and_cta.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_course_version_outdated_alert.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_version_outdated_alert.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_course_version_outdated_alert.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_version_outdated_alert.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_course_version_outdated_popup.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_version_outdated_popup.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_course_version_outdated_popup.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_course_version_outdated_popup.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_courses_catalog.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_courses_catalog.html.liquid
new file mode 100644
index 00000000..e727cfdc
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_courses_catalog.html.liquid	
@@ -0,0 +1,55 @@
+
+<div class="np-catalog-courses row row-with-thumbnails">
+  {% if courses.in_catalog.any? %}
+    {% for course in courses.in_catalog %}
+      {% assign course_categories = "" %}
+        {% for cat in course.categories %}
+          {% assign course_categories = course_categories | append: " " | append: cat.name  %}
+        {% endfor %}
+        {% assign progress = "NOT-STARTED" %}
+        {% if course.progress > 0 and course.progress < 100 %}
+          {% assign progress = "IN-PROGRESS" %}
+        {% elsif course.progress == 100 %}
+          {% assign progress = "COMPLETED" %}
+        {% endif %}
+
+        {% assign ribbon = "" %}
+        {% assign course_ribbon = course.ribbon | upcase %}
+
+        {% if course_ribbon contains "UPDATED" %}
+          {% assign ribbon = "UPDATED" %}
+        {% elsif course_ribbon contains "NEW" %}
+          {% assign ribbon = "NEW" %}
+        {% endif %}
+
+        <div 
+          class="col-xs-12 col-md-6 col-lg-4 np-stretch-content catalog-item" 
+          data-filters="{{course_categories | upcase | strip}} {{progress}} {{ribbon}}"
+        >
+          {% include "cards_course_new_styles" with course %}
+        </div>
+    {% endfor %}
+  {% endif %}
+
+  {% for learning_path in learning_paths.available %}
+    {% assign lp_categories = "" %}
+    {% for cat in learning_path.categories %}
+      {% assign lp_categories = lp_categories | append: " " | append: cat.name  %}
+    {% endfor %}
+    {% assign lp_progress = "NOT-STARTED" %}
+    {% if learning_path.progress > 0 and learning_path.progress < 100 %}
+      {% assign lp_progress = "IN-PROGRESS" %}
+    {% elsif learning_path.progress == 100 %}
+      {% assign lp_progress = "COMPLETED" %}
+    {% endif %}
+    <div 
+      class="col-xs-12 col-md-6 col-lg-4 np-stretch-content catalog-item" 
+      data-filters="LEARNING-PATH {{lp_categories | upcase | strip}}"
+    >
+      {% include "cards_learning_path_vertical" with learning_path %}
+      
+    </div>
+  {% endfor %}
+</div>
+
+
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_courses_index.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_courses_index.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_courses_index.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_courses_index.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_courses_zero_state.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_courses_zero_state.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_courses_zero_state.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_courses_zero_state.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_dashboard_courses_block.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_dashboard_courses_block.html.liquid
new file mode 100644
index 00000000..0d1614ab
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_dashboard_courses_block.html.liquid	
@@ -0,0 +1,111 @@
+<div class="courses-wrapper filterable-section active" data-type='courses'>
+  {% if courses.enrolled.any? %}
+    <div class="row courses-in-progress show">
+      <div class="col-xs-12">
+        <div class="row">
+          <div class="col-xs-12 col-md-7 small-heading" id="courses-in-progress-header">In Progress</div>
+          <div class="col-xs-5 col-lg-3 col-lg-offset-2 np-hidden-mobile small-heading progress-heading" id="courses-in-progress-header-2">My Progress</div>
+        </div>
+      </div>
+
+      <div class="col-xs-12">
+        {% assign num_of_in_progress_courses = 0 %}
+        {% for course in enrolled_courses %}
+          {% if course.progress < 100 %}
+            <div class="row dashboard-courses-row" data-status="in-progress" style="display:none">
+              <div class="col-xs-12 col-md-7">
+                {% include "cards_course_horizontal" with course %}
+              </div>
+
+              <div class="col-xs-12 col-md-5 col-lg-3 col-lg-offset-2 np-hidden-mobile">
+                <div class="course-progress-wrapper">
+                  {% 
+                    include "progress_circle", 
+                    name: course.id,
+                    count: course.progress, 
+                    total: 100,
+                    size: "120",
+                    stroke_color: "#02AB73",
+                    stroke_color_bg: "rgba(255, 255, 255)" 
+                  %}
+                </div>          
+              </div>
+            </div>
+            {% assign num_of_in_progress_courses = num_of_in_progress_courses | plus: 1 %}
+          {% endif %}
+        {% endfor %}
+
+        {% if num_of_in_progress_courses > 6 %}
+          <div id="showMoreInProgressCourses" class="show-more-button">View All Courses</div>
+        {% endif %}
+
+        {% if num_of_in_progress_courses == 0 %}
+          <div class="col-xs-12 dashboard-zero-state">
+            {% capture message %}
+              You don't have any courses currently in progress
+            {% endcapture %}
+            {% include "courses_zero_state", message: message %}
+          </div>
+        {% endif %}
+      </div>
+    </div>
+
+    {% comment %} COMPLETED COURSES  {% endcomment %}
+    <div class="row courses-completed">
+      <div class="col-xs-12">
+        <div class="row">
+          <div class="col-xs-12 col-md-7 small-heading" id="courses-in-progress-header">Completed</div>
+          <div class="col-xs-5 col-lg-3 col-lg-offset-2 np-hidden-mobile small-heading" id="courses-in-progress-header-2">Completion status</div>
+        </div>
+      </div>
+
+      <div class="col-xs-12">
+        {% assign num_of_completed_courses = 0 %}
+        {% for course in enrolled_courses %}
+          {% if course.progress == 100 %}
+            <div class="row dashboard-courses-row" style="display:none">
+              <div class="col-xs-12 col-md-7">
+                {% include "cards_course_horizontal" with course %}
+              </div>
+
+              <div class="col-xs-12 col-md-5 col-lg-3 col-lg-offset-2 np-hidden-mobile">
+                <div class="course-progress-wrapper">
+                  {% 
+                    include "progress_circle", 
+                    name: course.id,
+                    count: course.progress, 
+                    total: 100,
+                    size: "120",
+                    stroke_color: "#02AB73",
+                    stroke_color_bg: "rgba(255, 255, 255)" 
+                  %}
+                </div>          
+              </div>
+            </div>
+            {% assign num_of_completed_courses = num_of_completed_courses | plus: 1 %}
+          {% endif %}
+        {% endfor %}
+
+        {% if num_of_completed_courses > 6 %}
+          <div class="show-more-button" id="showMoreCompletedCourses">View All Completed Courses</div>
+        {% endif %}
+
+        {% if num_of_completed_courses == 0 %}
+          <div class="col-xs-12 dashboard-zero-state">
+            {% capture message %}
+              You haven't completed any courses yet
+            {% endcapture %}
+            {% include "courses_zero_state", message: message %}
+          </div>
+        {% endif %}
+      </div>
+    </div>
+  {% else %}
+    {% capture message %}
+      {% t shared.zero_state.courses.index,
+        key: current_school.course_vocabulary
+      %}
+    {% endcapture %}
+    {% include "courses_zero_state", message: message %}
+  {% endif %}
+</div>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_dashboard_lps_block.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_dashboard_lps_block.html.liquid
new file mode 100644
index 00000000..3d848264
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_dashboard_lps_block.html.liquid	
@@ -0,0 +1,178 @@
+{% if features.learning_paths? %}
+  <div class="learning-paths-wrapper filterable-section" data-type="learning-paths">
+    <div class="row lps-in-progress show">
+      <div class="col-xs-12">
+        <div class="row">
+          <div class="col-xs-12 col-md-7 small-heading" id="courses-in-progress-header">In Progress</div>
+          <div class="col-xs-5 col-lg-3 col-lg-offset-2 np-hidden-mobile small-heading" id="courses-in-progress-header-2">My Progress</div>
+        </div>
+      </div>
+
+      <div class="col-xs-12">
+        {% assign num_of_in_progress_lps = 0 %}
+        {% for learning_path in items %}
+          {% assign lp_progress = 0 %}
+          {% if learning_path.enrolled? %}
+            {% assign lp_courses_count = 0 | times: 1 %}
+            {% assign sum_of_progress = 0.0 | times: 1 %}
+            
+            {% for item in learning_path.items %}
+              {% if item.course? %}
+                {% assign lp_courses_count = lp_courses_count | plus: 1 %}
+                {% assign sum_of_progress = sum_of_progress | plus: item.progress %}
+              {% endif %}
+            {% endfor %}
+
+            {% if lp_courses_count == 0 %}
+              {% assign lp_progress = 0 %}
+            {% else %}
+              {% assign lp_progress = sum_of_progress | divided_by: lp_courses_count | round %}
+            {% endif %}
+          {% else %}
+            {% assign lp_progress = 0 %}
+          {% endif %}
+         
+          {% if lp_progress < 100 %}
+            <div class="row dashboard-learning-paths-row active" data-status="in-progress" style="display:none">
+              <div class="col-xs-12 col-md-7">
+                {% include "cards_learning_path_new_styles" with learning_path %}
+              </div>
+
+              <div class="col-xs-12 col-md-5 col-lg-3 col-lg-offset-2 np-hidden-mobile">
+                <div class="course-progress-wrapper">
+                  {% 
+                    include "progress_circle", 
+                    name: learning_path.id,
+                    count: lp_progress, 
+                    total: 100,
+                    size: "120",
+                    stroke_color: "#02AB73",
+                    stroke_color_bg: "rgba(255, 255, 255)" 
+                  %}
+                </div>          
+              </div>
+            </div>
+            {% assign num_of_in_progress_lps = num_of_in_progress_lps | plus: 1 %}
+          {% endif %}
+        {% endfor %}
+
+        {% if num_of_in_progress_lps > 6 %}
+          <div id="showMoreInProgressLps" class="show-more-button">View All Learning Paths</div>
+        {% endif %}
+
+        {% if num_of_in_progress_lps == 0 %}
+          <div class="col-xs-12 dashboard-zero-state">
+            {% capture message %}
+              You don't have any learning paths currently in progress.
+            {% endcapture %}
+            {% include "courses_zero_state", message: message %}
+          </div>
+        {% endif %}
+      </div>
+    </div>
+
+    <div class="row lps-completed">
+      <div class="col-xs-12">
+        <div class="row">
+          <div class="col-xs-12 col-md-7 small-heading" id="lps-completed-header">Completed</div>
+          <div class="col-xs-5 col-lg-3 col-lg-offset-2 np-hidden-mobile small-heading" id="lps-completed-header-2">Completion Status</div>
+        </div>
+      </div>
+
+      <div class="col-xs-12">
+        {% assign num_of_completed_lps = 0 %}
+        {% for learning_path in items %}
+          {% assign lp_progress = 0 %}
+          {% if learning_path.enrolled? %}
+            {% assign lp_courses_count = 0 | times: 1 %}
+            {% assign sum_of_progress = 0.0 | times: 1 %}
+            
+            {% for item in learning_path.items %}
+              {% if item.course? %}
+                {% assign lp_courses_count = lp_courses_count | plus: 1 %}
+                {% assign sum_of_progress = sum_of_progress | plus: item.progress %}
+              {% endif %}
+            {% endfor %}
+
+            {% if lp_courses_count == 0 %}
+              {% assign lp_progress = 0 %}
+            {% else %}
+              {% assign lp_progress = sum_of_progress | divided_by: lp_courses_count | round %}
+            {% endif %}
+          {% else %}
+            {% assign lp_progress = 0 %}
+          {% endif %}
+
+          {% if lp_progress == 100 %}
+            <div class="row dashboard-learning-paths-row" data-status="completed" style="display:none">
+              <div class="col-xs-12 col-md-7">
+                {% include "cards_learning_path_new_styles" with learning_path %}
+              </div>
+
+              <div class="col-xs-12 col-md-5 col-lg-3 col-lg-offset-2 np-hidden-mobile">
+                <div class="course-progress-wrapper">
+                  {% 
+                    include "progress_circle", 
+                    name: learning_path.id,
+                    count: lp_progress, 
+                    total: 100,
+                    size: "120",
+                    stroke_color: "#02AB73",
+                    stroke_color_bg: "rgba(255, 255, 255)" 
+                  %}
+                </div>          
+              </div>
+            </div>
+            {% assign num_of_completed_lps = num_of_completed_lps | plus: 1 %}
+          {% endif %}
+        {% endfor %}
+
+        {% if num_of_completed_lps > 6 %}
+          <div id="showMoreCompletedLps" class="show-more-button">View All Completed Learning Paths</div>
+        {% endif %}
+
+        {% if num_of_completed_lps == 0 %}
+          <div class="col-xs-12 dashboard-zero-state">
+            {% capture message %}
+              You haven't completed any learning paths
+            {% endcapture %}
+            {% include "courses_zero_state", message: message %}
+          </div>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+{% endif %}
+
+{% comment %} <script>
+console.log("working")
+console.log($(".lps-in-progress .dashboard-learning-paths-row").length)
+window.onload = function () {
+  console.log($(".lps-in-progress .dashboard-learning-paths-row").length)
+    progress_lps_size_li =  $(".lps-in-progress .dashboard-learning-paths-row").length;
+    completed_lps_size_li = $(".lps-completed .dashboard-learning-paths-row").length;
+    j=3;
+
+    console.log(progress_lps_size_li)
+
+    $(`.lps-in-progress .dashboard-learning-paths-row:lt(${j})`).css('display', 'flex');   
+    $('#showMoreInProgressLps').click(function () {
+      j = progress_lps_size_li
+      $(`.lps-in-progress .dashboard-learning-paths-row:lt(${j}))`).css('display', 'flex');
+      if(x == progress_lps_size_li){
+        $('#showMoreInProgressLps').hide();
+      }
+    });
+
+    $(`.lps-completed .dashboard-learning-paths-row:lt(${j})`).css('display', 'flex');   
+    $('#showMoreCompletedLps').click(function () {
+      j = progress_lps_size_li
+      $(`.lps-completed .dashboard-learning-paths-row:lt(${j}))`).css('display', 'flex');
+      if(j == progress_lps_size_li){
+        $('#showMoreCompletedLps').hide();
+      }
+    });
+    
+};
+
+</script> {% endcomment %}
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_filter_checkbox.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_filter_checkbox.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_filter_checkbox.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_filter_checkbox.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_filter_dropdown.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_filter_dropdown.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_filter_dropdown.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_filter_dropdown.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_filter_select.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_filter_select.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_filter_select.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_filter_select.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_footer.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_footer.html.liquid
similarity index 87%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_footer.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_footer.html.liquid
index 4ac44fd3..6770fab5 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_footer.html.liquid	
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_footer.html.liquid	
@@ -4,6 +4,7 @@
       <div class="np-footer-navigation">
         <ul class="np-footer-navigation-list">
           {% for website_navigation in navigations.footer_navigations %}
+          {% if website_navigation.name !="Events" and website_navigation.name !="Learning Paths" %}
             <li class="np-footer-navigation-item">
               <a
                 class="{{ website_navigation.name }} np-footer-navigation-link np-button-color"
@@ -13,6 +14,7 @@
                 {{ website_navigation.name }}
               </a>
             </li>
+            {% endif %}
           {% endfor %}
         </ul>
       </div>
@@ -64,23 +66,18 @@
           {% t .need_help %}
         </div>
         <div class="np-footer-support-item np-footer-support-email">
-          {% comment %} {% t .email %} {% endcomment %}
-		  Contact ATOS at:
+          Call ATOS
         </div>
-		{% comment %}     <a
+        <a
           class="np-footer-support-item np-footer-support-link np-button-color"
-          href="mailto:{{ website_footer.school_customer_service_email }}"
-		  >
-		  {{ website_footer.school_customer_service_email }}
-		  {% endcomment %}
-		<a
-          class="np-footer-support-item np-footer-support-link np-button-color"
-		  href="tel:18005153636" >
-		  1-800-515-3636
+          href="tel:18005153636"
+        >
+          +1 800 515 3636
+        </a>
       </div>
     {% endif %}
   </div>
-{% if current_person.signed_in? %}
+{% if current_person.signed_in? %}  
   {% if current_person.properties.language == "es" %}
     {% include "spanish_lang" %}
   {% elsif current_person.properties.language == "fr" %}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_french_lang.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_french_lang.html.liquid
similarity index 91%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_french_lang.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_french_lang.html.liquid
index 85785a09..48f6f0ed 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_french_lang.html.liquid	
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_french_lang.html.liquid	
@@ -49,7 +49,10 @@
 .avatar-requirements,
 .radio__label.gravatar,
 .radio__label.custom,
-#desktop_upload_avatar
+#desktop_upload_avatar,
+.np-header-desktop-nav .np-header-desktop-nav-item:nth-child(1) .np-header-desktop-nav-link,
+.np-header-desktop-nav .np-header-desktop-nav-item:nth-child(2) .np-header-desktop-nav-link,
+.np-header-desktop-nav .np-header-desktop-nav-item:nth-child(3) .np-header-desktop-nav-link
 {
     text-indent: -9999999px;
 }
@@ -72,6 +75,33 @@
   content: "Se déconnecter";
 }
 
+.np-header-desktop-nav .np-header-desktop-nav-item:nth-child(1) .np-header-desktop-nav-link:after {
+  /* My Dashboard */
+  text-indent: 0;
+  line-height: 0;
+  margin-bottom:18px;
+  display: block;
+  content: "My Dashboard";
+}
+
+.np-header-desktop-nav .np-header-desktop-nav-item:nth-child(2) .np-header-desktop-nav-link:after {
+  /* Course Catalog */
+  text-indent: 0;
+  line-height: 0;
+  margin-bottom:18px;
+  display: block;
+  content: "Course Catalog";
+}
+
+.np-header-desktop-nav .np-header-desktop-nav-item:nth-child(3) .np-header-desktop-nav-link:after {
+  /* Training Events */
+  text-indent: 0;
+  line-height: 0;
+  margin-bottom:18px;
+  display: block;
+  content: "Training Events";
+}
+
 /* ACCOUNT */
 
 .radio__label.gravatar::after {
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_head.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_head.html.liquid
new file mode 100644
index 00000000..c2997749
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_head.html.liquid	
@@ -0,0 +1,16 @@
+{% styles default %}
+{% styles colors %}
+{% styles custom %}
+
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;500;700;800&display=swap" rel="stylesheet">
+
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tiny-slider/2.9.4/tiny-slider.css" integrity="sha512-eMxdaSf5XW3ZW1wZCrWItO2jZ7A9FhuZfjVdztr7ZsKNOmt6TUMTQgfpNoVRyfPE5S9BC0A4suXzsGSrAOWcoQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/tiny-slider/2.9.4/min/tiny-slider.js" integrity="sha512-j+F4W//4Pu39at5I8HC8q2l1BNz4OF3ju39HyWeqKQagW6ww3ZF9gFcu8rzUbyTDY7gEo/vqqzGte0UPpo65QQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.4/jquery.min.js" integrity="sha512-pumBsjNRGGqkPzKHndZMaAG+bir374sORyzM3uulLV14lN5LyykqNk8eEeUlUkB3U0M4FApyaHraT65ihJhDpQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+<script src="https://cdn.jsdelivr.net/npm/moment@2.29.4/moment.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment-timezone/0.5.33/moment-timezone-with-data.min.js"></script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_header.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_header.html.liquid
similarity index 58%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_header.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_header.html.liquid
index 7f484f80..72a2f654 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_header.html.liquid	
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_header.html.liquid	
@@ -1,27 +1,11 @@
-<header class="np-header np-header-color">
-  <div class="np-header-content">
-    <div class="np-hidden-desktop np-header-mobile-menu-nav">
-      {% if current_person.signed_in? %}
-        <button
-          data-toggle-class="np-hidden"
-          class="np-header-mobile-menu-nav-button fal fa-times np-hidden np-header-font-color"
-          data-toggle-target=".np-header-mobile-avatar-menu,
-          .np-header-mobile-menu-content, .np-main, .np-footer"
-        ></button>
-        <button
-          data-test="open-mobile-menu"
-          data-toggle-class="np-hidden"
-          class="np-header-mobile-menu-nav-button np-header-mobile-avatar-menu"
-          data-toggle-target=".fa-times, .np-header-mobile-menu-content, .np-main, .np-footer"
-        >
-          <img
-            alt="{{ current_person.name }}"
-            class="np-header-avatar-image"
-            src="{{ current_person.avatar_url }}"
-          />
-        </button>
-      {% endif %}
-    </div>
+
+  <script>
+    document.querySelector("body").classList.add("new-styles")
+  </script>
+
+<header class="np-header np-header-color new-header-styles">
+  <div class="np-header-content np-max-width">
+
     {% if current_school.logo_url %}
       <h1 class="np-header-logo">
         <a href="{% route home %}">
@@ -40,17 +24,24 @@
 
     <div class="np-hidden-mobile np-header-desktop-nav">
       <ul class="np-header-desktop-nav-list">
-        {% for website_navigation in navigations.header_navigations_external %}
-          <li class= "np-header-desktop-nav-item">
+
+          <li class= "np-header-desktop-nav-item videos-link">
             <a
-              href="{{ website_navigation.path }}"
+              href="/app/dashboard"
               class="np-header-desktop-nav-link np-header-font-color"
-              target="_blank"
             >
-              {{ website_navigation.name }}
+              My Dashboard
             </a>
           </li>
-        {% endfor %}
+          <li class= "np-header-desktop-nav-item videos-link">
+            <a
+              href="/app/catalog"
+              class="np-header-desktop-nav-link np-header-font-color"
+            >
+              Course Catalog
+            </a>
+          </li>
+
       </ul>
     </div>
 
@@ -58,34 +49,45 @@
       {% assign current_language = "English" %}
       {% if current_person.properties.language == "en" %}
         {% assign current_language = "English" %}
-      {% elsif current_person.properties.language == "ru" %}
-        {% assign current_language = "Pусский" %}
-      {% elsif current_person.properties.language == "ar" %}
-        {% assign current_language = "عربي" %}
-      {% elsif current_person.properties.language == "fr" %}
-        {% assign current_language = "Français" %}
+        {% assign current_language = "EN" %}
       {% elsif current_person.properties.language == "es" %}
         {% assign current_language = "Español" %}
+        {% assign current_language = "ES" %}
       {% endif %}
 
       <div class="dropdown">
-        <button onclick="myFunction()" class="dropbtn">{{current_language | upcase}}<i class="fas fa-arrow-alt-down" style="padding-left:5px"></i></button>
+        <button onclick="myFunction()" class="dropbtn">{{current_language | upcase}}
+        </button>
         <div id="myDropdown" class="dropdown-content">
             <a onclick="setLang('es')">Español</a>
             <hr class="divider">
             <a onclick="setLang('en')">English</a>
-            <!--<hr class="divider">
-            <a onclick="setLang('fr')">Français</a>
             <hr class="divider">
-            <a onclick="setLang('ru')">Pусский</a>
-            <hr class="divider">
-            <a onclick="setLang('ar')">عربي</a>-->
         </div>
       </div>
-            
     {% endif %}
 
+    <div class="np-hidden-desktop np-header-mobile-menu-nav">
+      {% if current_person.signed_in? %}
+        <button
+          data-toggle-class="np-hidden"
+          class="np-header-mobile-menu-nav-button fal fa-times np-hidden np-header-font-color"
+          data-toggle-target=".np-header-mobile-avatar-menu,
+          .np-header-mobile-menu-content, .np-main, .np-footer"
+        ></button>
+        <button
+          data-test="open-mobile-menu"
+          data-toggle-class="np-hidden"
+          class="np-header-mobile-menu-nav-button np-header-mobile-avatar-menu"
+          data-toggle-target=".fa-times, .np-header-mobile-menu-content, .np-main, .np-footer"
+        >
+          <i class="far fa-bars"></i>
+        </button>
+      {% endif %}
+    </div>
+
     {% if current_person.signed_in? %}
+    {% comment %}
       <div class="np-hidden-mobile np-header-search np-header-search-expanded">
         <form action="{% route search %}" method="get" data-test="desktop-search">
           <input
@@ -95,9 +97,10 @@
             name="q"
             placeholder="{% t .search %}"
           />
-          <i class="np-header-search-icon far fa-search"></i>
+          <i class="np-header-search-icon fa fa-search"></i>
         </form>
       </div>
+    {% endcomment %}
       <div class="np-hidden-mobile np-header-avatar">
         <button
           class="np-header-avatar-button"
@@ -106,11 +109,8 @@
           data-toggle-target=".np-header-avatar-tooltip"
           data-toggle-outside
         >
-          <img
-            alt="{{ current_person.name }}"
-            class="np-header-avatar-image"
-            src="{{ current_person.avatar_url }}"
-          >
+
+            <i class="fal fa-user-circle"></i>
         </button>
         <div class="np-header-avatar-tooltip np-hidden" role="tooltip">
           <span class="np-header-avatar-tooltip-arrow-up"></span>
@@ -151,47 +151,24 @@
   </div>
 </header>
 
-<div class="np-hidden-desktop">
+<div class="np-hidden-desktop new-header-styles">
   <div class="np-header-mobile-menu-content np-hidden">
-    {% if current_person.signed_in? %}
-      <img
-        alt="{{ current_person.name }}"
-        class="np-header-mobile-menu-content-avatar"
-        src="{{ current_person.avatar_url }}"
-      />
-      <div class="np-header-mobile-menu-content-name">
-        {{ current_person.name }}
-      </div>
-    {% endif %}
     <div class="np-header-mobile-menu-content-nav">
-      <form
-        class="np-header-search"
-        data-test="mobile-search"
-        method="get"
-        action="{% route search %}"
+      <a
+        href="/app/dashboard"
+        class="np-header-mobile-menu-content-button"
       >
-        <input
-          aria-label="{% t .search %}"
-          class="np-header-search-input"
-          type="text"
-          name="q"
-          placeholder="{% t .search %}"
-        />
-        <i class="np-header-search-icon far fa-search"></i>
-      </form>
-      {% for website_navigation in navigations.header_navigations %}
-        <a
-          href="{{ website_navigation.path }}"
-          class="np-header-mobile-menu-content-button"
-          {% if website_navigation.external? %} target="_blank" {% endif %}
-        >
-          {{ website_navigation.name }}
-        </a>
-      {% endfor %}
-      <div class="np-header-mobile-menu-content-line"></div>
+        My Dashboard
+      </a>
+      <a
+        href="/app/catalog"
+        class="np-header-mobile-menu-content-button"
+      >
+        Catalog
+      </a>
       {% unless current_school.sso_active? %}
         <a
-          class="np-header-mobile-menu-content-button"
+          class="np-header-mobile-menu-content-button profile-settings-link"
           href="{% route account %}"
         >
           {% t .profile_settings %}
@@ -218,7 +195,6 @@
 
 
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-
 <script>
 function setLang(lang) {
   var data = {
@@ -226,20 +202,20 @@ function setLang(lang) {
             language : lang
         };
   $.ajax({
-        type : 'POST',
-        url : 'https://hooks.zapier.com/hooks/catch/9725311/bt60dir/', //zapier link  
-        data: JSON.stringify(data),
-        success:function (data) {
-            console.log(data);
-            setTimeout(location.reload.bind(location), 1500);
-        },
-        error: function(xhr, status, error) {
-            console.log(error)
-      }
-    });
+      type : 'POST',
+      url : 'https://webhooks.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/language-change',
+      data: JSON.stringify(data),
+      success:function (data) {
+          console.log(data);
+          setTimeout(location.reload.bind(location), 700);
+      },
+      error: function(xhr, status, error) {
+          console.log(error)
+    }
+  });
 }
 
-/* When the user clicks on the button, 
+/* When the user clicks on the button,
 toggle between hiding and showing the dropdown content */
 function myFunction() {
   document.getElementById("myDropdown").classList.toggle("show");
@@ -258,26 +234,53 @@ window.onclick = function(event) {
     }
   }
 }
+
+if (window.location.pathname == "/app/videos") {
+  document.querySelector(".videos-link .np-header-desktop-nav-link").classList.add("np-sub-navigation-content-item-active")
+}
 </script>
+
 {% endif %}
 <style>
+
+.new-header-styles.np-header {
+  box-shadow: 0px 4px 4px rgb(0 0 0 / 25%), 0px 4px 4px rgb(0 0 0 / 25%);
+  position:relative;
+  position:fixed;
+  top:0;
+  z-index: 2817948196;
+}
+
+.np-header-mobile-menu-nav {
+  position:relative;
+  margin-right:12px;
+}
+
+.np-header-mobile-menu-nav .np-header-mobile-menu-nav-button {
+  color:#ffd700;
+}
+
+.np-header-logo {
+  justify-content: flex-end;
+  margin-right:16px;
+}
+
 .hr.divider {
   border-top: 4px solid black;
   border-radius: 5px;
 }
 
 .dropbtn {
-  background-color: white;
-  color: #0088dd;
+  background-color: #ffd700;
+  color: black;
   padding: 13px;
   font-size: 16px;
-  min-width: 160px;
+  line-height:16px;
   border: none;
   cursor: pointer;
   margin-right: 20px;
-  border-radius: 5px;
+  border-radius: 7px;
   max-height: 44px;
-  font-weight: 500;
 }
 
 .dropdown {
@@ -306,11 +309,122 @@ window.onclick = function(event) {
 }
 
 .dropdown a:hover {
-  color: #0088dd;
+  color: #ffd700;
   font-weight: 600;
   cursor: pointer;
 }
 
 .show {display: block;}
+
+.new-header-styles .np-header-mobile-menu-content {
+  background:#fff;
+  z-index:49;
+}
+
+.new-header-styles .np-header-mobile-menu-content-nav {
+  padding: 12px 0 0;
+}
+
+.new-header-styles .np-header-mobile-menu-content-button {
+  border-bottom: 1px solid #000;
+  box-shadow: none;
+  justify-content: flex-start;
+  padding: 16px;
+  border-radius: 0;
+  height: auto;
+  margin: 0;
+  font-size: 18px;
+  font-weight: 400;
+  color: #000F23;
+}
+
+.new-header-styles .np-header-mobile-menu-content-button.profile-settings-link {
+  border-bottom: 0;
+  margin-top: 16px;
+  font-size: 16px;
+}
+
+.new-header-styles .np-header-mobile-menu-content-button.np-danger {
+  margin: 0 0 32px;
+  border: none;
+  color: #48e3a0;
+  font-weight: 500;
+  padding-top: 0;
+}
+
+@media (min-width:768px) {
+  .np-header {
+    height:auto;
+  }
+
+  .new-styles .fa-user-circle {
+    font-size:45px;
+    color: #ffd700;
+    transition: all 0.2s ease-in-out;
+  }
+  @media (max-width: 1200px) {
+  .new-styles .fa-user-circle {
+    font-size: 25px;
+  }
+  }
+  .np-header-logo {
+    justify-content: unset;
+    margin-top: 12px;
+    margin-bottom: 12px;
+  }
+
+  .np-header-logo-image {
+    height: 60px;
+    transition: all 0.2s ease-in-out;
+  }
+@media (max-width:1200px) {
+  .np-header-logo-image {
+    height: 30px;
+  }
+}
+.np-header-desktop-nav-list {
+  padding-inline-start: 10px;
+}
+  .np-header-desktop-nav-item {
+    padding: 16px 8px;
+  }
+
+  .np-header-desktop-nav-link {
+    transition:all 0.2s;
+  }
+
+  .np-header-desktop-nav-link:hover,
+  .np-header-desktop-nav-link.np-sub-navigation-content-item-active {
+    text-decoration:underline;
+    color:#ffd700;
+  }
+
+  .new-header-styles .np-header-search-input,
+  .new-header-styles .np-header-search-input:focus {
+    border-radius:0;
+    opacity:1;
+    background:#fff;
+    padding: 0 40px 0 16px;
+    font-size:18px;
+  }
+
+  .new-header-styles .np-header-search-input:focus {
+    border: 1px solid #ffd700;
+  }
+
+  .np-header-search-icon {
+    color:#2ee3a0;
+  }
+}
+
+@media (min-width:1200px) {
+  .np-header-desktop-nav-item {
+    padding: 16px;
+  }
+
+  .np-header-desktop-nav-link {
+    font-size: 20px;
+  }
+}
 </style>
 
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_header_minimal.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_header_minimal.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_header_minimal.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_header_minimal.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_featured_content.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_featured_content.html.liquid
new file mode 100644
index 00000000..fcfae043
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_featured_content.html.liquid	
@@ -0,0 +1,109 @@
+<div class="homepage-featured-section">
+  <div class="row sp-between">
+    <div class="col-xs-12 col-sm-5-half">
+      <div class="small-heading featured-courses-heading homepage-subtitles">{{ homepage.featured_courses_headline }}</div> 
+    </div>
+    <div class="col-xs-12 col-sm-5-half">
+      <div class="small-heading featured-courses-heading homepage-subtitles np-hidden-mobile">My Achievements</div>
+    </div>
+    </div>
+    <div class="row sp-between">
+      <div class="featured-courses-block col-xs-12 col-sm-5-half">
+        {% assign featured_courses_count = 0 %}
+        {% for course in courses.in_catalog %}
+          {% for cat in course.categories %}
+            {% assign cat_name = cat.name | upcase %}
+            {% if cat_name == "GOLD STAR" %}     
+              <div class="featured-course-col">
+                {% include "cards_course_new_styles" with course %}     
+              </div>
+              {% assign featured_courses_count = featured_courses_count | plus: 1 %}
+            {% endif %}
+          {% endfor %}
+        {% endfor %}
+
+        {% if featured_courses_count == 0 %}
+          We're sorry! There are no featured courses at this time.
+        {% endif %}
+      </div>
+      <div class="featured-courses-block col-xs-12 col-sm-5-half np-hidden-mobile">
+{% include "homepage_featured_my_points" %}
+      </div>
+    </div>
+  </div>
+
+
+  <style>
+  .homepage-featured-section {
+    margin-top: 55px;
+  }
+    .my-points-heading {
+      margin-top:40px;
+      display: flex;
+      flex-direction: column;
+    }
+
+    .pop-heading {
+      margin-bottom:32px;
+      font-weight:500;
+    }
+
+    .view-all-events-heading {
+      color:#0088dd;
+      text-decoration: none;
+      font-weight: 500;
+      font-size: 16px;
+      display: inline-block;
+      align-self: flex-end;
+    }
+
+
+    .featured-courses-block {
+      margin-left: 0;
+      margin-right: 0;
+    }
+    @media (min-width:768px) {
+    .my-points-heading {
+        margin-top:0;
+      }
+    }
+
+    @media (min-width:992px) {
+    .my-points-heading {
+        flex-direction: row;
+        justify-content: space-between;
+      }
+
+      .view-all-events-heading {
+        font-size: 20px;
+      }
+    }
+    .sp-between {
+        justify-content: space-between;
+    }
+
+    @media only screen and (min-width: 48em) {
+    .col-sm-5-half {
+        flex-basis: 45%;
+        max-width: 45%;
+    }
+    }
+
+
+  
+  .small-text {
+    position: absolute;
+    bottom: -5px;
+    right: 5px;
+    font-size: 16px;
+  }
+.np-card-content-footer .np-card {
+    min-width: auto !important;
+}
+.np-card-content-footer {
+    align-items: center;
+}
+.np-card-content-footer .np-course-version-outdated-popup {
+  margin-right: 10px !important;
+}
+  </style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_featured_my_points.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_featured_my_points.html.liquid
new file mode 100644
index 00000000..302e6ad6
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_featured_my_points.html.liquid	
@@ -0,0 +1,98 @@
+<div class="my-points-and-gems-container">
+      <div class="my-points-block">
+        <div class="points-container">
+          
+          {% assign current_points = current_person.properties.points %}
+          {% if current_points >= 500 and current_points < 1000 %}
+            <img class="gem-image" src="https://s3.amazonaws.com/schoolkeep-production/wysiwyg/91327518-e518-422e-9454-3aa2b1fe061a/20240820152515_McNP_Point-Systems_2.png"></img>
+          {% elsif current_points >= 1000 and current_points < 1500 %}
+            <img class="gem-image" src="https://s3.amazonaws.com/schoolkeep-production/wysiwyg/91327518-e518-422e-9454-3aa2b1fe061a/20240820152521_McNP_Point-Systems_3.png"></img>
+          {% elsif current_points >= 1500 and current_points < 2000 %}
+            <img class="gem-image" src="https://s3.amazonaws.com/schoolkeep-production/wysiwyg/91327518-e518-422e-9454-3aa2b1fe061a/20240820152533_McNP_Point-Systems_4.png"></img>
+          {% elsif current_points >= 2000 %}
+            <img class="gem-image" src="https://s3.amazonaws.com/schoolkeep-production/wysiwyg/91327518-e518-422e-9454-3aa2b1fe061a/20240820152540_McNP_Point-Systems_5.png"></img>
+          {% endif %}
+          <h2>{{ current_person.properties.points }}</h2>
+        </div>
+        <div class="small-text">
+          <p>points</p>
+        </div>
+      </div>
+      <div class="my-gems-block">
+        {% assign topaz_count = 0 %}
+        {% for course in courses.enrolled %}
+        {% if course.name contains "Harri Learning Gem" %}
+        {% if course.progress == 100 %}
+        {% assign topaz_count = topaz_count | plus: 1 %}
+        {% endif %}
+        {% endif %}
+        {% endfor %}
+  
+        <div class="gem-grid-container">
+          <div class="gem-container">
+            {% for i in (1..topaz_count) %}
+              <img class="gem-image" src="https://s3.amazonaws.com/schoolkeep-production/wysiwyg/91327518-e518-422e-9454-3aa2b1fe061a/20240820152507_McNP_Point-Systems_1.png"></img>
+            {% endfor %}
+          </div>
+  
+          {% if topaz_count == 0 and current_points < 500 %}
+            <h5>
+              <a href="/app/dashboard">Get started>></a>
+            </h5>
+          {% endif %}
+  
+          <div class="small-text">
+            <p>gems</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  
+  <style>
+  
+    .my-points-and-gems-container {
+      display: grid;
+      grid-template-rows: 1fr 1fr;
+      gap: 20px;
+      height: 100%;
+    }
+  
+    .my-points-block,
+    .my-gems-block {
+      background-color: #F8FBFF;
+      width: 100%;
+      position: relative;
+      text-align: center;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      font-size: 36pt;
+    }
+  
+    .points-container {
+      display: flex;
+      align-items: center;
+      gap: 20px;
+    }
+  
+    .gem-grid-container {
+      display: flex;
+      flex-direction: column;
+    }
+  
+    .gem-container {
+      display: grid;
+      grid-template-columns: repeat(5, 1fr);
+      grid-gap: 10px;
+    }
+  
+    .gem-image {
+      max-width: 100px;
+      height: auto;
+    }
+  
+    .small-text {
+      font-size: 14px;
+    }
+  </style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_getting_started.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_getting_started.html.liquid
new file mode 100644
index 00000000..e0b2e1e9
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_getting_started.html.liquid	
@@ -0,0 +1,253 @@
+{% assign num_of_getting_started_courses = 0 %}
+<div class="homepage-getting-started-section">
+  <div class="row">
+    <div class="col-xs-12 col-sm-7">
+      <div class="getting-started-heading homepage-subtitles">Learning Gems &#128142;</div>
+    </div>
+    <div class="col-xs-12 col-sm-5 col-lg-3 col-lg-offset-2 np-hidden-mobile">
+      <div class="getting-started-heading progress-heading homepage-subtitles hidden-tab">My progress</div>
+    </div>
+  </div>
+
+  {% for course in courses.enrolled %}
+  {% if course.progress < 100 %}
+    {% if course.name contains "Harri Learning Gem: Org Admin" %}
+          <div class="row getting-started-course-row">
+            <div class="col-xs-12 col-md-7">
+              {% include "cards_course_horizontal" with course %}     
+            </div>
+            <div class="col-xs-12 col-md-5 col-lg-3 col-lg-offset-2 np-hidden-mobile">
+              <div class="course-progress-wrapper">
+                {% 
+                  include "progress_circle", 
+                  name: course.id,
+                  count: course.progress , 
+                  total: 100,
+                  size: "120",
+                  stroke_color: "#de352a",
+                  stroke_color_bg: "#fff" 
+                %}
+              </div>          
+            </div>
+          </div>
+      {% endif %}
+      {% endif %}
+  {% endfor %}
+
+  {% for course in courses.enrolled %}
+  {% if course.progress < 100 %}
+    {% if course.name contains "Harri Learning Gem: CoreHR" %}
+          <div class="row getting-started-course-row">
+            <div class="col-xs-12 col-md-7">
+              {% include "cards_course_horizontal" with course %}     
+            </div>
+            <div class="col-xs-12 col-md-5 col-lg-3 col-lg-offset-2 np-hidden-mobile">
+              <div class="course-progress-wrapper">
+                {% 
+                  include "progress_circle", 
+                  name: course.id,
+                  count: course.progress , 
+                  total: 100,
+                  size: "120",
+                  stroke_color: "#de352a",
+                  stroke_color_bg: "#fff" 
+                %}
+              </div>          
+            </div>
+          </div>
+      {% endif %}
+      {% endif %}
+  {% endfor %}
+
+  {% for course in courses.enrolled %}
+  {% if course.progress < 100 %}
+    {% if course.name contains "Harri Learning Gem: Forecasting" %}
+          <div class="row getting-started-course-row">
+            <div class="col-xs-12 col-md-7">
+              {% include "cards_course_horizontal" with course %}     
+            </div>
+            <div class="col-xs-12 col-md-5 col-lg-3 col-lg-offset-2 np-hidden-mobile">
+              <div class="course-progress-wrapper">
+                {% 
+                  include "progress_circle", 
+                  name: course.id,
+                  count: course.progress , 
+                  total: 100,
+                  size: "120",
+                  stroke_color: "#de352a",
+                  stroke_color_bg: "#fff" 
+                %}
+              </div>          
+            </div>
+          </div>
+      {% endif %}
+      {% endif %}
+  {% endfor %}
+
+    {% for course in courses.enrolled %}
+  {% if course.progress < 100 %}
+    {% if course.name contains "Harri Learning Gem: Scheduling" %}
+          <div class="row getting-started-course-row">
+            <div class="col-xs-12 col-md-7">
+              {% include "cards_course_horizontal" with course %}     
+            </div>
+            <div class="col-xs-12 col-md-5 col-lg-3 col-lg-offset-2 np-hidden-mobile">
+              <div class="course-progress-wrapper">
+                {% 
+                  include "progress_circle", 
+                  name: course.id,
+                  count: course.progress , 
+                  total: 100,
+                  size: "120",
+                  stroke_color: "#de352a",
+                  stroke_color_bg: "#fff" 
+                %}
+              </div>          
+            </div>
+          </div>
+      {% endif %}
+      {% endif %}
+  {% endfor %}
+
+  {% for course in courses.enrolled %}
+  {% if course.progress < 100 %}
+    {% if course.name contains "Harri Learning Gem: Timeclocks" %}
+          <div class="row getting-started-course-row">
+            <div class="col-xs-12 col-md-7">
+              {% include "cards_course_horizontal" with course %}     
+            </div>
+            <div class="col-xs-12 col-md-5 col-lg-3 col-lg-offset-2 np-hidden-mobile">
+              <div class="course-progress-wrapper">
+                {% 
+                  include "progress_circle", 
+                  name: course.id,
+                  count: course.progress , 
+                  total: 100,
+                  size: "120",
+                  stroke_color: "#de352a",
+                  stroke_color_bg: "#fff" 
+                %}
+              </div>          
+            </div>
+          </div>
+      {% endif %}
+      {% endif %}
+  {% endfor %}
+
+  {% for course in courses.enrolled %}
+  {% if course.progress < 100 %}
+    {% if course.name contains "Harri Learning Gem: Payroll" %}
+          <div class="row getting-started-course-row">
+            <div class="col-xs-12 col-md-7">
+              {% include "cards_course_horizontal" with course %}     
+            </div>
+            <div class="col-xs-12 col-md-5 col-lg-3 col-lg-offset-2 np-hidden-mobile">
+              <div class="course-progress-wrapper">
+                {% 
+                  include "progress_circle", 
+                  name: course.id,
+                  count: course.progress , 
+                  total: 100,
+                  size: "120",
+                  stroke_color: "#de352a",
+                  stroke_color_bg: "#fff" 
+                %}
+              </div>          
+            </div>
+          </div>
+      {% endif %}
+      {% endif %}
+  {% endfor %}
+
+  {% for course in courses.enrolled %}
+  {% if course.progress < 100 %}
+    {% if course.name contains "Harri Learning Gem: Harri Mobile" %}
+          <div class="row getting-started-course-row">
+            <div class="col-xs-12 col-md-7">
+              {% include "cards_course_horizontal" with course %}     
+            </div>
+            <div class="col-xs-12 col-md-5 col-lg-3 col-lg-offset-2 np-hidden-mobile">
+              <div class="course-progress-wrapper">
+                {% 
+                  include "progress_circle", 
+                  name: course.id,
+                  count: course.progress , 
+                  total: 100,
+                  size: "120",
+                  stroke_color: "#de352a",
+                  stroke_color_bg: "#fff" 
+                %}
+              </div>          
+            </div>
+          </div>
+      {% endif %}
+      {% endif %}
+  {% endfor %}
+
+  {% for course in courses.enrolled %}
+    {% if course.progress == 100 %}
+      {% for cat in course.categories %}
+        {% assign cat_name = cat.name | upcase %}
+        {% if cat_name == "LEARNING GEMS" %}
+          {% assign num_of_getting_started_courses = num_of_getting_started_courses | plus: 1 %}
+          <div class="row getting-started-course-row">
+
+            <div class="col-xs-12 col-md-7">
+              {% include "cards_course_horizontal" with course %}     
+            </div>
+  
+            <div class="col-xs-12 col-md-5 col-lg-3 col-lg-offset-2 np-hidden-mobile">
+              <div class="course-progress-wrapper">
+                {% 
+                  include "progress_circle", 
+                  name: course.id,
+                  count: course.progress , 
+                  total: 100,
+                  size: "120",
+                  stroke_color: "#de352a",
+                  stroke_color_bg: "#fff" 
+                %}
+              </div>          
+            </div>
+          </div>
+        {% endif %}
+      {% endfor %}
+      {% endif %}
+  {% endfor %}
+  </div>
+</div>
+
+  <style>
+    .getting-started-heading {
+      font-size: 18px;
+      margin-bottom: 24px;
+      font-weight:500;
+      margin-top:32px;
+    }
+
+    .getting-started-course-row {
+      margin-bottom:35px;
+    }
+
+    @media (min-width:768px) {
+      .getting-started-heading {
+        font-size: 24px;
+        margin-bottom: 32px;
+        margin-top:64px;
+      }
+    }
+    @media (max-width: 1024px) {
+        .progress-heading, .course-progress-wrapper {
+            display: none;
+        }
+    }
+  </style>
+
+{% comment %}
+  <script>
+    console.log("num of learning gems {{num_of_getting_started_courses}}")
+    if (Number("{{num_of_getting_started_courses}}") == 0) {
+      document.querySelector(".homepage-getting-started-section").style.display = "none"
+    }
+  </script>
+  {% endcomment %}
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_learning_progress.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_learning_progress.html.liquid
new file mode 100644
index 00000000..b3988ec3
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_homepage_learning_progress.html.liquid	
@@ -0,0 +1,191 @@
+<div class="homepage-getting-started-section">
+    <div class="row">
+      <div class="col-xs-12 lp-title">
+        <div class="getting-started-heading homepage-subtitles">My Learning Paths</div>
+        <div class="language-toggle-container">
+          <label class="switch">
+            <input type="checkbox" id="languageToggle" onclick="toggleLanguage()">
+            <span class="slider round"></span>
+          </label>
+          <span id="toggleLabel">English</span>
+        </div>
+      </div>
+    </div>
+  
+    <div class="row lp-prog-paths" id="englishPaths">
+      {% assign english_count = 0 %}
+      {% for learning_path in learning_paths.enrolled %}
+        {% unless learning_path.name contains "Spanish" %}
+          {% if learning_path.progress < 100 and english_count < 3 %}
+            {% capture learning_path_url %}{% route learning_path, id: learning_path.id %}{% endcapture %}
+            <div class="col-xs-12 col-sm-4">
+              <a href="{{ learning_path_url }}" class="learning-gem-block">
+                <div class="learning-gem-content">
+                  <h3>{{ learning_path.name }}</h3>
+                  <div class="lp-progress-wrapper">
+                    {% 
+                      include "progress_circle", 
+                      name: learning_path.id,
+                      count: learning_path.progress, 
+                      total: 100,
+                      size: "120",
+                      stroke_color: "#de352a",
+                      stroke_color_bg: "#fff" 
+                    %}
+                  </div>
+                </div>
+              </a>
+            </div>
+            {% assign english_count = english_count | plus: 1 %}
+          {% endif %}
+        {% endunless %}
+      {% endfor %}
+    </div>
+  
+    <div class="row lp-prog-paths" id="spanishPaths" style="display: none;">
+      {% assign spanish_count = 0 %}
+      {% for learning_path in learning_paths.enrolled %}
+        {% if learning_path.name contains "Spanish" %}
+          {% if learning_path.progress < 100 and spanish_count < 3 %}
+            {% capture learning_path_url %}{% route learning_path, id: learning_path.id %}{% endcapture %}
+            <div class="col-xs-12 col-sm-4">
+              <a href="{{ learning_path_url }}" class="learning-gem-block">
+                <div class="learning-gem-content">
+                  <h3>{{ learning_path.name }}</h3>
+                  <div class="lp-progress-wrapper">
+                    {% 
+                      include "progress_circle", 
+                      name: learning_path.id,
+                      count: learning_path.progress, 
+                      total: 100,
+                      size: "120",
+                      stroke_color: "#de352a",
+                      stroke_color_bg: "#fff" 
+                    %}
+                  </div>
+                </div>
+              </a>
+            </div>
+            {% assign spanish_count = spanish_count | plus: 1 %}
+          {% endif %}
+        {% endif %}
+      {% endfor %}
+    </div>
+  </div>
+  
+  <script>
+    function toggleLanguage() {
+      var englishPaths = document.getElementById('englishPaths');
+      var spanishPaths = document.getElementById('spanishPaths');
+      var toggleLabel = document.getElementById('toggleLabel');
+      var languageToggle = document.getElementById('languageToggle');
+  
+      if (languageToggle.checked) {
+        englishPaths.style.display = 'none';
+        spanishPaths.style.display = 'flex';
+        toggleLabel.textContent = 'Español';
+      } else {
+        englishPaths.style.display = 'flex';
+        spanishPaths.style.display = 'none';
+        toggleLabel.textContent = 'English';
+      }
+    }
+  </script>
+  <style>
+    .lp-progress-wrapper {
+    background: #F8FBFF;
+    padding:16px;
+    height:100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color:#de352a;
+}
+
+.lp-prog-paths {
+    align-items: flex-end;
+}
+
+.language-toggle-container {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+  }
+  #toggleLabel {
+    width: 60px;
+  }
+
+  .switch {
+    position: relative;
+    display: inline-block;
+    width: 60px;
+    height: 34px;
+    margin-right: 10px;
+  }
+
+  .switch input {
+    opacity: 0;
+    width: 0;
+    height: 0;
+  }
+
+  .slider {
+    position: absolute;
+    cursor: pointer;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: #de352a;
+    transition: .4s;
+  }
+
+  .slider:before {
+    position: absolute;
+    content: "";
+    height: 26px;
+    width: 26px;
+    left: 4px;
+    bottom: 4px;
+    background-color: #ececec;
+    transition: .4s;
+  }
+
+.learning-gem-content h3, .learning-gem-content a {
+    text-decoration: none;
+    color: black;
+}
+
+  input:checked + .slider:before {
+    transform: translateX(26px);
+  }
+
+  .slider.round {
+    border-radius: 34px;
+  }
+
+  .slider.round:before {
+    border-radius: 50%;
+  }
+  .lp-title {
+    display: flex;
+    align-items: flex-end;
+    justify-content: space-between;
+  }
+  .learning-gem-block,
+.learning-gem-block:link,
+.learning-gem-block:visited,
+.learning-gem-block:hover,
+.learning-gem-block:active {
+    text-decoration: none !important;
+}
+
+.learning-gem-block h3,
+.learning-gem-block:link h3,
+.learning-gem-block:visited h3,
+.learning-gem-block:hover h3,
+.learning-gem-block:active h3 {
+    text-decoration: none !important;
+    color: black !important;
+}
+  </style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_banners.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_banners.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_banners.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_banners.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_certificate.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_certificate.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_certificate.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_certificate.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_certificate_content.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_certificate_content.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_certificate_content.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_certificate_content.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_completed_banner.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_completed_banner.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_completed_banner.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_completed_banner.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_course.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_course.html.liquid
similarity index 87%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_course.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_course.html.liquid
index 88c77d06..8aa7641c 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_course.html.liquid	
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_course.html.liquid	
@@ -24,12 +24,6 @@
         " style="margin-top: 10px;">
           {{ course.progress }}% Complete
         </div>
-          {% assign time = courses.enrolled | where: "id", course.id %}
-          {% if time.first.properties.course_time != blank %} 
-          <div class="course-duration-lp">
-            {{time.first.properties.course_time}} Min
-          </div>
-          {%endif%}
       </div>
       <i class="fas fa-chevron-right np-learning-path-outline-icon"></i>
       {% comment %} {% if course.optional? %}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_description.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_description.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_description.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_description.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_desktop_content.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_desktop_content.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_desktop_content.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_desktop_content.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_desktop_header.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_desktop_header.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_desktop_header.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_desktop_header.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_desktop_view.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_desktop_view.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_desktop_view.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_desktop_view.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_instructors.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_instructors.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_instructors.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_instructors.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_mobile_content.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_mobile_content.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_mobile_content.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_mobile_content.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_mobile_header.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_mobile_header.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_mobile_header.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_mobile_header.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_mobile_view.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_mobile_view.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_mobile_view.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_mobile_view.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_new_content_banner.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_new_content_banner.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_new_content_banner.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_new_content_banner.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_outline.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_outline.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_outline.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_outline.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_progress_and_cta.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_progress_and_cta.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_progress_and_cta.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_progress_and_cta.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_summary_desktop_view.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_summary_desktop_view.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_summary_desktop_view.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_summary_desktop_view.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_summary_mobile_view.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_summary_mobile_view.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_summary_mobile_view.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_summary_mobile_view.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_training_session.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_training_session.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_path_training_session.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_path_training_session.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_paths_index.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_paths_index.html.liquid
similarity index 83%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_learning_paths_index.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_paths_index.html.liquid
index 693d143a..d37a3e19 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_learning_paths_index.html.liquid	
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_learning_paths_index.html.liquid	
@@ -1,4 +1,4 @@
-{% assign swapped_groups = 'd1cc8cb4-fc5b-48b3-8e85-2f4faaf982dd, 0ecc1170-5761-4b5b-9047-5992232ceff4, 172784c9-7c26-4ffd-891f-4dbe8fda324f, 13765f3c-f1ee-4196-b846-1f07f63b3b64, c2caaef8-bebf-46b7-857b-79934a667495, 33842d33-6e9d-4dd6-a07c-49f2ce62b752, 011e1a52-beeb-4369-b030-a9ee3a0efe21, 216f8729-c6c6-4708-ad2c-fc732ef2d505, c1862cc1-a933-42bd-81cc-ebab4ec8d3d2'  %}
+{% assign swapped_groups = '1fafc89f-fbbe-4fc9-b112-00645fb5708b, fa5b681e-cad9-4987-8801-a915b7c35855, 4a11c2c7-653e-4feb-865c-f8d300868324, 607235c7-cf3d-4997-977d-a1d4f0b4dcd6,f66bf675-5074-45bd-9ea7-62c928ec545e, 345c7c5f-f904-4ea1-ae7f-e8398b2a69f6, d1fa758c-eb92-45ed-8d01-d7f6fbf4a4ec, a4339f11-c69a-4880-8dee-204b1fd97359, 45a6eaa4-f3d5-4cd8-b054-eba2bb135b6a'%}
 {% assign is_in_group = false %}
 
   {% for group in current_person.groups %}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_messages.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_messages.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_messages.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_messages.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_popup2.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_popup2.html.liquid
new file mode 100644
index 00000000..f53a2d97
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_popup2.html.liquid	
@@ -0,0 +1 @@
+<SCRIPT TYPE="text/javascript"> function popup(mylink, windowname) { if (! window.focus)return true; var href; if (typeof(mylink) == 'string') href=mylink; else href=mylink.href; window.open(href, windowname, 'width=400,height=200,scrollbars=yes'); return false; } </SCRIPT>
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_progress_circle.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_progress_circle.html.liquid
new file mode 100644
index 00000000..8a524860
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_progress_circle.html.liquid	
@@ -0,0 +1,80 @@
+<div class="np-progress-ring-wrapper">
+  <svg
+    class="progress-ring"
+    width="{{ size }}"
+    height="{{ size }}">
+    <circle
+      class="progress-ring__circle circle-bg"
+      stroke="{{ stroke_color_bg }}"
+      stroke-width="15"
+      fill="transparent"
+      r="52"
+      cx="60"
+      cy="60"/>
+    <circle
+      class="progress-ring__circle circle-{{name}}"
+      stroke="{{ stroke_color }}"
+      stroke-width="15"
+      fill="transparent"
+      r="52"
+      cx="60"
+      cy="60"/>   
+      <text x="50%" y="50%" text-anchor="middle" stroke="t#fff" stroke-width="1px" fill="#35404E" dy=".3em">{{count}}%</text>
+  </svg>
+</div>
+
+<script>
+  document.addEventListener("DOMContentLoaded", function() {
+      var circle = document.getElementsByClassName("circle-{{name}}")[0];
+      var radius = circle.r.baseVal.value;
+      var circumference = radius * 2 * Math.PI;
+
+      circle.style.strokeDasharray = `${circumference} ${circumference}`;
+      circle.style.strokeDashoffset = `${circumference}`;
+
+      function setProgress(count, total) {
+        var percent = parseInt(count) / parseInt(total)
+       // console.log(percent)
+        const offset = circumference - percent * circumference;
+        //console.log(offset)
+        circle.style.strokeDashoffset = offset;
+      }
+
+      setProgress('{{count}}', '{{total}}')
+  }) 
+</script>
+
+<style>
+  .np-progress-ring-wrapper {
+    flex: 0;
+    flex-direction: column;
+    display: flex;
+    width: 100%;
+    align-items: center;
+  }
+
+  .progress-ring circle { stroke-linecap: round; }
+  .progress-ring text { font-size:2rem; }
+  .progress-ring__circle {
+    transition: stroke-dashoffset 0.35s;
+    transform: rotate(-90deg);
+    transform-origin: center;
+  }
+
+  .np-progress-circle-label {
+    text-transform: uppercase;
+    font-size:0.875rem;
+    margin-top:1rem;
+  }
+
+  @media (min-width:768px) {
+    .progress-ring text { font-size:2rem; }
+  }
+</style>
+
+<style>
+  .progress-circle-container {
+    background: #F8FBFF;
+    padding: 16px;
+  }
+</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_russian_lang.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_russian_lang.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_russian_lang.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_russian_lang.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_search_result.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_search_result.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_search_result.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_search_result.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_search_zero_state.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_search_zero_state.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_search_zero_state.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_search_zero_state.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_spanish_lang.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_spanish_lang.html.liquid
similarity index 50%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_spanish_lang.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_spanish_lang.html.liquid
index 6bd08e10..3f0e3a13 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_spanish_lang.html.liquid	
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_spanish_lang.html.liquid	
@@ -6,7 +6,7 @@
 .np-zero-state-text,
 .np-button.np-button-wide,
 .np-footer-support-item.np-footer-support-help,
-.np-card-content-progress.np-button-color.notstarted,
+.np-card-content-progress.notstarted,
 .np-zero-state-text.training-events,
 .np-button.lp,
 .sub-navigation-label:nth-child(1),
@@ -49,11 +49,58 @@
 .avatar-requirements,
 .radio__label.gravatar,
 .radio__label.custom,
-#desktop_upload_avatar
+#desktop_upload_avatar,
+.np-header-desktop-nav .np-header-desktop-nav-item:nth-child(1) .np-header-desktop-nav-link,
+.np-header-desktop-nav .np-header-desktop-nav-item:nth-child(2) .np-header-desktop-nav-link,
+.np-header-desktop-nav .np-header-desktop-nav-item:nth-child(3) .np-header-desktop-nav-link,
+.np-header-mobile-menu-content-button,
+.homepage-hero-section .np-homepage-headline,
+.homepage-hero-section .np-homepage-subheadline,
+.homepage-hero-section .np-homepage-hero-cta,
+.homepage-getting-started-section .getting-started-heading,
+.homepage-getting-started-section .progress-heading,
+.homepage-featured-section .featured-courses-heading,
+.homepage-featured-section .featured-events-heading,
+.homepage-featured-section .view-all-events-heading,
+.contact-us-block .contact-us-block-title,
+.contact-us-block .contact-us-block-subtitle,
+.contact-us-block .contact-us-block-cta,
+.training-events-header,
+.training-events-subheader,
+.training-events-headers .request-button,
+.dashboard-title,
+.type-filter[data-filter='courses'],
+.type-filter[data-filter='learning-paths'],
+.learning-path-items-definition,
+.np-card-training-sessions-label,
+.stats-container[data-item='in-progress'] .stats-label,
+.stats-container[data-item='completed'] .stats-label,
+.stats-container.events .stats-label,
+#courses-in-progress-header,
+#courses-in-progress-header-2,
+#my-registered-events-heading,
+.events-container #upcoming-trainings span,
+.events-container #new-user-journey span,
+.events-container #training-webinar-catalog span,
+.events-container #development-training span,
+.overlay-content .all-filter,
+.overlay-content .filter-category:nth-of-type(1),
+.overlay-content .filter-category:nth-of-type(2),
+.overlay-content .apply-button,
+#clearAll,
+.np-catalog-title
 {
     text-indent: -9999999px;
 }
 
+.course-completion,
+.events-container #upcoming-trainings span,
+.events-container #new-user-journey span,
+.events-container #training-webinar-catalog span,
+.events-container #development-training span {
+  display:inline-block;
+}
+
 /* HEADER */
 
 .np-header-avatar-tooltip-navigation-link::after {
@@ -72,6 +119,73 @@
   content: "Desconectar";
 }
 
+.np-header-desktop-nav .np-header-desktop-nav-item:nth-child(1) .np-header-desktop-nav-link:after {
+  /* My Dashboard */
+  text-indent: 0;
+  line-height: 0;
+  margin-bottom:18px;
+  display: block;
+  content: "Mi Tablero";
+}
+
+.np-header-desktop-nav .np-header-desktop-nav-item:nth-child(2) .np-header-desktop-nav-link:after {
+  /* Course Catalog */
+  text-indent: 0;
+  line-height: 0;
+  margin-bottom:18px;
+  display: block;
+  content: "Catálogo de Cursos";
+}
+
+.np-header-desktop-nav .np-header-desktop-nav-item:nth-child(3) .np-header-desktop-nav-link:after {
+  /* Training Events */
+  text-indent: 0;
+  line-height: 0;
+  margin-bottom:18px;
+  display: block;
+  content: "Eventos de formación";
+}
+
+.np-header-mobile-menu-content-button:nth-child(1):after {
+  /* My Dashboard - mobile */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Mi Tablero";
+}
+
+.np-header-mobile-menu-content-button:nth-child(2):after {
+  /* Course Catalog - mobile */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Catálogo de Cursos";
+}
+
+.np-header-mobile-menu-content-button:nth-child(3):after {
+  /* Training Events - mobile */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Eventos de formación";
+}
+
+.np-header-mobile-menu-content-button:nth-child(4):after {
+  /* Profile Settings - mobile */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Configuración de Perfil";
+}
+
+.np-header-mobile-menu-content-button:nth-child(5):after {
+  /* Sign out - mobile */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Desconectar";
+}
+
 /* ACCOUNT */
 
 .radio__label.gravatar::after {
@@ -308,7 +422,7 @@
   content: "Ver";
 }
 
-.np-card-content-progress.np-button-color.notstarted::after {
+.np-card-content-progress.notstarted::after {
   /* Not started */
   text-indent: 0;
   line-height: 1;
@@ -330,7 +444,6 @@
   line-height: 1;
   display: block;
   content: "Completo";
-  margin-top: -13px;
 }
 
 /* EVENTS */
@@ -368,6 +481,70 @@
   content: "Filtrar";
 }
 
+.events-container #upcoming-trainings span:after {
+  /* View All */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Ver todo";
+}
+
+.events-container #new-user-journey span:after {
+  /* New User Journey */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Viaje del nuevo usuario";
+}
+
+.events-container #training-webinar-catalog span:after {
+  /* Training Webinar Catalog */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Catálogo de seminarios web de capacitación";
+}
+
+.events-container #development-training span:after {
+  /* Development Training */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Capacitación para el desarrollo";
+}
+
+.overlay-content .all-filter:after {
+  /* Clear All */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Limpiar Todo";
+}
+
+.overlay-content .filter-category:nth-of-type(1):after {
+  /* Region */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Región";
+}
+
+.overlay-content .filter-category:nth-of-type(2):after {
+  /* Product */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Producto";
+}
+
+.overlay-content .apply-button:after {
+  /* Apply */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Aplicar";
+}
+
 /* FOOTER */
 
 .np-footer-support-item.np-footer-support-help::after {
@@ -465,4 +642,232 @@
   display: block;
   content: "Sobre el modulo";
 }
-</style>
+
+/* HOMEPAGE CONTENT  */
+
+.homepage-hero-section .np-homepage-headline:after {
+  /* Welcome to Harri Academy! */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "¡Bienvenidos a la Academia Harri!";
+}
+
+.homepage-hero-section .np-homepage-subheadline:after {
+  /* Grow your skillset and take your Harri knowledge to the next level right here. To get started, browse our course catalog below or take a quick survey to view courses tailored to you. */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Haga crecer su conjunto de habilidades y lleve su conocimiento de Harri al siguiente nivel aquí mismo. Para comenzar, explore nuestro catálogo de cursos a continuación o complete una encuesta rápida para ver los cursos adaptados a usted.";
+}
+
+.homepage-hero-section .np-homepage-hero-cta:after {
+  /* Take Survey */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Tomar encuesta";
+}
+
+.homepage-getting-started-section .getting-started-heading:after {
+  /* My Assigned Learning */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Mi aprendizaje";
+}
+
+.homepage-getting-started-section .progress-heading:after {
+  /* My Progress */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Mi progreso";
+}
+
+.homepage-featured-section .featured-courses-heading:after {
+  /* Featured Content */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Contenido destacado";
+}
+
+.homepage-featured-section .featured-events-heading:after {
+  /* Featured Training Events */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Eventos de capacitación destacados";
+}
+
+.homepage-featured-section .view-all-events-heading:after {
+  /* View all Events */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Ver todos los eventos";
+}
+
+.contact-us-block .contact-us-block-title:after {
+  /* Need More Help? */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "¿Necesitas más ayuda?";
+}
+
+.contact-us-block .contact-us-block-subtitle:after {
+  /* Get in touch with our support team */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Póngase en contacto con nuestro equipo de soporte";
+}
+
+.contact-us-block .contact-us-block-cta:after {
+  /* Contact Us */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Contacta con nosotros";
+}
+
+/* EVENTS PAGE CONTENT  */
+
+.training-events-header:after {
+  /* Sign Up For Live Private Training! */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "¡Regístrese para la capacitación privada en vivo!";
+}
+
+.training-events-subheader:after {
+  /* Grow your Harri skill set with one of our Education Consultants during a private training customized just for you! */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "¡Haz crecer tu conjunto de habilidades de Harri con uno de nuestros consultores de educación durante una capacitación privada personalizada solo para ti!";
+}
+
+.training-events-headers .request-button:after {
+  /* Request Here */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Solicite aquí";
+}
+
+/* DASHBOARD CONTENT  */
+.dashboard-title:after {
+  /* Overview */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Descripción general";
+}
+
+.type-filter[data-filter="courses"]:after {
+  /* Filter - Courses */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Cursos";
+}
+
+.type-filter[data-filter="learning-paths"]:after {
+  /* Filter - Learning Paths */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Mis rutas";
+}
+
+.stats-container[data-item='in-progress'] .stats-label:after {
+  /* In Progress */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "En curso";
+}
+
+.stats-container[data-item='completed'] .stats-label:after {
+  /* Completed */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Completo";
+}
+
+.stats-container.events .stats-label:after {
+  /* Events */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Eventos";
+}
+
+#courses-in-progress-header:after {
+  /* In Progress */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "En curso";
+}
+
+#courses-in-progress-header-2:after {
+  /* My Progress */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Mi progreso";
+}
+
+#my-registered-events-heading:after {
+  /* My Registered Events */
+  text-indent: 0;
+  line-height: 0;
+  display: block;
+  content: "Mis eventos registrados";
+}
+
+
+/* CARDS CONTENT */
+.learning-path-items-definition:after {
+  /* Learning path Cards - Items */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Elementos";
+}
+
+.np-card-training-sessions-label:after {
+  /* Events Cards - Session */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  margin-top: -20px;
+  content: "Sesión";
+}
+
+/* CATALOG */
+
+#clearAll:after {
+  /* Clear all */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Limpiar todo";
+}
+
+.np-catalog-title:After {
+  /* Browse The Harri Academy Course Catalog */
+  text-indent: 0;
+  line-height: normal;
+  display: block;
+  content: "Explorar el catálogo de cursos de la Academia Harri";
+}
+
+
+</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_sub_navigation.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_sub_navigation.html.liquid
new file mode 100644
index 00000000..18b9fdcc
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_sub_navigation.html.liquid	
@@ -0,0 +1,15 @@
+<nav class="np-sub-navigation">
+  <div class="np-sub-navigation-content">
+    {% for link in navigations.sub_navigation %}
+      {% unless link.label == "Dashboard" or link.label == "Catalog" or link.label == "Events" %}
+        <div class="np-sub-navigation-content-item {{ link.label }} {{ link.active_class }}">
+          <a class="np-sub-navigation-content-item-link" href="{{ link.url }}">
+            <i class="{{ link.icon }} np-button-color np-sub-navigation-content-item-icon"></i>
+            <p class="{{ link.label }} sub-navigation-label" style="margin-top:0px;"> {{ link.label }} </p>
+          </a>
+          <div class="np-sub-navigation-content-item-bar np-button-background-color"></div>
+        </div>
+      {% endunless %}
+    {% endfor %}
+  </div>
+</nav>
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_events_dashboard.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_events_dashboard.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_events_dashboard.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_events_dashboard.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_events_filter.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_events_filter.html.liquid
new file mode 100644
index 00000000..4fc6a182
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_events_filter.html.liquid	
@@ -0,0 +1,55 @@
+<div class="np-filter training-event-filter">
+  <div class="dropdown training-event-dropdown">
+    <button
+      class="np-button dropdown-button training-event-dropdown-button"
+      data-toggle-class="is-open"
+      data-toggle-escape
+      data-toggle-outside
+      data-toggle-target-next
+      type="button"
+      onclick="openNav()"
+    >
+      {% t shared.filters.filter %}
+    </button>
+
+    <div id="myNav" class="overlay">
+      <!-- Button to close the overlay navigation -->
+
+
+      <!-- Overlay content -->
+      <div class="overlay-content">
+        <div class="overlay-items-container">
+          <div class="overlay-items-headers">
+            <a href="javascript:void(0)" class="closebtn" onclick="closeNav()">
+              <i style="color: #0088DD;" class="far fa-angle-left"></i>
+            </a>
+            <p class="filter-title">Filter</p>
+            <div class="all-filter" id="all">Clear All</div>
+          </div>
+          <div class="filter-container">
+            <p class="filter-category">Region</p>
+            <div class="circle-container region-circle" id="us">
+              <span class="green-circle"><span class="white-circle"></span></span><p class="filter-item">US</p>
+            </div>
+            <div class="circle-container region-circle" id="uk">
+              <span class="green-circle"><span class="white-circle"></span></span><p class="filter-item">UK</p>
+            </div>
+            <div class="circle-container region-circle" id="global">
+              <span class="green-circle"><span class="white-circle"></span></span><p class="filter-item">Global</p>
+            </div>
+            <p class="filter-category">Product</p>
+            <div class="circle-container product-circle" id="talent-acquisition">
+              <span class="green-circle"><span class="white-circle"></span></span><p class="filter-item">Talent Acquisition</p>
+            </div>
+            <div class="circle-container product-circle" id="workforce-management">
+              <span class="green-circle"><span class="white-circle"></span></span><p class="filter-item">Workforce Management</p>
+            </div>
+          </div>
+          <div style="" class="apply-button-container">
+            <div class="apply-button np-button" id="apply-button">Apply</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_events_index.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_events_index.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_events_index.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_events_index.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_events_zero_state.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_events_zero_state.html.liquid
new file mode 100644
index 00000000..20e4ac6a
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_events_zero_state.html.liquid	
@@ -0,0 +1,9 @@
+{% comment %} <div class="np-dashboard-resources-container">
+  <div class="np-zero-state-text training-events">
+    {% t .empty %}
+  </div>
+  <img
+    class="np-zero-state-training-events"
+    alt="{% t .empty %}"
+  />
+</div> {% endcomment %}
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_filter.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_filter.html.liquid
new file mode 100644
index 00000000..fe46b750
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_filter.html.liquid	
@@ -0,0 +1,58 @@
+<div class="np-filter training-event-filter">
+  <div class="dropdown training-event-dropdown">
+    <button
+      class="np-button dropdown-button training-event-dropdown-button"
+      data-toggle-class="is-open"
+      data-toggle-escape
+      data-toggle-outside
+      data-toggle-target-next
+      type="button"
+      onclick="openNav()"
+    >
+      {% t shared.filters.filter %}
+    </button>
+
+    <div id="myNav" class="overlay">
+      <!-- Button to close the overlay navigation -->
+
+
+      <!-- Overlay content -->
+      <div class="overlay-content">
+        <div class="overlay-items-container">
+          <div class="overlay-items-headers">
+            <a href="javascript:void(0)" class="closebtn" onclick="closeNav()">
+              <i style="color: #0088DD;" class="far fa-angle-down"></i>
+            </a>
+            <p class="filter-title">Filter</p>
+            <div class="all-filter" id="all">Clear All</div>
+          </div>
+          <div class="filter-container">
+ 
+            <p class="filter-category">Region</p>
+            <div class="circle-container region-circle" id="us">
+              <span class="green-circle"><span class="white-circle"></span></span><p class="filter-item">US</p>
+            </div>
+            <div class="circle-container region-circle" id="uk">
+              <span class="green-circle"><span class="white-circle"></span></span><p class="filter-item">UK</p>
+            </div>
+         {% comment %}
+            <div class="circle-container region-circle" id="global">
+              <span class="green-circle"><span class="white-circle"></span></span><p class="filter-item">Global</p>
+            </div>
+            {% endcomment %}
+            <p class="filter-category">Product</p>
+            <div class="circle-container product-circle" id="talent-acquisition">
+              <span class="green-circle"><span class="white-circle"></span></span><p class="filter-item">Talent Acquisition</p>
+            </div>
+            <div class="circle-container product-circle" id="workforce-management">
+              <span class="green-circle"><span class="white-circle"></span></span><p class="filter-item">Workforce Management</p>
+            </div>
+          </div>
+          <div style="" class="apply-button-container">
+            <div class="apply-button np-button" id="apply-button">Apply</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_calendars.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_calendars.html.liquid
new file mode 100644
index 00000000..bae2f4c9
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_calendars.html.liquid	
@@ -0,0 +1,58 @@
+
+<div class="dropdown dropdown-calendar">
+  <button
+    class="np-top-button np-button-font-color np-button np-button-big dropdown-calendar-button"
+    data-toggle-class="is-open"
+    data-toggle-escape
+    data-toggle-outside
+    data-toggle-target-next
+    type="button"
+  >
+    {% t .add_to_calendar %}
+    <i class="fas fa-chevron-down dropdown-calendar-button-chevron"></i>
+  </button>
+
+  <ul class="dropdown-calendar-menu">
+    <li class="dropdown-calendar-item">
+      <a
+        class="dropdown-calendar-item-element np-button-background-color-on-hover np-button-font-color-on-hover"
+        href="{{ training_session.google_calendar_url }}"
+        target="_blank"
+        id="googleCal"
+      >
+          {% t .google_calendar %}
+      </a>
+    </li>
+    <li class="dropdown-calendar-item">
+      <a
+        class="dropdown-calendar-item-element np-button-background-color-on-hover np-button-font-color-on-hover"
+        href="{{ training_session.outlook_calendar_url }}"
+        target="_blank"
+        id="outlookCal"
+      >
+          {% t .outlook_calendar %}
+      </a>
+    </li>
+    <li class="dropdown-calendar-item">
+      <a
+        class="dropdown-calendar-item-element np-button-background-color-on-hover np-button-font-color-on-hover"
+        href="{{ training_session.outlook_office_calendar_url }}"
+        target="_blank"
+        id="officeCal"
+      >
+          {% t .office_calendar %}
+      </a>
+    </li>
+    <li class="dropdown-calendar-item">
+      <a
+        class="dropdown-calendar-item-element np-button-background-color-on-hover np-button-font-color-on-hover"
+        href="{{ training_session.ical_calendar_url }}"
+        target="_blank"
+        id="icalCal"
+      >
+          {% t .ical_calendar %}
+      </a>
+    </li>
+  </ul>
+</div>
+
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_session_cta.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_cta.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_session_cta.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_cta.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_session_date.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_date.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_session_date.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_date.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_session_description.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_description.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_session_description.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_description.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_session_desktop_view.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_desktop_view.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_session_desktop_view.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_desktop_view.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_details.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_details.html.liquid
new file mode 100644
index 00000000..7bd05731
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_details.html.liquid	
@@ -0,0 +1,33 @@
+
+<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"></i>
+    {{ training_session.time_period }} {{ training_session.time_zone }}<br><br>
+    <div class="gmt-time" style="display:none">
+      <i class="fal fa-clock np-button-color np-training-session-icon"></i>
+      <span class="europe-converted-time"></span> BST
+    </div>
+
+  </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 %}
+    {% if training_session.registered? %}
+      <div class="np-training-session-location" id="sessionLocation" style="display:none;">
+        <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 %}
+  {% endif %}
+</div>
+
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_session_header.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_header.html.liquid
similarity index 78%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_session_header.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_header.html.liquid
index 10434cfa..92a6b47e 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_training_session_header.html.liquid	
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_header.html.liquid	
@@ -3,7 +3,7 @@
   <i class="fal fa-users-class np-button-color np-training-session-icon"></i>
 </div>
 <div class="np-top-title">
-  <a href="{% route home %}" class="np-back-button" aria-label="{% t shared.go_back %}">
+  <a href="/app/training_events" 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 }}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_session_mobile_view.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_mobile_view.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_session_mobile_view.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_mobile_view.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_session_more_sessions.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_more_sessions.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_session_more_sessions.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_more_sessions.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_status.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_status.html.liquid
new file mode 100644
index 00000000..75116282
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_status.html.liquid	
@@ -0,0 +1,6 @@
+<div class="np-training-session-cta-note np-training-session-tile-badge np-training-session-tile-badge-{{ training_session.status.type }}">
+    {% if training_session.approved? %}
+        <i class="far fa-check np-training-session-icon"></i>
+    {% endif %}
+    {{ training_session.status.label }}
+</div>
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_session_tile.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_tile.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_session_tile.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/_training_session_tile.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_video_catalog_filters.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_video_catalog_filters.html.liquid
new file mode 100644
index 00000000..d1a4324f
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_video_catalog_filters.html.liquid	
@@ -0,0 +1,165 @@
+{% assign topic_filters = "TALENT ACQUISITION, WORKFORCE MANAGEMENT, CORE HR, HARRI IQ & REPORTING, EMPLOYEE ENGAGEMENT, TALENT DEVELOPMENT, ROLES & PERMISSIONS, ADMIN & BRAND SETTINGS" %}
+
+<div class="catalog-filters">
+  <div class="filter-wrapper">
+    <i class="fa fa-chevron-left close-tray np-hidden-desktop"></i>
+    <div id="clearAll">Clear All</div>
+  </div>
+
+  <div class="filter-group">
+    <div class="filter-group-name">Topic</div>
+    {% for category in categories.in_catalog %}
+      {% assign category_name_upcase = category.name | upcase %}
+      {% if topic_filters contains category_name_upcase %}
+        <label class="checkbox-container">{{category.name}}
+          <input type="checkbox" name="{{category_name_upcase}}">
+          <span class="checkmark"></span>
+        </label>
+      {% endif %}
+    {% endfor %}
+  </div>
+
+  {% comment %} <div class="filter-group">
+    <div class="filter-group-name">Content Type</div>
+    <label class="checkbox-container">New Content
+      <input type="checkbox" name="NEW">
+      <span class="checkmark"></span>
+    </label>
+    <label class="checkbox-container">Updated Content
+      <input type="checkbox" name="UPDATED">
+      <span class="checkmark"></span>
+    </label>
+    <label class="checkbox-container">Completed Content
+      <input type="checkbox" name="COMPLETED">
+      <span class="checkmark"></span>
+    </label>
+    <label class="checkbox-container">Learning Paths
+      <input type="checkbox" name="LEARNING-PATH">
+      <span class="checkmark"></span>
+    </label>
+
+  </div> {% endcomment %}
+
+</div>
+
+<style>
+  .catalog-filters {
+    box-shadow: 0 10px 25px 0 rgb(14 27 46 / 18%);
+    padding: 24px;
+    position: fixed;
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    z-index: 300;
+    background: #fff;
+    border-top-left-radius: 30px;
+    border-top-right-radius: 30px;
+    transform: translateX(-1000px);
+    transition: all 0.3s;
+    height: 60vh;
+    overflow: scroll;
+  }
+
+  .catalog-filters.show {
+    transform: translateX(0);
+  }
+
+  .close-tray {
+    color:#0088dd;
+    font-size: 22px;
+  }
+
+  .filter-wrapper {
+    display:flex;
+    justify-content:space-between;
+  }
+
+  #clearAll {
+    color:#0088DD;
+    display: block;
+    cursor: pointer;
+  }
+
+  .filter-group .filter-group-name {
+    margin: 22px 0 16px;
+    color: #000;
+    font-weight: 700;
+    font-size: 22px;
+  }
+
+  .checkbox-container {
+    display: block;
+    position: relative;
+    padding-left: 35px;
+    margin-bottom: 20px;
+    cursor: pointer;
+    font-size: 16px;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+  }
+
+  .checkbox-container input {
+    position: absolute;
+    opacity: 0;
+    cursor: pointer;
+    height: 0;
+    width: 0;
+  }
+
+  .checkbox-container .checkmark {
+    position: absolute;
+    top: -4px;
+    left: 0;
+    height: 25px;
+    width: 25px;
+    border: 3px solid #00E79A;
+    border-radius: 50%;
+    background-color: #fff;
+  }
+
+  .checkbox-container input:checked ~ .checkmark {
+    background-color: #00E79A;
+  }
+
+  .checkbox-container .checkmark:after {
+    content: "";
+    position: absolute;
+    display: none;
+  }
+
+  .checkbox-container input:checked ~ .checkmark:after {
+    display: block;
+  }
+
+  .checkbox-container .checkmark:after {
+    left: 6px;
+    top: 2px;
+    width: 5px;
+    height: 10px;
+    border: solid white;
+    border-width: 0 3px 3px 0;
+    -webkit-transform: rotate(45deg);
+    -ms-transform: rotate(45deg);
+    transform: rotate(45deg);
+  }
+
+  @media (min-width:768px) {
+    .catalog-filters {
+      margin-right:32px;
+      padding: 20px;
+      position: static;
+      width: auto;
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+      transform: translateX(0);
+      height: auto;
+      overflow: unset;
+    }
+
+    .filter-wrapper {
+      justify-content:flex-end;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_video_courses_catalog.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_video_courses_catalog.html.liquid
new file mode 100644
index 00000000..cdb4b47f
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_video_courses_catalog.html.liquid	
@@ -0,0 +1,39 @@
+
+<div class="np-catalog-courses row row-with-thumbnails">
+  {% if courses.in_catalog.any? %}
+    {% for course in courses.in_catalog %}
+        {% assign course_categories = "" %}
+        {% if course.properties.bite_size_video == true %}
+          {% for cat in course.categories %}
+            {% assign course_categories = course_categories | append: " " | append: cat.name  %}
+          {% endfor %}
+          {% assign progress = "NOT-STARTED" %}
+          {% if course.progress > 0 and course.progress < 100 %}
+            {% assign progress = "IN-PROGRESS" %}
+          {% elsif course.progress == 100 %}
+            {% assign progress = "COMPLETED" %}
+          {% endif %}
+
+          {% assign ribbon = "" %}
+          {% assign course_ribbon = course.ribbon | upcase %}
+
+          {% if course_ribbon contains "UPDATED" %}
+            {% assign ribbon = "UPDATED" %}
+          {% elsif course_ribbon contains "NEW" %}
+            {% assign ribbon = "NEW" %}
+          {% endif %}
+
+          <div 
+            class="col-xs-12 col-md-6 col-lg-4 np-stretch-content catalog-item" 
+            data-filters="{{course_categories | upcase | strip}} {{progress}} {{ribbon}}"
+          >
+            {% include "cards_course_videos" with course %}
+          </div>
+        {% endif %}
+    {% endfor %}
+  {% endif %}
+
+
+</div>
+
+
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_video_sub_filters.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_video_sub_filters.html.liquid
new file mode 100644
index 00000000..cea974c1
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/_video_sub_filters.html.liquid	
@@ -0,0 +1,89 @@
+{% assign sub_cat_talent_acquisition = "JOB POSTING, APPLICANT MANAGEMENT, DOCUMENT MANAGEMENT, SETTINGS, TEMPLATES, REPORTS" %}
+{% assign sub_cat_workforce_management = "SETTINGS, REQUESTS, NOTIFICATIONS, COMMSHUB, LOGBOOK, SCHEDULE, FORECASTING, TEAMHUB, REPORTS, TIMESHEETS, ENGAGE" %}
+{% assign sub_cat_harri_iq = "SOURCE & HIRE REPORTS, TEAMLIVE REPORTS, HARRI IQ, UK PAYROLL REPORTS" %}
+{% assign sub_cat_employee_engagement = "CARRI, COMMSHUB" %}
+
+<div class="video-sub-filters">
+
+  <div class="sub-filter-group" data-parent="TALENT ACQUISITION">
+    {% for category in categories.in_catalog %}
+      {% assign category_name_upcase = category.name | upcase %}
+      {% if sub_cat_talent_acquisition contains category_name_upcase %}
+        <div class="sub-filter">{{category.name}}</div>
+      {% endif %}
+    {% endfor %}
+  </div>
+
+  <div class="sub-filter-group" data-parent="WORKFORCE MANAGEMENT">
+    {% for category in categories.in_catalog %}
+      {% assign category_name_upcase = category.name | upcase %}
+      {% if sub_cat_workforce_management contains category_name_upcase %}
+        <div class="sub-filter">{{category.name}}</div>
+      {% endif %}
+    {% endfor %}
+  </div>
+
+  <div class="sub-filter-group" data-parent="HARRI IQ & REPORTING">
+    {% for category in categories.in_catalog %}
+      {% assign category_name_upcase = category.name | upcase %}
+      {% if sub_cat_harri_iq contains category_name_upcase %}
+        <div class="sub-filter">{{category.name}}</div>
+      {% endif %}
+    {% endfor %}
+  </div>
+
+  <div class="sub-filter-group" data-parent="EMPLOYEE ENGAGEMENT">
+    {% for category in categories.in_catalog %}
+      {% assign category_name_upcase = category.name | upcase %}
+      {% if sub_cat_employee_engagement contains category_name_upcase %}
+        <div class="sub-filter">{{category.name}}</div>
+      {% endif %}
+    {% endfor %}
+  </div>
+
+</div>
+
+<style>
+  .video-sub-filters {
+    max-width: 1200px;
+    margin: 0 auto 32px;
+  }
+
+  .sub-filter-group {
+    display: none;
+    justify-content:center;
+    align-items:center;
+    flex-wrap:wrap;
+    margin-top:16px;
+  }
+
+  .sub-filter-group.active {
+    display: flex;
+  }
+
+  .sub-filter {
+    font-size:18px;
+    padding: 0 16px 32px;
+    width: auto;
+    cursor:pointer;
+    text-align:center;
+    text-align: center;
+    font-weight:700;
+  }
+
+  .sub-filter:hover {
+    text-decoration:underline;
+  }
+
+  .sub-filter.active {
+    text-decoration:underline;
+    font-weight:700;
+  }
+
+  @media (min-width:768px) {
+    .sub-filter {
+      font-size:20px;
+      padding: 0 24px 32px;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/account.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/account.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/account.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/account.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/asset-manager.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/asset-manager.html.liquid
new file mode 100644
index 00000000..b26a5c2c
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/asset-manager.html.liquid	
@@ -0,0 +1,7 @@
+{% include "header" %}
+<main class="np-main np-catalog np-subpage-container np-max-width">
+
+
+</main>
+{% include "footer" %}
+
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/auth_url_email.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/auth_url_email.html.liquid
similarity index 89%
rename from Custom_Templates/customer_templates/Harri - McDonalds/auth_url_email.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/auth_url_email.html.liquid
index c4c27a3b..a413959c 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/auth_url_email.html.liquid	
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/auth_url_email.html.liquid	
@@ -1,4 +1,4 @@
-<main class="np-box-container np-open-access sign-up">
+<main class="np-box-container np-open-access">
   <div class="np-box">
     {% include "header_minimal" %}
     <div class="np-box-content-container">
@@ -37,8 +37,7 @@
         </div>
         <div class="np-form-field">
           <label class="np-input-label" for="learner_email">
-            Harri {% t shared.email_address %} <br>(Please enter the email address that you use, or 
-              plan to use, to access your Harri account.)
+            {% t shared.email_address %}
           </label>
           <input
             class="np-input"
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/auth_url_employee.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/auth_url_employee.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/auth_url_employee.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/auth_url_employee.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/auth_url_phone_number.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/auth_url_phone_number.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/auth_url_phone_number.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/auth_url_phone_number.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/auth_url_terms.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/auth_url_terms.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/auth_url_terms.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/auth_url_terms.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/catalog.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/catalog.html.liquid
new file mode 100644
index 00000000..5f9cf4e5
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/catalog.html.liquid	
@@ -0,0 +1,142 @@
+{% include "header" %}
+<main class="np-main np-catalog np-subpage-container np-max-width">
+<div class="row">
+<div class="col-xs-12 col-md-3"></div>
+  <div class="np-catalog-header-wrapper col-xs-12 col-md-9">
+    <div class="np-catalog-header">
+      <div class="np-resource-title np-catalog-title">Browse the Course Catalog</div>
+      <div class="catalog-search">
+        <form action="{% route search %}" method="get" data-test="desktop-search">
+          <input
+            aria-label="search"
+            class="np-catalog-search"
+            type="text"
+            name="q"
+            placeholder="search"
+          />
+          <i class="np-header-search-icon fa fa-search"></i>
+        </form>
+      </div>
+    </div>
+    </div>
+  </div>
+
+  <div class="np-hidden-desktop">
+    <div class="mobile-filter-button">
+      Filter
+    </div>
+  </div>
+
+  <div class="catalog-content-wrapper row">
+      <div class="col-xs-12 col-md-3">
+        {% include "catalog_filters" %}
+      </div></div>
+
+      <div class="col-xs-12 col-md-9">
+          {% include "courses_catalog" %}
+      </div>
+  </div>
+
+</main>
+{% include "footer" %}
+
+<script>
+
+const checkboxFilters = document.querySelectorAll("input[type='checkbox']");
+const allItems = document.querySelectorAll(".catalog-item");
+
+document.querySelector(".mobile-filter-button").addEventListener("click", function() {
+  document.querySelector(".catalog-filters").classList.toggle("show")
+})
+
+document.querySelector(".close-tray").addEventListener("click", function() {
+  document.querySelector(".catalog-filters").classList.toggle("show")
+})
+
+document.getElementById("clearAll").addEventListener("click", showAll);
+
+checkboxFilters.forEach(function(checkbox) {
+  checkbox.addEventListener('change', (event) => {
+    filterAllItems()
+  })
+})
+
+function showAll() {
+  const catalogItems = document.querySelectorAll(".catalog-item");
+  catalogItems.forEach((item) => item.style.display = "flex")  // show all courses
+  checkboxFilters.forEach((filter) => filter.checked = false)  // Uncheck all filters
+}
+
+function filterAllItems() {
+  allItems.forEach((item) => item.style.display = "none")  // show all courses
+
+  let checkedFiltersCount = 0
+  let checkedFilters = []
+  checkboxFilters.forEach((filter) => {  
+    if (filter.checked) {
+      checkedFiltersCount++
+      checkedFilters.push(filter.name)
+    }
+  }) 
+
+  allItems.forEach((course) => {
+    var includesAllCategories = checkedFilters.every(item => course.dataset.filters.includes(item));
+    if (includesAllCategories) {
+      console.log(course)
+      course.style.display = "flex"
+    }
+  })
+ 
+  if (checkedFiltersCount == 0) {
+    allItems.forEach((item) => item.style.display = "flex")
+  }
+}
+</script>
+
+<style>
+  .catalog-item {
+    margin-bottom:32px;
+  }
+
+  .np-catalog.np-main {
+    padding: 0 24px;
+  }
+
+  .np-catalog-header-wrapper {
+    justify-content: center;
+    margin-bottom:32px;
+  }
+
+  .np-catalog-header {
+    align-items: center;
+  }
+
+  .catalog-content-wrapper .np-catalog-courses {
+    margin-top:0;
+  }
+
+  .mobile-filter-button {
+    background-color:#D9D9D9;
+    color:#000000;
+    padding: 4px 16px;
+    margin-bottom:20px;
+    cursor:pointer;
+    display: inline-block;
+  }
+
+  @media (min-width:992px) {
+    .catalog-item {
+      margin-bottom:0;
+    }
+  }
+
+  @media (min-width:1440px) {
+    .np-catalog.np-main {
+      padding: 0;
+    }
+
+    .np-catalog-header-wrapper {
+      margin-bottom:50px;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/course.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/course.html.liquid
new file mode 100644
index 00000000..3eb811ba
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/course.html.liquid	
@@ -0,0 +1,18 @@
+{% if course.properties.bite_size_video == true %}
+  {% if course.enrolled? %}
+    <script>window.location.replace("{% route course_viewer, course_id: course.id, learning_path_id: params.learning_path_id %}")</script>   
+  {% else %}
+    <script>window.location.replace("{% route course_enrollment, code: course.enrollment_code %}")</script>
+  {% endif %}
+{% endif %}
+
+{% include "header" %}
+<main class="np-main np-max-width np-page-container">
+  <div class="np-hidden-mobile" id="course-desktop">
+    {% include "course_desktop_view" %}
+  </div>
+  <div class="np-hidden-desktop" id="course-mobile">
+    {% include "course_mobile_view" %}
+  </div>
+</main>
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/courses.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/courses.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/courses.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/courses.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/dashboard.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/dashboard.html.liquid
new file mode 100644
index 00000000..35006034
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/dashboard.html.liquid	
@@ -0,0 +1,435 @@
+{% assign enrolled_lps = learning_paths.enrolled %}
+{% assign lps_in_progress = 0 %}
+{% assign lps_completed = 0 %}
+
+{% for learning_path in enrolled_lps %}
+  {% assign lp_progress = 0 %}
+  {% if learning_path.enrolled? %}
+    {% assign lp_courses_count = 0 | times: 1 %}
+    {% assign sum_of_progress = 0.0 | times: 1 %}
+    
+    {% for item in learning_path.items %}
+      {% if item.course? %}
+        {% assign lp_courses_count = lp_courses_count | plus: 1 %}
+        {% assign sum_of_progress = sum_of_progress | plus: item.progress %}
+      {% endif %}
+    {% endfor %}
+
+    {% if lp_courses_count == 0 %}
+      {% assign lp_progress = 0 %}
+    {% else %}
+      {% assign lp_progress = sum_of_progress | divided_by: lp_courses_count | round %}
+    {% endif %}
+  {% else %}
+    {% assign lp_progress = 0 %}
+  {% endif %}
+
+  {% if lp_progress < 100 %}
+    {% assign lps_in_progress = lps_in_progress | plus: 1 %}
+  {% elsif lp_progress == 100 %}
+    {% assign lps_completed = lps_completed | plus: 1 %}
+  {% endif %}
+{% endfor %}
+
+{% assign enrolled_courses = courses.enrolled %}
+{% assign courses_in_progress = 0 %}
+{% assign courses_completed = 0 %}
+
+{% for course in enrolled_courses %}
+  {% if course.progress < 100 %}
+    {% assign courses_in_progress = courses_in_progress | plus: 1 %}
+  {% elsif course.progress == 100 %}
+    {% assign courses_completed = courses_completed | plus: 1 %}
+  {% endif %}
+{% endfor %}
+
+{% assign enrolled_events = training_events.enrolled %}
+{% assign enrolled_events_count = 0 %}
+
+{% for event in enrolled_events %}
+  {% assign enrolled_events_count = enrolled_events_count | plus: 1 %}
+{% endfor %}
+
+{% include "header" %}
+
+<main class="np-main np-dashboard np-max-width">
+
+  <div class="row ">
+    <div class="col-xs-12 dashboard-heading">
+      <div class="dashboard-title small-heading">Overview</div>
+      <div class="course-type-filters">
+        <div class="type-filter active" data-filter="courses">Courses</div>
+        {% if features.learning_paths? %}
+          <div class="type-filter" data-filter='learning-paths'>Learning Paths</div>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+
+  <div class="dashboard-stats col-xs-12 col-md-7">
+    {% comment %} Courses - in progress {% endcomment %}
+    <div class="stats-container courses show" data-item="in-progress">
+      <div class="stats-label">In Progress</div>
+      <div class="stats-number">{{courses_in_progress}}</div>
+    </div>
+
+    {% comment %} Courses - Completed  {% endcomment %}
+    <div class="stats-container courses show" data-item="completed">
+      <div class="stats-label">Completed</div>
+      <div class="stats-number">{{courses_completed}}</div>
+    </div>
+
+    {% comment %} Learning Paths - In Progress  {% endcomment %}
+    <div class="stats-container learning-paths" data-item="in-progress">
+      <div class="stats-label">In Progress</div>
+      <div class="stats-number">{{lps_in_progress}}</div>
+    </div>
+
+    {% comment %} Learning Paths - Completed  {% endcomment %}
+    <div class="stats-container learning-paths" data-item="completed">
+      <div class="stats-label">Completed</div>
+      <div class="stats-number">{{lps_completed}}</div>
+    </div>
+
+    {% comment %} Number of Events  
+    <div class="stats-container events show">
+      <div class="stats-label">Events</div>
+      <div class="stats-number">{{enrolled_events_count}}</div>
+    </div>
+    {% endcomment %}
+  </div>
+
+  <div class="row">
+    <div class="col-xs-12">
+
+      {% comment %} LEARNING PATHS BLOCK  {% endcomment %}
+       {% include "dashboard_lps_block", items: enrolled_lps %}
+
+      {% comment %} COURSES BLOCK  {% endcomment %}
+      {% include "dashboard_courses_block", items: enrolled_courses %}
+
+    </div>
+
+    {% comment %} TRAINING EVENTS BLOCK  
+    {% if features.training_events? %}
+      <div class="col-xs-12 col-sm-6 events-block">
+        <div class="small-heading" id="my-registered-events-heading">
+          My Registered Events
+        </div>
+        {% if training_events.enrolled.any? %}
+          {% for training_event in training_events.enrolled %}
+            {% include "cards_training_event_horizontal" with training_event %}
+          {% endfor %}
+        {% else %}
+          {% include "training_events_zero_state" %}
+        {% endif %}
+      </div>
+    {% endif %}{% endcomment %}
+  </div>
+</main>
+
+{% include "footer" %}
+
+<script>
+  var filters = document.getElementsByClassName("type-filter");
+
+  var changeTabs = function() {
+    var selectedFilter = this.getAttribute("data-filter");
+
+    // Update filter active state
+    document.querySelectorAll('.type-filter').forEach(function(filter) {
+      filter.classList.remove("active")
+    })
+    this.classList.add('active')
+
+    // Toggle sections
+    document.querySelectorAll(".filterable-section").forEach(function(section) {
+      section.classList.remove("active")
+
+      if (section.getAttribute("data-type") == selectedFilter) {
+         section.classList.add("active")
+      }
+    })
+
+    document.querySelectorAll(".stats-container").forEach(function(stat) {
+      if (stat.classList.contains("courses") || stat.classList.contains("learning-paths")) {
+        stat.classList.remove("show")
+      }
+
+      if (stat.classList.contains(selectedFilter)) {
+        stat.classList.add("show")
+      }
+    })
+      
+  };
+
+  for (var i = 0; i < filters.length; i++) {
+    filters[i].addEventListener('click', changeTabs, false);
+  }
+
+  document.querySelector(".stats-container.courses[data-item='in-progress']").addEventListener("click", function() {
+    document.querySelector(".courses-in-progress").classList.add("show")
+    document.querySelector(".courses-completed").classList.remove("show")
+    resetShowMore()
+  })
+
+  document.querySelector(".stats-container.courses[data-item='completed']").addEventListener("click", function() {
+    document.querySelector(".courses-in-progress").classList.remove("show")
+    document.querySelector(".courses-completed").classList.add("show")
+     resetShowMore()
+  })
+
+  document.querySelector(".stats-container.learning-paths[data-item='in-progress']").addEventListener("click", function() {
+    document.querySelector(".lps-in-progress").classList.add("show")
+    document.querySelector(".lps-completed").classList.remove("show")
+     resetShowMore()
+  })
+
+  document.querySelector(".stats-container.learning-paths[data-item='completed']").addEventListener("click", function() {
+    document.querySelector(".lps-in-progress").classList.remove("show")
+    document.querySelector(".lps-completed").classList.add("show")
+    resetShowMore()
+  })
+
+  function resetShowMore() {
+    $(".courses-in-progress .dashboard-courses-row").hide()
+    $(`.courses-in-progress .dashboard-courses-row:lt(${3})`).css('display', 'flex'); 
+
+    $(".courses-completed .dashboard-courses-row").hide()
+    $(`.courses-completed .dashboard-courses-row:lt(${3})`).css('display', 'flex'); 
+
+    $(`.lps-in-progress .dashboard-learning-paths-row`).hide(); 
+    $(`.lps-in-progress .dashboard-learning-paths-row:lt(${3})`).css('display', 'flex'); 
+
+    $(`.lps-completed .dashboard-learning-paths-row`).hide(); 
+    $(`.lps-completed .dashboard-learning-paths-row:lt(${3})`).css('display', 'flex'); 
+
+    $(".show-more-button").show()
+  }
+
+
+  window.onload = function () {
+    //courses show more 
+    progress_courses_size_li = $(".courses-in-progress .dashboard-courses-row").length;
+    completed_courses_size_li = $(".courses-completed .dashboard-courses-row").length;
+
+    $(`.courses-in-progress .dashboard-courses-row:lt(3)`).css('display', 'flex');   
+    $('#showMoreInProgressCourses').click(function () {
+      $(`.courses-in-progress .dashboard-courses-row:lt(${progress_courses_size_li})`).css('display', 'flex'); 
+      $('#showMoreInProgressCourses').hide();
+    });
+
+    $(`.courses-completed .dashboard-courses-row:lt(3)`).css('display', 'flex');   
+    $('#showMoreCompletedCourses').click(function () {
+      $(`.courses-completed .dashboard-courses-row:lt(${completed_courses_size_li})`).css('display', 'flex');
+      $('#showMoreCompletedCourses').hide();
+    });
+
+    //learning paths show more 
+    progress_lps_size_li =  $(".lps-in-progress .dashboard-learning-paths-row").length;
+    completed_lps_size_li = $(".lps-completed .dashboard-learning-paths-row").length;
+
+    $(`.lps-in-progress .dashboard-learning-paths-row:lt(${3})`).css('display', 'flex');   
+    $('#showMoreInProgressLps').click(function () {
+      $(`.lps-in-progress .dashboard-learning-paths-row:lt(${progress_lps_size_li})`).css('display', 'flex');
+      $('#showMoreInProgressLps').hide();
+    });
+
+    $(`.lps-completed .dashboard-learning-paths-row:lt(${3})`).css('display', 'flex');   
+    $('#showMoreCompletedLps').click(function () {
+      $(`.lps-completed .dashboard-learning-paths-row:lt(${completed_lps_size_li})`).css('display', 'flex');    
+      $('#showMoreCompletedLps').hide();
+    });
+    
+  };
+
+</script>
+
+
+
+<style>
+
+  .np-dashboard {
+    padding: 40px 16px;
+  }
+
+  .dashboard-heading .course-type-filters {
+    display:flex;
+    align-items:center;
+    margin-top:16px;
+    width:100%;
+  }
+
+  .dashboard-heading .dashboard-title {
+    font-size:24px;
+    font-weight:500;
+  }
+
+  .dashboard-heading .type-filter {
+    color: #db1020;
+    margin-right: 16px;
+    cursor: pointer;
+  }
+
+  .dashboard-heading .type-filter.active {
+    font-weight:700;
+    text-decoration:underline;
+  }
+
+  .filterable-section { display:none; }
+  .filterable-section.active { display:block; }
+
+  /* STATS */ 
+  .dashboard-stats {
+    display:flex;
+    flex-wrap:wrap;
+    margin: 32px 0;
+    justify-content: space-between;
+  }
+
+  .stats-container {
+    width: calc(50% - 8px);
+    background-color: #fff;
+    box-shadow: 0 10px 25px 0 rgb(14 27 46 / 18%);
+    margin-bottom: 16px;
+    padding: 16px;
+    position: relative;
+    display:none;
+  }
+
+  .stats-container.show {
+    display:block;
+  }
+
+  .stats-container:after {
+    content: "";
+    background-color: #db1020;
+    height:5px;
+    width: 70%;
+    position: absolute;
+    bottom:0;
+    right:0;
+  }
+
+  .stats-label {
+    font-weight:500;
+  }
+
+  .stats-number {
+    font-size: 40px;
+    text-align: right;
+    margin-top: 12px;
+  }
+
+  .stats-container.courses,
+  .stats-container.learning-paths {
+    cursor:pointer;
+    transition:all 0.2s;
+  }
+
+  .stats-container.courses:hover,
+  .stats-container.learning-paths:hover {
+    box-shadow: 0 16px 31px 0 rgb(14 27 46 / 18%);
+  }
+
+  .dashboard-courses-row,
+  .dashboard-learning-paths-row {
+    margin-bottom:32px;
+  }
+
+  .dashboard-courses-row .np-card,
+  .dashboard-learning-paths-row .np-card {
+    padding-bottom:0;
+  }
+
+  .courses-in-progress,
+  .courses-completed,
+  .lps-in-progress,
+  .lps-completed {
+    display:none;
+  }
+
+  .courses-in-progress.show,
+  .courses-completed.show,
+  .lps-in-progress.show,
+  .lps-completed.show {
+    display:flex;
+  }
+
+  .dashboard-courses-row .np-card-horizontal {
+    height:100%;
+  }
+
+  .dashboard-zero-state {
+    margin-bottom:32px;
+  }
+
+  .show-more-button {
+    color: #db1020;
+    text-decoration: underline;
+    font-size: 20px;
+    text-align: center;
+    font-weight: 500;
+    margin-top: 50px;
+    cursor: pointer;
+  }
+
+  @media (min-width:768px) {
+     .np-dashboard {
+      padding: 64px 16px;
+    }
+
+    .dashboard-heading {
+      display:flex; 
+      align-items: center;
+      margin-bottom:40px;
+    }
+
+    .dashboard-heading .dashboard-title {
+      margin-bottom:0;
+      margin-right:64px;
+      font-size:32px;
+    }
+
+    .dashboard-heading .course-type-filters {
+      margin-top:0;
+    }
+
+    .dashboard-heading .type-filter {
+      font-size:22px;
+      margin-right:36px;
+    }
+
+    .stats-container {
+      width: calc(25% - 12px);
+      max-width:250px;
+    }
+
+    .stats-container:after {
+      height: 7px;
+    }
+
+    .stats-label {
+      font-size:22px;
+    }
+
+    .stats-number {
+      font-size: 55px;
+    }
+
+    .dashboard-zero-state {
+      margin-bottom:48px;
+    }
+
+    .events-block {
+      margin-top:32px;
+    }
+    .np-card.card-training-event-horizontal { padding-left:0;}
+  }
+
+    @media (max-width: 1024px) {
+        .progress-heading, .course-progress-wrapper {
+            display: none;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/forgot_password.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/forgot_password.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/forgot_password.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/forgot_password.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/homepage.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/homepage.html.liquid
new file mode 100644
index 00000000..0a543f0d
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/homepage.html.liquid	
@@ -0,0 +1,129 @@
+{% include "header" %}
+
+  <main class="np-main np-homepage np-max-width">
+    <div class="homepage-hero-section row">
+      <div class="col-xs-12 col-sm-6 col-lg-5 sp-evenly">
+        <div class="np-homepage-headline">{{ homepage.headline }}</div>
+        <div class="np-homepage-subheadline">{{ homepage.subheadline }}</div>
+        <div class="hero-ctas">
+        <div class="np-homepage-hero-cta-wrapper">
+          <a class="np-homepage-hero-cta np-button" href="/app/dashboard">
+            My Courses
+          </a>
+        </div>
+
+          <div class="np-homepage-hero-cta-wrapper">
+          <a class="np-homepage-hero-cta np-button" href="/c/f60863bb7c01b1344ac8c77e5043ad43aea49161">
+            What's new
+          </a>
+        </div>
+
+      </div>
+      </div>
+      <div class="col-xs-12 col-sm-6 col-lg-5 col-lg-offset-2 hero-container np-hidden-mobile">
+      <div class="hero-image">
+       <img src="https://s3.amazonaws.com/schoolkeep-production/wysiwyg/01964507-8c4e-4f78-93b6-078efffa1998/20240215223539_harri-academy-homepage.png" style="display: block; vertical-align: top; margin: 5px auto; text-align: center;" url="https://s3.amazonaws.com/schoolkeep-production/wysiwyg/01964507-8c4e-4f78-93b6-078efffa1998/20240215223539_harri-academy-homepage.png" id="wysiwyg/01964507-8c4e-4f78-93b6-078efffa1998/20240215223539_harri-academy-homepage.png">
+       </div>
+      </div>
+    </div>
+    {% include "homepage_learning_progress" %}
+    {% include "homepage_getting_started" %}
+
+{% comment %}
+    <div class="section-horizontal-rule"></div>
+{% endcomment %}
+    {% include "homepage_featured_content" %}
+
+
+  </main>
+
+  {% include "contact_us_block" %}
+
+
+{% include "footer" %}
+
+<style> 
+
+  .homepage-hero-section {
+    height:450px;
+    background: #E3EEF9;
+    border-radius: 16px;
+    padding: 4%;
+  }
+
+  .np-homepage-headline {
+    font-weight:800;
+    font-size: 32px;
+  }
+
+  .np-homepage-subheadline {
+    opacity:1;
+    line-height:1.5rem;
+  }
+
+  .np-homepage-hero-cta-wrapper {
+    text-align:center;
+  }
+@media (max-width: 768px) {
+  .np-homepage-headline, .np-homepage-subheadline {
+    text-align: center;
+  }
+}
+  @media (min-width:768px) {
+
+    .np-homepage-headline {
+      font-size:40px;
+    }
+
+    .np-homepage-subheadline {
+      font-size:18px;
+    }
+
+    .np-homepage-hero-cta-wrapper {
+      text-align:left;
+      margin-top:12px;
+      margin-right: 20px;
+    }
+  }
+
+  @media (max-width:1440px) {
+    .np-homepage {
+      padding: 0 16px;
+    }
+  }
+.hero-container {
+    display: flex;
+    align-items: center;
+}
+  .hero-image {
+    display: block;
+    vertical-align: top;
+    margin: 5px;
+    text-align: center;
+  }
+
+  .hero-image img {
+    height: auto;
+    width: 100%;
+  }
+
+  .sp-evenly {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-evenly;
+  }
+
+  .homepage-subtitles {
+    font-size: 32px;
+    font-weight: bold;
+  }
+  .hero-ctas {
+    display:flex;
+    align-content: space-around;
+  }
+  @media (max-width:768px) {
+    .hero-ctas {
+      justify-content: space-around;
+    }
+  }
+</style>
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/learning_path.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/learning_path.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/learning_path.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/learning_path.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/learning_path_summary.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/learning_path_summary.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/learning_path_summary.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/learning_path_summary.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/learning_paths.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/learning_paths.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/learning_paths.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/learning_paths.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/login.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/login.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/login.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/login.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/master.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/master.html.liquid
new file mode 100644
index 00000000..63345068
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/master.html.liquid	
@@ -0,0 +1 @@
+{% body %}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/not_found.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/not_found.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/not_found.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/not_found.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/private_certificate.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/private_certificate.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/private_certificate.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/private_certificate.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/public_certificate.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/public_certificate.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/public_certificate.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/public_certificate.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/reset_password.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/reset_password.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/reset_password.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/reset_password.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/search.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/search.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/search.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/search.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/sign_up.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/sign_up.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/sign_up.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/sign_up.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/styles.css.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/styles.css.liquid
new file mode 100644
index 00000000..00322524
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/styles.css.liquid	
@@ -0,0 +1,343 @@
+ /*
+ Put your custom overlay styles in here
+ You can use your northpass color palette in this file
+
+{{ color_palette.button_font_color }}
+{{ color_palette.button_color }}
+{{ color_palette.button_hover_color }}
+{{ color_palette.header_font_color }}
+{{ color_palette.header_font_hover_color }}
+{{ color_palette.header_color }}
+*/
+
+html,
+body {
+    font-family: 'Open Sans', 'Roboto', sans-serif;
+    color: #35404E;
+}
+
+body.new-styles,
+body.new-styles .np-dashboard,
+body.new-styles .np-learning-paths {
+    background-color:#fff;
+}
+
+body.new-styles .np-button {
+    border-radius: 0;
+    font-size:16px;
+    transition: all 0.2s;
+    border: 1px solid #de352a;
+}
+
+body.new-styles .np-button:hover {
+    background-color: white;
+    color: #de352a;
+}
+
+body.new-styles .np-card-container {
+    box-shadow: 0 10px 25px 0 rgb(14 27 46 / 18%);
+    border-radius:0;
+}
+
+div[id^='CookieNotice-'] {
+    z-index: 1000;
+    position: fixed;
+    background: #fff;
+    bottom: 0;
+    width: 100%;
+    left: 0;
+}
+
+.section-horizontal-rule {
+    height:1px;
+    width:100%;
+    max-width:350px;
+    background: #000;
+    margin: 64px auto;
+}
+
+.small-heading {
+    font-size: 20px;
+    margin-bottom: 24px;
+    font-weight:500;
+}
+
+body.new-styles .np-homepage,
+body.new-styles .np-dashboard,
+body.new-styles .np-subpage-container {
+    margin-top:130px;
+}
+
+body.new-styles .np-page-container {
+    margin-top:150px;
+}
+
+@media (min-width:768px) {
+	.small-heading {
+        font-size: 24px;
+        margin-bottom: 32px;
+	}
+}
+
+
+.np-main.np-homepage {
+    padding: 0 5%;
+}
+
+
+.red-bar{
+    background: red;
+}
+
+.red-text,
+.red-status{
+    color: red;
+}
+
+.yellow-bar{
+    background: yellow;
+}
+
+.yellow-text,
+.yellow-status{
+    color: yellow;
+}
+
+.green-bar{
+    background: green;
+}
+
+.green-text,
+.green-status{
+    color: green;
+}
+
+.course-progress-wrapper {
+    background: #F8FBFF;
+    padding:16px;
+    height:100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color:#de352a;
+}
+
+/* VERTICAL COURSE CARDS  */
+.np-card-new-styles {
+    text-decoration:none;
+}
+
+.np-card-new-styles .np-card-content-title {
+    margin-top:0;
+}
+
+.np-card-new-styles .np-card-ribbon {
+    padding: 5px;
+    border-radius: 50%;
+    width: 70px;
+    height: 70px;
+    top: -16px;
+    right: -16px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 11px;
+    text-transform: none;
+    z-index:2;
+    text-align:center;
+}
+
+.np-card-new-styles .np-card-content-short-description {
+    color: #1b3e4f;
+}
+
+.np-card-new-styles .np-card-content-progress {
+    font-weight: 500;
+    color: #35404E;
+    text-transform: none;
+    font-size: 14px;
+}
+
+.np-card-new-styles .course-length {
+    color:#35404E;
+    margin-left:auto;
+}
+
+@media (min-width:768px) {
+    .np-card-new-styles .np-card-ribbon {
+        width: 75px;
+        height: 75px;
+        top: -25px;
+        right: -25px;
+        font-size: 12px;
+    }
+}
+
+/* HORIZONTAL COURSE CARDS  */
+
+.np-card-horizontal .np-card-content-short-description {
+    font-size:14px;
+    line-height:18px;
+}
+
+.np-card-horizontal .np-card-content-footer {
+    margin-top:16px;
+}
+
+.np-card-horizontal .np-course-version-outdated-popup {
+    margin-left:12px;
+    margin-right:auto;
+}
+
+@media (min-width:768px) {
+    .np-card.np-card-horizontal {
+        padding: 0;
+    }
+
+    .np-card-horizontal .np-card-container {
+        flex-direction:row;
+    }
+
+    .np-card-horizontal .np-card-image-wrapper {
+        width: 35%;
+        position: relative;
+        overflow: hidden;
+        background: #F8FBFF;
+    }
+
+    .np-card-horizontal .np-card-image{
+        border-radius: 0;
+        height: auto;
+        width: 100%;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+    }
+
+    .np-card-horizontal .np-card-content {
+        padding: 16px;
+    }
+
+    .np-card-horizontal .np-card-content-footer {
+        margin-top:24px;
+    }
+
+    .np-card-horizontal .np-card-content-title {
+        margin-top:0;
+    }
+
+    .np-card-horizontal .np-card-content-short-description {
+        font-size:16px;
+        line-height:20px;
+    }
+}
+
+/* END HORIZONTAL COURSE CARDS  */
+
+/* VIDEO COURSE CARDS  */
+.np-card.video-card .img-wrapper {
+    position:relative;
+}
+
+.np-card.video-card .img-wrapper i.fa-play {
+    position:absolute;
+    top:50%;
+    left:50%;
+    transform:translate(-50%, -50%);
+    font-size:70px;
+    color:#666;
+}
+
+/* END VIDEO COURSE CARDS  */
+
+/* HORIZONTAL TRAINING EVENT CARDS  */
+
+.card-training-event-horizontal.np-card {
+    padding-bottom:32px;
+    min-height: auto;
+}
+
+.card-training-event-horizontal .upcoming-date {
+    position:relative;
+    min-height: 132px;
+    padding: 16px;
+    text-align: center;
+}
+
+.card-training-event-horizontal .upcoming-date:before {
+    content: '\f133';
+    font-family: 'Font Awesome 5 Pro';
+    color: #de352a;
+    width:100%;
+    height:100px;
+    position:absolute;
+    font-size: 100px;
+    left: 0;
+    top: 12px;
+}
+
+.card-training-event-horizontal .np-card-training-session-date-month {
+    font-size: 14px;
+    margin-top: 38px;
+}
+
+.card-training-event-horizontal .np-card-training-session-date-day {
+    font-size: 32px;
+    margin: 0;
+}
+
+.card-training-event-horizontal .np-card-content-title {
+    font-size: 18px;
+}
+
+.card-training-event-horizontal .card-footer {
+    margin-top:16px;
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+}
+
+@media (min-width:768px) {
+    .card-training-event-horizontal .np-card-container {
+        flex-direction:row;
+    }
+
+    .card-training-event-horizontal .upcoming-date {
+        min-width:150px;
+    }
+
+    .card-training-event-horizontal .np-card-content-title {
+        margin-top:0;
+        font-size:22px;
+    }
+}
+
+/* END HORIZONTAL TRAINING EVENT CARDS  */
+
+/* 2024 Added styles */
+.np-catalog-search {
+    width: 320px;
+    height: 50px;
+    padding-left: 34px;
+    margin-top: 20px;
+    border-radius: 8px;
+    border: 1px solid #bac4ca;
+}
+/* search icon made to important-overwrite NP default icon styles */
+.np-header-search-icon {
+    color: #bac4ca !important;
+    font-size: 16px;
+    position: relative !important;
+    right: 310px !important;
+    top: 0px !important;
+}
+
+@media screen and (min-width: 768px)
+.np-header-search-icon {
+    color: #bac4ca !important;
+    font-size: 16px;
+    position: relative !important;
+    right: 310px !important;
+    top: 0px !important;
+}
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/training.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/training.html.liquid
new file mode 100644
index 00000000..68faed9e
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/training.html.liquid	
@@ -0,0 +1,705 @@
+{% include "header" %}
+
+{% comment %} <div class="training-events-coming-soon np-subpage-container np-max-width" style="text-align: center;">
+  <div style="color:#0088dd;font-weight:700;font-size:40px;">Coming soon!</div>
+</div> 
+
+ <div class="row training-events-headers">
+  <div class="col-xs-12 col-sm-10">
+    <div class="np-resource-title training-events-header">
+      Start your Harri Training Today!
+    </div>
+    <div class="np-resource-subtitle training-events-subheader">
+      Click on your role below to see your on-demand training courses.
+    </div>
+    <div class="request-button-container">
+      <a href="https://docs.google.com/forms/d/1wmGpIvYgAYvXqMgTawVqjfdO1PwhtpbpD9BOSkQqj-w/edit" target="_blank" class="request-button np-button">Request Here</a>
+    </div>
+  </div>
+</div>
+{% endcomment %}
+
+ <div class="row training-events-headers">
+  <div class="col-xs-12 col-sm-10">
+    <div class="np-resource-title training-events-header">
+      Start your Harri Training Today!
+    </div>
+    <div class="np-resource-subtitle training-events-subheader">
+      Click on your role below to see your on-demand training courses.
+    </div>
+    <div class="request-button-container">
+        <button onclick="scrollDown()" class="request-button np-button">Browse Courses</button>
+    </div>
+  </div>
+</div>
+
+ <div class="titles-container" id="trainingTitles">
+  <div class="events-container row">
+    <div id="upcoming-trainings" class="event">
+      <div class="active-section event-section">
+        <span>View All</span>
+      </div>
+    </div>
+    <div id="new-user-journey" class="event">
+      <div class="event-section">
+        <span>New Manager Training</span>
+      </div>
+    </div>
+    <div id="training-webinar-catalog" class="event">
+      <div class="event-section">
+        <span>New Admin Training</span>
+      </div>
+    </div>
+    {% include "training_filter" %}
+  </div>
+</div>
+
+ <main class="np-main np-training-events np-subpage-container np-max-width">
+  <div id="upcoming-trainings-container">
+    {% include "onboarding_index" %}
+  </div>
+  <div style="display: none;" id="new-user-journey-container">
+    {% include "manager_index" %}
+  </div>
+  <div style="display: none;" id="training-webinar-catalog-container">
+    {% include "admin_index" %}
+  </div>
+  <div style="display: none;" id="zero-state">
+    Coming Soon!
+  </div>
+</main> 
+  {% include "private_training_block" %}
+{% include "footer" %}
+
+<script>
+  var isUS = false
+  var isUK = false
+  var isGlobal = false
+  var isWorkforceManagement = false
+  var isTalentAcquisition = false
+
+  window.addEventListener('DOMContentLoaded', (event) => {
+    document.querySelectorAll('.event').forEach((item) => {
+      item.addEventListener('click', changeSection)
+    })
+
+    document.getElementById('all').addEventListener('click', clearAll)
+
+    document.getElementById('uk').addEventListener('click', chooseRegion)
+    document.getElementById('us').addEventListener('click', chooseRegion)
+        {% comment %}
+    document.getElementById('global').addEventListener('click', chooseRegion)
+    {% endcomment %}
+    document.getElementById('workforce-management').addEventListener('click', chooseProduct)
+    document.getElementById('talent-acquisition').addEventListener('click', chooseProduct)
+    document.getElementById('apply-button').addEventListener('click', showCategory)
+
+
+    window.addEventListener('click', function(e){
+      if (document.querySelector('.training-event-dropdown-button').contains(e.target))
+        openNav()
+      else if (!document.querySelector('.overlay-items-container').contains(e.target))
+        closeNav();
+    });
+  })
+  
+  function clearAll(e) {
+    closeNav();
+    showAll();
+
+    removeAllCircleColor();
+    resetChosenValues();
+  }
+
+  function chooseRegion() {
+    if (this.id === "uk") {
+      isUK = true
+      changeCircleColor(this.id)
+      isUS = false
+
+      removeCircleColor("us");
+
+    }
+
+    if (this.id === "us") {
+      isUS = true
+      changeCircleColor(this.id)
+      isUK = false
+
+      removeCircleColor("uk");
+
+    }
+
+{% comment %}
+In an old iteration of this function, there was a "global" button
+     if (this.id === "global") {
+      isGlobal = true
+      changeCircleColor(this.id)
+      isUK = false
+      isUS = false
+      removeCircleColor("uk");
+      removeCircleColor("us");
+    }
+    {% endcomment%}
+  }
+
+  function chooseProduct() {
+    if (this.id === "talent-acquisition") {
+      isTalentAcquisition = true
+      changeCircleColor(this.id)
+      isWorkforceManagement = false
+      removeCircleColor("workforce-management");
+    }
+
+    if (this.id === "workforce-management") {
+      isWorkforceManagement = true
+      changeCircleColor(this.id)
+      isTalentAcquisition = false
+      removeCircleColor("talent-acquisition");
+    }
+  }
+
+  function removeCircleColor(id) {
+    document.getElementById(id).querySelector('.white-circle').classList.remove("active-circle");
+  }
+
+  function removeAllCircleColor() {
+    document.querySelectorAll('.white-circle').forEach((item) => {
+      item.classList.remove("active-circle");
+    })
+  }
+
+  function changeCircleColor(id) {
+    document.getElementById(id).querySelector('.white-circle').classList.add("active-circle");
+  }
+
+  function resetChosenValues() {
+    isUS = false
+    isUK = false
+    isGlobal = false
+    isWorkforceManagement = false
+    isTalentAcquisition = false
+  }
+
+  function showAll() {
+    Array.from(document.querySelectorAll(".np-stretch-content")).forEach((item) => {
+      item.style.removeProperty('display');
+    })
+
+    document.getElementById("zero-state").style.display = "none"
+  }
+
+  function hideCategoryBox(category) {
+    console.log(category)
+    Array.from(document.querySelectorAll(".np-stretch-content")).forEach((item) => {
+      if (!item.querySelector('h3.np-card-content-title').innerHTML.includes(category))
+        item.style.display = 'none';
+    })
+  }
+
+  function filterNonCategory(category) {
+    console.log(category)
+    Array.from(document.querySelectorAll(".np-stretch-content")).forEach((item) => {
+      if (!item.querySelector('h3.np-card-content-title').innerHTML.includes(category))
+        item.style.display = 'none';
+    })
+  }
+
+  function showCategory() {
+    showAll();
+
+    if (isUS)
+      filterNonCategory("US")
+
+    if (isUK)
+      filterNonCategory("UK")
+
+    if (isGlobal)
+      filterNonCategory("Global")
+
+    if (isWorkforceManagement)
+      hideCategoryBox("Workforce Management")
+
+    if (isTalentAcquisition)
+      hideCategoryBox("Talent Acquisition")
+
+    //if (!isUS && !isUK && !isWorkforceManagement && !isTalentAcquisition)
+    //  showAll();
+
+    closeNav();
+    countActiveEvents()
+  }
+
+  function hideAll() {
+    Array.from(document.querySelectorAll(".np-stretch-content")).forEach((item) => {
+      item.style.display = 'none'
+    })
+  }
+
+  function changeSection(e) {
+    removeActiveSectionClass();
+    this.querySelector("div").classList.add('active-section');
+    hideSections();
+    showSection(this);
+
+    showAll();
+    removeAllCircleColor();
+    resetChosenValues();
+  }
+
+  function removeActiveSectionClass() {
+    const sections = document.querySelector(".events-container").children
+    for (let index = 0; index < sections.length; index++) {
+      const element = sections[index]; 
+      element.querySelector("div").classList.remove('active-section');
+    }
+  }
+
+  function hideSections() {
+    document.getElementById("upcoming-trainings-container").style.display = "none";
+    document.getElementById("new-user-journey-container").style.display = "none";
+    document.getElementById("training-webinar-catalog-container").style.display = "none";
+  }
+
+  function showSection(element) {
+    const container = document.getElementById(element.id + "-container");
+    container.style.display = "block";
+     countActiveEvents()
+  }
+
+function openNav() {
+    var overlay = document.querySelector(".overlay");
+    var overlayContent = document.querySelector(".overlay-content");
+    overlay.classList.add("active");
+    overlayContent.classList.add("active");
+}
+
+function closeNav() {
+    var overlay = document.querySelector(".overlay");
+    var overlayContent = document.querySelector(".overlay-content");
+    overlay.classList.remove("active");
+    overlayContent.classList.remove("active");
+}
+document.addEventListener('DOMContentLoaded', function () {
+  closeNav();
+});
+
+
+  function countActiveEvents() {
+    setTimeout(function() {
+      let visibleEvents = 0
+      const eventGroups = document.querySelector(".np-training-events").children
+
+      for(var i=0; i<eventGroups.length; i++){
+        var child = eventGroups[i];   
+        if (child.style.display != "none") {
+
+          if (child.querySelectorAll(".col-xs-12").length == 0) {
+            //console.log("show zero state")
+            document.getElementById("zero-state").style.display = "block"
+          } else {
+
+            child.querySelectorAll(".col-xs-12").forEach(function(tile) {
+              //console.log(tile)
+              if (tile.style.display != "none") {
+                visibleEvents++
+              }
+            })
+
+            console.log("visible events", visibleEvents)
+            if (visibleEvents == 0) {
+              console.log("show zero state")
+              document.getElementById("zero-state").style.display = "block"
+            }
+          }
+        }
+      }
+    }, 300) 
+  }
+
+function scrollDown() {
+  const targetElement = document.getElementById('trainingTitles');
+    
+  if (targetElement) {
+    const distanceToScroll = targetElement.getBoundingClientRect().top * 0.8;
+
+    window.scrollBy({ top: distanceToScroll, behavior: 'smooth' });
+  }
+}
+
+</script>
+
+<style>
+  body.new-styles .np-training-events.np-subpage-container {
+    margin-top:0;
+  }
+
+  .request-button-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .request-button {
+    font-weight: 500;
+  }
+
+  .training-events-header, .training-events-subheader {
+    text-align: center;
+  }
+
+  .training-events-header {
+    font-weight: 800;
+    color: #000;
+    margin-bottom: 20px;
+  }
+
+  .training-events-subheader {
+    font-weight: 400;
+    color: #000;
+    margin-bottom: 24px;
+    padding: 0;
+  }
+
+  .training-events-headers {
+    background-image: url("https://s3.amazonaws.com/static.northpass.com/Harri/events-background.png");
+    background-size:cover;
+    background-repeat: no-repeat;
+    background-position:center;
+    padding: 64px 24px;
+    width: 100%;
+    margin: 0;
+    align-items: center;
+    justify-content: center;
+    margin-top: 74px;
+  }
+
+  .titles-container, .secondary-titles-container {
+    display: flex;
+    flex-direction: column;
+    max-width: 1440px;
+    margin: auto;
+  }
+
+  .event {
+    text-align: center;
+    color: #0088DD;
+    padding: 0;
+    padding-bottom: 4px;
+    margin: 0;
+    width:30%;
+  }
+
+  .secondary-event {
+    font-size: 15px;
+  }
+  
+  .active-section {
+    font-weight: 700 !important;
+    text-decoration: underline;
+  }
+
+  .secondary-active-section {
+    font-weight: 700 !important;
+    color: #403D3B !important;
+    border-bottom: 2px solid #403D3B !important;
+  }
+
+  .events-container, .secondary-events-container {
+    display: flex;
+    cursor: pointer;
+    align-items: center;
+    margin: 24px 0;
+    width: 100%;
+  }
+
+  .events-container {
+    justify-content: space-around;
+    padding: 0 16px;
+    gap:12px;
+  }
+
+  .event-section {
+    width: fit-content;
+    margin-left: auto;
+    margin-right: auto;
+  }
+
+  #zero-state {
+    text-align: center;
+    font-size: 24px;
+    font-weight: 500;
+  }
+
+  @media only screen and (max-width: 600px) {
+    .secondary-events-container {
+      flex-direction: column;
+    }
+
+    .np-filter {
+      text-align: center;
+    }
+  }
+
+  @media (min-width: 768px) {
+    .np-training-events.np-subpage-container {
+      padding: 40px 5% 80px;
+    }
+
+    .training-events-subheader {
+      width: 50%;
+      margin-left: auto;
+      margin-right: auto;
+    }
+
+    .training-events-headers {
+      max-width: 100%;
+      margin: 90px 0 0;
+      align-items: center;
+      justify-content: center;
+    }
+
+    .event {
+      font-size: 18px;
+      max-width:20%;
+    }
+
+    .events-container, .secondary-events-container {
+      gap: 1.5rem;
+    }
+  }
+
+</style>
+
+
+<style>
+  .apply-button-container {
+    margin-top: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .apply-button {
+    padding: 20px 40px;
+    background-color: #0088DD;
+    color: white;
+    font-weight: 400;
+    text-decoration: none;
+  }
+
+  .circle-container {
+    display: flex;
+    align-items: center;
+  }
+
+  .white-circle {
+    border-radius: 50%;
+    height: 15px;
+    width: 15px;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  .active-circle {
+    background: #0088dd;
+  }
+
+  .green-circle {
+    margin-right: 10px;
+    border: 2px solid #0088dd;
+    border-radius: 50%;
+    height: 30px;
+    width: 30px;
+    position: relative;
+  }
+
+  .all-filter {
+    text-decoration: none;
+    color: #0088DD;
+  }
+
+  .filter-title {
+    color: #000;
+    font-weight: 400;
+    font-size: 30px;
+  }
+
+  .filter-item {
+    margin: 0;
+    color: #000;
+    font-weight: 400;
+    font-size: 16px;
+    text-decoration: none;
+    padding: 18px 0;
+  }
+
+  .overlay-items-headers {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-end;
+
+  }
+  @media (max-width: 768px) {
+    .overlay-items-headers {
+        flex-direction: row-reverse;
+        justify-content: space-between;
+    }
+  }
+
+  .overlay-items-headers, .filter-container {
+    padding: 0 60px;
+  }
+
+  .filter-category {
+    color: #000;
+    font-weight: 400;
+    font-size: 20px;
+  }
+
+  .filter-container {
+    align-items: flex-start;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .overlay-items-container {
+    height: 100%;
+    border-top-left-radius: 37px;
+    border-top-right-radius: 37px;
+    background-color: #fff
+  }
+
+  .overlay {
+    visibility: hidden;
+    opacity: 0;
+    transition: visibility 0.3s, opacity 0.3s ease-in-out;
+    z-index: 50;
+    overflow: hidden;
+    height: 100%;
+    width: 100%;
+    position: fixed; /* Stay in place */
+    left: 0;
+    top: 0;
+    background-color: rgb(0,0,0); /* Black fallback color */
+    background-color: #00000033; /* Black w/opacity */
+  }
+.overlay.active {
+  visibility: visible;
+  opacity: 1;
+}
+.overlay-content {
+  height: 100%;
+  position: relative;
+  top: 100%; /* Start off-screen at the bottom */
+  width: 100%;
+  text-align: center;
+  transition: top 0.3s ease-in-out; /* Add transition for smooth animation */
+  margin-top: 30px;
+}
+
+.overlay-content.active {
+  top: 25%; /* Slide in from the bottom when active */
+}
+
+  .overlay .closebtn {
+    font-size: 30px;
+  }
+
+  .training-event-dropdown-button {
+    background-color: #D9D9D9;
+    border-radius: 0px;
+    font-size: 20px;
+    padding: 10px 30px;
+    font-weight: 400;
+    color: #000;
+    border: none !important;
+  }
+
+  .training-event-dropdown {
+    display: flex;
+    justify-content: flex-start;
+  }
+  
+  .training-event-filter {
+    justify-content: flex-start;
+  }
+
+  @media (max-width: 576px) {
+    .training-event-dropdown {
+      margin-top: 20px;
+    }
+  }
+
+  @media (min-width: 768px) {
+    .all-filter {
+      font-size: 20px;
+      margin: 15px 0;
+    }
+
+    .filter-category {
+      margin: 0;
+    }
+
+    .training-event-filter {
+      margin: 0;
+      max-width:20%;
+    }
+
+    .training-event-dropdown {
+      margin-left: 0;
+    }
+
+    .training-event-dropdown-button {
+      margin-bottom: 4px;
+    }
+
+    .overlay {
+      position: absolute;
+      width: 300px;
+      height: auto;
+      top: 40px;
+      right: 0;
+      left: auto;
+      box-shadow: 0 10px 25px 0 rgb(14 27 46 / 18%);
+    }
+
+    .overlay-content {
+      margin-top: 0; 
+    }
+
+    .overlay-items-container {
+      border-radius: 0;
+    }
+
+    .filter-title, .closebtn {
+      display: none;
+    }
+
+    .overlay-items-headers, .filter-container {
+      padding: 0 20px;
+    }
+
+    .apply-button {
+      margin-bottom: 10px;
+    }
+  }
+
+  @media screen and (max-height: 450px) {
+    .overlay a {font-size: 20px}
+    .overlay .closebtn {
+      font-size: 40px;
+      top: 15px;
+      right: 35px;
+    }
+  }
+
+  @media (min-width:1200px) {
+    .event {
+      font-size: 22px;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/training_events.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/training_events.html.liquid
new file mode 100644
index 00000000..45103e0a
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/training_events.html.liquid	
@@ -0,0 +1,657 @@
+{% include "header" %}
+
+{% comment %} <div class="training-events-coming-soon np-subpage-container np-max-width" style="text-align: center;">
+  <div style="color:#0088dd;font-weight:700;font-size:40px;">Coming soon!</div>
+</div> {% endcomment %}
+
+ <div class="row training-events-headers">
+  <div class="col-xs-12 col-sm-10">
+    <div class="np-resource-title training-events-header">
+      Request Private Training!
+    </div>
+    <div class="np-resource-subtitle training-events-subheader">
+      Further your Harri knowledge with one of our Education Consultants during a private training customized just for you!
+    </div>
+    <div class="request-button-container">
+      <a href="https://docs.google.com/forms/d/1wmGpIvYgAYvXqMgTawVqjfdO1PwhtpbpD9BOSkQqj-w/edit" target="_blank" class="request-button np-button">Request Here</a>
+    </div>
+  </div>
+</div>
+
+ <div class="titles-container">
+  <div class="events-container row">
+    <div id="upcoming-trainings" class="event">
+      <div class="active-section event-section">
+        <span>View All</span>
+      </div>
+    </div>
+    <div id="new-user-journey" class="event">
+      <div class="event-section">
+        <span>New User Journey</span>
+      </div>
+    </div>
+    <div id="training-webinar-catalog" class="event">
+      <div class="event-section">
+        <span>Training Webinar Catalog</span>
+      </div>
+    </div>
+    <div id="development-training" class="event">
+      <div class="event-section">
+        <span>Development Training</span>
+      </div>
+    </div>
+    {% include "training_events_filter" %}
+  </div>
+</div>
+
+ <main class="np-main np-training-events np-subpage-container np-max-width">
+  <div id="upcoming-trainings-container">
+    {% include "training_events_index" %}
+  </div>
+  <div style="display: none;" id="development-training-container">
+    {% include "all_development_training_index" %}
+  </div>
+  <div style="display: none;" id="new-user-journey-container">
+    {% include "all_new_user_journey_index" %}
+  </div>
+  <div style="display: none;" id="training-webinar-catalog-container">
+    {% include "all_training_webinar_catalog_index" %}
+  </div>
+  <div style="display: none;" id="zero-state">
+    Coming Soon!
+  </div>
+</main> 
+{% include "footer" %}
+
+<script>
+  var isUS = false
+  var isUK = false
+  var isGlobal = false
+  var isWorkforceManagement = false
+  var isTalentAcquisition = false
+
+  window.addEventListener('DOMContentLoaded', (event) => {
+    document.querySelectorAll('.event').forEach((item) => {
+      item.addEventListener('click', changeSection)
+    })
+
+    document.getElementById('all').addEventListener('click', clearAll)
+    document.getElementById('uk').addEventListener('click', chooseRegion)
+    document.getElementById('us').addEventListener('click', chooseRegion)
+    document.getElementById('global').addEventListener('click', chooseRegion)
+    document.getElementById('workforce-management').addEventListener('click', chooseProduct)
+    document.getElementById('talent-acquisition').addEventListener('click', chooseProduct)
+    document.getElementById('apply-button').addEventListener('click', showCategory)
+
+
+    window.addEventListener('click', function(e){
+      if (document.querySelector('.training-event-dropdown-button').contains(e.target))
+        openNav()
+      else if (!document.querySelector('.overlay-items-container').contains(e.target))
+        closeNav();
+    });
+  })
+  
+  function clearAll(e) {
+    closeNav();
+    showAll();
+
+    removeAllCircleColor();
+    resetChosenValues();
+  }
+
+  function chooseRegion() {
+    if (this.id === "uk") {
+      isUK = true
+      changeCircleColor(this.id)
+      isUS = false
+      isGlobal = false
+      removeCircleColor("us");
+      removeCircleColor("global");
+    }
+
+    if (this.id === "us") {
+      isUS = true
+      changeCircleColor(this.id)
+      isUK = false
+      isGlobal = false
+      removeCircleColor("uk");
+      removeCircleColor("global");
+    }
+
+     if (this.id === "global") {
+      isGlobal = true
+      changeCircleColor(this.id)
+      isUK = false
+      isUS = false
+      removeCircleColor("uk");
+      removeCircleColor("us");
+    }
+  }
+
+  function chooseProduct() {
+    if (this.id === "talent-acquisition") {
+      isTalentAcquisition = true
+      changeCircleColor(this.id)
+      isWorkforceManagement = false
+      removeCircleColor("workforce-management");
+    }
+
+    if (this.id === "workforce-management") {
+      isWorkforceManagement = true
+      changeCircleColor(this.id)
+      isTalentAcquisition = false
+      removeCircleColor("talent-acquisition");
+    }
+  }
+
+  function removeCircleColor(id) {
+    document.getElementById(id).querySelector('.white-circle').classList.remove("active-circle");
+  }
+
+  function removeAllCircleColor() {
+    document.querySelectorAll('.white-circle').forEach((item) => {
+      item.classList.remove("active-circle");
+    })
+  }
+
+  function changeCircleColor(id) {
+    document.getElementById(id).querySelector('.white-circle').classList.add("active-circle");
+  }
+
+  function resetChosenValues() {
+    isUS = false
+    isUK = false
+    isGlobal = false
+    isWorkforceManagement = false
+    isTalentAcquisition = false
+  }
+
+  function showAll() {
+    Array.from(document.querySelectorAll(".np-stretch-content")).forEach((item) => {
+      item.style.removeProperty('display');
+    })
+
+    document.getElementById("zero-state").style.display = "none"
+  }
+
+  function hideCategoryBox(category) {
+    console.log(category)
+    Array.from(document.querySelectorAll(".np-stretch-content")).forEach((item) => {
+      if (!item.querySelector('h3.np-card-content-title').innerHTML.includes(category))
+        item.style.display = 'none';
+    })
+  }
+
+  function filterNonCategory(category) {
+    console.log(category)
+    Array.from(document.querySelectorAll(".np-stretch-content")).forEach((item) => {
+      if (!item.querySelector('h3.np-card-content-title').innerHTML.includes(category))
+        item.style.display = 'none';
+    })
+  }
+
+  function showCategory() {
+    showAll();
+
+    if (isUS)
+      filterNonCategory("US")
+
+    if (isUK)
+      filterNonCategory("UK")
+
+    if (isGlobal)
+      filterNonCategory("Global")
+
+    if (isWorkforceManagement)
+      hideCategoryBox("Workforce Management")
+
+    if (isTalentAcquisition)
+      hideCategoryBox("Talent Acquisition")
+
+    //if (!isUS && !isUK && !isWorkforceManagement && !isTalentAcquisition)
+    //  showAll();
+
+    closeNav();
+    countActiveEvents()
+  }
+
+  function hideAll() {
+    Array.from(document.querySelectorAll(".np-stretch-content")).forEach((item) => {
+      item.style.display = 'none'
+    })
+  }
+
+  function changeSection(e) {
+    removeActiveSectionClass();
+    this.querySelector("div").classList.add('active-section');
+    hideSections();
+    showSection(this);
+
+    showAll();
+    removeAllCircleColor();
+    resetChosenValues();
+  }
+
+  function removeActiveSectionClass() {
+    const sections = document.querySelector(".events-container").children
+    for (let index = 0; index < sections.length; index++) {
+      const element = sections[index]; 
+      element.querySelector("div").classList.remove('active-section');
+    }
+  }
+
+  function hideSections() {
+    document.getElementById("upcoming-trainings-container").style.display = "none";
+    document.getElementById("development-training-container").style.display = "none";
+    document.getElementById("new-user-journey-container").style.display = "none";
+    document.getElementById("training-webinar-catalog-container").style.display = "none";
+  }
+
+  function showSection(element) {
+    const container = document.getElementById(element.id + "-container");
+    container.style.display = "block";
+     countActiveEvents()
+  }
+
+  function openNav() {
+    document.getElementById("myNav").style.display = "block";
+  }
+
+  function closeNav() {
+    document.getElementById("myNav").style.display = "none";
+  }
+
+  function countActiveEvents() {
+    setTimeout(function() {
+      let visibleEvents = 0
+      const eventGroups = document.querySelector(".np-training-events").children
+
+      for(var i=0; i<eventGroups.length; i++){
+        var child = eventGroups[i];   
+        if (child.style.display != "none") {
+
+          if (child.querySelectorAll(".col-xs-12").length == 0) {
+            //console.log("show zero state")
+            document.getElementById("zero-state").style.display = "block"
+          } else {
+
+            child.querySelectorAll(".col-xs-12").forEach(function(tile) {
+              //console.log(tile)
+              if (tile.style.display != "none") {
+                visibleEvents++
+              }
+            })
+
+            console.log("visible events", visibleEvents)
+            if (visibleEvents == 0) {
+              console.log("show zero state")
+              document.getElementById("zero-state").style.display = "block"
+            }
+          }
+        }
+      }
+    }, 300) 
+  }
+</script>
+
+<style>
+  body.new-styles .np-training-events.np-subpage-container {
+    margin-top:0;
+  }
+
+  .request-button-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .request-button {
+    font-weight: 500;
+  }
+
+  .training-events-header, .training-events-subheader {
+    text-align: center;
+  }
+
+  .training-events-header {
+    font-weight: 800;
+    color: #000;
+    margin-bottom: 20px;
+  }
+
+  .training-events-subheader {
+    font-weight: 400;
+    color: #000;
+    margin-bottom: 24px;
+    padding: 0;
+  }
+
+  .training-events-headers {
+    background-image: url("https://s3.amazonaws.com/static.northpass.com/Harri/events-background.png");
+    background-size:cover;
+    background-repeat: no-repeat;
+    background-position:center;
+    padding: 64px 24px;
+    width: 100%;
+    margin: 0;
+    align-items: center;
+    justify-content: center;
+    margin-top: 74px;
+  }
+
+  .titles-container, .secondary-titles-container {
+    display: flex;
+    flex-direction: column;
+    max-width: 1440px;
+    margin: auto;
+  }
+
+  .event {
+    font-size: 14px;
+    text-align: center;
+    color: #0088DD;
+    padding: 0;
+    padding-bottom: 4px;
+    margin: 0;
+    width:30%;
+  }
+
+  .secondary-event {
+    font-size: 15px;
+  }
+  
+  .active-section {
+    font-weight: 700 !important;
+    border-bottom: 2px solid #0088DD !important;
+  }
+
+  .secondary-active-section {
+    font-weight: 700 !important;
+    color: #403D3B !important;
+    border-bottom: 2px solid #403D3B !important;
+  }
+
+  .events-container, .secondary-events-container {
+    display: flex;
+    cursor: pointer;
+    align-items: center;
+    margin: 24px 0;
+    width: 100%;
+  }
+
+  .events-container {
+    justify-content: space-around;
+    padding: 0 16px;
+    gap:12px;
+  }
+
+  .event-section {
+    width: fit-content;
+    margin-left: auto;
+    margin-right: auto;
+  }
+
+  #zero-state {
+    text-align: center;
+    font-size: 24px;
+    font-weight: 500;
+  }
+
+  @media only screen and (max-width: 600px) {
+    .secondary-events-container {
+      flex-direction: column;
+    }
+
+    .np-filter {
+      text-align: center;
+    }
+  }
+
+  @media (min-width: 768px) {
+    .np-training-events.np-subpage-container {
+      padding: 40px 5% 80px;
+    }
+
+    .training-events-subheader {
+      width: 50%;
+      margin-left: auto;
+      margin-right: auto;
+    }
+
+    .training-events-headers {
+      max-width: 100%;
+      margin: 90px 0 0;
+      align-items: center;
+      justify-content: center;
+    }
+
+    .event {
+      font-size: 18px;
+      max-width:20%;
+    }
+
+    .events-container, .secondary-events-container {
+      gap: 1.5rem;
+    }
+  }
+</style>
+
+
+<style>
+  .apply-button-container {
+    margin-top: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .apply-button {
+    padding: 20px 40px;
+    background-color: #00E79A;
+    color: white;
+    font-weight: 400;
+    text-decoration: none;
+  }
+
+  .circle-container {
+    display: flex;
+    align-items: center;
+  }
+
+  .white-circle {
+    border: 10px solid #fff;
+    border-radius: 50%;
+    height: 15px;
+    width: 15px;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  .active-circle {
+    border: 10px solid #0088dd;
+  }
+
+  .green-circle {
+    margin-right: 10px;
+    border: 8px solid #2ee3a0;
+    border-radius: 50%;
+    height: 30px;
+    width: 30px;
+    position: relative;
+  }
+
+  .all-filter {
+    text-decoration: none;
+    color: #0088DD;
+  }
+
+  .filter-title {
+    color: #000;
+    font-weight: 400;
+    font-size: 30px;
+  }
+
+  .filter-item {
+    margin: 0;
+    color: #000;
+    font-weight: 400;
+    font-size: 16px;
+    text-decoration: none;
+    padding: 18px 0;
+  }
+
+  .overlay-items-headers {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+
+  }
+
+  .overlay-items-headers, .filter-container {
+    padding: 0 60px;
+  }
+
+  .filter-category {
+    color: #000;
+    font-weight: 400;
+    font-size: 20px;
+  }
+
+  .filter-container {
+    align-items: flex-start;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .overlay-items-container {
+    height: 100%;
+    border-top-left-radius: 37px;
+    border-top-right-radius: 37px;
+    background-color: #fff
+  }
+
+  .overlay {
+    display: none;
+    z-index: 50;
+    overflow: hidden;
+    height: 100%;
+    width: 100%;
+    position: fixed; /* Stay in place */
+    left: 0;
+    top: 0;
+    background-color: rgb(0,0,0); /* Black fallback color */
+    background-color: #00000033; /* Black w/opacity */
+    transition: 0.5s; /* 0.5 second transition effect to slide in or slide down the overlay (height or width, depending on reveal) */
+  }
+
+  .overlay-content {
+    height: 100%;
+    position: relative;
+    top: 25%; /* 25% from the top */
+    width: 100%; /* 100% width */
+    text-align: center; /* Centered text/links */
+    margin-top: 30px; /* 30px top margin to avoid conflict with the close button on smaller screens */
+  }
+
+  .overlay .closebtn {
+    font-size: 30px;
+  }
+
+  .training-event-dropdown-button {
+    background-color: #D9D9D9;
+    border-radius: 0px;
+    font-size: 20px;
+    padding: 10px 30px;
+    font-weight: 400;
+    color: #000;
+    border: none;
+  }
+
+  .training-event-dropdown {
+    display: flex;
+    justify-content: flex-start;
+  }
+  
+  .training-event-filter {
+    justify-content: flex-start;
+  }
+
+  @media (max-width: 576px) {
+    .training-event-dropdown {
+      margin-top: 20px;
+    }
+  }
+
+  @media (min-width: 768px) {
+    .all-filter {
+      font-size: 20px;
+      margin: 15px 0;
+    }
+
+    .filter-category {
+      margin: 0;
+    }
+
+    .training-event-filter {
+      margin: 0;
+      max-width:20%;
+    }
+
+    .training-event-dropdown {
+      margin-left: 0;
+    }
+
+    .training-event-dropdown-button {
+      margin-bottom: 4px;
+    }
+
+    .overlay {
+      position: absolute;
+      width: 300px;
+      height: auto;
+      top: 40px;
+      right: 0;
+      left: auto;
+      box-shadow: 0 10px 25px 0 rgb(14 27 46 / 18%);
+    }
+
+    .overlay-content {
+      margin-top: 0; 
+    }
+
+    .overlay-items-container {
+      border-radius: 0;
+    }
+
+    .filter-title, .closebtn {
+      display: none;
+    }
+
+    .overlay-items-headers, .filter-container {
+      padding: 0 20px;
+    }
+
+    .apply-button {
+      margin-bottom: 10px;
+    }
+  }
+
+  @media screen and (max-height: 450px) {
+    .overlay a {font-size: 20px}
+    .overlay .closebtn {
+      font-size: 40px;
+      top: 15px;
+      right: 35px;
+    }
+  }
+
+  @media (min-width:1200px) {
+    .event {
+      font-size: 22px;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/training_session.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/training_session.html.liquid
new file mode 100644
index 00000000..bbbfa5e2
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/training_session.html.liquid	
@@ -0,0 +1,94 @@
+{% 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" %}
+
+<script>
+
+  const currentDate = new Date().getTime() / 1000
+  const sessionDate = new Date("{{training_session.year}}, {{training_session.month}}, {{training_session.day}}, {{training_session.starts}}")
+  const sessionEndDate = new Date("{{training_session.year}}, {{training_session.month}}, {{training_session.day}}, {{training_session.ends}}")
+  const sessionDateSeconds =  sessionDate.getTime() / 1000
+  const sessionEndDateSeconds =  sessionEndDate.getTime() / 1000
+
+  if (currentDate < sessionEndDateSeconds) {
+    console.log("event not ended")
+    if (currentDate > (sessionDateSeconds - 600)) {
+      console.log("within 10 mins of event or after event start");
+      document.getElementById("sessionLocation").style.display = "block";
+    }
+  } else {
+    console.log("event ended, hiding url")
+  }
+
+  document.addEventListener("DOMContentLoaded", () => {
+    const eventType = '{{training_event.event_type}}'
+    console.log(eventType)
+    if (eventType != "in_person" && document.querySelector(".dropdown-calendar")) {
+      console.log("registered for online event")
+      customizeCalendarUrls()
+    }
+
+  });
+
+  function customizeCalendarUrls() {
+    // GOOGLE
+    let googleCalendarUrl = '{{training_session.google_calendar_url | url_decode }}'
+    googleCalendarUrl = googleCalendarUrl.replace("To read more about this session, please visit", "To read more about this session and access the zoom link, please visit")
+    googleCalendarUrl = googleCalendarUrl.split("&")
+    let newGoogleCalendarUrl = googleCalendarUrl.splice(3, 1)
+    const finalGoogleCalendarUrl = googleCalendarUrl.join("&")
+    console.log("GOOGLE URL: ", encodeURI(finalGoogleCalendarUrl))
+    document.getElementById("googleCal").href = finalGoogleCalendarUrl
+
+    // OUTLOOK   
+    let outlookCalendarUrl = '{{training_session.outlook_calendar_url | url_decode }}'
+    outlookCalendarUrl = outlookCalendarUrl.split("&")
+    let newOutlookCalendarUrl = outlookCalendarUrl.splice(5, 2)
+    const finalOutlookCalendarUrl = outlookCalendarUrl.join("&")
+    document.getElementById("outlookCal").href = finalOutlookCalendarUrl
+
+    // OFFICE   
+    let officeCalendarUrl = '{{training_session.outlook_office_calendar_url | url_decode }}'
+    officeCalendarUrl = officeCalendarUrl.split("&")
+    let newOfficeCalendarUrl = officeCalendarUrl.splice(5, 2)
+    const finalOfficeCalendarUrl = officeCalendarUrl.join("&")
+    document.getElementById("officeCal").href = finalOfficeCalendarUrl
+
+    // iCAL   
+    let icalCalendarUrl = '{{training_session.ical_calendar_url }}'
+    console.log(icalCalendarUrl)
+    icalCalendarUrl = icalCalendarUrl.replace("LOCATION:", "")
+    icalCalendarUrl = icalCalendarUrl.replace("To%20read%20more%20about%20this%20session,%20please%20visit:%20", "To%20read%20more%20about%20this%20session%20and%20access%20the%20zoom%20link,%20please%20visit:%20")
+    document.getElementById("icalCal").href = icalCalendarUrl
+  }
+</script>
+
+<script>
+  const eventTitle = document.querySelector(".np-top-title").innerText
+
+  if (eventTitle.toUpperCase().includes("GLOBAL")) {
+    const easternTimeStart = '{{ training_session.starts }}';
+    const easternTimeEnd = '{{ training_session.ends }}';
+
+    const londonTimeStart = moment.tz(easternTimeStart, 'h:mm A', 'America/New_York').tz('Europe/London');
+    const londonTimeEnd = moment.tz(easternTimeEnd, 'h:mm A', 'America/New_York').tz('Europe/London');
+
+    const formattedTime = `${londonTimeStart.format('h:mm A')} - ${londonTimeEnd.format('h:mm A')}`;
+
+    document.querySelectorAll(".europe-converted-time").forEach((time) => {
+      time.innerText = formattedTime
+    })
+
+    document.querySelectorAll(".gmt-time").forEach((time) => {
+      time.style.display = "block"
+    })
+  }
+ 
+</script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/training_session_attendance.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/training_session_attendance.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/training_session_attendance.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/training_session_attendance.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/transcript.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/transcript.html.liquid
new file mode 100644
index 00000000..b6cb5428
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/transcript.html.liquid	
@@ -0,0 +1,8 @@
+{% include "header" %}
+{% include "account_tabs" %}
+
+<main class="np-main np-subpage-container np-transcript">
+  {% transcript %}
+</main>
+
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/unsubscribe.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/unsubscribe.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/unsubscribe.html.liquid
rename to Custom_Templates/customer_templates/Harri McDonalds Corp Field/unsubscribe.html.liquid
diff --git a/Custom_Templates/customer_templates/Harri McDonalds Corp Field/videos.html.liquid b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/videos.html.liquid
new file mode 100644
index 00000000..76671ed6
--- /dev/null
+++ b/Custom_Templates/customer_templates/Harri McDonalds Corp Field/videos.html.liquid	
@@ -0,0 +1,190 @@
+{% include "header" %}
+<main class="np-main np-catalog np-subpage-container np-max-width">
+<div class="row">
+<div class="col-xs-12 col-md-3"></div>
+  <div class="np-catalog-header-wrapper col-xs-12 col-md-9">
+    <div class="np-catalog-header">
+      <div class="np-resource-title np-catalog-title">Browse Our Video Catalog</div>
+      <div class="catalog-search">
+        <form action="{% route search %}" method="get" data-test="desktop-search">
+          <input
+            aria-label="search"
+            class="np-catalog-search"
+            type="text"
+            name="q"
+            placeholder="search"
+          />
+          <i class="np-header-search-icon fa fa-search"></i>
+        </form>
+      </div>
+    </div>
+    </div>
+  </div>
+  <div class="np-hidden-desktop">
+    <div class="mobile-filter-button">
+      Filter
+    </div>
+  </div>
+
+  <div class="catalog-content-wrapper">
+    <div class="row">
+      <div class="col-xs-12 col-md-3">
+        {% include "video_catalog_filters" %}
+      </div>
+
+      <div class="col-xs-12 col-md-9">
+        {% include "video_sub_filters" %}
+        {% include "video_courses_catalog" %}
+      </div>
+    </div>
+  </div>
+
+</main>
+{% include "footer" %}
+
+<script>
+
+const checkboxFilters = document.querySelectorAll("input[type='checkbox']");
+const allItems = document.querySelectorAll(".catalog-item");
+
+document.querySelector(".mobile-filter-button").addEventListener("click", function() {
+  document.querySelector(".catalog-filters").classList.toggle("show")
+})
+
+document.querySelector(".close-tray").addEventListener("click", function() {
+  document.querySelector(".catalog-filters").classList.toggle("show")
+})
+
+document.getElementById("clearAll").addEventListener("click", showAll);
+
+checkboxFilters.forEach(function(checkbox) {
+  checkbox.addEventListener('change', (event) => {
+    filterAllItems(event.target)
+  })
+})
+
+document.querySelectorAll(".sub-filter").forEach(function(subFilter) {
+  subFilter.addEventListener('click', (event) => {
+    
+    filterSubItems(event.target)
+  })
+})
+
+function showAll() {
+  const catalogItems = document.querySelectorAll(".catalog-item");
+  catalogItems.forEach((item) => item.style.display = "flex")  // show all courses
+  checkboxFilters.forEach((filter) => filter.checked = false)  // Uncheck all filters
+
+   clearAllSubFilters()
+
+  document.querySelectorAll(".sub-filter-group").forEach((subFilter) => {
+    subFilter.classList.remove("active")
+  })
+}
+
+function filterAllItems(target) {
+  allItems.forEach((item) => item.style.display = "none")  // show all courses
+
+  // uncheck all other filters 
+  checkboxFilters.forEach(function(checkbox) {
+    if (checkbox != target) {
+      checkbox.checked = false
+    }
+  })
+
+  // show sub filters, if any
+  document.querySelectorAll(".sub-filter-group").forEach((subFilterGroup) => {
+    subFilterGroup.classList.remove("active")
+
+    if (target.getAttribute("name") == subFilterGroup.getAttribute("data-parent")) {
+      subFilterGroup.classList.add("active")
+    }
+  })
+
+  clearAllSubFilters()
+
+  let checkedFiltersCount = 0
+  let checkedFilters = []
+  checkboxFilters.forEach((filter) => {  
+    if (filter.checked) {
+      checkedFiltersCount++
+      checkedFilters.push(filter.name)
+    }
+  }) 
+
+  allItems.forEach((course) => {
+    var includesAllCategories = checkedFilters.every(item => course.dataset.filters.includes(item));
+    if (includesAllCategories) {
+      course.style.display = "flex"
+    }
+  })
+ 
+  if (checkedFiltersCount == 0) {
+    allItems.forEach((item) => item.style.display = "flex")
+  }
+}
+
+function filterSubItems(subItem) {
+  clearAllSubFilters()
+  subItem.classList.add("active")
+  allItems.forEach((item) => item.style.display = "none")
+  let checkedFilter = ""
+
+  checkboxFilters.forEach((filter) => {  
+    if (filter.checked) {
+      checkedFilter = filter
+    }
+  }) 
+
+  // get active main filter and filter by that and this
+  allItems.forEach((video) => {
+    if (video.dataset.filters.includes(subItem.textContent.toUpperCase()) && video.dataset.filters.includes(checkedFilter.name)) {
+      video.style.display = "flex"
+    }
+  })
+}
+
+function clearAllSubFilters() {
+  document.querySelectorAll(".sub-filter").forEach((subFilter) => {
+    subFilter.classList.remove("active")
+  })
+}
+</script>
+
+<style>
+  .np-catalog.np-main {
+    padding: 0 24px;
+  }
+
+  .np-catalog-header-wrapper {
+    justify-content: center;
+    margin-bottom:32px;
+  }
+
+  .np-catalog-header {
+    align-items: center;
+  }
+
+  .catalog-content-wrapper .np-catalog-courses {
+    margin-top:0;
+  }
+
+  .mobile-filter-button {
+    background-color:#D9D9D9;
+    color:#000000;
+    padding: 4px 16px;
+    margin-bottom:20px;
+    cursor:pointer;
+    display: inline-block;
+  }
+
+  @media (min-width:1440px) {
+    .np-catalog.np-main {
+      padding: 0;
+    }
+
+    .np-catalog-header-wrapper {
+      margin-bottom:50px;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Pipedrive - Learn/_account_deletion.html.liquid b/Custom_Templates/customer_templates/Pipedrive - Learn/_account_deletion.html.liquid
index 08af6f5c..0bff3082 100644
--- a/Custom_Templates/customer_templates/Pipedrive - Learn/_account_deletion.html.liquid	
+++ b/Custom_Templates/customer_templates/Pipedrive - Learn/_account_deletion.html.liquid	
@@ -120,7 +120,7 @@
 <script>
   {% if current_school.properties.sandbox == false %}
     const deletionInput = document.getElementById('account-deletion-confirmation-input');
-  
+
     deletionInput.addEventListener('input', () => {
       const button = document.querySelector('#confirm-deletion');
       if (deletionInput.value.toLowerCase() !== 'delete') {
@@ -129,7 +129,7 @@
         button.classList.remove('button-deletion-disabled');
       }
     });
-  
+
     function sendDeleteRequest() {
       document.querySelector('.account-deletion-popup-confirmation').classList.add('np-hidden');
       document.querySelector('.account-deletion-popup-goodbye').classList.remove('np-hidden');
@@ -137,11 +137,11 @@
       const personEmail = '{{ current_person.email }}'
       const personTime = '{{ current_person.created_at | replace_first: " ", "T" | replace_first: " +0000", ".000000+00:00" }}';
       const xhr = new XMLHttpRequest();
-      
+
       {% if current_school.sso_active? %}
-        var url = 'https://www.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-sso-delete-myself'
+        var url = 'https://webhooks.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-sso-delete-myself'
       {% else %}
-        var url = 'https://www.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-open-delete-myself'
+        var url = 'https://webhooks.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-open-delete-myself'
       {% endif %}
       xhr.open('POST', url);
       xhr.setRequestHeader('Content-Type', 'application/json');
diff --git a/Custom_Templates/customer_templates/Pipedrive - Learn/_cookie_banner.html.liquid b/Custom_Templates/customer_templates/Pipedrive - Learn/_cookie_banner.html.liquid
index 865fe725..a07e9661 100644
--- a/Custom_Templates/customer_templates/Pipedrive - Learn/_cookie_banner.html.liquid	
+++ b/Custom_Templates/customer_templates/Pipedrive - Learn/_cookie_banner.html.liquid	
@@ -175,7 +175,7 @@
         var user_id = null
         var sso_uid = null
       {% endif %}
-      
+
       analytics.identify({
         "traits":{
           "northpass_email": email ,
@@ -366,9 +366,9 @@
       if (permissionCookie !== '{{ current_person.properties.cookie_permissions }}') {
         const xhr = new XMLHttpRequest();
         {% if current_school.sso_active? %}
-          var url = 'https://www.workato.com/webhooks/rest/997192d2-6726-4f22-afbc-8cf021019896/pipedrive-sso-change-cookie-value'
+          var url = 'https://webhooks.workato.com/webhooks/rest/997192d2-6726-4f22-afbc-8cf021019896/pipedrive-sso-change-cookie-value'
         {% else %}
-          var url = 'https://www.workato.com/webhooks/rest/4a75076f-e7be-472b-b661-319f34ee9d24/pipedrive-open-change-cookie-value'
+          var url = 'https://webhooks.workato.com/webhooks/rest/4a75076f-e7be-472b-b661-319f34ee9d24/pipedrive-open-change-cookie-value'
         {% endif %}
         xhr.open('POST', url);
         xhr.setRequestHeader('Content-Type', 'application/json');
diff --git a/Custom_Templates/customer_templates/Pipedrive - Learn/_head.html.liquid b/Custom_Templates/customer_templates/Pipedrive - Learn/_head.html.liquid
index f736f691..4398b3d5 100644
--- a/Custom_Templates/customer_templates/Pipedrive - Learn/_head.html.liquid	
+++ b/Custom_Templates/customer_templates/Pipedrive - Learn/_head.html.liquid	
@@ -39,9 +39,9 @@
       if (sendRequest) {
         let xhr = new XMLHttpRequest();
         {% if current_school.sso_active? %}
-          var url = "https://www.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-sso-change-user-language";
+          var url = "https://webhooks.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-sso-change-user-language";
         {% else %}
-          var url = "https://www.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-open-change-user-language";;
+          var url = "https://webhooks.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-open-change-user-language";;
         {% endif %}
         xhr.open("POST", url, true);
         xhr.send(JSON.stringify({
@@ -92,11 +92,11 @@
       } else {
         selectedLanguage =  'en';
       }
-  
+
       changeLanguage(selectedLanguage, false);
     }
   }
-  
+
   addEventListener('DOMContentLoaded', () => {
     setupInitialLanguage();
   });
@@ -129,22 +129,22 @@
         videoTutorials: '/app/video-tutorials'
       }
     };
-  
+
     const currentUrl = window.location.pathname;
     const currentLang = window.current_language || 'en';
-  
+
     let category = 'homepage';
     if (currentUrl.includes('catalog')) {
       category = 'catalog';
     } else if (currentUrl.includes('video-tutorials')) {
       category = 'videoTutorials';
     }
-  
+
     const newUrl = languageMappings[currentLang][category] || '/app';
-  
+
     window.location.href = newUrl;
   }
-  
+
 
   const academyLanguage = window.localStorage.getItem('academy-language');
   console.log(academyLanguage);
@@ -155,15 +155,15 @@
   function filterCoursesByLanguage() {
     var selectedLanguage = localStorage.getItem('academy-language');
     var courses = document.querySelectorAll('.homepage-card-wrapper, .course-card');
-  
+
     if (!courses.length) {
       return; // Nie ma żadnych kursów na stronie
     }
-  
+
     for (var i = 0; i < courses.length; i++) {
       var course = courses[i];
       var courseLanguage = course.getAttribute('language');
-  
+
       if (selectedLanguage && courseLanguage !== selectedLanguage) {
         course.style.display = 'none'; // Ukryj kursy o nieodpowiednim języku
       } else {
@@ -171,14 +171,14 @@
       }
     }
   }
-  
+
  // Wywołanie funkcji po załadowaniu strony
 window.addEventListener('DOMContentLoaded', filterCoursesByLanguage);
 
 // Wywołanie funkcji po zmianie wartości w local storage
 window.addEventListener('storage', filterCoursesByLanguage);
 
-  
+
 </script>
 
 <!-- on SSO school redirect new users to setup their name -->
@@ -191,7 +191,7 @@ window.addEventListener('storage', filterCoursesByLanguage);
       {
         window.location.replace('/app/profile-settings')
       }
-      
+
     </script>
   {% endunless %}
 {% endif %}
@@ -225,4 +225,4 @@ window.addEventListener('storage', filterCoursesByLanguage);
       window.sessionStorage.sso_last_page = window.location.pathname;
     </script>
   {% endif %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/Custom_Templates/customer_templates/Pipedrive - Learn/course.html.liquid b/Custom_Templates/customer_templates/Pipedrive - Learn/course.html.liquid
index d6025052..7627285d 100644
--- a/Custom_Templates/customer_templates/Pipedrive - Learn/course.html.liquid	
+++ b/Custom_Templates/customer_templates/Pipedrive - Learn/course.html.liquid	
@@ -59,9 +59,9 @@
         }
         let xhr = new XMLHttpRequest();
         {% if current_school.sso_active? %}
-          var url = "https://www.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-sso-last-courses";
+          var url = "https://webhooks.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-sso-last-courses";
         {% else %}
-          var url = "https://www.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-open-last-courses";
+          var url = "https://webhooks.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-open-last-courses";
         {% endif %}
         xhr.open("POST", url, true);
         xhr.send(JSON.stringify({
diff --git a/Custom_Templates/customer_templates/Pipedrive - Learn/profile-settings.html.liquid b/Custom_Templates/customer_templates/Pipedrive - Learn/profile-settings.html.liquid
index 50ec3f51..3fa4fd32 100644
--- a/Custom_Templates/customer_templates/Pipedrive - Learn/profile-settings.html.liquid	
+++ b/Custom_Templates/customer_templates/Pipedrive - Learn/profile-settings.html.liquid	
@@ -10,7 +10,7 @@
   {% else %}
     {% include 'profile_settings_initial' %}
   {% endif %}
-  
+
   <style>
     .np-account {
       background: #F7F7FE;
@@ -63,17 +63,17 @@
       }
     }
   </style>
-  
+
   <script>
     const form = document.getElementById('name-form');
-    
+
     form.addEventListener('input', () => {
       const firstName = document.querySelector('#first-name').value;
       const lastName = document.querySelector('#last-name').value;
       const button = document.querySelector('button.np-form-action');
       button.disabled = !(firstName.length > 0 && lastName.length > 0);
     });
-    
+
     addEventListener('DOMContentLoaded', () => {
       {% if current_person.first_name %}
       document.querySelector('#first-name').setAttribute('value', '{{ current_person.first_name }}');
@@ -97,7 +97,7 @@
         const firstName = document.getElementById('first-name').value;
         const lastName = document.getElementById('last-name').value;
         const xhr = new XMLHttpRequest();
-        xhr.open('POST', 'https://www.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-sso-setup-first-and-last-name');
+        xhr.open('POST', 'https://webhooks.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-sso-setup-first-and-last-name');
         xhr.setRequestHeader('Content-Type', 'application/json');
         xhr.send(JSON.stringify({
           "first-name": firstName,
diff --git a/Custom_Templates/customer_templates/Pipedrive - Learn/welcome.html.liquid b/Custom_Templates/customer_templates/Pipedrive - Learn/welcome.html.liquid
index c49d103e..b4bfe083 100644
--- a/Custom_Templates/customer_templates/Pipedrive - Learn/welcome.html.liquid	
+++ b/Custom_Templates/customer_templates/Pipedrive - Learn/welcome.html.liquid	
@@ -53,7 +53,7 @@
       </form>
     </div>
   </main>
-  
+
   <style>
     .np-account {
       background: #F7F7FE;
@@ -106,17 +106,17 @@
       }
     }
   </style>
-  
+
   <script>
     const form = document.getElementById('name-form');
-    
+
     form.addEventListener('input', () => {
       const firstName = document.querySelector('#first-name').value;
       const lastName = document.querySelector('#last-name').value;
       const button = document.querySelector('button');
       button.disabled = !(firstName.length > 0 && lastName.length > 0);
     });
-    
+
     addEventListener('DOMContentLoaded', () => {
       let defaultLastName = "{{ current_person.last_name }}";
       let splitName = defaultLastName.split(' ');
@@ -129,13 +129,13 @@
         document.querySelector('button').disabled = true;
       }
     })
-    
+
     form.addEventListener('submit', (event) => {
       event.preventDefault();
       const firstName = document.getElementById('first-name').value;
       const lastName = document.getElementById('last-name').value;
       const xhr = new XMLHttpRequest();
-      xhr.open('POST', 'https://www.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-sso-setup-first-and-last-name');
+      xhr.open('POST', 'https://webhooks.workato.com/webhooks/rest/bd1a1eb7-7e79-4208-a1db-8e9c7440bcc9/pipedrive-sso-setup-first-and-last-name');
       xhr.setRequestHeader('Content-Type', 'application/json');
       xhr.send(JSON.stringify({
         "first-name": firstName,
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/.DS_Store b/Custom_Templates/customer_templates/SPS_Commerce/.DS_Store
index 940c7b6e23279358af78787447cad475bd420881..c560c7cfadcfe94a6b0d168079c4e8f13e949482 100644
GIT binary patch
literal 6148
zcmeHKO-sW-5Pe&FsCem7JmnV{{0E`Nn}|?9j<sLVV$#+o6};uA`(|b-mg+@8N|}M#
zw;ykIHg7{V3n271lPjPLphFjIowE4GWL$jDTCqnk=p1WQm|{SG-(!2nAu1qycflPS
zV~GvE?%xy()ZEWY%!nll)(Xt=M&2BgRXw`hRP~ziGxYI6X3c#sk>ZJS6=aocS8V4P
za%{-jqrM-KCFSf(<}2w#woCFW9bIU|k}I+qY!xY<mH*1oYvtB#mt6USW?eC(WU-7A
zE9())lo<wbZM&>K?z!>-=M$bW$K<Df(Bv*^@+(ab@dfcUxdN`hQ7XVQTdZ?t=%p**
z3b+DW1?2mX&;_%IjiG)zSm+gi*k-pH>vETnm?UBru`%QbEm$bgLPNY_1Pf<>5_ws~
z#?ZnMG&ARknM1sx1kKL=MCk~bp_i_JE3m7;i8Z@&{@?t3|KAPrmMh>29F+p0o%iz|
zA1R)#dk-gPZ9;#ciwUnW+=j5CM=`l_6ra=8*q=y+m_=+1*+cUm0hPfESKwb2_ymoD
BTsHs!

delta 227
zcmZoMXfc=|#>B`mu~2NHo}wrV0|Nsi1A_nqgC9dGLwQcRVQ_N(#KPtEAPIJcV1@u7
z)<u@gEda^@!S3Hc0!>A3zKcszPJR+lhQs8I#j*V5M;)=LN+GC9kfFRF1LPK{b&L--
pFJw+**}Q?7jcGGG2R{eU3qX<Y%#-;=EIEL7fPBHUIY49!GXSHZGnxPZ

diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_course_new.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_course_new.html.liquid
deleted file mode 100644
index cd5b721e..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_course_new.html.liquid
+++ /dev/null
@@ -1,57 +0,0 @@
-{% assign categories = '' | split: '' %}
-{% for cat in course.categories %}
-  {% assign cat_name = cat.name | split: '!@#$%^&*()' %}
-  {% assign categories = categories | concat: cat_name %}
-{% endfor %}
-{% assign compressed_image_url = course.image_url | replace: "resize=width:820,height:500", "resize=width:500,height:305" %}
-<div class="np-card np-grid-spacing col-xs-12 col-sm-6 col-md-4" filter-type='co' category-name='{{categories | join: '+'}}'>
-  <div class="np-card-container">
-    {% if course.ribbon %}
-      <div class="np-card-ribbon">
-        {{ course.ribbon }}
-      </div>
-    {% endif %}
-    <img
-      class="np-card-image"
-      alt="{{ course.name }}"
-      src="{{ compressed_image_url }}"
-    >
-    <div class="np-card-content np-card-content-vertical np-card-padding">
-      <p class='categories'>
-        {% for category in course.categories %}
-          {{category.name}}   
-        {% endfor %}
-      </p>
-      <h3 class="np-card-content-title">
-        {{ course.name }}
-      </h3>
-      <div class="np-card-content-footer">
-        <div class="np-card-content-progress np-button-color">
-          {% t shared.progress, count: course.progress %}
-        </div>
-        {% capture course_path %}{% route course, id: course.id %}{% endcapture %}
-        {% if course.has_to_restart? %}
-          {% include "course_version_outdated_popup", path: course_path %}
-        {% endif %}
-        <a class="np-button np-button-wide" href="{{ course_path }}">
-          {% t shared.view %}
-        </a>
-      </div>
-    </div>
-  </div>
-</div>
-
-<style>
-  .categories {
-    margin: 0;
-  }
-  .np-card {
-    min-height: 0;
-    min-width: 0;
-  }
-  @media screen and (min-width: 768px) {
-    .np-grid-spacing {
-    padding-left: 3%;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_learning_path.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_learning_path.html.liquid
deleted file mode 100644
index b9b9733c..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_learning_path.html.liquid
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="np-card">
-  <div class="np-card-container">
-    <img
-      class="np-card-image"
-      alt="{{ learning_path.name }}"
-      src="{{ learning_path.image_url }}"
-    >
-    <div class="np-card-content np-card-content-vertical np-card-padding">
-      <h3 class="np-card-content-title">
-        {{ learning_path.name }}
-      </h3>
-      <div class="np-card-content-footer">
-        <div class="np-card-content-progress np-button-color">
-          {% t shared.progress, count: learning_path.progress %}
-        </div>
-        {% capture learning_path_path %}{% route learning_path, id: learning_path.id %}{% endcapture %}
-        <a class="np-button np-button-wide" href="{{ learning_path_path }}">
-          {% t shared.view %}
-        </a>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_learning_path_new.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_learning_path_new.html.liquid
deleted file mode 100644
index 7b18e5ab..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_learning_path_new.html.liquid
+++ /dev/null
@@ -1,44 +0,0 @@
-{% assign categories = '' | split: '' %}
-{% for cat in learning_path.categories %}
-  {% assign cat_name = cat.name | split: '!@#$%^&*()' %}
-  {% assign categories = categories | concat: cat_name %}
-{% endfor %}
-{% assign compressed_image_url = learning_path.image_url | replace: "resize=width:820,height:500", "resize=width:500,height:305" %}
-<div class="np-card np-grid-spacing col-xs-12 col-sm-6 col-md-4" filter-type='lp' category-name='{{categories | join: '+'}}'>
-  <div class="np-card-container">
-    <img
-      class="np-card-image"
-      alt="{{ learning_path.name }}"
-      src="{{ compressed_image_url }}"
-    >
-    <div class="np-card-content np-card-content-vertical np-card-padding">
-      <p class='categories'>
-        {% for category in learning_path.categories %}
-          {{category.name}}   
-        {% endfor %}
-      </p>
-      <h3 class="np-card-content-title">
-        {{ learning_path.name }}
-      </h3>
-      <div class="np-card-content-footer">
-        <div class="np-card-content-progress np-button-color">
-          {% t shared.progress, count: learning_path.progress %}
-        </div>
-        {% capture learning_path_path %}{% route learning_path, id: learning_path.id %}{% endcapture %}
-        <a class="np-button np-button-wide" href="{{ learning_path_path }}">
-          {% t shared.view %}
-        </a>
-      </div>
-    </div>
-  </div>
-</div>
-
-<style>
-  .categories {
-    margin: 0;
-  }
-  .np-card {
-    min-height: 0;
-    min-width: 0;
-  }
-</style>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_other_event.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_other_event.html.liquid
deleted file mode 100644
index f52ff10f..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_other_event.html.liquid
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class='np-card'>
-  <div class='event-header'>
-    <div class='event-header-left'>
-      <i class="far fa-thin fa-users"></i>
-    </div>
-    <div class='event-header-right'>
-      <div class='event-header-right-type'>
-        Other Event
-      </div>
-      <div class='event-header-right-title'>
-        {{ title }}
-      </div>
-    </div>
-  </div>
-  <div class='other-event-sessions'>
-    <div class='event-session'>
-      <div class='event-session-number' style="padding-bottom: 25px">
-        Click here for more information:
-      </div>
-      <a class='event-button' href="{{ link }}">Click here</a>
-    </div>
-  </div>
-</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_training_event.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_training_event.html.liquid
deleted file mode 100644
index 0a381aa3..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_cards_training_event.html.liquid
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class='np-card'>
-  <div class='event-header'>
-    <div class='event-header-left'>
-      <i class="far fa-thin fa-users"></i>
-    </div>
-    <div class='event-header-right'>
-      <div class='event-header-right-type'>
-        ZoomWebinar
-      </div>
-      <div class='event-header-right-title'>
-        {{ training_event.title }}
-      </div>
-    </div>
-  </div>
-  <div class='event-sessions'>
-    {% assign session_number = 0%}
-    {% for session in training_event.sessions limit: 2 %}
-      {% assign session_number = session_number | plus: 1 %}
-      <div class='event-session'>
-        <div class='event-session-number'>
-          Session {{session_number}}
-        </div>
-        <a class='event-session-date' href="{% route training_session, id: session.id %}">
-          {{ session.month }} {{ session.day }} at {{ session.starts }} {{ session.time_zone }}
-        </a>
-      </div>
-    {% endfor %}
-    {% if training_event.sessions.size > 2 %}
-      {% assign third_session = training_event.sessions | slice: 2 | map: 'id' %}
-      <a class='event-additional-sessions' href="{% route training_session, id: third_session %}">
-        {{ training_event.sessions.size | minus: 2 }} additional sessions
-      </a>
-    {% endif %}
-  </div>
-  <a class='event-button' href="{% route training_session, id: training_event.sessions.first.id %}">Select</a>
-</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_course_events.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_course_events.html.liquid
deleted file mode 100644
index 1f2f7158..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_course_events.html.liquid
+++ /dev/null
@@ -1,29 +0,0 @@
-<h3 class="np-card-heading">
-  {% t .header %}
-</h3>
-<div class="np-flex-column">
-  {% for event in course.events %}
-    <div class="np-course-events-content-item">
-      <div class="np-course-events-content-date np-button-background-color">
-        <div class="np-course-events-content-month">
-          {{ event.sessions.first.abbreviated_month }}
-        </div>
-        <div class="np-course-events-content-day">
-          {{ event.sessions.first.day }}
-        </div>
-      </div>
-      <div class="np-course-events-content-details">
-        <div class="np-course-events-content-name">
-          {{ event.title }}
-        </div>
-        <div class="np-course-events-content-type np-text-light">
-          {% t shared.event_types, key: event.event_type %}
-        </div>
-        <div class="np-course-events-content-time np-button-color">
-	  <a href="{{ event.sessions.first.session_url }}">
-	    Register: {{ event.sessions.first.time_period }} {{ event.sessions.first.time_zone }}</a>
-        </div>
-      </div>
-    </div>
-  {% endfor %}
-</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_course_outline.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_course_outline.html.liquid
deleted file mode 100644
index ffead22e..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_course_outline.html.liquid
+++ /dev/null
@@ -1,69 +0,0 @@
-<div class="np-course-outline">
-  <div class="np-text-title np-course-outline-title">
-    {% t .header, key: current_school.course_vocabulary %}
-  </div>
-  <div class='np-text-subtitle' style='padding-bottom: 15px;'>
-    (Click on section title to expand and view learning activities)
-  </div>
-  <div class="np-course-outline-content">
-    <ol class="np-course-outline-content-section">
-      {% for section in course.sections %}
-        <li class="np-course-outline-content-section-list">
-          <div class="np-course-outline-content-section-name np-text-title-bold np-text-title-bold">
-            <i class="fa fa-caret-right section-arrow"></i>
-            <i class="fa fa-caret-down section-arrow np-hidden"></i>
-            {{ section.name }}
-          </div>
-          <ol class="np-course-outline-content-activity np-hidden">
-            {% for activity in section.activities %}
-
-              <li class="np-course-outline-content-activity-list">
-                {% if activity.completed? %}
-                  <i class="fas fa-circle np-course-outline-content-activity-icon np-button-color"></i>
-                  {% if activity.locked? %}
-                    {% include "course_activity_locked" %}
-                  {% else %}
-                    {% include "course_activity_unlocked", class: "np-course-outline-content-activity-link-completed" %}
-                  {% endif %}
-                  <div class="np-button-background-color np-course-outline-content-activity-list-bar"></div>
-                {% else %}
-                  <i class="far fa-circle np-course-outline-content-activity-icon"></i>
-                  {% if activity.locked? %}
-                    {% include "course_activity_locked" %}
-                  {% else %}
-                    {% include "course_activity_unlocked", class: "np-course-outline-content-activity-link" %}
-                  {% endif %}
-                  <div class="np-course-outline-content-activity-list-bar"></div>
-                {% endif %}
-              </li>
-            {% endfor %}
-          </ol>
-        </li>
-      {% endfor %}
-    </ol>
-  </div>
-</div>
-
-<style>
-  .np-course-outline-content-section-name {
-    cursor: pointer;
-    border: none;
-  }
-  .np-course-outline-content > *, .np-course-outline-content-activity-list > *, .np-course-outline-title {
-    color: #9b4b87;
-    text-decoration: none;
-    cursor: pointer;
-  }
-  .np-course-outline-content-activity-icon {
-    color: #d4d4d4;
-  }
-</style>
-
-<script>
-  window.onload = function() {
-    $('.np-course-outline-content-section-name').click(function() {
-      $(this).children('.section-arrow').toggleClass('np-hidden');
-      $(this).siblings('.np-course-outline-content-activity').toggleClass('np-hidden');
-    });
-  };
-</script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_footer.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_footer.html.liquid
deleted file mode 100644
index 1cac0ad5..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_footer.html.liquid
+++ /dev/null
@@ -1,70 +0,0 @@
-<footer class="np-footer">
-  <div class="np-footer-top">
-    {% if website_footer.show_navigation_links? %}
-      <div class="np-footer-navigation">
-        <ul class="np-footer-navigation-list">
-          {% for website_navigation in navigations.footer_navigations %}
-            <li class="np-footer-navigation-item">
-              <a
-                class="np-footer-navigation-link np-button-color"
-                href="{{ website_navigation.path }}"
-                {% if website_navigation.external? %} target="_blank" {% endif %}
-              >
-                {{ website_navigation.name }}
-              </a>
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-    {% endif %}
-    {% if current_school.logo_url %}
-      <h2 class="np-footer-logo">
-        <a href="{% route home %}">
-          <img
-            alt="{{ current_school.name }}"
-            class="np-footer-logo-image"
-            src="{{ current_school.logo_url }}"
-          />
-        </a>
-      </h2>
-    {% else %}
-      <div class="np-school-name np-header-font-color">
-        {{ current_school.name }}
-      </div>
-    {% endif %}
-  </div>
-</footer>
-
-<style>
-  .np-footer-navigation-list {
-    flex-wrap: wrap;
-  }
-  .np-footer {
-    padding: 0.5rem 4% 0;
-    border-top: 1px solid #ededed !important;
-  }
-  .np-footer-navigation-link {
-    padding: 0 1.25rem 1.25rem;
-  }
-  .np-footer-navigation-link:hover {
-    color: #4b2346;
-  }
-  .np-powered-by {
-    padding-bottom: 0.75rem;
-    background: white;
-  }
-  @media screen and (min-width: 768px) {
-    .np-footer-navigation {
-      margin: 0 -1.25rem;
-    }
-    .np-footer-logo {
-      margin-right: 0;
-    }
-  }
-
-  @media screen and (max-width: 768px) {
-    .np-footer-navigation-link {
-      padding: 0 1.25rem;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_fullfilment_events_index.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_fullfilment_events_index.html.liquid
deleted file mode 100644
index 6f05faea..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_fullfilment_events_index.html.liquid
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="np-dashboard-resources">
-  <div class="row row-with-thumbnails">
-    <div class="col-xs-12 col-sm-6 col-lg-4 event-card">
-      {% include "cards_other_event" title: "Getting Started with Fulfillment", link:
-      "https://trainingcenter.spscommerce.com/courses/ccc29da0-f636-4a96-bfca-52d37e1b1ec6/activities/b308e860-f2b5-418c-a29a-3a722af5b3bf" %}
-    </div>
-     <div class="col-xs-12 col-sm-6 col-lg-4 event-card">
-      {% include "cards_other_event" title: "Fulfillment Product Training", link:
-      "https://trainingcenter.spscommerce.com/learning_paths/507e6357-039e-480d-88d1-296bb1ad5afa/courses/d85478a2-34f6-49eb-b511-dfa28319e6b8/activities/d9b2ac9f-bcf0-4469-aa71-08d9a1fb2ccf" %}
-    </div>
-  </div>
-</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_head.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_head.html.liquid
deleted file mode 100644
index e01042dd..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_head.html.liquid
+++ /dev/null
@@ -1,8 +0,0 @@
-{% styles default %}
-{% styles colors %}
-{% styles custom %}
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
-<link rel="stylesheet" media="all" href="https://s3.amazonaws.com/spscops/trainingcenter/styles/site-styles.css">
-<link href='https://s3.amazonaws.com/spscops/trainingcenter/styles/SourceSansPro-font-styles.css' rel='stylesheet' type='text/css'>
-<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,200,900,600' rel='stylesheet' type='text/css'>
-<script src="https://kit.fontawesome.com/41a3aee3ad.js" crossorigin="anonymous"></script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_header.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_header.html.liquid
deleted file mode 100644
index 3cd12f6d..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_header.html.liquid
+++ /dev/null
@@ -1,429 +0,0 @@
-<header class="np-header np-header-color" style='height: 50px;'>
-  <div class="np-header-content">
-    <div class='header-desktop-left'>
-      {% if current_school.logo_url %}
-        <h1 class="np-header-logo">
-          <a href="{% route home %}">
-            <img src="https://schoolkeep-production.s3.amazonaws.com/wysiwyg/c4231bd9-2caa-4eca-bdaa-92cd69c0a35f/20180105100241_logo_1.png" alt="{{ current_school.name }}"  style='display: flex;' class='logo-image'>
-          </a>
-        </h1>
-      {% else %}
-        <a href="{% route home %}" class="np-school-name np-header-font-color">
-          {{ current_school.name }}
-        </a>
-      {% endif %}
-    </div>
-    <div class='header-desktop-right np-hidden-mobile-new'>
-      <div class="np-header-desktop-nav">
-        <ul class="np-header-desktop-nav-list">
-          {% for website_navigation in navigations.header_navigations_external %}
-            <li class= "np-header-desktop-nav-item">
-              <a
-                href="{{ website_navigation.path }}"
-                class="np-header-desktop-nav-link np-header-font-color"
-                style='font-weight: 700;'
-              >
-                {{ website_navigation.name }}
-              </a>
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-      {% if current_person.signed_in? %}
-        <form action="{% route search %}" method="get" data-test="desktop-search" style="background: white; border-radius: 4px;" class='header-search-form' id='header-search-form'>
-          <input
-            aria-label="{% t .search %}"
-            class="header-search-input"
-            type="text"
-            name="q"
-            placeholder="Search by keyword"
-          />
-          <button class="far fa-search header-search-button" type="submit" form='header-search-form'></button>
-        </form>
-        <div class="np-hidden-mobile-new np-header-avatar">
-          <button
-            class="np-header-avatar-button"
-            data-test="open-desktop-menu"
-            data-toggle-class-on-target="np-hidden"
-            data-toggle-target=".np-header-avatar-tooltip"
-            data-toggle-outside
-            style='color: white; font-weight: 700;'
-          >
-            {{ current_person.name }}
-          </button>
-          <div class="np-header-avatar-tooltip np-hidden" role="tooltip">
-            <span class="np-header-avatar-tooltip-arrow-up"></span>
-            <div class="np-header-avatar-tooltip-learner">
-              <div class="np-header-avatar-tooltip-learner-name">
-                {{ current_person.name }}
-              </div>
-              <div class="np-header-avatar-tooltip-learner-email">
-                {{ current_person.email }}
-              </div>
-            </div>
-            <nav class="np-header-avatar-tooltip-navigation">
-            {% unless current_school.sso_active? %}
-              <a
-                class="np-header-avatar-tooltip-navigation-link"
-                href="{% route account %}"
-              >
-                {% t .profile_settings %}
-              </a>
-            {% endunless %}
-              <a
-                class="np-header-avatar-tooltip-navigation-link np-danger"
-                href="{% route logout %}"
-              >
-                {% t .sign_out %}
-              </a>
-            </nav>
-          </div>
-        </div>
-      {% else %}
-        <a
-          class="np-header-sign-in np-header-desktop-nav-link np-header-font-color"
-          aria-label="{% t shared.sign_in %}"
-          href="{% route login %}"
-        >
-          {% t shared.sign_in %}
-        </a>
-      {% endif %}
-    </div>
-    <div class='np-header-right-mobile np-hidden-desktop-new'>
-      <i class="mobile-search-button far fa-search" id='mobile-search-button'></i>
-      <i class="mobile-menu-button fas fa-bars" id='mobile-menu-button'></i>
-    </div>
-  </div>
-</header>
-<div class='bottom-header-search np-hidden np-hidden-desktop-new' id='menu-mobile-search-menu'>
-  <form action="{% route search %}" method="get" data-test="desktop-search" style="background: white; border-radius: 4px;" class='menu-mobile-search-form' id='menu-mobile-search-form'>
-    <input
-      aria-label="{% t .search %}"
-      class="menu-mobile-search-input"
-      type="text"
-      name="q"
-      placeholder="Search by keyword"
-    />
-    <button class="far fa-search menu-mobile-search-button" type="submit" form='menu-mobile-search-form'></button>
-  </form>
-  <i class="menu-mobile-close fas fa-times"></i>
-</div>
-</div>
-
-<div class="np-hidden-desktop-new np-hidden" id='mobile-menu-menu'>
-  <i class="mobile-menu-close fas fa-times" id='mobile-menu-close'></i>
-  <ul class="mobile-menu-list">
-    {% for website_navigation in navigations.header_navigations_external %}
-      <li class='mobile-menu-list-li'>
-        <a href="{{ website_navigation.path }}" class='mobile-menu-list-element'>
-          {{ website_navigation.name }}
-        </a>
-      </li>
-    {% endfor %}
-    <li class='mobile-menu-list-li'><a href="/app/account" class='mobile-menu-list-element'>My Profile</a></li>
-    <li style='border-bottom: 1px solid #1a1a1a;'></li>
-    <li class='mobile-menu-list-li'><a href="{% route logout %}" data-method="delete" rel="nofollow" class='mobile-menu-list-element'>Log Out</a></li>
-  </ul>
-</div>
-
-
-
-{% include "messages" %}
-<div class="main_site">
-
-<style>
-  .np-header-content {
-    justify-content: space-between;
-  }
-  .header-desktop-right {
-    display: flex;
-    flex-direction: row;
-  }
-  .np-header-search {
-    align-self: center;
-  }
-  .np-header-right-mobile {
-    display: flex;
-  }
-  .np-header-search-icon:before {
-    font-weight: 700;
-    color: gray;
-  }
-
-  .mobile-menu-button {
-    font-size: 1.5rem;
-    color: white;
-    padding: 10px;
-    cursor: pointer;
-  }
-  .mobile-search-button {
-    padding: 10px;
-    cursor: pointer;
-  }
-  .mobile-search-button:before {
-    color: white;
-    font-weight: 700;
-    font-size: 1.25rem;
-    align-self: center;
-  }
-  .bottom-header-search {
-    background: #00aae5;
-    height: 50px;
-    display: flex;
-  }
-
-  .header-search-form {
-    height: 40px;
-    display: flex;
-    width: 20%;
-    margin: auto;
-  }
-  .header-search-input {
-    padding-left: 15px;
-    border: none;
-    width: 100%;
-    background: none;
-  }
-  .header-search-input:focus-visible {
-    outline: none;
-  }
-  .header-search-icon {
-    right: .75rem;
-    top: 0.6rem;
-
-  }
-  .header-search-icon:before {
-    color: darkgray;
-  }
-  .header-search-button {
-    width: 60px;
-    font-size: 20px;
-    font-weight: 700;
-    color: gray;
-    background: none;
-    border: none;
-    cursor: pointer;
-  }
-
-  .menu-mobile-search-form {
-    height: 40px;
-    display: flex;
-    width: 70%;
-    margin: auto;
-  }
-  .menu-mobile-search-input {
-    padding-left: 15px;
-    border: none;
-    width: 100%;
-    background: none;
-  }
-  .menu-mobile-search-input:focus-visible {
-    outline: none;
-  }
-  .menu-mobile-search-icon {
-    right: .75rem;
-    top: 0.6rem;
-  }
-  .menu-mobile-search-icon:before {
-    color: darkgray;
-  }
-  .menu-mobile-search-button {
-    width: 60px;
-    font-size: 20px;
-    font-weight: 700;
-    color: gray;
-    background: none;
-    border: none;
-    cursor: pointer;
-  }
-  .menu-mobile-close {
-    z-index: 100;
-    position: absolute;
-    padding: 15px;
-    font-size: 20px;
-    padding: auto;
-    align-items: center;
-    align-self: center;
-    right: 5px;
-    cursor: pointer;
-  }
-  #mobile-menu-menu {
-    position: absolute;
-    top: 0;
-    right: -256px;
-    width: 256px;
-    background: #3b3f3d;
-    z-index: 10000;
-    height: 100%;
-    pointer-events: all;
-  }
-  .mobile-menu-close {
-    color: white;
-    font-size: 1.5rem;
-    top: 13px;
-    position: absolute;
-    left: 15px;
-  }
-  .mobile-menu-list {
-    list-style-type: none;
-    margin-top: 40px;
-    padding-left: 10px;
-  }
-  .mobile-menu-list-element {
-    color: #ccc;
-    font-weight: 400;
-    text-decoration: none;
-
-  }
-  .mobile-menu-list-li:hover * {
-    color: #ffffff;
-    text-shadow: none;
-    cursor: pointer;
-  }
-  .mobile-menu-list-li:hover {
-    background: #9b4b87;
-  }
-  .mobile-menu-list-li {
-    padding: 8px 16px;
-  }
-  .np-header-desktop-nav-list {
-    flex-wrap: nowrap;
-  }
-  @media screen and (min-width: 1056px) {
-    .np-hidden-desktop-new {
-      display: none !important;
-    }
-    .np-header-search-input {
-      background:#fff;
-      border:2px solid #bac4ca;
-      border-radius:4px;
-      color:#486776;
-      font-size:15px;
-      opacity:1;
-      outline:none;
-      padding:0 1.5rem 0 1rem;
-      width:90%;
-      height: 2.5rem;
-    }
-    .np-header-search-input::placeholder {
-      color: black;
-    }
-    .np-header-search-input:focus {
-    width: 90%;
-    padding:0 1.5rem 0 1rem;
-    }
-  }
-  @media (min-width:1643px) and (max-width:1738px) {
-    .header-search-form {
-      width: 14%;
-    }
-  }
-  @media (min-width:1472px) and (max-width:1610px) {
-    .header-search-form {
-      width: 14%;
-    }
-  }
-  @media (min-width:0px) and (max-width:1311px) {
-    .header-search-form {
-      width: 14%;
-    }
-    .header-search-input::placeholder {
-      font-size: 13px;
-    }
-  }
-  @media (min-width:1472px) and (max-width:1643px) {
-    .np-header-desktop-nav-item {
-      padding: 1rem 0.5rem;
-    }
-    .np-header-avatar-button {
-      margin: 0 0 0 0.5rem;
-    }
-  }
-  @media (min-width:1472px) and (max-width:1550px) {
-    .np-header-desktop-nav-link {
-      font-size: 14px;
-    }
-    .np-header-avatar-button {
-      font-size: 14px;
-    }
-  }
-  @media (min-width:1056px) and (max-width:1472px) {
-    .np-header-content {
-      flex-direction: column;
-      align-items: unset;
-    }
-    .np-header {
-      height: 100px !important;
-    }
-    .np-header-logo {
-      margin-bottom: 0;
-    }
-    .header-desktop-left {
-      margin-top: 1.5rem;
-    }
-    .header-desktop-right {
-      margin-bottom: 1rem;
-    }
-    .np-header-desktop-nav-list {
-      padding-left: 0;
-    }
-  }
-  @media (min-width:1056px) and (max-width:1220px) {
-    .np-header-desktop-nav-item {
-      padding: 1rem 0.5rem;
-    }
-    .np-header-avatar-button {
-      margin: 0 0 0 0.5rem;
-    }
-  }
-  @media (min-width:1056px) and (max-width:1118px) {
-    .np-header-desktop-nav-link {
-      font-size: 14px;
-    }
-    .np-header-avatar-button {
-      font-size: 14px;
-    }
-  }
-  @media screen and (max-width: 1055px) {
-    .np-hidden-mobile-new {
-      display: none !important;
-    }
-    .np-header-content {
-    flex-direction: row;
-    }
-  }
-  @media screen and (max-width: 445px) {
-    .logo-image {
-      width: 250px;
-    }
-  }
-  @media screen and (max-width: 400px) {
-    .menu-mobile-search-form {
-      width: 85%;
-    }
-  }
-</style>
-
-<script>
-   var a = $("#mobile-menu-menu").children()
-   var a = a.add($("#mobile-menu-menu"))
-  $("#mobile-search-button").click(function() {
-    $("#menu-mobile-search-menu").toggleClass('np-hidden');
-  });
-  $(".menu-mobile-close").click(function() {
-    $("#menu-mobile-search-menu").toggleClass('np-hidden');
-  });
-  $("#mobile-menu-button").click(function() {
-    $("#mobile-menu-menu").toggleClass('np-hidden');
-    window.onscroll = function () { window.scrollTo(0, 0); };
-    $('body').css({position: 'relative', left: '-256px'});
-    $("#mobile-menu-menu")
-    $('body:not(a)').css({pointerEvents: 'none', filter: 'grayscale(40%)'});
-  })
-  $('#mobile-menu-close').click(function(){
-    $('body').css({position: '', left: '', filter: ''});
-    $('body:not(a)').css({pointerEvents: ''});
-    window.onscroll = function() {}
-    $("#mobile-menu-menu").toggleClass('np-hidden');
-  })
-</script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_learning_path_course.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_learning_path_course.html.liquid
deleted file mode 100644
index bbefe65f..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_learning_path_course.html.liquid
+++ /dev/null
@@ -1,55 +0,0 @@
-{% if learning_path.enrolled? and course.unlocked? %}
-  <a
-    class="np-learning-path-outline-item np-card-container"
-    href="{% route learning_path_course, learning_path_id: learning_path.id, id: course.id %}"
-  >
-    <div class="np-card-content np-card-padding">
-      <img
-        src="{{ item.image }}"
-        alt="{{ course.name }}"
-        class="np-learning-path-outline-course-image"
-      >
-      <div class="np-learning-path-outline-content">
-        <div class="np-learning-path-outline-name np-top-title">
-          {{ course.name }}
-        </div>
-        {% if course.instructors %}
-          <div class="np-learning-path-outline-caption">
-            {{ course.instructors }}
-          </div>
-        {% endif %}
-        <div class="np-learning-path-outline-progress
-          {% if course.completed? %} np-color-success {% else %} np-button-color {% endif %}
-        ">
-          {% t shared.progress, count: course.progress %}
-        </div>
-      </div>
-      <i class="fas fa-chevron-right np-learning-path-outline-icon"></i>
-      {% if course.optional? %}
-        <div class="np-optional-ribbon">
-          {% t shared.optional %}
-        </div>
-      {% endif %}
-    </div>
-  </a>
-{% else %}
-  <div class="np-learning-path-outline-item np-learning-path-outline-inactive-item np-card-container">
-    <div class="np-card-content np-card-padding">
-      <img
-        src="{{ item.image }}"
-        alt="{{ course.name }}"
-        class="np-learning-path-outline-course-image"
-      >
-      <div class="np-learning-path-outline-content">
-        <div class="np-learning-path-outline-name np-top-title">
-          {{ course.name }}
-        </div>
-      </div>
-      {% if course.optional? %}
-        <div class="np-optional-ribbon">
-          {% t shared.optional %}
-        </div>
-      {% endif %}
-    </div>
-  </div>
-{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_learning_path_training_session.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_learning_path_training_session.html.liquid
deleted file mode 100644
index 8c5ae377..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_learning_path_training_session.html.liquid
+++ /dev/null
@@ -1,52 +0,0 @@
-{% if learning_path.enrolled? and training_session.unlocked? %}
-  <a
-    class="np-learning-path-outline-item np-card-container"
-    href="{% route training_session, id: training_session.id %}"
-  >
-    <div class="np-card-content np-card-padding">
-      <div class="np-events-content-date np-button-background-color">
-        <div class="np-events-content-month">
-          {{ training_session.month }}
-        </div>
-        <div class="np-events-content-day">
-          {{ training_session.day }}
-        </div>
-      </div>
-      <div class="np-learning-path-outline-content">
-        <div class="np-learning-path-outline-name np-top-title">{{ training_session.name }}</div>
-        <div class="np-learning-path-outline-caption">{{ training_session.instructors }}</div>
-        <div class="np-events-content-time np-learning-path-outline-time np-button-color">
-          {{ training_session.time }} {{ training_session.time_zone }}
-        </div>
-      </div>
-      <i class="fas fa-chevron-right np-learning-path-outline-icon"></i>
-      {% if training_session.optional? %}
-        <div class="np-optional-ribbon">
-          {% t shared.optional %}
-        </div>
-      {% endif %}
-    </div>
-  </a>
-{% else %}
-  <div class="np-learning-path-outline-item np-card-container np-learning-path-outline-inactive-item">
-    <div class="np-card-content np-card-padding">
-      <div class="np-events-content-date np-button-background-color">
-        <div class="np-events-content-month">
-          {{ training_session.month }}
-        </div>
-        <div class="np-events-content-day">
-          {{ training_session.day }}
-        </div>
-      </div>
-      <div class="np-learning-path-outline-content">
-        <div class="np-learning-path-outline-name np-top-title">{{ training_session.name }}</div>
-        <div class="np-learning-path-outline-caption">{{ training_session.caption }}</div>
-      </div>
-      {% if training_session.optional? %}
-        <div class="np-optional-ribbon">
-          {% t shared.optional %}
-        </div>
-      {% endif %}
-    </div>
-  </div>
-{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_learning_paths_index.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_learning_paths_index.html.liquid
deleted file mode 100644
index 1c9fe93a..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_learning_paths_index.html.liquid
+++ /dev/null
@@ -1,16 +0,0 @@
-{% if learning_paths.available.any? %}
-  <div class="np-catalog-courses row row-with-thumbnails">
-    {% for learning_path in learning_paths.available %}
-      <div class="col-xs-12 col-md-6 col-lg-4 np-stretch-content">
-        {% include "cards_learning_path" with learning_path %}
-      </div>
-    {% endfor %}
-  </div>
-{% else %}
-  {% capture message %}
-    {% t shared.zero_state.courses.catalog,
-      key: current_school.course_vocabulary
-    %}
-  {% endcapture %}
-  {% include "courses_zero_state", message: message %}
-{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_other_events_index.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_other_events_index.html.liquid
deleted file mode 100644
index 629b2b84..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_other_events_index.html.liquid
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="np-dashboard-resources">
-  <div class="row row-with-thumbnails">
-    <div class="col-xs-12 col-sm-6 col-lg-4 event-card">
-      {% include "cards_other_event" title: "SPS Commerce presents MAPADOC Training for Sage 100", link: "https://www.spscommerce.com/lp/mapadoc-training-sage-100/" %}
-    </div>
-    <div class="col-xs-12 col-sm-6 col-lg-4 event-card">
-      {% include "cards_other_event" title: "SPS Commerce presents MAPADOC Training for Sage X3", link: "https://www.spscommerce.com/lp/mapadoc-training-sage-x3/" %}
-    </div>
-    <div class="col-xs-12 col-sm-6 col-lg-4 event-card">
-      {% include "cards_other_event" title: "SPS Commerce presents MAPADOC Training for Sage 500", link: "https://www.spscommerce.com/lp/mapadoc-training-sage-500/" %}
-    </div>
-  </div>
-</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_sub_navigation.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_sub_navigation.html.liquid
deleted file mode 100644
index e69de29b..00000000
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_training_events_index.html (1).liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_training_events_index.html (1).liquid
deleted file mode 100644
index 4a5c6132..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_training_events_index.html (1).liquid	
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="np-dashboard-resources">
-  {% if training_events.available.any? %}
-    <div class="row row-with-thumbnails">
-      {% for training_event in training_events.available %}
-        <div class="col-xs-12 col-sm-6 col-lg-4 event-card">
-          {% include "cards_training_event" with training_event %}
-        </div>
-      {% endfor %}
-    </div>
-  {% else %}
-    {% include "training_events_zero_state" %}
-  {% endif %}
-</div>
-<style>
-  .event-card {
-    padding: 1rem 3rem;
-  }
-  @media screen and (max-width: 1450px) {
-    .event-card {
-      padding: 1rem 2rem;
-    }
-  }
-  @media screen and (max-width: 768px) {
-    .event-card {
-      display: flex;
-      justify-content: center;
-      padding: 0.5rem 0;
-    }
-  }
-  @media screen and (max-width: 500px) {
-    .event-card {
-      padding: 0.5rem 1rem;
-    }
-  }
-  @media screen and (max-width: 350px) {
-    .event-card {
-      padding: 0.5rem 0.5rem;
-    }
-  }
-  
-</style>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_training_events_index.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_training_events_index.html.liquid
deleted file mode 100644
index 4a5c6132..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_training_events_index.html.liquid
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="np-dashboard-resources">
-  {% if training_events.available.any? %}
-    <div class="row row-with-thumbnails">
-      {% for training_event in training_events.available %}
-        <div class="col-xs-12 col-sm-6 col-lg-4 event-card">
-          {% include "cards_training_event" with training_event %}
-        </div>
-      {% endfor %}
-    </div>
-  {% else %}
-    {% include "training_events_zero_state" %}
-  {% endif %}
-</div>
-<style>
-  .event-card {
-    padding: 1rem 3rem;
-  }
-  @media screen and (max-width: 1450px) {
-    .event-card {
-      padding: 1rem 2rem;
-    }
-  }
-  @media screen and (max-width: 768px) {
-    .event-card {
-      display: flex;
-      justify-content: center;
-      padding: 0.5rem 0;
-    }
-  }
-  @media screen and (max-width: 500px) {
-    .event-card {
-      padding: 0.5rem 1rem;
-    }
-  }
-  @media screen and (max-width: 350px) {
-    .event-card {
-      padding: 0.5rem 0.5rem;
-    }
-  }
-  
-</style>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/catalog.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/catalog.html.liquid
deleted file mode 100644
index cb7a3bbb..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/catalog.html.liquid
+++ /dev/null
@@ -1,34 +0,0 @@
-{% include "header" %}
-{% include "course_version_outdated_alert", courses: courses.in_catalog %}
-{% include "sub_navigation" %}
-<main class="np-main np-dashboard np-subpage-container np-max-width">
-  <div class="np-catalog-header-wrapper">
-    <div class="np-catalog-header">
-      <div class="np-resource-title">{{ catalog.headline }}</div>
-      <div class="np-resource-subtitle">{{ catalog.subheadline }}</div>
-    </div>
-    {% capture label %}{% t shared.filters.by_category %}{% endcapture %}
-
-    {% if courses.in_catalog.any? %}
-      {%
-        include "filter_dropdown",
-        filters: courses.filters,
-        key: "category_uuid",
-        label: label
-      %}
-    {% endif %}
-  </div>
-  {% include "courses_catalog" %}
-</main>
-{% include "footer" %}
-
-<style>
-  .np-dashboard {
-    background: white;
-  }
-  @media screen and (min-width: 768px) {
-    .np-grid-spacing {
-    padding-left: 3%;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/course.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/course.html.liquid
deleted file mode 100644
index f052eb18..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/course.html.liquid
+++ /dev/null
@@ -1,60 +0,0 @@
-{% include "header_minimal" %}
-<main class="np-main np-max-width np-page-container">
-  <div class="np-hidden-mobile" id="course-desktop">
-    {% include "course_desktop_view" %}
-  </div>
-  <div class="np-hidden-desktop" id="course-mobile">
-    {% include "course_mobile_view" %}
-  </div>
-</main>
-
-<style>
-  body {
-    background-image: url(https://s3.amazonaws.com/static.northpass.com/SPS/sps-background.gif);
-  }
-  .np-card-padding-large {
-    box-shadow: none;
-  }
-  .np-card-container,
-  .np-card-container-training-session {
-    border-radius: 4px;
-    box-shadow: none;
-    position: relative;
-  }
-  .np-learning-path-outline-icon {
-    align-self: center;
-    font-size: 40px;
-    color: #9b4b87;
-  }
-  .np-box-header {
-    height: 80px;
-  }
-  .np-powered-by {
-    background: none;
-  }
-  .np-card-container, .np-card-container-training-session {
-    background: none;
-  }
-  .np-top-cta {
-    background: rgba(229, 233, 235, 0.5);
-  }
-  .np-card-text {
-    background: rgba(255, 255, 255, 0.5);
-  }
-  .np-course-outline {
-    background: rgba(255, 255, 255, 0.5);
-  }
-  @media screen and (max-width: 835px) {
-    .col-sm-6 {
-      max-width: 45%;
-    }
-    .np-card-padding, .np-card-padding-dynamic {
-      padding-left: 0;
-    }
-  }
-  @media screen and (max-width: 765px) {
-    .np-box-header {
-      height: 60px;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/dashboard.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/dashboard.html.liquid
deleted file mode 100644
index a9d761d1..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/dashboard.html.liquid
+++ /dev/null
@@ -1,291 +0,0 @@
-{% include "header" %}
-{% include "course_version_outdated_alert", courses: courses.enrolled %}
-{% include "sub_navigation" %}
-<main class="np-main np-dashboard np-subpage-container np-max-width">
-  <div class="row np-flex-center">
-    <div class='my-webinars'>
-      <div class='section-title'>
-        My Webinars
-      </div>
-      {% if training_events.enrolled and training_events.enrolled.size > 0 %}
-        {% for training_event in training_events.enrolled %}
-          {% for session in training_event.sessions %}
-            {% if session.registered? %}
-              <div class='dashboard-event'>
-                On {{ session.month }} {{ session.day }} at {{ session.starts }} {{ session.time_zone }} is your {{ session.title }} event that is being held online 
-                <a href='{{ session.session_url }}' class='dashboard-event-link'>Join</a>
-              </div>
-            {% endif %}
-          {% endfor %}
-        {% endfor %}
-      {% else %}
-        <div class='section-none-text'>
-          You haven't registered for any webinars yet. 
-        </div>
-        <button class='section-none-button'>
-          <a class="section-none-link" href="/app/training_events">
-            Discover Webinars
-          </a>
-        </button>
-      {% endif %}
-    </div>
-    <div class='my-paths'>
-      <div class='section-title'>
-        My Paths
-      </div>
-      <div class='section-subtitle'>
-        Learning Paths in which you're currently enrolled
-      </div>
-      {% if learning_paths.enrolled and learning_paths.enrolled.size > 0 %}
-        <div class='section-content'>
-          <div class='filter-section'>
-            <div class='filter-title'>Filter by:</div>
-            {% assign lp_categories = '' | split: '' %}
-            {% for lp in learning_paths.enrolled %}
-              {% for cat in lp.categories %}
-                {% assign cat_name = cat.name | split: '!@#$%^&*()' %}
-                {% assign lp_categories = lp_categories | concat: cat_name %}
-              {% endfor %}
-            {% endfor %}
-            {% assign lp_categories = lp_categories | uniq %}
-              <div class='filter-element filter-element-selected' filter-type='lp' category-name='none'>
-                All
-              </div>
-            {% for cat in lp_categories %}
-              <div class='filter-element' filter-type='lp' category-name='{{cat}}'>
-                {{cat}}
-              </div>
-            {% endfor %}
-          </div>
-          <div class='tiles-section'>
-            {% for learning_path in learning_paths.enrolled %}
-              {% include 'cards_learning_path_new' with learning_path %}
-            {% endfor %}
-          </div>
-        </div>
-      {% else %}
-        <div class='section-none-text'>
-          You haven't enrolled into any learning_paths yet. 
-        </div>
-        <button class='section-none-button'>
-          <a class="section-none-link" href="/app/learning_paths">
-            Discover Paths
-          </a>
-        </button>
-      {% endif %}
-    </div>
-    <div class='my-courses'>
-      <div class='section-title'>
-        My Courses
-      </div>
-      <div class='section-subtitle'>
-        Courses in which you're currently enrolled
-      </div>
-      {% if courses.enrolled and courses.enrolled.size > 0 %}
-      <div class='section-content'>
-        <div class='filter-section'>
-          <div class='filter-title'>Filter by:</div>
-          {% assign lp_categories = '' | split: '' %}
-          {% for lp in courses.enrolled %}
-            {% for cat in lp.categories %}
-              {% assign cat_name = cat.name | split: '!@#$%^&*()' %}
-              {% assign lp_categories = lp_categories | concat: cat_name %}
-            {% endfor %}
-          {% endfor %}
-          {% assign lp_categories = lp_categories | uniq %}
-            <div class='filter-element filter-element-selected' filter-type='co' category-name='none'>
-              All
-            </div>
-          {% for cat in lp_categories %}
-            <div class='filter-element' filter-type='co' category-name='{{cat}}'>
-              {{cat}}
-            </div>
-          {% endfor %}
-        </div>
-        <div class='tiles-section'>
-          {% for course in courses.enrolled %}
-            {% include 'cards_course_new' with course %}
-          {% endfor %}
-        </div>
-      </div>
-      {% else %}
-        <div class='section-none-text'>
-          You haven't enrolled into any courses yet. 
-        </div>
-        <button class='section-none-button'>
-          <a class="section-none-link" href="/app/catalog">
-            Discover Courses
-          </a>
-        </button>
-      {% endif %}
-    </div>
-  </div>
-</main>
-{% include "footer" %}
-
-<style>
-  .np-dashboard {
-    background: white;
-  }
-  .row {
-    flex-direction: column;
-    margin-right: -1rem;
-    margin-left: -1rem;
-    display: inline-block;
-  }
-  .tiles-section {
-    display: flex;
-    width: 100%;
-    flex-wrap: wrap;
-  }
-  .section-content {
-    display: flex;
-    flex-direction: row;
-    border-top: 1px solid #ededed !important;
-    padding: 1rem 0;
-  }
-  .section-title {
-    margin-top: 30px;
-    font-size: 24px;
-    font-weight: 600;
-    line-height: 30px;
-    margin-bottom: 15px;
-    color: #444;
-  }
-  .section-subtitle {
-    font-size: 20px;
-    font-weight: 600;
-    line-height: 24px;
-    margin-bottom: 45px;
-    color: #444;
-  }
-  .section-none-text {
-    margin-bottom: 15px;
-    color: #606060;
-    font-size: 16px;
-  }
-  .section-none-button {
-    background: #9b4b87;
-    color: white;
-    padding: 0 20px;
-    text-align: center;
-    margin: auto;
-    font-size: 16px;
-    border: none;
-    border-radius: 2px;
-    cursor: pointer;
-    min-height: 30px;
-    line-height: 39px;
-    margin: 10px 0
-  }
-  .section-none-button:hover {
-    background: #4b2346 !important;
-  }
-  .section-none-link {
-    color: white;
-    text-decoration: none;
-  }
-  .section-none-link:hover {
-    color: white;
-  }
-  .dashboard-event {
-    padding: 10px 0;
-    display: flex;
-    justify-content: space-between;
-  }
-  .dashboard-event-link {
-    color: #9b4b87;
-    margin-left: 15px;
-    text-decoration: none;
-  }
-  .dashboard-event-link:hover {
-    color: #4b2346;
-  }
-  .filter-section {
-    width: 25%;
-  }
-  .filter-element {
-    color: #9b4b87;
-    font-size: 18px;
-    margin-top: 8px;
-    cursor: pointer;
-  }
-  .filter-element:hover {
-    color: #4b2346;
-  }
-  .filter-element-selected {
-    font-weight: 700;
-  }  
-  .filter-title {
-    font-size: 20px;
-    font-weight: 600;
-  }
-  @media (min-width:1200px) and (max-width:1640px) {
-    .row .np-card {
-      padding: 0 1rem 2rem;
-    }
-  }
-  @media (min-width:768px) and (max-width:1200px) {
-    .row .np-card {
-      padding: 0 0.7rem 1.4rem;
-    }
-  }
-  @media screen and (max-width: 1400px) {
-    .filter-section {
-      width: 20%;
-    }
-  }
-  @media screen and (max-width: 768px) {
-    .section-content {
-      flex-direction: column;
-    }
-    .filter-section {
-      width: 100%;
-      margin-bottom: 15px;
-    }
-  }
-  .np-subpage-container {
-    padding:20px 4% 40px;
-  }
-  .my-webinars {
-    padding: 1rem;
-    border-top: 1px solid #ededed !important;
-  }
-  .my-paths {
-    padding: 1rem;
-    border-top: 1px solid #ededed !important;
-  }
-  .my-courses {
-    padding: 1rem;
-    border-top: 1px solid #ededed !important;
-  }
-</style>
-
-
-<script>
-  $('[filter-type]').each(function(x){
-    $(this).attr('category-name', $(this).attr('category-name').replaceAll(' ', '').replaceAll('+', ' '))
-  })
-  $('.filter-element[filter-type="co"]').click(function(){
-    $('.filter-element[filter-type="co"]').removeClass('filter-element-selected');
-    $(this).toggleClass('filter-element-selected');
-    if($(this).attr('category-name')=='none') {
-      $('.np-card[filter-type="co"]').show()
-    }
-    else {
-      $('.np-card[filter-type="co"]').hide();
-      $('.np-card[category-name~='+$(this).attr('category-name')+'][filter-type="co"]').show()
-    }
-  })
-  $('.filter-element[filter-type="lp"]').click(function(){
-    $('.filter-element[filter-type="lp"]').removeClass('filter-element-selected');
-    $(this).toggleClass('filter-element-selected');
-    if($(this).attr('category-name')=='none') {
-      $('.np-card[filter-type="lp"]').show()
-    }
-    else {
-      $('.np-card[filter-type="lp"]').hide();
-      $('.np-card[category-name~='+$(this).attr('category-name')+'][filter-type="lp"]').show()
-    }
-  })
-</script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/homepage.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/homepage.html.liquid
deleted file mode 100644
index 9e22bed6..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/homepage.html.liquid
+++ /dev/null
@@ -1,3 +0,0 @@
-<script>
-  window.location.replace("/app/dashboard")
-</script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/learning_path.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/learning_path.html.liquid
deleted file mode 100644
index 7e12704c..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/learning_path.html.liquid
+++ /dev/null
@@ -1,50 +0,0 @@
-{% include "header_minimal" %}
-<main class="np-main np-max-width np-page-container">
-  <div class="np-hidden-mobile" id="learning-path-desktop">
-    {% include "learning_path_desktop_view" %}
-  </div>
-  <div class="np-hidden-desktop" id="learning-path-mobile">
-    {% include "learning_path_mobile_view" %}
-  </div>
-</main>
-
-<style>
-  body {
-    background-image: url(https://s3.amazonaws.com/static.northpass.com/SPS/sps-background.gif);
-  }
-  .np-card-padding-large {
-    background: rgba(255, 255, 255, 0.5);
-    box-shadow: none;
-  }
-  .np-card-container,
-  .np-card-container-training-session {
-    background: rgba(255, 255, 255, 0.5);
-    border-radius: 4px;
-    box-shadow: none;
-    position: relative;
-  }
-  .np-learning-path-outline-icon {
-    align-self: center;
-    font-size: 40px;
-    color: #9b4b87;
-  }
-  .np-box-header {
-    height: 80px;
-  }
-  .np-powered-by {
-    background: none;
-  }
-  @media screen and (max-width: 835px) {
-    .col-sm-6 {
-      max-width: 45%;
-    }
-    .np-card-padding, .np-card-padding-dynamic {
-      padding-left: 0;
-    }
-  }
-  @media screen and (max-width: 765px) {
-    .np-box-header {
-      height: 60px;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/learning_paths.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/learning_paths.html.liquid
deleted file mode 100644
index 58203d14..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/learning_paths.html.liquid
+++ /dev/null
@@ -1,23 +0,0 @@
-{% include "header" %}
-{% include "sub_navigation" %}
-<main class="np-main np-dashboard np-subpage-container np-max-width">
-  <div class="np-catalog-header-wrapper">
-    <div class="np-catalog-header">
-      <div class="np-resource-title">{% t shared.learning_paths %}</div>
-      <div class="np-resource-subtitle">{% t .subtitle %}</div>
-    </div>
-  </div>
-  {% include "learning_paths_index" %}
-</main>
-{% include "footer" %}
-
-<style>
-  .np-dashboard {
-    background: white;
-  }
-  @media screen and (min-width: 768px) {
-    .np-grid-spacing {
-    padding-left: 3%;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/styles.css.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/styles.css.liquid
deleted file mode 100644
index ffb95481..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/styles.css.liquid
+++ /dev/null
@@ -1,21 +0,0 @@
- /*
- Put your custom overlay styles in here
- You can use your northpass color palette in this file
-
-{{ color_palette.button_font_color }}
-{{ color_palette.button_color }}
-{{ color_palette.button_hover_color }}
-{{ color_palette.header_font_color }}
-{{ color_palette.header_font_hover_color }}
-{{ color_palette.header_color }}
-*/
-
-.np-subpage-container {
-    padding:80px 4% 184px;
-   }
-   .np-max-width {
-    justify-content:space-between;
-    margin:auto;
-    max-width: none;
-   }
-      
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/training_events.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/training_events.html.liquid
deleted file mode 100644
index b9ddb896..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/training_events.html.liquid
+++ /dev/null
@@ -1,130 +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" style='font-size: 2rem;'>
-        {% 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" %}
-
-  <div class="row">
-    <div class="col-xs-12 col-sm-12">
-      <div class="np-resource-title" style='font-size: 2rem;'>
-	Fulfillment Webinars
-      </div>
-    </div>
-  </div>
-  {% include "fullfilment_events_index" %}
- <div class="row">
-    <div class="col-xs-12 col-sm-12">
-      <div class="np-resource-title" style='font-size: 2rem;'>
-        Other Training Events
-      </div>
-    </div>
-  </div>
-  {% include "other_events_index" %}
-</main>
-{% include "footer" %}
-
-<style>
-.other-event-sessions {
-  height: 65px;
-  margin-bottom: 0;
-}
-
-.np-training-events {
-  background: white;
-}
-
-.row .np-card {
-  border: 1px solid #ccc;
-  padding: 35px;
-}
-.event-header {
-  display: flex;
-  padding-bottom: 25px;
-  height: 115px;
-}
-.event-header-left {
-  margin-right: 20px;
-}
-.fa-users {
-  font-size: 44px;
-  font-weight: 300;
-}
-.event-header-right-type {
-  color: #3b3f3d;
-  font-size: 18px;
-}
-.event-header-right-title {
-  color: #3b3f3d;
-  font-size: 26px;
-  font-weight: 600;
-  word-wrap: break-word;
-}
-.event-sessions {
-  height: 160px;
-  margin-bottom: 30px;
-}
-.event-session {
-  margin-bottom: 15px;
-}
-.event-session-number {
-  color: #606060;
-  font-weight: bold;
-  font-size: 18px;
-}
-.event-session-date {
-  color: #9b4b87;
-  text-decoration: none;
-  cursor: pointer;
-  font-size: 18px;
-}
-.event-session-date:hover {
-  color: #4b2346;
-}
-.event-additional-sessions {
-  color: #9b4b87;
-  text-decoration: none;
-  cursor: pointer;
-}
-.event-additional-sessions:hover {
-  color: #4b2346;
-}
-.event-button {
-  background: #9b4b87;
-  color: white;
-  border-radius: 4px;
-  border: none;
-  cursor: pointer;
-  padding: 10px 20px;
-  line-height: 39px;
-  min-height: 30px;
-  text-align: center;
-  margin-bottom: -10px;
-  text-decoration: none;
-}
-.event-button:hover {
-  background: #4b2346
-}
-@media screen and (max-width: 768px) {
-  .row .np-card {
-    width: 80%;
-  }
-}
-@media screen and (max-width: 450px) {
-  .row .np-card {
-    width: 90%;
-    padding: 25px;
-  }
-}
-</style>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_account_avatar.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_account_avatar.html.liquid
new file mode 100644
index 00000000..d952af93
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_account_avatar.html.liquid
@@ -0,0 +1,66 @@
+<div class="np-hidden-mobile">
+  <p>{% t .description %}</p>
+  <p>{% t .requirements %}</p>
+</div>
+
+<img
+  alt=""
+  class="np-account-avatar-image"
+  src="{{ form.gravatar_url }}?s=200"
+  id="{{version}}_gravatar_img"
+  {% unless form.use_gravatar? %}style="display: none"{% endunless %}
+/>
+<img
+  alt=""
+  class="np-account-avatar-image"
+  src="{{ form.secure_custom_avatar_url }}"
+  id="{{version}}_custom_avatar_img"
+  {% if form.use_gravatar? %}style="display: none"{% endif %}
+/>
+
+<div class="np-account-avatar-choice">
+  <div class="np-form-field">
+    <label class="radio radio-before np-input-label" for="{{version}}_learner_use_gravatar_true">
+      <span class="radio__input">
+        <input
+          id="{{version}}_learner_use_gravatar_true"
+          name="learner[use_gravatar]"
+          type="radio"
+          value="true"
+          {% if form.use_gravatar? %}checked{% endif %}
+        />
+        <span class="np-button-color radio__control"></span>
+      </span>
+      <span class="radio__label">
+        {% t .use_gravatar %}
+      </span>
+    </label>
+  </div>
+
+  <div class="np-form-field">
+    <label class="radio radio-before np-input-label" for="{{version}}_learner_use_gravatar_false">
+      <span class="radio__input">
+        <input
+          id="{{version}}_learner_use_gravatar_false"
+          name="learner[use_gravatar]"
+          type="radio"
+          value="false"
+          {% unless form.use_gravatar? %}checked{% endunless %}
+        />
+        <span class="np-button-color radio__control"></span>
+      </span>
+      <span class="radio__label">
+        {% t .upload_custom_photo %}
+      </span>
+    </label>
+  </div>
+  <div>
+    <button
+      id="{{version}}_upload_avatar"
+      type="button"
+      class="np-button np-button-secondary" {% if form.use_gravatar? %}style="visibility: hidden"{% endif %}
+    >
+      {% t .upload %}
+    </button>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_account_desktop_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_account_desktop_view.html.liquid
new file mode 100644
index 00000000..8ae8599d
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_account_desktop_view.html.liquid
@@ -0,0 +1,19 @@
+<form class="np-form" action="{{ form.options.action }}" method="post" id="desktop_edit_learner" novalidate>
+  <input type="hidden" name="_method" value="{{ form.options.http_method }}">
+  {% form_authenticity_token %}
+  <div class="np-card">
+    <div class="np-card-container np-card-padding">
+      <div class="row">
+        <div class="col-sm-7 np-account-form">
+          {% render "account_form", form: form, version: "desktop" %}
+          <button type="submit" class="np-button np-button-big np-button-large-font np-form-action">
+            {% t shared.account.save %}
+          </button>
+        </div>
+        <div class="col-sm-5 np-account-avatar">
+          {% include "account_avatar", version: "desktop" %}
+        </div>
+      </div>
+    </div>
+  </div>
+</form>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_account_form.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_account_form.html.liquid
new file mode 100644
index 00000000..ddd264c2
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_account_form.html.liquid
@@ -0,0 +1,139 @@
+<div class="np-resource-title">
+  {% t .header %}
+</div>
+<div class="np-form-field {% if form.errors contains 'email' %}np-account-form-field-error{% endif %}">
+  <label class="np-input-label" for="{{version}}_learner_email">{% t shared.email %} *</label>
+  <input
+    {% if form.options.invite? %} disabled {% endif %}
+    autofocus="autofocus"
+    class="np-input"
+    id="{{version}}_learner_email"
+    name="learner[email]"
+    type="email"
+    value="{{ form.email }}"
+  />
+</div>
+<div class="np-form-field {% if form.errors contains 'first_name' %}np-account-form-field-error{% endif %}">
+  <label class="np-input-label" for="{{version}}_learner_first_name">
+    {% t shared.first_name %} *
+  </label>
+  <input
+    class="np-input"
+    id="{{version}}_learner_first_name"
+    name="learner[first_name]"
+    value="{{ form.first_name }}"
+  />
+</div>
+<div class="np-form-field {% if form.errors contains 'last_name' %}np-account-form-field-error{% endif %}">
+  <label class="np-input-label" for="{{version}}_learner_last_name">
+    {% t shared.last_name %} *
+  </label>
+  <input
+    class="np-input"
+    id="{{version}}_learner_last_name"
+    name="learner[last_name]"
+    value="{{ form.last_name }}"
+  />
+</div>
+<div class="np-form-field {% if form.errors contains 'display_name' %}np-account-form-field-error{% endif %}">
+  <label class="np-input-label" for="{{version}}_learner_display_name">
+    {% t .display_name %}
+  </label>
+  <input
+    class="np-input"
+    id="{{version}}_learner_display_name"
+    name="learner[display_name]"
+    value="{{ form.display_name }}"
+  />
+</div>
+
+{% unless form.options.invite?  %}
+  <div class="np-form-field {% if form.errors contains 'current_password' %}np-account-form-field-error{% endif %}">
+    <label class="np-input-label" for="{{version}}_learner_current_password">
+      {% t .current_password %} *
+    </label>
+    <input
+      class="np-input"
+      id="{{version}}_learner_current_password"
+      name="learner[current_password]"
+      type="password"
+    />
+  </div>
+
+  <div class="np-form-field {% if form.errors contains 'password' %}np-account-form-field-error{% endif %}">
+    <label class="np-input-label" for="{{version}}_learner_password">
+      {% t .new_password %} *
+    </label>
+    <input
+      class="np-input"
+      id="{{version}}_learner_password"
+      name="learner[password]"
+      type="password"
+    />
+  </div>
+
+  <div class="np-form-field {% if form.errors contains 'password_confirmation' %}np-account-form-field-error{% endif %}">
+    <label class="np-input-label" for="{{version}}_learner_password_confirmation">
+      {% t .confirm_new_password %} *
+    </label>
+    <input
+      class="np-input"
+      id="{{version}}_learner_password_confirmation"
+      name="learner[password_confirmation]"
+      type="password"
+    />
+  </div>
+{% endunless %}
+
+{% if form.options.invite?  %}
+  <div class="np-form-field {% if form.errors contains 'password' %}np-account-form-field-error{% endif %}">
+    <label class="np-input-label" for="{{version}}_learner_password">
+      {% t shared.password %} *
+    </label>
+    <input
+      class="np-input"
+      id="{{version}}_learner_password"
+      name="learner[password]"
+      type="password"
+    />
+  </div>
+
+  {% if form.terms_of_service_required? %}
+    <div class="np-form-field terms-of-service {% if form.errors contains 'terms_of_service_accepted' %}np-account-form-field-error{% endif %}">
+      <input
+        id="{{version}}_learner_terms_of_service"
+        name="learner[terms_of_service_accepted]"
+        type="checkbox"
+      />
+      <div class="label">
+        {% t .terms_of_service %}
+        <a
+          target="_blank"
+          href={{ form.terms_of_service_url }}
+        >
+          {% t .terms_link %}
+        </a>
+      </div>
+    </div>
+  {% else %}
+    <div class="np-margin-top">
+      <span class="np-form-terms ">
+        {% t .terms %}
+        <a
+          class="np-form-link np-button-color"
+          target="_blank"
+          href={{ form.terms_of_service_url }}
+        >
+          {% t .terms_link %}
+        </a>
+      </span>
+    </div>
+  {% endif %}
+
+  <input
+    id="{{version}}_invite_token"
+    name="learner[token]"
+    value="{{ form.invite_token }}"
+    type="hidden"
+  />
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_account_mobile_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_account_mobile_view.html.liquid
new file mode 100644
index 00000000..6ac8c007
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_account_mobile_view.html.liquid
@@ -0,0 +1,17 @@
+<form class="np-form" action="{{ form.options.action }}" method="post" id="mobile_edit_learner" novalidate>
+  <input type="hidden" name="_method" value="{{ form.options.http_method }}">
+  {% form_authenticity_token %}
+  <div class="np-card np-account-form">
+    <div class="np-card-container np-card-padding">
+      {% render "account_form", form: form, version: "mobile" %}
+    </div>
+  </div>
+  <div class="np-card np-account-avatar">
+    <div class="np-card-container np-card-padding">
+      {% include "account_avatar", version: "mobile" %}
+    </div>
+  </div>
+  <button type="submit" class="np-button np-button-big np-button-large-font np-form-action">
+    {% t shared.account.save %}
+  </button>
+</form>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_account_tabs.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_account_tabs.html.liquid
new file mode 100644
index 00000000..ec4109c1
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_account_tabs.html.liquid
@@ -0,0 +1,32 @@
+{% capture settings_path %}{% route account %}{% endcapture %}
+{% capture transcript_path %}{% route transcript %}{% endcapture %}
+{% capture order_history_path %}{% route order_history %}{% endcapture %}
+
+{% if current_person.signed_in? %}
+{% unless current_school.sso_active? %}
+  <nav class="np-tabs np-account-tabs">
+    <div class="np-tabs-content">
+      <div class="np-tab{% if page.path == settings_path %} np-tab-active{% endif %}">
+        <a class="np-tab-link" href="{{ settings_path}}">
+          {% t .profile_settings %}
+        </a>
+        <div class="np-tab-indicator np-button-background-color"></div>
+      </div>
+      <div class="np-tab{% if page.path == transcript_path %} np-tab-active{% endif %}">
+        <a class="np-tab-link" href="{{ transcript_path }}">
+          {% t .transcript %}
+        </a>
+        <div class="np-tab-indicator np-button-background-color"></div>
+      </div>
+      {% if features.commerce? %}
+        <div class="np-tab{% if page.path == order_history_path %} np-tab-active{% endif %}">
+          <a class="np-tab-link" href="{{ order_history_path }}">
+            {% t .order_history %}
+          </a>
+          <div class="np-tab-indicator np-button-background-color"></div>
+        </div>
+      {% endif %}
+    </div>
+  </nav>
+{% endunless %}
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_bundle_description.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_bundle_description.html.liquid
new file mode 100644
index 00000000..e7e891ca
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_bundle_description.html.liquid
@@ -0,0 +1,6 @@
+<h3 class="np-card-heading">
+  {% t .about %}
+</h3>
+<div class="np-card-text">
+  {{ product.description }}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_bundle_desktop_header.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_bundle_desktop_header.html.liquid
new file mode 100644
index 00000000..6fb22dec
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_bundle_desktop_header.html.liquid
@@ -0,0 +1,12 @@
+<div class="np-resource-header np-resource-header-card np-card-padding-large">
+  <div class="np-top-vocabulary np-text-title">
+    {% t shared.product_types.bundle %}
+    <i class="far fa-layer-group np-button-color np-learning-path-icon"></i>
+  </div>
+  <div class="np-top-title">
+    <a href="{% route catalog %}" class="np-back-button" aria-label="{% t shared.go_back %}">
+      <i class="far fa-arrow-left np-icon-back"></i>
+    </a>
+    {{ product.name }}
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_bundle_product_desktop_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_bundle_product_desktop_view.html.liquid
new file mode 100644
index 00000000..66f57bdc
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_bundle_product_desktop_view.html.liquid
@@ -0,0 +1,21 @@
+{% include "bundle_desktop_header" %}
+<div class="row">
+  <div class="col-xs-12 col-sm-6">
+    <div class="np-card-container">
+      <img
+        src="{{ product.image_url }}"
+        class="np-top-image"
+        alt="{{ product.name }}"
+      />
+      <div class="np-card-padding-dynamic">
+        {% include "bundle_description"  %}
+      </div>
+    </div>
+  </div>
+  <div class="col-xs-12 col-sm-6 np-grid-spacing">
+    <div class="np-top-cta np-card-container np-card-padding np-product-cta">
+      {% include "product_price_and_cta"%}
+    </div>
+    {% include "bundle_product_outline" %}
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_bundle_product_mobile_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_bundle_product_mobile_view.html.liquid
new file mode 100644
index 00000000..89272b6d
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_bundle_product_mobile_view.html.liquid
@@ -0,0 +1,27 @@
+<div class="np-card-container np-card-padding-large">
+  <div class="np-top-vocabulary np-text-title np-text-muted">
+    {% t shared.product_types.bundle %}
+  </div>
+  <div class="np-top-title">
+    <a href="{% route catalog %}" class="np-back-button" aria-label="{% t shared.go_back %}">
+      <i class="far fa-arrow-left np-hidden-mobile np-icon-back"></i>
+    </a>
+    {{ product.name }}
+  </div>
+  <img
+    src="{{ product.image_url }}"
+    class="np-top-image"
+    alt="{{ product.name }}"
+  />
+  <div class="np-top-cta">
+    {% include "product_price_and_cta" %}
+  </div>
+</div>
+
+<div class="np-card-container np-card-padding np-card-spacing">
+  {% include "bundle_description" %}
+</div>
+
+<div class="np-card-spacing">
+  {% include "bundle_product_outline" %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_bundle_product_outline.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_bundle_product_outline.html.liquid
new file mode 100644
index 00000000..9fc22512
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_bundle_product_outline.html.liquid
@@ -0,0 +1,12 @@
+<div class="np-learning-path-outline">
+  <h3 class="np-product-outline-title">{% t shared.bundle.title %}</h3>
+  {% for item in product.bundle_items %}
+    {% if item.course? %}
+      {% include "product_outline_course", id: forloop.index %}
+    {% elsif item.training_event? %}
+      {% include "product_outline_event", id: forloop.index %}
+    {% elsif item.learning_path? %}
+      {% include "product_outline_lp", id: forloop.index %}
+    {% endif %}
+  {% endfor %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_cards_catalog_item.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_cards_catalog_item.html.liquid
new file mode 100644
index 00000000..a096f57c
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_cards_catalog_item.html.liquid
@@ -0,0 +1,38 @@
+<div class="np-card">
+  <div class="np-card-container">
+    <img
+      class="np-card-image"
+      alt="{{ item.name }}"
+      src="{{ item.image_url }}"
+    >
+    <div class="np-card-content np-card-content-vertical np-card-padding">
+      <h3 class="np-catalog-card-title">
+        {{ item.name }}
+      </h3>
+      <div class="np-product-badge np-product-badge-catalog">
+        <i class="far {{ item.icon }} np-product-badge-icon np-product-badge-catalog-icon"></i>
+        <h3 class="np-product-badge-name np-product-badge-catalog-name">{{ item.formatted_type }}</h3>
+      </div>
+      <div class="np-card-content-footer np-catalog-card-footer">
+        {% if item.free_course? %}
+          <div class="np-card-content-progress np-learning-progress-text-color">
+            {% t shared.progress, count: item.progress %}
+          </div>
+          {% if item.has_to_restart? %}
+            {% include "course_version_outdated_popup", path: item.path %}
+          {% endif %}
+          <a class="np-button np-button-wide" href="{{ item.path }}">
+            {% t shared.view %}
+          </a>
+        {% else %}
+          <span class="np-catalog-card-price">
+            {{ item.formatted_price}}
+          </span>
+          <a class="np-button np-button-wide" href="{{ item.path }}">
+            {% t shared.learn_more %}
+          </a>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_cards_course.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_cards_course.html.liquid
new file mode 100644
index 00000000..727b06a1
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_cards_course.html.liquid
@@ -0,0 +1,34 @@
+<div class="np-card">
+  <div class="np-card-container">
+    {% if course.ribbon %}
+      <div class="np-card-ribbon">
+        {{ course.ribbon }}
+      </div>
+    {% endif %}
+    <img
+      class="np-card-image"
+      alt="{{ course.name }}"
+      src="{{ course.image_url }}"
+    >
+    <div class="np-card-content np-card-content-vertical np-card-padding">
+      <h2 class="np-card-content-title">
+        {{ course.name }}
+      </h2>
+      <div class="np-card-content-subtitle">
+        {{ course.instructor_names }}
+      </div>
+      <div class="np-card-content-footer">
+        <div class="np-card-content-progress np-learning-progress-text-color">
+          {% t shared.progress, count: course.progress %}
+        </div>
+        {% capture course_path %}{% route course, id: course.id %}{% endcapture %}
+        {% if course.has_to_restart? %}
+          {% include "course_version_outdated_popup", path: course_path %}
+        {% endif %}
+        <a class="np-button np-button-wide" href="{{ course_path }}">
+          {% t shared.view %}
+        </a>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_cards_course_new.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_cards_course_new.html.liquid
deleted file mode 100644
index cd5b721e..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/_cards_course_new.html.liquid
+++ /dev/null
@@ -1,57 +0,0 @@
-{% assign categories = '' | split: '' %}
-{% for cat in course.categories %}
-  {% assign cat_name = cat.name | split: '!@#$%^&*()' %}
-  {% assign categories = categories | concat: cat_name %}
-{% endfor %}
-{% assign compressed_image_url = course.image_url | replace: "resize=width:820,height:500", "resize=width:500,height:305" %}
-<div class="np-card np-grid-spacing col-xs-12 col-sm-6 col-md-4" filter-type='co' category-name='{{categories | join: '+'}}'>
-  <div class="np-card-container">
-    {% if course.ribbon %}
-      <div class="np-card-ribbon">
-        {{ course.ribbon }}
-      </div>
-    {% endif %}
-    <img
-      class="np-card-image"
-      alt="{{ course.name }}"
-      src="{{ compressed_image_url }}"
-    >
-    <div class="np-card-content np-card-content-vertical np-card-padding">
-      <p class='categories'>
-        {% for category in course.categories %}
-          {{category.name}}   
-        {% endfor %}
-      </p>
-      <h3 class="np-card-content-title">
-        {{ course.name }}
-      </h3>
-      <div class="np-card-content-footer">
-        <div class="np-card-content-progress np-button-color">
-          {% t shared.progress, count: course.progress %}
-        </div>
-        {% capture course_path %}{% route course, id: course.id %}{% endcapture %}
-        {% if course.has_to_restart? %}
-          {% include "course_version_outdated_popup", path: course_path %}
-        {% endif %}
-        <a class="np-button np-button-wide" href="{{ course_path }}">
-          {% t shared.view %}
-        </a>
-      </div>
-    </div>
-  </div>
-</div>
-
-<style>
-  .categories {
-    margin: 0;
-  }
-  .np-card {
-    min-height: 0;
-    min-width: 0;
-  }
-  @media screen and (min-width: 768px) {
-    .np-grid-spacing {
-    padding-left: 3%;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_cards_learning_path.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_cards_learning_path.html.liquid
index b9b9733c..fde3d1a6 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/_cards_learning_path.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_cards_learning_path.html.liquid
@@ -1,23 +1,71 @@
-<div class="np-card">
+<div class="np-card np-no-horizontal-padding lp-card" categories="{% for category in learning_path.categories %}{{category.name}},{% endfor %}">
   <div class="np-card-container">
-    <img
-      class="np-card-image"
-      alt="{{ learning_path.name }}"
-      src="{{ learning_path.image_url }}"
-    >
-    <div class="np-card-content np-card-content-vertical np-card-padding">
-      <h3 class="np-card-content-title">
-        {{ learning_path.name }}
-      </h3>
-      <div class="np-card-content-footer">
-        <div class="np-card-content-progress np-button-color">
-          {% t shared.progress, count: learning_path.progress %}
+    <div class="np-learning-path">
+      <div class="lp-card-image-wrapper">
+        <img
+          alt="{{ learning_path.name }}"
+          class="np-card-image np-learning-path-image"
+          src="{{ learning_path.image_url }}"
+        />
+      </div>
+      <div class="np-card-text-wrapper">
+        <div class="np-hidden-desktop np-card-header">
+          <i class="np-card-header-icon far fa-road"></i>
+          <div class="np-card-header-type">{% t shared.learning_path.title %}</div>
+          <div class="np-hidden-desktop  np-card-header-items-count">
+            {{ learning_path.items.count }} {% t .items %}
+          </div>
+        </div>
+        <div class="np-hidden-mobile np-card-header">
+          <div class="np-card-header-type">{% t shared.learning_path.title %}</div>
+          <i class="np-card-header-icon far fa-road"></i>
+        </div>
+
+        <div class="np-card-content np-card-padding np-card-content-vertical">
+          <h2 class="np-card-content-title">
+            {{ learning_path.name }}
+          </h2>
+
+          <div class="np-card-content-subtitle">
+            {{ learning_path.instructor_names }}
+          </div>
+
+          <div class="np-hidden-mobile np-card-content-description">
+            {{ learning_path.description }}
+          </div>
+
+          <div class="np-hidden-mobile np-card-content-progress np-learning-progress-text-color">
+            {% t shared.progress, count: learning_path.progress %}
+          </div>
+
+          <div class="np-hidden-mobile np-card-progress-bar-container">
+            <div
+              style="width: {{ learning_path.progress }}%"
+              class="np-card-progress-bar np-learning-progress-bar-color">
+            </div>
+          </div>
+
+          <div class="np-card-content-footer">
+            <div class="np-hidden-desktop np-card-content-progress
+            np-button-color">
+              {% t shared.progress, count: learning_path.progress %}
+            </div>
+            <a class="np-button" href="{% route learning_path, id: learning_path.id %}">
+              {% t shared.view %}
+            </a>
+            <span class="np-hidden-mobile np-learning-path-items">
+              <i class="np-button-color np-learning-path-items-icon far fa-graduation-cap"></i>
+              <span class="np-learning-path-items-count">
+                {{ learning_path.items.count }} {% t .items %}
+              </span>
+            </span>
+          </div>
         </div>
-        {% capture learning_path_path %}{% route learning_path, id: learning_path.id %}{% endcapture %}
-        <a class="np-button np-button-wide" href="{{ learning_path_path }}">
-          {% t shared.view %}
-        </a>
       </div>
     </div>
   </div>
+  <div class="np-card-stack">
+    <div class="np-card-stack-level-1"></div>
+    <div class="np-card-stack-level-2"></div>
+  </div>
 </div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_cards_learning_path_new.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_cards_learning_path_new.html.liquid
deleted file mode 100644
index 7b18e5ab..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/_cards_learning_path_new.html.liquid
+++ /dev/null
@@ -1,44 +0,0 @@
-{% assign categories = '' | split: '' %}
-{% for cat in learning_path.categories %}
-  {% assign cat_name = cat.name | split: '!@#$%^&*()' %}
-  {% assign categories = categories | concat: cat_name %}
-{% endfor %}
-{% assign compressed_image_url = learning_path.image_url | replace: "resize=width:820,height:500", "resize=width:500,height:305" %}
-<div class="np-card np-grid-spacing col-xs-12 col-sm-6 col-md-4" filter-type='lp' category-name='{{categories | join: '+'}}'>
-  <div class="np-card-container">
-    <img
-      class="np-card-image"
-      alt="{{ learning_path.name }}"
-      src="{{ compressed_image_url }}"
-    >
-    <div class="np-card-content np-card-content-vertical np-card-padding">
-      <p class='categories'>
-        {% for category in learning_path.categories %}
-          {{category.name}}   
-        {% endfor %}
-      </p>
-      <h3 class="np-card-content-title">
-        {{ learning_path.name }}
-      </h3>
-      <div class="np-card-content-footer">
-        <div class="np-card-content-progress np-button-color">
-          {% t shared.progress, count: learning_path.progress %}
-        </div>
-        {% capture learning_path_path %}{% route learning_path, id: learning_path.id %}{% endcapture %}
-        <a class="np-button np-button-wide" href="{{ learning_path_path }}">
-          {% t shared.view %}
-        </a>
-      </div>
-    </div>
-  </div>
-</div>
-
-<style>
-  .categories {
-    margin: 0;
-  }
-  .np-card {
-    min-height: 0;
-    min-width: 0;
-  }
-</style>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_cards_other_event.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_cards_other_event.html.liquid
deleted file mode 100644
index f52ff10f..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/_cards_other_event.html.liquid
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class='np-card'>
-  <div class='event-header'>
-    <div class='event-header-left'>
-      <i class="far fa-thin fa-users"></i>
-    </div>
-    <div class='event-header-right'>
-      <div class='event-header-right-type'>
-        Other Event
-      </div>
-      <div class='event-header-right-title'>
-        {{ title }}
-      </div>
-    </div>
-  </div>
-  <div class='other-event-sessions'>
-    <div class='event-session'>
-      <div class='event-session-number' style="padding-bottom: 25px">
-        Click here for more information:
-      </div>
-      <a class='event-button' href="{{ link }}">Click here</a>
-    </div>
-  </div>
-</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_cards_training_event.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_cards_training_event.html.liquid
index 0a381aa3..be152ff7 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/_cards_training_event.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_cards_training_event.html.liquid
@@ -1,36 +1,53 @@
-<div class='np-card'>
-  <div class='event-header'>
-    <div class='event-header-left'>
-      <i class="far fa-thin fa-users"></i>
-    </div>
-    <div class='event-header-right'>
-      <div class='event-header-right-type'>
-        ZoomWebinar
-      </div>
-      <div class='event-header-right-title'>
+<div class="np-card np-card-training-event">
+  <div class="np-card-container">
+    <div class="np-card-content-training-event">
+      <h2 class="np-card-content-title">
         {{ training_event.title }}
+      </h2>
+      <div class="np-card-content-subtitle">
+        <i class="far {{ training_event.event_type_icon }} np-training-session-icon"></i>
+        {% t shared.event_types, key: training_event.event_type %}
+        <span class="np-card-training-sessions-separator">•</span>
+        <i class="np-card-training-sessions-icon far fa-calendar-star"></i>
+        <span class="np-card-training-sessions-label">
+          {% t .sessions, count: training_event.sessions.size %}
+        </span>
+      </div>
+      <div class="np-card-training-session">
+        <span class="np-card-content-label">
+          {% t .next_session %} -
+          <span class="{{ training_event.sessions.first.status.type}}">
+            {{ training_event.sessions.first.status.label}}
+          </span>
+        </span>
+        <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-label">
+            <div class="np-card-training-session-date-day">
+              {{ training_event.sessions.first.day }}
+            </div>
+            <div>
+              <div class="np-card-training-session-date-month">
+                {{ training_event.sessions.first.month }}
+              </div>
+              <div class="np-card-training-session-date-year">
+                {{ training_event.sessions.first.year }}
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
-  </div>
-  <div class='event-sessions'>
-    {% assign session_number = 0%}
-    {% for session in training_event.sessions limit: 2 %}
-      {% assign session_number = session_number | plus: 1 %}
-      <div class='event-session'>
-        <div class='event-session-number'>
-          Session {{session_number}}
-        </div>
-        <a class='event-session-date' href="{% route training_session, id: session.id %}">
-          {{ session.month }} {{ session.day }} at {{ session.starts }} {{ session.time_zone }}
+    <div class="np-card-content np-card-content-vertical np-card-content-training-event">
+      <div class="np-card-training-sessions">
+
+        <a
+          class="np-button np-button-wide"
+          href="{% route training_session, id: training_event.sessions.first.id %}"
+        >
+          {% t shared.view %}
         </a>
       </div>
-    {% endfor %}
-    {% if training_event.sessions.size > 2 %}
-      {% assign third_session = training_event.sessions | slice: 2 | map: 'id' %}
-      <a class='event-additional-sessions' href="{% route training_session, id: third_session %}">
-        {{ training_event.sessions.size | minus: 2 }} additional sessions
-      </a>
-    {% endif %}
+    </div>
   </div>
-  <a class='event-button' href="{% route training_session, id: training_event.sessions.first.id %}">Select</a>
 </div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_certificates_info_column.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_certificates_info_column.html.liquid
new file mode 100644
index 00000000..61adfaba
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_certificates_info_column.html.liquid
@@ -0,0 +1,4 @@
+<div class="col-xs-12 col-md-4 spacing-clear">
+  {% include "certificates_verification" %}
+  {% include "certificates_metadata" %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_certificates_metadata.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_certificates_metadata.html.liquid
new file mode 100644
index 00000000..9f4a1dba
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_certificates_metadata.html.liquid
@@ -0,0 +1,59 @@
+<div class="np-card spacing-clear">
+  <div class="np-card-container padding-spacing-8">
+    <div class="row np-certificate-metadata-row">
+      <div class="col-xs-6 col-md-6">
+        <p class="np-certificate-metadata-title" >
+          {% t .learner %}
+        </p>
+      </div>
+      <div class="col-xs-6 col-md-6">
+        <p class="np-certificate-metadata-value">
+          {{certificate.learner_name}}
+        </p>
+      </div>
+    </div>
+    <div class="line"></div>
+
+    {% if certificate.issuer_name_enabled? %}
+      <div class="row  np-certificate-metadata-row">
+        <div class="col-xs-6 col-md-6">
+          <p class="np-certificate-metadata-title">
+            {% t .issued_by %}
+          </p>
+        </div>
+        <div class="col-xs-6 col-md-6">
+          <p class="np-certificate-metadata-value">
+            {{ certificate.issuer_name }}
+          </p>
+        </div>
+      </div>
+      <div class="line"></div>
+    {% endif %}
+
+    <div class="row np-certificate-metadata-row">
+      <div class="col-xs-6 col-md-6">
+        <p class="np-certificate-metadata-title" >
+          {% t .issued_on %}
+        </p>
+      </div>
+      <div class="col-xs-6 col-md-6">
+        <p class="np-certificate-metadata-value">
+          {{ certificate.issue_date }}
+        </p>
+      </div>
+    </div>
+    <div class="line"></div>
+    <div class="row np-certificate-metadata-row">
+      <div class="col-xs-6 col-md-6">
+        <p class="np-certificate-metadata-title" >
+          {% t .expires_on %}
+        </p>
+      </div>
+      <div class="col-xs-6 col-md-6">
+        <p class="np-certificate-metadata-value">
+          {{ certificate.expiration_date_translation }}
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_certificates_preview.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_certificates_preview.html.liquid
new file mode 100644
index 00000000..6357b621
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_certificates_preview.html.liquid
@@ -0,0 +1,35 @@
+<script type="text/javascript">
+  const resizeIframe = () => {
+    const combinedPadding = 16;
+    const previewIframe = document.getElementById("previewIframe");
+    const previewIFrameCard = document.getElementById("previewIFrameCard");
+    const templateInPreviewContainer = previewIframe.contentWindow.document.querySelector('.np-certificate-container');
+    const previewIframeContentHeight = templateInPreviewContainer.offsetHeight;
+    const previewIframeContentWidth = templateInPreviewContainer.offsetWidth;
+    const certificateRatio = previewIframeContentHeight / previewIframeContentWidth;
+
+    templateInPreviewContainer.style.margin = 0;
+    previewIFrameCard.style.height = `${previewIFrameCard.offsetWidth * certificateRatio}px`;
+
+    const scaledIframeWidth = previewIFrameCard.offsetWidth - combinedPadding;
+    const scaledIframeHeight = scaledIframeWidth * certificateRatio;
+    const scale = scaledIframeHeight / previewIframeContentHeight;
+
+    previewIframe.style.transform = `scale(${scale})`;
+  }
+
+  window.onresize = resizeIframe;
+</script>
+
+<div class="col-xs-12 col-md-8 np-certificate-iframe-container">
+  <div class="np-card spacing-clear">
+    <div id="previewIFrameCard" class="np-card-container np-certificate-card">
+      <iframe
+        id="previewIframe"
+        onload="resizeIframe()"
+        class="np-certificate-iframe-preview"
+        srcdoc="{{ certificate.certificate_template_html }}"
+      ></iframe>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_certificates_top_bar.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_certificates_top_bar.html.liquid
new file mode 100644
index 00000000..74a7ae41
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_certificates_top_bar.html.liquid
@@ -0,0 +1,44 @@
+<div class="top-bar np-certificate-top-bar-spacing">
+  <div class="top-bar__container uk-container uk-container-center uk-padding-horizontal np-max-width">
+    <div class="top-bar__col">
+      <h2 class="np-certificate-title" >
+        {{certificate.certificate_name}}
+      </h2>
+    </div>
+    <div class="button-container np-certificate-button-container">
+      {% if certificate.linkedin_sharing_enabled and current_person.signed_in? and certificate.learner_uuid == current_person.id %}
+        <a
+          class="np-button np-certificate-button np-certificate-button-secondary"
+          href="{{certificate.linkedin_share_url}}"
+          target="_blank"
+        >
+          <i class="fab fa-linkedin np-certificate-share-icon"></i>
+          {% t .share %}
+        </a>
+      {% endif %}
+      <button
+        id="print"
+        type="button"
+        class="np-button np-certificate-button np-certificate-button-secondary np-certificate-button-print"
+      >
+        {% t .print %}
+      </button>
+      {% if certificate.generating_pdf %}
+        <div class="np-button np-certificate-button np-certificate-button-primary np-certificate-spinner-container">
+          <i class="loader fad fa-spinner-third fa-spin np-certificate-spinner-icon np-button-font-color"></i>
+        </div>
+      {% else %}
+        <a
+        href="{{ certificate.download_url }}"
+        aria-label="{% t .download %}"
+        target="_blank"
+        rel="noopener noreferrer"
+        download
+        class="np-button np-certificate-button np-certificate-button-primary np-button-font-color"
+        >
+          {% t .download %}
+        </a>
+      {% endif %}
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_certificates_verification.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_certificates_verification.html.liquid
new file mode 100644
index 00000000..4fc19415
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_certificates_verification.html.liquid
@@ -0,0 +1,15 @@
+<div class="np-card spacing-clear np-certificate-verification-card">
+  <div class="np-card-container np-certificate-verification-container">
+    <div class="np-certificate-verification-icon-container np-certificate-verification-icon-container-{{certificate.verification_status}}">
+      <i class="far fa-{{certificate.verification_icon}} np-certificate-verification-icon"></i>
+    </div>
+    <div class="np-certificate-verification-info-container">
+      <h2 class="np-certificate-verification-info-status spacing-clear">
+       {{certificate.verification_title}}
+      </h2>
+      <p class="np-certificate-verification-info-description spacing-clear">
+        {{certificate.verification_description}}
+      </p>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_course_activity_locked.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_activity_locked.html.liquid
new file mode 100644
index 00000000..386393d5
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_activity_locked.html.liquid
@@ -0,0 +1,4 @@
+<i class="far fa-lock-alt np-course-outline-content-activity-icon-locked"></i>
+<span class="np-course-outline-content-activity-title">
+  {{ activity.title }}
+</span>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_course_activity_unlocked.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_activity_unlocked.html.liquid
new file mode 100644
index 00000000..30c03305
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_activity_unlocked.html.liquid
@@ -0,0 +1,15 @@
+{% if course.enrolled? %}
+  <a
+    href="{% route activity_viewer,
+      id: activity.id,
+      course_id: params.course_id,
+      learning_path_id: params.learning_path_id
+    %}" class="{{ class }}"
+  >
+    {{ activity.title }}
+  </a>
+{% else%}
+  <span class="{{ class }}">
+    {{ activity.title }}
+  </span>
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_course_categories.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_categories.html.liquid
new file mode 100644
index 00000000..64f40e73
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_categories.html.liquid
@@ -0,0 +1,10 @@
+<h2 class="np-card-heading">
+  {% t .header %}
+</h2>
+<div class="np-flex">
+  {% for category in course.categories %}
+    <div class="np-content-categories-content-item">
+      {{ category.name }}
+    </div>
+  {% endfor %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_course_description.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_description.html.liquid
new file mode 100644
index 00000000..b3c6b470
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_description.html.liquid
@@ -0,0 +1,6 @@
+<h2 class="np-card-heading">
+  {% t .header, key: current_school.course_vocabulary %}
+</h2>
+<div class="np-card-text">
+  {{ course.full_description }}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_course_desktop_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_desktop_view.html.liquid
index bedffc18..e16fee16 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/_course_desktop_view.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_desktop_view.html.liquid
@@ -2,6 +2,7 @@
   <div class="np-resource-header np-course-header np-card-padding-large">
     {% include "course_header" %}
   </div>
+  <div class="np-divider"></div>
   <div class="row np-course-content np-card-padding-dynamic">
     <div class="col-xs-12 col-sm-6">
       <img
@@ -10,14 +11,23 @@
         alt="{{ course.name }}"
       />
       {% include "course_description" %}
+
       {% if course.categories.any? %}
-        {% include "course_categories" %}
+        <div class="np-card-content-divider">
+          {% include "course_categories" %}
+        </div>
       {% endif %}
+
       {% if course.instructors.any? %}
-        {% include "course_instructors" %}
+        <div class="np-card-content-divider">
+          {% include "course_instructors" %}
+        </div>
       {% endif %}
+
       {% if course.events.any? %}
-        {% include "course_events" %}
+        <div class="np-card-content-divider">
+          {% include "course_events" %}
+        </div>
       {% endif %}
     </div>
     <div class="np-grid-spacing col-xs-12 col-sm-6">
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_course_header.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_header.html.liquid
new file mode 100644
index 00000000..84820ec4
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_header.html.liquid
@@ -0,0 +1,16 @@
+<div class="np-top-vocabulary np-text-title np-text-muted">
+  {{ current_school.course_vocabulary }}
+  <i class="far fa-graduation-cap np-button-color np-learning-path-icon np-hidden-mobile">
+  </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>
+  {{ course.name }}
+</div>
+<img
+  src="{{ course.image_url }}"
+  class="np-top-image np-hidden-desktop"
+  alt="{{ course.name }}"
+/>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_course_instructors.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_instructors.html.liquid
new file mode 100644
index 00000000..a8d82b21
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_instructors.html.liquid
@@ -0,0 +1,22 @@
+<h2 class="np-card-heading">
+  {% t .header %}
+</h2>
+<div class="np-flex">
+  {% for instructor in course.instructors %}
+    <div class="np-content-instructors-content-item">
+      <img
+        src="{{ instructor.avatar_url }}"
+        class="np-content-instructors-content-image"
+        alt="{{ instructor.name }}"
+      />
+      <div class="np-content-instructors-content-description">
+        <div class="np-content-instructors-content-name">
+          {{ instructor.name }}
+        </div>
+        <div class="np-content-instructors-content-info np-text-light">
+          {{ instructor.title }}
+        </div>
+      </div>
+    </div>
+  {% endfor %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_course_mobile_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_mobile_view.html.liquid
new file mode 100644
index 00000000..7f31ff35
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_mobile_view.html.liquid
@@ -0,0 +1,40 @@
+<div class="np-card-container np-card-padding-large">
+  {% include "course_header" %}
+  <div class="np-top-cta">
+    {% include "course_progress_and_cta" %}
+  </div>
+</div>
+
+{% if course.progress == 0 %}
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "course_description" %}
+  </div>
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "course_outline" %}
+  </div>
+{% else %}
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "course_outline" %}
+  </div>
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "course_description" %}
+  </div>
+{% endif %}
+
+{% if course.categories.any? %}
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "course_categories" %}
+  </div>
+{% endif %}
+
+{% if course.instructors.any? %}
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "course_instructors" %}
+  </div>
+{% endif %}
+
+{% if course.events.any? %}
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "course_events" %}
+  </div>
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_course_outline.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_outline.html.liquid
index ffead22e..72f97e79 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/_course_outline.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_outline.html.liquid
@@ -2,19 +2,14 @@
   <div class="np-text-title np-course-outline-title">
     {% t .header, key: current_school.course_vocabulary %}
   </div>
-  <div class='np-text-subtitle' style='padding-bottom: 15px;'>
-    (Click on section title to expand and view learning activities)
-  </div>
   <div class="np-course-outline-content">
     <ol class="np-course-outline-content-section">
       {% for section in course.sections %}
         <li class="np-course-outline-content-section-list">
           <div class="np-course-outline-content-section-name np-text-title-bold np-text-title-bold">
-            <i class="fa fa-caret-right section-arrow"></i>
-            <i class="fa fa-caret-down section-arrow np-hidden"></i>
             {{ section.name }}
           </div>
-          <ol class="np-course-outline-content-activity np-hidden">
+          <ol class="np-course-outline-content-activity">
             {% for activity in section.activities %}
 
               <li class="np-course-outline-content-activity-list">
@@ -43,27 +38,3 @@
     </ol>
   </div>
 </div>
-
-<style>
-  .np-course-outline-content-section-name {
-    cursor: pointer;
-    border: none;
-  }
-  .np-course-outline-content > *, .np-course-outline-content-activity-list > *, .np-course-outline-title {
-    color: #9b4b87;
-    text-decoration: none;
-    cursor: pointer;
-  }
-  .np-course-outline-content-activity-icon {
-    color: #d4d4d4;
-  }
-</style>
-
-<script>
-  window.onload = function() {
-    $('.np-course-outline-content-section-name').click(function() {
-      $(this).children('.section-arrow').toggleClass('np-hidden');
-      $(this).siblings('.np-course-outline-content-activity').toggleClass('np-hidden');
-    });
-  };
-</script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_course_desktop_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_product_desktop_view.html.liquid
similarity index 57%
rename from Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_course_desktop_view.html.liquid
rename to Custom_Templates/customer_templates/SPS_Commerce/_course_product_desktop_view.html.liquid
index bedffc18..ae8d50de 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/SPS-New/_course_desktop_view.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_product_desktop_view.html.liquid
@@ -2,6 +2,7 @@
   <div class="np-resource-header np-course-header np-card-padding-large">
     {% include "course_header" %}
   </div>
+  <div class="np-divider"></div>
   <div class="row np-course-content np-card-padding-dynamic">
     <div class="col-xs-12 col-sm-6">
       <img
@@ -10,21 +11,31 @@
         alt="{{ course.name }}"
       />
       {% include "course_description" %}
+
       {% if course.categories.any? %}
-        {% include "course_categories" %}
+        <div class="np-card-content-divider">
+          {% include "course_categories" %}
+        </div>
       {% endif %}
+
       {% if course.instructors.any? %}
-        {% include "course_instructors" %}
+        <div class="np-card-content-divider">
+          {% include "course_instructors" %}
+        </div>
       {% endif %}
+
       {% if course.events.any? %}
-        {% include "course_events" %}
+        <div class="np-card-content-divider">
+          {% include "course_events" %}
+        </div>
       {% endif %}
     </div>
+
     <div class="np-grid-spacing col-xs-12 col-sm-6">
-      <div class="np-top-cta">
-        {% include "course_progress_and_cta" %}
+      <div class="np-top-cta np-card-container np-card-padding np-product-cta">
+        {% include "product_price_and_cta" %}
       </div>
-      {% include "course_outline" %}
+      {% include "product_outline" %}
     </div>
   </div>
 </div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_course_product_mobile_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_product_mobile_view.html.liquid
new file mode 100644
index 00000000..880a0f24
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_product_mobile_view.html.liquid
@@ -0,0 +1,31 @@
+<div class="np-card-container np-card-padding-large">
+  {% include "course_header" %}
+  <div class="np-top-cta">
+    {% include "product_price_and_cta" %}
+  </div>
+</div>
+
+<div class="np-card-container np-card-padding np-card-spacing">
+  {% include "course_description" %}
+</div>
+<div class="np-card-container np-card-padding np-card-spacing">
+  {% include "product_outline" %}
+</div>
+
+{% if course.categories.any? %}
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "course_categories" %}
+  </div>
+{% endif %}
+
+{% if course.instructors.any? %}
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "course_instructors" %}
+  </div>
+{% endif %}
+
+{% if course.events.any? %}
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "course_events" %}
+  </div>
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_course_progress_and_cta.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_progress_and_cta.html.liquid
new file mode 100644
index 00000000..c3e46166
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_progress_and_cta.html.liquid
@@ -0,0 +1,48 @@
+<div class="np-top-cta-progress-content">
+  <div class="np-top-cta-progress-title np-text-title">
+    {% t .header %}
+  </div>
+  <div class="np-progress-bar-container">
+    <div
+      style="width: {{ course.progress }}%"
+      class="np-card-progress-bar np-learning-progress-bar-color">
+    </div>
+  </div>
+
+  <div class="np-top-cta-progress-text
+    {% if course.completed? %} np-color-success {% else %} np-learning-progress-text-color {% endif %}
+  ">
+    {% t shared.progress, count: course.progress %}
+  </div>
+  {% include "product_expiration_date", date: course.expiration_date %}
+</div>
+
+<div class="np-top-cta-container">
+  {% if course.learner_can_retake? %}
+    <form action="{% route course_retake, id: course.id %}" method="POST">
+      {% form_authenticity_token %}
+      <button type="submit" class="np-top-button np-button-font-color np-button np-button-big">
+        {% t .retake, key: current_school.course_vocabulary %}
+      </button>
+    </form>
+  {% else %}
+    <a
+      class="np-top-button np-button-font-color np-button np-button-big"
+    {% if course.enrolled? %}
+        href="{% route course_viewer, course_id: course.id, learning_path_id: params.learning_path_id %}"
+    {% else %}
+        href="{% route course_enrollment, code: course.enrollment_code %}"
+    {% endif %}
+    >
+      {% if course.enrolled? == false %}
+        {% t shared.enroll %}
+      {% elsif course.started? == false %}
+        {% t shared.course.start, key: current_school.course_vocabulary %}
+      {% elsif course.completed? %}
+        {% t shared.course.view, key: current_school.course_vocabulary %}
+      {% else %}
+        {% t shared.continue %}
+      {% endif %}
+    </a>
+  {% endif %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_course_version_outdated_alert.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_version_outdated_alert.html.liquid
new file mode 100644
index 00000000..03e245ab
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_version_outdated_alert.html.liquid
@@ -0,0 +1,7 @@
+{% if courses.include_courses_to_restart? %}
+  <div role="alert" class="np-alert np-alert-global np-alert-info">
+    <div class="np-alert-container uk-container uk-container-center">
+      {% t .content %}
+    </div>
+  </div>
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_course_version_outdated_popup.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_course_version_outdated_popup.html.liquid
new file mode 100644
index 00000000..d2e6fc52
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_course_version_outdated_popup.html.liquid
@@ -0,0 +1,33 @@
+<div class="np-course-version-outdated-popup np-popup">
+  <div class="np-popup-positioner">
+    <i
+      class="np-course-version-outdated-popup-trigger fas fa-exclamation-circle"
+      data-toggle-class-on-target="np-popup-tooltip--visible"
+      data-toggle-target-parent=".np-popup-tooltip"
+      data-toggle-outside
+    ></i>
+    <div
+      class="np-popup-tooltip"
+      role="tooltip"
+      aria-hidden="true"
+    >
+      <header class="np-popup-header">
+        <i class="np-popup-header-icon fas fa-exclamation-circle"></i>
+        <h2 class="np-popup-header-title">
+          {% t .title %}
+        </h2>
+      </header>
+      <div class="np-popup-body">
+        <h4>{% t .body.header %}</h4>
+        <p>{% t .body.content %}</p>
+        <a
+          class="np-popup-body-button"
+          href="{{ path }}"
+        >
+          {% t .body.button %}
+        </a>
+      </div>
+      <div class="np-popup-tail"></div>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_courses_catalog.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_courses_catalog.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_courses_catalog.html.liquid
rename to Custom_Templates/customer_templates/SPS_Commerce/_courses_catalog.html.liquid
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_courses_homepage.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_courses_homepage.html.liquid
new file mode 100644
index 00000000..91e119d8
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_courses_homepage.html.liquid
@@ -0,0 +1,38 @@
+<div class="section-text-container">
+    <div class="dashboard-resources-title">
+      My Courses
+    </div>
+    <div class="dashboard-resources-subtitle">
+      Courses in which you're currently enrolled
+    </div>
+  </div>
+  <div class="content-container">
+    <div class="filter-container">
+      <div class='filter-section course-filter'>
+        <div class='filter-title'>Filter by:</div>
+        {% assign course_categories = '' | split: '' %}
+        {% for course in courses.enrolled %}
+          {% for cat in course.categories %}
+            {% assign cat_name = cat.name | split: '!@#$%^&*()' %}
+            {% assign course_categories = course_categories | concat: cat_name %}
+          {% endfor %}
+        {% endfor %}
+        {% assign course_categories = course_categories | uniq %}
+        <div class="filter-options-wrapper">
+          <div class="filter-option-container">
+            <input type="checkbox" class="input-checkbox" name="all" />
+            <label class="input-label" >All</label>
+          </div>
+          {% for cat in course_categories %}
+            <div class="filter-option-container">
+              <input type="checkbox" class="input-checkbox" name="{{cat}}" />
+              <label class="input-label" >{{cat}}</label>
+            </div>
+          {% endfor %}
+        </div>
+      </div>
+    </div>
+    <div class="cards-wrapper">
+      {% include "courses_index", class: "col-xs-12 col-md-6 col-lg-4 np-stretch-content course-card" %}
+    </div>
+  </div>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_courses_index.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_courses_index.html.liquid
new file mode 100644
index 00000000..783b9702
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_courses_index.html.liquid
@@ -0,0 +1,16 @@
+{% if courses.enrolled.any? %}
+  <div class="row row-with-thumbnails">
+    {% for course in courses.enrolled %}
+      <div class="{{ class }}" categories="{% for category in course.categories %}{{category.name}},{% endfor %}">
+        {% include "cards_course" with course %}
+      </div>
+    {% endfor %}
+  </div>
+{% else %}
+  {% capture message %}
+    {% t shared.zero_state.courses.index,
+      key: current_school.course_vocabulary
+    %}
+  {% endcapture %}
+  {% include "courses_zero_state", message: message %}
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_courses_zero_state.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_courses_zero_state.html.liquid
new file mode 100644
index 00000000..26e371f7
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_courses_zero_state.html.liquid
@@ -0,0 +1,6 @@
+<div class="np-dashboard-resources-container">
+  <div class="np-zero-state-text">
+    {{ message }}
+  </div>
+  <img class="np-zero-state-courses" alt="{{ message }}" />
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_custom_events_card.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_custom_events_card.html.liquid
new file mode 100644
index 00000000..2eb7c504
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_custom_events_card.html.liquid
@@ -0,0 +1,25 @@
+<div class="col-xs-12 col-sm-6 col-lg-4 np-stretch-content">
+    <div class="np-card np-card-training-event">
+        <div class="np-card-container">
+            <div class="np-card-content-training-event">
+            <h2 class="np-card-content-title">
+                {{title}}
+            </h2>
+            <div class="np-card-content-subtitle">
+                <i class="far fa-video np-training-session-icon"></i>
+                Other Event
+            </div>
+            <div class="card-description">
+                Click here for more information:
+            </div>
+            </div>
+            <div class="np-card-content np-card-content-vertical np-card-content-training-event">
+            <div class="np-card-training-sessions">
+                <a class="np-button np-button-wide" href="{{link}}">
+                    Click Here
+                </a>
+            </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_filter_checkbox.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_filter_checkbox.html.liquid
new file mode 100644
index 00000000..5cbcbd07
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_filter_checkbox.html.liquid
@@ -0,0 +1,10 @@
+<input
+  id={{value}}
+  name={{ name }}
+  value={{ value }}
+  type="checkbox"
+  {% if selected %} checked="checked" {% endif %}
+/>
+<label for={{value}}>
+  {{label}}
+</label>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_filter_dropdown.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_filter_dropdown.html.liquid
new file mode 100644
index 00000000..e7a954bb
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_filter_dropdown.html.liquid
@@ -0,0 +1,33 @@
+<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/Custom_Templates/customer_templates/SPS_Commerce/_filter_select.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_filter_select.html.liquid
new file mode 100644
index 00000000..d006c0df
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_filter_select.html.liquid
@@ -0,0 +1,22 @@
+{% if params.q %}
+  <input type="hidden" name="q" value="{{ params.q }}">
+{% endif %}
+
+<label class="dropdown-label" for="filter[category_uuid][in][]">
+  {{ label }}
+</label>
+
+<select
+  class="np-filter-select"
+  multiple
+  name="filter[{{ key }}][in][]"
+>
+  {% for filter in filters %}
+    <option
+      value="{{ filter.value }}"
+      {% if filter.selected? %} selected="selected" {% endif %}
+    >
+      {{ filter.name }}
+    </option>
+  {% endfor %}
+</select>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_footer.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_footer.html.liquid
index 1cac0ad5..c1a5ab83 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/_footer.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_footer.html.liquid
@@ -33,38 +33,46 @@
       </div>
     {% endif %}
   </div>
+
+  <div class="np-footer-bottom">
+    <nav class="np-footer-social-links">
+      {% if website_footer.show_social_media_links? %}
+        <ul class="np-footer-social-links-list">
+          {% for social_media_link in website_footer.social_media_links %}
+            <li class="np-footer-social-links-item">
+              <a
+                class="np-footer-social-links-link np-button-color"
+                href="{{ social_media_link.link }}"
+                target="_blank" title="{{ social_media_link.name }}"
+              >
+                <i class="np-footer-social-links-icon
+                  np-button-color
+                  fab fa-{{ social_media_link.name }}"
+                ></i>
+              </a>
+            </li>
+          {% endfor %}
+        </ul>
+      {% endif %}
+    </nav>
+
+    {% if website_footer.show_customer_service_email? and
+      website_footer.school_customer_service_email
+    %}
+      <div class="np-footer-support">
+        <div class="np-footer-support-item np-footer-support-help">
+          {% t .need_help %}
+        </div>
+        <div class="np-footer-support-item np-footer-support-email">
+          {% t .email %}
+        </div>
+        <a
+          class="np-footer-support-item np-footer-support-link np-button-color"
+          href="mailto:{{ website_footer.school_customer_service_email }}"
+        >
+          {{ website_footer.school_customer_service_email }}
+        </a>
+      </div>
+    {% endif %}
+  </div>
 </footer>
-
-<style>
-  .np-footer-navigation-list {
-    flex-wrap: wrap;
-  }
-  .np-footer {
-    padding: 0.5rem 4% 0;
-    border-top: 1px solid #ededed !important;
-  }
-  .np-footer-navigation-link {
-    padding: 0 1.25rem 1.25rem;
-  }
-  .np-footer-navigation-link:hover {
-    color: #4b2346;
-  }
-  .np-powered-by {
-    padding-bottom: 0.75rem;
-    background: white;
-  }
-  @media screen and (min-width: 768px) {
-    .np-footer-navigation {
-      margin: 0 -1.25rem;
-    }
-    .np-footer-logo {
-      margin-right: 0;
-    }
-  }
-
-  @media screen and (max-width: 768px) {
-    .np-footer-navigation-link {
-      padding: 0 1.25rem;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_fulfillment_webinars.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_fulfillment_webinars.html.liquid
new file mode 100644
index 00000000..76baa47b
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_fulfillment_webinars.html.liquid
@@ -0,0 +1,7 @@
+
+<div class="np-dashboard-resources">
+    <div class="row row-with-thumbnails"> 
+            {% include 'custom_events_card' title: "Getting Started with Fulfillment" link: "https://trainingcenter.spscommerce.com/courses/ccc29da0-f636-4a96-bfca-52d37e1b1ec6/activities/b308e860-f2b5-418c-a29a-3a722af5b3bf" %}
+            {% include 'custom_events_card' title: "Fulfillment Product Training" link: "https://trainingcenter.spscommerce.com/courses/eff337de-64dd-4e1f-9abc-837520c12664/activities/d85c6894-9f20-41f4-94dd-ecbdebc336ac" %}
+    </div>
+</div>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_fullfilment_events_index.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_fullfilment_events_index.html.liquid
deleted file mode 100644
index dcd8e0cc..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/_fullfilment_events_index.html.liquid
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="np-dashboard-resources">
-  <div class="row row-with-thumbnails">
-    <div class="col-xs-12 col-sm-6 col-lg-4 event-card">
-      {% include "cards_other_event" title: "Getting Started with Fulfillment Webinars", link:
-      "https://www.spscommerce.com" %}
-    </div>
-  </div>
-</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_head.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_head.html.liquid
index e01042dd..beab5b4a 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/_head.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_head.html.liquid
@@ -1,8 +1,3 @@
 {% styles default %}
 {% styles colors %}
 {% styles custom %}
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
-<link rel="stylesheet" media="all" href="https://s3.amazonaws.com/spscops/trainingcenter/styles/site-styles.css">
-<link href='https://s3.amazonaws.com/spscops/trainingcenter/styles/SourceSansPro-font-styles.css' rel='stylesheet' type='text/css'>
-<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,200,900,600' rel='stylesheet' type='text/css'>
-<script src="https://kit.fontawesome.com/41a3aee3ad.js" crossorigin="anonymous"></script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_header.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_header.html.liquid
index 3cd12f6d..8df4143e 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/_header.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_header.html.liquid
@@ -1,67 +1,106 @@
-<header class="np-header np-header-color" style='height: 50px;'>
+<header class="np-header np-header-color">
   <div class="np-header-content">
-    <div class='header-desktop-left'>
-      {% if current_school.logo_url %}
-        <h1 class="np-header-logo">
-          <a href="{% route home %}">
-            <img src="https://schoolkeep-production.s3.amazonaws.com/wysiwyg/c4231bd9-2caa-4eca-bdaa-92cd69c0a35f/20180105100241_logo_1.png" alt="{{ current_school.name }}"  style='display: flex;' class='logo-image'>
-          </a>
-        </h1>
-      {% else %}
+    <div class="np-hidden-desktop np-header-mobile-menu-nav">
+      {% if current_person.signed_in? %}
+        <button
+          data-toggle-class="np-hidden"
+          class="np-header-mobile-menu-nav-button fal fa-times np-hidden np-header-font-color"
+          data-toggle-target=".np-header-mobile-avatar-menu,
+          .np-header-mobile-menu-content, .np-main, .np-footer"
+        ></button>
+        <button
+          data-test="open-mobile-menu"
+          data-toggle-class="np-hidden"
+          class="np-header-mobile-menu-nav-button np-header-mobile-avatar-menu"
+          data-toggle-target=".fa-times, .np-header-mobile-menu-content, .np-main, .np-footer"
+        >
+          <img
+            alt="{{ current_person.name }}"
+            class="np-header-avatar-image"
+            src="https://s3.us-east-1.amazonaws.com/static.northpass.com/SPS/school_logo-1.png"
+          />
+        </button>
+      {% endif %}
+    </div>
+    {% if current_school.logo_url %}
+      <h1 class="np-header-logo">
+        <a href="{% route home %}">
+          <img
+            alt="{{ current_school.name }}"
+            class="np-header-logo-image"
+            src="{{ current_school.logo_url }}"
+          />
+        </a>
+      </h1>
+    {% else %}
+      <h1>
         <a href="{% route home %}" class="np-school-name np-header-font-color">
           {{ current_school.name }}
         </a>
-      {% endif %}
+      </h1>
+    {% endif %}
+
+    <div class="np-hidden-mobile np-header-desktop-nav">
+      <ul class="np-header-desktop-nav-list">
+        {% for website_navigation in navigations.header_navigations_external %}
+          <li class= "np-header-desktop-nav-item">
+            <a
+              href="{{ website_navigation.path }}"
+              class="np-header-desktop-nav-link np-header-font-color"
+              target="_blank"
+            >
+              {{ website_navigation.name }}
+            </a>
+          </li>
+        {% endfor %}
+      </ul>
     </div>
-    <div class='header-desktop-right np-hidden-mobile-new'>
-      <div class="np-header-desktop-nav">
-        <ul class="np-header-desktop-nav-list">
-          {% for website_navigation in navigations.header_navigations_external %}
-            <li class= "np-header-desktop-nav-item">
-              <a
-                href="{{ website_navigation.path }}"
-                class="np-header-desktop-nav-link np-header-font-color"
-                style='font-weight: 700;'
-              >
-                {{ website_navigation.name }}
-              </a>
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-      {% if current_person.signed_in? %}
-        <form action="{% route search %}" method="get" data-test="desktop-search" style="background: white; border-radius: 4px;" class='header-search-form' id='header-search-form'>
+
+    {% if current_person.signed_in? %}
+      {% if features.commerce? %}
+        <a class="np-hidden-mobile np-header-button np-header-button-cart" href="{% route cart %}">
+          <i class="np-header-button-icon far fa-shopping-cart"></i>
+          {% t .cart %}
+          {% commerce_cart_badge %}
+        </a>
+      {% endif %}
+      <div class="np-hidden-mobile np-header-search np-header-search-expanded">
+        <form action="{% route search %}" method="get" data-test="desktop-search">
           <input
             aria-label="{% t .search %}"
-            class="header-search-input"
+            class="np-header-search-input"
             type="text"
             name="q"
-            placeholder="Search by keyword"
+            placeholder="{% t .search %}"
           />
-          <button class="far fa-search header-search-button" type="submit" form='header-search-form'></button>
+          <i class="np-header-search-icon far fa-search"></i>
         </form>
-        <div class="np-hidden-mobile-new np-header-avatar">
-          <button
-            class="np-header-avatar-button"
-            data-test="open-desktop-menu"
-            data-toggle-class-on-target="np-hidden"
-            data-toggle-target=".np-header-avatar-tooltip"
-            data-toggle-outside
-            style='color: white; font-weight: 700;'
+      </div>
+      <div class="np-hidden-mobile np-header-avatar">
+        <button
+          class="np-header-avatar-button"
+          data-test="open-desktop-menu"
+          data-toggle-class-on-target="np-hidden"
+          data-toggle-target=".np-header-avatar-tooltip"
+          data-toggle-outside
+        >
+          <img
+            alt="{{ current_person.name }}"
+            class="np-header-avatar-image"
+            src="https://s3.us-east-1.amazonaws.com/static.northpass.com/SPS/school_logo-1.png"
           >
-            {{ current_person.name }}
-          </button>
-          <div class="np-header-avatar-tooltip np-hidden" role="tooltip">
-            <span class="np-header-avatar-tooltip-arrow-up"></span>
-            <div class="np-header-avatar-tooltip-learner">
-              <div class="np-header-avatar-tooltip-learner-name">
-                {{ current_person.name }}
-              </div>
-              <div class="np-header-avatar-tooltip-learner-email">
-                {{ current_person.email }}
-              </div>
+        </button>
+        <div class="np-header-avatar-tooltip np-hidden" role="tooltip">
+          <span class="np-header-avatar-tooltip-arrow-up"></span>
+          <div class="np-header-avatar-tooltip-learner">
+            <div class="np-header-avatar-tooltip-learner-name">
+              {{ current_person.name }}
             </div>
-            <nav class="np-header-avatar-tooltip-navigation">
+            <div class="np-header-avatar-tooltip-learner-email">
+              {{ current_person.email }}
+            </div>
+          </div>
+          <nav class="np-header-avatar-tooltip-navigation">
             {% unless current_school.sso_active? %}
               <a
                 class="np-header-avatar-tooltip-navigation-link"
@@ -70,360 +109,124 @@
                 {% t .profile_settings %}
               </a>
             {% endunless %}
+            {% if current_person.signed_in? %}
               <a
-                class="np-header-avatar-tooltip-navigation-link np-danger"
-                href="{% route logout %}"
+                class="np-header-avatar-tooltip-navigation-link"
+                href="{% route transcript %}"
               >
-                {% t .sign_out %}
+                {% t .transcript %}
               </a>
-            </nav>
-          </div>
+            {% endif %}
+            {% if current_person.signed_in? and features.commerce? %}
+              <a
+                class="np-header-avatar-tooltip-navigation-link"
+                href="{% route order_history %}"
+              >
+                {% t .order_history %}
+              </a>
+            {% endif %}
+            <a
+              class="np-header-avatar-tooltip-navigation-link np-danger"
+              href="{% route logout %}"
+            >
+              {% t .sign_out %}
+            </a>
+          </nav>
         </div>
-      {% else %}
-        <a
-          class="np-header-sign-in np-header-desktop-nav-link np-header-font-color"
-          aria-label="{% t shared.sign_in %}"
-          href="{% route login %}"
-        >
-          {% t shared.sign_in %}
-        </a>
-      {% endif %}
-    </div>
-    <div class='np-header-right-mobile np-hidden-desktop-new'>
-      <i class="mobile-search-button far fa-search" id='mobile-search-button'></i>
-      <i class="mobile-menu-button fas fa-bars" id='mobile-menu-button'></i>
-    </div>
+      </div>
+    {% else %}
+      <a
+        class="np-header-sign-in np-header-desktop-nav-link np-header-font-color"
+        aria-label="{% t shared.sign_in %}"
+        href="{% route login %}"
+      >
+        {% t shared.sign_in %}
+      </a>
+    {% endif %}
   </div>
 </header>
-<div class='bottom-header-search np-hidden np-hidden-desktop-new' id='menu-mobile-search-menu'>
-  <form action="{% route search %}" method="get" data-test="desktop-search" style="background: white; border-radius: 4px;" class='menu-mobile-search-form' id='menu-mobile-search-form'>
-    <input
-      aria-label="{% t .search %}"
-      class="menu-mobile-search-input"
-      type="text"
-      name="q"
-      placeholder="Search by keyword"
-    />
-    <button class="far fa-search menu-mobile-search-button" type="submit" form='menu-mobile-search-form'></button>
-  </form>
-  <i class="menu-mobile-close fas fa-times"></i>
-</div>
-</div>
 
-<div class="np-hidden-desktop-new np-hidden" id='mobile-menu-menu'>
-  <i class="mobile-menu-close fas fa-times" id='mobile-menu-close'></i>
-  <ul class="mobile-menu-list">
-    {% for website_navigation in navigations.header_navigations_external %}
-      <li class='mobile-menu-list-li'>
-        <a href="{{ website_navigation.path }}" class='mobile-menu-list-element'>
+<div class="np-hidden-desktop">
+  <div class="np-header-mobile-menu-content np-hidden">
+    {% if current_person.signed_in? %}
+      <img
+        alt="{{ current_person.name }}"
+        class="np-header-mobile-menu-content-avatar"
+        src="{{ current_person.avatar_url }}"
+      />
+      <div class="np-header-mobile-menu-content-name">
+        {{ current_person.name }}
+      </div>
+    {% endif %}
+    <div class="np-header-mobile-menu-content-nav">
+      <form
+        class="np-header-search"
+        data-test="mobile-search"
+        method="get"
+        action="{% route search %}"
+      >
+        <input
+          aria-label="{% t .search %}"
+          class="np-header-search-input"
+          type="text"
+          name="q"
+          placeholder="{% t .search %}"
+        />
+        <i class="np-header-search-icon far fa-search"></i>
+      </form>
+      {% for website_navigation in navigations.header_navigations %}
+        <a
+          href="{{ website_navigation.path }}"
+          class="np-header-mobile-menu-content-button"
+          {% if website_navigation.external? %} target="_blank" {% endif %}
+        >
           {{ website_navigation.name }}
         </a>
-      </li>
-    {% endfor %}
-    <li class='mobile-menu-list-li'><a href="/app/account" class='mobile-menu-list-element'>My Profile</a></li>
-    <li style='border-bottom: 1px solid #1a1a1a;'></li>
-    <li class='mobile-menu-list-li'><a href="{% route logout %}" data-method="delete" rel="nofollow" class='mobile-menu-list-element'>Log Out</a></li>
-  </ul>
+      {% endfor %}
+      <div class="np-header-mobile-menu-content-line"></div>
+      {% unless current_school.sso_active? %}
+        <a
+          class="np-header-mobile-menu-content-button"
+          href="{% route account %}"
+        >
+          {% t .profile_settings %}
+        </a>
+      {% endunless %}
+      {% if current_person.signed_in? %}
+        <a
+          class="np-header-mobile-menu-content-button"
+          href="{% route transcript %}"
+        >
+          {% t .transcript %}
+        </a>
+      {% endif %}
+      {% if current_person.signed_in? and features.commerce? %}
+        <a
+          class="np-header-mobile-menu-content-button"
+          href="{% route order_history %}"
+        >
+          {% t .order_history %}
+        </a>
+      {% endif %}
+      {% if current_person.signed_in? and features.commerce? %}
+        <div class="np-header-mobile-menu-content-line"></div>
+        <a
+          class="np-header-mobile-menu-content-button np-header-mobile-menu-content-button-cart"
+          href="{% route cart %}"
+        >
+          <i class="np-header-mobile-menu-content-button-icon far fa-shopping-cart"></i>
+          {% t .cart %}
+          {% commerce_cart_badge %}
+        </a>
+      {% endif %}
+      <a
+        class="np-header-mobile-menu-content-button np-danger"
+        href="{% route logout %}"
+      >
+        {% t .sign_out %}
+      </a>
+    </div>
+  </div>
 </div>
 
-
-
 {% include "messages" %}
-<div class="main_site">
-
-<style>
-  .np-header-content {
-    justify-content: space-between;
-  }
-  .header-desktop-right {
-    display: flex;
-    flex-direction: row;
-  }
-  .np-header-search {
-    align-self: center;
-  }
-  .np-header-right-mobile {
-    display: flex;
-  }
-  .np-header-search-icon:before {
-    font-weight: 700;
-    color: gray;
-  }
-
-  .mobile-menu-button {
-    font-size: 1.5rem;
-    color: white;
-    padding: 10px;
-    cursor: pointer;
-  }
-  .mobile-search-button {
-    padding: 10px;
-    cursor: pointer;
-  }
-  .mobile-search-button:before {
-    color: white;
-    font-weight: 700;
-    font-size: 1.25rem;
-    align-self: center;
-  }
-  .bottom-header-search {
-    background: #00aae5;
-    height: 50px;
-    display: flex;
-  }
-
-  .header-search-form {
-    height: 40px;
-    display: flex;
-    width: 20%;
-    margin: auto;
-  }
-  .header-search-input {
-    padding-left: 15px;
-    border: none;
-    width: 100%;
-    background: none;
-  }
-  .header-search-input:focus-visible {
-    outline: none;
-  }
-  .header-search-icon {
-    right: .75rem;
-    top: 0.6rem;
-
-  }
-  .header-search-icon:before {
-    color: darkgray;
-  }
-  .header-search-button {
-    width: 60px;
-    font-size: 20px;
-    font-weight: 700;
-    color: gray;
-    background: none;
-    border: none;
-    cursor: pointer;
-  }
-
-  .menu-mobile-search-form {
-    height: 40px;
-    display: flex;
-    width: 70%;
-    margin: auto;
-  }
-  .menu-mobile-search-input {
-    padding-left: 15px;
-    border: none;
-    width: 100%;
-    background: none;
-  }
-  .menu-mobile-search-input:focus-visible {
-    outline: none;
-  }
-  .menu-mobile-search-icon {
-    right: .75rem;
-    top: 0.6rem;
-  }
-  .menu-mobile-search-icon:before {
-    color: darkgray;
-  }
-  .menu-mobile-search-button {
-    width: 60px;
-    font-size: 20px;
-    font-weight: 700;
-    color: gray;
-    background: none;
-    border: none;
-    cursor: pointer;
-  }
-  .menu-mobile-close {
-    z-index: 100;
-    position: absolute;
-    padding: 15px;
-    font-size: 20px;
-    padding: auto;
-    align-items: center;
-    align-self: center;
-    right: 5px;
-    cursor: pointer;
-  }
-  #mobile-menu-menu {
-    position: absolute;
-    top: 0;
-    right: -256px;
-    width: 256px;
-    background: #3b3f3d;
-    z-index: 10000;
-    height: 100%;
-    pointer-events: all;
-  }
-  .mobile-menu-close {
-    color: white;
-    font-size: 1.5rem;
-    top: 13px;
-    position: absolute;
-    left: 15px;
-  }
-  .mobile-menu-list {
-    list-style-type: none;
-    margin-top: 40px;
-    padding-left: 10px;
-  }
-  .mobile-menu-list-element {
-    color: #ccc;
-    font-weight: 400;
-    text-decoration: none;
-
-  }
-  .mobile-menu-list-li:hover * {
-    color: #ffffff;
-    text-shadow: none;
-    cursor: pointer;
-  }
-  .mobile-menu-list-li:hover {
-    background: #9b4b87;
-  }
-  .mobile-menu-list-li {
-    padding: 8px 16px;
-  }
-  .np-header-desktop-nav-list {
-    flex-wrap: nowrap;
-  }
-  @media screen and (min-width: 1056px) {
-    .np-hidden-desktop-new {
-      display: none !important;
-    }
-    .np-header-search-input {
-      background:#fff;
-      border:2px solid #bac4ca;
-      border-radius:4px;
-      color:#486776;
-      font-size:15px;
-      opacity:1;
-      outline:none;
-      padding:0 1.5rem 0 1rem;
-      width:90%;
-      height: 2.5rem;
-    }
-    .np-header-search-input::placeholder {
-      color: black;
-    }
-    .np-header-search-input:focus {
-    width: 90%;
-    padding:0 1.5rem 0 1rem;
-    }
-  }
-  @media (min-width:1643px) and (max-width:1738px) {
-    .header-search-form {
-      width: 14%;
-    }
-  }
-  @media (min-width:1472px) and (max-width:1610px) {
-    .header-search-form {
-      width: 14%;
-    }
-  }
-  @media (min-width:0px) and (max-width:1311px) {
-    .header-search-form {
-      width: 14%;
-    }
-    .header-search-input::placeholder {
-      font-size: 13px;
-    }
-  }
-  @media (min-width:1472px) and (max-width:1643px) {
-    .np-header-desktop-nav-item {
-      padding: 1rem 0.5rem;
-    }
-    .np-header-avatar-button {
-      margin: 0 0 0 0.5rem;
-    }
-  }
-  @media (min-width:1472px) and (max-width:1550px) {
-    .np-header-desktop-nav-link {
-      font-size: 14px;
-    }
-    .np-header-avatar-button {
-      font-size: 14px;
-    }
-  }
-  @media (min-width:1056px) and (max-width:1472px) {
-    .np-header-content {
-      flex-direction: column;
-      align-items: unset;
-    }
-    .np-header {
-      height: 100px !important;
-    }
-    .np-header-logo {
-      margin-bottom: 0;
-    }
-    .header-desktop-left {
-      margin-top: 1.5rem;
-    }
-    .header-desktop-right {
-      margin-bottom: 1rem;
-    }
-    .np-header-desktop-nav-list {
-      padding-left: 0;
-    }
-  }
-  @media (min-width:1056px) and (max-width:1220px) {
-    .np-header-desktop-nav-item {
-      padding: 1rem 0.5rem;
-    }
-    .np-header-avatar-button {
-      margin: 0 0 0 0.5rem;
-    }
-  }
-  @media (min-width:1056px) and (max-width:1118px) {
-    .np-header-desktop-nav-link {
-      font-size: 14px;
-    }
-    .np-header-avatar-button {
-      font-size: 14px;
-    }
-  }
-  @media screen and (max-width: 1055px) {
-    .np-hidden-mobile-new {
-      display: none !important;
-    }
-    .np-header-content {
-    flex-direction: row;
-    }
-  }
-  @media screen and (max-width: 445px) {
-    .logo-image {
-      width: 250px;
-    }
-  }
-  @media screen and (max-width: 400px) {
-    .menu-mobile-search-form {
-      width: 85%;
-    }
-  }
-</style>
-
-<script>
-   var a = $("#mobile-menu-menu").children()
-   var a = a.add($("#mobile-menu-menu"))
-  $("#mobile-search-button").click(function() {
-    $("#menu-mobile-search-menu").toggleClass('np-hidden');
-  });
-  $(".menu-mobile-close").click(function() {
-    $("#menu-mobile-search-menu").toggleClass('np-hidden');
-  });
-  $("#mobile-menu-button").click(function() {
-    $("#mobile-menu-menu").toggleClass('np-hidden');
-    window.onscroll = function () { window.scrollTo(0, 0); };
-    $('body').css({position: 'relative', left: '-256px'});
-    $("#mobile-menu-menu")
-    $('body:not(a)').css({pointerEvents: 'none', filter: 'grayscale(40%)'});
-  })
-  $('#mobile-menu-close').click(function(){
-    $('body').css({position: '', left: '', filter: ''});
-    $('body:not(a)').css({pointerEvents: ''});
-    window.onscroll = function() {}
-    $("#mobile-menu-menu").toggleClass('np-hidden');
-  })
-</script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_header_minimal.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_header_minimal.html.liquid
new file mode 100644
index 00000000..6b72cdb2
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_header_minimal.html.liquid
@@ -0,0 +1,17 @@
+<header class="np-box-header np-header-color">
+  <a class="np-box-header-link" href="{% route home %}">
+    {% if current_school.logo_url %}
+      <img
+        alt="{{ current_school.name }}"
+        src="{{ current_school.logo_url }}"
+        class="np-box-header-logo"
+      />
+    {% else %}
+      <span class="np-school-name np-header-font-color">
+        {{ current_school.name }}
+      </span>
+    {% endif %}
+  </a>
+</header>
+
+{% include "messages" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_banners.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_banners.html.liquid
new file mode 100644
index 00000000..11a1810c
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_banners.html.liquid
@@ -0,0 +1,5 @@
+{% if learning_path.new_content_available? %}
+  {% include "learning_path_new_content_banner" %}
+{% else %}
+  {% include "learning_path_completed_banner" %}
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_certificate.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_certificate.html.liquid
new file mode 100644
index 00000000..3a282c5e
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_certificate.html.liquid
@@ -0,0 +1,17 @@
+{% if learning_path.has_certificate? %}
+  {% if learning_path.certificate_completed? %}
+    <div class="np-learning-path-outline-bar np-hidden-mobile"></div>
+    <a
+      class="np-learning-path-certificate-link"
+      href="{{ learning_path.certificate_link }}"
+    >
+      <div class="np-learning-path-certificate">
+        {% include "learning_path_certificate_content" %}
+      </div>
+    </a>
+  {% else %}
+    <div class="np-learning-path-certificate np-learning-path-certificate--inactive">
+      {% include "learning_path_certificate_content" %}
+    </div>
+  {% endif %}
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_certificate_content.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_certificate_content.html.liquid
new file mode 100644
index 00000000..3feafd59
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_certificate_content.html.liquid
@@ -0,0 +1,19 @@
+<div class="np-learning-path-certificate-content">
+  <div class="np-learning-path-certificate-avatar" role="img">
+    <i class="np-learning-path-certificate-avatar-icon fal fa-award"></i>
+    <h5 class="np-learning-path-certificate-avatar-title">
+      {% t .avatar_title %}
+    </h5>
+  </div>
+  <h4 class="np-learning-path-certificate-name">
+    {{ learning_path.certificate_name }}
+  </h4>
+  {% if learning_path.certificate_completed? %}
+    <time
+      class="np-learning-path-certificate-issue-date"
+      datetime="{{ learning_path.certificate_issue_date }}"
+    >
+      {{ learning_path.certificate_issue_date | date: "%B %d, %Y" }}
+    </time>
+  {% endif  %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_completed_banner.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_completed_banner.html.liquid
new file mode 100644
index 00000000..3632ce1c
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_completed_banner.html.liquid
@@ -0,0 +1,13 @@
+<div class="np-learning-path-completed-banner np-learning-path-banner">
+  <img class="np-learning-path-banner-image" src="https://s3.amazonaws.com/static.northpass.com/images/stars-completed.svg"/>
+  <div class="np-learning-path-banner-content">
+    <h3 class="np-learning-path-banner-headline">{% t .headline %}</h3>
+    <p class="np-learning-path-banner-description">{% t .description %}</p>
+    <div class="np-learning-path-banner-actions">
+      {% if learning_path.certificate_link %}
+        <a href="{{ learning_path.certificate_link }}" class="np-learning-path-banner-action np-learning-path-banner-action--primary">{% t .actions.certificate %}</a>
+      {% endif %}
+      <a href="{% route courses %}" class="np-learning-path-banner-action np-learning-path-banner-action--secondary">{% t .actions.more_courses %}</a>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_course.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_course.html.liquid
index bbefe65f..dc463beb 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_course.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_course.html.liquid
@@ -1,4 +1,5 @@
 {% if learning_path.enrolled? and course.unlocked? %}
+  <div class="np-learning-path-outline-bar np-hidden-mobile"></div>
   <a
     class="np-learning-path-outline-item np-card-container"
     href="{% route learning_path_course, learning_path_id: learning_path.id, id: course.id %}"
@@ -19,7 +20,7 @@
           </div>
         {% endif %}
         <div class="np-learning-path-outline-progress
-          {% if course.completed? %} np-color-success {% else %} np-button-color {% endif %}
+          {% if course.completed? %} np-color-success {% else %} np-learning-progress-text-color {% endif %}
         ">
           {% t shared.progress, count: course.progress %}
         </div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_description.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_description.html.liquid
new file mode 100644
index 00000000..f79f9e14
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_description.html.liquid
@@ -0,0 +1,6 @@
+<h2 class="np-card-heading">
+  {% t .about %}
+</h2>
+<div class="np-card-text">
+  {{ learning_path.description }}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_desktop_content.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_desktop_content.html.liquid
new file mode 100644
index 00000000..e9ca85d9
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_desktop_content.html.liquid
@@ -0,0 +1,21 @@
+<div class="row">
+  <div class="col-xs-12 col-sm-6">
+    <div class="np-card-container">
+      <img
+        src="{{ learning_path.image_url }}"
+        class="np-top-image"
+        alt="{{ learning_path.name }}"
+      />
+      <div class="np-card-padding-dynamic">
+        {% include "learning_path_description" %}
+        {% include "learning_path_instructors" %}
+      </div>
+    </div>
+  </div>
+  <div class="col-xs-12 col-sm-6 np-grid-spacing">
+    <div class="np-top-cta">
+      {% include "learning_path_progress_and_cta" %}
+    </div>
+    {% include "learning_path_outline" %}
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_desktop_header.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_desktop_header.html.liquid
new file mode 100644
index 00000000..6f4c112c
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_desktop_header.html.liquid
@@ -0,0 +1,12 @@
+<div class="np-resource-header np-resource-header-card np-card-padding-large">
+  <div class="np-top-vocabulary np-text-title">
+    {% t shared.learning_path.title %}
+    <i class="far fa-road np-button-color np-learning-path-icon"></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-icon-back"></i>
+    </a>
+    {{ learning_path.name }}
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_desktop_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_desktop_view.html.liquid
new file mode 100644
index 00000000..8447443e
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_desktop_view.html.liquid
@@ -0,0 +1,2 @@
+{% include "learning_path_desktop_header" %}
+{% include "learning_path_desktop_content" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_instructors.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_instructors.html.liquid
new file mode 100644
index 00000000..a8342301
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_instructors.html.liquid
@@ -0,0 +1,26 @@
+{% if learning_path.instructors.any? %}
+  <div class="np-card-content-divider">
+    <h3 class="np-card-heading">
+      {% t shared.instructors %}
+    </h3>
+    <div class="np-content-instructors-content row">
+      {% for instructor in learning_path.instructors %}
+        <div class="np-content-instructors-content-item col-xs-12 col-lg">
+          <img
+            src="{{ instructor.avatar_url }}"
+            class="np-content-instructors-content-image"
+            alt="{{ instructor.name }}"
+          >
+          <div class="np-content-instructors-content-description">
+            <div class="np-content-instructors-content-name">
+              {{ instructor.name }}
+            </div>
+            <div class="np-content-instructors-content-info np-text-light">
+              {{ instructor.title }}
+            </div>
+          </div>
+        </div>
+      {% endfor %}
+    </div>
+  </div>
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_mobile_content.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_mobile_content.html.liquid
new file mode 100644
index 00000000..92ffd4c8
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_mobile_content.html.liquid
@@ -0,0 +1,19 @@
+{% if learning_path.in_progress? %}
+  {% include "learning_path_outline" %}
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "learning_path_description" %}
+  </div>
+{% else %}
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "learning_path_description" %}
+  </div>
+  <div class="np-card-spacing">
+    {% include "learning_path_outline" %}
+  </div>
+{% endif %}
+
+{% if learning_path.instructors.any? %}
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "learning_path_instructors" %}
+  </div>
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_mobile_header.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_mobile_header.html.liquid
new file mode 100644
index 00000000..2bf66a5a
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_mobile_header.html.liquid
@@ -0,0 +1,17 @@
+<div class="np-resource-header np-card-padding-vertical">
+  <div class="np-top-vocabulary np-text-title">
+    {% t shared.learning_path.title %}
+    <i class="far fa-road np-button-color np-learning-path-icon"></i>
+  </div>
+  <div class="np-top-title">
+    {{ learning_path.name }}
+  </div>
+  <img
+    src="{{ learning_path.image_url }}"
+    class="np-top-image"
+    alt="{{ learning_path.name }}"
+  />
+  <div class="np-top-cta">
+    {% include "learning_path_progress_and_cta" %}
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_mobile_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_mobile_view.html.liquid
new file mode 100644
index 00000000..0e22feb9
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_mobile_view.html.liquid
@@ -0,0 +1,2 @@
+{% include "learning_path_mobile_header" %}
+{% include "learning_path_mobile_content" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_new_content_banner.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_new_content_banner.html.liquid
new file mode 100644
index 00000000..f4b3eaf3
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_new_content_banner.html.liquid
@@ -0,0 +1,12 @@
+<div class="np-learning-path-new-content-banner np-learning-path-banner">
+  <div class="np-learning-path-banner-content">
+    <h2 class="np-learning-path-banner-headline">{% t .headline %}</h2>
+    <p class="np-learning-path-banner-description">{% t .description %}</p>
+    <div class="np-learning-path-banner-actions">
+      {% learning_path_next_step_button learning_path, class: "np-learning-path-banner-action np-learning-path-banner-action--primary" %}
+      {% if learning_path.certificate_link %}
+        <a href="{{ learning_path.certificate_link }}" class="np-learning-path-banner-action np-learning-path-banner-action--secondary">{% t .actions.view_certificate %}</a>
+      {% endif %}
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_outline.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_outline.html.liquid
new file mode 100644
index 00000000..22ddd573
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_outline.html.liquid
@@ -0,0 +1,10 @@
+<div class="np-learning-path-outline">
+  {% for item in learning_path.items %}
+    {% if item.course? %}
+      {% include "learning_path_course", course: item %}
+    {% elsif item.training_event? %}
+      {% include "learning_path_training_session", training_session: item %}
+    {% endif %}
+  {% endfor %}
+  {% include "learning_path_certificate" %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_product_desktop_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_product_desktop_view.html.liquid
new file mode 100644
index 00000000..08cb6406
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_product_desktop_view.html.liquid
@@ -0,0 +1,22 @@
+{% include "learning_path_desktop_header", learning_path: product %}
+<div class="row">
+  <div class="col-xs-12 col-sm-6">
+    <div class="np-card-container">
+      <img
+        src="{{ product.image_url }}"
+        class="np-top-image"
+        alt="{{ product.name }}"
+      />
+      <div class="np-card-padding-dynamic">
+        {% include "learning_path_description", learning_path: product  %}
+        {% include "learning_path_instructors", learning_path: product  %}
+      </div>
+    </div>
+  </div>
+  <div class="col-xs-12 col-sm-6 np-grid-spacing">
+    <div class="np-top-cta np-card-container np-card-padding np-product-cta">
+      {% include "product_price_and_cta"%}
+    </div>
+    {% include "learning_path_product_outline" %}
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_product_mobile_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_product_mobile_view.html.liquid
new file mode 100644
index 00000000..c42b6612
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_product_mobile_view.html.liquid
@@ -0,0 +1,34 @@
+<div class="np-card-container np-card-padding-large">
+  <div class="np-top-vocabulary np-text-title np-text-muted">
+    {% t shared.learning_path.title %}
+    <i class="far fa-road np-button-color np-learning-path-icon np-hidden-mobile"></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>
+    {{ product.name }}
+  </div>
+  <img
+    src="{{ product.image_url }}"
+    class="np-top-image"
+    alt="{{ product.name }}"
+  />
+  <div class="np-top-cta">
+    {% include "product_price_and_cta" %}
+  </div>
+</div>
+
+<div class="np-card-container np-card-padding np-card-spacing">
+  {% include "learning_path_description", learning_path: product %}
+</div>
+
+<div class="np-card-spacing">
+  {% include "learning_path_product_outline" %}
+</div>
+
+{% if product.instructors.any? %}
+  <div class="np-card-container np-card-padding np-card-spacing">
+    {% include "learning_path_instructors", learning_path: product %}
+  </div>
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_product_outline.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_product_outline.html.liquid
new file mode 100644
index 00000000..bf077377
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_product_outline.html.liquid
@@ -0,0 +1,10 @@
+<div class="np-learning-path-outline">
+  <h3 class="np-product-outline-title">{% t .title %}</h3>
+  {% for item in product.learning_path_items %}
+    {% if item.course? %}
+      {% include "product_outline_course", id: forloop.index %}
+    {% elsif item.training_event? %}
+      {% include "product_outline_event", id: forloop.index %}
+    {% endif %}
+  {% endfor %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_progress_and_cta.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_progress_and_cta.html.liquid
new file mode 100644
index 00000000..0e7fb9b2
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_progress_and_cta.html.liquid
@@ -0,0 +1,23 @@
+{% if learning_path.enrolled? %}
+  <div class="np-top-cta-progress-content">
+    <div class="np-top-cta-progress-title np-text-title">
+      {% t .progress %}
+    </div>
+    <div class="np-progress-bar-container">
+      <div
+        style="width: {{ learning_path.progress }}%"
+        class="np-card-progress-bar np-learning-progress-bar-color">
+      </div>
+    </div>
+    <div class="np-top-cta-progress-text
+      {% if learning_path.completed? %} np-color-success {% else %} np-learning-progress-text-color {% endif %}
+    ">
+      {% t shared.progress, count: learning_path.progress %}
+    </div>
+    {% include "product_expiration_date", date: learning_path.expiration_date %}
+  </div>
+{% endif %}
+
+<div class="np-top-cta-container">
+  {% learning_path_next_step_button learning_path, class: "np-top-button np-button-font-color np-button np-button-big" %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_summary_desktop_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_summary_desktop_view.html.liquid
new file mode 100644
index 00000000..05961c52
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_summary_desktop_view.html.liquid
@@ -0,0 +1,3 @@
+{% include "learning_path_desktop_header" %}
+{% include "learning_path_banners" %}
+{% include "learning_path_desktop_content" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_summary_mobile_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_summary_mobile_view.html.liquid
new file mode 100644
index 00000000..f30a09eb
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_summary_mobile_view.html.liquid
@@ -0,0 +1,5 @@
+<div class="np-card-padding">
+  {% include "learning_path_banners" %}
+</div>
+{% include "learning_path_mobile_header" %}
+{% include "learning_path_mobile_content" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_training_session.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_training_session.html.liquid
index 8c5ae377..f796cdf4 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_training_session.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_path_training_session.html.liquid
@@ -1,4 +1,5 @@
 {% if learning_path.enrolled? and training_session.unlocked? %}
+  <div class="np-learning-path-outline-bar np-hidden-mobile"></div>
   <a
     class="np-learning-path-outline-item np-card-container"
     href="{% route training_session, id: training_session.id %}"
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_learning_paths_index.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_learning_paths_index.html.liquid
index 1c9fe93a..a4681210 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/_learning_paths_index.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_learning_paths_index.html.liquid
@@ -1,16 +1,14 @@
-{% if learning_paths.available.any? %}
-  <div class="np-catalog-courses row row-with-thumbnails">
-    {% for learning_path in learning_paths.available %}
-      <div class="col-xs-12 col-md-6 col-lg-4 np-stretch-content">
-        {% include "cards_learning_path" with learning_path %}
-      </div>
+<div class="np-learning-paths-resources">
+  {% if items.any? %}
+    {% for learning_path in items %}
+      {% include "cards_learning_path" with learning_path %}
     {% endfor %}
-  </div>
-{% else %}
-  {% capture message %}
-    {% t shared.zero_state.courses.catalog,
-      key: current_school.course_vocabulary
-    %}
-  {% endcapture %}
-  {% include "courses_zero_state", message: message %}
-{% endif %}
+  {% else %}
+    <div class="np-learning-paths-resources-container">
+      <div class="np-zero-state-text">
+        {% t .empty %}
+      </div>
+      <img class="np-zero-state-learning-paths" alt="{% t .empty %}" />
+    </div>
+  {% endif %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_lp_homepage.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_lp_homepage.html.liquid
new file mode 100644
index 00000000..2035310b
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_lp_homepage.html.liquid
@@ -0,0 +1,40 @@
+<div class="section-text-container">
+    <div class="dashboard-resources-title">
+      My Paths
+    </div>
+    <div class="dashboard-resources-subtitle">
+      Learning Paths in which you're currently enrolled
+    </div>
+  </div>
+  <div class="content-container">
+    <div class="filter-container">
+      <div class='filter-section lp-filter'>
+        <div class='filter-title'>Filter by:</div>
+        {% assign lp_categories = '' | split: '' %}
+        {% for lp in learning_paths.enrolled %}
+          {% for cat in lp.categories %}
+            {% assign cat_name = cat.name | split: '!@#$%^&*()' %}
+            {% assign lp_categories = lp_categories | concat: cat_name %}
+          {% endfor %}
+        {% endfor %}
+        {% assign lp_categories = lp_categories | uniq %}
+        <div class="filter-options-wrapper">
+          <div class="filter-option-container">
+            <input type="checkbox" class="input-checkbox" name="all" />
+            <label class="input-label" >All</label>
+          </div>
+          {% for cat in lp_categories %}
+            <div class="filter-option-container">
+              <input type="checkbox" class="input-checkbox" name="{{cat}}" />
+              <label class="input-label" >{{cat}}</label>
+            </div>
+          {% endfor %}
+        </div>
+      </div>
+    </div>
+    <div class="cards-wrapper">
+      {% if features.learning_paths? %}
+        {% include "learning_paths_index", items: learning_paths.enrolled %}
+      {% endif %}
+    </div>
+  </div>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_messages.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_messages.html.liquid
new file mode 100644
index 00000000..059fc568
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_messages.html.liquid
@@ -0,0 +1,19 @@
+{% if messages.alert.size > 0 %}
+  <div class="np-alert np-alert-error">
+    <div class="np-alert-wrapper">
+      {% for message in messages.alert %}
+        <div>{{ message }}</div>
+      {% endfor %}
+    </div>
+  </div>
+{% endif %}
+
+{% if messages.notice.size > 0 %}
+  <div class="np-alert np-alert-success">
+    <div class="np-alert-wrapper">
+      {% for message in messages.notice %}
+        <div>{{ message }}</div>
+      {% endfor %}
+    </div>
+  </div>
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_other_events.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_other_events.html.liquid
new file mode 100644
index 00000000..c6f4dad1
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_other_events.html.liquid
@@ -0,0 +1,8 @@
+
+<div class="np-dashboard-resources">
+    <div class="row row-with-thumbnails"> 
+            {% include 'custom_events_card' title: "SPS Commerce presents MAPADOC Training for Sage 100" link: "https://www.spscommerce.com/lp/mapadoc-training-sage-100/" %}
+            {% include 'custom_events_card' title: "SPS Commerce presents MAPADOC Training for Sage X3" link: "https://www.spscommerce.com/lp/mapadoc-training-sage-x3/" %}
+            {% include 'custom_events_card' title: "SPS Commerce presents MAPADOC Training for Sage 500" link: "https://www.spscommerce.com/lp/mapadoc-training-sage-500/" %}
+    </div>
+</div>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_other_events_index.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_other_events_index.html.liquid
deleted file mode 100644
index 629b2b84..00000000
--- a/Custom_Templates/customer_templates/SPS_Commerce/_other_events_index.html.liquid
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="np-dashboard-resources">
-  <div class="row row-with-thumbnails">
-    <div class="col-xs-12 col-sm-6 col-lg-4 event-card">
-      {% include "cards_other_event" title: "SPS Commerce presents MAPADOC Training for Sage 100", link: "https://www.spscommerce.com/lp/mapadoc-training-sage-100/" %}
-    </div>
-    <div class="col-xs-12 col-sm-6 col-lg-4 event-card">
-      {% include "cards_other_event" title: "SPS Commerce presents MAPADOC Training for Sage X3", link: "https://www.spscommerce.com/lp/mapadoc-training-sage-x3/" %}
-    </div>
-    <div class="col-xs-12 col-sm-6 col-lg-4 event-card">
-      {% include "cards_other_event" title: "SPS Commerce presents MAPADOC Training for Sage 500", link: "https://www.spscommerce.com/lp/mapadoc-training-sage-500/" %}
-    </div>
-  </div>
-</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_product_expiration_date.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_product_expiration_date.html.liquid
new file mode 100644
index 00000000..2d4b898b
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_product_expiration_date.html.liquid
@@ -0,0 +1,7 @@
+{% if date %}
+  {% capture date_format %}{% t date.formats.short_humanized %}{% endcapture %}
+  {% capture formatted_date %}{{ date | date: date_format }}{% endcapture %}
+  <time class="np-product-expiration-date" datetime="{{ date }}">
+    {% t .label, date: formatted_date %}
+  </time>
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_product_outline.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_product_outline.html.liquid
new file mode 100644
index 00000000..4255455a
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_product_outline.html.liquid
@@ -0,0 +1,25 @@
+<div class="np-course-outline">
+  <div class="np-text-title np-course-outline-title">
+    {% t .header.course %}
+  </div>
+  <div class="np-course-outline-content">
+    <ol class="np-course-outline-content-section">
+      {% for section in course.sections %}
+        <li class="np-course-outline-content-section-list">
+          <div class="np-course-outline-content-section-name np-text-title-bold np-text-title-bold">
+            {{ section.name }}
+          </div>
+          <ol class="np-course-outline-content-activity">
+            {% for activity in section.activities %}
+              <li class="np-course-outline-content-activity-list">
+                <i class="far fa-circle np-course-outline-content-activity-icon"></i>
+                  {% include "course_activity_locked" %}
+                <div class="np-course-outline-content-activity-list-bar"></div>
+              </li>
+            {% endfor %}
+          </ol>
+        </li>
+      {% endfor %}
+    </ol>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_product_outline_course.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_product_outline_course.html.liquid
new file mode 100644
index 00000000..594cc2de
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_product_outline_course.html.liquid
@@ -0,0 +1,82 @@
+<div class="np-card-container np-card-padding np-product-outline-container">
+  <div class="np-product-outline-base-container">
+    <img
+      src="{{ item.image }}"
+      alt="{{ item.name }}"
+      class="np-product-outline-course-image"
+    >
+    <div class="np-product-outline-content">
+      <div class="np-product-outline-name np-top-title">
+        {{ item.name }}
+      </div>
+
+        <p class="np-product-outline-caption">
+        {% if item.instructors.any? %}
+          {{ item.instructor_names }}
+           {% endif %}
+        </p>
+
+      <div class="np-product-outline-base-bottom">
+        <div class="np-product-badge np-product-badge-catalog np-product-badge-outline">
+          <i class="far fa-graduation-cap np-product-badge-icon np-product-badge-catalog-icon"></i>
+          <h3 class="np-product-badge-name np-product-badge-catalog-name">{% t shared.product_types.course %}</h3>
+        </div>
+        <button
+          class="np-button np-product-outline-details-button"
+          data-toggle-class-on-target="np-hidden"
+          data-toggle-target=".np-expand-{{ id }}"
+          data-toggle-outside
+        >
+          <span class="np-expand-{{ id }}">{% t shared.buttons.expand %}<i class="far fa-chevron-down np-expand-{{ id }}"></i></span>
+          <span class="np-expand-{{ id }} np-hidden">{% t shared.buttons.collapse %} <i class="far fa-chevron-up np-hidden np-expand-{{ id }}"></i></span>
+        </button>
+      </div>
+    </div>
+  </div>
+  <div class="np-expand-{{ id }} np-hidden">
+    <div class="np-card-content-divider np-product-outline-spacer">
+      <h3 class="np-product-outline-section-headline">{% t .about %}</h3>
+      <p class="np-product-outline-section-content">{{ item.full_description }}</p>
+    </div>
+    {% if item.categories.any? %}
+      <div class="np-card-content-divider np-product-outline-spacer">
+        <h3 class="np-product-outline-section-headline">
+          {% t .categories %}
+        </h3>
+        <div class="np-flex">
+          {% for category in item.categories %}
+            <div class="np-content-categories-content-item">
+              {{ category.name }}
+            </div>
+          {% endfor %}
+        </div>
+      </div>
+    {% endif %}
+    {% if item.instructors.any? %}
+      <div class="np-card-content-divider np-product-outline-spacer">
+        <h3 class="np-product-outline-section-headline">
+          {% t shared.instructors %}
+        </h3>
+        <div class="np-content-instructors-content row">
+          {% for instructor in item.instructors %}
+            <div class="np-content-instructors-content-item col-xs-12 col-lg">
+              <img
+                src="{{ instructor.avatar_url }}"
+                class="np-content-instructors-content-image"
+                alt="{{ instructor.name }}"
+              >
+              <div class="np-content-instructors-content-description">
+                <div class="np-content-instructors-content-name">
+                  {{ instructor.name }}
+                </div>
+                <div class="np-content-instructors-content-info np-text-light">
+                  {{ instructor.title }}
+                </div>
+              </div>
+            </div>
+          {% endfor %}
+        </div>
+      </div>
+    {% endif %}
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_product_outline_event.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_product_outline_event.html.liquid
new file mode 100644
index 00000000..aaa38f41
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_product_outline_event.html.liquid
@@ -0,0 +1,49 @@
+<div class="np-card-container np-card-padding np-product-outline-container">
+  <div class="np-product-outline-content">
+    {% if item.available? %}
+      {% if item.location %}
+        <span class="np-product-location">{{ item.location }} |</span>
+      {% endif %}
+      <span class="np-product-date">{{ item.time }} {{ item.time_zone }}, {{ item.date }}</span>
+      <a class="np-product-outline-name np-top-title" href="{{ item.preview_path }}">{{ item.name }}</a>
+    {% else %}
+      <span class="np-product-outline-name np-top-title">{{ item.name }}</span>
+    {% endif %}
+    <div class="np-learning-path-outline-caption">{{ item.caption }}</div>
+    <div class="np-product-outline-base-bottom np-product-ilt-bottom">
+      <div class="np-product-badge np-product-badge-catalog np-product-badge-outline">
+      <i class="far {{ item.icon }} np-product-badge-icon np-product-badge-catalog-icon"></i>
+      <h3 class="np-product-badge-name np-product-badge-catalog-name">{{ item.formatted_type }}</h3>
+    </div>
+    <button
+      class="np-button np-product-outline-details-button"
+      data-toggle-class-on-target="np-hidden"
+      data-toggle-target=".np-expand-{{ id }}"
+      data-toggle-outside
+    >
+      <span class="np-expand-{{ id }}">{% t shared.buttons.expand %}<i class="far fa-chevron-down np-expand-{{ id }}"></i></span>
+      <span class="np-expand-{{ id }} np-hidden">{% t shared.buttons.collapse %} <i class="far fa-chevron-up np-hidden np-expand-{{ id }}"></i></span>
+    </button>
+    </div>
+    <div class="np-expand-{{ id }} np-hidden">
+    <div class="np-card-content-divider np-product-outline-spacer">
+      <h3 class="np-product-outline-section-headline">{% t .about %}</h3>
+      <p class="np-product-outline-section-content">{{ item.description }}</p>
+    </div>
+    {% if item.instructors %}
+      <div class="np-card-content-divider np-product-outline-spacer">
+        <h3 class="np-product-outline-section-headline">
+          {% t shared.instructors %}
+        </h3>
+        <div class="np-content-instructors-content row">
+            <div class="np-content-instructors-content-item col-xs-12 col-lg">
+                <div class="np-content-instructors-content-name">
+                  {{ item.instructors }}
+                </div>
+            </div>
+        </div>
+      </div>
+    {% endif %}
+  </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_product_outline_lp.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_product_outline_lp.html.liquid
new file mode 100644
index 00000000..87106e09
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_product_outline_lp.html.liquid
@@ -0,0 +1,65 @@
+<div class="np-card-container np-card-padding np-product-outline-container">
+  <div class="np-product-outline-base-container">
+    <img
+      src="{{ item.image_url }}"
+      alt="{{ item.name }}"
+      class="np-product-outline-course-image"
+    >
+    <div class="np-product-outline-content">
+      <div class="np-product-outline-name np-top-title">
+        {{ item.name }}
+      </div>
+
+        <p class="np-product-outline-caption">
+          {% if item.instructor_names %}
+            {{ item.instructor_names }}
+          {% endif %}
+        </p>
+
+      <div class="np-product-outline-base-bottom">
+        <div class="np-product-badge np-product-badge-catalog np-product-badge-outline">
+          <i class="far fa-road np-product-badge-icon np-product-badge-catalog-icon"></i>
+          <h3 class="np-product-badge-name np-product-badge-catalog-name">{% t shared.product_types.learning_path %}</h3>
+        </div>
+        <button
+          class="np-button np-product-outline-details-button"
+          data-toggle-class-on-target="np-hidden"
+          data-toggle-target=".np-expand-{{ id }}"
+          data-toggle-outside
+        >
+          <span class="np-expand-{{ id }}">{% t shared.buttons.expand %}<i class="far fa-chevron-down np-expand-{{ id }}"></i></span>
+          <span class="np-expand-{{ id }} np-hidden">{% t shared.buttons.collapse %} <i class="far fa-chevron-up np-hidden np-expand-{{ id }}"></i></span>
+        </button>
+      </div>
+    </div>
+  </div>
+  <div class="np-expand-{{ id }} np-hidden">
+    <div class="np-card-content-divider np-product-outline-spacer">
+      <h3 class="np-product-outline-section-headline">{% t .about %}</h3>
+      {{ item.description }}
+    </div>
+    <h3 class="np-product-outline-section-headline">{% t .content %}</h3>
+    {% for learning_path_item in item.learning_path_items %}
+      <div class="np-product-outline-lp-product-container">
+        <div class="np-product-outline-lp-product-info">
+          {% if learning_path_item.course? %}
+            <h3 class="np-product-outline-name np-top-title">{{learning_path_item.name}}</h3>
+            <p class="np-product-outline-caption">{{learning_path_item.instructor_names}}</p>
+          {% elsif learning_path_item.training_event? %}
+            {% if learning_path_item.available? %}
+              <a class="np-product-outline-name np-top-title" href="{{ learning_path_item.preview_path }}">{{learning_path_item.name}}</a>
+              <span class="np-product-date">{{ learning_path_item.time }} {{ learning_path_item.time_zone }}, {{ learning_path_item.date }}</span>
+            {% else %}
+              <span class="np-product-outline-name np-top-title">{{learning_path_item.name}}</span>
+              <span class="np-product-date">{{ learning_path_item.caption }}</span>
+            {% endif %}
+          {% endif %}
+        </div>
+        <div class="np-product-badge np-product-badge-catalog">
+          <i class="far {{ learning_path_item.icon }} np-product-badge-icon np-product-badge-catalog-icon"></i>
+          <h3 class="np-product-badge-name np-product-badge-catalog-name">{{ learning_path_item.formatted_type }}</h3>
+        </div>
+      </div>
+    {% endfor %}
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_product_price_and_cta.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_product_price_and_cta.html.liquid
new file mode 100644
index 00000000..c0221597
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_product_price_and_cta.html.liquid
@@ -0,0 +1,12 @@
+<div class="np-top-cta-price-content">
+    <div>
+    <span class="np-catalog-card-price np-commerce-outline-description-price">{{ product.formatted_price }}</span>
+    <span class="np-commerce-outline-description-access">
+        {{ product.formatted_access_period}}
+    </span>
+    </div>
+</div>
+<div class="np-top-cta-container">
+  {% commerce_add_to_cart product %}
+  {% commerce_buy_more_access product %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_search_result.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_search_result.html.liquid
new file mode 100644
index 00000000..5c2a4991
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_search_result.html.liquid
@@ -0,0 +1,19 @@
+<div class="np-card np-search-result">
+  <div class="np-card-container">
+    <div class="np-card-content">
+      <img
+        class="np-search-result-image"
+        alt="{{ result.name }}"
+        src="{{ result.image_url }}"
+      />
+      <div class="np-search-result-content">
+        <div>
+          <a class="np-search-result-title" href="{{ result.path }}">
+            {{ result.name }}
+          </a>
+        </div>
+        <div class="np-search-result-snippet">{{ result.description }}</div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_search_zero_state.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_search_zero_state.html.liquid
new file mode 100644
index 00000000..9b76d980
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_search_zero_state.html.liquid
@@ -0,0 +1,13 @@
+<div class="np-card np-search-zero-state">
+  <div class="np-card-container">
+    <div class="np-card-content np-card-content-vertical np-search-zero-state-card">
+      <h2 class="np-search-zero-state-title">
+        {% t .nothing_found %}
+      </h2>
+      <div class="np-search-zero-state-subtitle">
+        {% t .empty %}
+      </div>
+      <div class="np-search-zero-state-image"></div>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_sub_navigation.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_sub_navigation.html.liquid
index e69de29b..5a7354a3 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/_sub_navigation.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_sub_navigation.html.liquid
@@ -0,0 +1,60 @@
+<nav aria-label="subnavigation" class="np-sub-navigation">
+  <div class="np-sub-navigation-content">
+    {% for link in navigations.sub_navigation %}
+      {% if link.label == 'Home' %}
+        <div class="np-sub-navigation-content-item {{ link.active_class }}">
+          <a class="np-sub-navigation-content-item-link" href="{{ link.url }}">
+            <i class="{{ link.icon }} np-button-color np-sub-navigation-content-item-icon"></i>
+            {{ link.label }}
+          </a>
+          <div class="np-sub-navigation-content-item-bar np-button-background-color"></div>
+        </div>
+      {% endif %}
+      {% break %}
+    {% endfor %}
+
+    <div id="courses-nav" class="np-sub-navigation-content-item np-sub-navigation-content-item-inactive">
+      <a class="np-sub-navigation-content-item-link" href="/app/courses">
+        <i class="far fa-graduation-cap np-button-color np-sub-navigation-content-item-icon"></i>
+        Courses
+      </a>
+      <div class="np-sub-navigation-content-item-bar np-button-background-color"></div>
+    </div>
+    
+    {% for link in navigations.sub_navigation %}
+      {% unless link.label == 'Home' or link.label == 'Dashboard' or link.label == 'Catalog' %}
+        <div class="np-sub-navigation-content-item {{ link.active_class }}">
+          <a class="np-sub-navigation-content-item-link" href="{{ link.url }}">
+            <i class="{{ link.icon }} np-button-color np-sub-navigation-content-item-icon"></i>
+            {{ link.label }}
+          </a>
+          <div class="np-sub-navigation-content-item-bar np-button-background-color"></div>
+        </div>
+      {% endunless %}
+    {% endfor %}
+
+    <div id="catalog-nav" class="np-sub-navigation-content-item np-sub-navigation-content-item-inactive">
+      <a class="np-sub-navigation-content-item-link" href="/app/catalog">
+        <i class="far fa-store np-button-color np-sub-navigation-content-item-icon"></i>
+        Catalog
+      </a>
+      <div class="np-sub-navigation-content-item-bar np-button-background-color"></div>
+    </div>
+
+  </div>
+</nav>
+
+<script>
+  document.addEventListener('DOMContentLoaded', function() {
+    const path = window.location.pathname;
+    const coursesNav = document.getElementById('courses-nav');
+    const catalogNav = document.getElementById('catalog-nav');
+    if (path.includes('/app/courses')) {
+      coursesNav.classList.add('np-sub-navigation-content-item-active');
+      coursesNav.classList.remove('np-sub-navigation-content-item-inactive');
+    } else if (path.includes('/app/catalog')) {
+      catalogNav.classList.add('np-sub-navigation-content-item-active');
+      catalogNav.classList.remove('np-sub-navigation-content-item-inactive');
+    }
+  });
+</script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_event_desktop_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_event_desktop_view.html.liquid
new file mode 100644
index 00000000..76ac434a
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_event_desktop_view.html.liquid
@@ -0,0 +1,42 @@
+<div class="np-resource-header np-resource-header-card np-card-padding-large">
+  {% include "training_session_header" %}
+</div>
+<div class="row np-training-session-row">
+  <div class="col-xs-12 col-sm-8">
+    <div class="np-card-container">
+      <div class="np-card-padding-large">
+        <div>
+          {% include "training_session_status" %}
+          {% include "training_session_date" %}
+        </div>
+        <div class="np-training-session-details">
+          {% include "training_session_details" %}
+        </div>
+      </div>
+      <div class="np-card-content-divider"></div>
+      <div class="np-card-padding-large">
+        {% include "training_session_description" %}
+      </div>
+    </div>
+  </div>
+  <div class="col-xs-12 col-sm-4 np-grid-spacing">
+    <div class="np-training-session-container">
+        <div class="np-training-session-sessions-title">
+          {% t shared.more_sessions %}
+        </div>
+        {% if training_event.sessions.size > 1 %}
+          {% include "training_session_more_sessions" %}
+        {% else %}
+          <div class="np-training-session-zero-state">
+            <img
+              alt="{% t .empty %}"
+              class="np-zero-state-training-sessions"
+            />
+            <div class="np-training-session-zero-state-text">
+              {% t .empty %}
+            </div>
+          </div>
+        {% endif %}
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_event_mobile_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_event_mobile_view.html.liquid
new file mode 100644
index 00000000..f6a7b959
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_event_mobile_view.html.liquid
@@ -0,0 +1,23 @@
+<div class="np-training-session-view">
+  <div class="np-training-session-view-header">
+    {% include "training_session_header" %}
+  </div>
+
+  <div class="np-card-container np-training-session-view-details np-card-padding np-card-spacing">
+    {% include "training_session_status" %}
+    {% include "training_session_date" %}
+    {% include "training_session_details" %}
+    {% include "training_session_description" %}
+  </div>
+
+  {% if training_event.sessions.size > 1 %}
+    <div class="np-card-spacing">
+      <div class="np-training-session-container">
+        <div class="np-training-session-sessions-title">
+          {% t shared.more_sessions %}
+        </div>
+        {% include "training_session_more_sessions" %}
+      </div>
+    </div>
+  {% endif %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_desktop_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_desktop_view.html.liquid
new file mode 100644
index 00000000..be9b996a
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_desktop_view.html.liquid
@@ -0,0 +1,42 @@
+<div class="np-resource-header np-resource-header-card np-card-padding-large">
+  {% include "training_session_header" %}
+</div>
+<div class="row np-training-session-row">
+  <div class="col-xs-12 col-sm-8">
+    <div class="np-card-container">
+      <div class="np-card-padding-large">
+        <div>
+          {% include "training_session_status" %}
+          {% include "training_session_date" %}
+        </div>
+        <div class="np-training-session-details">
+          {% include "training_session_details" %}
+        </div>
+      </div>
+      <div class="np-card-content-divider"></div>
+      <div class="np-card-padding-large">
+        {% include "training_session_description" %}
+      </div>
+    </div>
+  </div>
+  <div class="col-xs-12 col-sm-4 np-grid-spacing">
+    <div class="np-training-session-container">
+        <div class="np-training-session-sessions-title">
+          {% t shared.more_sessions %}
+        </div>
+        {% if training_event.sessions.size > 0 %}
+          {% include "training_event_preview_more_sessions" %}
+        {% else %}
+          <div class="np-training-session-zero-state">
+            <img
+              alt="{% t themes.default._training_event_desktop_view.empty %}"
+              class="np-zero-state-training-sessions"
+            />
+            <div class="np-training-session-zero-state-text">
+              {% t themes.default._training_event_desktop_view.empty %}
+            </div>
+          </div>
+        {% endif %}
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_mobile_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_mobile_view.html.liquid
new file mode 100644
index 00000000..84323a09
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_mobile_view.html.liquid
@@ -0,0 +1,23 @@
+<div class="np-training-session-view">
+  <div class="np-training-session-view-header">
+    {% include "training_session_header" %}
+  </div>
+
+  <div class="np-card-container np-training-session-view-details np-card-padding np-card-spacing">
+    {% include "training_session_status" %}
+    {% include "training_session_date" %}
+    {% include "training_session_details" %}
+    {% include "training_session_description" %}
+  </div>
+
+  {% if training_event.sessions.size > 0 %}
+    <div class="np-card-spacing">
+      <div class="np-training-session-container">
+        <div class="np-training-session-sessions-title">
+          {% t shared.more_sessions %}
+        </div>
+        {% include "training_event_preview_more_sessions" %}
+      </div>
+    </div>
+  {% endif %}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_more_sessions.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_more_sessions.html.liquid
new file mode 100644
index 00000000..a81c888a
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_more_sessions.html.liquid
@@ -0,0 +1,3 @@
+{% for session in training_event.sessions %}
+  {% include "training_event_preview_session_tile", current_session: training_session %}
+{% endfor %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_session_tile.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_session_tile.html.liquid
new file mode 100644
index 00000000..7a09cc33
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_event_preview_session_tile.html.liquid
@@ -0,0 +1,18 @@
+<div class="np-training-session-tile">
+  <div class="np-training-session-tile-header">
+    <i class="far fa-calendar-star np-training-session-tile-icon"></i>
+    <div class="np-training-session-tile-badge np-training-session-tile-badge-{{ session.status.type }}">
+      {{ session.status.label }}
+    </div>
+  </div>
+  <div class="np-training-session-tile-content">
+    <div>
+      <div class="np-training-session-tile-date">
+        {{ session.month }} {{ session.day }}, {{ session.year }}
+      </div>
+      <div class="np-training-session-tile-time">
+        {{ session.time_period }} {{ session.time_zone }}
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_events_dashboard.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_events_dashboard.html.liquid
new file mode 100644
index 00000000..7aeb19ce
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_events_dashboard.html.liquid
@@ -0,0 +1,9 @@
+<div class="np-dashboard-resources">
+  {% if training_events.enrolled.any? %}
+    {% for training_event in training_events.enrolled %}
+      {% include "cards_training_event" with training_event %}
+    {% endfor %}
+  {% else %}
+    {% include "training_events_zero_state" %}
+  {% endif %}
+</div>
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_events_filter.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_events_filter.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_events_filter.html.liquid
rename to Custom_Templates/customer_templates/SPS_Commerce/_training_events_filter.html.liquid
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_events_index.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_events_index.html.liquid
index 4a5c6132..ff93b1c8 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/_training_events_index.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_events_index.html.liquid
@@ -2,7 +2,7 @@
   {% if training_events.available.any? %}
     <div class="row row-with-thumbnails">
       {% for training_event in training_events.available %}
-        <div class="col-xs-12 col-sm-6 col-lg-4 event-card">
+        <div class="col-xs-12 col-sm-6 col-lg-4 np-stretch-content">
           {% include "cards_training_event" with training_event %}
         </div>
       {% endfor %}
@@ -11,31 +11,3 @@
     {% include "training_events_zero_state" %}
   {% endif %}
 </div>
-<style>
-  .event-card {
-    padding: 1rem 3rem;
-  }
-  @media screen and (max-width: 1450px) {
-    .event-card {
-      padding: 1rem 2rem;
-    }
-  }
-  @media screen and (max-width: 768px) {
-    .event-card {
-      display: flex;
-      justify-content: center;
-      padding: 0.5rem 0;
-    }
-  }
-  @media screen and (max-width: 500px) {
-    .event-card {
-      padding: 0.5rem 1rem;
-    }
-  }
-  @media screen and (max-width: 350px) {
-    .event-card {
-      padding: 0.5rem 0.5rem;
-    }
-  }
-  
-</style>
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_events_zero_state.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_events_zero_state.html.liquid
similarity index 75%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_events_zero_state.html.liquid
rename to Custom_Templates/customer_templates/SPS_Commerce/_training_events_zero_state.html.liquid
index 1ecc4d78..076b789e 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_training_events_zero_state.html.liquid	
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_events_zero_state.html.liquid
@@ -1,5 +1,5 @@
 <div class="np-dashboard-resources-container">
-  <div class="np-zero-state-text training-events">
+  <div class="np-zero-state-text">
     {% t .empty %}
   </div>
   <img
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_session_calendars.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_calendars.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_session_calendars.html.liquid
rename to Custom_Templates/customer_templates/SPS_Commerce/_training_session_calendars.html.liquid
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_session_cta.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_cta.html.liquid
new file mode 100644
index 00000000..5f959556
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_cta.html.liquid
@@ -0,0 +1,35 @@
+<div class="np-training-session-cta">
+  <div class="np-training-session-cta-buttons">
+    <form
+      action="{{ training_session.cta.url }}"
+      method="post"
+    >
+      {% form_authenticity_token %}
+
+      {% if training_session.show_calendar_links? %}
+        {% include "training_session_calendars" %}
+      {% endif %}
+
+      {% if training_session.cta.undo? %}
+        <input type="hidden" name="_method" value="delete" />
+      {% endif %}
+
+      {% if training_session.cta.label %}
+        <button
+          type="submit"
+          class="
+            np-top-button
+            np-button
+            np-button-big
+
+            {% if training_session.show_calendar_links? %}
+              np-button-secondary
+            {% endif %}
+          "
+        >
+          {{ training_session.cta.label }}
+        </button>
+      {% endif %}
+    </form>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_session_date.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_date.html.liquid
new file mode 100644
index 00000000..860040fe
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_date.html.liquid
@@ -0,0 +1,16 @@
+<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-label">
+    <div class="np-card-training-session-date-day">
+      {{ 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>
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_session_description.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_description.html.liquid
new file mode 100644
index 00000000..f8c165ba
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_description.html.liquid
@@ -0,0 +1,6 @@
+<h2 class="np-card-heading">
+  {% t .header %}
+</h2>
+<div class="np-card-text">
+  {{ training_event.description }}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_session_desktop_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_desktop_view.html.liquid
new file mode 100644
index 00000000..d689ade2
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_desktop_view.html.liquid
@@ -0,0 +1,43 @@
+<div class="np-resource-header np-resource-header-card np-card-padding-large">
+  {% include "training_session_header" %}
+</div>
+<div class="row np-training-session-row">
+  <div class="col-xs-12 col-sm-8">
+    <div class="np-card-container">
+      <div class="np-card-padding-large">
+        <div>
+          {% include "training_session_status" %}
+          {% include "training_session_date" %}
+        </div>
+        <div class="np-training-session-details">
+          {% include "training_session_details" %}
+          {% include "training_session_cta" %}
+        </div>
+      </div>
+      <div class="np-card-content-divider"></div>
+      <div class="np-card-padding-large">
+        {% include "training_session_description" %}
+      </div>
+    </div>
+  </div>
+  <div class="col-xs-12 col-sm-4 np-grid-spacing">
+    <div class="np-training-session-container">
+        <div class="np-training-session-sessions-title">
+          {% t shared.more_sessions %}
+        </div>
+        {% if training_event.sessions.size > 1 %}
+          {% include "training_session_more_sessions" %}
+        {% else %}
+          <div class="np-training-session-zero-state">
+            <img
+              alt="{% t .empty %}"
+              class="np-zero-state-training-sessions"
+            />
+            <div class="np-training-session-zero-state-text">
+              {% t .empty %}
+            </div>
+          </div>
+        {% endif %}
+    </div>
+  </div>
+</div>
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/_training_session_details.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_details.html.liquid
similarity index 70%
rename from Custom_Templates/customer_templates/Harri - McDonalds/_training_session_details.html.liquid
rename to Custom_Templates/customer_templates/SPS_Commerce/_training_session_details.html.liquid
index ae23b7ac..64a925b7 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/_training_session_details.html.liquid	
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_details.html.liquid
@@ -1,19 +1,18 @@
-<div class="np-card-spacing-large">
-  {% include "training_session_date" %}
+<div class="np-training-session-info">
 
   <div class="np-training-session-time">
     <i class="fal fa-clock np-button-color np-training-session-icon"></i>
-    {{ training_session.time_period }} {{ training_session.time_zone }}
+    <time>{{ training_session.time_period }} {{ training_session.time_zone }}</time>
   </div>
 
-  {% if training_session.location %}
+  {% if training_session.approved? and 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 %}
+  {% if training_session.approved? and 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" >
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_session_header.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_header.html.liquid
new file mode 100644
index 00000000..fdfdf380
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_header.html.liquid
@@ -0,0 +1,7 @@
+<div class="np-top-vocabulary np-text-title">
+  {% t shared.event_types, key: training_event.event_type %}
+  <i class="fal {{ training_event.event_type_icon }} np-button-color np-training-session-icon"></i>
+</div>
+<div class="np-top-title">
+  {{ training_event.title }}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_session_mobile_view.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_mobile_view.html.liquid
new file mode 100644
index 00000000..3270d65d
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_mobile_view.html.liquid
@@ -0,0 +1,27 @@
+<div class="np-training-session-view">
+  <div class="np-training-session-view-header">
+    {% include "training_session_header" %}
+  </div>
+
+  <div class="np-card-container np-training-session-view-details np-card-padding np-card-spacing">
+    {% include "training_session_status" %}
+    {% include "training_session_date" %}
+    {% include "training_session_details" %}
+    <div class="np-card-padding-large">
+      {% include "training_session_cta" %}
+    </div>
+    {% include "training_session_description" %}
+  </div>
+
+  {% if training_event.sessions.size > 1 %}
+    <div class="np-card-spacing">
+      <div class="np-training-session-container">
+        <div class="np-training-session-sessions-title">
+          {% t shared.more_sessions %}
+        </div>
+        {% include "training_session_more_sessions" %}
+      </div>
+    </div>
+  {% endif %}
+
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_session_more_sessions.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_more_sessions.html.liquid
new file mode 100644
index 00000000..6cfafa87
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_more_sessions.html.liquid
@@ -0,0 +1,3 @@
+{% for session in training_event.sessions %}
+  {% include "training_session_tile", current_session: training_session %}
+{% endfor %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_session_status.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_status.html.liquid
new file mode 100644
index 00000000..75116282
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_status.html.liquid
@@ -0,0 +1,6 @@
+<div class="np-training-session-cta-note np-training-session-tile-badge np-training-session-tile-badge-{{ training_session.status.type }}">
+    {% if training_session.approved? %}
+        <i class="far fa-check np-training-session-icon"></i>
+    {% endif %}
+    {{ training_session.status.label }}
+</div>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/_training_session_tile.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_tile.html.liquid
new file mode 100644
index 00000000..669fbb6c
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/_training_session_tile.html.liquid
@@ -0,0 +1,24 @@
+{% if current_session.id != session.id %}
+  <a
+    class="np-training-session-tile"
+    href="{% route training_session, id: session.id %}"
+  >
+    <div class="np-training-session-tile-header">
+        <i class="far fa-calendar-star np-training-session-tile-icon"></i>
+        <div class="np-training-session-tile-badge np-training-session-tile-badge-{{ session.status.type }}">
+            {{ session.status.label }}
+        </div>
+    </div>
+    <div class="np-training-session-tile-content">
+      <div>
+          <div class="np-training-session-tile-date">
+              {{ session.month }} {{ session.day }}, {{ session.year }}
+          </div>
+          <div class="np-training-session-tile-time">
+              {{ session.time_period }} {{ session.time_zone }}
+          </div>
+      </div>
+      <i class="fas fa-arrow-right np-training-session-tile-chevron"></i>
+    </div>
+  </a>
+{% endif %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/account.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/account.html.liquid
new file mode 100644
index 00000000..df96f9b6
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/account.html.liquid
@@ -0,0 +1,15 @@
+{% include "header" %}
+{% include "account_tabs" %}
+
+<main class="np-main np-subpage-container np-account">
+  <div class="np-hidden-desktop">
+    {% include "account_mobile_view", form: form %}
+  </div>
+
+  <div class="np-hidden-mobile np-flex np-flex-center">
+    {% include "account_desktop_view", form: form %}
+  </div>
+</main>
+
+{% include "footer" %}
+
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/auth_url_email.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/auth_url_email.html.liquid
new file mode 100644
index 00000000..a413959c
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/auth_url_email.html.liquid
@@ -0,0 +1,59 @@
+<main class="np-box-container np-open-access">
+  <div class="np-box">
+    {% include "header_minimal" %}
+    <div class="np-box-content-container">
+      <form class="np-form np-box-content" action="{{ form.url }}" method="get" novalidate>
+        {% form_authenticity_token %}
+        <div class="np-form-headline">
+          {% t shared.welcome_to_school, school_name: current_school.name %}
+        </div>
+        <div class="np-form-subheadline">
+          {% t .headline, key: current_school.course_vocabulary %}
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_first_name">
+            {% t shared.first_name %}
+          </label>
+          <input
+            class="np-input"
+            autofocus="autofocus"
+            type="text"
+            name="first_name"
+            id="learner_first_name"
+            value="{{ form.first_name }}"
+          />
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_last_name">
+            {% t shared.last_name %}
+          </label>
+          <input
+            class="np-input"
+            type="text"
+            name="last_name"
+            id="learner_last_name"
+            value="{{ form.last_name }}"
+          />
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_email">
+            {% t shared.email_address %}
+          </label>
+          <input
+            class="np-input"
+            type="text"
+            name="email"
+            id="learner_email"
+            value="{{ form.email }}"
+          />
+        </div>
+        <input
+          type="submit"
+          name="commit"
+          value="{% t shared.enter %}"
+          class="np-button np-button-big np-form-action"
+        />
+      </form>
+    </div>
+  </div>
+</main>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/auth_url_employee.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/auth_url_employee.html.liquid
new file mode 100644
index 00000000..c8d8adf7
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/auth_url_employee.html.liquid
@@ -0,0 +1,59 @@
+<main class="np-box-container np-open-access">
+  <div class="np-box">
+    {% include "header_minimal" %}
+    <div class="np-box-content-container">
+      <form class="np-form np-box-content" action="{{ form.url }}" method="get" novalidate>
+        {% form_authenticity_token %}
+        <div class="np-form-headline">
+          {% t shared.welcome_to_school, school_name: current_school.name %}
+        </div>
+        <div class="np-form-subheadline">
+          {% t .headline, key: current_school.course_vocabulary %}
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_employee_id">
+            {% t shared.employee_id %}
+          </label>
+          <input
+            class="np-input"
+            autofocus="autofocus"
+            type="text"
+            name="employee_id"
+            id="learner_employee_id"
+            value="{{ form.employee_id }}"
+          />
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_first_name">
+            {% t shared.first_name %}
+          </label>
+          <input
+            class="np-input"
+            type="text"
+            name="first_name"
+            id="learner_first_name"
+            value="{{ form.first_name }}"
+          />
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_last_name">
+            {% t shared.last_name %}
+          </label>
+          <input
+            class="np-input"
+            type="text"
+            name="last_name"
+            id="learner_last_name"
+            value="{{ form.last_name }}"
+          />
+        </div>
+        <input
+          type="submit"
+          name="commit"
+          value="{% t shared.enter %}"
+          class="np-button np-button-big np-form-action"
+        />
+      </form>
+    </div>
+  </div>
+</main>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/auth_url_phone_number.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/auth_url_phone_number.html.liquid
new file mode 100644
index 00000000..aafae119
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/auth_url_phone_number.html.liquid
@@ -0,0 +1,40 @@
+<main class="np-box-container np-open-access">
+  <div class="np-box">
+    {% include "header_minimal" %}
+    <div class="np-box-content-container">
+      <form class="np-form np-box-content" action="{{ form.url }}" method="get" novalidate>
+        <div class="np-form-headline"> {% t shared.welcome_to_school, school_name: current_school.name %} </div>
+        <div class="np-form-subheadline"> {% t .headline, key: current_school.course_vocabulary %} </div>
+        {% form_authenticity_token %}
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_last_name">
+            {% t shared.last_name %}
+          </label>
+          <input
+            class="np-input"
+            autofocus="autofocus"
+            type="text"
+            name="last_name"
+            id="learner_last_name"
+            value="{{ form.last_name }}"
+          />
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_phone_number">
+            {% t shared.phone_number %}
+          </label>
+          <input
+            class="np-input"
+            type="text"
+            name="phone_number"
+            id="learner_phone_number"
+            value="{{ form.phone_number }}"
+          />
+        </div>
+        <button type="submit" class="np-button np-button-big np-form-action">
+          {% t shared.enter %}
+        </button>
+      </form>
+    </div>
+  </div>
+</main>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/auth_url_terms.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/auth_url_terms.html.liquid
new file mode 100644
index 00000000..a7087db2
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/auth_url_terms.html.liquid
@@ -0,0 +1,74 @@
+<main class="np-box-container np-open-access">
+  <div class="np-box">
+    {% include "header_minimal" %}
+    <div class="np-box-content-container">
+      <form class="np-form np-box-content" action="{{ form.url }}" method="get" novalidate>
+        <div class="np-form-headline"> {% t shared.welcome_to_school, school_name: current_school.name %} </div>
+        <div class="np-form-subheadline"> {% t .headline, key: current_school.course_vocabulary %} </div>
+        {% form_authenticity_token %}
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_email">
+            {% t shared.email_address %}
+          </label>
+          <input
+            class="np-input"
+            autofocus="autofocus"
+            type="email"
+            name="email"
+            id="learner_email"
+            value="{{ form.email }}"
+          />
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_first_name">
+            {% t shared.first_name %}
+          </label>
+          <input
+            class="np-input"
+            type="text"
+            name="first_name"
+            id="learner_first_name"
+            value="{{ form.first_name }}"
+          />
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_last_name">
+            {% t shared.last_name %}
+          </label>
+          <input
+            class="np-input"
+            type="text"
+            name="last_name"
+            id="learner_last_name"
+            value="{{ form.last_name }}"
+          />
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_phone_number">
+            {% t shared.phone_number_optional %}
+          </label>
+          <input
+            class="np-input"
+            type="text"
+            name="phone_number"
+            id="learner_phone_number"
+            value="{{ form.phone_number }}"
+          />
+        </div>
+        <div class="np-form-field np-open-access-terms">
+          <input type="hidden" name="terms" value="0" />
+          <input id="terms" type="checkbox" name="terms" value="1" />
+          <label for="terms" class="np-open-access-terms-checkbox">
+            {{ current_school.custom_terms }}
+          </label>
+        </div>
+        <input
+          type="submit"
+          name="commit"
+          value="{% t shared.enter %}"
+          class="np-button np-button-big np-form-action"
+        />
+      </form>
+    </div>
+  </div>
+</main>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/bundle_product.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/bundle_product.html.liquid
new file mode 100644
index 00000000..734327e5
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/bundle_product.html.liquid
@@ -0,0 +1,10 @@
+{% include "header" %}
+<main class="np-main np-max-width np-page-container">
+  <div class="np-hidden-mobile">
+    {% include "bundle_product_desktop_view" %}
+  </div>
+  <div class="np-hidden-desktop">
+    {% include "bundle_product_mobile_view" %}
+  </div>
+</main>
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/catalog.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/catalog.html.liquid
index cb7a3bbb..d7b380b8 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/catalog.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/catalog.html.liquid
@@ -1,7 +1,7 @@
 {% include "header" %}
 {% include "course_version_outdated_alert", courses: courses.in_catalog %}
 {% include "sub_navigation" %}
-<main class="np-main np-dashboard np-subpage-container np-max-width">
+<main class="np-main np-catalog np-subpage-container np-max-width">
   <div class="np-catalog-header-wrapper">
     <div class="np-catalog-header">
       <div class="np-resource-title">{{ catalog.headline }}</div>
@@ -21,14 +21,3 @@
   {% include "courses_catalog" %}
 </main>
 {% include "footer" %}
-
-<style>
-  .np-dashboard {
-    background: white;
-  }
-  @media screen and (min-width: 768px) {
-    .np-grid-spacing {
-    padding-left: 3%;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/commerce_cart.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/commerce_cart.html.liquid
new file mode 100644
index 00000000..2f75af33
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/commerce_cart.html.liquid
@@ -0,0 +1,7 @@
+{% include "header" %}
+
+<main class="np-commerce-cart-page np-main np-page-container np-max-width">
+  {% commerce_cart %}
+</main>
+
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/commerce_catalog.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/commerce_catalog.html.liquid
new file mode 100644
index 00000000..94d32dfa
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/commerce_catalog.html.liquid
@@ -0,0 +1,28 @@
+{% include "header" %}
+{% include "course_version_outdated_alert", courses: courses.in_catalog %}
+{% include "sub_navigation" %}
+<main class="np-main np-catalog np-subpage-container np-max-width">
+  <div class="np-catalog-header-wrapper">
+    <div class="np-catalog-header">
+      <h2 class="np-resource-title">{{ catalog.headline }}</h2>
+      <p class="np-resource-subtitle">{{ catalog.subheadline }}</p>
+    </div>
+  </div>
+  {% if catalog.any? %}
+    <div class="np-catalog-courses row row-with-thumbnails">
+      {% for item in catalog.items %}
+        <div class="col-xs-12 col-md-6 col-lg-4 np-stretch-content">
+          {% include "cards_catalog_item" with item %}
+        </div>
+      {% endfor %}
+    </div>
+  {% else %}
+    {% capture message %}
+      {% t shared.zero_state.courses.catalog,
+        key: current_school.course_vocabulary
+      %}
+    {% endcapture %}
+    {% include "courses_zero_state", message: message %}
+  {% endif %}
+</main>
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/commerce_checkout.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/commerce_checkout.html.liquid
new file mode 100644
index 00000000..96d540b6
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/commerce_checkout.html.liquid
@@ -0,0 +1,7 @@
+{% include "header" %}
+
+<main class="np-commerce-checkout-page np-main np-page-container np-max-width">
+  {% commerce_checkout %}
+</main>
+
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/commerce_order_details.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/commerce_order_details.html.liquid
new file mode 100644
index 00000000..a12b7245
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/commerce_order_details.html.liquid
@@ -0,0 +1,7 @@
+{% include "header" %}
+
+<main class="np-main np-subpage-container np-commerce-order-details-page">
+  {% commerce_order_details %}
+</main>
+
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/commerce_order_history.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/commerce_order_history.html.liquid
new file mode 100644
index 00000000..031f5eac
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/commerce_order_history.html.liquid
@@ -0,0 +1,8 @@
+{% include "header" %}
+{% include "account_tabs" %}
+
+<main class="np-main np-subpage-container np-commerce-order-history-page">
+  {% commerce_order_history %}
+</main>
+
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/commerce_redeem.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/commerce_redeem.html.liquid
new file mode 100644
index 00000000..58260bac
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/commerce_redeem.html.liquid
@@ -0,0 +1,7 @@
+{% include "header" %}
+
+<main class="np-commerce-redeem-page np-main np-page-container np-max-width">
+  {% commerce_redeem %}
+</main>
+
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/commerce_return.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/commerce_return.html.liquid
new file mode 100644
index 00000000..e8ea847b
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/commerce_return.html.liquid
@@ -0,0 +1,7 @@
+{% include "header" %}
+
+<main class="np-commerce-return-page np-main np-page-container np-max-width">
+  {% commerce_return %}
+</main>
+
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/course.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/course.html.liquid
index f052eb18..d77e09ba 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/course.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/course.html.liquid
@@ -1,4 +1,4 @@
-{% include "header_minimal" %}
+{% include "header" %}
 <main class="np-main np-max-width np-page-container">
   <div class="np-hidden-mobile" id="course-desktop">
     {% include "course_desktop_view" %}
@@ -7,54 +7,4 @@
     {% include "course_mobile_view" %}
   </div>
 </main>
-
-<style>
-  body {
-    background-image: url(https://s3.amazonaws.com/static.northpass.com/SPS/sps-background.gif);
-  }
-  .np-card-padding-large {
-    box-shadow: none;
-  }
-  .np-card-container,
-  .np-card-container-training-session {
-    border-radius: 4px;
-    box-shadow: none;
-    position: relative;
-  }
-  .np-learning-path-outline-icon {
-    align-self: center;
-    font-size: 40px;
-    color: #9b4b87;
-  }
-  .np-box-header {
-    height: 80px;
-  }
-  .np-powered-by {
-    background: none;
-  }
-  .np-card-container, .np-card-container-training-session {
-    background: none;
-  }
-  .np-top-cta {
-    background: rgba(229, 233, 235, 0.5);
-  }
-  .np-card-text {
-    background: rgba(255, 255, 255, 0.5);
-  }
-  .np-course-outline {
-    background: rgba(255, 255, 255, 0.5);
-  }
-  @media screen and (max-width: 835px) {
-    .col-sm-6 {
-      max-width: 45%;
-    }
-    .np-card-padding, .np-card-padding-dynamic {
-      padding-left: 0;
-    }
-  }
-  @media screen and (max-width: 765px) {
-    .np-box-header {
-      height: 60px;
-    }
-  }
-</style>
\ No newline at end of file
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/course.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/course_product.html.liquid
similarity index 70%
rename from Custom_Templates/customer_templates/Harri - McDonalds/course.html.liquid
rename to Custom_Templates/customer_templates/SPS_Commerce/course_product.html.liquid
index d77e09ba..05e06883 100644
--- a/Custom_Templates/customer_templates/Harri - McDonalds/course.html.liquid	
+++ b/Custom_Templates/customer_templates/SPS_Commerce/course_product.html.liquid
@@ -1,10 +1,10 @@
 {% include "header" %}
 <main class="np-main np-max-width np-page-container">
   <div class="np-hidden-mobile" id="course-desktop">
-    {% include "course_desktop_view" %}
+    {% include "course_product_desktop_view" %}
   </div>
   <div class="np-hidden-desktop" id="course-mobile">
-    {% include "course_mobile_view" %}
+    {% include "course_product_mobile_view" %}
   </div>
 </main>
 {% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/courses.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/courses.html.liquid
new file mode 100644
index 00000000..ef34b59a
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/courses.html.liquid
@@ -0,0 +1,11 @@
+{% include "header" %}
+{% include "course_version_outdated_alert", courses: courses.enrolled %}
+{% include "sub_navigation" %}
+<main class="np-main np-courses np-subpage-container np-max-width">
+  <div class="np-resource-title">
+    {% t shared.course_vocabulary.plural, key: current_school.course_vocabulary %}
+  </div>
+  <div class="np-resource-subtitle">{% t .headline, key: current_school.course_vocabulary %}</div>
+  {% include "courses_index", class: "col-xs-12 col-sm-6 col-lg-4 np-stretch-content" %}
+</main>
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/dashboard.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/dashboard.html.liquid
index a9d761d1..804119eb 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/dashboard.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/dashboard.html.liquid
@@ -1,291 +1,3 @@
-{% include "header" %}
-{% include "course_version_outdated_alert", courses: courses.enrolled %}
-{% include "sub_navigation" %}
-<main class="np-main np-dashboard np-subpage-container np-max-width">
-  <div class="row np-flex-center">
-    <div class='my-webinars'>
-      <div class='section-title'>
-        My Webinars
-      </div>
-      {% if training_events.enrolled and training_events.enrolled.size > 0 %}
-        {% for training_event in training_events.enrolled %}
-          {% for session in training_event.sessions %}
-            {% if session.registered? %}
-              <div class='dashboard-event'>
-                On {{ session.month }} {{ session.day }} at {{ session.starts }} {{ session.time_zone }} is your {{ session.title }} event that is being held online 
-                <a href='{{ session.session_url }}' class='dashboard-event-link'>Join</a>
-              </div>
-            {% endif %}
-          {% endfor %}
-        {% endfor %}
-      {% else %}
-        <div class='section-none-text'>
-          You haven't registered for any webinars yet. 
-        </div>
-        <button class='section-none-button'>
-          <a class="section-none-link" href="/app/training_events">
-            Discover Webinars
-          </a>
-        </button>
-      {% endif %}
-    </div>
-    <div class='my-paths'>
-      <div class='section-title'>
-        My Paths
-      </div>
-      <div class='section-subtitle'>
-        Learning Paths in which you're currently enrolled
-      </div>
-      {% if learning_paths.enrolled and learning_paths.enrolled.size > 0 %}
-        <div class='section-content'>
-          <div class='filter-section'>
-            <div class='filter-title'>Filter by:</div>
-            {% assign lp_categories = '' | split: '' %}
-            {% for lp in learning_paths.enrolled %}
-              {% for cat in lp.categories %}
-                {% assign cat_name = cat.name | split: '!@#$%^&*()' %}
-                {% assign lp_categories = lp_categories | concat: cat_name %}
-              {% endfor %}
-            {% endfor %}
-            {% assign lp_categories = lp_categories | uniq %}
-              <div class='filter-element filter-element-selected' filter-type='lp' category-name='none'>
-                All
-              </div>
-            {% for cat in lp_categories %}
-              <div class='filter-element' filter-type='lp' category-name='{{cat}}'>
-                {{cat}}
-              </div>
-            {% endfor %}
-          </div>
-          <div class='tiles-section'>
-            {% for learning_path in learning_paths.enrolled %}
-              {% include 'cards_learning_path_new' with learning_path %}
-            {% endfor %}
-          </div>
-        </div>
-      {% else %}
-        <div class='section-none-text'>
-          You haven't enrolled into any learning_paths yet. 
-        </div>
-        <button class='section-none-button'>
-          <a class="section-none-link" href="/app/learning_paths">
-            Discover Paths
-          </a>
-        </button>
-      {% endif %}
-    </div>
-    <div class='my-courses'>
-      <div class='section-title'>
-        My Courses
-      </div>
-      <div class='section-subtitle'>
-        Courses in which you're currently enrolled
-      </div>
-      {% if courses.enrolled and courses.enrolled.size > 0 %}
-      <div class='section-content'>
-        <div class='filter-section'>
-          <div class='filter-title'>Filter by:</div>
-          {% assign lp_categories = '' | split: '' %}
-          {% for lp in courses.enrolled %}
-            {% for cat in lp.categories %}
-              {% assign cat_name = cat.name | split: '!@#$%^&*()' %}
-              {% assign lp_categories = lp_categories | concat: cat_name %}
-            {% endfor %}
-          {% endfor %}
-          {% assign lp_categories = lp_categories | uniq %}
-            <div class='filter-element filter-element-selected' filter-type='co' category-name='none'>
-              All
-            </div>
-          {% for cat in lp_categories %}
-            <div class='filter-element' filter-type='co' category-name='{{cat}}'>
-              {{cat}}
-            </div>
-          {% endfor %}
-        </div>
-        <div class='tiles-section'>
-          {% for course in courses.enrolled %}
-            {% include 'cards_course_new' with course %}
-          {% endfor %}
-        </div>
-      </div>
-      {% else %}
-        <div class='section-none-text'>
-          You haven't enrolled into any courses yet. 
-        </div>
-        <button class='section-none-button'>
-          <a class="section-none-link" href="/app/catalog">
-            Discover Courses
-          </a>
-        </button>
-      {% endif %}
-    </div>
-  </div>
-</main>
-{% include "footer" %}
-
-<style>
-  .np-dashboard {
-    background: white;
-  }
-  .row {
-    flex-direction: column;
-    margin-right: -1rem;
-    margin-left: -1rem;
-    display: inline-block;
-  }
-  .tiles-section {
-    display: flex;
-    width: 100%;
-    flex-wrap: wrap;
-  }
-  .section-content {
-    display: flex;
-    flex-direction: row;
-    border-top: 1px solid #ededed !important;
-    padding: 1rem 0;
-  }
-  .section-title {
-    margin-top: 30px;
-    font-size: 24px;
-    font-weight: 600;
-    line-height: 30px;
-    margin-bottom: 15px;
-    color: #444;
-  }
-  .section-subtitle {
-    font-size: 20px;
-    font-weight: 600;
-    line-height: 24px;
-    margin-bottom: 45px;
-    color: #444;
-  }
-  .section-none-text {
-    margin-bottom: 15px;
-    color: #606060;
-    font-size: 16px;
-  }
-  .section-none-button {
-    background: #9b4b87;
-    color: white;
-    padding: 0 20px;
-    text-align: center;
-    margin: auto;
-    font-size: 16px;
-    border: none;
-    border-radius: 2px;
-    cursor: pointer;
-    min-height: 30px;
-    line-height: 39px;
-    margin: 10px 0
-  }
-  .section-none-button:hover {
-    background: #4b2346 !important;
-  }
-  .section-none-link {
-    color: white;
-    text-decoration: none;
-  }
-  .section-none-link:hover {
-    color: white;
-  }
-  .dashboard-event {
-    padding: 10px 0;
-    display: flex;
-    justify-content: space-between;
-  }
-  .dashboard-event-link {
-    color: #9b4b87;
-    margin-left: 15px;
-    text-decoration: none;
-  }
-  .dashboard-event-link:hover {
-    color: #4b2346;
-  }
-  .filter-section {
-    width: 25%;
-  }
-  .filter-element {
-    color: #9b4b87;
-    font-size: 18px;
-    margin-top: 8px;
-    cursor: pointer;
-  }
-  .filter-element:hover {
-    color: #4b2346;
-  }
-  .filter-element-selected {
-    font-weight: 700;
-  }  
-  .filter-title {
-    font-size: 20px;
-    font-weight: 600;
-  }
-  @media (min-width:1200px) and (max-width:1640px) {
-    .row .np-card {
-      padding: 0 1rem 2rem;
-    }
-  }
-  @media (min-width:768px) and (max-width:1200px) {
-    .row .np-card {
-      padding: 0 0.7rem 1.4rem;
-    }
-  }
-  @media screen and (max-width: 1400px) {
-    .filter-section {
-      width: 20%;
-    }
-  }
-  @media screen and (max-width: 768px) {
-    .section-content {
-      flex-direction: column;
-    }
-    .filter-section {
-      width: 100%;
-      margin-bottom: 15px;
-    }
-  }
-  .np-subpage-container {
-    padding:20px 4% 40px;
-  }
-  .my-webinars {
-    padding: 1rem;
-    border-top: 1px solid #ededed !important;
-  }
-  .my-paths {
-    padding: 1rem;
-    border-top: 1px solid #ededed !important;
-  }
-  .my-courses {
-    padding: 1rem;
-    border-top: 1px solid #ededed !important;
-  }
-</style>
-
-
 <script>
-  $('[filter-type]').each(function(x){
-    $(this).attr('category-name', $(this).attr('category-name').replaceAll(' ', '').replaceAll('+', ' '))
-  })
-  $('.filter-element[filter-type="co"]').click(function(){
-    $('.filter-element[filter-type="co"]').removeClass('filter-element-selected');
-    $(this).toggleClass('filter-element-selected');
-    if($(this).attr('category-name')=='none') {
-      $('.np-card[filter-type="co"]').show()
-    }
-    else {
-      $('.np-card[filter-type="co"]').hide();
-      $('.np-card[category-name~='+$(this).attr('category-name')+'][filter-type="co"]').show()
-    }
-  })
-  $('.filter-element[filter-type="lp"]').click(function(){
-    $('.filter-element[filter-type="lp"]').removeClass('filter-element-selected');
-    $(this).toggleClass('filter-element-selected');
-    if($(this).attr('category-name')=='none') {
-      $('.np-card[filter-type="lp"]').show()
-    }
-    else {
-      $('.np-card[filter-type="lp"]').hide();
-      $('.np-card[category-name~='+$(this).attr('category-name')+'][filter-type="lp"]').show()
-    }
-  })
+  window.location.replace('/app');
 </script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/forgot_password.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/forgot_password.html.liquid
new file mode 100644
index 00000000..3d65513f
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/forgot_password.html.liquid
@@ -0,0 +1,25 @@
+<main class="np-box-container">
+  <div class="np-box">
+    {% include "header_minimal" %}
+    <div class="np-box-content-container">
+      <form class="np-form np-box-content" action="{% route forgot_password_create %}" method="post" novalidate>
+        {% form_authenticity_token %}
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_email">
+            {% t shared.email_address %}
+          </label>
+          <input
+            autofocus="autofocus"
+            class="np-input"
+            id="learner_email"
+            name="learner[email]"
+            type="email"
+          >
+        </div>
+        <button type="submit" class="np-button np-button-big np-button-large-font np-form-action">
+          {% t .button_label %}
+        </button>
+      </form>
+    </div>
+  </div>
+</main>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/homepage.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/homepage.html.liquid
index 9e22bed6..47e2c79a 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/homepage.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/homepage.html.liquid
@@ -1,3 +1,136 @@
+{% include "header" %}
+{% include "course_version_outdated_alert", courses: courses.enrolled %}
+{% include "sub_navigation" %}
+<main class="np-main np-dashboard np-subpage-container np-max-width">
+  <div class="row np-flex-center">
+    <div class="dashboard-content-container">
+      <div class="homepage-content-wrapper">
+        <div class="cards-section-container">
+          {% include 'lp_homepage' %}
+        </div>
+        <div class="events-homepage-container">
+          <div class="section-text-container">
+            <div class="dashboard-resources-title">
+              My Webinars
+            </div>
+          </div>
+              {% include "training_events_dashboard" %}
+        </div>
+      </div>
+      {% include 'courses_homepage' %}
+    </div>
+  </div>
+</main>
+{% include "footer" %}
+
+<style>
+  .homepage-content-wrapper {
+  display: flex;
+  gap: 30px;
+}
+.events-homepage-container {
+  width: 25%;
+}
+.cards-section-container {
+  width: 75%;
+}
+.filter-container {
+  width: 25%;
+  background: #fff;
+  padding: 20px;
+  box-shadow: 0 2px 4px 0 rgba(72,103,118,.5);
+  border-radius: 8px;
+}
+.content-container {
+  display: flex;
+  margin-bottom: 30px;
+  gap: 30px;
+}
+.cards-wrapper {
+  width: 75%;
+}
+.filter-options-wrapper {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+.filter-option-container {
+  border-bottom: 1px solid #0000002e;
+  padding-bottom: 10px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+.filter-title {
+  padding-bottom: 20px;
+  font-size: 20px;
+  font-weight: 700;
+}
+.input-checkbox {
+  width: 20px;
+  height: 20px;
+}
+.dashboard-content-container {
+  width: 100%;
+}
+.dashboard-resources-title {
+  font-size: 20px;
+  font-weight: 500;
+}
+.dashboard-resources-subtitle {
+  font-weight: 400;
+}
+.section-text-container {
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+  margin: 30px 0;
+}
+.input-label {
+  width: 100%;
+}
+</style>
+
 <script>
-  window.location.replace("/app/dashboard")
+  document.addEventListener("DOMContentLoaded", function () {
+    function setupFilters(filterClass, cardClass) {
+        const filters = document.querySelectorAll(`.${filterClass} .input-checkbox`);
+        const allFilter = document.querySelector(`.${filterClass} .input-checkbox[name="all"]`);
+        const cards = document.querySelectorAll(`.${cardClass}`);
+
+        function filterCards() {
+            let selectedFilters = Array.from(filters)
+                .filter(f => f.checked && f.name !== "all")
+                .map(f => f.name.toLowerCase());
+
+            if (selectedFilters.length === 0) {
+                cards.forEach(card => card.style.display = "block");
+                return;
+            }
+
+            cards.forEach(card => {
+                let cardCategories = card.getAttribute("categories").toLowerCase().split(",");
+                let match = selectedFilters.some(filter => cardCategories.includes(filter));
+                card.style.display = match ? "block" : "none";
+            });
+        }
+
+        filters.forEach(filter => {
+            filter.addEventListener("change", function () {
+                if (this.name === "all") {
+                    filters.forEach(f => { if (f !== allFilter) f.checked = false; });
+                } else {
+                    allFilter.checked = false; 
+                }
+                filterCards();
+            });
+        });
+
+        filterCards();
+    }
+
+
+    setupFilters("lp-filter", "lp-card");
+    setupFilters("course-filter", "course-card");
+});
 </script>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/learning_path.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/learning_path.html.liquid
index 7e12704c..5cbb5a93 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/learning_path.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/learning_path.html.liquid
@@ -1,4 +1,4 @@
-{% include "header_minimal" %}
+{% include "header" %}
 <main class="np-main np-max-width np-page-container">
   <div class="np-hidden-mobile" id="learning-path-desktop">
     {% include "learning_path_desktop_view" %}
@@ -7,44 +7,4 @@
     {% include "learning_path_mobile_view" %}
   </div>
 </main>
-
-<style>
-  body {
-    background-image: url(https://s3.amazonaws.com/static.northpass.com/SPS/sps-background.gif);
-  }
-  .np-card-padding-large {
-    background: rgba(255, 255, 255, 0.5);
-    box-shadow: none;
-  }
-  .np-card-container,
-  .np-card-container-training-session {
-    background: rgba(255, 255, 255, 0.5);
-    border-radius: 4px;
-    box-shadow: none;
-    position: relative;
-  }
-  .np-learning-path-outline-icon {
-    align-self: center;
-    font-size: 40px;
-    color: #9b4b87;
-  }
-  .np-box-header {
-    height: 80px;
-  }
-  .np-powered-by {
-    background: none;
-  }
-  @media screen and (max-width: 835px) {
-    .col-sm-6 {
-      max-width: 45%;
-    }
-    .np-card-padding, .np-card-padding-dynamic {
-      padding-left: 0;
-    }
-  }
-  @media screen and (max-width: 765px) {
-    .np-box-header {
-      height: 60px;
-    }
-  }
-</style>
\ No newline at end of file
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/learning_path_product.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/learning_path_product.html.liquid
new file mode 100644
index 00000000..3d613e2a
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/learning_path_product.html.liquid
@@ -0,0 +1,10 @@
+{% include "header" %}
+<main class="np-main np-max-width np-page-container">
+  <div class="np-hidden-mobile" id="learning-path-desktop">
+    {% include "learning_path_product_desktop_view" %}
+  </div>
+  <div class="np-hidden-desktop" id="learning-path-mobile">
+    {% include "learning_path_product_mobile_view" %}
+  </div>
+</main>
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/learning_path_summary.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/learning_path_summary.html.liquid
new file mode 100644
index 00000000..99ae32ed
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/learning_path_summary.html.liquid
@@ -0,0 +1,10 @@
+{% include "header" %}
+<main class="np-main np-max-width np-page-container">
+  <div class="np-hidden-mobile" id="learning-path-desktop">
+    {% include "learning_path_summary_desktop_view" %}
+  </div>
+  <div class="np-hidden-desktop" id="learning-path-mobile">
+    {% include "learning_path_summary_mobile_view" %}
+  </div>
+</main>
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/learning_paths.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/learning_paths.html.liquid
index 58203d14..e6e10cba 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/learning_paths.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/learning_paths.html.liquid
@@ -1,23 +1,14 @@
 {% include "header" %}
 {% include "sub_navigation" %}
-<main class="np-main np-dashboard np-subpage-container np-max-width">
-  <div class="np-catalog-header-wrapper">
-    <div class="np-catalog-header">
-      <div class="np-resource-title">{% t shared.learning_paths %}</div>
-      <div class="np-resource-subtitle">{% t .subtitle %}</div>
+<main class="np-main np-learning-paths np-subpage-container np-max-width">
+  <div class="np-learning-paths-main">
+    <div class="np-resource-title">
+      {% t shared.learning_paths %}
     </div>
+    <div class="np-resource-subtitle">
+      {% t .subtitle %}
+    </div>
+    {% include "learning_paths_index", items: learning_paths.available %}
   </div>
-  {% include "learning_paths_index" %}
 </main>
 {% include "footer" %}
-
-<style>
-  .np-dashboard {
-    background: white;
-  }
-  @media screen and (min-width: 768px) {
-    .np-grid-spacing {
-    padding-left: 3%;
-    }
-  }
-</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/login.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/login.html.liquid
new file mode 100644
index 00000000..bde185dd
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/login.html.liquid
@@ -0,0 +1,53 @@
+<main class="np-main np-box-container">
+  <div class="np-box">
+    {% include "header_minimal" %}
+    <div class="np-box-content-container">
+      <form class="np-form np-box-content" action="{% route login %}" method="post" novalidate>
+        {% form_authenticity_token %}
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_email">
+            {% t shared.email_address %}
+          </label>
+          <input
+            class="np-input"
+            autofocus="autofocus"
+            type="email"
+            name="learner[email]"
+            id="learner_email"
+          >
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_password">
+            {% t shared.password %}
+          </label>
+          <input
+            class="np-input"
+            type="password"
+            name="learner[password]"
+            id="learner_password"
+          >
+        </div>
+        <button type="submit" class="np-button np-button-big np-button-large-font np-form-action">
+          {% t shared.sign_in %}
+        </button>
+        <a class="np-form-link np-button-color" href="{% route forgot_password_new %}">
+          {% t .forgot_password %}
+        </a>
+        {% if features.account_creation? %}
+          <a class="np-form-link np-button-color" href="{% route sign_up %}">
+            {% t shared.sign_up %}
+          </a>
+        {% endif %}
+        {% if features.request_access? %}
+          <a
+            class="np-form-link np-button-color"
+            target="_blank"
+            href="{{ current_school.request_access_link }}"
+          >
+            {{ current_school.request_access_label }}
+          </a>
+        {% endif %}
+      </form>
+    </div>
+  </div>
+</main>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/master.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/master.html.liquid
new file mode 100644
index 00000000..63345068
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/master.html.liquid
@@ -0,0 +1 @@
+{% body %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/not_found.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/not_found.html.liquid
new file mode 100644
index 00000000..91c76e4b
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/not_found.html.liquid
@@ -0,0 +1,10 @@
+<main class="np-main np-max-width np-subpage-container">
+  <div class="np-homepage-featured-text">
+    <div class="np-homepage-headline">
+      {% t .header %}
+    </div>
+  </div>
+  <div class="np-homepage-featured-empty">
+    <img src="/images/404.svg">
+  </div>
+</main>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/private_certificate.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/private_certificate.html.liquid
new file mode 100644
index 00000000..15d05419
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/private_certificate.html.liquid
@@ -0,0 +1,10 @@
+{% include "header" %}
+{% include "certificates_top_bar" %}
+<main class="np-main np-certificate np-max-width np-page-container clear-main-spacings">
+  <section class="np-certificate-content-spacing">
+    <div class="row">
+      {% include "certificates_preview" %}
+      {% include "certificates_info_column" %}
+    </div>
+  </section>
+</main>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/public_certificate.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/public_certificate.html.liquid
new file mode 100644
index 00000000..15d05419
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/public_certificate.html.liquid
@@ -0,0 +1,10 @@
+{% include "header" %}
+{% include "certificates_top_bar" %}
+<main class="np-main np-certificate np-max-width np-page-container clear-main-spacings">
+  <section class="np-certificate-content-spacing">
+    <div class="row">
+      {% include "certificates_preview" %}
+      {% include "certificates_info_column" %}
+    </div>
+  </section>
+</main>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/reset_password.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/reset_password.html.liquid
new file mode 100644
index 00000000..281c6eaa
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/reset_password.html.liquid
@@ -0,0 +1,43 @@
+<main class="np-box-container">
+  <div class="np-box">
+    {% include "header_minimal" %}
+    <div class="np-box-content-container">
+      <form class="np-form np-box-content" method="post" action="{% route forgot_password_create %}">
+        <input type="hidden" name="_method" value="put">
+        <input
+          type="hidden"
+          value="{{ reset_password_token }}"
+          name="learner[reset_password_token]"
+          id="learner_reset_password_token"
+        >
+        {% form_authenticity_token %}
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_password">
+            {% t .new_password %}
+          </label>
+          <input
+            class="np-input"
+            autofocus="autofocus"
+            type="password"
+            name="learner[password]"
+            id="learner_password"
+          >
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_password_confirmation">
+            {% t .confirm_new_password %}
+          </label>
+          <input
+            class="np-input"
+            type="password"
+            name="learner[password_confirmation]"
+            id="learner_password_confirmation"
+          >
+        </div>
+        <button type="submit" class="np-button np-button-big np-form-action">
+          {% t .change_password %}
+        </button>
+      </form>
+    </div>
+  </div>
+</main>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/search.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/search.html.liquid
new file mode 100644
index 00000000..01684399
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/search.html.liquid
@@ -0,0 +1,27 @@
+{% include "header" %}
+<main class="np-main np-search np-subpage-container np-max-width">
+  <div class="np-resource-title">
+    {% t .title %}
+  </div>
+  <div class="np-search-header">
+    <div class="np-resource-subtitle">
+      {% t .showing %}
+      <span class="np-resource-subtitle-number">{{ results.count }}</span>
+      {% t .results_for %}
+      <span class="np-button-color">"{{ results.term }}"</span>
+    </div>
+    {% capture label %}{% t shared.filters.by_type %}{% endcapture %}
+    {%
+      include "filter_dropdown",
+      filters: results.filters,
+      key: "type",
+      label: label
+    %}
+  </div>
+  {% if results.items.any? %}
+    {% render "search_result" for results.items as result %}
+  {% else %}
+    {% include "search_zero_state" %}
+  {% endif %}
+</main>
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/sign_up.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/sign_up.html.liquid
new file mode 100644
index 00000000..7a903da4
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/sign_up.html.liquid
@@ -0,0 +1,72 @@
+<main class="np-main np-box-container">
+  <div class="np-box">
+    {% include "header_minimal" %}
+    <div class="np-box-content-container">
+      <form class="np-form np-box-content" action="{% route sign_up %}" method="post" novalidate>
+        <div class="np-form-title"> {% t .create_account %} </div>
+        {% form_authenticity_token %}
+        <div class="np-form-flex-desktop">
+          <div class="np-form-field">
+            <label class="np-input-label" for="learner_first_name">
+              {% t shared.first_name %}
+            </label>
+            <input
+              class="np-input"
+              autofocus="autofocus"
+              type="text"
+              name="learner[first_name]"
+              id="learner_first_name"
+            >
+          </div>
+          <div class="np-form-field">
+            <label class="np-input-label" for="learner_last_name">
+              {% t shared.last_name %}
+            </label>
+            <input
+              class="np-input"
+              type="text"
+              name="learner[last_name]"
+              id="learner_last_name"
+            >
+          </div>
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_email">
+            {% t shared.email_address %}
+          </label>
+          <input
+            class="np-input"
+            autofocus="autofocus"
+            type="email"
+            name="learner[email]"
+            id="learner_email"
+          >
+        </div>
+        <div class="np-form-field">
+          <label class="np-input-label" for="learner_password">
+            {% t shared.password %}
+          </label>
+          <input
+            class="np-input"
+            type="password"
+            name="learner[password]"
+            id="learner_password"
+          >
+        </div>
+        <button type="submit" class="np-button np-button-big np-button-large-font np-form-action">
+          {% t shared.sign_up %}
+        </button>
+        <span class="np-form-terms">
+          {% t .terms %}
+          <a
+            class="np-form-link np-button-color"
+            target="_blank"
+            href="{{ current_school.terms_of_service_url }}"
+          >
+            {% t .terms_link %}
+          </a>
+        </span>
+      </form>
+    </div>
+  </div>
+</main>
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/styles.css.liquid b/Custom_Templates/customer_templates/SPS_Commerce/styles.css.liquid
index ffb95481..91463f98 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/styles.css.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/styles.css.liquid
@@ -10,12 +10,30 @@
 {{ color_palette.header_color }}
 */
 
-.np-subpage-container {
-    padding:80px 4% 184px;
-   }
-   .np-max-width {
-    justify-content:space-between;
-    margin:auto;
-    max-width: none;
-   }
-      
\ No newline at end of file
+body, .np-dashboard, .np-learning-paths {
+    background: #fff;
+}
+.card-description {
+    margin-top: 30px;
+    color: #606060;
+    font-weight: bold;
+    font-size: 18px;
+  }
+
+.np-learning-path-image {
+    object-fit: contain;
+    width: 100%;
+    margin: 15px;
+    border-radius: 12px;
+}
+
+.lp-card-image-wrapper {
+    width: 50%;
+    display: flex;
+    align-items: center;
+}
+.np-learning-paths .np-learning-path-image {
+    width: 100%;
+    min-height: 0;
+    align-self: center;
+}
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/training_event_preview.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/training_event_preview.html.liquid
new file mode 100644
index 00000000..1645bc57
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/training_event_preview.html.liquid
@@ -0,0 +1,10 @@
+{% 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_event_preview_desktop_view", training_session: training_event %}
+  </div>
+  <div class="np-hidden-desktop" id="training-session-mobile">
+    {% include "training_event_preview_mobile_view", training_session: training_event %}
+  </div>
+</main>
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/training_events.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/training_events.html.liquid
index b9ddb896..2c964bce 100644
--- a/Custom_Templates/customer_templates/SPS_Commerce/training_events.html.liquid
+++ b/Custom_Templates/customer_templates/SPS_Commerce/training_events.html.liquid
@@ -3,7 +3,7 @@
 <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" style='font-size: 2rem;'>
+      <div class="np-resource-title">
         {% t .title %}
       </div>
       <div class="np-resource-subtitle">
@@ -18,113 +18,26 @@
 
   <div class="row">
     <div class="col-xs-12 col-sm-12">
-      <div class="np-resource-title" style='font-size: 2rem;'>
-	Fulfillment Webinars
+      <div class="np-resource-title event-heading">
+        Fulfillment Webinars
       </div>
     </div>
   </div>
-  {% include "fullfilment_events_index" %}
- <div class="row">
+  {% include "fulfillment_webinars" %}
+
+  <div class="row">
     <div class="col-xs-12 col-sm-12">
-      <div class="np-resource-title" style='font-size: 2rem;'>
+      <div class="np-resource-title event-heading">
         Other Training Events
       </div>
     </div>
   </div>
-  {% include "other_events_index" %}
+  {% include "other_events" %}
 </main>
 {% include "footer" %}
 
 <style>
-.other-event-sessions {
-  height: 65px;
-  margin-bottom: 0;
-}
-
-.np-training-events {
-  background: white;
-}
-
-.row .np-card {
-  border: 1px solid #ccc;
-  padding: 35px;
-}
-.event-header {
-  display: flex;
-  padding-bottom: 25px;
-  height: 115px;
-}
-.event-header-left {
-  margin-right: 20px;
-}
-.fa-users {
-  font-size: 44px;
-  font-weight: 300;
-}
-.event-header-right-type {
-  color: #3b3f3d;
-  font-size: 18px;
-}
-.event-header-right-title {
-  color: #3b3f3d;
-  font-size: 26px;
-  font-weight: 600;
-  word-wrap: break-word;
-}
-.event-sessions {
-  height: 160px;
-  margin-bottom: 30px;
-}
-.event-session {
-  margin-bottom: 15px;
-}
-.event-session-number {
-  color: #606060;
-  font-weight: bold;
-  font-size: 18px;
-}
-.event-session-date {
-  color: #9b4b87;
-  text-decoration: none;
-  cursor: pointer;
-  font-size: 18px;
-}
-.event-session-date:hover {
-  color: #4b2346;
-}
-.event-additional-sessions {
-  color: #9b4b87;
-  text-decoration: none;
-  cursor: pointer;
-}
-.event-additional-sessions:hover {
-  color: #4b2346;
-}
-.event-button {
-  background: #9b4b87;
-  color: white;
-  border-radius: 4px;
-  border: none;
-  cursor: pointer;
-  padding: 10px 20px;
-  line-height: 39px;
-  min-height: 30px;
-  text-align: center;
-  margin-bottom: -10px;
-  text-decoration: none;
-}
-.event-button:hover {
-  background: #4b2346
-}
-@media screen and (max-width: 768px) {
-  .row .np-card {
-    width: 80%;
+  .event-heading {
+    margin-bottom: 40px;
   }
-}
-@media screen and (max-width: 450px) {
-  .row .np-card {
-    width: 90%;
-    padding: 25px;
-  }
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/Custom_Templates/customer_templates/Harri - McDonalds/training_session.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/training_session.html.liquid
similarity index 100%
rename from Custom_Templates/customer_templates/Harri - McDonalds/training_session.html.liquid
rename to Custom_Templates/customer_templates/SPS_Commerce/training_session.html.liquid
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/training_session_attendance.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/training_session_attendance.html.liquid
new file mode 100644
index 00000000..e6a0ec1c
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/training_session_attendance.html.liquid
@@ -0,0 +1,43 @@
+{% include "header" %}
+<main class="np-main np-cta-page np-max-width np-subpage-container">
+  <div class="np-card-container np-card-padding-xlarge">
+    {% if token %}
+      <i class="np-cta-page-icon fal {{ training_event.event_type_icon }}"></i>
+      <div class="np-form-headline">
+        {{ training_session.title }}
+      </div>
+      <div class="np-form-subheadline">
+        {% t .info,
+          event_name: training_session.title,
+          session_date: training_session.date,
+          session_time: training_session.time
+        %}
+      </div>
+      <div class="np-form-subheadline">
+        {% t .question %}
+      </div>
+      <form action="{% route training_session_attendance %}" method="post" class="np-cta-page-buttons">
+        {% form_authenticity_token %}
+        <input type="hidden" name="token" value="{{ token }}">
+        <input type="submit" name="not_attended" value="{% t .not_attended %}" class="np-button np-button-secondary">
+        <input type="submit" name="commit" value="{% t .attended %}" class="np-button">
+      </form>
+      <div class="np-form-subheadline">
+        {% t .salutation %}
+      </div>
+      <div class="np-form-subheadline">
+        {{ current_school.name }}
+      </div>
+    {% else %}
+      <i class="np-cta-page-icon fal fa-check-circle"></i>
+      <div class="np-form-headline">
+        {% t .success.response_text %}
+      </div>
+      <div class="np-cta-page-buttons">
+        <a href="{% route training_events %}" class="np-button">
+          {% t .success.button_text %}
+        </a>
+    {% endif %}
+  </div>
+</main>
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/transcript.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/transcript.html.liquid
new file mode 100644
index 00000000..b6cb5428
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/transcript.html.liquid
@@ -0,0 +1,8 @@
+{% include "header" %}
+{% include "account_tabs" %}
+
+<main class="np-main np-subpage-container np-transcript">
+  {% transcript %}
+</main>
+
+{% include "footer" %}
diff --git a/Custom_Templates/customer_templates/SPS_Commerce/unsubscribe.html.liquid b/Custom_Templates/customer_templates/SPS_Commerce/unsubscribe.html.liquid
new file mode 100644
index 00000000..69a54028
--- /dev/null
+++ b/Custom_Templates/customer_templates/SPS_Commerce/unsubscribe.html.liquid
@@ -0,0 +1,30 @@
+{% include "header" %}
+<main class="np-main np-cta-page np-max-width np-subpage-container">
+  <div class="np-card-container np-card-padding-xlarge">
+    {% if token %}
+      <i class="np-cta-page-icon fal fa-bell-slash"></i>
+      <div class="np-form-subheadline np-margin-top">
+        {% t .unsubscribe_text %}
+      </div>
+      <div class="np-form-subheadline np-margin-top">
+        {% t .resubscribe_text %}
+      </div>
+      <form
+        id="unsubscribe_form"
+        action="{% route email_unsubscribe, unsubscribe_token: token %}"
+        method="post"
+        class="np-cta-page-buttons"
+      >
+        {% form_authenticity_token %}
+        <input type="hidden" name="_method" value="delete">
+        <input type="submit" name="commit" value="{% t .resubscribe_button %}" class="np-button np-button-wide">
+      </form>
+    {% else %}
+      <i class="np-cta-page-icon fal fa-bell-on"></i>
+      <div class="np-form-subheadline np-margin-top">
+        {% t .resubscribed_text %}
+      </div>
+    {% endif %}
+  </div>
+</main>
+{% include "footer" %}
diff --git a/Scripts/Zenjob/workato-webhook-gsheets.py b/Scripts/Zenjob/workato-webhook-gsheets.py
index ef529704..7aff8bbf 100644
--- a/Scripts/Zenjob/workato-webhook-gsheets.py
+++ b/Scripts/Zenjob/workato-webhook-gsheets.py
@@ -1,4 +1,3 @@
-import requests
 import json
 
 with open('./sample_payload.json', 'r') as file:
@@ -6,16 +5,49 @@ with open('./sample_payload.json', 'r') as file:
 
 def main(input):
     # input = input['input']
+    quiz_name = ""
+    quiz_score = ""
+    sso_uid = ""
+    course = ""
+    timestamp = input['payload']['data']['attributes']['created_at']
     for items in input['payload']['data']['included']:
         if items['type'] == 'quizzes':
-            try:
-                if items['name'] == 'Deutsch Einstufungstest':
-                    print('quiz!')
-            except TypeError as h:
-                print(h)
-
+            if items['attributes']['name'] == 'Deutsch Einstufungstest':
+                quiz_score = input['attributes']['value']
+                quiz_name = items['attributes']['name']
+                print(quiz_score, quiz_name)
         elif items['type'] == 'people':
-            print('people')
+            sso_uid = items['attributes']['sso_uid']
+        elif items['type'] == 'courses':
+            course = items['attributes']['name']
+
+    if input['payload']['data']['type'] == 'quiz_completed_events':
+        job_report = { "email": sso_uid, "course": course, "quiz_name": quiz_name, "quiz_score": quiz_score, "timestamp": timestamp }
+        print(job_report)
+        if quiz_name:
+            if quiz_name == "Deutsch Einstufungstest":
+                """
+                At this point, we need to add a new row to the Google Sheet
+                The columns to add are:
+                    email = sso_uid
+                    course name = course
+                    date stamp = created at
+                    quiz name = quiz name
+                    quiz score = quiz score
+                """
+                print("adding row!")
+    else:
+        """
+        At this point, we need to add a new row to the Google Sheet
+        The columns to add are:
+            email = sso_uid
+            course name = course
+            date stamp = created at
+            link to BE profile = "=HYPERLINK(SUBSTITUTE("https://ops-live.zenjob.tools/ops/employee/showByUuid/{{sso_uid}}}";"test";INDIRECT("R[0]C1"; FALSE));"Talent Profil")"
+            Tag = "=IFS(INDIRECT("R[0]C2"; FALSE)="Kassentraining";"food_cashier_lms, exp_cashier_123";INDIRECT("R[0]C2"; FALSE)="Servicetraining";"pool_service_lms, exp_service_staff_123";INDIRECT("R[0]C2"; FALSE)="";"")"
+            tag assigned = false
+        """
+        print("final else statement")
 
 if __name__ == "__main__":
     main(input)