diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 8e90240cf2de..8e244036fc05 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2387,7 +2387,7 @@ var gBrowserInit = {
         "resource:///modules/FloorpAppConstants.sys.mjs"
       );
 
-      if (FloorpAppConstants.FLOORP_PRIVATE_COMPONENTS_ENABLED) {
+      if (FloorpAppConstants.FLOORP_OFFICIAL_COMPONENTS_ENABLED) {
         if (uri) {
           try {
             // If the URI has "?FloorpEnableSSBWindow=true" at the end, The window will be opened as a SSB window.
diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
index 5795580176eb..675e428d02d9 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -149,8 +149,12 @@
 #include unified-extensions-viewcache.inc.xhtml
 
 #include ../../../floorp/browser/base/content/browser-manager-sidebar-context.inc.xhtml
-#include ../../../floorp/browser/base/content/browser-ssb-context.inc.xhtml
-#include ../../../floorp/browser/base/content/browser-workspaces-context-menu.xhtml
+
+#ifdef FLOORP_OFFICIAL_COMPONENTS_ENABLED
+#include ../../../floorp/Floorp-private-components/browser/base/content/browser-ssb-context.inc.xhtml
+#include ../../../floorp/Floorp-private-components/browser/base/content/browser-workspaces-context-menu.xhtml
+#endif
+
 
   <html:dialog id="window-modal-dialog" style="visibility: hidden; height: 0; width: 0"/>
   <html:template id="window-modal-dialog-template">
diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js
index da3fec397edc..d261ad609776 100644
--- a/browser/base/content/tabbrowser.js
+++ b/browser/base/content/tabbrowser.js
@@ -3169,7 +3169,7 @@
           "resource:///modules/FloorpAppConstants.sys.mjs"
         );
  
-        if (FloorpAppConstants.FLOORP_PRIVATE_COMPONENTS_ENABLED) {
+        if (FloorpAppConstants.FLOORP_OFFICIAL_COMPONENTS_ENABLED) {
           floorpWorkspaceId = tabData.floorpWorkspaceId;
           floorpLastShowWorkspaceId = tabData.floorpLastShowWorkspaceId;
           floorpWorkspace = tabData.floorpWorkspace ? tabData.floorpWorkspace : Services.prefs.getStringPref("floorp.browser.workspace.all").split(",")[0];
@@ -3191,7 +3191,7 @@
           tab = this.selectedTab;
           tab.setAttribute("floorpWorkspace", floorpWorkspace);
 
-          if (FloorpAppConstants.FLOORP_PRIVATE_COMPONENTS_ENABLED) {
+          if (FloorpAppConstants.FLOORP_OFFICIAL_COMPONENTS_ENABLED) {
             let { WorkspacesService } = ChromeUtils.importESModule(
               "resource:///modules/WorkspacesService.sys.mjs"
             );      
@@ -3260,7 +3260,7 @@
 
           tab.setAttribute("floorpWorkspace", floorpWorkspace);
 
-          if (FloorpAppConstants.FLOORP_PRIVATE_COMPONENTS_ENABLED) {
+          if (FloorpAppConstants.FLOORP_OFFICIAL_COMPONENTS_ENABLED) {
             let { WorkspacesService } = ChromeUtils.importESModule(
               "resource:///modules/WorkspacesService.sys.mjs"
             );      
diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
index 6ab787de45f6..efaa07636b5c 100644
--- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js
@@ -230,7 +230,7 @@ function init_all() {
   );
 
 
-  if (FloorpAppConstants.FLOORP_PRIVATE_COMPONENTS_ENABLED) {
+  if (FloorpAppConstants.FLOORP_OFFICIAL_COMPONENTS_ENABLED) {
     register_module("paneCSK", gCSKPane)
     register_module("paneWorkspaces", gWorkspacesPane);
     register_module("paneSsb", gSsbPane);
diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
index dfa5143031f4..3f0684514723 100644
--- a/browser/components/preferences/preferences.xhtml
+++ b/browser/components/preferences/preferences.xhtml
@@ -115,7 +115,7 @@
           <label class="category-name" flex="1" data-l10n-id="pane-BSB-title"></label>  
           </richlistitem>
 
-#ifdef FLOORP_PRIVATE_COMPONENTS_ENABLED
+#ifdef FLOORP_OFFICIAL_COMPONENTS_ENABLED
           <richlistitem id="category-workspaces"
                       class="category"
                       value="paneWorkspaces"
@@ -137,7 +137,7 @@
           <image class="category-icon"/>
           <label class="category-name" flex="1" data-l10n-id="files-and-applications-title"></label>  
           </richlistitem>
-#ifdef FLOORP_PRIVATE_COMPONENTS_ENABLED
+#ifdef FLOORP_OFFICIAL_COMPONENTS_ENABLED
           <richlistitem id="category-CSK"
                       class="category"
                       value="paneCSK"
@@ -307,7 +307,7 @@
 #include ../../../floorp/browser/components/preferences/design.inc.xhtml
 #include ../../../floorp/browser/components/preferences/lepton.inc.xhtml
 
-#ifdef FLOORP_PRIVATE_COMPONENTS_ENABLED
+#ifdef FLOORP_OFFICIAL_COMPONENTS_ENABLED
 #include ../../../floorp/browser/components/preferences/csk.inc.xhtml
 #include ../../../floorp/browser/components/preferences/ssb.inc.xhtml
 #include ../../../floorp/browser/components/preferences/workspaces.inc.xhtml
diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
index bf9b786ac73f..3c05c8367488 100644
--- a/browser/components/sessionstore/SessionStore.sys.mjs
+++ b/browser/components/sessionstore/SessionStore.sys.mjs
@@ -4083,7 +4083,7 @@ var SessionStoreInternal = {
     var { FloorpAppConstants } = ChromeUtils.importESModule(
       "resource:///modules/FloorpAppConstants.sys.mjs"
     );
-    if (FloorpAppConstants.FLOORP_PRIVATE_COMPONENTS_ENABLED) {
+    if (FloorpAppConstants.FLOORP_OFFICIAL_COMPONENTS_ENABLED) {
       let windowUuid = aWindow.gWorkspaces._windowId;
       if (windowUuid) {
         winData.windowUuid = windowUuid;
@@ -5330,7 +5330,7 @@ var SessionStoreInternal = {
         "resource:///modules/FloorpAppConstants.sys.mjs"
       );
   
-      if (FloorpAppConstants.FLOORP_PRIVATE_COMPONENTS_ENABLED) {
+      if (FloorpAppConstants.FLOORP_OFFICIAL_COMPONENTS_ENABLED) {
         let { WorkspacesWindowUuidService } = ChromeUtils.importESModule(
           "resource:///modules/WorkspacesService.sys.mjs"
         );
diff --git a/browser/components/sessionstore/TabState.sys.mjs b/browser/components/sessionstore/TabState.sys.mjs
index ecc8f6453d6d..a070e99feba1 100644
--- a/browser/components/sessionstore/TabState.sys.mjs
+++ b/browser/components/sessionstore/TabState.sys.mjs
@@ -111,7 +111,7 @@ var TabStateInternal = {
       "resource:///modules/FloorpAppConstants.sys.mjs"
     );
 
-    if (FloorpAppConstants.FLOORP_PRIVATE_COMPONENTS_ENABLED) {
+    if (FloorpAppConstants.FLOORP_OFFICIAL_COMPONENTS_ENABLED) {
       let { WorkspacesService } = ChromeUtils.importESModule(
         "resource:///modules/WorkspacesService.sys.mjs"
       );
diff --git a/floorp b/floorp
index e7a9b6a92449..babe6f530add 160000
--- a/floorp
+++ b/floorp
@@ -1 +1 @@
-Subproject commit e7a9b6a9244931f99c0532b931bdcfd4ded66e40
+Subproject commit babe6f530add6562955452a79c15437d432af07b