diff --git a/site/app/css/components.css b/site/app/css/components.css
index 7a38cbdc..2187d59d 100644
--- a/site/app/css/components.css
+++ b/site/app/css/components.css
@@ -48,7 +48,7 @@ html {
 body {
   margin: 0;
   min-height: 100%;
-  background-color: #fff;
+  background-color: transparent;
   font-family: Arial, sans-serif;
   font-size: 14px;
   line-height: 20px;
@@ -328,8 +328,8 @@ label {
   width: 100%;
   height: 38px;
   padding: 8px 12px;
-  margin-bottom: 10px;
-  font-size: 14px;
+  /* margin-bottom: 10px; */
+  font-size: 16px;
   line-height: 1.42857143;
   color: #333333;
   vertical-align: middle;
diff --git a/site/app/css/sigma-dev-8020.css b/site/app/css/sigma-dev-8020.css
index bd3b756a..8ecbf2b7 100644
--- a/site/app/css/sigma-dev-8020.css
+++ b/site/app/css/sigma-dev-8020.css
@@ -2973,7 +2973,9 @@ figure {
 }
 
 .section-hero {
-  background-image: linear-gradient(140deg, rgba(192, 149, 177, 0.15), rgba(47, 178, 175, 0.15));
+  /* background-image: linear-gradient(140deg, rgba(192, 149, 177, 0.15), rgba(47, 178, 175, 0.15)); */
+  background-color: transparent;
+  background-image: url(https://cdn.prod.website-files.com/666bbba4ff7240a20f4ccccf/685106838d461923ec10fc64_0ae8ba725281d3ce0757318ef80f6942_grid-fade.svg);
 }
 
 .section-hero.g-section-padding-medium.is-snowflake-page {
@@ -3420,11 +3422,11 @@ figure {
   display: -ms-flexbox;
   display: flex;
   width: 100%;
-  max-width: 1248px;
+  /* max-width: 1248px; */
   margin-right: auto;
   margin-left: auto;
-  padding-right: 16px;
-  padding-left: 16px;
+  padding-right: 25px;
+  padding-left: 25px;
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
   -ms-flex-pack: justify;
@@ -71898,3 +71900,24 @@ a.buttons-wrapper .w-button {
   background-color: #0000FF !important;
   color: #FFFFFF !important;
 }
+
+/* Search placeholder styling */
+#search::placeholder {
+  font-weight: 500;
+  color: #999;
+}
+
+#search::-webkit-input-placeholder {
+  font-weight: 500;
+  color: #999;
+}
+
+#search::-moz-placeholder {
+  font-weight: 500;
+  color: #999;
+}
+
+#search:-ms-input-placeholder {
+  font-weight: 500;
+  color: #999;
+}
diff --git a/site/app/data/featured-quickstarts.json b/site/app/data/featured-quickstarts.json
new file mode 100644
index 00000000..0002c7c6
--- /dev/null
+++ b/site/app/data/featured-quickstarts.json
@@ -0,0 +1,35 @@
+{
+  "recentQuickStarts": [
+    {
+      "title": "First Friday Features - November 2025",
+      "id": "11_2025_first_friday_features",
+      "category": "Administration",
+      "date": "Dec 9, 2025"
+    },
+    {
+      "title": "Popular Functions",
+      "id": "functions_popular_functions",
+      "category": "Functions",
+      "date": "Dec 3, 2025"
+    },
+    {
+      "title": "Connect Snowflake Intelligence to Sigma Workbook",
+      "id": "partners_snowflake_intelligence",
+      "category": "Functions",
+      "date": "Dec 3, 2025"
+    },
+    {
+      "title": "Plugin Use Case 01: Dashboard Builder (Embedding Series)",
+      "id": "embedding_plugin_useage_01_dashboard_builder",
+      "category": "Security",
+      "date": "Dec 3, 2025"
+    },
+        {
+      "title": "QuickStarts API Toolkit",
+      "id": "developers_quickstarts_api_tookit",
+      "category": "Developers",
+      "date": "Sep 17, 2025"
+    }
+  ]
+}
+
diff --git a/site/app/styles/_app.scss b/site/app/styles/_app.scss
index c16e6e0b..5099fe43 100644
--- a/site/app/styles/_app.scss
+++ b/site/app/styles/_app.scss
@@ -72,8 +72,8 @@ ul, li {
 
 .site-width {
   margin: 0 auto;
-  width: 90vw;
-  max-width: 1024px;
+  width: 95vw;
+  // max-width: 1024px; commented out by PB
 }
 
 #banner {
diff --git a/site/app/styles/_categories.scss b/site/app/styles/_categories.scss
index 6d69f647..9f1c5166 100644
--- a/site/app/styles/_categories.scss
+++ b/site/app/styles/_categories.scss
@@ -103,6 +103,14 @@ $catagory-colors: (
      .#{$category}-icon {
       background-image: url('/images/#{$icon}');
      }
+
+     .#{$category}-bar {
+      background-color: $color;
+      color: #000;
+      border-radius: 0 !important;
+      -webkit-border-radius: 0 !important;
+      -moz-border-radius: 0 !important;
+     }
   }
 }
 
diff --git a/site/app/styles/_codelab-card.scss b/site/app/styles/_codelab-card.scss
index 13e1f905..fd6b5933 100644
--- a/site/app/styles/_codelab-card.scss
+++ b/site/app/styles/_codelab-card.scss
@@ -24,9 +24,9 @@ $card-col-height: 200px; // column mode
 #cards {
   display: flex;
   flex-wrap: wrap;
-  justify-content: space-evenly;
+  // justify-content: space-evenly;
   margin-bottom: $keyline * 1;
-  padding: 0  $keyline * 2 0 $keyline * 2;
+  // padding: 0  $keyline * 2 0 $keyline * 2;
 }
 
 .codelab-card {
@@ -37,7 +37,8 @@ $card-col-height: 200px; // column mode
   margin: 0 $keyline * 2 $keyline * 4 $keyline * 2;
   max-width: $card-width;
   border-radius: 0;
-  border-bottom: 6px solid transparent;
+  border-bottom: 0;
+  overflow: hidden;
 
   -webkit-box-shadow: 2px 4px 10px 0 rgba(0,0,0,.1);
   box-shadow: 2px 4px 10px 0 rgba(0,0,0,.1);
@@ -82,20 +83,24 @@ $card-col-height: 200px; // column mode
   }
 
   .description {
-    padding: $keyline * 2 $keyline * 2 0 $keyline * 2;
-    flex: 1 0 auto;
+    padding: $keyline * 2;
     color: #212121;
     -webkit-font-smoothing: antialiased;
     font-family: $lato-bold !important;
+    flex: 1;
   }
 }
 
 .card-footer {
   border-top: 0;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: $keyline 2 * $keyline;
+  display: block;
+  padding: 0;
+  margin: 0;
+  margin-top: auto;
+  width: 100%;
+  position: relative;
+  left: 0;
+  right: 0;
 
   paper-button {
     @include md-font-button();
@@ -114,6 +119,19 @@ $card-col-height: 200px; // column mode
     background-repeat: no-repeat;
     background-position: 0 50%;
   }
+
+  .category-bar {
+    width: 100%;
+    padding: 14px 16px;
+    text-align: center;
+    font-family: $lato-bold !important;
+    font-size: 13px;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    border-radius: 0;
+    margin: 0;
+    display: block;
+  }
 }
 
 .card-pin {
diff --git a/site/app/styles/_overrides.scss b/site/app/styles/_overrides.scss
index be5834ec..ff01d2e1 100644
--- a/site/app/styles/_overrides.scss
+++ b/site/app/styles/_overrides.scss
@@ -26,7 +26,6 @@
 Sigma specific category classes */
 $color-administration: #000000;
 $color-aiapps: #4CAF50;
-$color-dataapps: #4CAF50;
 $color-developers: #3F51B5;
 $color-embedding: #06dbf7;
 $color-fundamentals: #FFA726;
@@ -39,7 +38,6 @@ $color-templates: #EC407A;
 
 $icon-administration: 'administration.svg';
 $icon-aiapps: 'aiapps.svg';
-$icon-dataapps: 'dataapps.svg';
 $icon-developers: 'developers.svg';
 $icon-embedding: 'embedding.svg';
 $icon-fundamentals: 'Solutions_MarkAnal.svg';
@@ -52,7 +50,6 @@ $icon-templates: 'workbook-template.svg';
 
 @include codelab-card(['administration'], $color-administration, $icon-administration);
 @include codelab-card(['aiapps'], $color-aiapps, $icon-aiapps);
-@include codelab-card(['dataapps'], $color-dataapps, $icon-dataapps);
 @include codelab-card(['developers'], $color-developers, $icon-developers);
 @include codelab-card(['embedding'], $color-embedding, $icon-embedding);
 @include codelab-card(['fundamentals'], $color-fundamentals, $icon-fundamentals);
@@ -63,6 +60,17 @@ $icon-templates: 'workbook-template.svg';
 @include codelab-card(['partners'], $color-partners, $icon-partners);
 @include codelab-card(['templates'], $color-templates, $icon-templates);
 
+// Special override for dark category bars - white text
+.administration-bar,
+.functions-bar,
+.partners-bar,
+.use-cases-bar,
+.security-bar,
+.aiapps-bar,
+.developers-bar {
+  color: #fff !important;
+}
+
 /** Categories in Use (so far):
 Administration
 AI Apps
diff --git a/site/app/styles/_variables.scss b/site/app/styles/_variables.scss
index b804e15d..055a0d81 100644
--- a/site/app/styles/_variables.scss
+++ b/site/app/styles/_variables.scss
@@ -108,7 +108,7 @@ $grey500: #9e9e9e;
 $grey700: #616161;
 $grey800: #424242;
 
-$backgroundColor: #fff;
+$backgroundColor: transparent;
 $mainColor: $snowflake-blue;
 $accentColor: $valencia-orange;
 
diff --git a/site/app/styles/sigma-dev-8020.css b/site/app/styles/sigma-dev-8020.css
index 3b6aa615..997e4b11 100644
--- a/site/app/styles/sigma-dev-8020.css
+++ b/site/app/styles/sigma-dev-8020.css
@@ -1034,7 +1034,7 @@ figure {
 
 .g-section-padding-medium {
   padding-top: 5rem;
-  padding-bottom: 5rem;
+  /* padding-bottom: 5rem; */
 }
 
 .g-section-padding-small {
@@ -2970,7 +2970,9 @@ figure {
 }
 
 .section-hero {
-  background-image: linear-gradient(140deg, rgba(192, 149, 177, 0.15), rgba(47, 178, 175, 0.15));
+  /* background-image: linear-gradient(140deg, rgba(192, 149, 177, 0.15), rgba(47, 178, 175, 0.15)); */
+  background-color: #f0f0f0;
+  background-image: url(https://cdn.prod.website-files.com/666bbba4ff7240a20f4ccccf/685106838d461923ec10fc64_0ae8ba725281d3ce0757318ef80f6942_grid-fade.svg);
 }
 
 .section-hero.g-section-padding-medium.is-snowflake-page {
@@ -3417,11 +3419,11 @@ figure {
   display: -ms-flexbox;
   display: flex;
   width: 100%;
-  max-width: 1248px;
+  /* max-width: 1248px; commented out by PB */
   margin-right: auto;
   margin-left: auto;
-  padding-right: 16px;
-  padding-left: 16px;
+  padding-right: 25px;
+  padding-left: 25px;
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
   -ms-flex-pack: justify;
diff --git a/site/app/views/archive/index.html b/site/app/views/archive/index.html
index f0e10e89..a21790f0 100644
--- a/site/app/views/archive/index.html
+++ b/site/app/views/archive/index.html
@@ -96,6 +96,205 @@
             #displayText {
             display: none;
             }
+
+            /* Header section - gradient background */
+            .section-hero {
+               background: linear-gradient(to bottom, rgba(243, 234, 252, 0.5), #FFFFFF) !important;
+               border-bottom: 1px solid #E5E7EB !important;
+               padding-top: 6rem !important;
+               padding-bottom: 2rem !important;
+            }
+
+            /* Responsive Grid System */
+            #cards {
+               display: grid !important;
+               grid-template-columns: repeat(1, minmax(0, 1fr)) !important;
+               gap: 1rem !important;
+            }
+
+            @media (min-width: 640px) {
+            #cards {
+               grid-template-columns: repeat(2, minmax(0, 1fr)) !important;
+            }
+            }
+
+            @media (min-width: 768px) {
+            #cards {
+               grid-template-columns: repeat(3, minmax(0, 1fr)) !important;
+            }
+            }
+
+            @media (min-width: 1024px) {
+            #cards {
+               grid-template-columns: repeat(4, minmax(0, 1fr)) !important;
+            }
+            }
+
+            @media (min-width: 1280px) {
+            #cards {
+               grid-template-columns: repeat(5, minmax(0, 1fr)) !important;
+            }
+            }
+
+            @media (min-width: 1536px) {
+            #cards {
+               grid-template-columns: repeat(6, minmax(0, 1fr)) !important;
+            }
+            }
+
+            /* Card styling updates */
+            .codelab-card {
+               background-color: #FFFFFF !important;
+               border-radius: 6px !important;
+               border: 1px solid #D1D5DB !important;
+               box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06) !important;
+               transition: all 0.2s ease !important;
+               overflow: hidden !important;
+               padding: 0 !important;
+               display: flex !important;
+               flex-direction: column !important;
+               cursor: pointer !important;
+            }
+
+            .codelab-card:hover {
+               transform: translateY(-2px) !important;
+               box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05) !important;
+               border-color: #2563EB !important;
+            }
+
+            /* Make card title a clickable link */
+            .codelab-card .description {
+               color: #374151 !important;
+               font-size: 1rem !important;
+               line-height: 1.25rem !important;
+               padding: 1rem 1rem 0.5rem 1rem !important;
+               transition: color 0.2s ease !important;
+               min-height: 3.5rem !important;
+               cursor: pointer !important;
+            }
+
+            .codelab-card:hover .description {
+               color: #2563EB !important;
+            }
+
+            /* Hide the old Start button */
+            .codelab-card .card-footer a.button-secondary {
+               display: none !important;
+            }
+
+            /* Category bar at bottom */
+            .card-footer {
+               margin-top: auto !important;
+               padding: 1rem !important;
+               display: flex !important;
+               align-items: flex-start !important;
+               justify-content: flex-start !important;
+            }
+
+            .card-footer .category-icon {
+               display: none !important;
+            }
+
+            /* Category pills with proper styling */
+            .card-footer .category-bar,
+            .codelab-card .card-footer .category-bar,
+            .category-bar,
+            .administration-bg,
+            .aiapps-bg,
+            .dataapps-bg,
+            .developers-bg,
+            .embedding-bg,
+            .fundamentals-bg,
+            .functions-bg,
+            .partners-bg,
+            .security-bg,
+            .tables-bg,
+            .templates-bg,
+            .use-cases-bg {
+               display: inline-block !important;
+               width: auto !important;
+               padding: 0.25rem 0.75rem !important;
+               text-align: center !important;
+               font-family: 'Lato', sans-serif !important;
+               font-weight: 600 !important;
+               font-size: 0.75rem !important;
+               text-transform: uppercase !important;
+               letter-spacing: 0.025em !important;
+               border-radius: 9999px !important;
+               -webkit-border-radius: 9999px !important;
+               -moz-border-radius: 9999px !important;
+               margin: 0 !important;
+               color: #FFFFFF !important;
+               border: none !important;
+               box-shadow: none !important;
+               cursor: pointer !important;
+            }
+
+            /* Footer link styling for better readability */
+            .footer-link,
+            .footer-link:link,
+            .footer-link:visited {
+               color: #9CA3AF !important;
+            }
+
+            .footer-link:hover {
+               color: #D1D5DB !important;
+            }
+
+            /* Update header buttons to match Sigma homepage */
+            .nav-button-wrapper a.button-secondary,
+            .nav-button-wrapper a.button-secondary:link,
+            .nav-button-wrapper a.button-secondary:visited,
+            .buttons-wrapper a.button-secondary,
+            .buttons-wrapper a.button-secondary:link,
+            .buttons-wrapper a.button-secondary:visited,
+            .section-hero a.button-secondary,
+            a.button-secondary.w-button {
+               background-color: #d4ff00 !important;
+               background-image: none !important;
+               border: 1px solid #000 !important;
+               color: #000 !important;
+               padding: 10px 24px !important;
+               border-radius: 50px !important;
+               font-size: 14px !important;
+               font-weight: 500 !important;
+               text-transform: none !important;
+               text-decoration: none !important;
+               display: inline-block !important;
+            }
+
+            .nav-button-wrapper a.button-primary,
+            .nav-button-wrapper a.button-primary:link,
+            .nav-button-wrapper a.button-primary:visited,
+            .buttons-wrapper a.button-primary,
+            .buttons-wrapper a.button-primary:link,
+            .buttons-wrapper a.button-primary:visited,
+            .section-hero a.button-primary,
+            a.button-primary.w-button {
+               background-color: #d4ff00 !important;
+               background-image: none !important;
+               border: 1px solid #000 !important;
+               color: #000 !important;
+               padding: 10px 24px !important;
+               border-radius: 50px !important;
+               font-size: 14px !important;
+               font-weight: 500 !important;
+               text-transform: none !important;
+               text-decoration: none !important;
+               display: inline-block !important;
+            }
+
+            .nav-button-wrapper a.button-secondary:hover,
+            .buttons-wrapper a.button-secondary:hover,
+            .section-hero a.button-secondary:hover {
+               background-color: rgba(0, 0, 0, 0.05) !important;
+            }
+
+            .nav-button-wrapper a.button-primary:hover,
+            .buttons-wrapper a.button-primary:hover,
+            .section-hero a.button-primary:hover {
+               background-color: #c4ef00 !important;
+            }
          </style>
          <!-- End of PB add -->
       </head>
