diff --git a/assets/css/docs-nginx-com/style.css b/assets/css/docs-nginx-com/style.css
index b61a2953..283c1517 100644
--- a/assets/css/docs-nginx-com/style.css
+++ b/assets/css/docs-nginx-com/style.css
@@ -1,5 +1,13 @@
 /*copy from nginx-theme.css */
 
+[data-mf="false"] {
+  display: revert;
+}
+
+[data-mf="true"] {
+  display: none;
+}
+
 big,
 html,
 small {
@@ -2248,4 +2256,3 @@ text-decoration: none;
 }
 
 /*======END GDPR2==================*/
-
diff --git a/assets/css/v2/style.css b/assets/css/v2/style.css
index fc6bacb4..6762b915 100644
--- a/assets/css/v2/style.css
+++ b/assets/css/v2/style.css
@@ -1,3 +1,11 @@
+[data-mf="true"] {
+  display: revert;
+}
+
+[data-mf="false"] {
+  display: none;
+}
+
 /* Regular */
 @font-face {
   font-family: "JetBrainsMono";
diff --git a/layouts/_default/_markup/render-codeblock.html b/layouts/_default/_markup/render-codeblock.html
index f1088809..7e1ff14b 100644
--- a/layouts/_default/_markup/render-codeblock.html
+++ b/layouts/_default/_markup/render-codeblock.html
@@ -4,7 +4,7 @@
 {{ $isSingleLine := eq (len $lines) 1 }}
 
 {{- if $isSingleLine  -}}
-<div class="code-block" data-mf="true" style="display: none;">
+<div class="code-block" data-mf="true">
     <div class="code-container chroma">
         <button onclick="copyToClipBoard(this, {{ $codeBlockId }})" class="code-copy-button" type="button">Copy</button>
         <div class="highlight-v2 single-line" id="{{ $codeBlockId }}">
@@ -13,7 +13,7 @@
     </div>
 </div>
 {{- else -}}
-<div class="code-block" data-mf="true" style="display: none;">
+<div class="code-block" data-mf="true">
     {{- if and (ne .Type "") (ne .Type "none") -}}
         <span class="code-type chroma">{{ .Type }}</span>
     {{- end -}}
@@ -27,4 +27,4 @@
 {{- end -}}
 <div id="code-block-v1" data-mf="false">
 {{ $result.Wrapped }}
-</div>
\ No newline at end of file
+</div>
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 54e5c04a..3af294dc 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="{{ .Site.LanguageCode }}">
 
-<head>  
+<head>
   <style>
     body {
       /* Hide entire body for first paint. This suppresses flicker when theme is loading. */
@@ -11,7 +11,7 @@
       flex-direction: column;
     }
   </style>
-  
+
   <noscript>
     <style>
       /* Styles when JavaScript is disabled. Fallsback to old theme. */
@@ -20,7 +20,7 @@
       }
     </style>
   </noscript>
-  
+
 
 
   <script>
@@ -56,43 +56,11 @@
         }
       });
 
-      // swap out v1 and v2 elements
-      const v1ElementIds = ["sidebar", "footer", "toc", "api", "search-v1", "breadcrumb-v1", "list-v1"]
 
-      v1ElementIds.forEach((elementId) => {
-        const element = document.getElementById(elementId);
-        if (element !== null) {
-          element.style.display = isNewTheme ? "none" : "";
-        }
-
-        const trustarc = document.getElementById("teconsent-v1");
+      const trustarc = document.getElementById("teconsent-v1");
         if (trustarc) {
           trustarc.id = isNewTheme ? "teconsent-v1" : "teconsent";
         }
-      });
-
-      document.querySelectorAll(".table-v1").forEach((table) => {
-        table.style.display = isNewTheme ? "none" : "";
-      });
-
-      const notMfElements = ['[data-mf="false"]'];
-      notMfElements.forEach((elementId) => {
-        document.querySelectorAll(elementId).forEach((element) => {
-          element.style.display = isNewTheme ? "none" : "";
-        });
-      })
-
-      const mfElements = ['[data-mf="true"]'];
-      mfElements.forEach((elementId) => {
-        document.querySelectorAll(elementId).forEach((element) => {
-          element.style.display = isNewTheme ? "" : "none";
-
-          const trustarc = document.getElementById("teconsent-v2");
-          if (trustarc) {
-            trustarc.id = isNewTheme ? "teconsent" : "teconsent-v2";
-          }
-        });
-      });
 
       document.getElementById("body").style.visibility = "visible";
     };
