diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml
index 1f4c691..f07c144 100644
--- a/.gitea/workflows/deployment.yml
+++ b/.gitea/workflows/deployment.yml
@@ -24,7 +24,7 @@ jobs:
       docker_folder_changed: ${{ steps.docker_folder.outputs.changed }}
     steps:
       - name: Checkout Repository
-        run: git clone --branch preview https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git .
+        run: git clone --branch ${{ gitea.ref_name }} https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git .
 
       - name: Check Latest Hugo Version
         id: get_latest
@@ -79,7 +79,7 @@ jobs:
         shell: sh
     steps:
       - name: Checkout Repository
-        run: git clone --branch preview https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git .
+        run: git clone --branch ${{ gitea.ref_name }} https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git .
 
       - name: Build Docker Image
         run: |  
@@ -116,7 +116,7 @@ jobs:
     needs: Deploy-Staging
     runs-on: ubuntu
     env:
-      URL: "https://blog-dev.vezpi.com/en/"
+      URL: "https://blog-staging.vezpi.com/en/"
     steps:
       - name: Check HTTP Response
         run: |
@@ -143,7 +143,7 @@ jobs:
       
       - name: Merge preview Branch on main
         run: |
-          git merge --ff-only origin/preview
+          git merge --ff-only origin/${{ gitea.ref_name }}
           git push origin main
 
   Deploy-Production:
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index c9c4ff1..1ce54aa 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -87,7 +87,7 @@ jobs:
             --build-arg HUGO_VERSION=${{ needs.Check-Rebuild.outputs.latest_hugo_version }} \
             --tag ${DOCKER_IMAGE}:${{ needs.Check-Rebuild.outputs.latest_hugo_version }} \
             .
-          docker tag ${DOCKER_IMAGE}:${{ needs.Check-Rebuild.outputs.latest_hugo_version }} ${DOCKER_IMAGE}:test
+          docker tag ${DOCKER_IMAGE}:${{ needs.Check-Rebuild.outputs.latest_hugo_version }} ${DOCKER_IMAGE}:dev
 
   Deploy-Test:
     needs:
@@ -102,7 +102,7 @@ jobs:
       run:
         shell: sh
     env:
-      CONTAINER_NAME: blog_test
+      CONTAINER_NAME: blog_dev
     steps:
       - name: Launch Blog Test Deployment
         run: |
@@ -117,7 +117,7 @@ jobs:
     needs: Deploy-Test
     runs-on: ubuntu
     env:
-      URL: "https://blog-test.vezpi.com/en/"
+      URL: "https://blog-dev.vezpi.com/en/"
     steps:
       - name: Check HTTP Response
         run: |
diff --git a/assets/scss/custom.scss b/assets/scss/custom.scss
index 3547a0f..319eba9 100644
--- a/assets/scss/custom.scss
+++ b/assets/scss/custom.scss
@@ -3,9 +3,15 @@
 }
 
 .lang-toggle-icon {
-  margin-left: auto;
+  margin-left: 0;
   svg {
     width: 64px;
     height: 24px;
   }
+}
+
+.container {
+    .left-sidebar {
+        width: unset;
+    }
 }
\ No newline at end of file
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index f5478c7..2f4128d 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -21,6 +21,9 @@ rm -rf "$CLONE_DIR"
 echo "- Cloning $REPO_URL (branch: $BRANCH)..."
 git clone --recurse-submodules --branch "$BRANCH" "$REPO_URL" "$CLONE_DIR"
 
+# Patch .Site.Data references not yet fixed in Stack theme
+sed -i 's/\.Site\.Data/hugo.Data/g' "$CLONE_DIR/themes/stack/layouts/_partials/article/components/photoswipe.html"
+
 # Generate static files with hugo
 echo "- Building site with Hugo v$HUGO_VERSION in $HUGO_DEST..."
 hugo --source "$CLONE_DIR" --destination "$HUGO_DEST" --baseURL="https://${URL}" ${DRAFTS} --logLevel info --cleanDestinationDir --gc --panicOnWarning --printI18nWarnings
diff --git a/layouts/partials/article/components/details.html b/layouts/partials/article/components/details.html
index 97d7597..6f2d43a 100644
--- a/layouts/partials/article/components/details.html
+++ b/layouts/partials/article/components/details.html
@@ -1,8 +1,13 @@
+{{- $IsList := .IsList -}}
+{{- $Page := .Page -}}
 <div class="article-details">