@@ -767,7 +966,7 @@
                <div class="site-width">
                   <div class="grid-wrapper">
                      <div class="header-4 g-mg-bottom-small">Sigma QuickStarts - Annual Archive</div>
-                     <div class="nav-dropdown_toggle">New features, public betas and bug fixes for each previous month</div>
+                     <div class="nav-dropdown_toggle">These are full year compilations of all the new features, public betas and bug fixes.</div>
                      <div class="buttons-wrapper">
                         <a href="https://quickstarts.sigmacomputing.com/" target="_self" class="button-secondary w-button">Back to QuickStarts Main Site</a>         
                         <br> <br>                      
@@ -784,14 +983,15 @@
                   All other views are explicitly opt-in via metadata. #}
                   {% if codelab.status.indexOf('hidden') === -1 || view.id !== 'default' %}
                   {% set cat = levelledCategory(codelab, view.catLevel) %}
-                  <div 
+                  <div
                      data-category="{{codelab.category}}"
                      data-title="{{codelab.title}}"
                      data-duration="{{codelab.duration}}"
                      data-updated="{{codelab.updated}}"
                      data-tags="{{codelab.tags}}"
-                     data-pin="{{codelabPin(view, codelab)}}" 
-                     class="retailers-card codelab-card category-{{categoryClass(codelab, cat.level)}}">
+                     data-pin="{{codelabPin(view, codelab)}}"
+                     class="retailers-card codelab-card category-{{categoryClass(codelab, cat.level)}}"
+                     onclick="window.location.href='{{codelabUrl(view, codelab)}}'">
                      {%- if codelabPin(view, codelab) -%}
                      <div class="card-pin"></div>
                      {%- endif -%}
@@ -799,7 +999,7 @@
                      <div class="card-footer">
                         <div class="category-icon {{categoryClass(codelab, cat.level)}}-icon"></div>
                         <a href="{{codelabUrl(view, codelab)}}" on-tap="navigate"
-                           class="button-secondary w-button {{categoryClass(codelab, cat.level)}}-bg">Start
+                           class="button-secondary w-button {{categoryClass(codelab, cat.level)}}-bg">{% if cat.name == 'aiapps' %}AI Apps{% elif cat.name == 'dataapps' %}Data Apps{% else %}{{cat.name}}{% endif %}
                         </a>
                      </div>
                      <div class="card-duration">
@@ -891,8 +1091,8 @@ <h3 class="paragraph-2 g-text-color-neutral-6 g-mg-bottom-medium">Company</h3>
                      </nav>
                      <div id="w-node-_35691ef6-8a0b-1f2a-08de-23a461e1dcad-61e1dc7a" class="footer-form-wrapper">
                         <div class="grid-wrapper">
-                           <h3 class="header-6 g-text-color-neutral-6 g-mg-bottom-small">Sigma Quickstarts Are Community Made</h3>
-                           <p class="paragraph-1 g-text-color-neutral-9">Sigma Employees, Partners and Power Users please reach out if you have an idea that should be a Quickstart!</p>
+                           <h3 class="header-6 g-text-color-neutral-6 g-mg-bottom-small">Sigma Quickstarts</h3>
+                           <p class="paragraph-1 g-text-color-neutral-9">Sigma employees, partners and power users please reach out if you have an idea that should be a Quickstart!</p>
                         </div>
                         <div class="footer-form-embed ">
                            <div class>
diff --git a/site/app/views/default/index.html b/site/app/views/default/index.html
index 231eaa5d..8bf943d2 100644
--- a/site/app/views/default/index.html
+++ b/site/app/views/default/index.html
@@ -45,7 +45,7 @@
          <link href="/css/normalize.css" rel="stylesheet" type="text/css">
          <link href="/css/components.css" rel="stylesheet" type="text/css">
          <link href="/css/sigma-dev-8020.css" rel="stylesheet" type="text/css">
-         <link href="/css/sigma-pb.css" rel="stylesheet" type="text/css"> 
+         <!-- <link href="/css/sigma-pb.css" rel="stylesheet" type="text/css"> -->
          <script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js" type="text/javascript"></script>
          <style is="custom-style">
             :root {
@@ -96,6 +96,317 @@
             #displayText {
             display: none;
             }
+
+            /* Improved Color Scheme with Visual Hierarchy */
+            body {
+            background-color: #F3F4F6 !important;
+            color: #111827 !important;
+            }
+
+            /* Remove navbar border */
+            .navbar {
+            border-bottom: none !important;
+            box-shadow: none !important;
+            }
+
+            /* Header section - gradient background */
+            .section-hero {
+            background: linear-gradient(to bottom, rgba(243, 234, 252, 0.5), #FFFFFF) !important;
+            border-bottom: 1px solid #E5E7EB !important;
+            /* padding-top: 6rem !important; */
+            /* padding-bottom: 2rem !important; */
+            }
+
+            /* Primary headers */
+            h1, h2, h3, h4, .header-4, .banner-title {
+            color: #1F2937 !important;
+            }
+
+            /* Secondary text */
+            p, .paragraph-hero {
+            color: #6B7280 !important;
+            }
+
+            /* Filter container responsive layout */
+            .filter-container {
+            display: flex !important;
+            flex-wrap: wrap !important;
+            gap: 1rem !important;
+            align-items: center !important;
+            margin-bottom: 2rem !important;
+            }
+
+            /* Search and category filter - enhanced styling */
+            #search, #category-filter {
+            background-color: #FFFFFF !important;
+            border: 1px solid #D1D5DB !important;
+            color: #111827 !important;
+            box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05) !important;
+            transition: all 0.2s ease !important;
+            padding: 0.75rem 1rem !important;
+            border-radius: 0.5rem !important;
+            font-size: 0.875rem !important;
+            height: 50px;
+            }
+
+            #category-filter {
+            width: 220px !important;
+            max-width: 220px !important;
+            min-width: 220px !important;
+            flex: 0 0 220px !important;
+            appearance: none !important;
+            background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3E%3Cpath stroke='%236B7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3E%3C/svg%3E") !important;
+            background-position: right 0.75rem center !important;
+            background-repeat: no-repeat !important;
+            background-size: 1.2em 1.2em !important; */
+            padding-right: 2.5rem !important;
+            }
+
+            #search {
+            flex: 1 1 auto !important;
+            min-width: 250px !important;
+            max-width: 400px !important;
+            }
+
+            #search:focus, #category-filter:focus {
+            border-color: #3B82F6 !important;
+            outline: none !important;
+            box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1) !important;
+            }
+
+            /* Responsive Grid System */
+            #cards {
+            display: grid !important;
+            grid-template-columns: repeat(1, minmax(0, 1fr)) !important;
+            gap: 1rem !important;
+            }
+
+            @media (min-width: 640px) {
+            #cards {
+               grid-template-columns: repeat(2, minmax(0, 1fr)) !important;
+            }
+            }
+
+            @media (min-width: 768px) {
+            #cards {
+               grid-template-columns: repeat(3, minmax(0, 1fr)) !important;
+            }
+            }
+
+            @media (min-width: 1024px) {
+            #cards {
+               grid-template-columns: repeat(4, minmax(0, 1fr)) !important;
+            }
+            }
+
+            @media (min-width: 1280px) {
+            #cards {
+               grid-template-columns: repeat(5, minmax(0, 1fr)) !important;
+            }
+            }
+
+            @media (min-width: 1536px) {
+            #cards {
+               grid-template-columns: repeat(6, minmax(0, 1fr)) !important;
+            }
+            }
+
+            /* Card backgrounds */
+            .retailers-card.codelab-card,
+            .codelab-card {
+            background-color: #FFFFFF !important;
+            border: 1px solid #D1D5DB !important;
+            box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06) !important;
+            transition: all 0.2s ease !important;
+            border-radius: 6px !important;
+            overflow: hidden !important;
+            padding: 0 !important;
+            display: flex !important;
+            flex-direction: column !important;
+            /* height: 100% !important; */
+            cursor: pointer !important;
+            }
+
+            .codelab-card:hover {
+            transform: translateY(-2px) !important;
+            box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05) !important;
+            border-color: #2563EB !important;
+            }
+
+            .codelab-card .description {
+            color: #374151 !important;
+            font-size: 1rem !important;
+            line-height: 1.25rem !important;
+            /* padding: 1rem 1rem 0.5rem 1rem !important; */
+            /* flex-grow: 1 !important; */
+            transition: color 0.2s ease !important;
+            min-height: 3.5rem !important;
+            }
+
+            .codelab-card:hover .description {
+            color: #2563EB !important;
+            }
+
+            /* Recently Added section */
+            .featured-container {
+            padding: 0 !important;
+            margin-top: 1.5rem !important;
+            border-radius: 0 !important;
+            border: none !important;
+            /* margin-bottom: 1.5rem !important; */
+            }
+
+            /* Recently Added QuickStarts container */
+            #recent-quickstarts {
+            display: flex !important;
+            gap: 1rem !important;
+            overflow-x: auto !important;
+            scroll-snap-type: x mandatory !important;
+            -webkit-overflow-scrolling: touch !important;
+            padding-bottom: 1rem !important;
+            }
+
+            /* Hide scrollbar but keep functionality */
+            #recent-quickstarts::-webkit-scrollbar {
+            display: none !important;
+            }
+
+            #recent-quickstarts {
+            -ms-overflow-style: none !important;
+            scrollbar-width: none !important;
+            }
+
+            /* Style Recently Added QuickStarts cards */
+            #recent-quickstarts .codelab-card {
+            min-width: 280px !important;
+            max-width: 280px !important;
+            flex-shrink: 0 !important;
+            scroll-snap-align: start !important;
+            }
+
+            #recent-quickstarts .codelab-card .description {
+            font-size: 1rem !important;
+            }
+
+            /* Accent for links and interactive elements */
+            a:not(.button-primary):not(.button-secondary) {
+            color: #2563EB !important;
+            }
+
+            a:hover:not(.button-primary):not(.button-secondary) {
+            color: #1D4ED8 !important;
+            }
+
+            /* Category pill styling - rounded pill shape */
+            .card-footer .category-bar,
+            .codelab-card .card-footer .category-bar,
+            .category-bar,
+            .administration-bar,
+            .aiapps-bar,
+            .dataapps-bar,
+            .developers-bar,
+            .embedding-bar,
+            .fundamentals-bar,
+            .functions-bar,
+            .partners-bar,
+            .security-bar,
+            .tables-bar,
+            .templates-bar,
+            .use-cases-bar {
+            display: inline-block !important;
+            width: auto !important;
+            padding: 0.25rem 0.75rem !important;
+            text-align: center !important;
+            font-family: 'Lato', sans-serif !important;
+            font-weight: 600 !important;
+            font-size: 0.75rem !important;
+            text-transform: uppercase !important;
+            letter-spacing: 0.025em !important;
+            border-radius: 9999px !important;
+            -webkit-border-radius: 9999px !important;
+            -moz-border-radius: 9999px !important;
+            margin: 0 !important;
+            color: #FFFFFF !important;
+            border: none !important;
+            box-shadow: none !important;
+            }
+
+            .codelab-card .card-footer,
+            .card-footer {
+            padding: 1rem !important;
+            margin-top: auto !important;
+            width: 100% !important;
+            display: flex !important;
+            align-items: flex-start !important;
+            justify-content: flex-start !important;
+            border-radius: 0 !important;
+            }
+
+            .codelab-card .card-duration,
+            .card-duration {
+            display: none !important;
+            }
+
+            /* Library heading */
+            #library-heading {
+            color: #1F2937 !important;
+            }
+
+            /* Footer styling - improve readability */
+            .footer {
+            background-color: #1a1a1a !important;
+            }
+
+            .footer h3,
+            .footer .paragraph-2 {
+            color: #FFFFFF !important;
+            }
+
+            .footer .footer-link,
+            .footer .footer-list a,
+            .footer .footer-bottom a,
+            .footer a,
+            .footer a:link,
+            .footer a:visited {
+            color: #9CA3AF !important;
+            text-decoration: none !important;
+            }
+
+            .footer .footer-link:hover,
+            .footer .footer-list a:hover,
+            .footer .footer-bottom a:hover,
+            .footer a:hover {
+            color: #FFFFFF !important;
+            }
+            /* Update header buttons to match Sigma homepage */
+            .nav-button-wrapper a.button-secondary,
+            .nav-button-wrapper a.button-secondary:link,
+            .nav-button-wrapper a.button-secondary:visited {
+            background-color: transparent !important;
+            background-image: none !important;
+            border: 1px solid #000 !important;
+            color: #000 !important;
+            padding: 10px 24px !important;
+            border-radius: 50px !important;
+            font-size: 14px !important;
+            font-weight: 500 !important;
+            text-transform: none !important;
+            }
+            .nav-button-wrapper a.button-primary,
+            .nav-button-wrapper a.button-primary:link,
+            .nav-button-wrapper a.button-primary:visited,
+            .nav-button-wrapper a.button-primary:hover,
+            .nav-button-wrapper a.button-primary:active {
+            background-color: #d4ff00 !important;
+            background-image: none !important;
+            border: 1px solid #000 !important;
+            color: #000 !important;
+            padding: 10px 24px !important;
+            border-radius: 50px !important;
+            font-size: 14px !important;
+            font-weight: 500 !important;
+            text-transform: none !important;
+            }
          </style>
          <!-- End of PB add -->
       </head>