@@ -131,72 +99,72 @@
   {{ block "head" . }}
 
   {{ partial "meta.html" . }}
-  
+
   {{ partial "favicon.html" . }}
-  
+
   {{ partial "styles.html" . }}
-  
+
   {{ if in .Params.doctypes "devportal" }}
   {{ partial "devportal/style.html" . }}
   {{ end }}
-  
+
   {{ if fileExists "/layouts/partials/head_custom.html" }}
   {{ partial "head_custom.html" . }}
   {{ end }}
-  
+
   {{ if or ( not hugo.IsServer ) ( not ( in .Site.Params.buildtype "package" ) ) }}
-        
+
   {{ partial "trustarc.html" . }}
-  
+
   {{ partial "tealium-profile.html" . }}
-  
+
   {{ end }}
-  
+
   {{ end }}
-  
+
   <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
     new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
     j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
     'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
     })(window,document,'script','dataLayer','GTM-K5HG9JT');</script>
-  
+
   </head>
-  
+
   <body id="body">
     {{ if or ( not hugo.IsServer ) ( not ( in .Site.Params.buildtype "package" ) ) }}
   {{ partial "universal-tag.html" . }}
     {{ end }}
-  
+
     <header>
       {{ block "header" . }}{{end}}
     </header>
-  
+
     <section class="base-layout" data-testid="base-layout">
-      <section id="breadcrumb-v1">
+      <section id="breadcrumb-v1" data-mf="false">
         {{ if not .IsHome }}
           {{ if not (in .Params.display_breadcrumb "false" ) }}
-          {{ partial "breadcrumb" .}}  
+          {{ partial "breadcrumb" .}}
           {{ end }}
         {{ end }}
       </section>
-  
+
       <div class="main container-fluid min-page-height" data-menu-id="{{.RelPermalink}}">
         {{ block "main" . }}{{ end }}
       </div>
   </section>
 
-    <footer id="footer">
+    <footer id="footer" data-mf="false">
       {{ block "footer" . }}
       {{ partial "footer.html" . }}
       {{ end }}
     </footer>
 
-    <footer data-mf="true" id="footer-v2" style="display:none;">
+    <footer data-mf="true" id="footer-v2">
       {{ block "footer-v2" . }}
       {{ partial "footer-v2.html" . }}
       {{ end }}
     </footer>
-  {{ partial "scripts.html" . }} 
+  {{ partial "scripts.html" . }}
   <div id="consent_blackbar"></div>
 </body>
 </html>
diff --git a/layouts/_default/docs.html b/layouts/_default/docs.html
index cfd11f45..05af83c1 100644
--- a/layouts/_default/docs.html
+++ b/layouts/_default/docs.html
@@ -1,13 +1,13 @@
 {{ define "main" }}
 <div class="docs-container row override-sidebar-collapse">
 <div class="docs-container row override-sidebar-collapse">
-  <nav id="sidebar" class="sidenav overflow-auto col-md-3 d-none d-xl-block d-print-none align-top">
+  <nav data-mf="false" id="sidebar" class="sidenav overflow-auto col-md-3 d-none d-xl-block d-print-none align-top">
     {{ partial "sidebar.html" . }}
   </nav>
 
   <!-- Replace icons -->
   {{ $content := partial "icon-replacement.html" (dict "content" .Content) }}
-  
+
   {{if (.Params.catalog) }}
   <main class="content content-has-toc" role="main">
   {{ else if and (gt .WordCount 200 ) (.Params.toc) }}
@@ -15,7 +15,7 @@
   {{ else }}
   <main class="content col d-block align-top content-no-toc" role="main">
   {{ end }}
-    
+
   <section class="main-layout">
     <div class="sidebar-layout" id="sidebar-layout">
       <button class="sidebar__mobile__toggle" aria-expanded="false" data-mf="true">{{ partial "lucide" (dict "context" . "icon" "x")}}Close</button>
@@ -26,10 +26,10 @@
 
     <section id="maincontent" class="content-layout">
       <div data-cms-edit="content" class="text-content">
-        <section class="breadcrumb-layout wide" data-mf="true" style="display: none;">
+        <section class="breadcrumb-layout wide" data-mf="true">
           {{ if not .IsHome }}
             {{ if not (in .Params.display_breadcrumb "false" ) }}
-            {{ partial "breadcrumb" .}}  
+            {{ partial "breadcrumb" .}}
             {{ end }}
           {{ end }}
         </section>
@@ -39,7 +39,7 @@ <h1>{{ .Title }}</h1>
         {{ if in .Params.doctypes "beta" }}{{ partial "beta-badge" . }}{{ end }}
 
         <hr>
