diff --git a/_data/homepage.yml b/_data/homepage.yml
index f2769223f9..11ffc3509c 100644
--- a/_data/homepage.yml
+++ b/_data/homepage.yml
@@ -45,7 +45,7 @@ documentation:
 technical:
   title: "Technical Structure"
   subtitle: "Access source code, releases, and project repositories"
-  intro: "Release packages are available for download. We use three primary GIT repositories to develop the project: <strong><a href=\"{{ site.data.project.source_repository_os_mirror }}\" target=\"_blank\" rel=\"noopener noreferrer\">RTOS</a></strong>, <strong><a href=\"{{ site.data.project.source_repository_apps_mirror }}\" target=\"_blank\" rel=\"noopener noreferrer\">Applications</a></strong>, and <strong><a href=\"https://github.com/apache/nuttx-website\" target=\"_blank\" rel=\"noopener noreferrer\">Website</a></strong>. Documentation is part of the RTOS repository and then built and hosted online."
+  intro: "Release packages are available for download. We use three primary GIT repositories to develop the project: <strong><a href=\"https://github.com/apache/nuttx\" target=\"_blank\" rel=\"noopener noreferrer\">RTOS</a></strong>, <strong><a href=\"https://github.com/apache/nuttx-apps\" target=\"_blank\" rel=\"noopener noreferrer\">Applications</a></strong>, and <strong><a href=\"https://github.com/apache/nuttx-website\" target=\"_blank\" rel=\"noopener noreferrer\">Website</a></strong>. Documentation is part of the RTOS repository and then built and hosted online."
   resources:
     - icon: "download.svg"
       title: "Release Packages"
@@ -89,7 +89,7 @@ demo:
 # Community Section
 community:
   title: "Join the Apache NuttX Community"
-  description: "NuttX is developed and maintained by an international <a href=\"{{ site.baseurl }}/community-members\">group of volunteers</a> from all around the world. We welcome developers of all skill levels to contribute to the project. View our <a href=\"https://github.com/apache/nuttx/graphs/contributors\" target=\"_blank\" rel=\"noopener noreferrer\">full contributor list on GitHub</a>."
+  description: "NuttX is developed and maintained by an international <a href=\"/community-members\">group of volunteers</a> from all around the world. We welcome developers of all skill levels to contribute to the project. View our <a href=\"https://github.com/apache/nuttx/graphs/contributors\" target=\"_blank\" rel=\"noopener noreferrer\">full contributor list on GitHub</a>."
   channels_title: "Connect With Us"
   channels:
     - name: "Mailing List (Main)"
diff --git a/_includes/themes/apache/_navigation.html b/_includes/themes/apache/_navigation.html
index 4973fe1633..05930949dc 100644
--- a/_includes/themes/apache/_navigation.html
+++ b/_includes/themes/apache/_navigation.html
@@ -5,12 +5,6 @@
       <span class="logo-text">Apache NuttX®</span>
     </a>
     
-    <button class="mobile-toggle" id="mobileToggle" aria-label="Menu">
-      <span class="hamburger-line"></span>
-      <span class="hamburger-line"></span>
-      <span class="hamburger-line"></span>
-    </button>
-    
     <div class="navbar-nav" id="navbarNav">
       <div class="nav-item">
         <button class="nav-btn" type="button">
@@ -71,9 +65,30 @@
           <a href="https://www.apache.org/foundation/thanks.html" target="_blank">Thanks</a>
         </div>
       </div>
+      
+      <div class="mobile-theme-item">
+        <button class="theme-btn mobile-theme-btn" id="themeBtn" aria-label="Toggle theme">
+          <span class="theme-label">Theme</span>
+          <svg class="sun" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <circle cx="12" cy="12" r="5"/><line x1="12" y1="1" x2="12" y2="3"/><line x1="12" y1="21" x2="12" y2="23"/>
+            <line x1="4.22" y1="4.22" x2="5.64" y2="5.64"/><line x1="18.36" y1="18.36" x2="19.78" y2="19.78"/>
+            <line x1="1" y1="12" x2="3" y2="12"/><line x1="21" y1="12" x2="23" y2="12"/>
+            <line x1="4.22" y1="19.78" x2="5.64" y2="18.36"/><line x1="18.36" y1="5.64" x2="19.78" y2="4.22"/>
+          </svg>
+          <svg class="moon" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+            <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"/>
+          </svg>
+        </button>
+      </div>
     </div>
     