@@ -385,6 +696,16 @@
          </div>
          <paper-header-panel id="main" mode="standard" main>
             {% raw %}
+
+            <!-- Event Announcement Bar - Comment out when event is over 
+            <div style="background-color: #000; color: #fff; text-align: center; padding: 12px 20px; font-size: 14px; font-weight: 500; position: relative; z-index: 1000;">
+               DEC. 11 PRODUCT LAUNCH
+               <a href="PLACEHOLDER_LINK" style="color: #fff; text-decoration: none; margin-left: 8px;">
+                  SIGN UP →
+               </a>
+            </div>
+            End Event Announcement Bar -->
+
             <div data-animation="default" data-collapse="medium" data-duration="400" data-easing="ease" data-easing2="ease" data-doc-height="1" role="banner" class="navbar w-nav">
                <div class="nav-container">
                   <nav class="nav-left-wrapper">
@@ -753,8 +1074,8 @@
                      </div>
                   </nav>
                   <div class="nav-button-wrapper">
-                     <a href="https://app.sigmacomputing.com/login" class="button-secondary w-button">sign in</a>
-                     <a href="https://sigmacomputing.com/free-trial" class="button-primary w-button">free trial</a>
+                     <a href="https://app.sigmacomputing.com/login" class="button-secondary w-button" style="background-color: transparent !important; background-image: none !important; border: 1px solid #000 !important; color: #000 !important; padding: 10px 24px !important; border-radius: 50px !important; font-size: 14px !important; font-weight: 500 !important; text-transform: none !important;">Login</a>
+                     <a href="https://sigmacomputing.com/free-trial" class="button-primary w-button" style="background-color: #d4ff00 !important; background-image: none !important; border: 1px solid #000 !important; color: #000 !important; padding: 10px 24px !important; border-radius: 50px !important; font-size: 14px !important; font-weight: 500 !important; text-transform: none !important;">Try Sigma free</a>
                   </div>
                   <div data-w-id="6e060741-16f2-279a-eb04-81a89169fde5" class="nav-hamburger-button w-nav-button">
                      <div class="nav-hamburger_line cc-1"></div>
@@ -766,46 +1087,62 @@
          </div>
          <header id="" class="section-hero g-section-padding-medium wf-section">
             <div class="site-width">
-               <div class="grid-wrapper">
+               <div class="grid-wrapper" style="max-width: 100%; width: 100%;">
                   <div class="header-4 g-mg-bottom-small">Welcome to Sigma QuickStarts</div>
                   <p class="paragraph-hero g-mg-bottom-large">
-                     Maximize your investment in Sigma with easy-to-follow, step-by-step tutorials.<br>
-                     
-                     <div class="kpi-container" style="display: flex; align-items: center; justify-content: center; width: 100%; overflow: hidden; margin: 10px; padding: 0;">
-                        <iframe src="https://app.sigmacomputing.com/embed/5t3nQDpTq3wNb0kV3mNNkX" style="width: 100%; height: 175px; border: none; display: block;"></iframe>
-                    </div>
-                                         </div>                  
-                                         
-                  </p>       
-                  <br>
-                  <div class="">
-                     <div class="g-mg-bottom-large">
-                        <div class="w-embed">
-                           <img src="https://assets-global.website-files.com/62a3d35f74b3a546c309e010/63406002ed9b57daff3fcfb2_ico-close.svg" loading="lazy" alt="" class="input-close">
-                           <input type="text" is="iron-input" bind-value="{{searchVal}}" on-keydown="onSearchKeyDown" class="search g-shadow-100 w-input" placeholder="Search" id="search">
-                        
-                           <div class="buttons-wrapper">
-                              <a href="#" target="_self" class="button-secondary w-button" onclick="handleButtonClick(event, this)" data-cat="administration">Administration</a>
-                              <a href="#" target="_self" class="button-secondary w-button" onclick="handleButtonClick(event, this)" data-cat="aiapps">AI Apps</a>
-                              <a href="#" target="_self" class="button-secondary w-button" onclick="handleButtonClick(event, this)" data-cat="developers">Developers</a>
-                              <a href="#" target="_self" class="button-secondary w-button" onclick="handleButtonClick(event, this)" data-cat="embedding">Embedding</a>
-                              <a href="#" target="_self" class="button-secondary w-button" onclick="handleButtonClick(event, this)" data-cat="functions">Functions</a>
-                              <a href="#" target="_self" class="button-secondary w-button" onclick="handleButtonClick(event, this)" data-cat="fundamentals">Fundamentals for New Users</a>
-                            </div>
-                            
-                            <div class="buttons-wrapper">
-                              <a href="#" target="_self" class="button-secondary w-button" onclick="handleButtonClick(event, this)" data-cat="partners">Partners</a>
-                              <a href="#" target="_self" class="button-secondary w-button" onclick="handleButtonClick(event, this)" data-cat="security">Security</a>
-                              <a href="#" target="_self" class="button-secondary w-button" onclick="handleButtonClick(event, this)" data-cat="tables">Tables</a>
-                              <a href="#" target="_self" class="button-secondary w-button" onclick="handleButtonClick(event, this)" data-cat="templates">Templates</a>
-                              <a href="#" target="_self" class="button-secondary w-button" onclick="handleButtonClick(event, this)" data-cat="use-cases">Use Cases</a>
-                              <a href="#" target="_self" class="button-primary w-button" onclick="reloadBasePage(event, this)" data-cat="show-all">Show All</a>
-                              <a href="https://quickstarts.sigmacomputing.com/firstfridayfeatures" target="_self" class="button-primary w-button">First Friday Features</a>
-                            </div>
-                       </div>                                                                          
+                     Maximize your investment in Sigma with easy-to-follow, step-by-step guides<br>
+                  </p>
+
+                  <div class="featured-container" style="margin: 0 0 20px 0;">
+                     <h4 style="margin: 0 0 10px 0; color: black !important; font-size: 1.50em; font-weight: 600;">Recently Added QuickStarts:</h4>
+                     <div id="recent-quickstarts" style="display: flex; gap: 10px; flex-wrap: wrap;">
+                        <!-- Populated by JavaScript -->
+                        <div style="color: #999;">Loading recent QuickStarts...</div>
+                     </div>
                   </div>
+
+                     <script>
+                        // Load featured QuickStarts from JSON
+                        fetch('/data/featured-quickstarts.json')
+                           .then(response => response.json())
+                           .then(data => {
+                              // Populate recent QuickStarts
+                              const container = document.getElementById('recent-quickstarts');
+                              container.innerHTML = ''; // Clear loading message
+                              data.recentQuickStarts.forEach(qs => {
+                                 const card = document.createElement('div');
+                                 const categoryLower = qs.category.toLowerCase().replace(/\s+/g, '');
+                                 card.className = `retailers-card codelab-card category-${categoryLower}`;
+                                 card.setAttribute('data-category', categoryLower);
+                                 card.style.cssText = `
+                                    flex: 0 0 auto;
+                                    width: 280px;
+                                    margin: 0 16px 0 0;
+                                 `;
+
+                                 card.innerHTML = `
+                                    <a href="/guide/${qs.id}/index.html?index=..%2F..index" style="text-decoration: none; color: inherit;">
+                                       <div class="header-7 description">${qs.title}</div>
+                                    </a>
+                                    <div class="card-footer">
+                                       <!-- <div class="category-icon ${categoryLower}-icon"></div> -->
+                                       <div class="category-bar ${categoryLower}-bar">${qs.category}</div>
+                                    </div>
+                                    <div class="card-duration"></div>
+                                 `;
+                                 container.appendChild(card);
+                              });
+                           })
+                           .catch(error => {
+                              console.error('Error loading featured QuickStarts:', error);
+                              document.getElementById('recent-quickstarts').innerHTML = '<li style="color: #999;">Unable to load recent QuickStarts</li>';
+                           });
+                     </script>
+                     </div>
+                  </p>
+
+
                </div>
-               
             </header>
             {% endraw %}
             <main>
@@ -813,29 +1150,50 @@
             <p id="displayText"></p>
             <!-- End of PB add -->
             <br>