-  
+
         {{ if .Page.Lastmod }}
         <div class="last-modified">
           {{ partial "page-meta-links" . }}
@@ -53,12 +53,12 @@ <h1>{{ .Title }}</h1>
         </main>
         {{ if and (gt .WordCount 200 ) (.Params.toc) }}
           {{ if (add  (len (findRE "<h3" .Content)) (len (findRE "<h2" .Content))) }}
-            <div id="toc" class="col-md-3 d-none d-xl-block d-print-none nginx-toc align-top">
+            <div data-mf="false" id="toc" class="col-md-3 d-none d-xl-block d-print-none nginx-toc align-top">
             {{ partial "toc.html" . }}
             </div>
           {{ end }}
         {{ end }}
-        
+
       </div>
     </section>
   </section>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index badaade1..460c8f96 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,25 +1,28 @@
 {{ define "main" }}
+<div data-mf="false">
 <div class="row flex-xl-nowrap" id="list-v1">
   <nav class="sidenav overflow-auto col-md-3 d-none d-xl-block d-print-none">
     {{ partial "sidebar.html" . }}
   </nav>
   <main class="content col-xl-9 d-block" role="main">
-    {{ partial "list-main" . }} 
+    {{ partial "list-main" . }}
   </main>
 </div>
+</div>
 
 {{/*  mf list page  */}}
 
-<main class="content col d-block align-top content-has-toc" role="main" data-mf="true" style="display: none">
+<div data-mf="true">
+<main class="content col d-block align-top content-has-toc" role="main">
 <section class="main-layout">
   <div class="sidebar-layout" id="sidebar-layout">
-    <button class="sidebar__mobile__toggle" aria-expanded="false" data-mf="true">{{ partial "lucide" (dict "context" . "icon" "x")}}Close</button>
-    <nav data-mf="true" id="sidebar-v2" class="sidebar" style="display:none;">
+    <button class="sidebar__mobile__toggle" aria-expanded="false">{{ partial "lucide" (dict "context" . "icon" "x")}}Close</button>
+    <nav id="sidebar-v2" class="sidebar">
       {{ partial "sidebar-v2.html" . }}
     </nav>
   </div>
 
-  <section id="maincontent" class="content-layout" data-mf="true" style="display: none">
+  <section id="maincontent" class="content-layout">
     <div data-cms-edit="content" class="text-content list-page">
       <section class="breadcrumb-layout wide">
         {{ if not .IsHome }}
@@ -56,5 +59,5 @@ <h2>
 
 </section>
 </main>
+</div>
 {{ end }}
-
diff --git a/layouts/index.html b/layouts/index.html
index 52bd1baf..3fbd571b 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -4,7 +4,7 @@
     {{ partial "sidebar.html" . }}
   </nav>
   <main class="content col-xl-9 d-block" role="main">
-    {{ partial "list-main" . }} 
+    {{ partial "list-main" . }}
   </main>
 </div>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/partials/api.html b/layouts/partials/api.html
index 7f928b1b..cf7afd47 100644
--- a/layouts/partials/api.html
+++ b/layouts/partials/api.html
@@ -1,7 +1,6 @@
 <!--Use wide page layout for the API reference pages-->
-  <div class="nginx-docs-api-container">     
+  <div class="nginx-docs-api-container">
     <div id="api-component" class="content">
       {{ .Content}}
     </div>
   </div>
-
diff --git a/layouts/partials/callout.html b/layouts/partials/callout.html
index 616bfe04..4c8ab036 100644
--- a/layouts/partials/callout.html
+++ b/layouts/partials/callout.html
@@ -47,7 +47,7 @@
 {{ if $isSpecialTitle }}
   {{/*  Loud callouts  */}}
   <div>
-  <blockquote class="{{ $class }}" data-mf="true" style="display: none;">
+  <blockquote class="{{ $class }}" data-mf="true">
     <div>
       <div class="call-out-type">
         {{ partial "feather" (dict "context" . "icon" $icon) .}}
@@ -66,7 +66,7 @@
 
 {{ $cleanTitle := strings.TrimSuffix ":" $title}}
 
-<blockquote class="{{ $class }} note" data-mf="true" style="display: none;" data-title="{{ $cleanTitle }}">
+<blockquote class="{{ $class }} note" data-mf="true" data-title="{{ $cleanTitle }}">
   <div class="callout-content">
     {{- with $icon -}}
       <i class="{{ . }}"></i>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 240c834f..662528ba 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -11,7 +11,7 @@
           <!--div class="CoveoAnalytics" data-search-hub="HUB_ES_Nginx_Docs_And_Org"></div-->
           <div class="CoveoSearchbox" data-placeholder='Search NGINX Docs...'></div>
         </div>
