diff --git a/attack-theme/templates/general/base-template.html b/attack-theme/templates/general/base-template.html
index 61d60899d28..78c9fb2c9d4 100644
--- a/attack-theme/templates/general/base-template.html
+++ b/attack-theme/templates/general/base-template.html
@@ -126,7 +126,7 @@
                                 <div class="footer-float-right-responsive-brand">
                                     <div class="row row-footer row-footer-icon">
                                         <div class="mb-1">
-                                            <a href="https://twitter.com/MITREattack" class="btn btn-footer">
+                                            <a href="https://x.com/MITREattack" class="btn btn-footer">
                                                 <i class="fa-brands fa-x-twitter fa-lg"></i>
                                             </a>
                                             <a href="https://github.com/mitre-attack" class="btn btn-footer">
diff --git a/modules/benefactors/benefactors.py b/modules/benefactors/benefactors.py
index ac6045a0221..5b5f3778d7c 100644
--- a/modules/benefactors/benefactors.py
+++ b/modules/benefactors/benefactors.py
@@ -1,16 +1,12 @@
-import json
-import math
 import os
 
 from modules import util
 
 from . import benefactors_config
-from .. import site_config
 
 
 def generate_benefactors():
     """Generate benefactors page markdown"""
-
     # Create content pages directory if does not already exist
     util.buildhelpers.create_content_pages_dir()
 
diff --git a/modules/resources/templates/attackcon.html b/modules/resources/templates/attackcon.html
index bc64ca5beb2..b950300823b 100644
--- a/modules/resources/templates/attackcon.html
+++ b/modules/resources/templates/attackcon.html
@@ -30,24 +30,28 @@ <h1>ATT&amp;CKcon</h1>
           Learn about future ATT&amp;CKcons by keeping up with us at <a href="/resources/engage-with-attack/contact/">Engage with ATT&amp;CK</a>
         </p>
         <div class="card-deck">
+          {{contact_card.render(
+            "ATT&CKcon 6.0",
+            "https://na.eventscloud.com/attackcon6",
+            "<strong>October 14th - 15th, 2025</strong><br>McLean, VA",
+            fa_icon=True)}}
           {{contact_card.render(
             "ATT&CKcon 5.0",
             "/resources/attackcon/october-2024/",
-            "<strong>October 22nd - 23rd, 2024</strong><br>McLean, VA",
-            invert_icon=True)}}
+            "<strong>October 22nd - 23rd, 2024</strong><br>McLean, VA", invert_icon=True)}}
           {{contact_card.render(
               "ATT&CKcon 4.0",
               "/resources/attackcon/october-2023/",
               "<strong>October 24th - 25th, 2023</strong><br>McLean, VA",
               invert_icon=True)}}
-          {{contact_card.render(
-              "ATT&CKcon 3.0",
-              "/resources/attackcon/march-2022/",
-              "<strong>March 29th - 30th, 2022</strong><br>McLean, VA",
-              invert_icon=True)}}
         </div>
 
         <div class="card-deck mt-3">
+          {{contact_card.render(
+            "ATT&CKcon 3.0",
+            "/resources/attackcon/march-2022/",
+            "<strong>March 29th - 30th, 2022</strong><br>McLean, VA",
+            invert_icon=True)}}
           {{contact_card.render(
             "ATT&CKcon PowerHour",
             "/resources/attackcon/october-2020/",
@@ -56,9 +60,13 @@ <h1>ATT&amp;CKcon</h1>
           {{contact_card.render("ATT&CKcon 2.0", "/resources/attackcon/october-2019/", "<strong>October 29th - 30th,
               2019</strong><br>McLean, VA",
             invert_icon=True)}}
+        </div>
+        <div class="card-deck mt-3">
           {{contact_card.render("ATT&CKcon 2018", "/resources/attackcon/october-2018/", "<strong>October 23rd - 24th,
               2018</strong><br>McLean, VA",
             invert_icon=True)}}
+            <div class="card" style="visibility: hidden;"></div>
+            <div class="card" style="visibility: hidden;"></div>
         </div>
       </div>
     </div>
diff --git a/modules/resources/templates/contact.html b/modules/resources/templates/contact.html
index 426138d5b6d..3ee64345d3d 100644
--- a/modules/resources/templates/contact.html
+++ b/modules/resources/templates/contact.html
@@ -25,7 +25,7 @@ <h1>Stay Informed</h1>
                 Here's how you can find other community members, find out what they're doing with ATT&CK, and get involved.
             </span>
             <div class="card-deck mt-4">
-                {{contact_card.render("Twitter", "https://twitter.com/MITREattack", "Follow us @MITREattack to hear about news, latest updates, and what community members are doing with ATT&CK.", "fa-brands fa-x-twitter", invert_icon=True)}}
+                {{contact_card.render("X", "https://x.com/MITREattack", "Follow us @MITREattack to hear about news, latest updates, and what community members are doing with ATT&CK.", "fa-brands fa-x-twitter", invert_icon=True)}}
                 {{contact_card.render("Medium", "https://medium.com/mitre-attack", "Check out our Medium blog for ATT&CK updates and information.", "fa-brands fa-medium", invert_icon=True)}}
                 {{contact_card.render("Slack", "https://join.slack.com/t/mitreattack/shared_invite/zt-38j8youxv-4P5sN4A8rklw3B_a3dOwgg", "Join the ATT&CK slack workspace! With over 3,000 members and 15 channels, find and start discussions with the community on all things ATT&CK.", "fa-brands fa-slack", invert_icon=True)}}
             </div>