-
-            <card-sorter id="cards" class="site-width">
+            <div class="site-width">
+                  <div style="display: flex; align-items: center; gap: 24px; margin-bottom: 20px;">
+                     <h4 id="library-heading" style="margin: 0; color: #1F2937; font-size: 1.8em; font-weight: 700;">Library:</h4>
+                     <!-- Search and Category Filter -->
+                     <select id="category-filter" class="w-input">
+                        <option value="">All Categories</option>
+                        <option value="administration">Administration</option>
+                        <option value="aiapps">AI Apps</option>
+                        <option value="developers">Developers</option>
+                        <option value="embedding">Embedding</option>
+                        <option value="functions">Functions</option>
+                        <option value="fundamentals">Fundamentals for New Users</option>
+                        <option value="partners">Partners</option>
+                        <option value="security">Security</option>
+                        <option value="tables">Tables</option>
+                        <option value="templates">Templates</option>
+                        <option value="use-cases">Use Cases</option>
+                     </select>
+                     <input type="text" class="w-input" placeholder="Search QuickStarts" id="search">
+                     <a href="https://quickstarts.sigmacomputing.com/firstfridayfeatures/" class="button-primary" style="background-color: #d4ff00 !important; background-image: none !important; border: 1px solid #000 !important; color: #000 !important; padding: 10px 24px !important; border-radius: 50px !important; font-size: 14px !important; font-weight: 500 !important; text-transform: none !important; text-decoration: none !important; white-space: nowrap !important;">First Feature Fridays</a>
+                  </div>
+            </div>
+               <card-sorter id="cards" class="site-width">
                {% for codelab in codelabs -%}
                    <!-- Ensure all codelabs are loaded, filter only hidden ones if needed -->
                    {% if codelab.status.indexOf('hidden') === -1 || view.id !== 'default' %}
                        <!-- Card element with data attributes for filtering -->
-                       <div 
+                       <div
                           data-category="{{codelab.category}}"
                           data-title="{{codelab.title}}"
                           data-duration="{{codelab.duration}}"
                           data-updated="{{codelab.updated}}"
                           data-tags="{{codelab.tags}}"
-                          data-pin="{{codelabPin(view, codelab)}}" 
+                          data-pin="{{codelabPin(view, codelab)}}"
                           class="retailers-card codelab-card category-{{categoryClass(codelab, cat.level)}}">
                            {%- if codelabPin(view, codelab) -%}
                                <div class="card-pin"></div>
                            {%- endif -%}
-                           <div class="header-7 description">{{codelab.title}}</div>
+                           <a href="{{codelabUrl(view, codelab)}}" on-tap="navigate" style="text-decoration: none; color: inherit;">
+                               <div class="header-7 description">{{codelab.title}}</div>
+                           </a>
                            <div class="card-footer">
-                               <div class="category-icon {{categoryClass(codelab, cat.level)}}-icon"></div>
-                               <a href="{{codelabUrl(view, codelab)}}" on-tap="navigate"
-                                  class="button-secondary w-button {{categoryClass(codelab, cat.level)}}-bg">Start
-                               </a>
+                               <!-- <div class="category-icon {{categoryClass(codelab, cat.level)}}-icon"></div> -->
+                               <div class="category-bar {{categoryClass(codelab, cat.level)}}-bar">{{codelab.category}}</div>
                            </div>
                            <div class="card-duration">
                                <!--<div class="paragraph-2 ">{%- if codelab.duration -%}{{codelab.duration}} min {%- endif -%}</div>-->
@@ -858,7 +1216,37 @@
                    {% endif %}
                {% endfor %}
            </card-sorter>
-           
+
+          <script>
+             // Category filter handler
+             document.getElementById('category-filter').addEventListener('change', function(e) {
+                const category = e.target.value;
+                if (category) {
+                   // Create a fake element that mimics the button structure
+                   const fakeButton = {
+                      getAttribute: function(attr) {
+                         if (attr === 'data-cat') return category;
+                         return null;
+                      }
+                   };
+                   handleButtonClick(e, fakeButton);
+                } else {
+                   reloadBasePage(e, this);
+                }
+             });
+
+             // Search input handler using card-sorter API
+             const searchInput = document.getElementById('search');
+             const cardSorter = document.querySelector('card-sorter');
+
+             if (searchInput && cardSorter) {
+                searchInput.addEventListener('input', function(e) {
+                   const searchTerm = e.target.value;
+                   cardSorter.filterByText(searchTerm);
+                });
+             }
+          </script>
+
             <div id="loading-placeholder" class="site-width">
             Loading guides, please wait...
             </div>
@@ -940,8 +1328,8 @@ <h3 class="paragraph-2 g-text-color-neutral-6 g-mg-bottom-medium">Company</h3>
                      </nav>
                      <div id="w-node-_35691ef6-8a0b-1f2a-08de-23a461e1dcad-61e1dc7a" class="footer-form-wrapper">
                         <div class="grid-wrapper">
-                           <h3 class="header-6 g-text-color-neutral-6 g-mg-bottom-small">Sigma Quickstarts Are Community Made</h3>
-                           <p class="paragraph-1 g-text-color-neutral-9">Sigma Employees, Partners and Power Users please reach out if you have an idea that should be a Quickstart!</p>
+                           <h3 class="header-6 g-text-color-neutral-6 g-mg-bottom-small">Sigma Quickstarts</h3>
+                           <p class="paragraph-1 g-text-color-neutral-9">Sigma employees, partners and power users please reach out if you have an idea that should be a Quickstart!</p>
                         </div>
                         <div class="footer-form-embed ">
                            <div class>
@@ -980,4 +1368,31 @@ <h3 class="paragraph-2 g-text-color-neutral-6 g-mg-bottom-medium">
          <!-- Deprecated by PB
           <script src="scripts/defaultviewscript.js" type="text/javascript"></script>
          -->
+         <script>
+         // Fix category display names
+         document.addEventListener('DOMContentLoaded', function() {
+            const categoryMap = {
+               'aiapps': 'AI Apps',
+               'dataapps': 'Data Apps'
+            };
+
+            // Function to fix category names
+            function fixCategoryNames() {
+               document.querySelectorAll('.category-bar').forEach(function(el) {
+                  const currentText = el.textContent.trim().toLowerCase();
+                  if (categoryMap[currentText]) {
+                     el.textContent = categoryMap[currentText];
+                     el.style.textTransform = 'none';
+                  }
+               });
+            }
+
+            // Run immediately
+            fixCategoryNames();
+
+            // Also run after a short delay to catch dynamically loaded content
+            setTimeout(fixCategoryNames, 500);
+            setTimeout(fixCategoryNames, 1000);
+         });
+         </script>
    </html>
diff --git a/site/app/views/firstfridayfeatures/index.html b/site/app/views/firstfridayfeatures/index.html
index 8680d760..9a81b285 100644
--- a/site/app/views/firstfridayfeatures/index.html
+++ b/site/app/views/firstfridayfeatures/index.html
@@ -96,6 +96,220 @@
             #displayText {
             display: none;
             }
+
+            /* Improved Color Scheme with Visual Hierarchy */
+            body {
+            background-color: #F3F4F6 !important;
+            color: #111827 !important;
+            }
+
+            /* Remove navbar border */
+            .navbar {
+            border-bottom: none !important;
+            box-shadow: none !important;
+            }
+
+            /* Header section - gradient background */
+            .section-hero {
+            background: linear-gradient(to bottom, rgba(243, 234, 252, 0.5), #FFFFFF) !important;
+            border-bottom: 1px solid #E5E7EB !important;
+            padding-top: 6rem !important;
+            padding-bottom: 2rem !important;
+            }
+
+            /* Primary headers */
+            h1, h2, h3, h4, .header-4, .banner-title {
+            color: #1F2937 !important;
+            }
+
+            /* Secondary text */
+            p, .paragraph-hero {
+            color: #6B7280 !important;
+            }
+
+            /* Responsive Grid System */
+            #cards {
+            display: grid !important;
+            grid-template-columns: repeat(1, minmax(0, 1fr)) !important;
+            gap: 1rem !important;
+            }
+
+            @media (min-width: 640px) {
+            #cards {
+               grid-template-columns: repeat(2, minmax(0, 1fr)) !important;
+            }
+            }
+
+            @media (min-width: 768px) {
+            #cards {
+               grid-template-columns: repeat(3, minmax(0, 1fr)) !important;
+            }
+            }
+
+            @media (min-width: 1024px) {
+            #cards {
+               grid-template-columns: repeat(4, minmax(0, 1fr)) !important;
+            }
+            }
+
+            @media (min-width: 1280px) {
+            #cards {
+               grid-template-columns: repeat(5, minmax(0, 1fr)) !important;
+            }
+            }
+
+            @media (min-width: 1536px) {
+            #cards {
+               grid-template-columns: repeat(6, minmax(0, 1fr)) !important;
+            }
+            }
+
+            /* Card backgrounds */
+            .retailers-card.codelab-card,
+            .codelab-card {
+            background-color: #FFFFFF !important;
+            border: 1px solid #D1D5DB !important;
+            box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06) !important;
+            transition: all 0.2s ease !important;
+            border-radius: 6px !important;
+            overflow: hidden !important;
+            padding: 0 !important;
+            display: flex !important;
+            flex-direction: column !important;
+            cursor: pointer !important;
+            }
+
+            .codelab-card:hover {
+            transform: translateY(-2px) !important;
+            box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05) !important;
+            border-color: #2563EB !important;
+            }
+
+            .codelab-card .description {
+            color: #374151 !important;
+            font-size: 1rem !important;
+            line-height: 1.25rem !important;
+            padding: 1rem 1rem 0.5rem 1rem !important;
+            transition: color 0.2s ease !important;
+            min-height: 3.5rem !important;
+            }
+
+            .codelab-card:hover .description {
+            color: #2563EB !important;
+            }
+
+            /* Category pill styling - rounded pill shape */
+            .card-footer .category-bar,
+            .codelab-card .card-footer .category-bar,
+            .category-bar,
+            .administration-bar,
+            .aiapps-bar,
+            .dataapps-bar,
+            .developers-bar,
+            .embedding-bar,
+            .fundamentals-bar,
+            .functions-bar,
+            .partners-bar,
+            .security-bar,
+            .tables-bar,
+            .templates-bar,
+            .use-cases-bar {
+            display: inline-block !important;
+            width: auto !important;
+            padding: 0.25rem 0.75rem !important;
+            text-align: center !important;
+            font-family: 'Lato', sans-serif !important;
+            font-weight: 600 !important;
+            font-size: 0.75rem !important;
+            text-transform: uppercase !important;
+            letter-spacing: 0.025em !important;
+            border-radius: 9999px !important;
+            -webkit-border-radius: 9999px !important;
+            -moz-border-radius: 9999px !important;
+            margin: 0 !important;
+            color: #FFFFFF !important;
+            border: none !important;
+            box-shadow: none !important;
+            }
+
+            .codelab-card .card-footer,
+            .card-footer {
+            padding: 1rem !important;
+            margin-top: auto !important;
+            width: 100% !important;
+            display: flex !important;
+            align-items: flex-start !important;
+            justify-content: flex-start !important;
+            border-radius: 0 !important;
+            }
+
+            .codelab-card .card-duration,
+            .card-duration {
+            display: none !important;
+            }
+
+            /* Footer styling - improve readability */
+            .footer {
+            background-color: #1a1a1a !important;
+            }
+
+            .footer h3,
+            .footer .paragraph-2 {
+            color: #FFFFFF !important;
+            }
+
+            .footer-link,
+            .footer a {
+            color: #9CA3AF !important;
+            }
+
+            .footer-link:hover,
+            .footer a:hover {
+            color: #FFFFFF !important;
+            }
+
+            /* Update header buttons to match Sigma homepage */
+            .nav-button-wrapper a.button-secondary,
+            .nav-button-wrapper a.button-secondary:link,
+            .nav-button-wrapper a.button-secondary:visited,
+            .buttons-wrapper a.button-secondary,
+            .buttons-wrapper a.button-secondary:link,
+            .buttons-wrapper a.button-secondary:visited,
+            .section-hero a.button-secondary,
+            a.button-secondary.w-button {
+            background-color: #d4ff00 !important;
+            background-image: none !important;
+            border: 1px solid #000 !important;
+            color: #000 !important;
+            padding: 10px 24px !important;
+            border-radius: 50px !important;
+            font-size: 14px !important;
+            font-weight: 500 !important;
+            text-transform: none !important;
+            text-decoration: none !important;
+            display: inline-block !important;
+            }
+
+            .nav-button-wrapper a.button-primary,
+            .nav-button-wrapper a.button-primary:link,
+            .nav-button-wrapper a.button-primary:visited,
+            .buttons-wrapper a.button-primary,
+            .buttons-wrapper a.button-primary:link,
+            .buttons-wrapper a.button-primary:visited,
+            .section-hero a.button-primary,
+            a.button-primary.w-button {
+            background-color: #d4ff00 !important;
+            background-image: none !important;
+            border: 1px solid #000 !important;
+            color: #000 !important;
+            padding: 10px 24px !important;
+            border-radius: 50px !important;
+            font-size: 14px !important;
+            font-weight: 500 !important;
+            text-transform: none !important;
+            text-decoration: none !important;
+            display: inline-block !important;
+            }
          </style>
          <!-- End of PB add -->
       </head>
@@ -796,12 +1010,12 @@
                      {%- if codelabPin(view, codelab) -%}
                      <div class="card-pin"></div>
                      {%- endif -%}
-                     <div class="header-7 description">{{codelab.title}}</div>
+                     <a href="{{codelabUrl(view, codelab)}}" on-tap="navigate" style="text-decoration: none; color: inherit;">
+                        <div class="header-7 description">{{codelab.title}}</div>
+                     </a>
                      <div class="card-footer">
-                        <div class="category-icon {{categoryClass(codelab, cat.level)}}-icon"></div>
-                        <a href="{{codelabUrl(view, codelab)}}" on-tap="navigate"
-                           class="button-secondary w-button {{categoryClass(codelab, cat.level)}}-bg">Start
-                        </a>
+                        <!-- <div class="category-icon {{categoryClass(codelab, cat.level)}}-icon"></div> -->
+                        <div class="category-bar {{categoryClass(codelab, cat.level)}}-bar">First Friday Feature</div>
                      </div>
                      <div class="card-duration">
                         <!--<div class="paragraph-2 ">{%- if codelab.duration -%}{{codelab.duration}} min {%- endif -%}</div>-->
