diff --git a/orange_theme_odoo12/README.md b/orange_theme_odoo12/README.md
index 377bedf8c..b9e5ca5ba 100644
--- a/orange_theme_odoo12/README.md
+++ b/orange_theme_odoo12/README.md
@@ -24,8 +24,9 @@ Company
 
 Credits
 -------
-* 'Cybrosys Techno Solutions <https://cybrosys.com/>'__
-
+* Developer:
+    V16 Sigha Ck  @ Cybrosys
+* 
 Contacts
 --------
 * Mail Contact : odoo@cybrosys.com
diff --git a/orange_theme_odoo12/__init__.py b/orange_theme_odoo12/__init__.py
index 45fc0fe72..3f422d825 100644
--- a/orange_theme_odoo12/__init__.py
+++ b/orange_theme_odoo12/__init__.py
@@ -3,7 +3,7 @@
 #
 #    Cybrosys Technologies Pvt. Ltd.
 #
-#    Copyright (C) 2021-TODAY Cybrosys Technologies(<https://www.cybrosys.com>)
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>)
 #    Author: Cybrosys Techno Solutions(<https://www.cybrosys.com>)
 #
 #    You can modify it under the terms of the GNU LESSER
diff --git a/orange_theme_odoo12/__manifest__.py b/orange_theme_odoo12/__manifest__.py
index bbdcb170f..cd59ce615 100644
--- a/orange_theme_odoo12/__manifest__.py
+++ b/orange_theme_odoo12/__manifest__.py
@@ -3,7 +3,7 @@
 #
 #    Cybrosys Technologies Pvt. Ltd.
 #
-#    Copyright (C) 2021-TODAY Cybrosys Technologies(<https://www.cybrosys.com>)
+#    Copyright (C) 2023-TODAY Cybrosys Technologies(<https://www.cybrosys.com>)
 #    Author: Cybrosys Techno Solutions(<https://www.cybrosys.com>)
 #
 #    You can modify it under the terms of the GNU LESSER