-        <atomic-search-interface id="search-standalone-header" data-mf="true" style="display:none;">
+        <atomic-search-interface id="search-standalone-header" data-mf="true">
           <atomic-search-box redirection-url="/search.html">
           </atomic-search-box>
         </atomic-search-interface>
@@ -29,8 +29,8 @@
       </ul>
     </div>
     {{ end }}
-    
-    {{ $f5Sites := slice 
+
+    {{ $f5Sites := slice
       (dict "title" "DevCentral" "url" "https://community.f5.com/" "description" "Connect & learn in our hosted community")
       (dict "title" "MyF5" "url" "https://my.f5.com/" "description" "Your key to everything F5, including support, registration keys, and subscriptions")
       (dict "title" "NGINX" "url" "https://nginx.org/" "description" "Learn more about NGINX Open Source and read the community blog")
diff --git a/layouts/partials/lucide.html b/layouts/partials/lucide.html
index 8fe01769..3de09b58 100644
--- a/layouts/partials/lucide.html
+++ b/layouts/partials/lucide.html
@@ -1,6 +1,6 @@
 {{- /* Usage: */ -}}
 {{- /* (dict "context" . "icon" "circle") */ -}}
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-hidden="true" class="lucide"
-    style="{{ .style | safeCSS }}" data-mf="true" style="display: none">
+    style="{{ .style | safeCSS }}" data-mf="true">
     <use href="/images/lucide-sprite.svg#{{ .icon }}"></use>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/layouts/partials/sidebar-list-pages.html b/layouts/partials/sidebar-list-pages.html
index 1fa864ea..4f32fddd 100644
--- a/layouts/partials/sidebar-list-pages.html
+++ b/layouts/partials/sidebar-list-pages.html
@@ -4,23 +4,23 @@
     {{ range $context.Pages.ByWeight }}
     <li>
         {{ if eq .Kind "section" }}
-            <input type="checkbox" id="toggle-{{ .File.UniqueID }}" class="toggle-checkbox" style="display: none;">
+            <input type="checkbox" id="toggle-{{ .File.UniqueID }}" class="toggle-checkbox">
             <label for="toggle-{{ .File.UniqueID }}" class="collapsible-header">
                 {{ if .Pages }}
                     <span class="box expand partial-box"></span>
                     <span class="box opened partial-box"></span>
                 {{ end }}
-                {{ .Title }} 
+                {{ .Title }}
             </label>
             {{ partial "sidebar-list-pages.html" (dict "context" . "currentUrl" $currentUrl) }}
         {{ else if eq .Kind "page" }}
-            {{ if eq $currentUrl .Permalink }}                      
-                <span class="box current partial" id="current-page"></span>                 
-            {{ else }}                     
-                <span class="box-link partial"></span>              
+            {{ if eq $currentUrl .Permalink }}
+                <span class="box current partial" id="current-page"></span>
+            {{ else }}
+                <span class="box-link partial"></span>
             {{ end }}
             <a href="{{ .Permalink }}" style="{{if eq $currentUrl .Permalink}}font-weight: bold;{{end}}">{{ .Title }} </a>
-            {{ if eq $currentUrl .Permalink }}   
+            {{ if eq $currentUrl .Permalink }}
                 {{- with .TableOfContents -}}
                     {{- . -}}
                 {{- end -}}
@@ -28,4 +28,4 @@
         {{ end }}
     </li>
     {{ end }}
-</ul>
\ No newline at end of file
+</ul>
diff --git a/layouts/redoc/single.html b/layouts/redoc/single.html
index 665217c0..7f36d98d 100644
--- a/layouts/redoc/single.html
+++ b/layouts/redoc/single.html
@@ -63,7 +63,7 @@
 </style>
 <!--Use wide page layout for the API reference pages-->
 <section class="main-layout api">
-  <div class="sidebar-layout" data-mf="true" style="display:none;">
+  <div class="sidebar-layout" data-mf="true">
     <nav id="sidebar-v2" class="sidebar">
       {{ partial "sidebar-v2.html" . }}
     </nav>
@@ -79,16 +79,17 @@
   >
     <nav
       id="sidebar"
+      data-mf="false"
       class="sidenav overflow-auto col-md-3 d-none d-md-block d-print-none sidebar-toggle-hidden-width"
       style="width: 25%; border-right: 1px solid #e6e6e6"
       ;
     >
       {{ partial "sidebar.html" . }}
     </nav>
-    <section class="breadcrumb-layout" data-mf="true" style="display: none;">
+    <section class="breadcrumb-layout" data-mf="true">
       {{ if not .IsHome }}
         {{ if not (in .Params.display_breadcrumb "false" ) }}
-        {{ partial "breadcrumb" .}}  
+        {{ partial "breadcrumb" .}}
         {{ end }}
       {{ end }}
     </section>
diff --git a/layouts/search/single.html b/layouts/search/single.html
index bbbfc2db..510c99e0 100644
--- a/layouts/search/single.html
+++ b/layouts/search/single.html
@@ -1,13 +1,13 @@
 {{ define "main" }}
 
-<div class="row flex-xl-nowrap" id="search-v1">
+<div class="row flex-xl-nowrap" id="search-v1" data-mf="false">
   <main class="col-md-10 content" role="main">
     <div class="container"><h1>{{ .Title}}</h1></div>
 
     <div id="search" class="CoveoSearchInterface" data-enable-history="true" >
       <div class="CoveoFolding"></div>
       <div class="CoveoAnalytics" data-search-hub="HUB_ES_Nginx_Docs_And_Org"></div>
-      <div class="coveo-search-section" style="display: none;">
+      <div data-mf="true" class="coveo-search-section">
         <div class="CoveoSearchbox" data-enable-omnibox="true"></div>
       </div>
       <div class="coveo-main-section">
@@ -145,7 +145,7 @@
                 <atomic-result-section-title-metadata>
                   <atomic-result-printable-uri></atomic-result-printable-uri>
                 </atomic-result-section-title-metadata>
-                
+
                 <!-- Excerpt -->
                 <atomic-result-section-excerpt>
                   <atomic-result-text field="excerpt"></atomic-result-text>
@@ -157,7 +157,7 @@
                 </atomic-result-section-bottom-metadata>
               </template>
             </atomic-result-template>
-          </atomic-result-list> 
+          </atomic-result-list>
         </atomic-layout-section>
 
         <!-- Pagination -->
diff --git a/layouts/shortcodes/bootstrap-table.html b/layouts/shortcodes/bootstrap-table.html
index 8981d39f..4897df3f 100644
--- a/layouts/shortcodes/bootstrap-table.html
+++ b/layouts/shortcodes/bootstrap-table.html
@@ -1,12 +1,14 @@
+<div data-mf="false">
 {{ $htmlTable := .Inner | markdownify }}
 {{ $class := .Get 0 }}
 {{ $oldTable := "<table>" }}
-{{ $newTable := printf "<table class=\"%s %s\">" $class "table-v1" }}
+{{ $newTable := printf "<table class=\"%s\">" $class }}
 {{ $oldP := "<p>" }}
-{{ $newP := printf "<p class=\"%s\">" "table-v1"}}
+{{ $newP := printf "<p>"}}
 {{ $htmlTable := replace $htmlTable $oldTable $newTable }}
 {{ $htmlTable := replace $htmlTable $oldP $newP }}
 {{ $htmlTable | safeHTML }}
+</div>
 
 <!-- Add default option for table of "narrow" if one is not provided -->
 {{ $narrowOption := "narrow" }}
@@ -15,6 +17,6 @@
   {{ $class = printf "%s %s" $class $narrowOption }}
 {{ end }}
 
-<div data-mf="true" style="display: none;" class="table-v2 {{ $class }}">
+<div data-mf="true" class="table-v2 {{ $class }}">
     {{ .Inner | markdownify }}
-</div>
\ No newline at end of file
+</div>
diff --git a/layouts/shortcodes/ghcode.html b/layouts/shortcodes/ghcode.html
index 3aed9ec2..e18994c6 100644
--- a/layouts/shortcodes/ghcode.html
+++ b/layouts/shortcodes/ghcode.html
@@ -9,8 +9,8 @@
     <div id="code-block-v1" data-mf="false">
       {{ highlight .Content $lang $params }}
     </div>
-    
-    <div class="code-block" data-mf="true" style="display: none;">
+
+    <div class="code-block" data-mf="true">
       {{- if and (ne $lang "") (ne $lang "none") -}}
           <span class="code-type chroma">{{ $lang }}</span>
       {{- end -}}
@@ -24,4 +24,4 @@
   {{ end }}
 {{ else }}
   {{ errorf "Unable to load github content from %s from %q" $file .Position}}
-{{ end }}
\ No newline at end of file
+{{ end }}