-    <button class="theme-btn" id="themeBtn" aria-label="Toggle theme">
+    <button class="mobile-toggle" id="mobileToggle" aria-label="Menu">
+      <span class="hamburger-line"></span>
+      <span class="hamburger-line"></span>
+      <span class="hamburger-line"></span>
+    </button>
+    
+    <button class="theme-btn desktop-theme-btn" id="desktopThemeBtn" aria-label="Toggle theme">
       <svg class="sun" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
         <circle cx="12" cy="12" r="5"/><line x1="12" y1="1" x2="12" y2="3"/><line x1="12" y1="21" x2="12" y2="23"/>
         <line x1="4.22" y1="4.22" x2="5.64" y2="5.64"/><line x1="18.36" y1="18.36" x2="19.78" y2="19.78"/>
@@ -110,47 +125,6 @@ <h2 class="hero-subtitle">Apache NuttX is a free and open-source (FOSS) real-tim
         Documentation
       </a>
     </div>
-    
-    <!-- GitHub Stats - Static Shields.io Badges -->
-    <div class="hero-stats">
-      <div class="github-stats-pill">
-        <div class="stats-repo-group">
-          <a href="{{ site.data.project.source_repository_os_mirror }}" class="repo-link" target="_blank" rel="noopener noreferrer">
-            <svg width="18" height="18" viewBox="0 0 24 24" fill="currentColor">
-              <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
-            </svg>
-            <span class="repo-name">RTOS</span>
-          </a>
-          <div class="repo-stats">
-            <a href="https://github.com/apache/nuttx/stargazers" target="_blank" rel="noopener noreferrer">
-              <img src="https://img.shields.io/github/stars/apache/nuttx?style=flat&logo=github&label=Stars&labelColor=2d3748&color=3b82f6" alt="RTOS Stars">
-            </a>
-            <a href="https://github.com/apache/nuttx/network/members" target="_blank" rel="noopener noreferrer">
-              <img src="https://img.shields.io/github/forks/apache/nuttx?style=flat&logo=github&label=Forks&labelColor=2d3748&color=3b82f6" alt="RTOS Forks">
-            </a>
-          </div>
-        </div>
-        
-        <div class="stats-divider"></div>
-        
-        <div class="stats-repo-group">
-          <a href="{{ site.data.project.source_repository_apps_mirror }}" class="repo-link" target="_blank" rel="noopener noreferrer">
-            <svg width="18" height="18" viewBox="0 0 24 24" fill="currentColor">
-              <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
-            </svg>
-            <span class="repo-name">Apps</span>
-          </a>
-          <div class="repo-stats">
-            <a href="https://github.com/apache/nuttx-apps/stargazers" target="_blank" rel="noopener noreferrer">
-              <img src="https://img.shields.io/github/stars/apache/nuttx-apps?style=flat&logo=github&label=Stars&labelColor=2d3748&color=3b82f6" alt="Apps Stars">
-            </a>
-            <a href="https://github.com/apache/nuttx-apps/network/members" target="_blank" rel="noopener noreferrer">
-              <img src="https://img.shields.io/github/forks/apache/nuttx-apps?style=flat&logo=github&label=Forks&labelColor=2d3748&color=3b82f6" alt="Apps Forks">
-            </a>
-          </div>
-        </div>
-      </div>
-    </div>
   </div>
 </section>
 {% endif %}
diff --git a/_includes/themes/apache/default.html b/_includes/themes/apache/default.html
index cb7dd1a0be..8615ba4d70 100644
--- a/_includes/themes/apache/default.html
+++ b/_includes/themes/apache/default.html
@@ -18,10 +18,8 @@
     <link href="{{ site.baseurl }}/assets/themes/apache/bootstrap/css/bootstrap.css" rel="stylesheet">
     <link href="{{ site.baseurl }}/assets/themes/apache/css/modern.css" rel="stylesheet" type="text/css">
     <link href="{{ site.baseurl }}/assets/themes/apache/css/syntax.css" rel="stylesheet"  type="text/css" media="screen" />
-    <!-- Google Fonts -->
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&family=Patua+One&family=Roboto:wght@300;400;500;700&family=JetBrains+Mono:wght@400;500;600&display=swap" rel="stylesheet">
+    <!-- Local Fonts (CSP compliant) -->
+    <link href="{{ site.baseurl }}/assets/themes/apache/css/fonts.css" rel="stylesheet" type="text/css">
     {% if page.title == "Home" %}
     <link href="{{ site.baseurl }}/assets/themes/apache/css/demo.css" rel="stylesheet" type="text/css">
     {% endif %}
