diff --git a/e107_themes/bootstrap5/languages/English_admin.php b/e107_themes/bootstrap5/languages/English_admin.php
index 916b27721..738feb09b 100644
--- a/e107_themes/bootstrap5/languages/English_admin.php
+++ b/e107_themes/bootstrap5/languages/English_admin.php
@@ -6,6 +6,12 @@
 +----------------------------------------------------------------------------+
 */
 
-define("LAN_THEMEPREF_01", "Bootswatch Styles:");
+define("LAN_THEMEPREF_00", "Branding:");
+define("LAN_THEMEPREF_01", "Navbar Alignment:");
 define("LAN_THEMEPREF_02", "Display standard menu with card look");
 define("LAN_THEMEPREF_03", "Display Login Page as standard page");
+define("LAN_THEMEPREF_04", "Site Name");
+define("LAN_THEMEPREF_05", "Logo");
+define("LAN_THEMEPREF_06", "Logo &amp; Site Name");
+define("LAN_THEMEPREF_07", "left");
+define("LAN_THEMEPREF_08", "right");
diff --git a/e107_themes/bootstrap5/theme.html b/e107_themes/bootstrap5/theme.html
index 613b69c56..902c682c9 100644
--- a/e107_themes/bootstrap5/theme.html
+++ b/e107_themes/bootstrap5/theme.html
@@ -2,12 +2,12 @@
 <body id="page-top" class="{LAYOUT_ID}" {BODY_ONLOAD} >
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
     <div class="container">
-      <a class="navbar-brand" href="{SITEURL}">{SITENAME}</a>
+      <a class="navbar-brand" href="{SITEURL}">{BOOTSTRAP_BRANDING}</a>
       <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse" id="navbarResponsive">
-      {NAVIGATION: type=main&class=me-auto}
+      {BOOTSTRAP_NAV_ALIGN}
       {SIGNIN}
       </div>
     </div>
diff --git a/e107_themes/bootstrap5/theme_config.php b/e107_themes/bootstrap5/theme_config.php
index 471609e73..07d84b522 100644
--- a/e107_themes/bootstrap5/theme_config.php
+++ b/e107_themes/bootstrap5/theme_config.php
@@ -18,10 +18,11 @@ class theme_config implements e_theme_config
 
 	function config()
 	{
-
+		$brandingOpts = array('sitename' => LAN_THEMEPREF_04, 'logo' => LAN_THEMEPREF_05, 'sitenamelogo' => LAN_THEMEPREF_06);
 		return array(
-		//	'cardmenu_look' => array('title' => LAN_THEMEPREF_02, 'type'=>'boolean', 'writeParms'=>array(),'help'=>''),
-			'login_iframe' => array('title' => LAN_THEMEPREF_03, 'type'=>'boolean', 'writeParms'=>array(),'help'=>''),
+			'login_iframe' => array('title' => LAN_THEMEPREF_03, 'type' => 'boolean', 'writeParms' => array(), 'help' => ''),
+			'branding'          => array('title' => LAN_THEMEPREF_00, 'type' => 'dropdown', 'writeParms' => array('optArray' => $brandingOpts)),
+			'nav_alignment'     => array('title' => LAN_THEMEPREF_01, 'type' => 'radio', 'writeParms' => array('optArray' => array('left' => LAN_THEMEPREF_07, 'right' => LAN_THEMEPREF_08)))
 		);
 
 	}
diff --git a/e107_themes/bootstrap5/theme_shortcodes.php b/e107_themes/bootstrap5/theme_shortcodes.php
index 402e8bc1b..a6df8df5b 100644
--- a/e107_themes/bootstrap5/theme_shortcodes.php
+++ b/e107_themes/bootstrap5/theme_shortcodes.php
@@ -158,7 +158,45 @@ class theme_shortcodes extends e_shortcode
 
 	}
 
+	function sc_bootstrap_branding()
+	{
+		$pref = e107::pref('theme', 'branding');
 
+		switch ($pref)
+		{
+			case 'logo':
+
+				return e107::getParser()->parseTemplate('{SITELOGO: h=30}', true);
+
+				break;
+
+			case 'sitenamelogo':
+				return "<span>" . e107::getParser()->parseTemplate('{SITELOGO: h=30}', true) . "</span>" . SITENAME;
+
+				break;
+
+			case 'sitename':
+			default:
+
+				return SITENAME;
+
+				break;
+		}
+	}
+
+	function sc_bootstrap_nav_align()
+	{
+		$pref = e107::pref('theme', 'nav_alignment');
+
+		if ($pref == 'right')
+		{
+			return 	e107::getParser()->parseTemplate('{NAVIGATION: type=main&class=ms-auto}');
+		}
+		else
+		{
+			return e107::getParser()->parseTemplate('{NAVIGATION: type=main&class=me-auto}');
+		}
+	}
 
 
 }
