diff --git a/app/social/generators/SchedulesStatus.mjs b/app/social/generators/SchedulesStatus.mjs
index aa2a5d6..ae1cc05 100644
--- a/app/social/generators/SchedulesStatus.mjs
+++ b/app/social/generators/SchedulesStatus.mjs
@@ -45,9 +45,13 @@ export default class SchedulesStatus extends StatusGenerator
         `– Pro: ${festProStages[0].name} and ${festProStages[1].name}`,
       ];
 
-      if(stages.tricolor?.isTricolorActive) {
+      if(stages.tricolor?.isTricolorActive && stages.tricolor.tricolorStage) {
         lines.push(`– Tricolor: ${stages.tricolor.tricolorStage.name}`);
       }
+
+      if(stages.tricolor?.isTricolorActive && stages.tricolor.tricolorStages) {
+        lines.push(`– Tricolor: ${stages.tricolor.tricolorStages[0].name}`);
+      }
       return lines.join('\n');
 
     }
diff --git a/src/components/TricolorBox.vue b/src/components/TricolorBox.vue
index 96b01c3..32c5ef5 100644
--- a/src/components/TricolorBox.vue
+++ b/src/components/TricolorBox.vue
@@ -34,7 +34,7 @@
           </div>
         </div>
 
-        <div class="flex space-x-1">
+        <div v-if="tricolor?.tricolorStage" class="flex space-x-1">
           <div class="flex-1 relative">
             <StageImage
               img-class="rounded-xl"
@@ -42,6 +42,15 @@
             />
           </div>
         </div>
+
+        <div v-if="tricolor?.tricolorStages" class="flex space-x-1">
+          <div class="flex-1 relative">
+            <StageImage
+              img-class="rounded-xl"
+              :stage="tricolor?.tricolorStages?.[0]"
+            />
+          </div>
+        </div>
       </div>
     </div>
   </ProductContainer>
diff --git a/src/components/screenshots/ScreenshotTricolorBox.vue b/src/components/screenshots/ScreenshotTricolorBox.vue
index 9eaa0c0..920adf9 100644
--- a/src/components/screenshots/ScreenshotTricolorBox.vue
+++ b/src/components/screenshots/ScreenshotTricolorBox.vue
@@ -33,13 +33,21 @@
           </div>
         </div>
 
-        <div class="space-y-8">
+        <div v-if="tricolor?.tricolorStage" class="space-y-8">
           <StageImage
             img-class="rounded-2xl"
             :stage="tricolor?.tricolorStage"
             text-size="text-xl"
           />
         </div>
+
+        <div v-if="tricolor?.tricolorStages" class="space-y-8">
+          <StageImage
+            img-class="rounded-2xl"
+            :stage="tricolor?.tricolorStages[0]"
+            text-size="text-xl"
+          />
+        </div>
       </div>
     </div>
   </ProductContainer>
diff --git a/src/stores/splatfests.mjs b/src/stores/splatfests.mjs
index 3375d46..7db7a0b 100644
--- a/src/stores/splatfests.mjs
+++ b/src/stores/splatfests.mjs
@@ -65,16 +65,20 @@ function defineSplatfestRegionStore(region) {
 
       // Move the thumbnail image to "thumbnailImage" and pull in the high-res image for the stage
       if (fest.tricolorStage && !fest.tricolorStage.thumbnailImage) {
-        fest.tricolorStage.thumbnailImage = fest.tricolorStage.image;
+        fest.tricolorStage.thumbnailImage = fest.tricolorStage.image.url;
         fest.tricolorStage.image =
           vsStages.nodes.find(s => s.id === fest.tricolorStage.id)?.originalImage ||
           fest.tricolorStage.image;
       }
 
+      if (fest.tricolorStages) {
+        fest.tricolorStages.forEach(stage => stage.thumbnailImage = stage.image); 
+      }
+
       return {
         ...fest,
-        isTricolorActive: time.isActive(fest.midtermTime, fest.endTime),
-        startTime: fest.midtermTime,
+        isTricolorActive: fest.tricolorStages ? time.isActive(fest.startTime, fest.endTime) : time.isActive(time.midtermTime, time.endTime),
+        startTime: fest.tricolorStages ? fest.startTime : fest.midtermTime,
         endTime: fest.endTime,
       };
     });
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 0a14cb1..21aaff4 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -15,10 +15,10 @@
           </template>
           <template v-else>
             <div class="flex flex-wrap justify-center items-center gap-6">
-              <SplatfestBox :festival="activeFestivals[0]" class="md:max-w-md 2xl:max-w-lg md:-rotate-1" />
+              <SplatfestBox :festival="activeFestivals[0]" class="md:max-w-md 2xl:max-w-lg md:rotate-1" />
               <ScheduleBox type="splatfestOpen" class="md:max-w-md 2xl:max-w-lg md:-rotate-1" />
-              <ScheduleBox type="splatfestPro" class="md:max-w-md 2xl:max-w-lg md:-rotate-1" />
-              <TricolorBox v-if="isTricolorActive" class="md:max-w-md 2xl:max-w-lg md:rotate-1" />
+              <ScheduleBox type="splatfestPro" class="md:max-w-md 2xl:max-w-lg md:rotate-1" />
+              <TricolorBox v-if="isTricolorActive" class="md:max-w-md 2xl:max-w-lg md:-rotate-1" />
             </div>
           </template>
         </template>