@@ -58,8 +56,9 @@
     <script>
     // Theme Toggle with System Preference
     (function() {
-      const themeBtn = document.getElementById('themeBtn');
       const html = document.documentElement;
+      const mobileThemeBtn = document.getElementById('themeBtn');
+      const desktopThemeBtn = document.getElementById('desktopThemeBtn');
       
       // Check for saved theme preference or default to system preference
       const savedTheme = localStorage.getItem('theme');
@@ -72,15 +71,37 @@
         currentTheme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
       }
       
+      // Set initial theme
       html.setAttribute('data-theme', currentTheme);
+      document.body.style.transition = 'background-color 0.3s ease, color 0.3s ease';
       
-      if (themeBtn) {
-        themeBtn.addEventListener('click', function() {
-          const theme = html.getAttribute('data-theme');
-          const newTheme = theme === 'dark' ? 'light' : 'dark';
-          html.setAttribute('data-theme', newTheme);
-          localStorage.setItem('theme', newTheme);
-        });
+      // Function to toggle theme
+      function toggleTheme(e) {
+        if (e) {
+          e.preventDefault();
+          e.stopPropagation();
+        }
+        
+        const theme = html.getAttribute('data-theme');
+        const newTheme = theme === 'dark' ? 'light' : 'dark';
+        html.setAttribute('data-theme', newTheme);
+        localStorage.setItem('theme', newTheme);
+        console.log('Theme toggled to:', newTheme);
+      }
+      
+      // Add click listeners to both buttons
+      if (mobileThemeBtn) {
+        mobileThemeBtn.addEventListener('click', toggleTheme);
+        console.log('Mobile theme button listener attached');
+      }
+      
+      if (desktopThemeBtn) {
+        desktopThemeBtn.addEventListener('click', toggleTheme);
+        console.log('Desktop theme button listener attached');
+      }
+      
+      if (!mobileThemeBtn && !desktopThemeBtn) {
+        console.warn('Theme buttons not found');
       }
     })();
     
diff --git a/assets/themes/apache/css/fonts.css b/assets/themes/apache/css/fonts.css
new file mode 100644
index 0000000000..7756a15c55
--- /dev/null
+++ b/assets/themes/apache/css/fonts.css
@@ -0,0 +1,110 @@
+/* Local Font Declarations for Apache NuttX */
+/* This file contains locally hosted fonts to comply with Apache CSP policies */
+
+/* DM Sans - Regular (400) */
+@font-face {
+  font-family: 'DM Sans';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('../fonts/DMSans-Regular.ttf') format('truetype');
+}
+
+/* DM Sans - Medium (500) */
+@font-face {
+  font-family: 'DM Sans';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url('../fonts/DMSans-Medium.ttf') format('truetype');
+}
+
+/* DM Sans - SemiBold (600) */
+@font-face {
+  font-family: 'DM Sans';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url('../fonts/DMSans-SemiBold.ttf') format('truetype');
+}
+
+/* DM Sans - Bold (700) */
+@font-face {
+  font-family: 'DM Sans';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('../fonts/DMSans-Bold.ttf') format('truetype');
+}
+
+/* Patua One - Regular (400) */
+@font-face {
+  font-family: 'Patua One';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('../fonts/PatuaOne-Regular.ttf') format('truetype');
+}
+
+/* Roboto - Light (300) */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 300;
+  font-display: swap;
+  src: url('../fonts/Roboto-Light.ttf') format('truetype');
+}
+
+/* Roboto - Regular (400) */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('../fonts/Roboto-Regular.ttf') format('truetype');
+}
+
+/* Roboto - Medium (500) */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url('../fonts/Roboto-Medium.ttf') format('truetype');
+}
+
+/* Roboto - Bold (700) */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('../fonts/Roboto-Bold.ttf') format('truetype');
+}
+
+/* JetBrains Mono - Regular (400) */
+@font-face {
+  font-family: 'JetBrains Mono';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('../fonts/JetBrainsMono-Regular.ttf') format('truetype');
+}
+
+/* JetBrains Mono - Medium (500) */
+@font-face {
+  font-family: 'JetBrains Mono';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url('../fonts/JetBrainsMono-Medium.ttf') format('truetype');
+}
+
+/* JetBrains Mono - SemiBold (600) */
+@font-face {
+  font-family: 'JetBrains Mono';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url('../fonts/JetBrainsMono-SemiBold.ttf') format('truetype');
+}
diff --git a/assets/themes/apache/css/modern.css b/assets/themes/apache/css/modern.css
index a08c988db9..56fa434aad 100644
--- a/assets/themes/apache/css/modern.css
+++ b/assets/themes/apache/css/modern.css
@@ -262,6 +262,18 @@ body {
   order: 3;
 }
 
