diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34b4a845..5f10ce97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 ## New Updates
 
+### 9.2.2 - ਊਨਾ Release _June 18, 2024_
+
+#### Misc. bug fix and other improvements
+- Enhanced Bani Controller: Improved functionality when using the Bani Controller in a multipane workspace.
+- Improved Theme Handling: Enhanced support for custom images during theme changes.
+- Restored Font Size Adjustments: Restored the ability to change the font size for miscellaneous slides such as "Waheguru" and "Mool Mantra."
+- Code and Style Improvements: Various code refactors and stylistic enhancements to improve performance and maintainability.
+
+**We would love to hear from you if there a feature that you have been waiting for. Send us your feedback at [sttm.co/feedback](https://www.sttm.co/feedback).**
+</br>
+
 ### 9.2.1 - ਊਨਾ Release _May 24, 2024_
 
 #### New Features
diff --git a/package-lock.json b/package-lock.json
index e62c579d..45dcac2d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "sttm-desktop",
-  "version": "9.2.1",
+  "version": "9.2.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "sttm-desktop",
-      "version": "9.2.1",
+      "version": "9.2.2",
       "hasInstallScript": true,
       "license": "OSL-3.0",
       "dependencies": {
diff --git a/package.json b/package.json
index 7cc2c0df..6e9eac33 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "productName": "SikhiToTheMax",
   "name": "sttm-desktop",
-  "version": "9.2.1",
+  "version": "9.2.2",
   "description": "The SikhiToTheMax desktop app",
   "main": "app.js",
   "scripts": {
@@ -216,4 +216,4 @@
       "NSAllowsArbitraryLoads": true
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packaging/update-packagejson.js b/packaging/update-packagejson.js
index f996b659..a8378f13 100644
--- a/packaging/update-packagejson.js
+++ b/packaging/update-packagejson.js
@@ -7,7 +7,7 @@ const teamId = process.env.APPLE_TEAM_ID;
 
 if (!teamId) {
   console.error('TEAM_ID is not defined in the environment variables');
-  process.exit(1);
+  process.exit(0);
 }
 
 if (!process.env.I_AM_TRAVIS) {
diff --git a/www/configs/navigator-settings.json b/www/configs/navigator-settings.json
index 3295c0f8..83fe7bab 100644
--- a/www/configs/navigator-settings.json
+++ b/www/configs/navigator-settings.json
@@ -75,5 +75,7 @@
     "homeVerse": false,
     "content":"",
     "baniType": ""
-  }
+  },
+
+  "disabledContent": []
 }
diff --git a/www/main/addons/announcement/components/Annoucement.jsx b/www/main/addons/announcement/components/Annoucement.jsx
index c4347a18..50cf89cc 100644
--- a/www/main/addons/announcement/components/Annoucement.jsx
+++ b/www/main/addons/announcement/components/Annoucement.jsx
@@ -87,7 +87,7 @@ const Announcement = ({ isGurmukhi }) => {
         <textarea
           className={classNames(
             'announcement-text',
-            keyboardOpenStatus && 'gurmukhi',
+            keyboardOpenStatus && isGurmukhi && 'gurmukhi',
             isGurmukhi && 'gurmukhi',
             'disable-kb-shortcuts',
           )}
diff --git a/www/main/addons/ceremonies/components/CeremonyPane.jsx b/www/main/addons/ceremonies/components/CeremonyPane.jsx
index e6100df0..2826830d 100644
--- a/www/main/addons/ceremonies/components/CeremonyPane.jsx
+++ b/www/main/addons/ceremonies/components/CeremonyPane.jsx
@@ -53,7 +53,7 @@ const CeremonyPane = ({ token, name, id, onScreenClose }) => {
     setPaneSelectorActive(true);
   };
 
-  const onThemeClick = (theme, multipaneId = null) => {
+  const onThemeClick = (event, theme, multipaneId = null) => {
     let parsedTheme = theme;
     if (typeof theme === 'string') {
       parsedTheme = JSON.parse(theme);
@@ -136,8 +136,8 @@ const CeremonyPane = ({ token, name, id, onScreenClose }) => {
     current: getTheme(currentTheme),
   };
 
-  const openCeremonyFromDropdown = (givenPane) => {
-    onThemeClick(paneSelector.current.dataset.theme, givenPane);
+  const openCeremonyFromDropdown = (e, givenPane) => {
+    onThemeClick(e, paneSelector.current.dataset.theme, givenPane);
     setPaneSelectorActive(false);
   };
 
@@ -183,7 +183,7 @@ const CeremonyPane = ({ token, name, id, onScreenClose }) => {
                 if (currentWorkspace === i18n.t('WORKSPACES.MULTI_PANE')) {
                   openPaneMenu(e, themes.light);
                 } else {
-                  onThemeClick(themes.light);
+                  onThemeClick(e, themes.light);
                 }
               }}
               className="theme-instance"
diff --git a/www/main/common/sttm-ui/multipane-dropdown/MultipaneDropdown.jsx b/www/main/common/sttm-ui/multipane-dropdown/MultipaneDropdown.jsx
index 9a680046..7f0d5894 100644
--- a/www/main/common/sttm-ui/multipane-dropdown/MultipaneDropdown.jsx
+++ b/www/main/common/sttm-ui/multipane-dropdown/MultipaneDropdown.jsx
@@ -16,9 +16,9 @@ const MultipaneDropdown = ({
   const dropdownOptions = [pane1, pane2, pane3].map((item, index) => (
     <p
       key={`pane-option-${index + 1}`}
-      onClick={() => {
+      onClick={(e) => {
         if (!item.locked) {
-          clickHandler(index + 1);
+          clickHandler(e, index + 1);
         }
       }}
       title={item.locked ? i18n.t('MULTI_PANE.LOCKED_PANE_MSG') : ''}
diff --git a/www/main/common/sttm-ui/tile/Tile.jsx b/www/main/common/sttm-ui/tile/Tile.jsx
index d965dca0..583f2571 100644
--- a/www/main/common/sttm-ui/tile/Tile.jsx
+++ b/www/main/common/sttm-ui/tile/Tile.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { joinClasses } from '../../utils';
+import { classNames, joinClasses } from '../../utils';
 
 const Tile = ({
   children,
@@ -32,7 +32,7 @@ const Tile = ({
       className={`ui-tile ${tileClassname}`}
       style={theme ? getThemeSwatchStyles(theme) : null}
     >
-      <span className={isEngTransliterated && 'eng-tile'}>{children || content}</span>
+      <span className={classNames(isEngTransliterated && 'eng-tile')}>{children || content}</span>
     </button>
   );
 };
diff --git a/www/main/navigator/Navigator.jsx b/www/main/navigator/Navigator.jsx
index a4da700c..85a2ca0d 100644
--- a/www/main/navigator/Navigator.jsx
+++ b/www/main/navigator/Navigator.jsx
@@ -13,9 +13,9 @@ const remote = require('@electron/remote');
 const { i18n } = remote.require('./app');
 
 const Navigator = () => {
-  const { minimizedBySingleDisplay, currentWorkspace } = useStoreState(
-    (state) => state.userSettings,
-  );
+  const { currentWorkspace } = useStoreState((state) => state.userSettings);
+
+  const { minimizedBySingleDisplay } = useStoreState((state) => state.navigator);
 
   const {
     displayWaheguruSlide,
diff --git a/www/main/navigator/misc/components/favoritePane.jsx b/www/main/navigator/misc/components/favoritePane.jsx
index 6191887c..701594b4 100644
--- a/www/main/navigator/misc/components/favoritePane.jsx
+++ b/www/main/navigator/misc/components/favoritePane.jsx
@@ -128,6 +128,7 @@ export const FavoritePane = ({ className, paneId }) => {
               ...pane1,
               content: i18n.t('MULTI_PANE.SHABAD'),
               activeShabad: shabadId,
+              baniType: 'shabad',
             });
             break;
           case 2:
@@ -135,6 +136,7 @@ export const FavoritePane = ({ className, paneId }) => {
               ...pane2,
               content: i18n.t('MULTI_PANE.SHABAD'),
               activeShabad: shabadId,
+              baniType: 'shabad',
             });
             break;
           case 3:
@@ -142,6 +144,7 @@ export const FavoritePane = ({ className, paneId }) => {
               ...pane3,
               content: i18n.t('MULTI_PANE.SHABAD'),
               activeShabad: shabadId,
+              baniType: 'shabad',
             });
             break;
           default:
diff --git a/www/main/navigator/search/hooks/use-new-shabad.jsx b/www/main/navigator/search/hooks/use-new-shabad.jsx
index dae6d062..88651111 100644
--- a/www/main/navigator/search/hooks/use-new-shabad.jsx
+++ b/www/main/navigator/search/hooks/use-new-shabad.jsx
@@ -20,7 +20,7 @@ export const useNewShabad = () => {
     pane3,
   } = useStoreState((state) => state.navigator);
 
-  const { currentWorkspace } = useStoreState((state) => state.userSettings);
+  const { currentWorkspace, defaultPaneId } = useStoreState((state) => state.userSettings);
 
   const {
     setActiveShabadId,
@@ -38,8 +38,21 @@ export const useNewShabad = () => {
   } = useStoreActions((actions) => actions.navigator);
 
   return (newSelectedShabad, newSelectedVerse, newSearchVerse, multiPaneId = false) => {
+    let shabadPane;
     if (currentWorkspace === i18n.t('WORKSPACES.MULTI_PANE')) {
-      switch (multiPaneId) {
+      if (!multiPaneId) {
+        const existingPane = [pane1, pane2, pane3].filter(
+          (pane) => pane.activeShabad === newSelectedShabad,
+        );
+        if (existingPane.length > 0) {
+          [shabadPane] = existingPane;
+        } else {
+          shabadPane = defaultPaneId;
+        }
+      } else {
+        shabadPane = multiPaneId;
+      }
+      switch (shabadPane) {
         case 1:
           setPane1({
             ...pane1,
@@ -95,6 +108,17 @@ export const useNewShabad = () => {
     if (activeShabadId !== newSelectedShabad) {
       if (currentWorkspace !== i18n.t('WORKSPACES.MULTI_PANE')) {
         setActiveShabadId(newSelectedShabad);
+        if (window.socket !== undefined && window.socket !== null) {
+          window.socket.emit('data', {
+            type: 'shabad',
+            host: 'sttm-desktop',
+            id: newSelectedShabad,
+            shabadid: newSelectedShabad, // @deprecated
+            highlight: newSelectedVerse,
+            homeId: newSelectedVerse,
+            verseChange: false,
+          });
+        }
       }
 
       // initialVerseId is the verse which is stored in history
@@ -111,16 +135,5 @@ export const useNewShabad = () => {
     if (newSelectedVerse && activeVerseId !== newSelectedVerse) {
       setActiveVerseId(newSelectedVerse);
     }
-    if (window.socket !== undefined && window.socket !== null) {
-      window.socket.emit('data', {
-        type: 'shabad',
-        host: 'sttm-desktop',
-        id: newSelectedShabad,
-        shabadid: newSelectedShabad, // @deprecated
-        highlight: newSelectedVerse,
-        homeId: newSelectedVerse,
-        verseChange: false,
-      });
-    }
   };
 };
diff --git a/www/main/navigator/shabad/FavShabadIcon.jsx b/www/main/navigator/shabad/FavShabadIcon.jsx
index 62b7484d..d53d7229 100644
--- a/www/main/navigator/shabad/FavShabadIcon.jsx
+++ b/www/main/navigator/shabad/FavShabadIcon.jsx
@@ -12,9 +12,17 @@ const { i18n } = remote.require('./app');
 const FavShabadIcon = ({ paneId }) => {
   const [isLoading, setLoading] = useState(false);
   const favBtnRef = useRef(null);
-  const { activeShabadId, activeVerseId, favShabad, pane1, pane2, pane3 } = useStoreState(
-    (state) => state.navigator,
-  );
+  const {
+    activeShabadId,
+    activeVerseId,
+    favShabad,
+    pane1,
+    pane2,
+    pane3,
+    isSundarGutkaBani,
+    isCeremonyBani,
+  } = useStoreState((state) => state.navigator);
+  const { currentWorkspace } = useStoreState((state) => state.userSettings);
 
   const { setFavShabad } = useStoreActions((state) => state.navigator);
 
@@ -23,21 +31,25 @@ const FavShabadIcon = ({ paneId }) => {
   const [currentShabad, setCurrentShabad] = useState(activeShabadId);
   const [currentVerse, setCurrentVerse] = useState(activeVerseId);
   const [favShabadIndex, setFavShabadIndex] = useState(-1);
+  const [baniType, setBaniType] = useState('');
 
   useEffect(() => {
     if (paneId) {
       switch (paneId) {
         case 1:
           setCurrentShabad(pane1.activeShabad);
-          setCurrentVerse(pane1.versesRead[0]);
+          setCurrentVerse(pane1.activeVerse);
+          setBaniType(pane1.baniType);
           break;
         case 2:
           setCurrentShabad(pane2.activeShabad);
-          setCurrentVerse(pane2.versesRead[0]);
+          setCurrentVerse(pane2.activeVerse);
+          setBaniType(pane2.baniType);
           break;
         case 3:
           setCurrentShabad(pane3.activeShabad);
-          setCurrentVerse(pane3.versesRead[0]);
+          setCurrentVerse(pane3.activeVerse);
+          setBaniType(pane3.baniType);
           break;
         default:
           break;
@@ -69,17 +81,22 @@ const FavShabadIcon = ({ paneId }) => {
     });
   };
 
-  if (currentShabad && !isLoading && userToken) {
-    return (
-      <button
-        className={classNames('fav-btn', favShabadIndex >= 0 && 'unfav-btn')}
-        ref={favBtnRef}
-        title={i18n.t('SHABAD_PANE.FAV_BTN_TOOLTIP')}
-        onClick={toggleFavShabad}
-      >
-        <i className={favShabadIndex < 0 ? 'fa-regular fa-star' : 'fa-solid fa-star'}></i>
-      </button>
-    );
+  if (
+    baniType === 'shabad' ||
+    (currentWorkspace !== i18n.t('WORKSPACES.MULTI_PANE') && !isSundarGutkaBani && !isCeremonyBani)
+  ) {
+    if (currentShabad && !isLoading && userToken) {
+      return (
+        <button
+          className={classNames('fav-btn', favShabadIndex >= 0 && 'unfav-btn')}
+          ref={favBtnRef}
+          title={i18n.t('SHABAD_PANE.FAV_BTN_TOOLTIP')}
+          onClick={toggleFavShabad}
+        >
+          <i className={favShabadIndex < 0 ? 'fa-regular fa-star' : 'fa-solid fa-star'}></i>
+        </button>
+      );
+    }
   }
   return null;
 };
diff --git a/www/main/navigator/shabad/ShabadContent.jsx b/www/main/navigator/shabad/ShabadContent.jsx
index ef7f130c..e58fa69b 100644
--- a/www/main/navigator/shabad/ShabadContent.jsx
+++ b/www/main/navigator/shabad/ShabadContent.jsx
@@ -373,7 +373,11 @@ const ShabadContent = () => {
     setTimeout(() => {
       const currentIndex = activeShabad.findIndex((obj) => obj.ID === activeVerseId);
       // Ignoring flower verse to avoid unwanted scroll during asa di vaar
-      if (activeVerseId !== 61 && activeShabad[currentIndex].Gurmukhi !== ',') {
+      if (
+        currentIndex >= 0 &&
+        activeVerseId !== 61 &&
+        activeShabad[currentIndex].Gurmukhi !== ','
+      ) {
         virtuosoRef.current.scrollToIndex({
           index: currentIndex,
           behavior: 'smooth',
@@ -422,10 +426,8 @@ const ShabadContent = () => {
       loadCeremony(ceremonyId).then((ceremonyVerses) => {
         if (ceremonyVerses) {
           setActiveShabad(ceremonyVerses);
-          const newEntry = saveToHistory(ceremonyVerses, 'ceremony');
-          if (newEntry) {
-            openFirstVerse(ceremonyVerses[0].ID, ceremonyVerses[0].crossPlatformID);
-          }
+          saveToHistory(ceremonyVerses, 'ceremony');
+          openFirstVerse(ceremonyVerses[0].ID, ceremonyVerses[0].crossPlatformID);
         }
       });
     } else {
diff --git a/www/main/navigator/shabad/ShabadText.jsx b/www/main/navigator/shabad/ShabadText.jsx
index 7b5bf91b..65232f55 100644
--- a/www/main/navigator/shabad/ShabadText.jsx
+++ b/www/main/navigator/shabad/ShabadText.jsx
@@ -9,15 +9,15 @@ import { ShabadVerse } from '../../common/sttm-ui';
 import {
   changeHomeVerse,
   changeVerse,
-  sendToBaniController,
   filterRequiredVerseItems,
+  filterOverlayVerseItems,
   udpateHistory,
   scrollToVerse,
   saveToHistory,
   copyToClipboard,
   intelligentNextVerse,
+  sendToBaniController,
 } from './utils';
-import { filterOverlayVerseItems } from './utils/filter-verse-items';
 
 const baniLengthCols = {
   short: 'existsSGPC',
@@ -33,11 +33,15 @@ export const ShabadText = ({
   setPaneAttributes,
   currentPane,
 }) => {
+  const [previousVerseIndex, setPreviousIndex] = useState();
   const [filteredItems, setFilteredItems] = useState([]);
+  const [activeVerse, setActiveVerse] = useState({});
   const [rawVerses, setRawVerses] = useState([]);
-  const [previousVerseIndex, setPreviousIndex] = useState();
   const [atHome, setHome] = useState(true);
 
+  const virtuosoRef = useRef(null);
+  const activeVerseRef = useRef(null);
+
   const {
     activeVerseId,
     isMiscSlide,
@@ -63,13 +67,14 @@ export const ShabadText = ({
     setVerseHistory,
     setActivePaneId,
     setShortcuts,
+    setSundarGutkaBaniId,
+    setCeremonyId,
+    setIsCeremonyBani,
+    setIsSundarGutkaBani,
+    savedCrossPlatformId,
   } = useStoreActions((actions) => actions.navigator);
-  const [activeVerse, setActiveVerse] = useState({});
-
-  const virtuosoRef = useRef(null);
-  const activeVerseRef = useRef(null);
 
-  const updateTraversedVerse = (newTraversedVerse, verseIndex, crossPlatformID = null) => {
+  const updateTraversedVerse = (newTraversedVerse, verseIndex, crossPlatformId = null) => {
     if (isMiscSlide) {
       setIsMiscSlide(false);
     }
@@ -83,6 +88,15 @@ export const ShabadText = ({
       activeShabadId,
       setActiveShabadId,
       setPreviousIndex,
+      baniType,
+      sundarGutkaBaniId,
+      setSundarGutkaBaniId,
+      ceremonyId,
+      setCeremonyId,
+      isSundarGutkaBani,
+      setIsSundarGutkaBani,
+      isCeremonyBani,
+      setIsCeremonyBani,
     });
     udpateHistory(shabadId, newTraversedVerse, {
       verseHistory,
@@ -90,7 +104,7 @@ export const ShabadText = ({
       setPaneAttributes,
       paneAttributes,
     });
-    sendToBaniController(crossPlatformID, filteredItems, newTraversedVerse, baniLength, {
+    sendToBaniController(crossPlatformId, filteredItems, newTraversedVerse, baniLength, {
       isSundarGutkaBani,
       sundarGutkaBaniId,
       isCeremonyBani,
@@ -145,6 +159,7 @@ export const ShabadText = ({
             initialVerseId,
           );
           setFilteredItems(filterRequiredVerseItems(verseList));
+          updateTraversedVerse(verseList[0].ID, 0);
         }
       });
     }
@@ -163,12 +178,23 @@ export const ShabadText = ({
         updateHomeVerse(initialVerseIndex);
         setActiveVerse({ [activeVerseIndex]: activeVerseId });
       }
-      if (activeShabadId === null) {
-        updateTraversedVerse(initialVerseId, initialVerseIndex);
+      if (activeShabadId === null && sundarGutkaBaniId === null && ceremonyId === null) {
+        if (initialVerseIndex >= 0) {
+          updateTraversedVerse(initialVerseId, initialVerseIndex);
+        }
       }
     }
   }, [filteredItems]);
 
+  useEffect(() => {
+    const baniVerseIndex = filteredItems.findIndex(
+      (obj) => obj.crossPlatformId === savedCrossPlatformId,
+    );
+    if (baniVerseIndex >= 0) {
+      updateTraversedVerse(filteredItems[baniVerseIndex].ID, baniVerseIndex);
+    }
+  }, [savedCrossPlatformId]);
+
   useEffect(() => {
     const overlayVerse = filterOverlayVerseItems(rawVerses, activeVerseId);
     ipcRenderer.send(
@@ -178,7 +204,22 @@ export const ShabadText = ({
         live: liveFeed,
       }),
     );
-  }, [activeShabadId, activeVerseId]);
+    if (
+      (isCeremonyBani && ceremonyId === paneAttributes.activeShabad) ||
+      (isSundarGutkaBani && sundarGutkaBaniId === paneAttributes.activeShabad) ||
+      (!isSundarGutkaBani && !isCeremonyBani && activeShabadId === paneAttributes.activeShabad)
+    ) {
+      setPaneAttributes({
+        ...paneAttributes,
+        activeVerse: activeVerseId,
+      });
+      const verseIndex = filteredItems.findIndex((verse) => verse.verseId === activeVerseId);
+      if (verseIndex >= 0 && activeVerseId !== 61 && filteredItems[verseIndex].verse !== ',') {
+        setActiveVerse({ [verseIndex]: activeVerseId });
+        scrollToVerse(activeVerseId, filteredItems, virtuosoRef);
+      }
+    }
+  }, [activeShabadId, activeVerseId, sundarGutkaBaniId, ceremonyId]);
 
   const getVerse = (direction) => {
     let verseIndex = null;
diff --git a/www/main/navigator/shabad/utils/change-verse.js b/www/main/navigator/shabad/utils/change-verse.js
index c4557882..678a6c41 100644
--- a/www/main/navigator/shabad/utils/change-verse.js
+++ b/www/main/navigator/shabad/utils/change-verse.js
@@ -31,11 +31,57 @@ export const changeVerse = (
     setActiveShabadId,
     activeShabadId,
     setPreviousIndex,
+    baniType,
+    sundarGutkaBaniId,
+    setSundarGutkaBaniId,
+    ceremonyId,
+    setCeremonyId,
+    isSundarGutkaBani,
+    setIsSundarGutkaBani,
+    isCeremonyBani,
+    setIsCeremonyBani,
   },
 ) => {
-  if (clickedShabad !== activeShabadId) {
-    setActiveShabadId(clickedShabad);
-    setPreviousIndex(null);
+  switch (baniType) {
+    case 'bani':
+      if (clickedShabad !== sundarGutkaBaniId) {
+        setSundarGutkaBaniId(clickedShabad);
+        setPreviousIndex(null);
+      }
+      if (!isSundarGutkaBani) {
+        setIsSundarGutkaBani(true);
+      }
+      if (isCeremonyBani) {
+        setIsCeremonyBani(false);
+      }
+      break;
+    case 'ceremony':
+      if (clickedShabad !== ceremonyId) {
+        setCeremonyId(clickedShabad);
+        setPreviousIndex(null);
+      }
+
+      if (isSundarGutkaBani) {
+        setIsSundarGutkaBani(false);
+      }
+      if (!isCeremonyBani) {
+        setIsCeremonyBani(true);
+      }
+      break;
+    case 'shabad':
+      if (clickedShabad !== activeShabadId) {
+        setActiveShabadId(clickedShabad);
+        setPreviousIndex(null);
+      }
+      if (isSundarGutkaBani) {
+        setIsSundarGutkaBani(false);
+      }
+      if (isCeremonyBani) {
+        setIsCeremonyBani(false);
+      }
+      break;
+    default:
+      break;
   }
   setActiveVerse({ [verseIndex]: newTraversedVerse });
   if (activeVerseId !== newTraversedVerse) {
@@ -60,34 +106,34 @@ export const sendToBaniController = (
   if (window.socket !== undefined && window.socket !== null) {
     let baniVerse;
     if (!crossPlatformId) {
-      baniVerse = activeShabad.find((obj) => obj.ID === newTraversedVerse);
+      baniVerse = activeShabad.find((obj) => obj.verseId === newTraversedVerse);
     }
-    if (isSundarGutkaBani) {
+    if (isSundarGutkaBani && sundarGutkaBaniId) {
       window.socket.emit('data', {
         host: 'sttm-desktop',
         type: 'bani',
-        id: sundarGutkaBaniId,
-        shabadid: sundarGutkaBaniId, // @deprecated
-        highlight: crossPlatformId || baniVerse.crossPlatformID,
+        id: paneAttributes.activeShabad,
+        shabadid: paneAttributes.activeShabad, // @deprecated
+        highlight: crossPlatformId || baniVerse.crossPlatformId,
         baniLength,
         // mangalPosition,
         verseChange: false,
       });
-    } else if (isCeremonyBani) {
+    } else if (isCeremonyBani && ceremonyId) {
       window.socket.emit('data', {
         host: 'sttm-desktop',
         type: 'ceremony',
-        id: ceremonyId,
-        shabadid: ceremonyId, // @deprecated
-        highlight: crossPlatformId || baniVerse.crossPlatformID,
+        id: paneAttributes.activeShabad,
+        shabadid: paneAttributes.activeShabad, // @deprecated
+        highlight: crossPlatformId || baniVerse.crossPlatformId,
         verseChange: false,
       });
-    } else {
+    } else if (activeShabadId) {
       window.socket.emit('data', {
         type: 'shabad',
         host: 'sttm-desktop',
-        id: activeShabadId,
-        shabadid: activeShabadId, // @deprecated
+        id: paneAttributes.activeShabad,
+        shabadid: paneAttributes.activeShabad, // @deprecated
         highlight: newTraversedVerse,
         homeId: paneAttributes.homeVerse,
         verseChange: false,
diff --git a/www/main/navigator/shabad/utils/index.js b/www/main/navigator/shabad/utils/index.js
index b889bceb..217bc57d 100644
--- a/www/main/navigator/shabad/utils/index.js
+++ b/www/main/navigator/shabad/utils/index.js
@@ -4,7 +4,7 @@ export {
   udpateHistory,
   intelligentNextVerse,
 } from './change-verse';
-export { filterRequiredVerseItems } from './filter-verse-items';
+export { filterRequiredVerseItems, filterOverlayVerseItems } from './filter-verse-items';
 export { changeHomeVerse } from './change-home-verse';
 export { scrollToVerse } from './scroll-to-verse';
 export { saveToHistory } from './save-to-history';
diff --git a/www/main/navigator/shabad/utils/scroll-to-verse.js b/www/main/navigator/shabad/utils/scroll-to-verse.js
index bdb60c19..9a7d80e4 100644
--- a/www/main/navigator/shabad/utils/scroll-to-verse.js
+++ b/www/main/navigator/shabad/utils/scroll-to-verse.js
@@ -1,8 +1,11 @@
 export const scrollToVerse = (verseId, activeShabad, virtuosoRef) => {
   const verseIndex = activeShabad.findIndex((obj) => obj.verseId === verseId);
-  virtuosoRef.current.scrollToIndex({
-    index: verseIndex,
-    behavior: 'smooth',
-    align: 'center',
-  });
+  // Ignoring flower verse to avoid unwanted scroll during asa di vaar
+  if (verseIndex >= 0 && verseId !== 61 && activeShabad[verseIndex].verse !== ',') {
+    virtuosoRef.current.scrollToIndex({
+      index: verseIndex,
+      behavior: 'smooth',
+      align: 'center',
+    });
+  }
 };
diff --git a/www/main/settings/components/Categories.jsx b/www/main/settings/components/Categories.jsx
index e761f263..82663047 100644
--- a/www/main/settings/components/Categories.jsx
+++ b/www/main/settings/components/Categories.jsx
@@ -28,6 +28,7 @@ const SettingsFactory = ({ subCategory }) => {
       addonObj.forEach((add, index) => {
         addonMarkup.push(
           <Setting
+            key={`setting-addon-${index}`}
             settingObj={add}
             stateVar={convertToCamelCase(addon[index])}
             stateFunction={`set${convertToCamelCase(addon[index], true)}`}
diff --git a/www/main/settings/components/Setting.jsx b/www/main/settings/components/Setting.jsx
index d6af0869..f85ef80a 100644
--- a/www/main/settings/components/Setting.jsx
+++ b/www/main/settings/components/Setting.jsx
@@ -16,6 +16,8 @@ const Setting = ({ settingObj, stateVar, stateFunction }) => {
   const userSettings = useStoreState((state) => state.userSettings);
   const userSettingsActions = useStoreActions((state) => state.userSettings);
 
+  const { disabledContent } = useStoreState((state) => state.navigator);
+
   const handleInputChange = (event) => {
     const value = event.target ? event.target.value : event;
     const { disableSetting } = settingObj;
@@ -129,7 +131,11 @@ const Setting = ({ settingObj, stateVar, stateFunction }) => {
             {options.map((optionObj, optionIndex) => (
               <optgroup key={`option-${optionIndex}`} label={dropdownLabel(optionObj.label)}>
                 {optionObj.options.map((optionName, nameIndex) => (
-                  <option key={`option-name-${nameIndex}`} value={optionName.id}>
+                  <option
+                    key={`option-name-${nameIndex}`}
+                    value={optionName.id}
+                    disabled={disabledContent.includes(optionName.id)}
+                  >
                     {optionName.text}
                   </option>
                 ))}
diff --git a/www/main/settings/components/SettingViewer.jsx b/www/main/settings/components/SettingViewer.jsx
index d079e092..90d20b82 100644
--- a/www/main/settings/components/SettingViewer.jsx
+++ b/www/main/settings/components/SettingViewer.jsx
@@ -1,39 +1,22 @@
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import { useStoreState } from 'easy-peasy';
 
 const themes = require('../../../configs/themes.json');
 
 const SettingViewer = () => {
   const { themeBg } = useStoreState((state) => state.userSettings);
-  const { slideOrder } = useStoreState((state) => state.viewerSettings);
-
-  const [translationOrder, setTranslationOrder] = useState();
-  const [teekaOrder, setTeekaOrder] = useState();
-  const [transliterationOrder, setTransliterationOrder] = useState();
-
-  const orderFunctions = {
-    translation: (item) => {
-      if (translationOrder !== item) {
-        setTranslationOrder(item);
-      }
-    },
-    transliteration: (item) => {
-      if (transliterationOrder !== item) {
-        setTransliterationOrder(item);
-      }
-    },
-    teeka: (item) => {
-      if (teekaOrder !== item) {
-        setTeekaOrder(item);
-      }
-    },
-  };
 
   const {
     gurbaniFontSize,
     content1FontSize,
     content2FontSize,
     content3FontSize,
+    content1Visibility,
+    content2Visibility,
+    content3Visibility,
+    content1,
+    content2,
+    content3,
     displayNextLine,
     leftAlign,
     theme,
@@ -62,17 +45,17 @@ const SettingViewer = () => {
     fontSize: `${gurbaniFontSize * 3}px`,
   };
 
-  const translationStyles = {
-    fontSize: `${content1FontSize * 3}px`,
+  const contentAttributes = {
+    1: { visibility: content1Visibility, fontSize: content1FontSize },
+    2: { visibility: content2Visibility, fontSize: content2FontSize },
+    3: { visibility: content3Visibility, fontSize: content3FontSize },
   };
 
-  const transliterationStyles = {
-    fontSize: `${content2FontSize * 3}px`,
-  };
-
-  const teekaStyles = {
-    fontSize: `${content3FontSize * 3}px`,
-  };
+  const getContentStyles = (contentId) => ({
+    display: contentAttributes[contentId].visibility ? 'block' : 'none',
+    fontSize: `${contentAttributes[contentId].fontSize * 3}px`,
+    fontWeight: 'normal',
+  });
 
   const nextLineStyles = {
     fontSize: `${gurbaniFontSize * 3}px`,
@@ -80,12 +63,6 @@ const SettingViewer = () => {
     display: displayNextLine ? 'block' : 'none',
   };
 
-  useEffect(() => {
-    slideOrder.forEach((element, index) => {
-      orderFunctions[element](index + 2);
-    });
-  }, [slideOrder]);
-
   const getLarivaarAssistClass = () => {
     if (larivaarAssist) {
       return larivaarAssistType === 'single-color'
@@ -104,6 +81,51 @@ const SettingViewer = () => {
     return '';
   };
 
+  const multilingual = {
+    'translation-english': (
+      <div className="slide-translation translation">
+        <span className="english-translation transtext">
+          Whatever I ask for from my Lord and Master, he gives that to me.
+        </span>
+      </div>
+    ),
+    'translation-hindi': (
+      <div className="slide-translation translation">
+        <span className="hindi-translation transtext">
+          हे भाई ! प्रभू के दास अपने प्रभू से जो कुछ माँगते हैं वह वही कुछ उनको देता है।
+        </span>
+      </div>
+    ),
+    'translation-spanish': (
+      <div className="slide-translation translation">
+        <span className="spanish-translation transtext">
+          Lo que sea que el Esclavo del Señor, Nanak recita con sus labios
+        </span>
+      </div>
+    ),
+    'teeka-punjabi': (
+      <div className="slide-teeka teeka">
+        hy BweI! pRBU dy dws Awpxy pRBU pwsoN jo kuJ mMgdy hn auh auhI kuJ auhnW ƒ dyNdw hY [
+      </div>
+    ),
+    'transliteration-english': (
+      <div className="slide-transliteration transliteration">
+        jo maageh Thaakur apune te soiee soiee dhevai ||
+      </div>
+    ),
+    'transliteration-hindi': (
+      <div className="slide-transliteration transliteration">
+        जो मागहि ठाकुर अपुने ते सोई सोई देवै ॥
+      </div>
+    ),
+    'transliteration-shahmukhi': (
+      <div className="slide-transliteration transliteration">
+        {' '}
+        جو ماگه ٹھاکر اپنے تے سوای سوای دےوَے ۔۔
+      </div>
+    ),
+  };
+
   return (
     <>
       <div className="settings-preview-title">
@@ -157,40 +179,9 @@ const SettingViewer = () => {
               )}
             </div>
           </h1>
-          <h2 className="slide-translation translation" style={{ ...translationStyles }}>
-            <div>
-              <div className="english-translation transtext">
-                Whatever I ask for from my Lord and Master, he gives that to me.
-              </div>
-              <div className="spanish-translation transtext">
-                Lo que sea que el Esclavo del Señor, Nanak recita con sus labios,{' '}
-              </div>
-              <div className="hindi-translation transtext">
-                हे भाई ! प्रभू के दास अपने प्रभू से जो कुछ माँगते हैं वह वही कुछ उनको देता है।
-              </div>
-            </div>
-          </h2>
-          <h2 className="slide-teeka teeka" style={{ ...teekaStyles }}>
-            <div>
-              hy BweI! pRBU dy dws Awpxy pRBU pwsoN jo kuJ mMgdy hn auh auhI kuJ auhnW ƒ dyNdw hY [
-            </div>
-          </h2>
-          <h2
-            className="slide-transliteration transliteration"
-            style={{ ...transliterationStyles }}
-          >
-            <div>
-              <div className="english-transliteration translittext">
-                jo maageh Thaakur apune te soiee soiee dhevai ||
-              </div>
-              <div className="shahmukhi-transliteration translittext">
-                جو ماگه ٹھاکر اپنے تے سوای سوای دےوَے ۔۔
-              </div>
-              <div className="devanagari-transliteration translittext">
-                जो मागहि ठाकुर अपुने ते सोई सोई देवै ॥
-              </div>
-            </div>
-          </h2>
+          <h2 style={{ ...getContentStyles(1) }}>{multilingual[content1]}</h2>
+          <h2 style={{ ...getContentStyles(2) }}>{multilingual[content2]}</h2>
+          <h2 style={{ ...getContentStyles(3) }}>{multilingual[content3]}</h2>
           <h1
             className="slide-next-line slide-gurbani gurbani gurmukhi next-line"
             style={nextLineStyles}
diff --git a/www/main/settings/components/ThemeContainer.jsx b/www/main/settings/components/ThemeContainer.jsx
index 865c2312..e76d4996 100644
--- a/www/main/settings/components/ThemeContainer.jsx
+++ b/www/main/settings/components/ThemeContainer.jsx
@@ -51,6 +51,7 @@ const ThemeContainer = () => {
                     if (currentTheme !== theme.key) {
                       applyTheme(theme, false, setTheme, setThemeBg, themeBg);
                     }
+                    setDefaultBg(theme, setThemeBg, themeBg);
                   }}
                   className={theme['background-video'] ? 'video-theme-instance' : 'theme-instance'}
                   theme={theme}
@@ -93,7 +94,7 @@ const ThemeContainer = () => {
                   applyTheme(tile, 'custom', setTheme, setThemeBg);
                 }}
                 onRemove={() => {
-                  removeCustomBackgroundFile(tile['background-image-path'].replace(/\\(\s)/g, ' '));
+                  removeCustomBackgroundFile(tile['background-image-path']);
                   upsertCustomBackgrounds(setCustomThemes);
                   if (tile['background-image'] === themeBg.url.href) {
                     const currentThemeInstance = themes.filter(
diff --git a/www/main/settings/utils/theme-bg-reader.js b/www/main/settings/utils/theme-bg-reader.js
index c9615419..a1211fd6 100644
--- a/www/main/settings/utils/theme-bg-reader.js
+++ b/www/main/settings/utils/theme-bg-reader.js
@@ -29,8 +29,8 @@ export const upsertCustomBackgrounds = (responseCallback = () => {}) => {
           .map((file) => ({
             name: file,
             path: `${userBackgroundsPath}/${file}`,
-            'background-image': `${userBackgroundsURL}/${file.replace(/(\s)/g, '\\ ')}`,
-            'background-image-path': `${userBackgroundsPath}/${file.replace(/(\s)/g, '\\ ')}`,
+            'background-image': `${userBackgroundsURL}/${file}`,
+            'background-image-path': `${userBackgroundsPath}/${file}`,
             time: fs.statSync(path.resolve(userBackgroundsPath, file)).mtime.getTime(),
           }))
           .sort((a, b) => b.time - a.time),
diff --git a/www/main/settings/utils/theme-bg-uploader.js b/www/main/settings/utils/theme-bg-uploader.js
index 4f343540..2bc34ad6 100644
--- a/www/main/settings/utils/theme-bg-uploader.js
+++ b/www/main/settings/utils/theme-bg-uploader.js
@@ -42,7 +42,7 @@ const imageCheck = (filePath) => {
 export const removeCustomBackgroundFile = (imagePath) => {
   fs.unlink(imagePath, (deleteError) => {
     if (deleteError) {
-      errorAlert(i18n.t('TOOLBAR.SYNC_CONTROLLER.INTERNET_ERR'));
+      errorAlert(i18n.t('THEMES.DELETE_ERR', { error: deleteError }));
       throw deleteError;
     }
   });
@@ -57,7 +57,10 @@ export const uploadImage = async (evt) => {
   return new Promise((resolve, reject) => {
     try {
       const filePath = evt.target.files[0].path;
-      const newPath = path.resolve(userBackgroundsPath, evt.target.files[0].name);
+      const newPath = path.resolve(
+        userBackgroundsPath,
+        evt.target.files[0].name.replaceAll(' ', '_'),
+      );
       // eslint-disable-next-line no-param-reassign
       evt.target.value = '';
 
diff --git a/www/main/viewer/Slide/QuickTools.jsx b/www/main/viewer/Slide/QuickTools.jsx
index 0b0c230d..4e3b761a 100644
--- a/www/main/viewer/Slide/QuickTools.jsx
+++ b/www/main/viewer/Slide/QuickTools.jsx
@@ -2,6 +2,8 @@ import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useStoreActions, useStoreState } from 'easy-peasy';
 
+import { convertToCamelCase } from '../../common/utils';
+
 const remote = require('@electron/remote');
 
 const { i18n } = remote.require('./app');
@@ -23,6 +25,8 @@ const QuickTools = ({ isMiscSlide }) => {
     userSettings.content3,
   ]);
 
+  const { disabledContent } = useStoreState((state) => state.navigator);
+
   const dropdownLabel = (option) => {
     if (option.includes('gurbani')) {
       return i18n.t(`QUICK_TOOLS.BANI`);
@@ -76,7 +80,7 @@ const QuickTools = ({ isMiscSlide }) => {
     },
   ];
 
-  const createGlobalPlatformObj = (name, index, action) => {
+  const createGlobalPlatformObj = (name, toolname, index, action) => {
     let payload;
     let actionName;
     let stateName;
@@ -85,8 +89,8 @@ const QuickTools = ({ isMiscSlide }) => {
       stateName = `content${index}${action}`;
       actionName = `setContent${index}${action}`;
     } else {
-      stateName = `gurbani${action}`;
-      actionName = `setGurbani${action}`;
+      stateName = `${toolname}${action}`;
+      actionName = `set${convertToCamelCase(`${toolname}-${action}`, true)}`;
     }
 
     if (name === 'visibility') {
@@ -124,7 +128,7 @@ const QuickTools = ({ isMiscSlide }) => {
           onClick={() => {
             global.platform.ipc.send(
               'update-global-setting',
-              JSON.stringify(createGlobalPlatformObj(name, index, actionName)),
+              JSON.stringify(createGlobalPlatformObj(name, toolName, index, actionName)),
             );
           }}
         />
@@ -154,7 +158,11 @@ const QuickTools = ({ isMiscSlide }) => {
     const markup = baniOptions.map((optionObj, optionIndex) => (
       <optgroup key={`option-${optionIndex}`} label={dropdownLabel(optionObj.label)}>
         {optionObj.options.map((optionName, nameIndex) => (
-          <option key={`option-name-${nameIndex}`} value={optionName.id}>
+          <option
+            key={`option-name-${nameIndex}`}
+            value={optionName.id}
+            disabled={disabledContent.includes(optionName.id)}
+          >
             {optionName.text}
           </option>
         ))}
diff --git a/www/main/viewer/Slide/Slide.jsx b/www/main/viewer/Slide/Slide.jsx
index 69014e42..f2fca7db 100644
--- a/www/main/viewer/Slide/Slide.jsx
+++ b/www/main/viewer/Slide/Slide.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
-import { useStoreState } from 'easy-peasy';
+import { useStoreActions, useStoreState } from 'easy-peasy';
 import { CSSTransition } from 'react-transition-group';
 
 import SlideTeeka from './SlideTeeka';
@@ -28,7 +28,8 @@ const Slide = ({ verseObj, nextLineObj, isMiscSlide, bgColor }) => {
     content3Visibility,
   } = useStoreState((state) => state.userSettings);
 
-  const { activeVerseId } = useStoreState((state) => state.navigator);
+  const { activeVerseId, disabledContent } = useStoreState((state) => state.navigator);
+  const { setDisabledContent } = useStoreActions((state) => state.navigator);
   const [showVerse, setShowVerse] = useState(true);
   const [orderMarkup, setOrderMarkup] = useState(null);
 
@@ -69,6 +70,27 @@ const Slide = ({ verseObj, nextLineObj, isMiscSlide, bgColor }) => {
         });
       }
     }, 100);
+    if (verseObj && verseObj.Translations) {
+      const translations = JSON.parse(verseObj.Translations);
+
+      const translationMapping = {
+        'en.bdb': 'translation-english',
+        'es.sn': 'translation-spanish',
+        'hi.ss': 'translation-hindi',
+      };
+
+      const missingTranslations = Object.entries(translationMapping)
+        .filter(([key]) => {
+          const value = key.split('.').reduce((obj, k) => obj && obj[k], translations);
+          return !value || !value.trim();
+        })
+        // eslint-disable-next-line no-unused-vars
+        .map(([_, identifier]) => identifier);
+
+      if (JSON.stringify(disabledContent) !== JSON.stringify(missingTranslations)) {
+        setDisabledContent(missingTranslations);
+      }
+    }
   }, [verseObj]);
 
   useEffect(() => {
diff --git a/www/obs/index.html b/www/obs/index.html
index 3866f02c..e9c2e447 100644
--- a/www/obs/index.html
+++ b/www/obs/index.html
@@ -247,13 +247,16 @@
 
       document.body.style.backgroundColor = overlayColor;
 
-      const $gurbani = document.querySelector('.o-gurbani');
-      const { overlayLarivaar, larivaarAssist } = overlayPrefs;
-      let line = '';
-      if ($gurbani.children.length) {
-        line = [...$gurbani.children].map(word => word.innerHTML).join(' ');
-      }
-      $gurbani.innerHTML = assist(line, overlayLarivaar, larivaarAssist);
+      const $gurbaniWrapper = document.querySelectorAll('.o-gurbani');
+
+      $gurbaniWrapper.forEach($gurbani => {
+        let line = '';
+        const { overlayLarivaar, larivaarAssist } = overlayPrefs;
+        if ($gurbani.children.length) {
+          line = [...$gurbani.children].map(word => word.innerHTML).join(' ');
+        }
+        $gurbani.innerHTML = assist(line, overlayLarivaar, larivaarAssist);
+      });
     };
 
     socket.on('show-line', request => {
diff --git a/www/src/scss/_settings.scss b/www/src/scss/_settings.scss
index e936318c..161a3da9 100644
--- a/www/src/scss/_settings.scss
+++ b/www/src/scss/_settings.scss
@@ -371,11 +371,6 @@
   line-height: 1.5;
 }
 
-.transtext,
-.translittext {
-  display: none;
-}
-
 .translation-language-English .english-translation,
 .translation-language-Spanish .spanish-translation,
 .transliteration-language-Shahmukhi .shahmukhi-transliteration,
diff --git a/www/src/scss/styles.scss b/www/src/scss/styles.scss
index b54d3b6e..5ad57907 100644
--- a/www/src/scss/styles.scss
+++ b/www/src/scss/styles.scss
@@ -155,7 +155,7 @@ button {
   bottom: 0;
   height: 100vh;
   left: 60px;
-  max-height: 750px;
+  max-height: 780px;
   max-width: 850px;
   overflow: auto;
   position: fixed;
@@ -606,7 +606,7 @@ button {
 
         &.instructions-btn {
           align-items: center;
-          background-color: #973737;
+          background-color: $rust-red;
           color: white;
           display: flex;
           margin: auto;
diff --git a/www/src/scss/themes/helpers/_variables.scss b/www/src/scss/themes/helpers/_variables.scss
index 4a73d6e2..3776b0ae 100644
--- a/www/src/scss/themes/helpers/_variables.scss
+++ b/www/src/scss/themes/helpers/_variables.scss
@@ -36,6 +36,7 @@ $bright-red: #ff0000;
 $cadmium-orange: #e1802f;
 $princeton-orange: #ff802e;
 $rust: #b24601;
+$rust-red: #973737;
 
 $light-green: #27ae60;
 $apple-green: #65a757;