-    {{ if .Params.categories }}
+    {{ if $Page.Params.categories }}
     <header class="article-category">
-        {{ range (.GetTerms "tags") }}
-            <a href="{{ .RelPermalink }}" {{ with .Params.style }}style="background-color: {{ .background }}; color: {{ .color }};"{{ end }}>
+        {{ range ($Page.GetTerms "tags") }}
+            {{ $color := partial "helper/color-from-str" .LinkTitle }}
+            {{ $BackgroundColor := default $color.BackgroundColor .Params.style.background }}
+            {{ $TextColor := default $color.TextColor .Params.style.color }}
+            <a href="{{ .RelPermalink }}" style="background-color: {{ $BackgroundColor | safeCSS }}; color: {{ $TextColor | safeCSS }};">
                 {{ .LinkTitle }}
             </a>
         {{ end }}
@@ -12,49 +17,50 @@
     <div class="article-title-wrapper">
         <h2 class="article-title">
             <a href="{{ .RelPermalink }}">
-                {{- .Title -}}
+                {{- $Page.Title -}}
             </a>
         </h2>
     
-        {{ with .Params.description }}
+        {{ with $Page.Params.description }}
         <h3 class="article-subtitle">
             {{ . }}
         </h3>
         {{ end }}
     </div>
 
-    {{ $showReadingTime := .Params.readingTime | default (.Site.Params.article.readingTime) }}
-    {{ $showDate := not .Date.IsZero }}
-    {{ $showFooter := or $showDate $showReadingTime }}
-    {{ if $showFooter }}
-    <footer class="article-time">
-        {{ if $showDate }}
-            <div>
+    {{ $showReadingTime := $Page.Params.readingTime | default ($Page.Site.Params.article.readingTime) }}
+    {{ $showDate := not $Page.Date.IsZero }}
+    {{ $showTime := or $showDate $showReadingTime }}
+ 
+    {{ if $showTime }}
+    <footer class="article-meta">
+        <div class="inline-meta">
+            {{ if $showDate }}
                 {{ partial "helper/icon" "date" }}
-                <time class="article-time--published">
-                    {{- .Date | time.Format (or .Site.Params.dateFormat.published "Jan 02, 2006") -}}
+                <time class="article-time--published" datetime='{{ $Page.Date.Format "2006-01-02T15:04:05Z07:00" }}'>
+                    {{- $Page.Date | time.Format $Page.Site.Params.dateFormat.published -}}
                 </time>
-            </div>
-        {{ end }}
+            {{ end }}
 
-        {{ if $showReadingTime }}
-            <div>
-                {{ partial "helper/icon" "stopwatch" }}
+            {{ if $showReadingTime }}
+                {{ partial "helper/icon" "clock" }}
                 <time class="article-time--reading">
-                    {{ T "article.readingTime" .ReadingTime }}
+                    {{ T "article.readingTime" $Page.ReadingTime }}
                 </time>
-            </div>
-        {{ end }}
-        {{- $date := .Date.Format "20060102" | int -}}
-        {{- $lastmod := .Lastmod.Format "20060102" | int -}}
-        {{- if gt $lastmod $date -}}
-            <div class="article-lastmod">
-              {{ partial "helper/icon" "refresh" }}
-              <time>
-                {{ T "article.lastUpdatedOn" }} {{ .Lastmod | time.Format ( or .Site.Params.dateFormat.lastUpdated "Jan 02, 2006 15:04 MST" ) }}
-              </time>
-            </div>
-        {{- end -}}
+            {{ end }}
+
+            {{- $date := $Page.Date.Format "20060102" | int -}}
+            {{- $lastmod := $Page.Lastmod.Format "20060102" | int -}}
+            {{- if gt $lastmod $date -}}
+                <div class="article-lastmod">
+                {{ partial "helper/icon" "refresh" }}
+                <time>
+                    {{ T "article.lastUpdatedOn" }} {{ $Page.Lastmod | time.Format ( or $Page.Site.Params.dateFormat.lastUpdated "Jan 02, 2006 15:04 MST" ) }}
+                </time>
+                </div>
+            {{- end -}}
+        </div>
+
     </footer>
     {{ end }}
 </div>
diff --git a/themes/stack b/themes/stack
index 9e6b7b2..8e36874 160000
--- a/themes/stack
+++ b/themes/stack
@@ -1 +1 @@
-Subproject commit 9e6b7b22a9d47478a72287bcdc29e885dcd8f359
+Subproject commit 8e3687431f40f3367635f067b3be89bd3f95d36e