diff --git a/author.hbs b/author.hbs
index 22d7daf..e9591df 100644
--- a/author.hbs
+++ b/author.hbs
@@ -72,13 +72,13 @@
                                                 target="_blank"
                                                 rel="noopener"
                                                 class="button button--secondary button--small button--square spacing-right-1"
-                                                title="Twitter autora"
+                                                title="X (Twitter) autora"
                                             >
                                                 <span class="icon">
                                                     {{> "icons/twitter"}}
                                                 </span>
                                                 <span class="visually-hidden">
-                                                    Twitter
+                                                    X (Twitter)
                                                 </span>
                                             </a>
                                         {{/if}}
diff --git a/partials/footer.hbs b/partials/footer.hbs
index 5527316..ba14d03 100644
--- a/partials/footer.hbs
+++ b/partials/footer.hbs
@@ -22,10 +22,10 @@
         {{/unless}}
 
         {{#unless hideInternalLinks}}
-            {{navigation type="secondary" in_footer=true}}
+            {{navigation type="secondary" isInFooter=true}}
         {{/unless}}
 
-        {{> "social-links" in_footer=true}}
+        {{> "social-links" isInFooter=true}}
 
         <hr class="print-only" />
 
diff --git a/partials/icons/twitter.hbs b/partials/icons/twitter.hbs
index 19de4af..f594b39 100644
--- a/partials/icons/twitter.hbs
+++ b/partials/icons/twitter.hbs
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path d="M30.063 7.313c-.813 1.125-1.75 2.125-2.875 2.938v.75c0 1.563-.188 3.125-.688 4.625a15.088 15.088 0 0 1-2.063 4.438c-.875 1.438-2 2.688-3.25 3.813a15.015 15.015 0 0 1-4.625 2.563c-1.813.688-3.75 1-5.75 1-3.25 0-6.188-.875-8.875-2.625.438.063.875.125 1.375.125 2.688 0 5.063-.875 7.188-2.5-1.25 0-2.375-.375-3.375-1.125s-1.688-1.688-2.063-2.875c.438.063.813.125 1.125.125.5 0 1-.063 1.5-.25-1.313-.25-2.438-.938-3.313-1.938a5.673 5.673 0 0 1-1.313-3.688v-.063c.813.438 1.688.688 2.625.688a5.228 5.228 0 0 1-1.875-2c-.5-.875-.688-1.813-.688-2.75 0-1.063.25-2.063.75-2.938 1.438 1.75 3.188 3.188 5.25 4.25s4.313 1.688 6.688 1.813a5.579 5.579 0 0 1 1.5-5.438c1.125-1.125 2.5-1.688 4.125-1.688s3.063.625 4.188 1.813a11.48 11.48 0 0 0 3.688-1.375c-.438 1.375-1.313 2.438-2.563 3.188 1.125-.125 2.188-.438 3.313-.875z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 29"><path d="M25.202,0L30.108,0L19.389,12.253L32,28.925L22.125,28.925L14.391,18.813L5.542,28.925L0.632,28.925L12.098,15.82L0,0L10.125,0L17.116,9.243L25.202,0ZM23.48,25.988L26.199,25.988L8.648,2.783L5.73,2.783L23.48,25.988Z"/></svg>
diff --git a/partials/navigation.hbs b/partials/navigation.hbs
index 6d30d62..3c05bbd 100644
--- a/partials/navigation.hbs
+++ b/partials/navigation.hbs
@@ -1,7 +1,7 @@
 <nav
     class="
         navigation
-        {{#if in_footer}}
+        {{#if isInFooter}}
             navigation--secondary
             spacing-bottom
         {{/if}}
@@ -31,7 +31,7 @@
             </li>
         {{/foreach}}
 
-        {{#if in_footer}}
+        {{#if isInFooter}}
             <li class="navigation__item">
                 <a
                     href=""
diff --git a/partials/share-and-comment.hbs b/partials/share-and-comment.hbs
index d66a96f..a8ff8d4 100644
--- a/partials/share-and-comment.hbs
+++ b/partials/share-and-comment.hbs
@@ -14,13 +14,13 @@
             class="button button--secondary button--small button--square spacing-right-1"
             data-track="share"
             data-track-method="Twitter"
-            title="Sdílet na Twitteru"
+            title="Sdílet na X (Twitteru)"
         >
             <span class="icon">
                 {{> "icons/twitter"}}
             </span>
             <span class="visually-hidden">
-                Twitter
+                X (Twitter)
             </span>
         </a>
         <a
diff --git a/partials/social-links.hbs b/partials/social-links.hbs
index 53b22d8..a306344 100644
--- a/partials/social-links.hbs
+++ b/partials/social-links.hbs
@@ -2,7 +2,7 @@
     class="
         navigation
         navigation--icons
-        {{#if in_footer}}
+        {{#if isInFooter}}
             navigation--secondary
             spacing-bottom
         {{/if}}
@@ -17,10 +17,10 @@
                     class="navigation__icon-link"
                     target="_blank"
                     rel="noopener"
-                    title="{{@site.title}} na Twitteru"
+                    title="{{@site.title}} na X (Twitteru)"
                     data-track="navigate"
                     data-track-category="Outbound links"
-                    data-track-label="Twitter in {{#if in_footer}}footer{{else}}header{{/if}}"
+                    data-track-label="Twitter in {{#if isInFooter}}footer{{else}}header{{/if}}"
                 >
                     <span class="icon">
                         {{> "icons/twitter"}}
@@ -38,7 +38,7 @@
                     title="{{@site.title}} na Facebooku"
                     data-track="navigate"
                     data-track-category="Outbound links"
-                    data-track-label="Facebook in {{#if in_footer}}footer{{else}}header{{/if}}"
+                    data-track-label="Facebook in {{#if isInFooter}}footer{{else}}header{{/if}}"
                 >
                     <span class="icon">
                         {{> "icons/facebook"}}
@@ -55,7 +55,7 @@
                 title="{{@site.title}} na Instagramu"
                 data-track="navigate"
                 data-track-category="Outbound links"
-                data-track-label="Instagram in {{#if in_footer}}footer{{else}}header{{/if}}"
+                data-track-label="Instagram in {{#if isInFooter}}footer{{else}}header{{/if}}"
             >
                 <span class="icon">
                     {{> "icons/instagram"}}
@@ -71,7 +71,7 @@
                 title="{{@site.title}} na GitHubu"
                 data-track="navigate"
                 data-track-category="Outbound links"
-                data-track-label="GitHub in {{#if in_footer}}footer{{else}}header{{/if}}"
+                data-track-label="GitHub in {{#if isInFooter}}footer{{else}}header{{/if}}"
             >
                 <span class="icon">
                     {{> "icons/github"}}