@@ -892,8 +1106,8 @@ <h3 class="paragraph-2 g-text-color-neutral-6 g-mg-bottom-medium">Company</h3>
                      </nav>
                      <div id="w-node-_35691ef6-8a0b-1f2a-08de-23a461e1dcad-61e1dc7a" class="footer-form-wrapper">
                         <div class="grid-wrapper">
-                           <h3 class="header-6 g-text-color-neutral-6 g-mg-bottom-small">Sigma Quickstarts Are Community Made</h3>
-                           <p class="paragraph-1 g-text-color-neutral-9">Sigma Employees, Partners and Power Users please reach out if you have an idea that should be a Quickstart!</p>
+                           <h3 class="header-6 g-text-color-neutral-6 g-mg-bottom-small">Sigma Quickstarts</h3>
+                           <p class="paragraph-1 g-text-color-neutral-9">Sigma employees, partners and power users please reach out if you have an idea that should be a Quickstart!</p>
                         </div>
                         <div class="footer-form-embed ">
                            <div class>
@@ -927,7 +1141,34 @@ <h3 class="paragraph-2 g-text-color-neutral-6 g-mg-bottom-medium">
          <script src="bower_components/url-search-params-polyfill/build/url-search-params.js"></script>
          <script src="scripts/app.js"></script>
          <!-- endbuild-->
-         <script src="https://d3e54v103j8qbb.cloudfront.net/js/jquery-3.5.1.min.dc5e7f18c8.js?site=62a3d35f74b3a546c309e010" type="text/javascript" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script> 
+         <script src="https://d3e54v103j8qbb.cloudfront.net/js/jquery-3.5.1.min.dc5e7f18c8.js?site=62a3d35f74b3a546c309e010" type="text/javascript" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
          <script src="../scripts/sigma-dev-8020.js" type="text/javascript"></script>
+         <script>
+         // Fix category display names
+         document.addEventListener('DOMContentLoaded', function() {
+            const categoryMap = {
+               'aiapps': 'AI Apps',
+               'dataapps': 'Data Apps'
+            };
+
+            // Function to fix category names
+            function fixCategoryNames() {
+               document.querySelectorAll('.category-bar').forEach(function(el) {
+                  const currentText = el.textContent.trim().toLowerCase();
+                  if (categoryMap[currentText]) {
+                     el.textContent = categoryMap[currentText];
+                     el.style.textTransform = 'none';
+                  }
+               });
+            }
+
+            // Run immediately
+            fixCategoryNames();
+
+            // Also run after a short delay to catch dynamically loaded content
+            setTimeout(fixCategoryNames, 500);
+            setTimeout(fixCategoryNames, 1000);
+         });
+         </script>
       </body>
    </html>
diff --git a/site/gulpfile.js b/site/gulpfile.js
index 7271a7cb..73f1d64f 100644
--- a/site/gulpfile.js
+++ b/site/gulpfile.js
@@ -229,6 +229,16 @@ gulp.task('build:fonts', () => {
     .pipe(gulp.dest('build'));
 });
 