+.desktop-theme-btn {
+  display: flex;
+}
+
+.mobile-theme-btn {
+  display: none;
+}
+
+.mobile-theme-item {
+  display: none;
+}
+
 .theme-btn:hover {
   background: rgba(59, 130, 246, 0.1);
   border-color: var(--accent-primary);
@@ -326,9 +338,40 @@ body {
     order: 2;
   }
   
-  .theme-btn {
-    order: 3;
-    margin-left: 0.5rem;
+  .desktop-theme-btn {
+    display: none;
+  }
+  
+  .mobile-theme-btn {
+    display: flex;
+  }
+  
+  .mobile-theme-item {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid var(--border-color);
+    padding: 16px 20px;
+    gap: 0.5rem;
+  }
+  
+  .mobile-theme-btn {
+    width: 100%;
+    border: none;
+    padding: 0;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 14px;
+    font-weight: 500;
+    color: var(--text-primary);
+  }
+  
+  .mobile-theme-btn:hover {
+    background: var(--bg-card);
+  }
+  
+  .theme-label {
+    display: inline;
+    flex: 1;
   }
   
   .navbar-nav.active {
@@ -634,182 +677,6 @@ body {
   border-color: #636e7b;
 }
 
-.hero-stats {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  gap: 0.75rem;
-  margin-top: 1.5rem;
-  animation: fadeInUp 1.3s ease-out;
-}
-
-.github-stats-pill {
-  display: flex;
-  align-items: center;
-  gap: 1rem;
-  background: var(--bg-card);
-  border: 1px solid var(--border-color);
-  border-radius: 12px;
-  padding: 0.75rem 1.25rem;
-  max-width: 100%;
-  width: auto;
-  transition: all 0.3s ease;
-}
-
-.github-stats-pill:hover {
-  border-color: var(--accent-primary);
-  box-shadow: 0 4px 16px rgba(59, 130, 246, 0.15);
-}
-
-.stats-repo-group {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: 0.5rem;
-  flex: 0 0 auto;
-}
-
-.repo-link {
-  display: flex;
-  align-items: center;
-  gap: 0.4rem;
-  color: var(--text-primary);
-  text-decoration: none !important;
-  font-weight: 600;
-  font-size: 0.9rem;
-  transition: color 0.2s ease;
-  white-space: nowrap;
-}
-
-.repo-link:hover {
-  color: var(--accent-primary);
-  text-decoration: none !important;
-}
-
-.repo-link svg {
-  color: var(--text-secondary);
-  transition: color 0.2s ease;
-}
-
-.repo-link:hover svg {
-  color: var(--accent-primary);
-}
-
-.repo-name {
-  font-family: 'JetBrains Mono', monospace;
-}
-
-.repo-stats {
-  display: flex;
-  gap: 0.6rem;
-  align-items: center;
-}
-
-.repo-stats a {
-  display: inline-flex;
-  text-decoration: none !important;
-  border-radius: 8px;
-  overflow: hidden;
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
-  position: relative;
-  animation: badgeShine 3s ease-in-out infinite;
-}
-
-.repo-stats a::before {
-  content: '';
-  position: absolute;
-  inset: 0;
-  background: linear-gradient(135deg, rgba(59, 130, 246, 0.1), rgba(16, 185, 129, 0.1));
-  opacity: 0;
-  transition: opacity 0.3s ease;
-  z-index: -1;
-}
-
-.repo-stats a:hover {
-  transform: translateY(-3px) scale(1.03);
-  box-shadow: 0 8px 20px rgba(59, 130, 246, 0.25), 0 4px 12px rgba(0, 0, 0, 0.1);
-}
-
-.repo-stats a:hover::before {
-  opacity: 1;
-}
-
-.repo-stats a:active {
-  transform: translateY(-1px) scale(1.01);
-}
-
-.repo-stats img {
-  height: 20px;
-  display: block;
-  transition: filter 0.3s ease;
-}
-
-[data-theme="dark"] .repo-stats a {
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
-}
-
-[data-theme="dark"] .repo-stats a:hover {
-  box-shadow: 0 8px 20px rgba(59, 130, 246, 0.4), 0 4px 12px rgba(0, 0, 0, 0.3);
-}
-
-.stats-divider {
-  width: 1px;
-  align-self: stretch;
-  background: var(--border-color);
-}
-
-@media (max-width: 768px) {
-  .github-stats-pill {
-    flex-direction: column;
-    gap: 1rem;
-    padding: 1rem;
-    justify-content: center;
-  }
-  
-  .stats-divider {
-    display: none;
-  }
-  
-  .stats-repo-group {
-    flex-direction: row;
-    flex-wrap: wrap;
-    align-items: center;
-    gap: 0.75rem;
-    width: 100%;
-    justify-content: space-between;
-  }
-  
-  .repo-link {
-    flex-shrink: 0;
-  }
-  
-  .repo-stats {
-    display: flex;
-    gap: 0.5rem;
-    flex-wrap: nowrap;
-  }
-  
-  .repo-stats a {
-    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
-  }
-  
-  .repo-stats img {
-    height: 18px;
-  }
-}
-
-@media (max-width: 480px) {
-  .stats-repo-group {
-    width: 100%;
-  }
-  
-  .repo-stats {
-    gap: 0.4rem;
-  }
-}
-
 @keyframes fadeInUp {
   from {
     opacity: 0;
@@ -821,15 +688,6 @@ body {
   }
 }
 
-@keyframes badgeShine {
-  0%, 100% {
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
-  }
-  50% {
-    box-shadow: 0 4px 12px rgba(59, 130, 246, 0.15), 0 2px 8px rgba(0, 0, 0, 0.08);
-  }
-}
-
 /* ===== MAIN CONTENT ===== */
 
 
diff --git a/assets/themes/apache/fonts/DMSans-Bold.ttf b/assets/themes/apache/fonts/DMSans-Bold.ttf
new file mode 100644
index 0000000000..b6051af2cb
Binary files /dev/null and b/assets/themes/apache/fonts/DMSans-Bold.ttf differ
diff --git a/assets/themes/apache/fonts/DMSans-Medium.ttf b/assets/themes/apache/fonts/DMSans-Medium.ttf
new file mode 100644
index 0000000000..0f1fa5399f
Binary files /dev/null and b/assets/themes/apache/fonts/DMSans-Medium.ttf differ
diff --git a/assets/themes/apache/fonts/DMSans-Regular.ttf b/assets/themes/apache/fonts/DMSans-Regular.ttf
new file mode 100644
index 0000000000..9654ef59ea
Binary files /dev/null and b/assets/themes/apache/fonts/DMSans-Regular.ttf differ
diff --git a/assets/themes/apache/fonts/DMSans-SemiBold.ttf b/assets/themes/apache/fonts/DMSans-SemiBold.ttf
new file mode 100644
index 0000000000..45daaaca4a
Binary files /dev/null and b/assets/themes/apache/fonts/DMSans-SemiBold.ttf differ
diff --git a/assets/themes/apache/fonts/JetBrainsMono-Medium.ttf b/assets/themes/apache/fonts/JetBrainsMono-Medium.ttf
new file mode 100644
index 0000000000..51ccd916b8
Binary files /dev/null and b/assets/themes/apache/fonts/JetBrainsMono-Medium.ttf differ
diff --git a/assets/themes/apache/fonts/JetBrainsMono-Regular.ttf b/assets/themes/apache/fonts/JetBrainsMono-Regular.ttf
new file mode 100644
index 0000000000..129e8825b1
Binary files /dev/null and b/assets/themes/apache/fonts/JetBrainsMono-Regular.ttf differ
diff --git a/assets/themes/apache/fonts/JetBrainsMono-SemiBold.ttf b/assets/themes/apache/fonts/JetBrainsMono-SemiBold.ttf
new file mode 100644
index 0000000000..003757ef66
Binary files /dev/null and b/assets/themes/apache/fonts/JetBrainsMono-SemiBold.ttf differ
diff --git a/assets/themes/apache/fonts/Roboto-Bold.ttf b/assets/themes/apache/fonts/Roboto-Bold.ttf
new file mode 100644
index 0000000000..db17c0a410
Binary files /dev/null and b/assets/themes/apache/fonts/Roboto-Bold.ttf differ
diff --git a/assets/themes/apache/fonts/Roboto-Light.ttf b/assets/themes/apache/fonts/Roboto-Light.ttf
new file mode 100644
index 0000000000..c66ada49cf
Binary files /dev/null and b/assets/themes/apache/fonts/Roboto-Light.ttf differ
diff --git a/assets/themes/apache/fonts/Roboto-Medium.ttf b/assets/themes/apache/fonts/Roboto-Medium.ttf
new file mode 100644
index 0000000000..310c9e48da
Binary files /dev/null and b/assets/themes/apache/fonts/Roboto-Medium.ttf differ
diff --git a/assets/themes/apache/fonts/Roboto-Regular.ttf b/assets/themes/apache/fonts/Roboto-Regular.ttf
new file mode 100644
index 0000000000..60b906e6c9
Binary files /dev/null and b/assets/themes/apache/fonts/Roboto-Regular.ttf differ