diff --git a/components/organisms/navbar/navbar.component.yml b/components/organisms/navbar/navbar.component.yml
index 136d313..5837b21 100644
--- a/components/organisms/navbar/navbar.component.yml
+++ b/components/organisms/navbar/navbar.component.yml
@@ -2,6 +2,7 @@ $schema: https://git.drupalcode.org/project/drupal/-/raw/10.2.x/core/modules/sdc
 name: Navbar
 status: experimental
 description: Navbar component
+replaces: 'varbase_components:navbar'
 props:
   type: object
   properties:
diff --git a/components/organisms/navbar/navbar.css b/components/organisms/navbar/navbar.css
index 65addf8..c04d99e 100644
--- a/components/organisms/navbar/navbar.css
+++ b/components/organisms/navbar/navbar.css
@@ -1,3 +1,21 @@
+/*!
+ * Bootstrap  v5.3.2 (https://getbootstrap.com/)
+ * Copyright 2011-2023 The Bootstrap Authors
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ */
+
+[data-bs-theme=light] .navbar {
+  background: var(--bs-white);
+}
+
+[data-bs-theme=dark] .navbar {
+  background: #084298;
+}
+
+.navbar {
+  height: 5.25rem;
+}
+
 .navbar .form-inline .form-actions {
   display: none;
 }
@@ -6,11 +24,13 @@
   z-index: 1200;
 }
 
-[dir="ltr"] .toolbar-horizontal .toolbar-menu.nav {
+.toolbar-horizontal .toolbar-menu.nav {
+  
   float: left;
 }
 
 [dir="rtl"] .toolbar-horizontal .toolbar-menu.nav {
+  
   float: right;
 }
 
diff --git a/components/organisms/navbar/navbar.scss b/components/organisms/navbar/navbar.scss
index 74e2b01..4e31916 100644
--- a/components/organisms/navbar/navbar.scss
+++ b/components/organisms/navbar/navbar.scss
@@ -1,4 +1,20 @@
+@import "../../defaults";   // Global component defaults.
+
+[data-bs-theme=light] {
+  .navbar {
+    background: var(--bs-white);
+  }
+}
+
+[data-bs-theme=dark] {
+  .navbar {
+    background: $blue-700;
+  }
+}
+
 .navbar {
+  height: 5.25rem;
+
   .form-inline {
     .form-actions {
       display: none;
@@ -17,11 +33,3 @@
     }
   }
 }
-
-.nav-underline {
-  .nav-link {
-    &:focus {
-      border-bottom-color: $primary;
-    }
-  }
-}
\ No newline at end of file
diff --git a/components/organisms/navbar/navbar.twig b/components/organisms/navbar/navbar.twig
index 182b177..50faf02 100644
--- a/components/organisms/navbar/navbar.twig
+++ b/components/organisms/navbar/navbar.twig
@@ -21,13 +21,11 @@
 {% set container = container ?? false %}
 {% set placement = placement ?? '' %}
 {% set color = color ?? 'light' %}
-{% set navbar_expand = navbar_expand ?? 'lg' %}
 {% set utility_classes = utility_classes ? utility_classes : [] %}
 
 {%
   set classes = [
     'navbar',
-    'navbar-expand-' ~ navbar_expand,
     'justify-content-between',
     'navbar-' ~ color,
     'bg-' ~ color,
@@ -44,11 +42,7 @@
     {{ branding }}
   {% endblock %}
 
-  <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
-
-  <div class="collapse navbar-collapse">
+  <div>
     {% block navigation %}
       {{ navigation }}
     {% endblock %}
diff --git a/webpack.config.components.js b/webpack.config.components.js
index 32a0382..e5e1c70 100644
--- a/webpack.config.components.js
+++ b/webpack.config.components.js
@@ -18,7 +18,7 @@ module.exports = {
     // 'molecules/alert/alert': ['./components/molecules/alert/alert.scss'],
     // 'molecules/tabs/tabs': ['./components/molecules/tabs/tabs.scss'],
     // 'molecules/field-tags/field-tags': ['./components/molecules/field-tags/field-tags.scss'],
-    //'organisms/navbar/navbar': ['./components/organisms/navbar/navbar.scss'],
+    'organisms/navbar/navbar': ['./components/organisms/navbar/navbar.scss'],
     // 'organisms/page-header/page-header': ['./components/organisms/page-header/page-header.scss'],
     //'organisms/page-footer/page-footer': ['./components/organisms/page-footer/page-footer.scss'],
     // 'organisms/page-better-login/page-better-login': ['./components/organisms/page-better-login/page-better-login.scss'],