+// build:data builds all the data files into the build directory.
+gulp.task('build:data', () => {
+  const srcs = [
+    'app/data/**/*'
+  ];
+
+  return gulp.src(srcs, { base: 'app/' })
+    .pipe(gulp.dest('build'));
+});
+
 // build:js builds all the javascript into the dest dir
 gulp.task('build:js', (callback) => {
   let streams = [];
@@ -299,6 +309,7 @@ gulp.task('build', gulp.series(
   'build:html',
   'build:images',
   'build:fonts',
+  'build:data',
   'build:js',
   'build:elements_js',
   'build:vulcanize',
@@ -395,6 +406,10 @@ gulp.task('watch:fonts', () => {
   gulp.watch('app/fonts/**/*', gulp.series('build:fonts'));
 });
 
+gulp.task('watch:data', () => {
+  gulp.watch('app/data/**/*', gulp.series('build:data'));
+});
+
 // watch:images watches js files for changes and re-builds them
 gulp.task('watch:js', () => {
   const srcs = [
@@ -413,6 +428,7 @@ gulp.task('watch', gulp.parallel(
     'watch:html',
     'watch:images',
     'watch:fonts',
+    'watch:data',
     'watch:js',
   ));
 
diff --git a/site/sigmaguides/src/dataaps_fundamentals/dataaps_fundamentals.md b/site/sigmaguides/src/apiapps_fundamentals/apiapps_fundamentals.md
similarity index 98%
rename from site/sigmaguides/src/dataaps_fundamentals/dataaps_fundamentals.md
rename to site/sigmaguides/src/apiapps_fundamentals/apiapps_fundamentals.md
index c13d150b..8c2751c3 100644
--- a/site/sigmaguides/src/dataaps_fundamentals/dataaps_fundamentals.md
+++ b/site/sigmaguides/src/apiapps_fundamentals/apiapps_fundamentals.md
@@ -1,14 +1,14 @@
 author: pballai
 id: dataaps_fundamentals
 summary: dataaps_fundamentals
-categories: dataapps
+categories: aiapps
 environments: web
 status: Published
 feedback link: https://github.com/sigmacomputing/sigmaquickstarts/issues
 tags: Default
 lastUpdated: 2024-10-24
 
-# Data Apps Fundamentals
+# AI Apps Fundamentals
 
 ## Overview 
 Duration: 5 
@@ -23,10 +23,10 @@ This transformation has occurred in stages, and we are now in stage three, as sh
 
 This QuickStart demonstrates how to use Sigma to build a data application (app) entirely within the Sigma UI. The data used will come from, and be stored in, Snowflake. During this demonstration, we will build a fully functional project tracking data app that, in the past, may have taken significant time to get up and running.
 
-This QuickStart is a bit longer than usual, and we understand that people can be pressed for time. While it is well worth the investment, if you can’t spare the time, you can instead [watch this 5-minute video](https://sigmacomputing.wistia.com/medias/6lneuw4062?__hstc=191098485.ee45354cafd3cb03900ca8358c6cba7c.1713989091503.1733934938183.1734711950588.87&__hssc=191098485.2.1734711950588&__hsfp=336580338) to see how impactful Sigma data apps can be for your organization.
+This QuickStart is a bit longer than usual, and we understand that people can be pressed for time. While it is well worth the investment, if you can’t spare the time, you can instead [watch this 5-minute video](https://sigmacomputing.wistia.com/medias/6lneuw4062?__hstc=191098485.ee45354cafd3cb03900ca8358c6cba7c.1713989091503.1733934938183.1734711950588.87&__hssc=191098485.2.1734711950588&__hsfp=336580338) to see how impactful Sigma AI apps can be for your organization.
 
 <aside class="positive">
-<strong>PLEASE READ:</strong><br> Sigma data apps are rapidly evolving, with new features being added regularly. If your Sigma instance does not have the specific feature shown (or if the UI has changed), please contact Sigma support for assistance in accessing the feature.
+<strong>PLEASE READ:</strong><br> Sigma AI apps are rapidly evolving, with new features being added regularly. If your Sigma instance does not have the specific feature shown (or if the UI has changed), please contact Sigma support for assistance in accessing the feature.
 </aside>
 
 [How to contact Sigma support](https://help.sigmacomputing.com/docs/sigma-support)
@@ -110,7 +110,7 @@ The finished product can look something like this (depending on your styling cho
 For more information on Sigma's product release strategy, see [Sigma product releases.](https://help.sigmacomputing.com/docs/sigma-product-releases)
  
 ### Target Audience
-Sigma builders interested in leveraging the advanced capabilities to create fully functioning Data Apps.
+Sigma builders interested in leveraging the advanced capabilities to create fully functioning AI Apps.
 
 ### Prerequisites
 
@@ -258,7 +258,7 @@ Add the following row of data to the `Project Tracker Input Table`.
 </aside>
 
 #### Step 8: 
-Click the `Save as` button and name workbook as `Data Apps Fundamentals`.
+Click the `Save as` button and name workbook as `AI Apps Fundamentals`.
 
 #### Step 9: 
 Using the element bar, in the `Controls` group, add a `Text Input` control above the input table: 
@@ -794,7 +794,7 @@ Move the the `Task Tracking Input Table` to the `Control Panel` page. Now that w
 Add an additional task record for the same project and sort by `Project Name`. 
 
 <aside class="positive">
-<strong>IMPORTANT:</strong><br> This demonstrates the "multiple tasks to one project" relationship. This is a very important concept in building data apps in Sigma. 
+<strong>IMPORTANT:</strong><br> This demonstrates the "multiple tasks to one project" relationship. This is a very important concept in building AI apps in Sigma. 
 </aside>
 
 ![Footer](assets/sigma_footer.png)
@@ -1291,7 +1291,7 @@ It is a good practice to package elements in containers in a manner that will be
 We have also demonstrated the other cool benefit of using containers; they can be targeted by an action!
 
 ### Step 3: 
-With Sigma, your data apps can support whatever branding may be required. 
+With Sigma, your AI apps can support whatever branding may be required. 
 
 You can customize to match your own branding and style considerations while maintaining accessibility and visual design best practices. 
 
@@ -1299,7 +1299,7 @@ Images and icons can be added for additional personalization:
 
 <img src="assets/dataaps_fun_done.png" width="800"/>
 
-Here are some example of styled data apps in Sigma:
+Here are some example of styled AI apps in Sigma:
 
 <img src="assets/containers.gif" />
 
@@ -1309,7 +1309,7 @@ Here are some example of styled data apps in Sigma:
 ## What we've covered
 Duration: 5
 
-In this QuickStart, we built a fully functional project tracking application using Sigma and sample data. Hopefully, this was a smooth and eye-opening process that showed just how easy building data apps can be with Sigma. Additional resources are provided below.
+In this QuickStart, we built a fully functional project tracking application using Sigma and sample data. Hopefully, this was a smooth and eye-opening process that showed just how easy building AI apps can be with Sigma. Additional resources are provided below.
 
 **Additional Resource Links**
 
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/1.png b/site/sigmaguides/src/apiapps_fundamentals/assets/1.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/1.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/1.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/10.png b/site/sigmaguides/src/apiapps_fundamentals/assets/10.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/10.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/10.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/2.png b/site/sigmaguides/src/apiapps_fundamentals/assets/2.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/2.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/2.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/3-dots.png b/site/sigmaguides/src/apiapps_fundamentals/assets/3-dots.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/3-dots.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/3-dots.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/3.png b/site/sigmaguides/src/apiapps_fundamentals/assets/3.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/3.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/3.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/4.png b/site/sigmaguides/src/apiapps_fundamentals/assets/4.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/4.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/4.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/5.png b/site/sigmaguides/src/apiapps_fundamentals/assets/5.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/5.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/5.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/6.png b/site/sigmaguides/src/apiapps_fundamentals/assets/6.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/6.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/6.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/7.png b/site/sigmaguides/src/apiapps_fundamentals/assets/7.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/7.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/7.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/8.png b/site/sigmaguides/src/apiapps_fundamentals/assets/8.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/8.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/8.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/9.png b/site/sigmaguides/src/apiapps_fundamentals/assets/9.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/9.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/9.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/CleanShot 2024-12-18 at 16.23.53.png b/site/sigmaguides/src/apiapps_fundamentals/assets/CleanShot 2024-12-18 at 16.23.53.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/CleanShot 2024-12-18 at 16.23.53.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/CleanShot 2024-12-18 at 16.23.53.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/caret.png b/site/sigmaguides/src/apiapps_fundamentals/assets/caret.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/caret.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/caret.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/closeview.png b/site/sigmaguides/src/apiapps_fundamentals/assets/closeview.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/closeview.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/closeview.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/containers.gif b/site/sigmaguides/src/apiapps_fundamentals/assets/containers.gif
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/containers.gif
rename to site/sigmaguides/src/apiapps_fundamentals/assets/containers.gif
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_0.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_0.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_0.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_0.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_0a.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_0a.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_0a.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_0a.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_0b.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_0b.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_0b.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_0b.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_0c.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_0c.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_0c.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_0c.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1a.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1a.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1a.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1a.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1b.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1b.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1b.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1b.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1c.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1c.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1c.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1c.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1d.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1d.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1d.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1d.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1e.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1e.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1e.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1e.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1f.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1f.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1f.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1f.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1g.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1g.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1g.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1g.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1h.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1h.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1h.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1h.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1i.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1i.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1i.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1i.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1j.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1j.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1j.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1j.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1k.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1k.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1k.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1k.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1l.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1l.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1l.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1l.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1m.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1m.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1m.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1m.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1n.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1n.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1n.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1n.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1o.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1o.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1o.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1o.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1p.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1p.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1p.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1p.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1q.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1q.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1q.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1q.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1r.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1r.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1r.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1r.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1s.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1s.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1s.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1s.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1t.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1t.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1t.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1t.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1t1.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1t1.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1t1.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1t1.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1u.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1u.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1u.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1u.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1v.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1v.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1v.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1v.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1w.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1w.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1w.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1w.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1x.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1x.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_1x.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_1x.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2a.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2a.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2a.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2a.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2b.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2b.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2b.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2b.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2c.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2c.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2c.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2c.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2d.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2d.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2d.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2d.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2e.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2e.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2e.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2e.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2f.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2f.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2f.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2f.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2g.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2g.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2g.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2g.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2h.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2h.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2h.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2h.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2i.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2i.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2i.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2i.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2ia.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2ia.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2ia.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2ia.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2ib.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2ib.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2ib.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2ib.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2iba.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2iba.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2iba.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2iba.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2j.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2j.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2j.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2j.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2k.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2k.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_2k.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_2k.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_3.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_3.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_3.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_3.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_3a.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_3a.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_3a.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_3a.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_3b.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_3b.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_3b.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_3b.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_3c.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_3c.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_3c.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_3c.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_3d.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_3d.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_3d.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_3d.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_3e.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_3e.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_3e.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_3e.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4a.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4a.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4a.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4a.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4b.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4b.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4b.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4b.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4c.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4c.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4c.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4c.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4d.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4d.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4d.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4d.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4e.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4e.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4e.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4e.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4f.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4f.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4f.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4f.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4g.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4g.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4g.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4g.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4h.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4h.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4h.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4h.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4i.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4i.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4i.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4i.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4j.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4j.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4j.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4j.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4k.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4k.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4k.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4k.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4l.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4l.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4l.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4l.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4m.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4m.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4m.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4m.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4n.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4n.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4n.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4n.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4o.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4o.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4o.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4o.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4p.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4p.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4p.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4p.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4q.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4q.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4q.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4q.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4r.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4r.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4r.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4r.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4s.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4s.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4s.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4s.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4t.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4t.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_4t.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_4t.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5a.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5a.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5a.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5a.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5b.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5b.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5b.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5b.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5c.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5c.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5c.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5c.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5d.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5d.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5d.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5d.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5e.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5e.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5e.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5e.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5f.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5f.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5f.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5f.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5g.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5g.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5g.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5g.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5h.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5h.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5h.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5h.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5i.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5i.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5i.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5i.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5j.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5j.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5j.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5j.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5k.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5k.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5k.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5k.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5l.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5l.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5l.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5l.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5m.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5m.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5m.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5m.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5n.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5n.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5n.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5n.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5o.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5o.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5o.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5o.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5p.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5p.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5p.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5p.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5q.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5q.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5q.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5q.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5r.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5r.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5r.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5r.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5s.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5s.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5s.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5s.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5t.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5t.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5t.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5t.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5u.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5u.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5u.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5u.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5v.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5v.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_5v.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_5v.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6a.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6a.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6a.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6a.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6b.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6b.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6b.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6b.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6c.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6c.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6c.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6c.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6d.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6d.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6d.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6d.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6e.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6e.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6e.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6e.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6f.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6f.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6f.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6f.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6g.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6g.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6g.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6g.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6h.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6h.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6h.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6h.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6i.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6i.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6i.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6i.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6j.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6j.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6j.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6j.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6k.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6k.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6k.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6k.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6l.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6l.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6l.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6l.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6m.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6m.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6m.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6m.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6m1.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6m1.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6m1.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6m1.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6n.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6n.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6n.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6n.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6o.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6o.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_6o.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_6o.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7a.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7a.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7a.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7a.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7b.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7b.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7b.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7b.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7c.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7c.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7c.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7c.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7d.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7d.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7d.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7d.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7e.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7e.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7e.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7e.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7g.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7g.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7g.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7g.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7h.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7h.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7h.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7h.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7i.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7i.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7i.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7i.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7j.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7j.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7j.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7j.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7k.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7k.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7k.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7k.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7l.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7l.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7l.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7l.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7m.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7m.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7m.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7m.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7n.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7n.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7n.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7n.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7o.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7o.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7o.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7o.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7p.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7p.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_7p.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_7p.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_8.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_8.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_8.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_8.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_done.png b/site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_done.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/dataaps_fun_done.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/dataaps_fun_done.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/facebook.png b/site/sigmaguides/src/apiapps_fundamentals/assets/facebook.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/facebook.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/facebook.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/greencheckbox.png b/site/sigmaguides/src/apiapps_fundamentals/assets/greencheckbox.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/greencheckbox.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/greencheckbox.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/heart_icon.png b/site/sigmaguides/src/apiapps_fundamentals/assets/heart_icon.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/heart_icon.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/heart_icon.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/horizonalline.png b/site/sigmaguides/src/apiapps_fundamentals/assets/horizonalline.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/horizonalline.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/horizonalline.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/lineage.gif b/site/sigmaguides/src/apiapps_fundamentals/assets/lineage.gif
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/lineage.gif
rename to site/sigmaguides/src/apiapps_fundamentals/assets/lineage.gif
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/linkedin.png b/site/sigmaguides/src/apiapps_fundamentals/assets/linkedin.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/linkedin.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/linkedin.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/sigma_footer.png b/site/sigmaguides/src/apiapps_fundamentals/assets/sigma_footer.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/sigma_footer.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/sigma_footer.png
diff --git a/site/sigmaguides/src/dataaps_fundamentals/assets/twitter.png b/site/sigmaguides/src/apiapps_fundamentals/assets/twitter.png
similarity index 100%
rename from site/sigmaguides/src/dataaps_fundamentals/assets/twitter.png
rename to site/sigmaguides/src/apiapps_fundamentals/assets/twitter.png
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_05.png b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_05.png
index a8aa53eb..61c4cdb2 100644
Binary files a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_05.png and b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_05.png differ
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_05a.png b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_05a.png
new file mode 100644
index 00000000..c8e5380e
Binary files /dev/null and b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_05a.png differ
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_06.png b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_06.png
index f35e30d1..d38a25a7 100644
Binary files a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_06.png and b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_06.png differ
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_14a.png b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_14a.png
new file mode 100644
index 00000000..d0cb79d1
Binary files /dev/null and b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_14a.png differ
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_16.png b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_16.png
index 1e2b9b15..8158959c 100644
Binary files a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_16.png and b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_16.png differ
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_16c.png b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_16c.png
new file mode 100644
index 00000000..20564588
Binary files /dev/null and b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_16c.png differ
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_16d.png b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_16d.png
new file mode 100644
index 00000000..031b0726
Binary files /dev/null and b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_16d.png differ
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_17.png b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_17.png
index f32de67b..ea9e1903 100644
Binary files a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_17.png and b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_17.png differ
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_18.png b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_18.png
index 0e45b96f..6944375c 100644
Binary files a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_18.png and b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_18.png differ
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_19.png b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_19.png
index a8d2aff6..99419c0c 100644
Binary files a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_19.png and b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_19.png differ
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_20.png b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_20.png
index 808712d9..723520bd 100644
Binary files a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_20.png and b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_20.png differ
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_22.png b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_22.png
index 7f0266a7..7f06bd6d 100644
Binary files a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_22.png and b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_22.png differ
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_24.png b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_24.png
index 885c0a77..b91df61c 100644
Binary files a/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_24.png and b/site/sigmaguides/src/partners_snowflake_intelligence/assets/cortex_24.png differ
diff --git a/site/sigmaguides/src/partners_snowflake_intelligence/partners_snowflake_intelligence.md b/site/sigmaguides/src/partners_snowflake_intelligence/partners_snowflake_intelligence.md
index 61fa974a..4ed74591 100644
--- a/site/sigmaguides/src/partners_snowflake_intelligence/partners_snowflake_intelligence.md
+++ b/site/sigmaguides/src/partners_snowflake_intelligence/partners_snowflake_intelligence.md
@@ -37,8 +37,6 @@ Any Sigma or Snowflake user interested in how Snowflake Intelligence and Sigma c
 
 ### What You'll Learn
 - How to set up Snowflake Intelligence and create Snowflake Intelligence Agents
-- How to configure service users, roles, and Programmatic Access Tokens (PAT) for secure API access
-- How to create external access integrations and secrets for Snowflake Intelligence API calls
 - How to build a stored procedure that invokes Snowflake Intelligence Agents via REST API
 - How to configure a Sigma workbook with input tables and actions to interact with agents
 - How to connect agents to your data using custom tools and functions
@@ -87,10 +85,10 @@ For example, we ran:
 USE ROLE ACCOUNTADMIN;
 
 CREATE DATABASE IF NOT EXISTS snowflake_intelligence;
-GRANT USAGE ON DATABASE snowflake_intelligence TO ROLE PUBLIC;
+GRANT USAGE ON DATABASE snowflake_intelligence TO ROLE ACCOUNTADMIN;
 
 CREATE SCHEMA IF NOT EXISTS snowflake_intelligence.agents;
-GRANT USAGE ON SCHEMA snowflake_intelligence.agents TO ROLE PUBLIC;
+GRANT USAGE ON SCHEMA snowflake_intelligence.agents TO ROLE ACCOUNTADMIN;
 
 GRANT CREATE AGENT ON SCHEMA snowflake_intelligence.agents TO ROLE ACCOUNTADMIN;
 ```
@@ -98,6 +96,8 @@ GRANT CREATE AGENT ON SCHEMA snowflake_intelligence.agents TO ROLE ACCOUNTADMIN;
 Now running this script again works, but returns no results (we need to create an agent still):
 ```code
 USE ROLE ACCOUNTADMIN;
+USE DATABASE snowflake_intelligence;
+USE SCHEMA agents;
 SHOW AGENTS IN SCHEMA SNOWFLAKE_INTELLIGENCE.AGENTS;
 ```
 
@@ -112,13 +112,15 @@ Click the `Create agent` button.
 <strong>NOTE:</strong><br> Make sure you are using the ACCOUNTADMIN role.
 </aside>
 
-Set the `name` and `display name` to `quickstarts` and click `Create agent`:
+Set the database and schema as shown. the `name` and `display name` to `QUICKSTARTS`:
 
 <img src="assets/cortex_05.png" width="600"/>
 
-Once the agent is created, we can `edit` it and add a description to help tailor the responses to our sample retail dataset.
+ Click `Create agent`.
 
-Set the `Description` to:
+Once the agent is created, we instruct the agent adopt a persona to help tailor the responses to our sample retail dataset.
+
+Use the prompt:
 ```code
 You are a Product Insights Analyst.
   
@@ -127,11 +129,12 @@ An AI retail analyst specializing in customer feedback analysis for a large e-co
 It can summarize reviews by category, detect emerging issues, and highlight products that delight or frustrate customers.
 ```
 
-Click `Save`.
+<img src="assets/cortex_05a.png" width="800"/>
+
 
-Now we can verify it works by asking a question like `what agent are you?`:
+Submit it and the reponse will be similar to:
 
-<img src="assets/cortex_06.png" width="800"/>
+<img src="assets/cortex_06.png" width="600"/>
 
 Now this script returns the `quickstart` agent:
 ```code
@@ -156,23 +159,21 @@ Run the following command in Snowflake:
 -- Use a privileged role for account-level and global grants
 USE ROLE ACCOUNTADMIN;
 
--- Create the database + schema if they don't exist yet
-CREATE DATABASE IF NOT EXISTS QUICKSTARTS
-  COMMENT = 'QS sandboxes and examples';
-CREATE SCHEMA IF NOT EXISTS QUICKSTARTS.AGENTS
-  COMMENT = 'Agent QuickStart assets (procs, logs, etc.)';
+-- Use the database + schema created earlier
+use database snowflake_intelligence;
+use schema agents;
 
 -- Create a dedicated service role for Sigma
 CREATE ROLE IF NOT EXISTS SIGMA_SERVICE_ROLE;
 
 -- Grant role basic access to the namespace where the proc will live
-GRANT USAGE ON DATABASE QUICKSTARTS TO ROLE SIGMA_SERVICE_ROLE;
-GRANT USAGE ON SCHEMA QUICKSTARTS.AGENTS TO ROLE SIGMA_SERVICE_ROLE;
+GRANT USAGE ON DATABASE snowflake_intelligence TO ROLE SIGMA_SERVICE_ROLE;
+GRANT USAGE ON SCHEMA snowflake_intelligence.agents TO ROLE SIGMA_SERVICE_ROLE;
 
 -- Allow the role to create/execute procs in this schema (proc will be added later)
-GRANT CREATE PROCEDURE ON SCHEMA QUICKSTARTS.AGENTS TO ROLE SIGMA_SERVICE_ROLE;
+GRANT CREATE PROCEDURE ON SCHEMA snowflake_intelligence.agents TO ROLE SIGMA_SERVICE_ROLE;
 -- we plan to log chats to a table in this schema, pre-grant table privileges:
-GRANT CREATE TABLE ON SCHEMA QUICKSTARTS.AGENTS TO ROLE SIGMA_SERVICE_ROLE;
+GRANT CREATE TABLE ON SCHEMA snowflake_intelligence.agents TO ROLE SIGMA_SERVICE_ROLE;
 
 -- Create the service user that Sigma will use to connect
 CREATE USER IF NOT EXISTS SIGMA_SERVICE_USER
@@ -187,292 +188,178 @@ GRANT ROLE SIGMA_SERVICE_ROLE TO USER SIGMA_SERVICE_USER;
 GRANT USAGE ON WAREHOUSE COMPUTE_WH TO ROLE SIGMA_SERVICE_ROLE;
 ```
 
-After selecting `Run All` the script will run to success:
-
-<img src="assets/cortex_07.png" width="800"/>
+After selecting `Run All` the script will run to success (at can take a minute or two to run to completion).
 
 Now would be a good time to configure the connection to Snowflake in Sigma. The connection will require key-pair authentication and write-back enabled.
 
 For more information, see: [Snowflake Key-pair Authorization](https://quickstarts.sigmacomputing.com/guide/security_snowflake_keypair_rotation/index.html?index=..%2F..index#0) and [Set up write access](https://help.sigmacomputing.com/docs/set-up-write-access)
 
-## Create a Programmatic Access Token (PAT) 
-Duration: 5 
-
-Now that we have a service account, we need to create a `Programmatic Access Token` ("PAT) for the service user.
-
-Before Snowflake can call the Cortex API on behalf of your Sigma service user, you’ll need to create a Programmatic Access Token (PAT).
-
-This token authorizes Snowflake to make REST API calls (to the Cortex Agent endpoint) on behalf of that user—without requiring interactive login.
-
-To create a PAT, we also need a service account user and role.
-
-Service users must have a network policy restricting the IPs allowed to use the token. 
-
-### Create a network policy
-For this QuickStart demonstration, we will relax that rule by applying an authentication policy that does not enforce a network policy for PAT creation, but expires the PAT after one day.
-
-<aside class="negative">
-<strong>BEST PRACTICE:</strong><br> In production, replace this with a real NETWORK POLICY listing your organization’s trusted egress IPs or CIDR ranges.
-
-This ensures only approved systems (like Sigma’s outbound IPs) can use the service user’s token.
-</aside>
-
-Run the following command in Snowflake:
-```code
-USE ROLE ACCOUNTADMIN;
-
--- Demo-only network policy (allows all IPv4)
-CREATE OR REPLACE NETWORK POLICY quickstarts
-  ALLOWED_IP_LIST = ('0.0.0.0/0')
-  COMMENT = 'Demo-only: permits PAT use from any IPv4 address';
-
--- Attach the policy to the service user
-ALTER USER SIGMA_SERVICE_USER SET NETWORK_POLICY = quickstarts;
-
--- Create a short-lived PAT (1-day expiry)
-ALTER USER SIGMA_SERVICE_USER
-ADD PROGRAMMATIC ACCESS TOKEN SIGMA_CORTEX_QUICKSTARTS_PAT
-  ROLE_RESTRICTION = 'SIGMA_SERVICE_ROLE'
-  DAYS_TO_EXPIRY = 1
-  COMMENT = 'Token for Sigma–Cortex QuickStart demo (expires in 1 day)';
-```
-
-<aside class="positive">
-<strong>BEST PRACTICE:</strong><br> This token is intentionally short-lived because the demo network policy (0.0.0.0/0) is fully open.
-
-For production:
-- Use a restricted network policy listing your trusted egress IPv4 addresses or CIDR ranges.
-- Increase DAYS_TO_EXPIRY only once network restrictions are in place.
-- Store and rotate tokens securely using Snowflake’s CREATE SECRET integration.
-</aside>
-
-Once the script is run, copy the `token secret` to a text file as we will use it next:
-
-<img src="assets/cortex_02.png" width="800"/>
-
-
-<aside class="positive">
-<strong>IMPORTANT:</strong><br> If you want to recreate a network policy after it is already created, a quick way to do that is to run this script:
-
-ALTER USER SIGMA_SERVICE_USER UNSET NETWORK_POLICY;<br>
-DROP NETWORK POLICY IF EXISTS quickstarts;<br>
-ALTER USER SIGMA_SERVICE_USER<br>
-REMOVE PROGRAMMATIC ACCESS TOKEN SIGMA_CORTEX_QUICKSTARTS_PAT;
-
-Then just rerun the network policy creation script.
-</aside>
-
-### Generate the PAT
-Run the following command in Snowflake:
-```code
-USE ROLE ACCOUNTADMIN;
-
-ALTER USER SIGMA_SERVICE_USER
-ADD PROGRAMMATIC ACCESS TOKEN SIGMA_CORTEX_PAT
-  ROLE_RESTRICTION = SIGMA_SERVICE_ROLE
-  DAYS_TO_EXPIRY = 30
-  COMMENT = 'Token for Sigma–Cortex integration';
-```
-
 ![Footer](assets/sigma_footer.png)
 <!-- END OF SECTION-->
 
-## Snowflake Objects
-Duration: 5
-
-With your Programmatic Access Token (PAT) created, the next step is to let Snowflake securely call the Cortex API using that token. We’ll:
-
-- Store the PAT in a Snowflake Secret
-- Allow outbound HTTPS to your Snowflake Intelligenceendpoint via a Network Rule
-- Bind both into an External Access Integration used by the stored procedure
-
-<aside class="negative">
-<strong>BEST PRACTICE:</strong><br> For production, pair this with a restricted network policy on the service user and use a sensible PAT expiry/rotation strategy.
-</aside>
 
-Run the following command in Snowflake, replacing **<paste_your_token_secret_here>** and **<your_account_identifier>** and with your values:
-
-```code
--- ------------------------------------------------------------
--- Setup for Sigma + Snowflake Snowflake Intelligence Integration (Account Objects)
--- ------------------------------------------------------------
--- This script:
--- 1) Uses ACCOUNTADMIN for account-level objects
--- 2) Creates a SECRET holding your already-created PAT (token_secret)
--- 3) Creates a NETWORK RULE allowing egress to your Snowflake API host
--- 4) Creates an EXTERNAL ACCESS INTEGRATION binding the rule + secret
--- 5) Switches context to QUICKSTARTS.CORTEX_QS (proc will be created later)
--- ------------------------------------------------------------
-
--- Use a role with privileges to create account-level objects
-USE ROLE ACCOUNTADMIN;
-
--- Switch to the db/schema
-USE DATABASE QUICKSTARTS;
-USE SCHEMA AGENTS;
-
--- Replace with your real host from Snowsight
--- Replace <your_account_identifier> with your org/acc locator, e.g. xy12345.us-east-1
-SET ACCOUNT_HOST = '<your_account_identifier>.snowflakecomputing.com';
-
--- (1) Store your existing PAT (paste the token_secret from Step 1)
-CREATE OR REPLACE SECRET SIGMA_CORTEX_QUICKSTARTS_PAT
-  TYPE = GENERIC_STRING
-  SECRET_STRING = '<paste_your_token_secret_here>';
-
--- (2) Allow outbound HTTPS to your account's Snowflake Intelligence API host
-CREATE OR REPLACE NETWORK RULE SNOWFLAKE_API_EGRESS_NETWORK_RULE
-  MODE = EGRESS
-  TYPE = HOST_PORT
-  VALUE_LIST = ($ACCOUNT_HOST);
-
--- (3) Bind the secret + network rule into an external access integration
-CREATE OR REPLACE EXTERNAL ACCESS INTEGRATION CORTEX_AGENT_EXTERNAL_ACCESS_INTEGRATION
-  ALLOWED_NETWORK_RULES = (SNOWFLAKE_API_EGRESS_NETWORK_RULE)
-  ALLOWED_AUTHENTICATION_SECRETS = (SIGMA_CORTEX_QUICKSTARTS_PAT)
-  ENABLED = TRUE;
-```
-
-After running, Snowflake will return `Integration CORTEX_AGENT_EXTERNAL_ACCESS_INTEGRATION successfully created.`.
-
-![Footer](assets/sigma_footer.png)
-<!-- END OF SECTION-->
 
 ## Create the Cortex Agent Stored Procedure in Snowflake
 Duration: 5
 
 Next we create a stored procedure that when called from Sigma, invokes the Snowflake Intelligence Agent via Snowflake’s REST API. 
 
-It takes two arguments, an `agent name` and a `user message`, and returns the agent’s text response.
+This stored procedure takes an `agent name` and a `user prompt`, but for this QuickStart it always routes requests to the `QUICKSTARTS agent` in `SNOWFLAKE_INTELLIGENCE.AGENTS`. It calls the agent’s REST endpoint and returns the final text response as a string.
 
-Run the following command in Snowflake, replacing the values for **<your-snowflake-account-identifier>** with your Snowflake account identifier: 
+Run the following command in Snowflake (it will take a minute or two to complete):
 ```code
--- Create the API caller procedure
-CREATE OR REPLACE PROCEDURE QUICKSTARTS.AGENTS.CALL_CORTEX_AGENT_API(
-  CORTEX_AGENT VARCHAR, 
-  USER_MESSAGE VARCHAR
+use database snowflake_intelligence;
+use schema agents;
+use role SIGMA_SERVICE_ROLE;
+
+create or replace procedure call_cortex_agent_api(
+    cortex_agent varchar,
+    user_message varchar
 )
-RETURNS VARCHAR
-LANGUAGE PYTHON
-RUNTIME_VERSION = '3.9'
-PACKAGES = ('requests','snowflake-snowpark-python')
-HANDLER = 'call_agent_api'
-EXTERNAL_ACCESS_INTEGRATIONS = (CORTEX_AGENT_EXTERNAL_ACCESS_INTEGRATION)
-SECRETS = ('SIGMA_CORTEX_QUICKSTARTS_PAT' = SIGMA_CORTEX_QUICKSTARTS_PAT)
-EXECUTE AS OWNER
-AS
+copy grants
+returns string
+language python
+runtime_version = '3.10'
+packages = ('snowflake-snowpark-python==1.9.0')
+handler = 'main'
+execute as owner
+as
 $$
-import _snowflake, requests, json
-
-def call_agent_api(session, cortex_agent, user_message):
+import _snowflake
+import json
+from datetime import datetime
+
+# Force a single agent for this QuickStart
+AGENT_NAME = "QUICKSTARTS"
+
+def make_api_request(path, body):
+    headers = {
+        "Content-Type": "application/json",
+        "Accept": "application/json"
+    }
+    TIMEOUT_MS = 180_000
+
+    return _snowflake.send_snow_api_request(
+        "POST",
+        path,
+        headers,
+        {},      # query params
+        body,
+        {},      # cookies
+        TIMEOUT_MS
+    )
+
+def parse_streaming_response(response):
+    raw_content = response.get("content", "")
+
+    if isinstance(raw_content, str):
+        try:
+            parsed = json.loads(raw_content)
+        except Exception as e:
+            return f"JSON parse error: {str(e)}"
+    else:
+        parsed = raw_content
+
+    # Streaming format (list of events)
+    if isinstance(parsed, list):
+        for event in reversed(parsed):
+            if not isinstance(event, dict):
+                continue
+
+            event_type = event.get("event", "")
+            data = event.get("data", {})
+
+            if event_type == "response" and isinstance(data, dict):
+                message = data.get("message", {})
+                if isinstance(message, dict):
+                    content = message.get("content", [])
+                    if isinstance(content, list):
+                        for item in reversed(content):
+                            if isinstance(item, dict) and item.get("type") == "text":
+                                text = item.get("text", "")
+                                if text:
+                                    return text
+
+            if event_type == "response.text" and isinstance(data, dict):
+                text = data.get("text", "")
+                if text:
+                    return text
+
+        return f"No text found in {len(parsed)} events."
+
+    # Non-streaming format (dict)
+    if isinstance(parsed, dict):
+        message = parsed.get("message", {})
+        if isinstance(message, dict):
+            content = message.get("content", [])
+            if isinstance(content, list):
+                for item in reversed(content):
+                    if isinstance(item, dict) and item.get("type") == "text":
+                        return item.get("text", "")
+        return f"No text in dict response. Keys: {list(parsed.keys())}"
+
+    return f"Unexpected parsed type: {type(parsed).__name__}"
+
+def main(session, cortex_agent, user_message):
     try:
-        ALLOWLIST = {"QUICKSTARTS": []}
-        
-        if cortex_agent not in ALLOWLIST:
-            return f"Invalid agent '{cortex_agent}'. Valid options: {', '.join(sorted(ALLOWLIST.keys()))}"
-        
-        account_host = "<your_account_identifier>.snowflakecomputing.com"
-        url = f"https://{account_host}/api/v2/databases/snowflake_intelligence/schemas/agents/agents/{cortex_agent}:run"
-        
-        token = _snowflake.get_generic_secret_string('SIGMA_CORTEX_QUICKSTARTS_PAT')
-        headers = {
-            "Content-Type": "application/json",
-            "Accept": "text/event-stream",
-            "Authorization": f"Bearer {token}",
-            "X-Snowflake-Authorization-Token-Type": "PROGRAMMATIC_ACCESS_TOKEN",
-            "X-Snowflake-Role": "SIGMA_SERVICE_ROLE",
-        }
-        
+        # Ignore cortex_agent parameter; always call the QuickStart agent
+        url = f"/api/v2/databases/snowflake_intelligence/schemas/agents/agents/{AGENT_NAME}:run"
+
+        # Omit tool_choice so orchestration rules can plan tool usage
         payload = {
             "messages": [
-                {"role": "user", "content": [{"type": "text", "text": user_message}]}
-            ],
-            "tool_choice": {"type": "auto"}
+                {
+                    "role": "user",
+                    "content": [{"type": "text", "text": user_message}]
+                }
+            ]
         }
-        
-        text_chunks, current_event = [], None
-        
-        with requests.post(url, json=payload, headers=headers, stream=True, timeout=60) as r:
-            r.raise_for_status()
-            for raw in r.iter_lines(decode_unicode=True):
-                if not raw: 
-                    continue
-                line = raw.strip()
-                
-                if line.startswith("event: "):
-                    current_event = line[7:]
-                elif line.startswith("data: "):
-                    data_str = line[6:]
-                    if current_event in ("response.text", "response.text.delta"):
-                        try:
-                            t = json.loads(data_str).get("text")
-                            if isinstance(t, str): 
-                                text_chunks.append(t)
-                        except Exception: 
-                            pass
-                    elif current_event == "response.error":
-                        try:
-                            msg = json.loads(data_str).get("message") or data_str
-                            return f"Agent error: {msg}"
-                        except Exception:
-                            return f"Agent error: {data_str}"
-                    elif current_event == "response.completed":
-                        break
-        
-        if text_chunks:
-            return "".join(text_chunks)
-        
-        # Fallback: try non-streaming
-        r2 = requests.post(url, json=payload, headers={**headers, "Accept":"application/json"}, timeout=60)
-        r2.raise_for_status()
-        try:
-            body = r2.json()
-            for k in ("output_text","text","message","content"):
-                if isinstance(body.get(k), str) and body[k]:
-                    return body[k]
-        except Exception:
-            pass
-        
-        return r2.text or "No text content returned by agent."
-        
-    except requests.exceptions.RequestException as e:
-        return f"HTTP error: {e}"
+
+        response = make_api_request(url, payload)
+        return parse_streaming_response(response)
+
     except Exception as e:
-        return f"Error: {e}"
-$$;
+        return json.dumps({
+            "status": "error",
+            "error_message": str(e),
+            "error_type": "GENERAL_ERROR",
+            "timestamp": datetime.now().isoformat(),
+            "agent_name": AGENT_NAME
+        })
+
+$$
+;
 ```
 
+Once the procedure is added, create the grants.
+
 Grants:
 ```
-GRANT USAGE ON PROCEDURE QUICKSTARTS.AGENTS.CALL_CORTEX_AGENT_API(VARCHAR, VARCHAR)
-  TO ROLE SIGMA_SERVICE_ROLE;
-
--- Grant visibility & execute rights to Sigma’s role
-GRANT USAGE ON DATABASE QUICKSTARTS TO ROLE SIGMA_SERVICE_ROLE;
-GRANT USAGE ON SCHEMA QUICKSTARTS.AGENTS TO ROLE SIGMA_SERVICE_ROLE;
-GRANT USAGE ON PROCEDURE QUICKSTARTS.AGENTS.CALL_CORTEX_AGENT_API(VARCHAR, VARCHAR)
-  TO ROLE SIGMA_SERVICE_ROLE;
-GRANT DATABASE ROLE snowflake.cortex_user TO ROLE SIGMA_SERVICE_ROLE;
-
--- Ensure the PAT's role can see/execute agents
-GRANT USAGE ON DATABASE SNOWFLAKE_INTELLIGENCE TO ROLE SIGMA_SERVICE_ROLE;
-GRANT USAGE ON SCHEMA  SNOWFLAKE_INTELLIGENCE.AGENTS TO ROLE SIGMA_SERVICE_ROLE;
-GRANT USAGE ON AGENT SNOWFLAKE_INTELLIGENCE.AGENTS.QUICKSTARTS TO ROLE SIGMA_SERVICE_ROLE;
+-- The sigma service role needs the ability to use cortex features
+grant database role snowflake.cortex_user to role SIGMA_SERVICE_ROLE;
+
+-- Grant usage on the procedure, the agent, semantic views / search services exposed to the agent and tables referenced by the semantic view
+grant usage on database snowflake_intelligence to role SIGMA_SERVICE_ROLE;
+grant usage on schema agents to role SIGMA_SERVICE_ROLE;
+grant usage on procedure call_cortex_agent_api(varchar, varchar) to role SIGMA_SERVICE_ROLE;
+
+grant usage on agent snowflake_intelligence.agents.quickstarts to role SIGMA_SERVICE_ROLE; -- repeat this for all agents exposed to Sigma
 ```
 
 <aside class="negative">
-<strong>NOTE:</strong><br> If your Cortex Agent is configured with orchestration rules, omit "tool_choice" from the payload and let the agent plan tool use. Use tool_choice only for single-tool agents or when you explicitly need to force a specific tool; otherwise the request may fail or the setting may be ignored.
+<strong>NOTE:</strong><br> This procedure omits tool_choice so the agent’s orchestration rules can plan tool usage. Only add tool_choice if you are forcing a specific tool in a single-tool design.
 </aside>
 
 ### Quick test
-We can check that everything is configured correctly in Snowflake by calling the agent:
+We can check that everything is configured correctly in Snowflake by calling the agent, using the `SIGMA_SERVICE_ROLE`:
 ```code
-CALL QUICKSTARTS.AGENTS.CALL_CORTEX_AGENT_API('QUICKSTARTS', 'What agent are you?');
+USE ROLE SIGMA_SERVICE_ROLE;
+CALL SNOWFLAKE_INTELLIGENCE.AGENTS.CALL_CORTEX_AGENT_API('QUICKSTARTS', 'What agent are you?');
 ```
 
 The response will be something like this:
 ```text
-I am an AI assistant created by Anthropic. I aim to be direct and honest in my interactions. I engage in conversation while being truthful about my identity and capabilities.
+I am Claude, an AI assistant created by Anthropic. I aim to be direct and honest in my communication.
 ```
 
 ### Multiple Agents
@@ -525,15 +412,11 @@ Rename the input table to `Chat Log` and delete any empty rows:
 
 <img src="assets/cortex_11.png" width="800"/>
 
-Now click on the `Chat Log Modal` tab and add the `Chat Log` table from `Data` > `Elements` > `Data`:
+Now click on the `Chat Log Modal` tab and add the `Chat Log` table from `Data` > `Table` > `Elements`:
 
 <img src="assets/cortex_12.png" width="600"/>
 
-In this way, users can see the log but do not have access to the input table.
-
-It is really easy to customize elements using the `Element panel`:
-
-<img src="assets/cortex_13.png" width="800"/>
+Hide the `Data` page.In this way, users can see the chat log but do not have access to the input table.
 
 ### Action adjustments
 We need to let the workbook actions know about our new input table and stored procedure.
@@ -546,14 +429,32 @@ Select that action, point it at the `Chat Log` input table on the `Data` page. T
 
 <img src="assets/cortex_14.png" width="800"/>
 
-Check the configuration of the `CALL_CORTEX_AGENT_API` action to make sure it can access the Snowflake stored procedure we created earlier:
+Check the configuration of the `Call stored procedure` action to make sure it can access the Snowflake stored procedure we created earlier:<br>
 
 <img src="assets/cortex_16.png" width="600"/>
 
+<aside class="negative">
+<strong>NOTE:</strong><br> If the stored procedure does not appear on the list, you may need to navigate to the connection browser and click the circular refresh button:<br>
+
+<img src="assets/cortex_14a.png" width="400"/>
+</aside>
+
+Set `CORTEX_AGENT` to `Control` and `Select an Agent (Cortex Demo)` 
+
+and
+
+`USER_MESSAGE` to `Control` and `Chat with Cortex`:
+
+<img src="assets/cortex_16c.png" width="600"/>
+
 Ensure the fourth action sets the `action variable` as:
 
 <img src="assets/cortex_16b.png" width="600"/>
 
+In the fifth action sequence, target the `Chat Log (Data)` input table with the following value assignments (check carefully!):
+
+<img src="assets/cortex_16d.png" width="800"/>
+
 Click `Save as` and name the workbook `Snowflake Intelligence QuickStart`.
 
 ![Footer](assets/sigma_footer.png)
@@ -591,13 +492,13 @@ Now that Sigma can call our Snowflake agent, we want to give the agent access to
 
 <button>[Download the Sample Dataset](https://sigma-quickstarts-main.s3.us-west-1.amazonaws.com/csv/Product_Reviews_Big_Buys.csv)</button>
 
-In Snowflake (as `ACCOUNTADMIN`), open the `Add data` page and select `Load data into a Table`:
+In Snowflake (as `ACCOUNTADMIN`), open `Ingestion` and the `Add data` page and select `Load data into a Table`:
 
 <img src="assets/cortex_19.png" width="800"/>
 
 Locate the `Product_Reviews_Big_Buys` CSV file and select it. 
 
-To keep this simple, we will store the data in `QUICKSTARTS.AGENTS` and create a new table called `Big_Buys`:
+To keep this simple, we will store the data in `SNOWFLAKE_INTELLIGENCE.AGENTS` and create a new table called `Big_Buys`:
 
 <img src="assets/cortex_20.png" width="600"/>
 
@@ -615,7 +516,7 @@ The Cortex tool requires either a semantic view, procedure or function to access
 In Snowflake, run the following command to create a simple function:
 ```code
 USE ROLE ACCOUNTADMIN;
-USE DATABASE QUICKSTARTS;
+USE DATABASE SNOWFLAKE_INTELLIGENCE;
 USE SCHEMA AGENTS;
 
 CREATE OR REPLACE FUNCTION BIG_BUYS_FUNC()
@@ -634,31 +535,34 @@ SELECT ARRAY_AGG(
            'review',       REVIEW
          )
        )
-FROM QUICKSTARTS.AGENTS.BIG_BUYS
+FROM SNOWFLAKE_INTELLIGENCE.AGENTS.BIG_BUYS
 $$;
 
 -- Grants
-GRANT USAGE ON DATABASE QUICKSTARTS TO ROLE SIGMA_SERVICE_ROLE;
-GRANT USAGE ON SCHEMA QUICKSTARTS.AGENTS TO ROLE SIGMA_SERVICE_ROLE;
-GRANT USAGE ON FUNCTION QUICKSTARTS.AGENTS.BIG_BUYS_FUNC() TO ROLE SIGMA_SERVICE_ROLE;
-GRANT SELECT ON TABLE QUICKSTARTS.AGENTS.BIG_BUYS TO ROLE SIGMA_SERVICE_ROLE;
-GRANT USAGE ON WAREHOUSE COMPUTE_WH TO ROLE SIGMA_SERVICE_ROLE;
-GRANT USAGE ON FUNCTION QUICKSTARTS.AGENTS.BIG_BUYS_FUNC() TO ROLE ACCOUNTADMIN;
+GRANT USAGE ON FUNCTION SNOWFLAKE_INTELLIGENCE.AGENTS.BIG_BUYS_FUNC() TO ROLE SIGMA_SERVICE_ROLE;
+GRANT SELECT ON TABLE SNOWFLAKE_INTELLIGENCE.AGENTS.BIG_BUYS TO ROLE SIGMA_SERVICE_ROLE;
 ```
 
 ### Add custom tool to Agent
-On the `QuickStart` agent, select the `Tools` menu and `Add custom tool`. 
+On the `QuickStart` agent (in `EDIT`), select the `Tools` menu and `Add custom tool`. 
 
-Configure a the tool to use the new function as:
+Configure a the tool to use the new function and click the `Generate with Cortex` button to let AI populate the `Description`:
 
 <img src="assets/cortex_22.png" width="800"/>
 
+Click `Add`.
+
+`Save` the changes.
+
 ### Test it out
 With our data connected, we can ask a question in Snowflake to verify it works:
+```code
+What products have the worst ratings?
+```
 
 <img src="assets/cortex_23.png" width="800"/>
 
-Asking the question in Sigma:
+Asking the same question in Sigma:
 
 <img src="assets/cortex_24.png" width="800"/>
 
@@ -677,25 +581,31 @@ With this foundation in place, we can expand by adding additional agents and all
 ## What we've covered
 Duration: 5
 
-You've successfully built a complete integration between Snowflake Cortex Agents and Sigma, including:
+You've successfully built a complete integration between Snowflake Intelligence Agents and Sigma, including:
+
+**Infrastructure & Security**
+- Configured Snowflake Intelligence with a custom agent
+- Created a dedicated service user and service role for Sigma
+- Applied least-privilege grants and database roles to securely execute Cortex features
+- Used EXECUTE AS OWNER stored procedures to provide stable, auditable access from Sigma
 
-**Infrastructure Setup:**
-- Configured Snowflake Intelligence with custom agents
-- Created secure service users and roles with proper permissions
-- Set up Programmatic Access Tokens with network policies
-- Built external access integrations for API connectivity
+**Secure Data Access for Agents**
+- Loaded sample customer review data into Snowflake
+- Exposed warehouse data to the agent through a controlled SQL function
+- Granted explicit usage and select privileges to restrict agent access to only approved data
+- Ensured the agent cannot access tables directly, enforcing governed data access patterns
 
-**Data Integration:**
-- Created a stored procedure for Cortex Agent API calls
-- Connected agents to your data using custom tools and functions
-- Implemented secure, auditable AI interactions
+**Agent Integration**
+- Built a stored procedure that invokes a Snowflake Intelligence Agent via the REST API
+- Parsed streaming agent responses and returned clean text output for Sigma
+- Allowed the agent to plan tool usage automatically using orchestration rules
 
-**User Experience:**
-- Built a Sigma workbook with intuitive chat interface
-- Added conversation logging with input tables
-- Created seamless workflows between AI questions and data analysis
+**Sigma User Experience**
+- Built a Sigma workbook with a chat-style interface
+- Logged all questions and responses using input tables
+- Enabled users to ask natural-language questions and immediately continue structured analysis in Sigma
 
-This integration enables AI-powered analytics directly within your data warehouse, allowing users to ask natural-language questions and immediately continue their analysis using Sigma's full visualization and computation capabilities.
+This integration demonstrates how Snowflake Intelligence and Sigma work together to deliver AI-powered analytics that remain fully governed, auditable, and warehouse-native.
 
 <img src="assets/horizonalline.png" width="800"/>