@@ -36,7 +36,6 @@
     ],
     "depends": [
         'web',
-        'website',
         'portal',
     ],
     "data": [
diff --git a/orange_theme_odoo12/doc/RELEASE_NOTES.md b/orange_theme_odoo12/doc/RELEASE_NOTES.md
index 25944adc9..0190ce90d 100644
--- a/orange_theme_odoo12/doc/RELEASE_NOTES.md
+++ b/orange_theme_odoo12/doc/RELEASE_NOTES.md
@@ -1,10 +1,7 @@
 ## Module <orange_theme_odoo12>
 
-#### 04.06.2021
-#### Version 15.0.1.0.0
-##### ADD
+#### 10.03.2023
+#### Version 16.0.1.0.0
+#### ADD
 - Initial commit
 
-#### 09.01.2023
-#### Version 16.0.1.0.0
-#### ADD
\ No newline at end of file
diff --git a/orange_theme_odoo12/static/src/js/chrome/search_apps.js b/orange_theme_odoo12/static/src/js/chrome/search_apps.js
index c55bf9a89..1daae5dbd 100644
--- a/orange_theme_odoo12/static/src/js/chrome/search_apps.js
+++ b/orange_theme_odoo12/static/src/js/chrome/search_apps.js
@@ -1,20 +1,17 @@
 /** @odoo-module */
-
 import { NavBar } from "@web/webclient/navbar/navbar";
-import { registry } from "@web/core/registry";
 const { fuzzyLookup } = require('@web/core/utils/search');
 import { computeAppsAndMenuItems } from "@web/webclient/menus/menu_helpers";
 import core from 'web.core';
-
-const commandProviderRegistry = registry.category("command_provider");
 const { onMounted } = owl;
-
 import { patch } from 'web.utils';
-var rpc = require('web.rpc');
+
+// patch NavaBar for searching apps and contents by extending navbar
 patch(NavBar.prototype, 'orange_theme_odoo12/static/src/js/chrome/search_apps.js', {
 
     //--------------------------------------------------------------------------
-    // Public
+    // For advance search bar feature, and this will enable a global search for apps and related content
+    //
     //--------------------------------------------------------------------------
 
     /**
@@ -28,25 +25,22 @@ patch(NavBar.prototype, 'orange_theme_odoo12/static/src/js/chrome/search_apps.js
         this._searchableMenus = menuItems;
         onMounted(this.onMounted);
     },
-
-
     onMounted() {
         this.$search_container = $(".search-container");
         this.$search_input = $(".search-input input");
         this.$search_results = $(".search-results");
         this.$app_menu = $(".app-menu");
-        this.$dropdown_menu = $(".dropdown-menu");
     },
+    // to show the search results
      _searchMenusSchedule: function () {
         this.$search_results.removeClass("o_hidden")
         this.$app_menu.addClass("o_hidden");
         this._search_def.reject();
         this._search_def = $.Deferred();
         setTimeout(this._search_def.resolve.bind(this._search_def), 50);
-
         this._search_def.done(this._searchMenus.bind(this));
     },
-
+    // function for searching all apps and content
     _searchMenus: function () {
         var query = this.$search_input.val();
         if (query === "") {
@@ -55,7 +49,7 @@ patch(NavBar.prototype, 'orange_theme_odoo12/static/src/js/chrome/search_apps.js
             this.$search_results.empty();
             return;
         }
-
+        // search for all apps
         var results = [];
         fuzzyLookup(query, this._apps, (menu) => menu.label)
         .forEach((menu) => {
@@ -67,7 +61,7 @@ patch(NavBar.prototype, 'orange_theme_odoo12/static/src/js/chrome/search_apps.js
                 webIconData: menu.webIconData,
             });
         });
-
+        // search for all content
         fuzzyLookup(query, this._searchableMenus, (menu) =>
             (menu.parents + " / " + menu.label).split("/").reverse().join("/")
         ).forEach((menu) => {
@@ -79,18 +73,11 @@ patch(NavBar.prototype, 'orange_theme_odoo12/static/src/js/chrome/search_apps.js
             });
         });
 
-        this.$search_container.toggleClass(
-            "has-results",
-            Boolean(results.length)
-        );
-        this.$search_results.html(
-            core.qweb.render(
-                "orange_theme_odoo12.SearchResults",
-                {
+        this.$search_container.toggleClass("has-results",Boolean(results.length));
+        this.$search_results.html( core.qweb.render("orange_theme_odoo12.SearchResults", {
                     results: results,
                     widget: this,
-                }
-            )
-        );
+                })
+                );
     },
 });
\ No newline at end of file
diff --git a/orange_theme_odoo12/static/src/scss/theme_style_backend.scss b/orange_theme_odoo12/static/src/scss/theme_style_backend.scss
index 0a90ffe89..9b6e758bd 100644
--- a/orange_theme_odoo12/static/src/scss/theme_style_backend.scss
+++ b/orange_theme_odoo12/static/src/scss/theme_style_backend.scss
@@ -22,10 +22,7 @@ p img {
   margin: 0
 }
 a,
-.o_form_view .o_form_uri > span:first-child,
-.o_form_view .o_form_uri > span:last-child,
-.o_button_icon,
-.btn-link
+.o_form_view .o_form_uri > span:first-child,.o_form_view .o_form_uri > span:last-child,.o_button_icon,.btn-link
 {
     color: #fe5031 !important;
     text-decoration: none;
@@ -119,12 +116,10 @@ input {
   border-radius: 0 !important;
   transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
 }
-.o_field_statusbar > .o_statusbar_status > .o_arrow_button.o_arrow_button_current.disabled::after, .o_field_statusbar >
-.o_statusbar_status > .o_arrow_button.o_arrow_button_current.disabled::before {
+.o_field_statusbar > .o_statusbar_status > .o_arrow_button.o_arrow_button_current.disabled::after, .o_field_statusbar >.o_statusbar_status > .o_arrow_button.o_arrow_button_current.disabled::before {
   border-left-color: #fe5031;
 }
-.o_field_statusbar > .o_statusbar_status > .o_arrow_button:not(:first-child)::before, .o_field_statusbar >
-.o_statusbar_status > .o_arrow_button:not(:first-child)::after {
+.o_field_statusbar > .o_statusbar_status > .o_arrow_button:not(:first-child)::before, .o_field_statusbar >.o_statusbar_status > .o_arrow_button:not(:first-child)::after {
   content: " ";
  content: " ";
 display: block;
@@ -153,10 +148,9 @@ button {
   outline: none !important;
   letter-spacing: 0
 }
-.custom-control-input:checked ~ .custom-control-label::before,
-.badge-primary
+.custom-control-input:checked ~ .custom-control-label::before,.badge-primary
 {
-    background-color: #fe5031 !important ;
+    background-color: #fe5031  ;
 }
 blockquote {
   padding: 60px;
@@ -307,8 +301,7 @@ li.o_user_menu a.dropdown-toggle {
   transform: translateY(-2px);
   margin-right: 9px;
 }
-.o_main_navbar .o_nav_entry, .o_main_navbar .dropdown-toggle, .o_main_navbar .o_menu_brand, .o_main_navbar
-.o_menu_systray > * > a, .o_main_navbar .o_menu_systray > * > .dropdown > a, .o_main_navbar .o_menu_systray > * > button, .o_main_navbar .o_menu_systray > * > label
+.o_main_navbar .o_nav_entry, .o_main_navbar .dropdown-toggle, .o_main_navbar .o_menu_brand, .o_main_navbar.o_menu_systray > * > a, .o_main_navbar .o_menu_systray > * > .dropdown > a, .o_main_navbar .o_menu_systray > * > button, .o_main_navbar .o_menu_systray > * > label
 {
     line-height: 33px;
 }
@@ -325,8 +318,7 @@ li.o_user_menu a.dropdown-toggle {
       margin-left: 20px;
 }
 
-.o_main_navbar .o_menu_systray > * > a .badge, .o_main_navbar .o_menu_systray > * > .dropdown > a
-.badge, .o_main_navbar .o_menu_systray > * > button .badge, .o_main_navbar .o_menu_systray > * > label .badge
+.o_main_navbar .o_menu_systray > * > a .badge, .o_main_navbar .o_menu_systray > * > .dropdown > a.badge, .o_main_navbar .o_menu_systray > * > button .badge, .o_main_navbar .o_menu_systray > * > label .badge
 {
     background-color:#fe5031;
     border-radius: 24px;
@@ -337,8 +329,7 @@ li.o_user_menu a.dropdown-toggle {
     appearance: radio;
     height: 14px !important;
 }
-.o_menu_sections .o-dropdown .dropdown-toggle,
-.o_main_navbar .o_nav_entry, .o_main_navbar .o_menu_sections .o_nav_entry
+.o_menu_sections .o-dropdown .dropdown-toggle,.o_main_navbar .o_nav_entry, .o_main_navbar .o_menu_sections .o_nav_entry
 {
     &:hover{
         color: #fe5031 !important;
@@ -377,8 +368,7 @@ li.o_user_menu a.dropdown-toggle {
   transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
 
-.o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button:not(:first-child):
-before, .o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button:not(:first-child):after {
+.o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button:not(:first-child):before, .o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button:not(:first-child):after {
   content: " ";
   display: block;
   position: absolute;
@@ -458,8 +448,7 @@ before, .o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button:n
   color: #b1a7a7;
 }
 
-.ui-autocomplete .ui-menu-item > a, .show .dropdown-menu .dropdown-item, .show .dropdown-menu .dropdown-header,
-.navbar-nav .show .dropdown-menu .dropdown-item, .navbar-nav .show .dropdown-menu .dropdown-header {
+.ui-autocomplete .ui-menu-item > a, .show .dropdown-menu .dropdown-item, .show .dropdown-menu .dropdown-header,.navbar-nav .show .dropdown-menu .dropdown-item, .navbar-nav .show .dropdown-menu .dropdown-header {
   padding: 3px 20px;
   transition: 0s !important;
 }
@@ -594,8 +583,7 @@ span.o_searchview_facet_label {
   border: 1px solid #fe5031;
 }
 
-.o_control_panel .btn-secondary:not(:disabled):not(.disabled):active, .o_control_panel .btn-secondary:
-not(:disabled):not(.disabled).active, .o_control_panel .show > .btn-secondary.dropdown-toggle {
+.o_control_panel .btn-secondary:not(:disabled):not(.disabled):active, .o_control_panel .btn-secondary:not(:disabled):not(.disabled).active, .o_control_panel .show > .btn-secondary.dropdown-toggle {
   color: #fe5031;
   background-color: #ffffff;
   border-color: #fe5031;
@@ -763,8 +751,6 @@ ul.nav.nav-tabs li.nav-item a {
   background-color: #ffffff;
   width: 300px;
   color: #000000;
-//   box-shadow: 13px 9px 21px 20px #f1f1f1;
-//   box-shadow: 12px 0px 4px 6px black;
 }
 
 .o_DiscussSidebarItem.o-active {
@@ -798,8 +784,7 @@ ul.nav.nav-tabs li.nav-item a {
   opacity: .5 !important;
 }
 
-.o_Discuss .o_DiscussSidebar .o_DiscussSidebar_groupHeader .o_add:hover, .o_Discuss .o_DiscussSidebar .o_DiscussSidebar_groupHeader
-.o_add:focus, .o_Discuss .o_DiscussSidebar .o_DiscussSidebar_groupHeader .o_add.focus {
+.o_Discuss .o_DiscussSidebar .o_DiscussSidebar_groupHeader .o_add:hover, .o_Discuss .o_DiscussSidebar .o_DiscussSidebar_groupHeader.o_add:focus, .o_Discuss .o_DiscussSidebar .o_DiscussSidebar_groupHeader .o_add.focus {
   color: #fe5031;
 }
 
@@ -1054,15 +1039,13 @@ h4.o_onboarding_step_title.mt16 a {
 .o_menu_apps .dropdown-menu {
  position :absolute !important;
 }
-.o_cp_switch_buttons .btn-light:not(:disabled):not(.disabled).active,
-.o_cp_switch_buttons .btn-light:hover
+.o_cp_switch_buttons .btn-light:not(:disabled):not(.disabled).active,.o_cp_switch_buttons .btn-light:hover
 {
     color: #fe5031 !important;
     background-color: #fff !important;
     border-color: #fe5031 !important;
 }
-.o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button.btn-primary.disabled::before,
-.o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button.btn-primary.disabled::after
+.o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button.btn-primary.disabled::before,.o_form_view .o_form_statusbar > .o_statusbar_status > .o_arrow_button.btn-primary.disabled::after
 {
     border-left-color: #E9ECEF !important;
 }
@@ -1186,5 +1169,12 @@ i.fa-folder{
 #user_id {
   height: 22px !important;
 }
+o_main_navbar .o_menu_systray > * > a .badge, .o_main_navbar .o_menu_systray > * > .dropdown > a .badge, .o_main_navbar .o_menu_systray > * > button .badge, .o_main_navbar .o_menu_systray > * > label .badge {
+
+  background-color: #fe5031 !important;
+  border-radius: 50% !important;
+  color: #fff;
+
+}
 
 
diff --git a/orange_theme_odoo12/views/login_templates.xml b/orange_theme_odoo12/views/login_templates.xml
index f61015028..4ee563b77 100644
--- a/orange_theme_odoo12/views/login_templates.xml
+++ b/orange_theme_odoo12/views/login_templates.xml
@@ -8,13 +8,8 @@
                 in
             </button>
         </xpath>
-        <xpath expr="//t[@t-if='debug']/button" position="replace">
-            <button type="submit" name="redirect"
-                    value="/web/become"
-                    class="btn btn-link btn-sm btn-block cybro-super-btn">Log in
-                as
-                superuser
-            </button>
+        <xpath expr="//t[@t-if='debug']/button" position="attributes">
+            <attribute name="class"  add="btn btn-link btn-sm btn-block cybro-super-btn"  separator=" "/>
         </xpath>
     </template>
     <template id="layout" name="Main layout Ext"