diff --git a/bun.lockb b/bun.lockb
index f3605eb3..48f1a823 100644
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index ac881cf3..c8632929 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "version": "7.1.1",
   "dependencies": {
     "@eartharoid/i18n": "2.0.0-alpha.1",
-    "@eartharoid/vite-plugin-i18n": "^1.0.0-alpha.1",
+    "@eartharoid/vite-plugin-i18n": "^1.0.0-alpha.3",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
     "@floating-ui/react-dom": "2.1.0",
diff --git a/src/components/Elements/AddModal/AddModal.jsx b/src/components/Elements/AddModal/AddModal.jsx
index fa97493d..4be74446 100644
--- a/src/components/Elements/AddModal/AddModal.jsx
+++ b/src/components/Elements/AddModal/AddModal.jsx
@@ -19,7 +19,7 @@ function AddModal({ urlError, iconError, addLink, closeModal, edit, editData, ed
             ? variables.getMessage('widgets.quicklinks.edit')
             : variables.getMessage('widgets.quicklinks.new')}
         </span>
-        <Tooltip title={variables.getMessage('modals.welcome.buttons.close')}>
+        <Tooltip title={variables.getMessage('welcome:buttons.close')}>
           <div className="close" onClick={() => closeModal()}>
             <MdClose />
           </div>
@@ -56,7 +56,7 @@ function AddModal({ urlError, iconError, addLink, closeModal, edit, editData, ed
             type="settings"
             onClick={() => editLink(editData, name, url, icon)}
             icon={<MdAddLink />}
-            label={variables.getMessage('modals.main.settings.sections.quicklinks.edit')}
+            label={variables.getMessage('settings:sections.quicklinks.edit')}
           />
         ) : (
           <Button
diff --git a/src/components/Elements/MainModal/backend/Tab.jsx b/src/components/Elements/MainModal/backend/Tab.jsx
index 70ad56a9..aff4e114 100644
--- a/src/components/Elements/MainModal/backend/Tab.jsx
+++ b/src/components/Elements/MainModal/backend/Tab.jsx
@@ -28,34 +28,34 @@ import {
 } from 'react-icons/md';
 
 const iconMapping = {
-  [variables.getMessage('modals.main.marketplace.product.overview')]: <Overview />,
+  [variables.getMessage('marketplace:product.overview')]: <Overview />,
   [variables.getMessage('modals.main.navbar.settings')]: <Settings />,
   [variables.getMessage('modals.main.navbar.addons')]: <Addons />,
   [variables.getMessage('modals.main.navbar.marketplace')]: <Marketplace />,
-  [variables.getMessage('modals.main.settings.sections.appearance.navbar.title')]: <Navbar />,
-  [variables.getMessage('modals.main.settings.sections.greeting.title')]: <Greeting />,
-  [variables.getMessage('modals.main.settings.sections.time.title')]: <Time />,
-  [variables.getMessage('modals.main.settings.sections.quicklinks.title')]: <QuickLinks />,
-  [variables.getMessage('modals.main.settings.sections.quote.title')]: <Quote />,
-  [variables.getMessage('modals.main.settings.sections.date.title')]: <Date />,
-  [variables.getMessage('modals.main.settings.sections.message.title')]: <Message />,
-  [variables.getMessage('modals.main.settings.sections.background.title')]: <Background />,
-  [variables.getMessage('modals.main.settings.sections.search.title')]: <MdSearch />,
-  [variables.getMessage('modals.main.settings.sections.weather.title')]: <Weather />,
-  [variables.getMessage('modals.main.settings.sections.appearance.title')]: <Appearance />,
-  [variables.getMessage('modals.main.settings.sections.language.title')]: <Language />,
-  [variables.getMessage('modals.main.settings.sections.advanced.title')]: <Advanced />,
-  [variables.getMessage('modals.main.settings.sections.stats.title')]: <Stats />,
-  [variables.getMessage('modals.main.settings.sections.experimental.title')]: <Experimental />,
-  [variables.getMessage('modals.main.settings.sections.changelog.title')]: <Changelog />,
-  [variables.getMessage('modals.main.settings.sections.about.title')]: <About />,
-  [variables.getMessage('modals.main.addons.added')]: <Added />,
-  [variables.getMessage('modals.main.addons.create.title')]: <Create />,
-  [variables.getMessage('modals.main.marketplace.all')]: <Addons />,
-  [variables.getMessage('modals.main.marketplace.photo_packs')]: <Background />,
-  [variables.getMessage('modals.main.marketplace.quote_packs')]: <Quote />,
-  [variables.getMessage('modals.main.marketplace.preset_settings')]: <Advanced />,
-  [variables.getMessage('modals.main.marketplace.collections')]: <Collections />,
+  [variables.getMessage('settings:sections.appearance.navbar.title')]: <Navbar />,
+  [variables.getMessage('settings:sections.greeting.title')]: <Greeting />,
+  [variables.getMessage('settings:sections.time.title')]: <Time />,
+  [variables.getMessage('settings:sections.quicklinks.title')]: <QuickLinks />,
+  [variables.getMessage('settings:sections.quote.title')]: <Quote />,
+  [variables.getMessage('settings:sections.date.title')]: <Date />,
+  [variables.getMessage('settings:sections.message.title')]: <Message />,
+  [variables.getMessage('settings:sections.background.title')]: <Background />,
+  [variables.getMessage('settings:sections.search.title')]: <MdSearch />,
+  [variables.getMessage('settings:sections.weather.title')]: <Weather />,
+  [variables.getMessage('settings:sections.appearance.title')]: <Appearance />,
+  [variables.getMessage('settings:sections.language.title')]: <Language />,
+  [variables.getMessage('settings:sections.advanced.title')]: <Advanced />,
+  [variables.getMessage('settings:sections.stats.title')]: <Stats />,
+  [variables.getMessage('settings:sections.experimental.title')]: <Experimental />,
+  [variables.getMessage('settings:sections.changelog.title')]: <Changelog />,
+  [variables.getMessage('settings:sections.about.title')]: <About />,
+  [variables.getMessage('addons:added')]: <Added />,
+  [variables.getMessage('addons:create.title')]: <Create />,
+  [variables.getMessage('marketplace:all')]: <Addons />,
+  [variables.getMessage('marketplace:photo_packs')]: <Background />,
+  [variables.getMessage('marketplace:quote_packs')]: <Quote />,
+  [variables.getMessage('marketplace:preset_settings')]: <Advanced />,
+  [variables.getMessage('marketplace:collections')]: <Collections />,
 };
 
 function Tab({ label, currentTab, onClick, navbarTab }) {
@@ -72,20 +72,20 @@ function Tab({ label, currentTab, onClick, navbarTab }) {
 
   const icon = iconMapping[label];
   const divider = [
-    variables.getMessage('modals.main.settings.sections.weather.title'),
-    variables.getMessage('modals.main.settings.sections.language.title'),
-    variables.getMessage('modals.main.marketplace.all'),
-    variables.getMessage('modals.main.settings.sections.experimental.title'),
+    variables.getMessage('settings:sections.weather.title'),
+    variables.getMessage('settings:sections.language.title'),
+    variables.getMessage('marketplace:all'),
+    variables.getMessage('settings:sections.experimental.title'),
   ].includes(label);
 
   const mue = [
-    variables.getMessage('modals.main.marketplace.product.overview'),
-    variables.getMessage('modals.main.addons.added'),
-    variables.getMessage('modals.main.marketplace.all'),
+    variables.getMessage('marketplace:product.overview'),
+    variables.getMessage('addons:added'),
+    variables.getMessage('marketplace:all'),
   ].includes(label);
 
   if (
-    label === variables.getMessage('modals.main.settings.sections.experimental.title') &&
+    label === variables.getMessage('settings:sections.experimental.title') &&
     !isExperimental
   ) {
     return null;
diff --git a/src/components/Elements/MainModal/backend/TabContext.jsx b/src/components/Elements/MainModal/backend/TabContext.jsx
index b558e069..8bbd34d8 100644
--- a/src/components/Elements/MainModal/backend/TabContext.jsx
+++ b/src/components/Elements/MainModal/backend/TabContext.jsx
@@ -10,7 +10,7 @@ export const useTab = () => {
 export const TabProvider = ({ children }) => {
   const [activeTab, setActiveTab] = useState('settings');
   const [subTab, setSubTab] = useState(
-    variables.getMessage('modals.main.marketplace.product.overview'),
+    variables.getMessage('marketplace:product.overview'),
   );
   const [subSection, setSubSection] = useState('');
   const [direction, setDirection] = useState(1);
@@ -28,7 +28,7 @@ export const TabProvider = ({ children }) => {
     setDirection(newIndex > currentIndex ? 1 : -1);
     setSubTab(subtab);
     if (tab === 'settings' && subtab === '' && section === '') {
-      setSubTab(variables.getMessage('modals.main.marketplace.product.overview'));
+      setSubTab(variables.getMessage('marketplace:product.overview'));
     }
 
     setActiveTab(tab);
diff --git a/src/components/Elements/MainModal/backend/TabNavbar.jsx b/src/components/Elements/MainModal/backend/TabNavbar.jsx
index 10c94051..ef08b3bc 100644
--- a/src/components/Elements/MainModal/backend/TabNavbar.jsx
+++ b/src/components/Elements/MainModal/backend/TabNavbar.jsx
@@ -237,7 +237,7 @@ const TabNavbar = ({ modalClose }) => {
         </div>
         <Tooltip
           style={{ marginLeft: 'auto', justifySelf: 'flex-end' }}
-          title={variables.getMessage('modals.welcome.buttons.close')}
+          title={variables.getMessage('welcome:buttons.close')}
           key="closeTooltip"
         >
           <span className="closeModal" onClick={modalClose}>
diff --git a/src/components/Elements/MainModal/backend/Tabs.jsx b/src/components/Elements/MainModal/backend/Tabs.jsx
index a5a22e4a..e1b7987c 100644
--- a/src/components/Elements/MainModal/backend/Tabs.jsx
+++ b/src/components/Elements/MainModal/backend/Tabs.jsx
@@ -38,14 +38,14 @@ const Tabs = (props) => {
       >
         <div className="shareHeader">
           <span className="title">
-            {variables.getMessage('modals.main.settings.reminder.title')}
+            {variables.getMessage('settings:reminder.title')}
           </span>
           <span className="closeModal" onClick={hideReminder}>
             <MdClose />
           </span>
         </div>
         <span className="subtitle">
-          {variables.getMessage('modals.main.settings.reminder.message')}
+          {variables.getMessage('settings:reminder.message')}
         </span>
         <button onClick={() => window.location.reload()}>
           <MdRefresh />
diff --git a/src/components/Elements/MainModal/backend/newTabs.jsx b/src/components/Elements/MainModal/backend/newTabs.jsx
index 4612bcaa..f9cf8db8 100644
--- a/src/components/Elements/MainModal/backend/newTabs.jsx
+++ b/src/components/Elements/MainModal/backend/newTabs.jsx
@@ -14,7 +14,7 @@ const Sidebar = memo(({ sections, currentTab, setCurrentTab }) => {
     [setSubTab, setSubSection],
   );
 
-  
+
   const hideReminder = () => {
     localStorage.setItem('showReminder', false);
     document.querySelector('.reminder-info').style.display = 'none';
@@ -28,14 +28,14 @@ const Sidebar = memo(({ sections, currentTab, setCurrentTab }) => {
       >
         <div className="shareHeader">
           <span className="title">
-            {variables.getMessage('modals.main.settings.reminder.title')}
+            {variables.getMessage('settings:reminder.title')}
           </span>
           <span className="closeModal" onClick={hideReminder}>
             <MdClose />
           </span>
         </div>
         <span className="subtitle">
-          {variables.getMessage('modals.main.settings.reminder.message')}
+          {variables.getMessage('settings:reminder.message')}
         </span>
         <button onClick={() => window.location.reload()}>
           <MdRefresh />
diff --git a/src/components/Elements/ResetModal/ResetModal.jsx b/src/components/Elements/ResetModal/ResetModal.jsx
index bdeeb816..7b2047ff 100644
--- a/src/components/Elements/ResetModal/ResetModal.jsx
+++ b/src/components/Elements/ResetModal/ResetModal.jsx
@@ -15,10 +15,10 @@ function ResetModal({ modalClose }) {
     <div className="smallModal">
       <div className="shareHeader">
         <span className="title">
-          {variables.getMessage('modals.main.settings.sections.advanced.reset_modal.title')}
+          {variables.getMessage('settings:sections.advanced.reset_modal.title')}
         </span>
         <Tooltip
-          title={variables.getMessage('modals.main.settings.sections.advanced.reset_modal.cancel')}
+          title={variables.getMessage('settings:sections.advanced.reset_modal.cancel')}
         >
           <div className="close" onClick={modalClose}>
             <MdClose />
@@ -26,23 +26,23 @@ function ResetModal({ modalClose }) {
         </Tooltip>
       </div>
       <span className="title">
-        {variables.getMessage('modals.main.settings.sections.advanced.reset_modal.question')}
+        {variables.getMessage('settings:sections.advanced.reset_modal.question')}
       </span>
       <span className="subtitle">
-        {variables.getMessage('modals.main.settings.sections.advanced.reset_modal.information')}
+        {variables.getMessage('settings:sections.advanced.reset_modal.information')}
       </span>
       <div className="resetFooter">
         <Button
           type="secondary"
           onClick={modalClose}
           icon={<MdClose />}
-          label={variables.getMessage('modals.main.settings.sections.advanced.reset_modal.cancel')}
+          label={variables.getMessage('settings:sections.advanced.reset_modal.cancel')}
         />
         <Button
           type="settings"
           onClick={() => reset()}
           icon={<MdRestartAlt />}
-          label={variables.getMessage('modals.main.settings.buttons.reset')}
+          label={variables.getMessage('settings:buttons.reset')}
         />
       </div>
     </div>
diff --git a/src/components/Elements/ShareModal/ShareModal.jsx b/src/components/Elements/ShareModal/ShareModal.jsx
index 2491e82b..5049aa67 100644
--- a/src/components/Elements/ShareModal/ShareModal.jsx
+++ b/src/components/Elements/ShareModal/ShareModal.jsx
@@ -42,7 +42,7 @@ function ShareModal({ modalClose, data }) {
     <div className="smallModal">
       <div className="shareHeader">
         <span className="title">{variables.getMessage('widgets.quote.share')}</span>
-        <Tooltip title={variables.getMessage('modals.welcome.buttons.close')}>
+        <Tooltip title={variables.getMessage('welcome:buttons.close')}>
           <div className="close" onClick={modalClose}>
             <MdClose />
           </div>
diff --git a/src/components/Form/Settings/Slider/Slider.jsx b/src/components/Form/Settings/Slider/Slider.jsx
index 2d80dd2c..81ee0f6b 100644
--- a/src/components/Form/Settings/Slider/Slider.jsx
+++ b/src/components/Form/Settings/Slider/Slider.jsx
@@ -56,7 +56,7 @@ function SliderComponent(props) {
         <span>{Number(value)}</span>
         <span className="link" onClick={resetItem}>
           <MdRefresh />
-          {variables.getMessage('modals.main.settings.buttons.reset')}
+          {variables.getMessage('settings:buttons.reset')}
         </span>
       </span>
       <Slider
diff --git a/src/components/Form/Settings/Text/Text.jsx b/src/components/Form/Settings/Text/Text.jsx
index 1d67c320..4228bfb6 100644
--- a/src/components/Form/Settings/Text/Text.jsx
+++ b/src/components/Form/Settings/Text/Text.jsx
@@ -47,7 +47,7 @@ function Text(props) {
         <Label>{props.title}</Label>
         <span className="link" onClick={resetItem}>
           <MdRefresh />
-          {variables.getMessage('modals.main.settings.buttons.reset')}
+          {variables.getMessage('settings:buttons.reset')}
         </span>
       </div>
       {props.textarea === true ? (
diff --git a/src/components/Layout/Settings/Header/Header.jsx b/src/components/Layout/Settings/Header/Header.jsx
index 731cfe56..6d189c5e 100644
--- a/src/components/Layout/Settings/Header/Header.jsx
+++ b/src/components/Layout/Settings/Header/Header.jsx
@@ -62,7 +62,7 @@ function Header(props) {
           window.open(variables.constants.BUG_REPORT + props.title.split(' ').join('+'), '_blank')
         }
         icon={<MdFlag />}
-        label={variables.getMessage('modals.main.settings.sections.header.report_issue')}
+        label={variables.getMessage('settings:sections.header.report_issue')}
       />
     );
   };
diff --git a/src/components/Layout/Settings/PreferencesWrapper/PreferencesWrapper.jsx b/src/components/Layout/Settings/PreferencesWrapper/PreferencesWrapper.jsx
index 99ede687..74c3e2e5 100644
--- a/src/components/Layout/Settings/PreferencesWrapper/PreferencesWrapper.jsx
+++ b/src/components/Layout/Settings/PreferencesWrapper/PreferencesWrapper.jsx
@@ -22,9 +22,9 @@ const PreferencesWrapper = ({ children, ...props }) => {
         <Row>
           <Content
             title={variables.getMessage(
-              'modals.main.settings.sections.appearance.accessibility.widget_zoom',
+              'settings:sections.appearance.accessibility.widget_zoom',
             )}
-            subtitle={variables.getMessage('modals.main.settings.sections.header.size')}
+            subtitle={variables.getMessage('settings:sections.header.size')}
           />
           <Action>
             <Slider
diff --git a/src/features/background/components/ExcludeModal.jsx b/src/features/background/components/ExcludeModal.jsx
index 3ee197a3..430af612 100644
--- a/src/features/background/components/ExcludeModal.jsx
+++ b/src/features/background/components/ExcludeModal.jsx
@@ -20,10 +20,10 @@ function ExcludeModal({ modalClose, info }) {
     <div className="smallModal">
       <div className="shareHeader">
         <span className="title">
-          {variables.getMessage('modals.main.settings.sections.advanced.reset_modal.title')}
+          {variables.getMessage('settings:sections.advanced.reset_modal.title')}
         </span>
         <Tooltip
-          title={variables.getMessage('modals.main.settings.sections.advanced.reset_modal.cancel')}
+          title={variables.getMessage('settings:sections.advanced.reset_modal.cancel')}
         >
           <div className="close" onClick={modalClose}>
             <MdClose />
@@ -38,7 +38,7 @@ function ExcludeModal({ modalClose, info }) {
           type="secondary"
           onClick={modalClose}
           icon={<MdClose />}
-          label={variables.getMessage('modals.main.settings.sections.advanced.reset_modal.cancel')}
+          label={variables.getMessage('settings:sections.advanced.reset_modal.cancel')}
         />
         <Button
           type="settings"
diff --git a/src/features/background/options/BackgroundOptions.jsx b/src/features/background/options/BackgroundOptions.jsx
index 2c321b51..9ba94926 100644
--- a/src/features/background/options/BackgroundOptions.jsx
+++ b/src/features/background/options/BackgroundOptions.jsx
@@ -94,14 +94,14 @@ class BackgroundOptions extends PureComponent {
       <>
         <Row final={this.state.backgroundAPI === 'mue'}>
           <Content
-            title={variables.getMessage('modals.main.settings.sections.background.api')}
-            subtitle={variables.getMessage('modals.main.settings.sections.background.api_subtitle')}
+            title={variables.getMessage('settings:sections.background.api')}
+            subtitle={variables.getMessage('settings:sections.background.api_subtitle')}
           />
           <Action>
             {this.state.backgroundCategories[0] === variables.getMessage('modals.main.loading') ? (
               <>
                 <Dropdown
-                  label={variables.getMessage('modals.main.settings.sections.background.category')}
+                  label={variables.getMessage('settings:sections.background.category')}
                   name="apiCategories"
                   items={[
                     {
@@ -117,14 +117,14 @@ class BackgroundOptions extends PureComponent {
               </>
             ) : (
               <ChipSelect
-                label={variables.getMessage('modals.main.settings.sections.background.categories')}
+                label={variables.getMessage('settings:sections.background.categories')}
                 options={this.state.backgroundCategories}
                 name="apiCategories"
               />
             )}
             <Dropdown
               label={variables.getMessage(
-                'modals.main.settings.sections.background.source.quality.title',
+                'settings:sections.background.source.quality.title',
               )}
               name="apiQuality"
               element=".other"
@@ -153,17 +153,17 @@ class BackgroundOptions extends PureComponent {
           <Row final={true}>
             <Content
               title={variables.getMessage(
-                'modals.main.settings.sections.background.unsplash.title',
+                'settings:sections.background.unsplash.title',
               )}
               subtitle={variables.getMessage(
-                'modals.main.settings.sections.background.unsplash.subtitle',
+                'settings:sections.background.unsplash.subtitle',
               )}
             />
             <Action>
               <Text
-                title={variables.getMessage('modals.main.settings.sections.background.unsplash.id')}
+                title={variables.getMessage('settings:sections.background.unsplash.id')}
                 subtitle={variables.getMessage(
-                  'modals.main.settings.sections.background.unsplash.id_subtitle',
+                  'settings:sections.background.unsplash.id_subtitle',
                 )}
                 placeholder="e.g. 123456, 654321"
                 name="unsplashCollections"
@@ -210,9 +210,9 @@ class BackgroundOptions extends PureComponent {
     if (this.state.effects === true) {
       header = (
         <Header
-          title={variables.getMessage('modals.main.settings.sections.background.title')}
+          title={variables.getMessage('settings:sections.background.title')}
           secondaryTitle={variables.getMessage(
-            'modals.main.settings.sections.background.effects.title',
+            'settings:sections.background.effects.title',
           )}
           goBack={() => this.setState({ effects: false })}
         />
@@ -220,9 +220,9 @@ class BackgroundOptions extends PureComponent {
     } else if (this.state.backgroundSettingsSection === true) {
       header = (
         <Header
-          title={variables.getMessage('modals.main.settings.sections.background.title')}
+          title={variables.getMessage('settings:sections.background.title')}
           secondaryTitle={variables.getMessage(
-            'modals.main.settings.sections.background.source.title',
+            'settings:sections.background.source.title',
           )}
           goBack={() => this.setState({ backgroundSettingsSection: false })}
         />
@@ -230,7 +230,7 @@ class BackgroundOptions extends PureComponent {
     } else {
       header = (
         <Header
-          title={variables.getMessage('modals.main.settings.sections.background.title')}
+          title={variables.getMessage('settings:sections.background.title')}
           setting="background"
           category="background"
           element="#backgroundImage"
@@ -251,11 +251,11 @@ class BackgroundOptions extends PureComponent {
                 <MdSource />
                 <div className="content">
                   <span className="title">
-                    {variables.getMessage('modals.main.settings.sections.background.source.title')}
+                    {variables.getMessage('settings:sections.background.source.title')}
                   </span>
                   <span className="subtitle">
                     {variables.getMessage(
-                      'modals.main.settings.sections.background.source.subtitle',
+                      'settings:sections.background.source.subtitle',
                     )}
                   </span>
                 </div>
@@ -263,7 +263,7 @@ class BackgroundOptions extends PureComponent {
               <div className="action">
                 <Dropdown
                   label={variables.getMessage(
-                    'modals.main.settings.sections.background.type.title',
+                    'settings:sections.background.type.title',
                   )}
                   name="backgroundType"
                   onChange={(value) => this.setState({ backgroundType: value })}
@@ -282,12 +282,12 @@ class BackgroundOptions extends PureComponent {
                     <div className="content">
                       <span className="title">
                         {variables.getMessage(
-                          'modals.main.settings.sections.background.effects.title',
+                          'settings:sections.background.effects.title',
                         )}
                       </span>
                       <span className="subtitle">
                         {variables.getMessage(
-                          'modals.main.settings.sections.background.effects.subtitle',
+                          'settings:sections.background.effects.subtitle',
                         )}
                       </span>
                     </div>
@@ -308,28 +308,28 @@ class BackgroundOptions extends PureComponent {
           this.state.marketplaceEnabled) ? (
           <Row final={true}>
             <Content
-              title={variables.getMessage('modals.main.settings.sections.background.display')}
+              title={variables.getMessage('settings:sections.background.display')}
               subtitle={variables.getMessage(
-                'modals.main.settings.sections.background.display_subtitle',
+                'settings:sections.background.display_subtitle',
               )}
             />
             <Action>
               <Checkbox
                 name="bgtransition"
-                text={variables.getMessage('modals.main.settings.sections.background.transition')}
+                text={variables.getMessage('settings:sections.background.transition')}
                 element=".other"
                 disabled={!usingImage}
               />
               <Checkbox
                 name="photoInformation"
                 text={variables.getMessage(
-                  'modals.main.settings.sections.background.photo_information',
+                  'settings:sections.background.photo_information',
                 )}
                 element=".other"
               />
               <Checkbox
                 name="photoMap"
-                text={variables.getMessage('modals.main.settings.sections.background.show_map')}
+                text={variables.getMessage('settings:sections.background.show_map')}
                 element=".other"
                 disabled={!usingImage}
               />
@@ -346,16 +346,16 @@ class BackgroundOptions extends PureComponent {
             >
               <Content
                 title={variables.getMessage(
-                  'modals.main.settings.sections.background.source.title',
+                  'settings:sections.background.source.title',
                 )}
                 subtitle={variables.getMessage(
-                  'modals.main.settings.sections.background.source.subtitle',
+                  'settings:sections.background.source.subtitle',
                 )}
               />
               <Action>
                 <Dropdown
                   label={variables.getMessage(
-                    'modals.main.settings.sections.background.type.title',
+                    'settings:sections.background.type.title',
                   )}
                   name="backgroundType"
                   onChange={(value) => this.setState({ backgroundType: value })}
@@ -374,15 +374,15 @@ class BackgroundOptions extends PureComponent {
         this.state.effects ? (
           <Row final={true}>
             <Content
-              title={variables.getMessage('modals.main.settings.sections.background.effects.title')}
+              title={variables.getMessage('settings:sections.background.effects.title')}
               subtitle={variables.getMessage(
-                'modals.main.settings.sections.background.effects.subtitle',
+                'settings:sections.background.effects.subtitle',
               )}
             />
             <Action>
               <Slider
                 title={variables.getMessage(
-                  'modals.main.settings.sections.background.effects.blur',
+                  'settings:sections.background.effects.blur',
                 )}
                 name="blur"
                 min="0"
@@ -395,7 +395,7 @@ class BackgroundOptions extends PureComponent {
               />
               <Slider
                 title={variables.getMessage(
-                  'modals.main.settings.sections.background.effects.brightness',
+                  'settings:sections.background.effects.brightness',
                 )}
                 name="brightness"
                 min="0"
@@ -408,7 +408,7 @@ class BackgroundOptions extends PureComponent {
               />
               <Dropdown
                 label={variables.getMessage(
-                  'modals.main.settings.sections.background.effects.filters.title',
+                  'settings:sections.background.effects.filters.title',
                 )}
                 name="backgroundFilter"
                 onChange={(value) => this.setState({ backgroundFilter: value })}
@@ -419,7 +419,7 @@ class BackgroundOptions extends PureComponent {
               {this.state.backgroundFilter !== 'none' && (
                 <Slider
                   title={variables.getMessage(
-                    'modals.main.settings.sections.background.effects.filters.amount',
+                    'settings:sections.background.effects.filters.amount',
                   )}
                   name="backgroundFilterAmount"
                   min="0"
diff --git a/src/features/background/options/Colour.jsx b/src/features/background/options/Colour.jsx
index 77ea2b24..07213e5e 100644
--- a/src/features/background/options/Colour.jsx
+++ b/src/features/background/options/Colour.jsx
@@ -38,7 +38,7 @@ const ColourOptions = () => {
     <Row final={true}>
       <Content
         title={variables.getMessage(
-          'modals.main.settings.sections.background.source.custom_colour',
+          'settings:sections.background.source.custom_colour',
         )}
       />
       <Action>
@@ -53,7 +53,7 @@ const ColourOptions = () => {
         <div className="colourReset">
           <span className="link" onClick={() => resetColour()}>
             <MdRefresh />
-            {variables.getMessage('modals.main.settings.buttons.reset')}
+            {variables.getMessage('settings:buttons.reset')}
           </span>
         </div>
       </Action>
diff --git a/src/features/background/options/Custom.jsx b/src/features/background/options/Custom.jsx
index e523039d..4935614b 100644
--- a/src/features/background/options/Custom.jsx
+++ b/src/features/background/options/Custom.jsx
@@ -86,13 +86,13 @@ export default class CustomSettings extends PureComponent {
           <Checkbox
             name="backgroundVideoLoop"
             text={variables.getMessage(
-              'modals.main.settings.sections.background.source.loop_video',
+              'settings:sections.background.source.loop_video',
             )}
           />
           <Checkbox
             name="backgroundVideoMute"
             text={variables.getMessage(
-              'modals.main.settings.sections.background.source.mute_video',
+              'settings:sections.background.source.mute_video',
             )}
           />
         </>
@@ -194,12 +194,12 @@ export default class CustomSettings extends PureComponent {
               <div>
                 <span className="title">
                   {variables.getMessage(
-                    'modals.main.settings.sections.background.source.custom_title',
+                    'settings:sections.background.source.custom_title',
                   )}
                 </span>
                 <span className="subtitle">
                   {variables.getMessage(
-                    'modals.main.settings.sections.background.source.custom_description',
+                    'settings:sections.background.source.custom_description',
                   )}
                 </span>
               </div>
@@ -210,7 +210,7 @@ export default class CustomSettings extends PureComponent {
                 onClick={() => this.uploadCustomBackground()}
                 icon={<MdOutlineFileUpload />}
                 label={variables.getMessage(
-                  'modals.main.settings.sections.background.source.upload',
+                  'settings:sections.background.source.upload',
                 )}
               />
               <Button
@@ -218,7 +218,7 @@ export default class CustomSettings extends PureComponent {
                 onClick={() => this.setState({ customURLModal: true })}
                 icon={<MdAddLink />}
                 label={variables.getMessage(
-                  'modals.main.settings.sections.background.source.add_url',
+                  'settings:sections.background.source.add_url',
                 )}
               />
             </div>
@@ -236,7 +236,7 @@ export default class CustomSettings extends PureComponent {
                     {this.state.customBackground.length > 0 && (
                       <Tooltip
                         title={variables.getMessage(
-                          'modals.main.settings.sections.background.source.remove',
+                          'settings:sections.background.source.remove',
                         )}
                       >
                         <Button
@@ -255,12 +255,12 @@ export default class CustomSettings extends PureComponent {
                   <MdAddPhotoAlternate />
                   <span className="title">
                     {variables.getMessage(
-                      'modals.main.settings.sections.background.source.drop_to_upload',
+                      'settings:sections.background.source.drop_to_upload',
                     )}
                   </span>
                   <span className="subtitle">
                     {variables.getMessage(
-                      'modals.main.settings.sections.background.source.formats',
+                      'settings:sections.background.source.formats',
                       {
                         list: 'jpeg, png, webp, webm, gif, mp4, webm, ogg',
                       },
@@ -271,7 +271,7 @@ export default class CustomSettings extends PureComponent {
                     onClick={() => this.uploadCustomBackground()}
                     icon={<MdFolder />}
                     label={variables.getMessage(
-                      'modals.main.settings.sections.background.source.select',
+                      'settings:sections.background.source.select',
                     )}
                   />
                 </div>
diff --git a/src/features/background/options/CustomURLModal.jsx b/src/features/background/options/CustomURLModal.jsx
index 14b910f6..fab9a291 100644
--- a/src/features/background/options/CustomURLModal.jsx
+++ b/src/features/background/options/CustomURLModal.jsx
@@ -10,10 +10,10 @@ function CustomURLModal({ modalClose, urlError, modalCloseOnly }) {
     <div className="smallModal">
       <div className="shareHeader">
         <span className="title">
-          {variables.getMessage('modals.main.settings.sections.background.source.add_url')}
+          {variables.getMessage('settings:sections.background.source.add_url')}
         </span>
         <Tooltip
-          title={variables.getMessage('modals.main.settings.sections.advanced.reset_modal.cancel')}
+          title={variables.getMessage('settings:sections.advanced.reset_modal.cancel')}
         >
           <div className="close" onClick={modalCloseOnly}>
             <MdClose />
@@ -32,13 +32,13 @@ function CustomURLModal({ modalClose, urlError, modalCloseOnly }) {
           type="secondary"
           onClick={modalCloseOnly}
           icon={<MdClose />}
-          label={variables.getMessage('modals.main.settings.sections.advanced.reset_modal.cancel')}
+          label={variables.getMessage('settings:sections.advanced.reset_modal.cancel')}
         />
         <Button
           type="settings"
           onClick={() => modalClose(url)}
           icon={<MdOutlineAddLink />}
-          label={variables.getMessage('modals.main.settings.sections.background.source.add_url')}
+          label={variables.getMessage('settings:sections.background.source.add_url')}
         />
       </div>
     </div>
diff --git a/src/features/background/options/optionTypes/APIQualityOptions.js b/src/features/background/options/optionTypes/APIQualityOptions.js
index a2fee291..d4e5dc41 100644
--- a/src/features/background/options/optionTypes/APIQualityOptions.js
+++ b/src/features/background/options/optionTypes/APIQualityOptions.js
@@ -3,18 +3,18 @@ import variables from 'config/variables';
 export const APIQualityOptions = [
   {
     value: 'original',
-    text: variables.getMessage('modals.main.settings.sections.background.source.quality.original'),
+    text: variables.getMessage('settings:sections.background.source.quality.original'),
   },
   {
     value: 'high',
-    text: variables.getMessage('modals.main.settings.sections.background.source.quality.high'),
+    text: variables.getMessage('settings:sections.background.source.quality.high'),
   },
   {
     value: 'normal',
-    text: variables.getMessage('modals.main.settings.sections.background.source.quality.normal'),
+    text: variables.getMessage('settings:sections.background.source.quality.normal'),
   },
   {
     value: 'datasaver',
-    text: variables.getMessage('modals.main.settings.sections.background.source.quality.datasaver'),
+    text: variables.getMessage('settings:sections.background.source.quality.datasaver'),
   },
 ];
diff --git a/src/features/background/options/optionTypes/backgroundImageEffects.js b/src/features/background/options/optionTypes/backgroundImageEffects.js
index 3c962ae3..96dafa73 100644
--- a/src/features/background/options/optionTypes/backgroundImageEffects.js
+++ b/src/features/background/options/optionTypes/backgroundImageEffects.js
@@ -4,29 +4,29 @@ export const backgroundImageEffects = [
   {
     value: 'none',
     text: variables.getMessage(
-      'modals.main.settings.sections.appearance.navbar.refresh_options.none',
+      'settings:sections.appearance.navbar.refresh_options.none',
     ),
   },
   {
     value: 'grayscale',
     text: variables.getMessage(
-      'modals.main.settings.sections.background.effects.filters.grayscale',
+      'settings:sections.background.effects.filters.grayscale',
     ),
   },
   {
     value: 'sepia',
-    text: variables.getMessage('modals.main.settings.sections.background.effects.filters.sepia'),
+    text: variables.getMessage('settings:sections.background.effects.filters.sepia'),
   },
   {
     value: 'invert',
-    text: variables.getMessage('modals.main.settings.sections.background.effects.filters.invert'),
+    text: variables.getMessage('settings:sections.background.effects.filters.invert'),
   },
   {
     value: 'saturate',
-    text: variables.getMessage('modals.main.settings.sections.background.effects.filters.saturate'),
+    text: variables.getMessage('settings:sections.background.effects.filters.saturate'),
   },
   {
     value: 'contrast',
-    text: variables.getMessage('modals.main.settings.sections.background.effects.filters.contrast'),
+    text: variables.getMessage('settings:sections.background.effects.filters.contrast'),
   },
 ];
diff --git a/src/features/background/options/optionTypes/getBackgroundOptionItems.js b/src/features/background/options/optionTypes/getBackgroundOptionItems.js
index c58c7795..4d79456a 100644
--- a/src/features/background/options/optionTypes/getBackgroundOptionItems.js
+++ b/src/features/background/options/optionTypes/getBackgroundOptionItems.js
@@ -8,23 +8,23 @@ export function getBackgroundOptionItems(marketplaceEnabled) {
     },
     {
       value: 'api',
-      text: variables.getMessage('modals.main.settings.sections.background.type.api'),
+      text: variables.getMessage('settings:sections.background.type.api'),
     },
     {
       value: 'custom',
-      text: variables.getMessage('modals.main.settings.sections.background.type.custom_image'),
+      text: variables.getMessage('settings:sections.background.type.custom_image'),
     },
     {
       value: 'colour',
-      text: variables.getMessage('modals.main.settings.sections.background.type.custom_colour'),
+      text: variables.getMessage('settings:sections.background.type.custom_colour'),
     },
     {
       value: 'random_colour',
-      text: variables.getMessage('modals.main.settings.sections.background.type.random_colour'),
+      text: variables.getMessage('settings:sections.background.type.random_colour'),
     },
     {
       value: 'random_gradient',
-      text: variables.getMessage('modals.main.settings.sections.background.type.random_gradient'),
+      text: variables.getMessage('settings:sections.background.type.random_gradient'),
     },
   ];
 }
diff --git a/src/features/greeting/options/GreetingOptions.jsx b/src/features/greeting/options/GreetingOptions.jsx
index 3dbb4c6b..a4933ef8 100644
--- a/src/features/greeting/options/GreetingOptions.jsx
+++ b/src/features/greeting/options/GreetingOptions.jsx
@@ -45,7 +45,7 @@ const GreetingOptions = () => {
     setBirthday(newDate);
   };
 
-  const GREETING_SECTION = 'modals.main.settings.sections.greeting';
+  const GREETING_SECTION = 'settings:sections.greeting';
 
   const addEvent = () => {
     // Retrieve the current array of events from localStorage
@@ -109,7 +109,7 @@ const GreetingOptions = () => {
     return (
       <Row final={true}>
         <Content
-          title={variables.getMessage('modals.main.settings.additional_settings')}
+          title={variables.getMessage('settings:additional_settings')}
           subtitle={variables.getMessage(`${GREETING_SECTION}.additional`)}
         />
         <Action>
@@ -134,13 +134,13 @@ const GreetingOptions = () => {
         <Content
           title={variables.getMessage(`${GREETING_SECTION}.birthday`)}
           subtitle={variables.getMessage(
-            'modals.main.settings.sections.greeting.birthday_subtitle',
+            'settings:sections.greeting.birthday_subtitle',
           )}
         />
         <Action>
           <Switch
             name="birthdayenabled"
-            text={variables.getMessage('modals.main.settings.enabled')}
+            text={variables.getMessage('settings:enabled')}
             category="greeting"
             onChange={(value) => {
               setEnableBirthday(value ? 'preferences' : 'preferencesInactive');
@@ -178,7 +178,7 @@ const GreetingOptions = () => {
                 type="settings"
                 onClick={resetEvents}
                 icon={<MdRefresh />}
-                label={variables.getMessage('modals.main.settings.buttons.reset')}
+                label={variables.getMessage('settings:buttons.reset')}
               />
               <Button
                 type="settings"
@@ -245,7 +245,7 @@ const GreetingOptions = () => {
                     type="settings"
                     onClick={() => removeEvent(index)}
                     icon={<MdCancel />}
-                    label={variables.getMessage('modals.main.marketplace.product.buttons.remove')}
+                    label={variables.getMessage('marketplace:product.buttons.remove')}
                   />
                 </div>
               </div>
diff --git a/src/features/helpers/preview/Preview.jsx b/src/features/helpers/preview/Preview.jsx
index 5502ebd3..27f3105e 100644
--- a/src/features/helpers/preview/Preview.jsx
+++ b/src/features/helpers/preview/Preview.jsx
@@ -13,13 +13,13 @@ function Preview(props) {
 
   return (
     <div className="preview-mode">
-      <span className="title">{variables.getMessage('modals.main.settings.reminder.title')}</span>
-      <span className="subtitle">{variables.getMessage('modals.welcome.preview.description')}</span>
+      <span className="title">{variables.getMessage('settings:reminder.title')}</span>
+      <span className="subtitle">{variables.getMessage('welcome:preview.description')}</span>
       <Button
         type="settings"
         onClick={() => setup()}
         icon={<MdArrowForwardIos />}
-        label={variables.getMessage('modals.welcome.preview.continue')}
+        label={variables.getMessage('welcome:preview.continue')}
         iconPlacement={'right'}
       />
     </div>
diff --git a/src/features/marketplace/components/Collection/Collection.jsx b/src/features/marketplace/components/Collection/Collection.jsx
index 7b45042d..c38b6052 100644
--- a/src/features/marketplace/components/Collection/Collection.jsx
+++ b/src/features/marketplace/components/Collection/Collection.jsx
@@ -28,14 +28,14 @@ const Collection = ({ collection, collectionFunction }) => {
           target="_blank"
           rel="noopener noreferrer"
         >
-          {variables.getMessage('modals.main.marketplace.learn_more')} <MdOutlineOpenInNew />
+          {variables.getMessage('marketplace:learn_more')} <MdOutlineOpenInNew />
         </a>
       ) : (
         <Button
           type="collection"
           onClick={() => collectionFunction(collection.name)}
           icon={<MdOutlineArrowForward />}
-          label={variables.getMessage('modals.main.marketplace.explore_collection')}
+          label={variables.getMessage('marketplace:explore_collection')}
           iconPlacement={'right'}
         />
       )}
diff --git a/src/features/marketplace/components/Elements/CollectionCarousel/CollectionCarousel.jsx b/src/features/marketplace/components/Elements/CollectionCarousel/CollectionCarousel.jsx
index c1a6eff1..7a9d692e 100644
--- a/src/features/marketplace/components/Elements/CollectionCarousel/CollectionCarousel.jsx
+++ b/src/features/marketplace/components/Elements/CollectionCarousel/CollectionCarousel.jsx
@@ -54,14 +54,14 @@ const CollectionCarousel = ({ collections, collectionFunction }) => {
                 target="_blank"
                 rel="noopener noreferrer"
               >
-                {variables.getMessage('modals.main.marketplace.learn_more')} <MdOutlineOpenInNew />
+                {variables.getMessage('marketplace:learn_more')} <MdOutlineOpenInNew />
               </a>
             ) : (
               <Button
                 type="collection"
                 onClick={() => collectionFunction(selectedCollections[currentIndex]?.name)}
                 icon={<MdOutlineArrowForward />}
-                label={variables.getMessage('modals.main.marketplace.explore_collection')}
+                label={variables.getMessage('marketplace:explore_collection')}
                 iconPlacement={'right'}
               />
             )}
diff --git a/src/features/marketplace/components/Elements/SideloadFailedModal/SideloadFailedModal.jsx b/src/features/marketplace/components/Elements/SideloadFailedModal/SideloadFailedModal.jsx
index c6e0de37..97cece25 100644
--- a/src/features/marketplace/components/Elements/SideloadFailedModal/SideloadFailedModal.jsx
+++ b/src/features/marketplace/components/Elements/SideloadFailedModal/SideloadFailedModal.jsx
@@ -9,14 +9,14 @@ function SideloadFailedModal({ modalClose, reason }) {
       <div className="shareHeader">
         <span className="title">{variables.getMessage('modals.main.error_boundary.title')}</span>
         <Tooltip
-          title={variables.getMessage('modals.main.settings.sections.advanced.reset_modal.cancel')}
+          title={variables.getMessage('settings:sections.advanced.reset_modal.cancel')}
         >
           <div className="close" onClick={modalClose}>
             <MdClose />
           </div>
         </Tooltip>
       </div>
-      <span>{variables.getMessage('modals.main.addons.sideload.failed')}</span>
+      <span>{variables.getMessage('addons:sideload.failed')}</span>
       <span className="subtitle">{reason}</span>
     </div>
   );
diff --git a/src/features/marketplace/components/Items/Items.jsx b/src/features/marketplace/components/Items/Items.jsx
index 97d1b03e..2093427b 100644
--- a/src/features/marketplace/components/Items/Items.jsx
+++ b/src/features/marketplace/components/Items/Items.jsx
@@ -51,7 +51,7 @@ function ItemCard({ item, toggleFunction, type, onCollection, isCurator }) {
         <span className="card-title">{item.display_name || item.name}</span>
         {!isCurator ? (
           <span className="card-subtitle">
-            {variables.getMessage('modals.main.marketplace.by', { author: item.author })}
+            {variables.getMessage('marketplace:by', { author: item.author })}
           </span>
         ) : (
           ''
@@ -59,7 +59,7 @@ function ItemCard({ item, toggleFunction, type, onCollection, isCurator }) {
 
         {type === 'all' && !onCollection ? (
           <span className="card-type">
-            {variables.getMessage('modals.main.marketplace.' + item.type)}
+            {variables.getMessage('marketplace:' + item.type)}
           </span>
         ) : null}
       </div>
@@ -108,14 +108,14 @@ function Items({
               target="_blank"
               rel="noopener noreferrer"
             >
-              {variables.getMessage('modals.main.marketplace.learn_more')} <MdOutlineOpenInNew />
+              {variables.getMessage('marketplace:learn_more')} <MdOutlineOpenInNew />
             </a>
           ) : (
             <Button
               type="collection"
               onClick={() => collectionFunction(collection?.name)}
               icon={<MdOutlineArrowForward />}
-              label={variables.getMessage('modals.main.marketplace.explore_collection')}
+              label={variables.getMessage('marketplace:explore_collection')}
               iconPlacement={'right'}
             />
           )}
@@ -168,18 +168,18 @@ function Items({
       {!onCollection && showCreateYourOwn ? (
         <div className="createYourOwn">
           <MdAutoFixHigh />
-          <span className="title">{variables.getMessage('modals.main.marketplace.cant_find')}</span>
+          <span className="title">{variables.getMessage('marketplace:cant_find')}</span>
           <span className="subtitle">
-            {variables.getMessage('modals.main.marketplace.knowledgebase_one') + ' '}
+            {variables.getMessage('marketplace:knowledgebase_one') + ' '}
             <a
               className="link"
               target="_blank"
               href={variables.constants.KNOWLEDGEBASE}
               rel="noreferrer"
             >
-              {variables.getMessage('modals.main.marketplace.knowledgebase_two')}
+              {variables.getMessage('marketplace:knowledgebase_two')}
             </a>
-            {' ' + variables.getMessage('modals.main.marketplace.knowledgebase_three')}
+            {' ' + variables.getMessage('marketplace:knowledgebase_three')}
           </span>
         </div>
       ) : null}
diff --git a/src/features/marketplace/components/Items/NewItems.jsx b/src/features/marketplace/components/Items/NewItems.jsx
index 2f373bf8..a77c851d 100644
--- a/src/features/marketplace/components/Items/NewItems.jsx
+++ b/src/features/marketplace/components/Items/NewItems.jsx
@@ -39,7 +39,7 @@ function ItemCard({ item, onClick, type, onCollection, isCurator }) {
         <span className="card-title">{item.display_name || item.name}</span>
         {!isCurator ? (
           <span className="card-subtitle">
-            {variables.getMessage('modals.main.marketplace.by', { author: item.author })}
+            {variables.getMessage('marketplace:by', { author: item.author })}
           </span>
         ) : (
           ''
@@ -47,7 +47,7 @@ function ItemCard({ item, onClick, type, onCollection, isCurator }) {
 
         {type === 'all' && !onCollection ? (
           <span className="card-type">
-            {variables.getMessage('modals.main.marketplace.' + item.type)}
+            {variables.getMessage('marketplace:' + item.type)}
           </span>
         ) : null}
       </div>
diff --git a/src/features/marketplace/views/Added.jsx b/src/features/marketplace/views/Added.jsx
index 455c8249..19da2f70 100644
--- a/src/features/marketplace/views/Added.jsx
+++ b/src/features/marketplace/views/Added.jsx
@@ -29,7 +29,7 @@ export default class Added extends PureComponent {
         <Button
           type="settings"
           onClick={() => this.uninstall()}
-          label={variables.getMessage('modals.main.marketplace.product.buttons.remove')}
+          label={variables.getMessage('marketplace:product.buttons.remove')}
         />
       ),
     };
@@ -38,13 +38,13 @@ export default class Added extends PureComponent {
   installAddon(input) {
     let failedReason = '';
     if (!input.name) {
-      failedReason = variables.getMessage('modals.main.addons.sideload.errors.no_name');
+      failedReason = variables.getMessage('addons:sideload.errors.no_name');
     } else if (!input.author) {
-      failedReason = variables.getMessage('modals.main.addons.sideload.errors.no_author');
+      failedReason = variables.getMessage('addons:sideload.errors.no_author');
     } else if (!input.type) {
-      failedReason = variables.getMessage('modals.main.addons.sideload.errors.no_type');
+      failedReason = variables.getMessage('addons:sideload.errors.no_type');
     } else if (!input.version) {
-      failedReason = variables.getMessage('modals.main.addons.sideload.errors.no_version');
+      failedReason = variables.getMessage('addons:sideload.errors.no_version');
     } else if (
       input.type === 'photos' &&
       (!input.photos ||
@@ -54,12 +54,12 @@ export default class Added extends PureComponent {
         !input.photos[0].photographer ||
         !input.photos[0].location)
     ) {
-      failedReason = variables.getMessage('modals.main.addons.sideload.errors.invalid_photos');
+      failedReason = variables.getMessage('addons:sideload.errors.invalid_photos');
     } else if (
       input.type === 'quotes' &&
       (!input.quotes || !input.quotes.length || !input.quotes[0].quote || !input.quotes[0].author)
     ) {
-      failedReason = variables.getMessage('modals.main.addons.sideload.errors.invalid_quotes');
+      failedReason = variables.getMessage('addons:sideload.errors.invalid_quotes');
     }
 
     if (failedReason !== '' && this.state.showFailed === false) {
@@ -84,7 +84,7 @@ export default class Added extends PureComponent {
         onClick={() => document.getElementById('file-input').click()}
         ref={this.customDnd}
         icon={<MdSendTimeExtension />}
-        label={variables.getMessage('modals.main.addons.sideload.title')}
+        label={variables.getMessage('addons:sideload.title')}
       />
     );
   }
@@ -144,12 +144,12 @@ export default class Added extends PureComponent {
 
     if (updates > 0) {
       toast(
-        variables.getMessage('modals.main.addons.updates_available', {
+        variables.getMessage('addons:updates_available', {
           amount: updates,
         }),
       );
     } else {
-      toast(variables.getMessage('modals.main.addons.no_updates'));
+      toast(variables.getMessage('addons:no_updates'));
     }
   }
 
@@ -213,10 +213,10 @@ export default class Added extends PureComponent {
             <div className="emptyNewMessage">
               <MdOutlineExtensionOff />
               <span className="title">
-                {variables.getMessage('modals.main.addons.empty.title')}
+                {variables.getMessage('addons:empty.title')}
               </span>
               <span className="subtitle">
-                {variables.getMessage('modals.main.addons.empty.description')}
+                {variables.getMessage('addons:empty.description')}
               </span>
             </div>
           </div>
@@ -237,7 +237,7 @@ export default class Added extends PureComponent {
 
     return (
       <>
-        <Header title={variables.getMessage('modals.main.addons.added')} report={false}>
+        <Header title={variables.getMessage('addons:added')} report={false}>
           <CustomActions>
             {this.getSideloadButton()}
             {sideLoadBackendElements()}
@@ -245,7 +245,7 @@ export default class Added extends PureComponent {
               type="settings"
               onClick={() => this.updateCheck()}
               icon={<MdUpdate />}
-              label={variables.getMessage('modals.main.addons.check_updates')}
+              label={variables.getMessage('addons:check_updates')}
             />
             <Button
               type="settings"
@@ -257,30 +257,30 @@ export default class Added extends PureComponent {
                 type="settings"
                 onClick={() => document.getElementById('file-input').click()}
                 icon={<MdSendTimeExtension />}
-                label={variables.getMessage('modals.main.addons.sideload.title')}
+                label={variables.getMessage('addons:sideload.title')}
     `       />*/}
           </CustomActions>
         </Header>
         <Dropdown
-          label={variables.getMessage('modals.main.addons.sort.title')}
+          label={variables.getMessage('addons:sort.title')}
           name="sortAddons"
           onChange={(value) => this.setState({ installed: sortItems(this.state.installed, value) })}
           items={[
             {
               value: 'newest',
-              text: variables.getMessage('modals.main.addons.sort.newest'),
+              text: variables.getMessage('addons:sort.newest'),
             },
             {
               value: 'oldest',
-              text: variables.getMessage('modals.main.addons.sort.oldest'),
+              text: variables.getMessage('addons:sort.oldest'),
             },
             {
               value: 'a-z',
-              text: variables.getMessage('modals.main.addons.sort.a_z'),
+              text: variables.getMessage('addons:sort.a_z'),
             },
             {
               value: 'z-a',
-              text: variables.getMessage('modals.main.addons.sort.z_a'),
+              text: variables.getMessage('addons:sort.z_a'),
             },
           ]}
         />
diff --git a/src/features/marketplace/views/Browse.jsx b/src/features/marketplace/views/Browse.jsx
index 0065681d..c6100c00 100644
--- a/src/features/marketplace/views/Browse.jsx
+++ b/src/features/marketplace/views/Browse.jsx
@@ -169,10 +169,10 @@ function Marketplace() {
       <>
         <MdWifiOff />
         <span className="title">
-          {variables.getMessage('modals.main.marketplace.offline.title')}
+          {variables.getMessage('marketplace:offline.title')}
         </span>
         <span className="subtitle">
-          {variables.getMessage('modals.main.marketplace.offline.description')}
+          {variables.getMessage('marketplace:offline.description')}
         </span>
       </>,
     );
@@ -192,8 +192,8 @@ function Marketplace() {
     return errorMessage(
       <>
         <MdLocalMall />
-        <span className="title">{variables.getMessage('modals.main.addons.empty.title')}</span>
-        <span className="subtitle">{variables.getMessage('modals.main.marketplace.no_items')}</span>
+        <span className="title">{variables.getMessage('addons:empty.title')}</span>
+        <span className="subtitle">{variables.getMessage('marketplace:no_items')}</span>
       </>,
     );
   }
@@ -214,7 +214,7 @@ function Marketplace() {
         onClick={() =>
           changeTab(
             'settings',
-            variables.getMessage('modals.main.settings.sections.changelog.title'),
+            variables.getMessage('settings:sections.changelog.title'),
           )
         }
       >
@@ -237,7 +237,7 @@ function Marketplace() {
             }
           >
             <div className="nice-tag">
-              {variables.getMessage('modals.main.marketplace.collection')}
+              {variables.getMessage('marketplace:collection')}
             </div>
             <div className="content">
               <span className="mainTitle">{collectionTitle}</span>={' '}
@@ -250,8 +250,8 @@ function Marketplace() {
               icon={<MdLibraryAdd />}
               label={
                 busy
-                  ? variables.getMessage('modals.main.marketplace.installing')
-                  : variables.getMessage('modals.main.marketplace.add_all')
+                  ? variables.getMessage('marketplace:installing')
+                  : variables.getMessage('marketplace:add_all')
               }
             />
           </div>
@@ -283,18 +283,18 @@ function Marketplace() {
               </div>
             )}
             <Dropdown
-              label={variables.getMessage('modals.main.addons.sort.title')}
+              label={variables.getMessage('addons:sort.title')}
               name="sortMarketplace"
               onChange={(value) => changeSort(value
               items)}
               items={[
                 {
                   value: 'a-z',
-                  text: variables.getMessage('modals.main.addons.sort.a_z'),
+                  text: variables.getMessage('addons:sort.a_z'),
                 },
                 {
                   value: 'z-a',
-                  text: variables.getMessage('modals.main.addons.sort.z_a'),
+                  text: variables.getMessage('addons:sort.z_a'),
                 },
               ]}
             />
@@ -324,7 +324,7 @@ function Marketplace() {
                 type="collection"
                 onClick={() => toggle('collection', item.name)}
                 icon={<MdOutlineArrowForward />}
-                label={variables.getMessage('modals.main.marketplace.explore_collection')}
+                label={variables.getMessage('marketplace:explore_collection')}
                 iconPlacement="right"
               />
             </div>
diff --git a/src/features/marketplace/views/CollectionPage.jsx b/src/features/marketplace/views/CollectionPage.jsx
index 50b21bd9..37e6ed0f 100644
--- a/src/features/marketplace/views/CollectionPage.jsx
+++ b/src/features/marketplace/views/CollectionPage.jsx
@@ -44,7 +44,7 @@ function CollectionPage() {
           }
         }
       >
-        <div className="nice-tag">{variables.getMessage('modals.main.marketplace.collection')}</div>
+        <div className="nice-tag">{variables.getMessage('marketplace:collection')}</div>
         <div className="content">
           <span className="mainTitle">{collectionTitle}</span>={' '}
         </div>
@@ -56,8 +56,8 @@ function CollectionPage() {
           icon={<MdLibraryAdd />}
           label={
             busy
-              ? variables.getMessage('modals.main.marketplace.installing')
-              : variables.getMessage('modals.main.marketplace.add_all')
+              ? variables.getMessage('marketplace:installing')
+              : variables.getMessage('marketplace:add_all')
           }
         />
       </div>
diff --git a/src/features/marketplace/views/Create.jsx b/src/features/marketplace/views/Create.jsx
index e5d6eafb..3fd6eb53 100644
--- a/src/features/marketplace/views/Create.jsx
+++ b/src/features/marketplace/views/Create.jsx
@@ -6,21 +6,21 @@ function Create() {
   return (
     <>
       <div className="flexTopMarketplace">
-        <span className="mainTitle">{variables.getMessage('modals.main.addons.create.title')}</span>
+        <span className="mainTitle">{variables.getMessage('addons:create.title')}</span>
       </div>
       <div className="emptyItems">
         <div className="emptyNewMessage">
           <MdOutlineExtensionOff />
           <span className="title">
-            {variables.getMessage('modals.main.addons.create.moved_title')}
+            {variables.getMessage('addons:create.moved_title')}
           </span>
           <span className="subtitle">
-            {variables.getMessage('modals.main.addons.create.moved_description')}
+            {variables.getMessage('addons:create.moved_description')}
           </span>
           <div className="createButtons">
             <Button
               type="settings"
-              label={variables.getMessage('modals.main.addons.create.moved_button')}
+              label={variables.getMessage('addons:create.moved_button')}
             />
           </div>
         </div>
diff --git a/src/features/marketplace/views/ItemPage.jsx b/src/features/marketplace/views/ItemPage.jsx
index 6786aebd..6c66509c 100644
--- a/src/features/marketplace/views/ItemPage.jsx
+++ b/src/features/marketplace/views/ItemPage.jsx
@@ -44,7 +44,7 @@ class ItemPage extends PureComponent {
           type="settings"
           onClick={() => this.manage('uninstall')}
           icon={<MdClose />}
-          label={variables.getMessage('modals.main.marketplace.product.buttons.remove')}
+          label={variables.getMessage('marketplace:product.buttons.remove')}
         />
       ),
       install: (
@@ -52,7 +52,7 @@ class ItemPage extends PureComponent {
           type="settings"
           onClick={() => this.manage('install')}
           icon={<MdLibraryAdd />}
-          label={variables.getMessage('modals.main.marketplace.product.buttons.addtomue')}
+          label={variables.getMessage('marketplace:product.buttons.addtomue')}
         />
       ),
     };
@@ -162,7 +162,7 @@ class ItemPage extends PureComponent {
           <Button
             type="settings"
             onClick={() => this.updateAddon()}
-            label={variables.getMessage('modals.main.addons.product.buttons.update_addon')}
+            label={variables.getMessage('addons:product.buttons.update_addon')}
           />
         </Fragment>
       );
@@ -180,16 +180,16 @@ class ItemPage extends PureComponent {
       );
 
       if (this.props.data.data.sideload === true) {
-        return template(variables.getMessage('modals.main.marketplace.product.sideload_warning'));
+        return template(variables.getMessage('marketplace:product.sideload_warning'));
       }
 
       if (this.props.data.data.image_api === true) {
-        return template(variables.getMessage('modals.main.marketplace.product.third_party_api'));
+        return template(variables.getMessage('marketplace:product.third_party_api'));
       }
 
       if (this.props.data.data.language !== undefined && this.props.data.data.language !== null) {
         if (shortLocale !== this.props.data.data.language) {
-          return template(variables.getMessage('modals.main.marketplace.product.not_in_language'));
+          return template(variables.getMessage('marketplace:product.not_in_language'));
         }
       }
 
@@ -234,7 +234,7 @@ class ItemPage extends PureComponent {
         <Header
           title={
             this.props.addons
-              ? variables.getMessage('modals.main.addons.added')
+              ? variables.getMessage('addons:added')
               : this.props.data.onCollection && this.props.data.data.in_collections?.length > 0
                 ? this.props.data.data.in_collections[0].display_name
                 : variables.getMessage('modals.main.navbar.marketplace')
@@ -252,7 +252,7 @@ class ItemPage extends PureComponent {
             <div className="subHeader">
               {moreInfoItem(
                 <MdAccountCircle />,
-                variables.getMessage('modals.main.marketplace.product.created_by'),
+                variables.getMessage('marketplace:product.created_by'),
                 this.props.data.author,
               )}
               {itemWarning()}
@@ -277,7 +277,7 @@ class ItemPage extends PureComponent {
             )}
             <div className="marketplaceDescription">
               <span className="title">
-                {variables.getMessage('modals.main.marketplace.product.description')}
+                {variables.getMessage('marketplace:product.description')}
               </span>
               <Markdown>{this.props.data.data.description}</Markdown>
             </div>
@@ -286,8 +286,8 @@ class ItemPage extends PureComponent {
                 <table>
                   <tbody>
                     <tr>
-                      <th>{variables.getMessage('modals.main.settings.sections.quote.title')}</th>
-                      <th>{variables.getMessage('modals.main.settings.sections.quote.author')}</th>
+                      <th>{variables.getMessage('settings:sections.quote.title')}</th>
+                      <th>{variables.getMessage('settings:sections.quote.author')}</th>
                     </tr>
                     {this.props.data.data.quotes.slice(0, this.state.count).map((quote, index) => (
                       <tr key={index}>
@@ -300,8 +300,8 @@ class ItemPage extends PureComponent {
                 <div className="showMoreItems">
                   <span className="link" onClick={() => this.incrementCount('quotes')}>
                     {this.state.count !== this.props.data.data.quotes.length
-                      ? variables.getMessage('modals.main.marketplace.product.show_all')
-                      : variables.getMessage('modals.main.marketplace.product.show_less')}
+                      ? variables.getMessage('marketplace:product.show_all')
+                      : variables.getMessage('marketplace:product.show_less')}
                   </span>
                 </div>
               </>
@@ -311,8 +311,8 @@ class ItemPage extends PureComponent {
                 <table>
                   <tbody>
                     <tr>
-                      <th>{variables.getMessage('modals.main.marketplace.product.setting')}</th>
-                      <th>{variables.getMessage('modals.main.marketplace.product.value')}</th>
+                      <th>{variables.getMessage('marketplace:product.setting')}</th>
+                      <th>{variables.getMessage('marketplace:product.value')}</th>
                     </tr>
                     {Object.entries(this.props.data.data.settings)
                       .slice(0, this.state.count)
@@ -327,47 +327,47 @@ class ItemPage extends PureComponent {
                 <div className="showMoreItems">
                   <span className="link" onClick={() => this.incrementCount('settings')}>
                     {this.state.count !== this.props.data.data.settings.length
-                      ? variables.getMessage('modals.main.marketplace.product.show_all')
-                      : variables.getMessage('modals.main.marketplace.product.show_less')}
+                      ? variables.getMessage('marketplace:product.show_all')
+                      : variables.getMessage('marketplace:product.show_less')}
                   </span>
                 </div>
               </>
             )}
             <div className="marketplaceDescription">
               <span className="title">
-                {variables.getMessage('modals.main.marketplace.product.details')}
+                {variables.getMessage('marketplace:product.details')}
               </span>
               <div className="moreInfo">
                 {this.props.data.data.updated_at &&
                   moreInfoItem(
                     <MdCalendarMonth />,
-                    variables.getMessage('modals.main.marketplace.product.updated_at'),
+                    variables.getMessage('marketplace:product.updated_at'),
                     formattedDate,
                   )}
                 {this.props.data.data.quotes &&
                   moreInfoItem(
                     <MdFormatQuote />,
-                    variables.getMessage('modals.main.marketplace.product.no_quotes'),
+                    variables.getMessage('marketplace:product.no_quotes'),
                     this.props.data.data.quotes.length,
                   )}
                 {this.props.data.data.photos &&
                   moreInfoItem(
                     <MdImage />,
-                    variables.getMessage('modals.main.marketplace.product.no_images'),
+                    variables.getMessage('marketplace:product.no_images'),
                     this.props.data.data.photos.length,
                   )}
                 {this.props.data.data.quotes && this.props.data.data.language
                   ? moreInfoItem(
                       <MdTranslate />,
-                      variables.getMessage('modals.main.settings.sections.language.title'),
+                      variables.getMessage('settings:sections.language.title'),
                       languageNames.of(this.props.data.data.language),
                     )
                   : null}
                 {moreInfoItem(
                   <MdStyle />,
-                  variables.getMessage('modals.main.settings.sections.background.type.title'),
+                  variables.getMessage('settings:sections.background.type.title'),
                   variables.getMessage(
-                    'modals.main.marketplace.' + this.getName(this.props.data.data.type),
+                    'marketplace:' + this.getName(this.props.data.data.type),
                   ) || 'marketplace',
                 )}
               </div>
@@ -395,7 +395,7 @@ class ItemPage extends PureComponent {
               ) : (
                 <p style={{ textAlign: 'center' }}>
                   {variables.getMessage(
-                    'modals.main.marketplace.product.buttons.not_available_preview',
+                    'marketplace:product.buttons.not_available_preview',
                   )}
                 </p>
               )}
@@ -419,7 +419,7 @@ class ItemPage extends PureComponent {
                     }
                     icon={<MdFlag />}
                     tooltipTitle={variables.getMessage(
-                      'modals.main.marketplace.product.buttons.report',
+                      'marketplace:product.buttons.report',
                     )}
                     tooltipKey="report"
                   />
@@ -429,7 +429,7 @@ class ItemPage extends PureComponent {
                 <div>
                   <div className="inCollection">
                     <span className="subtitle">
-                      {variables.getMessage('modals.main.marketplace.product.part_of')}
+                      {variables.getMessage('marketplace:product.part_of')}
                     </span>
                     <span
                       className="title"
@@ -451,7 +451,7 @@ class ItemPage extends PureComponent {
         {moreByCurator.length > 1 && (
           <div className="moreFromCurator">
             <span className="title">
-              {variables.getMessage('modals.main.marketplace.product.more_from_curator', {
+              {variables.getMessage('marketplace:product.more_from_curator', {
                 name: this.props.data.author,
               })}
             </span>
diff --git a/src/features/marketplace/views/newItemPage.jsx b/src/features/marketplace/views/newItemPage.jsx
index f1d747c6..868c31b1 100644
--- a/src/features/marketplace/views/newItemPage.jsx
+++ b/src/features/marketplace/views/newItemPage.jsx
@@ -95,16 +95,16 @@ const NewItemPage = () => {
     );
 
     /*if (this.props.data.data.sideload === true) {
-      return template(variables.getMessage('modals.main.marketplace.product.sideload_warning'));
+      return template(variables.getMessage('marketplace:product.sideload_warning'));
     }
 
     if (this.props.data.data.image_api === true) {
-      return template(variables.getMessage('modals.main.marketplace.product.third_party_api'));
+      return template(variables.getMessage('marketplace:product.third_party_api'));
     }
 
     if (this.props.data.data.language !== undefined && this.props.data.data.language !== null) {
       if (shortLocale !== this.props.data.data.language) {
-        return template(variables.getMessage('modals.main.marketplace.product.not_in_language'));
+        return template(variables.getMessage('marketplace:product.not_in_language'));
       }
     }*/
 
@@ -115,39 +115,39 @@ const NewItemPage = () => {
     return (
       <div className="marketplaceDescription">
         <span className="title">
-          {variables.getMessage('modals.main.marketplace.product.details')}
+          {variables.getMessage('marketplace:product.details')}
         </span>
         <div className="moreInfo">
           {item?.updated_at &&
             moreInfoItem(
               <MdCalendarMonth />,
-              variables.getMessage('modals.main.marketplace.product.updated_at'),
+              variables.getMessage('marketplace:product.updated_at'),
               formattedDate,
             )}
           {item?.quotes &&
             moreInfoItem(
               <MdFormatQuote />,
-              variables.getMessage('modals.main.marketplace.product.no_quotes'),
+              variables.getMessage('marketplace:product.no_quotes'),
               item.quotes.length,
             )}
           {item?.photos &&
             moreInfoItem(
               <MdImage />,
-              variables.getMessage('modals.main.marketplace.product.no_images'),
+              variables.getMessage('marketplace:product.no_images'),
               item.photos.length,
             )}
           {item?.quotes && item?.language
             ? moreInfoItem(
                 <MdTranslate />,
-                variables.getMessage('modals.main.settings.sections.language.title'),
+                variables.getMessage('settings:sections.language.title'),
                 languageNames.of(item.language),
               )
             : null}
           {/*{moreInfoItem(
           <MdStyle />,
-          variables.getMessage('modals.main.settings.sections.background.type.title'),
+          variables.getMessage('settings:sections.background.type.title'),
           variables.getMessage(
-            'modals.main.marketplace.' + this.getName(this.props.data.data.type),
+            'marketplace:' + this.getName(this.props.data.data.type),
           ) || 'marketplace',
         )}*/}
         </div>
@@ -163,8 +163,8 @@ const NewItemPage = () => {
             <table>
               <tbody>
                 <tr>
-                  <th>{variables.getMessage('modals.main.settings.sections.quote.title')}</th>
-                  <th>{variables.getMessage('modals.main.settings.sections.quote.author')}</th>
+                  <th>{variables.getMessage('settings:sections.quote.title')}</th>
+                  <th>{variables.getMessage('settings:sections.quote.author')}</th>
                 </tr>
                 {item.quotes.slice(0, count).map((quote, index) => (
                   <tr key={index}>
@@ -177,8 +177,8 @@ const NewItemPage = () => {
             <div className="showMoreItems">
               <span className="link" onClick={() => count === item.quotes.length}>
                 {count !== item.quotes.length
-                  ? variables.getMessage('modals.main.marketplace.product.show_all')
-                  : variables.getMessage('modals.main.marketplace.product.show_less')}
+                  ? variables.getMessage('marketplace:product.show_all')
+                  : variables.getMessage('marketplace:product.show_less')}
               </span>
             </div>
           </>
@@ -189,8 +189,8 @@ const NewItemPage = () => {
             <table>
               <tbody>
                 <tr>
-                  <th>{variables.getMessage('modals.main.marketplace.product.setting')}</th>
-                  <th>{variables.getMessage('modals.main.marketplace.product.value')}</th>
+                  <th>{variables.getMessage('marketplace:product.setting')}</th>
+                  <th>{variables.getMessage('marketplace:product.value')}</th>
                 </tr>
                 {Object.entries(this.props.data.data.settings)
                   .slice(0, this.state.count)
@@ -205,8 +205,8 @@ const NewItemPage = () => {
             <div className="showMoreItems">
               <span className="link" onClick={() => this.incrementCount('settings')}>
                 {this.state.count !== this.props.data.data.settings.length
-                  ? variables.getMessage('modals.main.marketplace.product.show_all')
-                  : variables.getMessage('modals.main.marketplace.product.show_less')}
+                  ? variables.getMessage('marketplace:product.show_all')
+                  : variables.getMessage('marketplace:product.show_less')}
               </span>
             </div>
           </>
@@ -248,7 +248,7 @@ const NewItemPage = () => {
       {/*<Header
         title={
           this.props.addons
-            ? variables.getMessage('modals.main.addons.added')
+            ? variables.getMessage('addons:added')
             : this.props.data.onCollection && this.props.data.data.in_collections?.length > 0
               ? this.props.data.data.in_collections[0].display_name
               : variables.getMessage('modals.main.navbar.marketplace')
@@ -266,7 +266,7 @@ const NewItemPage = () => {
           <div className="subHeader">
             {moreInfoItem(
               <MdAccountCircle />,
-              variables.getMessage('modals.main.marketplace.product.created_by'),
+              variables.getMessage('marketplace:product.created_by'),
               item.author,
             )}
             {itemWarning()}
@@ -291,7 +291,7 @@ const NewItemPage = () => {
           )}*/}
           <div className="marketplaceDescription">
             <span className="title">
-              {variables.getMessage('modals.main.marketplace.product.description')}
+              {variables.getMessage('marketplace:product.description')}
             </span>
             <Markdown>{item.description}</Markdown>
           </div>
@@ -320,12 +320,12 @@ const NewItemPage = () => {
                 type="settings"
                 onClick={() => this.manage('install')}
                 icon={<MdLibraryAdd />}
-                label={variables.getMessage('modals.main.marketplace.product.buttons.addtomue')}
+                label={variables.getMessage('marketplace:product.buttons.addtomue')}
               />
             ) : (
               <p style={{ textAlign: 'center' }}>
                 {variables.getMessage(
-                  'modals.main.marketplace.product.buttons.not_available_preview',
+                  'marketplace:product.buttons.not_available_preview',
                 )}
               </p>
             )}
@@ -349,7 +349,7 @@ const NewItemPage = () => {
                   }
                   icon={<MdFlag />}
                   tooltipTitle={variables.getMessage(
-                    'modals.main.marketplace.product.buttons.report',
+                    'marketplace:product.buttons.report',
                   )}
                   tooltipKey="report"
                 />
@@ -360,7 +360,7 @@ const NewItemPage = () => {
               <div>
                 <div className="inCollection">
                   <span className="subtitle">
-                    {variables.getMessage('modals.main.marketplace.product.part_of')}
+                    {variables.getMessage('marketplace:product.part_of')}
                   </span>
                   <span
                     className="title"
@@ -382,7 +382,7 @@ const NewItemPage = () => {
       {/*{moreByCurator.length > 1 && (
         <div className="moreFromCurator">
           <span className="title">
-            {variables.getMessage('modals.main.marketplace.product.more_from_curator', {
+            {variables.getMessage('marketplace:product.more_from_curator', {
               name: this.props.data.author,
             })}
           </span>
diff --git a/src/features/message/options/MessageOptions.jsx b/src/features/message/options/MessageOptions.jsx
index 237a3faa..1da6e7aa 100644
--- a/src/features/message/options/MessageOptions.jsx
+++ b/src/features/message/options/MessageOptions.jsx
@@ -45,7 +45,7 @@ function MessageOptions() {
   return (
     <>
       <Header
-        title={variables.getMessage('modals.main.settings.sections.message.title')}
+        title={variables.getMessage('settings:sections.message.title')}
         setting="message"
         category="message"
         element=".message"
@@ -59,13 +59,13 @@ function MessageOptions() {
         zoomSetting="zoomMessage"
       >
         <Row final={true}>
-          <Content title={variables.getMessage('modals.main.settings.sections.message.messages')} />
+          <Content title={variables.getMessage('settings:sections.message.messages')} />
           <Action>
             <Button
               type="settings"
               onClick={() => modifyMessage('add')}
               icon={<MdAdd />}
-              label={variables.getMessage('modals.main.settings.sections.message.add')}
+              label={variables.getMessage('settings:sections.message.add')}
             />
           </Action>
         </Row>
@@ -78,12 +78,12 @@ function MessageOptions() {
                 </div>
                 <div className="messageText">
                   <span className="subtitle">
-                    {variables.getMessage('modals.main.settings.sections.message.title')}
+                    {variables.getMessage('settings:sections.message.title')}
                   </span>
                   <TextareaAutosize
                     value={messages[index]}
                     placeholder={variables.getMessage(
-                      'modals.main.settings.sections.message.content',
+                      'settings:sections.message.content',
                     )}
                     onChange={(e) => message(e, true, index)}
                     varient="outlined"
@@ -97,7 +97,7 @@ function MessageOptions() {
                     type="settings"
                     onClick={() => modifyMessage('remove', index)}
                     icon={<MdCancel />}
-                    label={variables.getMessage('modals.main.marketplace.product.buttons.remove')}
+                    label={variables.getMessage('marketplace:product.buttons.remove')}
                   />
 
                 </div>
@@ -110,16 +110,16 @@ function MessageOptions() {
             <div className="emptyNewMessage">
               <MdOutlineTextsms />
               <span className="title">
-                {variables.getMessage('modals.main.settings.sections.message.no_messages')}
+                {variables.getMessage('settings:sections.message.no_messages')}
               </span>
               <span className="subtitle">
-                {variables.getMessage('modals.main.settings.sections.message.add_some')}
+                {variables.getMessage('settings:sections.message.add_some')}
               </span>
               <Button
                 type="settings"
                 onClick={() => modifyMessage('add')}
                 icon={<MdAdd />}
-                label={variables.getMessage('modals.main.settings.sections.message.add')}
+                label={variables.getMessage('settings:sections.message.add')}
               />
             </div>
           </div>
diff --git a/src/features/misc/sections/About.jsx b/src/features/misc/sections/About.jsx
index 70874476..df0a1d27 100644
--- a/src/features/misc/sections/About.jsx
+++ b/src/features/misc/sections/About.jsx
@@ -15,7 +15,7 @@ class About extends PureComponent {
       sponsors: [],
       photographers: [],
       curators: [],
-      update: variables.getMessage('modals.main.settings.sections.about.version.checking_update'),
+      update: variables.getMessage('settings:sections.about.version.checking_update'),
       loading: variables.getMessage('modals.main.loading'),
     };
     this.controller = new AbortController();
@@ -72,9 +72,9 @@ class About extends PureComponent {
       }
 
       return this.setState({
-        update: variables.getMessage('modals.main.settings.sections.about.version.error.title'),
+        update: variables.getMessage('settings:sections.about.version.error.title'),
         loading: variables.getMessage(
-          'modals.main.settings.sections.about.version.error.description',
+          'settings:sections.about.version.error.description',
         ),
       });
     }
@@ -89,13 +89,13 @@ class About extends PureComponent {
 
     const newVersion = versionData[0].tag_name;
 
-    let update = variables.getMessage('modals.main.settings.sections.about.version.no_update');
+    let update = variables.getMessage('settings:sections.about.version.no_update');
     if (
       Number(variables.constants.VERSION.replaceAll('.', '')) <
       Number(newVersion.replaceAll('.', ''))
     ) {
       update = `${variables.getMessage(
-        'modals.main.settings.sections.about.version.update_available',
+        'settings:sections.about.version.update_available',
       )}: ${newVersion}`;
     }
 
@@ -113,8 +113,8 @@ class About extends PureComponent {
   componentDidMount() {
     if (navigator.onLine === false || localStorage.getItem('offlineMode') === 'true') {
       this.setState({
-        update: variables.getMessage('modals.main.marketplace.offline.description'),
-        loading: variables.getMessage('modals.main.marketplace.offline.description'),
+        update: variables.getMessage('marketplace:offline.description'),
+        loading: variables.getMessage('marketplace:offline.description'),
       });
       return;
     }
@@ -141,7 +141,7 @@ class About extends PureComponent {
             <div className="aboutText">
               <span className="title">Mue, by Kaiso</span>
               <span className="subtitle">
-                {variables.getMessage('modals.main.settings.sections.about.version.title')}{' '}
+                {variables.getMessage('settings:sections.about.version.title')}{' '}
                 {variables.constants.VERSION}
               </span>
               <span className="subtitle">({this.state.update})</span>
@@ -187,7 +187,7 @@ class About extends PureComponent {
                 target="_blank"
                 rel="noopener noreferrer"
               >
-                {variables.getMessage('modals.welcome.sections.privacy.links.privacy_policy')}
+                {variables.getMessage('welcome:sections.privacy.links.privacy_policy')}
               </a>
             </span>
           </div>
@@ -195,14 +195,14 @@ class About extends PureComponent {
 
         <div className="settingsRow" style={{ flexFlow: 'column', alignItems: 'flex-start' }}>
           <span className="title">
-            {variables.getMessage('modals.main.settings.sections.about.contact_us')}
+            {variables.getMessage('settings:sections.about.contact_us')}
           </span>
           <div className="aboutContact">
             <Button
               type="linkButton"
               href="https://muetab.com/contact"
               icon={<MdContactPage />}
-              label={variables.getMessage('modals.main.settings.sections.about.form_button')}
+              label={variables.getMessage('settings:sections.about.form_button')}
             />
             <Button
               type="linkIconButton"
@@ -227,15 +227,15 @@ class About extends PureComponent {
 
         <div className="settingsRow" style={{ flexFlow: 'column', alignItems: 'flex-start' }}>
           <span className="title">
-            {variables.getMessage('modals.main.settings.sections.about.support_mue')}
+            {variables.getMessage('settings:sections.about.support_mue')}
           </span>
-          <p>{variables.getMessage('modals.main.settings.sections.about.support_subtitle')}</p>
+          <p>{variables.getMessage('settings:sections.about.support_subtitle')}</p>
           <div className="aboutContact">
             <Button
               type="linkButton"
               href={'https://opencollective.com/' + variables.constants.OPENCOLLECTIVE_USERNAME}
               icon={<BiDonateHeart />}
-              label={variables.getMessage('modals.main.settings.sections.about.support_donate')}
+              label={variables.getMessage('settings:sections.about.support_donate')}
             />
             <Button
               type="linkIconButton"
@@ -257,7 +257,7 @@ class About extends PureComponent {
           style={{ flexFlow: 'column', alignItems: 'flex-start', minHeight: '70px' }}
         >
           <span className="title">
-            {variables.getMessage('modals.main.settings.sections.about.resources_used.title')}
+            {variables.getMessage('settings:sections.about.resources_used.title')}
           </span>
           <span className="subtitle">
             <a
@@ -277,13 +277,13 @@ class About extends PureComponent {
             >
               Unsplash
             </a>{' '}
-            ({variables.getMessage('modals.main.settings.sections.about.resources_used.bg_images')})
+            ({variables.getMessage('settings:sections.about.resources_used.bg_images')})
           </span>
         </div>
 
         <div className="settingsRow" style={{ flexFlow: 'column', alignItems: 'flex-start' }}>
           <span className="title">
-            {variables.getMessage('modals.main.settings.sections.about.contributors')}
+            {variables.getMessage('settings:sections.about.contributors')}
           </span>
           <p>{this.state.loading}</p>
           <div className="contributorImages">
@@ -303,14 +303,14 @@ class About extends PureComponent {
 
         <div className="settingsRow" style={{ flexFlow: 'column', alignItems: 'flex-start' }}>
           <span className="title">
-            {variables.getMessage('modals.main.settings.sections.about.supporters')}
+            {variables.getMessage('settings:sections.about.supporters')}
           </span>
           <p>{this.state.loading}</p>
           <div className="contributorImages">
             {this.state.sponsors.map(({ handle, avatar }) => {
               if (handle === 'empty') {
                 return (
-                  <p>{variables.getMessage('modals.main.settings.sections.about.no_supporters')}</p>
+                  <p>{variables.getMessage('settings:sections.about.no_supporters')}</p>
                 );
               }
 
@@ -337,7 +337,7 @@ class About extends PureComponent {
           }}
         >
           <span className="title">
-            {variables.getMessage('modals.main.settings.sections.about.photographers')}
+            {variables.getMessage('settings:sections.about.photographers')}
           </span>
           {!!this.state.loading ? <p>{this.state.loading}</p> : <></>}
           <ul>
@@ -359,7 +359,7 @@ class About extends PureComponent {
           }}
         >
           <span className="title">
-            {variables.getMessage('modals.main.settings.sections.about.curators')}
+            {variables.getMessage('settings:sections.about.curators')}
           </span>
           {!!this.state.loading ? <p>{this.state.loading}</p> : <></>}
           <ul>
diff --git a/src/features/misc/sections/Advanced.jsx b/src/features/misc/sections/Advanced.jsx
index e0a8662e..e5bb6dfd 100644
--- a/src/features/misc/sections/Advanced.jsx
+++ b/src/features/misc/sections/Advanced.jsx
@@ -22,31 +22,31 @@ import time_zones from 'features/time/timezones.json';
 function AdvancedOptions() {
   const [resetModal, setResetModal] = useState(false);
   const [data, setData] = useState(false);
-  const ADVANCED_SECTION = 'modals.main.settings.sections.advanced';
+  const ADVANCED_SECTION = 'settings:sections.advanced';
   const { subSection } = useTab();
 
   const Data = () => {
     return localStorage.getItem('welcomePreview') !== 'true' ? (
       <Row final={true}>
         <Content
-          title={variables.getMessage('modals.main.settings.sections.advanced.data')}
-          subtitle={variables.getMessage('modals.main.settings.sections.advanced.data_description')}
+          title={variables.getMessage('settings:sections.advanced.data')}
+          subtitle={variables.getMessage('settings:sections.advanced.data_description')}
         />
         <div className="resetDataButtonsLayout">
           <Button
             onClick={() => setResetModal(true)}
             icon={<ResetIcon />}
-            label={variables.getMessage('modals.main.settings.buttons.reset')}
+            label={variables.getMessage('settings:buttons.reset')}
           />
           <Button
             onClick={() => exportSettings()}
             icon={<ExportIcon />}
-            label={variables.getMessage('modals.main.settings.buttons.export')}
+            label={variables.getMessage('settings:buttons.export')}
           />
           <Button
             onClick={() => document.getElementById('file-input').click()}
             icon={<ImportIcon />}
-            label={variables.getMessage('modals.main.settings.buttons.import')}
+            label={variables.getMessage('settings:buttons.import')}
           />
         </div>
         <FileUpload
@@ -64,12 +64,12 @@ function AdvancedOptions() {
 
             <span className="title">
               {variables.getMessage(
-                'modals.main.settings.sections.advanced.preview_data_disabled.title',
+                'settings:sections.advanced.preview_data_disabled.title',
               )}
             </span>
             <span className="subtitle">
               {variables.getMessage(
-                'modals.main.settings.sections.advanced.preview_data_disabled.description',
+                'settings:sections.advanced.preview_data_disabled.description',
               )}
             </span>
           </div>
@@ -120,9 +120,9 @@ function AdvancedOptions() {
           />
           <Row>
             <Content
-              title={variables.getMessage('modals.main.settings.sections.advanced.offline_mode')}
+              title={variables.getMessage('settings:sections.advanced.offline_mode')}
               subtitle={variables.getMessage(
-                'modals.main.settings.sections.advanced.offline_subtitle',
+                'settings:sections.advanced.offline_subtitle',
               )}
             />
             <Action>
@@ -132,9 +132,9 @@ function AdvancedOptions() {
 
           <Row>
             <Content
-              title={variables.getMessage('modals.main.settings.sections.advanced.timezone.title')}
+              title={variables.getMessage('settings:sections.advanced.timezone.title')}
               subtitle={variables.getMessage(
-                'modals.main.settings.sections.advanced.timezone.subtitle',
+                'settings:sections.advanced.timezone.subtitle',
               )}
             />
             <Action>
@@ -145,7 +145,7 @@ function AdvancedOptions() {
                   {
                     value: 'auto',
                     text: variables.getMessage(
-                      'modals.main.settings.sections.advanced.timezone.automatic',
+                      'settings:sections.advanced.timezone.automatic',
                     ),
                   },
                   ...time_zones.map((timezone) => ({ value: timezone, text: timezone })),
@@ -155,9 +155,9 @@ function AdvancedOptions() {
           </Row>
           <Row>
             <Content
-              title={variables.getMessage('modals.main.settings.sections.advanced.tab_name')}
+              title={variables.getMessage('settings:sections.advanced.tab_name')}
               subtitle={variables.getMessage(
-                'modals.main.settings.sections.advanced.tab_name_subtitle',
+                'settings:sections.advanced.tab_name_subtitle',
               )}
             />
             <Action>
@@ -166,9 +166,9 @@ function AdvancedOptions() {
           </Row>
           <Row>
             <Content
-              title={variables.getMessage('modals.main.settings.sections.advanced.custom_css')}
+              title={variables.getMessage('settings:sections.advanced.custom_css')}
               subtitle={variables.getMessage(
-                'modals.main.settings.sections.advanced.custom_css_subtitle',
+                'settings:sections.advanced.custom_css_subtitle',
               )}
             />
             <Action>
@@ -177,15 +177,15 @@ function AdvancedOptions() {
           </Row>
           <Row final={true}>
             <Content
-              title={variables.getMessage('modals.main.settings.sections.experimental.title')}
+              title={variables.getMessage('settings:sections.experimental.title')}
               subtitle={variables.getMessage(
-                'modals.main.settings.sections.advanced.experimental_warning',
+                'settings:sections.advanced.experimental_warning',
               )}
             />
             <Action>
               <Switch
                 name="experimental"
-                text={variables.getMessage('modals.main.settings.enabled')}
+                text={variables.getMessage('settings:enabled')}
                 element=".other"
               />
             </Action>
diff --git a/src/features/misc/sections/Appearance.jsx b/src/features/misc/sections/Appearance.jsx
index 88039f0b..d6e7712d 100644
--- a/src/features/misc/sections/Appearance.jsx
+++ b/src/features/misc/sections/Appearance.jsx
@@ -18,9 +18,9 @@ function AppearanceOptions() {
     return (
       <Row>
         <Content
-          title={variables.getMessage('modals.main.settings.sections.appearance.theme.title')}
+          title={variables.getMessage('settings:sections.appearance.theme.title')}
           subtitle={variables.getMessage(
-            'modals.main.settings.sections.appearance.theme.description',
+            'settings:sections.appearance.theme.description',
           )}
         />
         <Action>
@@ -28,15 +28,15 @@ function AppearanceOptions() {
             name="theme"
             options={[
               {
-                name: variables.getMessage('modals.main.settings.sections.appearance.theme.auto'),
+                name: variables.getMessage('settings:sections.appearance.theme.auto'),
                 value: 'auto',
               },
               {
-                name: variables.getMessage('modals.main.settings.sections.appearance.theme.light'),
+                name: variables.getMessage('settings:sections.appearance.theme.light'),
                 value: 'light',
               },
               {
-                name: variables.getMessage('modals.main.settings.sections.appearance.theme.dark'),
+                name: variables.getMessage('settings:sections.appearance.theme.dark'),
                 value: 'dark',
               },
             ]}
@@ -48,23 +48,23 @@ function AppearanceOptions() {
   };
 
   const FontOptions = () => {
-    const fontWeight = 'modals.main.settings.sections.appearance.font.weight';
+    const fontWeight = 'settings:sections.appearance.font.weight';
     return (
       <Row>
         <Content
-          title={variables.getMessage('modals.main.settings.sections.appearance.font.title')}
+          title={variables.getMessage('settings:sections.appearance.font.title')}
           subtitle={variables.getMessage(
-            'modals.main.settings.sections.appearance.font.description',
+            'settings:sections.appearance.font.description',
           )}
         />
         <Action>
           <Checkbox
             name="fontGoogle"
-            text={variables.getMessage('modals.main.settings.sections.appearance.font.google')}
+            text={variables.getMessage('settings:sections.appearance.font.google')}
             category="other"
           />
           <Text
-            title={variables.getMessage('modals.main.settings.sections.appearance.font.custom')}
+            title={variables.getMessage('settings:sections.appearance.font.custom')}
             name="font"
             upperCaseFirst={true}
             category="other"
@@ -72,7 +72,7 @@ function AppearanceOptions() {
           {/* names are taken from https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight */}
           <Dropdown
             label={variables.getMessage(
-              'modals.main.settings.sections.appearance.font.weight.title',
+              'settings:sections.appearance.font.weight.title',
             )}
             name="fontweight"
             category="other"
@@ -113,7 +113,7 @@ function AppearanceOptions() {
           />
           <Dropdown
             label={variables.getMessage(
-              'modals.main.settings.sections.appearance.font.style.title',
+              'settings:sections.appearance.font.style.title',
             )}
             name="fontstyle"
             category="other"
@@ -121,19 +121,19 @@ function AppearanceOptions() {
               {
                 value: 'normal',
                 text: variables.getMessage(
-                  'modals.main.settings.sections.appearance.font.style.normal',
+                  'settings:sections.appearance.font.style.normal',
                 ),
               },
               {
                 value: 'italic',
                 text: variables.getMessage(
-                  'modals.main.settings.sections.appearance.font.style.italic',
+                  'settings:sections.appearance.font.style.italic',
                 ),
               },
               {
                 value: 'oblique',
                 text: variables.getMessage(
-                  'modals.main.settings.sections.appearance.font.style.oblique',
+                  'settings:sections.appearance.font.style.oblique',
                 ),
               },
             ]}
@@ -147,9 +147,9 @@ function AppearanceOptions() {
     return (
       <Row final={true}>
         <Content
-          title={variables.getMessage('modals.main.settings.sections.appearance.style.title')}
+          title={variables.getMessage('settings:sections.appearance.style.title')}
           subtitle={variables.getMessage(
-            'modals.main.settings.sections.appearance.style.description',
+            'settings:sections.appearance.style.description',
           )}
         />
         <Action>
@@ -158,11 +158,11 @@ function AppearanceOptions() {
             element=".other"
             options={[
               {
-                name: variables.getMessage('modals.main.settings.sections.appearance.style.legacy'),
+                name: variables.getMessage('settings:sections.appearance.style.legacy'),
                 value: 'legacy',
               },
               {
-                name: variables.getMessage('modals.main.settings.sections.appearance.style.new'),
+                name: variables.getMessage('settings:sections.appearance.style.new'),
                 value: 'new',
               },
             ]}
@@ -178,16 +178,16 @@ function AppearanceOptions() {
       <Row final={true}>
         <Content
           title={variables.getMessage(
-            'modals.main.settings.sections.appearance.accessibility.title',
+            'settings:sections.appearance.accessibility.title',
           )}
           subtitle={variables.getMessage(
-            'modals.main.settings.sections.appearance.accessibility.description',
+            'settings:sections.appearance.accessibility.description',
           )}
         />
         <Action>
           <Dropdown
             label={variables.getMessage(
-              'modals.main.settings.sections.appearance.accessibility.text_shadow.title',
+              'settings:sections.appearance.accessibility.text_shadow.title',
             )}
             name="textBorder"
             category="other"
@@ -195,33 +195,33 @@ function AppearanceOptions() {
               {
                 value: 'new',
                 text: variables.getMessage(
-                  'modals.main.settings.sections.appearance.accessibility.text_shadow.new',
+                  'settings:sections.appearance.accessibility.text_shadow.new',
                 ),
               },
               {
                 value: 'true',
                 text: variables.getMessage(
-                  'modals.main.settings.sections.appearance.accessibility.text_shadow.old',
+                  'settings:sections.appearance.accessibility.text_shadow.old',
                 ),
               },
               {
                 value: 'none',
                 text: variables.getMessage(
-                  'modals.main.settings.sections.appearance.accessibility.text_shadow.none',
+                  'settings:sections.appearance.accessibility.text_shadow.none',
                 ),
               },
             ]}
           />
           <Checkbox
             text={variables.getMessage(
-              'modals.main.settings.sections.appearance.accessibility.animations',
+              'settings:sections.appearance.accessibility.animations',
             )}
             name="animations"
             category="other"
           />
           <Slider
             title={variables.getMessage(
-              'modals.main.settings.sections.appearance.accessibility.toast_duration',
+              'settings:sections.appearance.accessibility.toast_duration',
             )}
             name="toastDisplayTime"
             default="2500"
@@ -232,7 +232,7 @@ function AppearanceOptions() {
             display={
               ' ' +
               variables.getMessage(
-                'modals.main.settings.sections.appearance.accessibility.milliseconds',
+                'settings:sections.appearance.accessibility.milliseconds',
               )
             }
           />
@@ -245,9 +245,9 @@ function AppearanceOptions() {
   if (accessibility) {
     header = (
       <Header
-        title={variables.getMessage('modals.main.settings.sections.appearance.title')}
+        title={variables.getMessage('settings:sections.appearance.title')}
         secondaryTitle={variables.getMessage(
-          'modals.main.settings.sections.appearance.accessibility.title',
+          'settings:sections.appearance.accessibility.title',
         )}
         goBack={() => setAccessibility(false)}
         report={false}
@@ -256,7 +256,7 @@ function AppearanceOptions() {
   } else {
     header = (
       <Header
-        title={variables.getMessage('modals.main.settings.sections.appearance.title')}
+        title={variables.getMessage('settings:sections.appearance.title')}
         report={false}
       />
     );
@@ -271,10 +271,10 @@ function AppearanceOptions() {
           <Section
             id="accessibility"
             title={variables.getMessage(
-              'modals.main.settings.sections.appearance.accessibility.title',
+              'settings:sections.appearance.accessibility.title',
             )}
             subtitle={variables.getMessage(
-              'modals.main.settings.sections.appearance.accessibility.description',
+              'settings:sections.appearance.accessibility.description',
             )}
             icon={<MdAccessibility />}
             onClick={() => setAccessibility(true)}
diff --git a/src/features/misc/sections/Changelog.jsx b/src/features/misc/sections/Changelog.jsx
index e0a1fe2c..f89e511a 100644
--- a/src/features/misc/sections/Changelog.jsx
+++ b/src/features/misc/sections/Changelog.jsx
@@ -76,9 +76,9 @@ function Changelog() {
     return errorMessage(
       <>
         <MdOutlineWifiOff />
-        <h1>{variables.getMessage('modals.main.marketplace.offline.title')}</h1>
+        <h1>{variables.getMessage('marketplace:offline.title')}</h1>
         <p className="description">
-          {variables.getMessage('modals.main.marketplace.offline.description')}
+          {variables.getMessage('marketplace:offline.description')}
         </p>
       </>,
     );
diff --git a/src/features/misc/sections/Experimental.jsx b/src/features/misc/sections/Experimental.jsx
index 88e6e965..b1256716 100644
--- a/src/features/misc/sections/Experimental.jsx
+++ b/src/features/misc/sections/Experimental.jsx
@@ -17,14 +17,14 @@ function ExperimentalOptions() {
   return (
     <>
       <span className="mainTitle">
-        {variables.getMessage('modals.main.settings.sections.experimental.title')}
+        {variables.getMessage('settings:sections.experimental.title')}
       </span>
       <span className="subtitle">
-        {variables.getMessage('modals.main.settings.sections.experimental.warning')}
+        {variables.getMessage('settings:sections.experimental.warning')}
       </span>
       <Row>
         <Content
-          title={variables.getMessage('modals.main.settings.sections.experimental.developer')}
+          title={variables.getMessage('settings:sections.experimental.developer')}
         />
         <Action>
           <Checkbox name="debug" text="Debug hotkey (Ctrl + #)" element=".other" />
diff --git a/src/features/misc/sections/Language.jsx b/src/features/misc/sections/Language.jsx
index f6b907c2..9981a128 100644
--- a/src/features/misc/sections/Language.jsx
+++ b/src/features/misc/sections/Language.jsx
@@ -37,7 +37,7 @@ function LanguageOptions() {
     <>
       <div className="modalHeader">
         <span className="mainTitle">
-          {variables.getMessage('modals.main.settings.sections.language.title')}
+          {variables.getMessage('settings:sections.language.title')}
         </span>
         <div className="headerActions">
           <a
@@ -55,7 +55,7 @@ function LanguageOptions() {
         <Radio name="language" options={languages} element=".other" />
       </div>
       <span className="mainTitle">
-        {variables.getMessage('modals.main.settings.sections.language.quote')}
+        {variables.getMessage('settings:sections.language.quote')}
       </span>
       <div className="languageSettings">
         <Radio
diff --git a/src/features/misc/sections/Overview.jsx b/src/features/misc/sections/Overview.jsx
index 8c1851b5..070cddbc 100644
--- a/src/features/misc/sections/Overview.jsx
+++ b/src/features/misc/sections/Overview.jsx
@@ -16,12 +16,12 @@ import EventBus from 'utils/eventbus';
 import defaults from 'config/default';
 
 const widget_name = {
-  greeting: variables.getMessage('modals.main.settings.sections.greeting.title'),
-  time: variables.getMessage('modals.main.settings.sections.time.title'),
-  quicklinks: variables.getMessage('modals.main.settings.sections.quicklinks.title'),
-  quote: variables.getMessage('modals.main.settings.sections.quote.title'),
-  date: variables.getMessage('modals.main.settings.sections.date.title'),
-  message: variables.getMessage('modals.main.settings.sections.message.title'),
+  greeting: variables.getMessage('settings:sections.greeting.title'),
+  time: variables.getMessage('settings:sections.time.title'),
+  quicklinks: variables.getMessage('settings:sections.quicklinks.title'),
+  quote: variables.getMessage('settings:sections.quote.title'),
+  date: variables.getMessage('settings:sections.date.title'),
+  message: variables.getMessage('settings:sections.message.title'),
 };
 
 const SortableItem = sortableElement(({ value }) => (
@@ -96,11 +96,11 @@ const Overview = () => {
   return (
     <>
       <span className="mainTitle">
-        {variables.getMessage('modals.main.marketplace.product.overview')}
+        {variables.getMessage('marketplace:product.overview')}
       </span>
       <div className="overviewGrid">
         <div>
-          <span className="title">{variables.getMessage('modals.welcome.buttons.preview')}</span>
+          <span className="title">{variables.getMessage('welcome:buttons.preview')}</span>
           <div className="tabPreview">
             <div className="previewItem" style={{ maxWidth: '50%' }}>
               {items.map((value, index) => {
@@ -118,7 +118,7 @@ const Overview = () => {
         </div>
         <div>
           <span className="title">
-            {variables.getMessage('modals.main.settings.sections.order.title')}
+            {variables.getMessage('settings:sections.order.title')}
           </span>
           <SortableContainer
             onSortEnd={onSortEnd}
diff --git a/src/features/misc/views/Addons.jsx b/src/features/misc/views/Addons.jsx
index 0512ef93..b7f303cf 100644
--- a/src/features/misc/views/Addons.jsx
+++ b/src/features/misc/views/Addons.jsx
@@ -8,9 +8,9 @@ function Addons(props) {
   return (
     {
       /*<Tabs changeTab={(type) => props.changeTab(type)} current="addons" modalClose={props.modalClose}>
-      <div label={variables.getMessage('modals.main.addons.added')} name="added">
+      <div label={variables.getMessage('addons:added')} name="added">
       </div>
-      <div label={variables.getMessage('modals.main.addons.create.title')} name="create">
+      <div label={variables.getMessage('addons:create.title')} name="create">
         <Create />
       </div>
     </Tabs>*/
diff --git a/src/features/misc/views/Marketplace.jsx b/src/features/misc/views/Marketplace.jsx
index 37859ff0..8ba726c0 100644
--- a/src/features/misc/views/Marketplace.jsx
+++ b/src/features/misc/views/Marketplace.jsx
@@ -48,22 +48,22 @@ function Marketplace(props) {
   return (
     {
       /*<Tabs changeTab={(type) => props.changeTab(type)} current="marketplace" modalClose={props.modalClose}>
-      <div label={variables.getMessage('modals.main.marketplace.all')} name="all">
+      <div label={variables.getMessage('marketplace:all')} name="all">
         <MarketplaceTab type="all" />
       </div>
-      <div label={variables.getMessage('modals.main.marketplace.photo_packs')} name="photo_packs">
+      <div label={variables.getMessage('marketplace:photo_packs')} name="photo_packs">
         <MarketplaceTab type="photo_packs" />
       </div>
-      <div label={variables.getMessage('modals.main.marketplace.quote_packs')} name="quote_packs">
+      <div label={variables.getMessage('marketplace:quote_packs')} name="quote_packs">
         <MarketplaceTab type="quote_packs" />
       </div>
       <div
-        label={variables.getMessage('modals.main.marketplace.preset_settings')}
+        label={variables.getMessage('marketplace:preset_settings')}
         name="preset_settings"
       >
         <MarketplaceTab type="preset_settings" />
       </div>
-      <div label={variables.getMessage('modals.main.marketplace.collections')} name="collections">
+      <div label={variables.getMessage('marketplace:collections')} name="collections">
         <MarketplaceTab type="collections" />
       </div>
     </Tabs>*/
diff --git a/src/features/misc/views/Settings.jsx b/src/features/misc/views/Settings.jsx
index 99ed05cd..f15720d7 100644
--- a/src/features/misc/views/Settings.jsx
+++ b/src/features/misc/views/Settings.jsx
@@ -25,68 +25,68 @@ import {
 } from '../sections';
 
 const sections = [
-  { label: 'modals.main.marketplace.product.overview', name: 'order', component: Overview },
+  { label: 'marketplace:product.overview', name: 'order', component: Overview },
   {
-    label: 'modals.main.settings.sections.appearance.navbar.title',
+    label: 'settings:sections.appearance.navbar.title',
     name: 'navbar',
     component: NavbarOptions,
   },
   {
-    label: 'modals.main.settings.sections.greeting.title',
+    label: 'settings:sections.greeting.title',
     name: 'greeting',
     component: GreetingOptions,
   },
-  { label: 'modals.main.settings.sections.time.title', name: 'time', component: TimeOptions },
+  { label: 'settings:sections.time.title', name: 'time', component: TimeOptions },
   {
-    label: 'modals.main.settings.sections.quicklinks.title',
+    label: 'settings:sections.quicklinks.title',
     name: 'quicklinks',
     component: QuickLinksOptions,
   },
-  { label: 'modals.main.settings.sections.quote.title', name: 'quote', component: QuoteOptions },
-  { label: 'modals.main.settings.sections.date.title', name: 'date', component: DateOptions },
+  { label: 'settings:sections.quote.title', name: 'quote', component: QuoteOptions },
+  { label: 'settings:sections.date.title', name: 'date', component: DateOptions },
   {
-    label: 'modals.main.settings.sections.message.title',
+    label: 'settings:sections.message.title',
     name: 'message',
     component: MessageOptions,
   },
   {
-    label: 'modals.main.settings.sections.background.title',
+    label: 'settings:sections.background.title',
     name: 'background',
     component: BackgroundOptions,
   },
-  { label: 'modals.main.settings.sections.search.title', name: 'search', component: SearchOptions },
+  { label: 'settings:sections.search.title', name: 'search', component: SearchOptions },
   {
-    label: 'modals.main.settings.sections.weather.title',
+    label: 'settings:sections.weather.title',
     name: 'weather',
     component: WeatherOptions,
   },
   {
-    label: 'modals.main.settings.sections.appearance.title',
+    label: 'settings:sections.appearance.title',
     name: 'appearance',
     component: AppearanceOptions,
   },
   {
-    label: 'modals.main.settings.sections.language.title',
+    label: 'settings:sections.language.title',
     name: 'language',
     component: LanguageOptions,
   },
   {
-    label: 'modals.main.settings.sections.advanced.title',
+    label: 'settings:sections.advanced.title',
     name: 'advanced',
     component: AdvancedOptions,
   },
-  { label: 'modals.main.settings.sections.stats.title', name: 'stats', component: Stats },
+  { label: 'settings:sections.stats.title', name: 'stats', component: Stats },
   {
-    label: 'modals.main.settings.sections.experimental.title',
+    label: 'settings:sections.experimental.title',
     name: 'experimental',
     component: ExperimentalOptions,
   },
   {
-    label: 'modals.main.settings.sections.changelog.title',
+    label: 'settings:sections.changelog.title',
     name: 'changelog',
     component: Changelog,
   },
-  { label: 'modals.main.settings.sections.about.title', name: 'about', component: About },
+  { label: 'settings:sections.about.title', name: 'about', component: About },
 ];
 
 function Settings(props) {
diff --git a/src/features/modals/main/settings/sections/quicklinks/QuickLink.jsx b/src/features/modals/main/settings/sections/quicklinks/QuickLink.jsx
index 9ed368d1..5808254b 100644
--- a/src/features/modals/main/settings/sections/quicklinks/QuickLink.jsx
+++ b/src/features/modals/main/settings/sections/quicklinks/QuickLink.jsx
@@ -56,13 +56,13 @@ const QuickLink = ({ item, deleteLink, startEditLink }) => {
             type="settings"
             onClick={() => startEditLink(item)}
             icon={<MdEdit />}
-            label={variables.getMessage('modals.main.settings.sections.quicklinks.edit')}
+            label={variables.getMessage('settings:sections.quicklinks.edit')}
           />
           <Button
             type="settings"
             onClick={(e) => deleteLink(item.key, e)}
             icon={<MdCancel />}
-            label={variables.getMessage('modals.main.marketplace.product.buttons.remove')}
+            label={variables.getMessage('marketplace:product.buttons.remove')}
           />
         </div>
       </div>
diff --git a/src/features/navbar/Navbar.jsx b/src/features/navbar/Navbar.jsx
index a21a6af7..2fbb081c 100644
--- a/src/features/navbar/Navbar.jsx
+++ b/src/features/navbar/Navbar.jsx
@@ -26,7 +26,8 @@ class Navbar extends PureComponent {
 
   setZoom() {
     this.setState({
-      zoomFontSize: Number(((localStorage.getItem('zoomNavbar') || defaults.zoomNavbar) / 100) * 1.2) + 'rem',
+      zoomFontSize:
+        Number(((localStorage.getItem('zoomNavbar') || defaults.zoomNavbar) / 100) * 1.2) + 'rem',
     });
   }
 
@@ -34,20 +35,20 @@ class Navbar extends PureComponent {
     let refreshText;
     switch (this.state.refreshOption) {
       case 'background':
-        refreshText = variables.getMessage('modals.main.settings.sections.background.title');
+        refreshText = variables.getMessage('settings:sections.background.title');
         break;
       case 'quote':
-        refreshText = variables.getMessage('modals.main.settings.sections.quote.title');
+        refreshText = variables.getMessage('settings:sections.quote.title');
         break;
       case 'quotebackground':
         refreshText =
-          variables.getMessage('modals.main.settings.sections.quote.title') +
+          variables.getMessage('settings:sections.quote.title') +
           ' ' +
-          variables.getMessage('modals.main.settings.sections.background.title');
+          variables.getMessage('settings:sections.background.title');
         break;
       default:
         refreshText = variables.getMessage(
-          'modals.main.settings.sections.appearance.navbar.refresh_options.page',
+          'settings:sections.appearance.navbar.refresh_options.page',
         );
         break;
     }
@@ -118,21 +119,23 @@ class Navbar extends PureComponent {
           {this.state.refreshEnabled !== 'false' && <Refresh fontSize={this.state.zoomFontSize} />}
 
           <Tooltip
-            title={variables.getMessage('modals.main.navbar.settings', {
-              type: variables.getMessage(
-                'modals.main.navbar.tooltips.refresh_' + this.refreshValue,
-              ),
-            })}
+          // FIXME: doesn't exist
+          // title={variables.getMessage('modals.main.navbar.settings', {
+          //   type: variables.getMessage(
+          //     'modals.main.navbar.tooltips.refresh_' + this.refreshValue,
+          //   ),
+          // })}
           >
             <button
               className="navbarButton"
               onClick={() => this.props.openModal('mainModal')}
               style={{ fontSize: this.state.zoomFontSize }}
-              aria-label={variables.getMessage('modals.main.navbar.settings', {
-                type: variables.getMessage(
-                  'modals.main.navbar.tooltips.refresh_' + this.refreshValue,
-                ),
-              })}
+              // FIXME: and here
+              // aria-label={variables.getMessage('modals.main.navbar.settings', {
+              //   type: variables.getMessage(
+              //     'modals.main.navbar.tooltips.refresh_' + this.refreshValue,
+              //   ),
+              // })}
             >
               <MdSettings className="settings-icon topicons" />
             </button>
diff --git a/src/features/navbar/components/Maximise.jsx b/src/features/navbar/components/Maximise.jsx
index 15472656..87c101cc 100644
--- a/src/features/navbar/components/Maximise.jsx
+++ b/src/features/navbar/components/Maximise.jsx
@@ -61,12 +61,12 @@ function Maximise(props) {
   };
 
   return (
-    <Tooltip title={variables.getMessage('modals.main.settings.sections.background.buttons.view')}>
+    <Tooltip title={variables.getMessage('settings:sections.background.buttons.view')}>
       <button
         className="navbarButton"
         style={{ fontSize: props.fontSize }}
         onClick={maximise}
-        aria-label={variables.getMessage('modals.main.settings.sections.background.buttons.view')}
+        aria-label={variables.getMessage('settings:sections.background.buttons.view')}
       >
         <MdCropFree className="topicons" />
       </button>
diff --git a/src/features/navbar/components/Refresh.jsx b/src/features/navbar/components/Refresh.jsx
index 9f7163df..51e09888 100644
--- a/src/features/navbar/components/Refresh.jsx
+++ b/src/features/navbar/components/Refresh.jsx
@@ -24,10 +24,10 @@ function Refresh() {
     let text;
     switch (refreshOption) {
       case 'background':
-        text = variables.getMessage('modals.main.settings.sections.background.title');
+        text = variables.getMessage('settings:sections.background.title');
         break;
       case 'quote':
-        text = variables.getMessage('modals.main.settings.sections.quote.title');
+        text = variables.getMessage('settings:sections.quote.title');
         break;
       case 'quotebackground':
         text = new Intl.ListFormat(
@@ -37,13 +37,13 @@ function Refresh() {
             type: 'conjunction',
           },
         ).format([
-          variables.getMessage('modals.main.settings.sections.quote.title'),
-          variables.getMessage('modals.main.settings.sections.background.title'),
+          variables.getMessage('settings:sections.quote.title'),
+          variables.getMessage('settings:sections.background.title'),
         ]);
         break;
       default:
         text = variables.getMessage(
-          'modals.main.settings.sections.appearance.navbar.refresh_options.page',
+          'settings:sections.appearance.navbar.refresh_options.page',
         );
         break;
     }
diff --git a/src/features/navbar/components/Todo.jsx b/src/features/navbar/components/Todo.jsx
index 018680f5..20a2fcfe 100644
--- a/src/features/navbar/components/Todo.jsx
+++ b/src/features/navbar/components/Todo.jsx
@@ -185,7 +185,7 @@ class Todo extends PureComponent {
                         {variables.getMessage('widgets.navbar.todo.no_todos')}
                       </span>
                       <span className="subtitle">
-                        {variables.getMessage('modals.main.settings.sections.message.add_some')}
+                        {variables.getMessage('settings:sections.message.add_some')}
                       </span>
                     </div>
                   </div>
@@ -218,7 +218,7 @@ class Todo extends PureComponent {
                             />
                             <Tooltip
                               title={variables.getMessage(
-                                'modals.main.marketplace.product.buttons.remove',
+                                'marketplace:product.buttons.remove',
                               )}
                             >
                               <MdDelete onClick={() => this.updateTodo('remove', index)} />
diff --git a/src/features/navbar/options/AppsOptions.jsx b/src/features/navbar/options/AppsOptions.jsx
index ce76852a..67814a0f 100644
--- a/src/features/navbar/options/AppsOptions.jsx
+++ b/src/features/navbar/options/AppsOptions.jsx
@@ -111,7 +111,7 @@ function AppsOptions({ appsEnabled }) {
         <Content
           title={variables.getMessage('widgets.navbar.apps.title')}
           subtitle={variables.getMessage(
-            'modals.main.settings.sections.appearance.navbar.apps_subtitle',
+            'settings:sections.appearance.navbar.apps_subtitle',
           )}
         />
         <Action>
@@ -119,7 +119,7 @@ function AppsOptions({ appsEnabled }) {
             type="settings"
             onClick={() => setAppsModalInfo((oldState) => ({ ...oldState, newLink: true }))}
             icon={<MdAddLink />}
-            label={variables.getMessage('modals.main.settings.sections.quicklinks.add_link')}
+            label={variables.getMessage('settings:sections.quicklinks.add_link')}
           />
         </Action>
       </Row>
diff --git a/src/features/navbar/options/NavbarOptions.jsx b/src/features/navbar/options/NavbarOptions.jsx
index cc205a8a..3d56b0e5 100644
--- a/src/features/navbar/options/NavbarOptions.jsx
+++ b/src/features/navbar/options/NavbarOptions.jsx
@@ -19,15 +19,15 @@ function NavbarOptions() {
   );
   const [appsEnabled, setAppsEnabled] = useState(localStorage.getItem('appsEnabled') === 'true' || defaults.appsEnabled);
 
-  const NAVBAR_SECTION = 'modals.main.settings.sections.appearance.navbar';
+  const NAVBAR_SECTION = 'settings:sections.appearance.navbar';
 
   const AdditionalSettings = () => {
     return (
       <Row final={false}>
         <Content
-          title={variables.getMessage('modals.main.settings.additional_settings')}
+          title={variables.getMessage('settings:additional_settings')}
           subtitle={variables.getMessage(
-            'modals.main.settings.sections.appearance.navbar.additional',
+            'settings:sections.appearance.navbar.additional',
           )}
         />
         <Action>
@@ -78,7 +78,7 @@ function NavbarOptions() {
       {
         icon: <MdCropFree />,
         settingName: 'view',
-        messageKey: 'modals.main.settings.sections.background.buttons.view',
+        messageKey: 'settings:sections.background.buttons.view',
       },
       {
         icon: <MdAssignment />,
@@ -105,7 +105,7 @@ function NavbarOptions() {
     return (
       <Row>
         <Content
-          title={variables.getMessage('modals.main.settings.sections.appearance.navbar.widgets')}
+          title={variables.getMessage('settings:sections.appearance.navbar.widgets')}
         />
         <Action>
           <div className="navbarButtonOptions">
@@ -124,7 +124,7 @@ function NavbarOptions() {
         <Content
           title={variables.getMessage(`${NAVBAR_SECTION}.refresh`)}
           subtitle={variables.getMessage(
-            'modals.main.settings.sections.appearance.navbar.refresh_subtitle',
+            'settings:sections.appearance.navbar.refresh_subtitle',
           )}
         />
         <Action>
@@ -135,23 +135,23 @@ function NavbarOptions() {
               {
                 value: 'page',
                 text: variables.getMessage(
-                  'modals.main.settings.sections.appearance.navbar.refresh_options.page',
+                  'settings:sections.appearance.navbar.refresh_options.page',
                 ),
               },
               {
                 value: 'background',
-                text: variables.getMessage('modals.main.settings.sections.background.title'),
+                text: variables.getMessage('settings:sections.background.title'),
               },
               {
                 value: 'quote',
-                text: variables.getMessage('modals.main.settings.sections.quote.title'),
+                text: variables.getMessage('settings:sections.quote.title'),
               },
               {
                 value: 'quotebackground',
                 text:
-                  variables.getMessage('modals.main.settings.sections.quote.title') +
+                  variables.getMessage('settings:sections.quote.title') +
                   ' + ' +
-                  variables.getMessage('modals.main.settings.sections.background.title'),
+                  variables.getMessage('settings:sections.background.title'),
               },
             ]}
           />
diff --git a/src/features/quicklinks/options/QuickLink.jsx b/src/features/quicklinks/options/QuickLink.jsx
index 21334557..32299e1c 100644
--- a/src/features/quicklinks/options/QuickLink.jsx
+++ b/src/features/quicklinks/options/QuickLink.jsx
@@ -56,13 +56,13 @@ const QuickLink = ({ item, deleteLink, startEditLink }) => {
             type="settings"
             onClick={() => startEditLink(item)}
             icon={<MdEdit />}
-            label={variables.getMessage('modals.main.settings.sections.quicklinks.edit')}
+            label={variables.getMessage('settings:sections.quicklinks.edit')}
           />
           <Button
             type="settings"
             onClick={(e) => deleteLink(item.key, e)}
             icon={<MdCancel />}
-            label={variables.getMessage('modals.main.marketplace.product.buttons.remove')}
+            label={variables.getMessage('marketplace:product.buttons.remove')}
           />
         </div>
       </div>
diff --git a/src/features/quicklinks/options/QuickLinksOptions.jsx b/src/features/quicklinks/options/QuickLinksOptions.jsx
index cb213894..cd6ea767 100644
--- a/src/features/quicklinks/options/QuickLinksOptions.jsx
+++ b/src/features/quicklinks/options/QuickLinksOptions.jsx
@@ -124,13 +124,13 @@ class QuickLinksOptions extends PureComponent {
   }
 
   render() {
-    const QUICKLINKS_SECTION = 'modals.main.settings.sections.quicklinks';
+    const QUICKLINKS_SECTION = 'settings:sections.quicklinks';
 
     const AdditionalSettings = () => {
       return (
         <Row>
           <Content
-            title={variables.getMessage('modals.main.settings.additional_settings')}
+            title={variables.getMessage('settings:additional_settings')}
             subtitle={variables.getMessage(`${QUICKLINKS_SECTION}.additional`)}
           />
           <Action>
@@ -155,7 +155,7 @@ class QuickLinksOptions extends PureComponent {
           <Content
             title={variables.getMessage(`${QUICKLINKS_SECTION}.styling`)}
             subtitle={variables.getMessage(
-              'modals.main.settings.sections.quicklinks.styling_description',
+              'settings:sections.quicklinks.styling_description',
             )}
           />
           <Action>
@@ -227,7 +227,7 @@ class QuickLinksOptions extends PureComponent {
                   {variables.getMessage(`${QUICKLINKS_SECTION}.no_quicklinks`)}
                 </span>
                 <span className="subtitle">
-                  {variables.getMessage('modals.main.settings.sections.message.add_some')}
+                  {variables.getMessage('settings:sections.message.add_some')}
                 </span>
                 <Button
                   type="settings"
diff --git a/src/features/quote/Quote.jsx b/src/features/quote/Quote.jsx
index c15fd967..054f7dbf 100644
--- a/src/features/quote/Quote.jsx
+++ b/src/features/quote/Quote.jsx
@@ -110,7 +110,7 @@ class Quote extends PureComponent {
   getAuthorLink(author) {
     return localStorage.getItem('authorLink') === 'false' || author === 'Unknown'
       ? null
-      : `https://${variables.locale_id.split('_')[0]}.wikipedia.org/wiki/${author
+      : `https://${variables.locale_id.split('-')[0]}.wikipedia.org/wiki/${author
           .split(' ')
           .join('_')}`;
   }
@@ -131,7 +131,7 @@ class Quote extends PureComponent {
     const authorimgdata = await (
       await fetch(
         `https://${
-          variables.locale_id.split('_')[0]
+          variables.locale_id.split('-')[0]
         }.wikipedia.org/w/api.php?action=query&titles=${author}&origin=*&prop=pageimages&format=json&pithumbsize=100`,
       )
     ).json();
@@ -144,7 +144,7 @@ class Quote extends PureComponent {
       const authorimglicensedata = await (
         await fetch(
           `https://${
-            variables.locale_id.split('_')[0]
+            variables.locale_id.split('-')[0]
           }.wikipedia.org/w/api.php?action=query&prop=imageinfo&iiprop=extmetadata&titles=File:${
             authorPage.pageimage
           }&origin=*&format=json`,
@@ -278,7 +278,7 @@ class Quote extends PureComponent {
         const getAPIQuoteData = async () => {
           const quoteLanguage = localStorage.getItem('quoteLanguage');
           const data = await (
-            await fetch(variables.constants.API_URL + '/quotes/random?language=' + quoteLanguage)
+            await fetch(`${variables.constants.API_URL}/quotes/random?language=${quoteLanguage || 'en'}`)
           ).json();
           // If we hit the ratelimit, we fall back to local quotes
           if (data.statusCode === 429) {
diff --git a/src/features/quote/options/Custom.jsx b/src/features/quote/options/Custom.jsx
index 88cc9897..12a86fbc 100644
--- a/src/features/quote/options/Custom.jsx
+++ b/src/features/quote/options/Custom.jsx
@@ -38,7 +38,7 @@ function CustomSettings() {
     return data;
   }
 
-  const QUOTE_SECTION = 'modals.main.settings.sections.quote';
+  const QUOTE_SECTION = 'settings:sections.quote';
 
   return (
     <>
@@ -67,14 +67,14 @@ function CustomSettings() {
               <div className="messageText">
                 <TextareaAutosize
                   value={customQuote[index].quote}
-                  placeholder={variables.getMessage('modals.main.settings.sections.quote.title')}
+                  placeholder={variables.getMessage('settings:sections.quote.title')}
                   onChange={(e) => handleCustomQuote(e, index, 'quote')}
                   varient="outlined"
                   style={{ fontSize: '22px', fontWeight: 'bold' }}
                 />
                 <TextareaAutosize
                   value={customQuote[index].author}
-                  placeholder={variables.getMessage('modals.main.settings.sections.quote.author')}
+                  placeholder={variables.getMessage('settings:sections.quote.author')}
                   className="subtitle"
                   onChange={(e) => handleCustomQuote(e, index, 'author')}
                   varient="outlined"
@@ -86,7 +86,7 @@ function CustomSettings() {
                     type="settings"
                     onClick={() => modifyCustomQuote('remove', index)}
                     icon={<MdCancel />}
-                    label={variables.getMessage('modals.main.marketplace.product.buttons.remove')}
+                    label={variables.getMessage('marketplace:product.buttons.remove')}
                   />
                 </div>
               </div>
@@ -99,7 +99,7 @@ function CustomSettings() {
             <MdOutlineFormatQuote />
             <span className="title">{variables.getMessage(`${QUOTE_SECTION}.no_quotes`)}</span>
             <span className="subtitle">
-              {variables.getMessage('modals.main.settings.sections.message.add_some')}
+              {variables.getMessage('settings:sections.message.add_some')}
             </span>
             <Button
               type="settings"
diff --git a/src/features/quote/options/QuoteOptions.jsx b/src/features/quote/options/QuoteOptions.jsx
index aa3381b1..a720d2e2 100644
--- a/src/features/quote/options/QuoteOptions.jsx
+++ b/src/features/quote/options/QuoteOptions.jsx
@@ -30,14 +30,14 @@ const QuoteOptions = () => {
     localStorage.setItem('quoteType', quoteType);
   }, [quoteType]);
 
-  const QUOTE_SECTION = 'modals.main.settings.sections.quote';
+  const QUOTE_SECTION = 'settings:sections.quote';
 
   const ButtonOptions = () => {
     return (
       <Row>
         <Content
           title={variables.getMessage(`${QUOTE_SECTION}.buttons.title`)}
-          subtitle={variables.getMessage('modals.main.settings.sections.quote.buttons.subtitle')}
+          subtitle={variables.getMessage('settings:sections.quote.buttons.subtitle')}
         />
         <Action>
           <Checkbox
@@ -64,7 +64,7 @@ const QuoteOptions = () => {
     return (
       <Dropdown
         name="quoteType"
-        label={variables.getMessage('modals.main.settings.sections.background.type.title')}
+        label={variables.getMessage('settings:sections.background.type.title')}
         onChange={(value) => setQuoteType(value)}
         category="quote"
         items={[
@@ -74,7 +74,7 @@ const QuoteOptions = () => {
           },
           {
             value: 'api',
-            text: variables.getMessage('modals.main.settings.sections.background.type.api'),
+            text: variables.getMessage('settings:sections.background.type.api'),
           },
           { value: 'custom', text: variables.getMessage(`${QUOTE_SECTION}.custom`) },
         ]}
@@ -86,7 +86,7 @@ const QuoteOptions = () => {
     return (
       <Row final={true}>
         <Content
-          title={variables.getMessage('modals.main.settings.additional_settings')}
+          title={variables.getMessage('settings:additional_settings')}
           subtitle={variables.getMessage(`${QUOTE_SECTION}.additional`)}
         />
         <Action>
@@ -111,7 +111,7 @@ const QuoteOptions = () => {
         <Header
           title={variables.getMessage(`${QUOTE_SECTION}.title`)}
           secondaryTitle={variables.getMessage(
-            'modals.main.settings.sections.background.source.title',
+            'settings:sections.background.source.title',
           )}
           report={false}
         />
@@ -128,7 +128,7 @@ const QuoteOptions = () => {
       {subSection === 'source' && (
         <Row final={true}>
           <Content
-            title={variables.getMessage('modals.main.settings.sections.background.source.title')}
+            title={variables.getMessage('settings:sections.background.source.title')}
             subtitle={variables.getMessage(`${QUOTE_SECTION}.source_subtitle`)}
           />
           <Action>
@@ -148,7 +148,7 @@ const QuoteOptions = () => {
           <Section
             id="source"
             icon={<MdSource />}
-            title={variables.getMessage('modals.main.settings.sections.background.source.title')}
+            title={variables.getMessage('settings:sections.background.source.title')}
             subtitle={variables.getMessage(`${QUOTE_SECTION}.source_subtitle`)}
           >
             <SourceDropdown />
diff --git a/src/features/search/Search.jsx b/src/features/search/Search.jsx
index d877f38c..15d26f69 100644
--- a/src/features/search/Search.jsx
+++ b/src/features/search/Search.jsx
@@ -146,7 +146,7 @@ function Search() {
         <div className={classList}>
           <Icon currentSearch={currentSearch} setSearchDropdown={setSearchDropdown} />
           <Tooltip
-            title={variables.getMessage('modals.main.settings.sections.search.voice_search')}
+            title={variables.getMessage('settings:sections.search.voice_search')}
           >
             {microphone}
           </Tooltip>
diff --git a/src/features/search/components/dropdown/Dropdown.jsx b/src/features/search/components/dropdown/Dropdown.jsx
index 181038c2..b684e0b6 100644
--- a/src/features/search/components/dropdown/Dropdown.jsx
+++ b/src/features/search/components/dropdown/Dropdown.jsx
@@ -11,7 +11,7 @@ function Dropdown({
   searchEngines
 }) {
   const customText = variables
-    .getMessage('modals.main.settings.sections.search.custom')
+    .getMessage('settings:sections.search.custom')
     .split(' ')[0];
 
   function setSearch(name, custom) {
diff --git a/src/features/search/components/dropdown/Icon.jsx b/src/features/search/components/dropdown/Icon.jsx
index 0027ec95..b3a52966 100644
--- a/src/features/search/components/dropdown/Icon.jsx
+++ b/src/features/search/components/dropdown/Icon.jsx
@@ -35,7 +35,7 @@ function Icon({ currentSearch, searchDropdown, setSearchDropdown }) {
   }
 
   return (
-    <Tooltip title={variables.getMessage('modals.main.settings.sections.search.search_engine')}>
+    <Tooltip title={variables.getMessage('settings:sections.search.search_engine')}>
       <button
         className="navbarButton"
         aria-label="Search Engine"
diff --git a/src/features/search/options/SearchOptions.jsx b/src/features/search/options/SearchOptions.jsx
index 94e31822..b15de63f 100644
--- a/src/features/search/options/SearchOptions.jsx
+++ b/src/features/search/options/SearchOptions.jsx
@@ -51,13 +51,13 @@ function SearchOptions() {
     EventBus.emit('refresh', 'search');
   }
 
-  const SEARCH_SECTION = 'modals.main.settings.sections.search';
+  const SEARCH_SECTION = 'settings:sections.search';
 
   const AdditionalOptions = () => {
     return (
       <Row>
         <Content
-          title={variables.getMessage('modals.main.settings.additional_settings')}
+          title={variables.getMessage('settings:additional_settings')}
           subtitle={variables.getMessage(`${SEARCH_SECTION}.additional`)}
         />
         <Action>
@@ -97,7 +97,7 @@ function SearchOptions() {
         <Content
           title={variables.getMessage(`${SEARCH_SECTION}.search_engine`)}
           subtitle={variables.getMessage(
-            'modals.main.settings.sections.search.search_engine_subtitle',
+            'settings:sections.search.search_engine_subtitle',
           )}
         />
         <Action>
@@ -134,7 +134,7 @@ function SearchOptions() {
           />
           <p style={{ marginTop: '0px' }}>
             <span className="link" onClick={() => resetSearch()}>
-              {variables.getMessage('modals.main.settings.buttons.reset')}
+              {variables.getMessage('settings:buttons.reset')}
             </span>
           </p>
         </Action>
diff --git a/src/features/stats/api/stats.js b/src/features/stats/api/stats.js
index 6da0f7f1..10e92833 100644
--- a/src/features/stats/api/stats.js
+++ b/src/features/stats/api/stats.js
@@ -9,7 +9,7 @@ export default class Stats {
       if (achievement) {
         const { name } = getLocalisedAchievementData(achievement.id);
         toast.info(
-          `🏆 ${variables.getMessage('modals.main.settings.sections.stats.achievement_unlocked', { name: name })}`,
+          `🏆 ${variables.getMessage('settings:sections.stats.achievement_unlocked', { name: name })}`,
           {
             icon: false,
             closeButton: false,
diff --git a/src/features/stats/options/ClearModal.jsx b/src/features/stats/options/ClearModal.jsx
index 79234c04..2d09bee9 100644
--- a/src/features/stats/options/ClearModal.jsx
+++ b/src/features/stats/options/ClearModal.jsx
@@ -8,10 +8,10 @@ function ClearModal({ modalClose, resetStats }) {
     <div className="smallModal">
       <div className="shareHeader">
         <span className="title">
-          {variables.getMessage('modals.main.settings.sections.advanced.reset_modal.title')}
+          {variables.getMessage('settings:sections.advanced.reset_modal.title')}
         </span>
         <Tooltip
-          title={variables.getMessage('modals.main.settings.sections.advanced.reset_modal.cancel')}
+          title={variables.getMessage('settings:sections.advanced.reset_modal.cancel')}
         >
           <div className="close" onClick={modalClose}>
             <MdClose />
@@ -19,23 +19,23 @@ function ClearModal({ modalClose, resetStats }) {
         </Tooltip>
       </div>
       <span className="title">
-        {variables.getMessage('modals.main.settings.sections.stats.clear_modal.question')}
+        {variables.getMessage('settings:sections.stats.clear_modal.question')}
       </span>
       <span className="subtitle">
-        {variables.getMessage('modals.main.settings.sections.stats.clear_modal.information')}
+        {variables.getMessage('settings:sections.stats.clear_modal.information')}
       </span>
       <div className="resetFooter">
         <Button
           type="secondary"
           onClick={modalClose}
           icon={<MdClose />}
-          label={variables.getMessage('modals.main.settings.sections.advanced.reset_modal.cancel')}
+          label={variables.getMessage('settings:sections.advanced.reset_modal.cancel')}
         />
         <Button
           type="settings"
           onClick={() => resetStats()}
           icon={<MdRestartAlt />}
-          label={variables.getMessage('modals.main.settings.buttons.reset')}
+          label={variables.getMessage('settings:buttons.reset')}
         />
       </div>
     </div>
diff --git a/src/features/stats/options/StatsOptions.jsx b/src/features/stats/options/StatsOptions.jsx
index 732df405..663c1b2f 100644
--- a/src/features/stats/options/StatsOptions.jsx
+++ b/src/features/stats/options/StatsOptions.jsx
@@ -78,7 +78,7 @@ const Stats = () => {
     </div>
   );
 
-  const STATS_SECTION = 'modals.main.settings.sections.stats';
+  const STATS_SECTION = 'settings:sections.stats';
 
   return (
     <>
@@ -94,7 +94,7 @@ const Stats = () => {
             type="settings"
             onClick={() => setClearmodal(true)}
             icon={<MdRestartAlt />}
-            label={variables.getMessage('modals.main.settings.buttons.reset')}
+            label={variables.getMessage('settings:buttons.reset')}
           />
         </CustomActions>
       </Header>
diff --git a/src/features/time/options/DateOptions.jsx b/src/features/time/options/DateOptions.jsx
index 7fdd5442..5fa6a27a 100644
--- a/src/features/time/options/DateOptions.jsx
+++ b/src/features/time/options/DateOptions.jsx
@@ -15,7 +15,7 @@ function DateOptions() {
   const longSettings = (
     <>
       <Dropdown
-        label={variables.getMessage('modals.main.settings.sections.date.long_format')}
+        label={variables.getMessage('settings:sections.date.long_format')}
         name="longFormat"
         category="date"
         items={dateFormats.map((format) => {
@@ -27,12 +27,12 @@ function DateOptions() {
       />
       <Checkbox
         name="dayofweek"
-        text={variables.getMessage('modals.main.settings.sections.date.day_of_week')}
+        text={variables.getMessage('settings:sections.date.day_of_week')}
         category="date"
       />
       <Checkbox
         name="datenth"
-        text={variables.getMessage('modals.main.settings.sections.date.datenth')}
+        text={variables.getMessage('settings:sections.date.datenth')}
         category="date"
       />
     </>
@@ -41,7 +41,7 @@ function DateOptions() {
   const shortSettings = (
     <>
       <Dropdown
-        label={variables.getMessage('modals.main.settings.sections.date.short_format')}
+        label={variables.getMessage('settings:sections.date.short_format')}
         name="dateFormat"
         category="date"
         items={dateFormats.map((format) => {
@@ -53,26 +53,26 @@ function DateOptions() {
       />
 
       <Dropdown
-        label={variables.getMessage('modals.main.settings.sections.date.short_separator.title')}
+        label={variables.getMessage('settings:sections.date.short_separator.title')}
         name="shortFormat"
         category="date"
         items={[
           {
             value: 'dash',
-            text: variables.getMessage('modals.main.settings.sections.date.short_separator.dash'),
+            text: variables.getMessage('settings:sections.date.short_separator.dash'),
           },
           {
             value: 'dots',
-            text: variables.getMessage('modals.main.settings.sections.date.short_separator.dots'),
+            text: variables.getMessage('settings:sections.date.short_separator.dots'),
           },
           {
             value: 'gaps',
-            text: variables.getMessage('modals.main.settings.sections.date.short_separator.gaps'),
+            text: variables.getMessage('settings:sections.date.short_separator.gaps'),
           },
           {
             value: 'slashes',
             text: variables.getMessage(
-              'modals.main.settings.sections.date.short_separator.slashes',
+              'settings:sections.date.short_separator.slashes',
             ),
           },
         ]}
@@ -83,7 +83,7 @@ function DateOptions() {
   return (
     <>
       <Header
-        title={variables.getMessage('modals.main.settings.sections.date.title')}
+        title={variables.getMessage('settings:sections.date.title')}
         setting="date"
         category="date"
         element=".date"
@@ -98,8 +98,8 @@ function DateOptions() {
       >
         <Row>
           <Content
-            title={variables.getMessage('modals.main.settings.sections.time.type')}
-            subtitle={variables.getMessage('modals.main.settings.sections.date.type.subtitle')}
+            title={variables.getMessage('settings:sections.time.type')}
+            subtitle={variables.getMessage('settings:sections.date.type.subtitle')}
           />
           <Action>
             <Dropdown
@@ -112,11 +112,11 @@ function DateOptions() {
               items={[
                 {
                   value: 'long',
-                  text: variables.getMessage('modals.main.settings.sections.date.type.long'),
+                  text: variables.getMessage('settings:sections.date.type.long'),
                 },
                 {
                   value: 'short',
-                  text: variables.getMessage('modals.main.settings.sections.date.type.short'),
+                  text: variables.getMessage('settings:sections.date.type.short'),
                 },
               ]}
             />
@@ -126,21 +126,21 @@ function DateOptions() {
           <Content
             title={
               dateType === 'long'
-                ? variables.getMessage('modals.main.settings.sections.date.type.long')
-                : variables.getMessage('modals.main.settings.sections.date.type.short')
+                ? variables.getMessage('settings:sections.date.type.long')
+                : variables.getMessage('settings:sections.date.type.short')
             }
-            subtitle={variables.getMessage('modals.main.settings.sections.date.type_settings')}
+            subtitle={variables.getMessage('settings:sections.date.type_settings')}
           />
           <Action>
             {dateType === 'long' ? longSettings : shortSettings}
             <Checkbox
               name="weeknumber"
-              text={variables.getMessage('modals.main.settings.sections.date.week_number')}
+              text={variables.getMessage('settings:sections.date.week_number')}
               category="date"
             />
             <Checkbox
               name="datezero"
-              text={variables.getMessage('modals.main.settings.sections.time.digital.zero')}
+              text={variables.getMessage('settings:sections.time.digital.zero')}
               category="date"
             />
           </Action>
diff --git a/src/features/time/options/TimeOptions.jsx b/src/features/time/options/TimeOptions.jsx
index 7f0057c8..9add53ee 100644
--- a/src/features/time/options/TimeOptions.jsx
+++ b/src/features/time/options/TimeOptions.jsx
@@ -17,7 +17,7 @@ const TimeOptions = () => {
   const [secondColour, setSecondColour] = useState(
     localStorage.getItem('secondColour') || defaults.time.secondColour,
   );
-  const TIME_SECTION = 'modals.main.settings.sections.time';
+  const TIME_SECTION = 'settings:sections.time';
 
   const updateColour = (type, event) => {
     const colour = event.target.value;
@@ -143,7 +143,7 @@ const TimeOptions = () => {
       <Row>
         <Content
           title={variables.getMessage(
-            'modals.main.settings.sections.time.vertical_clock.change_hour_colour',
+            'settings:sections.time.vertical_clock.change_hour_colour',
           )}
         />
         <Action>
@@ -161,14 +161,14 @@ const TimeOptions = () => {
           </div>
           <span className="link" onClick={() => localStorage.setItem('hourColour', '#ffffff')}>
             <MdRefresh />
-            {variables.getMessage('modals.main.settings.buttons.reset')}
+            {variables.getMessage('settings:buttons.reset')}
           </span>
         </Action>
       </Row>
       <Row>
         <Content
           title={variables.getMessage(
-            'modals.main.settings.sections.time.vertical_clock.change_minute_colour',
+            'settings:sections.time.vertical_clock.change_minute_colour',
           )}
         />
         <Action>
@@ -186,14 +186,14 @@ const TimeOptions = () => {
           </div>
           <span className="link" onClick={() => localStorage.setItem('minuteColour', '#ffffff')}>
             <MdRefresh />
-            {variables.getMessage('modals.main.settings.buttons.reset')}
+            {variables.getMessage('settings:buttons.reset')}
           </span>
         </Action>
       </Row>
       <Row>
         <Content
           title={variables.getMessage(
-            'modals.main.settings.sections.time.vertical_clock.change_second_colour',
+            'settings:sections.time.vertical_clock.change_second_colour',
           )}
         />
         <Action>
@@ -211,7 +211,7 @@ const TimeOptions = () => {
           </div>
           <span className="link" onClick={() => localStorage.setItem('secondColour', '#ffffff')}>
             <MdRefresh />
-            {variables.getMessage('modals.main.settings.buttons.reset')}
+            {variables.getMessage('settings:buttons.reset')}
           </span>
         </Action>
       </Row>
diff --git a/src/features/weather/components/Expanded.jsx b/src/features/weather/components/Expanded.jsx
index 16309f8b..061f69cc 100644
--- a/src/features/weather/components/Expanded.jsx
+++ b/src/features/weather/components/Expanded.jsx
@@ -13,37 +13,37 @@ const weatherTypes = {
     icon: WiCloud,
     key: 'cloudiness',
     unit: '%',
-    title: 'modals.main.settings.sections.weather.extra_info.cloudiness',
+    title: 'settings:sections.weather.extra_info.cloudiness',
   },
   windspeed: {
     icon: WiWindy,
     key: 'wind_speed',
     unit: 'm/s',
-    title: 'modals.main.settings.sections.weather.extra_info.wind_speed',
+    title: 'settings:sections.weather.extra_info.wind_speed',
     extra: 'windDirection',
   },
   atmosphericpressure: {
     icon: WiBarometer,
     key: 'pressure',
     unit: 'hPa',
-    title: 'modals.main.settings.sections.weather.extra_info.atmospheric_pressure',
+    title: 'settings:sections.weather.extra_info.atmospheric_pressure',
   },
   weatherdescription: {
     icon: WeatherIcon,
     key: 'description',
-    title: 'modals.main.settings.sections.weather.extra_info.weather_description',
+    title: 'settings:sections.weather.extra_info.weather_description',
   },
   visibility: {
     icon: MdDisabledVisible,
     key: 'visibility',
     unit: 'm',
-    title: 'modals.main.settings.sections.weather.extra_info.visibility',
+    title: 'settings:sections.weather.extra_info.visibility',
   },
   humidity: {
     icon: WiHumidity,
     key: 'humidity',
     unit: '%',
-    title: 'modals.main.settings.sections.weather.extra_info.humidity',
+    title: 'settings:sections.weather.extra_info.humidity',
   },
 };
 
diff --git a/src/features/weather/options/WeatherOptions.jsx b/src/features/weather/options/WeatherOptions.jsx
index 7146d3eb..b87803b1 100644
--- a/src/features/weather/options/WeatherOptions.jsx
+++ b/src/features/weather/options/WeatherOptions.jsx
@@ -56,14 +56,14 @@ const WeatherOptions = () => {
   const { location, windSpeed, setWindSpeed, changeLocation, getAutoLocation } =
     useWeatherSettings();
   const weatherType = localStorage.getItem('weatherType');
-  const WEATHER_SECTION = 'modals.main.settings.sections.weather';
+  const WEATHER_SECTION = 'settings:sections.weather';
 
   const WidgetType = () => (
     <Row>
       <Content title={variables.getMessage(`${WEATHER_SECTION}.widget_type`)} />
       <Action>
         <Dropdown
-          label={variables.getMessage('modals.main.settings.sections.time.type')}
+          label={variables.getMessage('settings:sections.time.type')}
           name="weatherType"
           category="weather"
           onChange={() => this.forceUpdate()}
diff --git a/src/features/welcome/Welcome.jsx b/src/features/welcome/Welcome.jsx
index cd257f27..c31c0ff2 100644
--- a/src/features/welcome/Welcome.jsx
+++ b/src/features/welcome/Welcome.jsx
@@ -25,7 +25,7 @@ import {
 
 function WelcomeModal() {
   const [currentTab, setCurrentTab] = useState(0);
-  const [buttonText, setButtonText] = useState(variables.getMessage('modals.welcome.buttons.next'));
+  const [buttonText, setButtonText] = useState(variables.getMessage('welcome:buttons.next'));
   const [importedSettings, setImportedSettings] = useState([]);
   const [image, setImage] = useState(null);
   const [credit, setCredit] = useState('');
@@ -45,8 +45,8 @@ function WelcomeModal() {
       setCurrentTab(tab);
       setButtonText(
         tab !== finalTab + 1
-          ? variables.getMessage('modals.welcome.buttons.next')
-          : variables.getMessage('modals.welcome.buttons.finish'),
+          ? variables.getMessage('welcome:buttons.next')
+          : variables.getMessage('welcome:buttons.finish'),
       );
     }
 
@@ -76,8 +76,8 @@ function WelcomeModal() {
     setCurrentTab(newTab);
     setButtonText(
       newTab !== finalTab
-        ? variables.getMessage('modals.welcome.buttons.next')
-        : variables.getMessage('modals.welcome.buttons.finish'),
+        ? variables.getMessage('welcome:buttons.next')
+        : variables.getMessage('welcome:buttons.finish'),
     );
 
     localStorage.setItem('bgtransition', true);
@@ -91,7 +91,7 @@ function WelcomeModal() {
 
   const nextTab = () => {
     setDirection(1);
-    if (buttonText === variables.getMessage('modals.welcome.buttons.finish')) {
+    if (buttonText === variables.getMessage('welcome:buttons.finish')) {
       completeSetup();
       return;
     }
@@ -124,14 +124,14 @@ function WelcomeModal() {
               type="settings"
               onClick={() => prevTab()}
               icon={<MdArrowBackIosNew />}
-              label={variables.getMessage('modals.welcome.buttons.previous')}
+              label={variables.getMessage('welcome:buttons.previous')}
             />
           ) : (
             <Button
               type="settings"
               onClick={() => modalSkip()}
               icon={<MdOutlinePreview />}
-              label={variables.getMessage('modals.welcome.buttons.preview')}
+              label={variables.getMessage('welcome:buttons.preview')}
             />
           )}
           <Button
diff --git a/src/features/welcome/components/Sections/ChooseLanguage.jsx b/src/features/welcome/components/Sections/ChooseLanguage.jsx
index b25b7134..91d14c17 100644
--- a/src/features/welcome/components/Sections/ChooseLanguage.jsx
+++ b/src/features/welcome/components/Sections/ChooseLanguage.jsx
@@ -9,8 +9,8 @@ function ChooseLanguage() {
   return (
     <Content>
       <Header
-        title={variables.getMessage('modals.welcome.sections.language.title')}
-        subtitle={variables.getMessage('modals.welcome.sections.language.description')}
+        title={variables.getMessage('welcome:sections.language.title')}
+        subtitle={variables.getMessage('welcome:sections.language.description')}
       />
       <a
         href={variables.constants.TRANSLATIONS_URL}
diff --git a/src/features/welcome/components/Sections/Final.jsx b/src/features/welcome/components/Sections/Final.jsx
index 351f9b4f..da7d793c 100644
--- a/src/features/welcome/components/Sections/Final.jsx
+++ b/src/features/welcome/components/Sections/Final.jsx
@@ -7,31 +7,31 @@ function Final(props) {
   return (
     <Content>
       <Header
-        title={variables.getMessage('modals.welcome.sections.final.title')}
-        subtitle={variables.getMessage('modals.welcome.sections.final.description')}
+        title={variables.getMessage('welcome:sections.final.title')}
+        subtitle={variables.getMessage('welcome:sections.final.description')}
       />
-      <span className="title">{variables.getMessage('modals.welcome.sections.final.changes')}</span>
+      <span className="title">{variables.getMessage('welcome:sections.final.changes')}</span>
       <span className="subtitle">
-        {variables.getMessage('modals.welcome.sections.final.changes_description')}
+        {variables.getMessage('welcome:sections.final.changes_description')}
       </span>
       <div className="themesToggleArea themesToggleAreaWelcome">
         <div className="toggle" onClick={() => props.switchTab(1)}>
           <span>
-            {variables.getMessage('modals.main.settings.sections.language.title')}:{' '}
+            {variables.getMessage('settings:sections.language.title')}:{' '}
             {languages.find((i) => i.value === localStorage.getItem('language') || defaults.language).name}
           </span>
         </div>
         <div className="toggle" onClick={() => props.switchTab(3)}>
           <span>
-            {variables.getMessage('modals.main.settings.sections.appearance.theme.title')}:{' '}
+            {variables.getMessage('settings:sections.appearance.theme.title')}:{' '}
             {variables.getMessage(
-              'modals.main.settings.sections.appearance.theme.' + localStorage.getItem('theme'),
+              'settings:sections.appearance.theme.' + localStorage.getItem('theme'),
             )}
           </span>
         </div>
         {props.importedSettings.length !== 0 && (
           <div className="toggle" onClick={() => props.switchTab(2)}>
-            {variables.getMessage('modals.welcome.sections.final.imported', {
+            {variables.getMessage('welcome:sections.final.imported', {
               amount: props.importedSettings.length,
             })}{' '}
           </div>
diff --git a/src/features/welcome/components/Sections/ImportSettings.jsx b/src/features/welcome/components/Sections/ImportSettings.jsx
index ab3cf09d..44aeab54 100644
--- a/src/features/welcome/components/Sections/ImportSettings.jsx
+++ b/src/features/welcome/components/Sections/ImportSettings.jsx
@@ -34,12 +34,12 @@ function ImportSettings(props) {
   return (
     <Content>
       <Header
-        title={variables.getMessage('modals.welcome.sections.settings.title')}
-        subtitle={variables.getMessage('modals.welcome.sections.settings.description')}
+        title={variables.getMessage('welcome:sections.settings.title')}
+        subtitle={variables.getMessage('welcome:sections.settings.description')}
       />
       <button className="upload" onClick={() => document.getElementById('file-input').click()}>
         <MdCloudUpload />
-        <span>{variables.getMessage('modals.main.settings.buttons.import')}</span>
+        <span>{variables.getMessage('settings:buttons.import')}</span>
       </button>
       <FileUpload
         id="file-input"
@@ -47,9 +47,9 @@ function ImportSettings(props) {
         type="settings"
         loadFunction={(e) => importSettings(e)}
       />
-      <span className="title">{variables.getMessage('modals.welcome.tip')}</span>
+      <span className="title">{variables.getMessage('welcome:tip')}</span>
       <span className="subtitle">
-        {variables.getMessage('modals.welcome.sections.settings.tip')}
+        {variables.getMessage('welcome:sections.settings.tip')}
       </span>
     </Content>
   );
diff --git a/src/features/welcome/components/Sections/Intro.jsx b/src/features/welcome/components/Sections/Intro.jsx
index 0e6443e9..742fc673 100644
--- a/src/features/welcome/components/Sections/Intro.jsx
+++ b/src/features/welcome/components/Sections/Intro.jsx
@@ -23,7 +23,7 @@ function WelcomeNotice({ config }) {
       {link && (
         <a href={link} target="_blank" rel="noopener noreferrer">
           <MdOpenInNew />
-          {variables.getMessage('modals.welcome.sections.intro.notices.github_open')}
+          {variables.getMessage('welcome:sections.intro.notices.github_open')}
         </a>
       )}
     </div>
@@ -55,21 +55,21 @@ function Intro() {
 
   return (
     <Content>
-      <Header title={variables.getMessage('modals.welcome.sections.intro.title')} />
+      <Header title={variables.getMessage('welcome:sections.intro.title')} />
       {/*{ShareYourMue}*/}
       <WelcomeNotice
         config={{
           icon: MdOutlineWavingHand,
-          title: variables.getMessage('modals.welcome.sections.intro.title'),
-          subtitle: variables.getMessage('modals.welcome.sections.intro.description'),
+          title: variables.getMessage('welcome:sections.intro.title'),
+          subtitle: variables.getMessage('welcome:sections.intro.description'),
         }}
       />
       <WelcomeNotice
         config={{
           icon: FaDiscord,
-          title: variables.getMessage('modals.welcome.sections.intro.notices.discord_title'),
+          title: variables.getMessage('welcome:sections.intro.notices.discord_title'),
           subtitle: variables.getMessage(
-            'modals.welcome.sections.intro.notices.discord_description',
+            'welcome:sections.intro.notices.discord_description',
           ),
           link: DISCORD_LINK,
         }}
@@ -77,9 +77,9 @@ function Intro() {
       <WelcomeNotice
         config={{
           icon: FaGithub,
-          title: variables.getMessage('modals.welcome.sections.intro.notices.github_title'),
+          title: variables.getMessage('welcome:sections.intro.notices.github_title'),
           subtitle: variables.getMessage(
-            'modals.welcome.sections.intro.notices.github_description',
+            'welcome:sections.intro.notices.github_description',
           ),
           link: GITHUB_LINK,
         }}
diff --git a/src/features/welcome/components/Sections/PrivacyOptions.jsx b/src/features/welcome/components/Sections/PrivacyOptions.jsx
index 154eb493..6216fa68 100644
--- a/src/features/welcome/components/Sections/PrivacyOptions.jsx
+++ b/src/features/welcome/components/Sections/PrivacyOptions.jsx
@@ -8,11 +8,11 @@ function OfflineMode() {
     <>
       <Checkbox
         name="offlineMode"
-        text={variables.getMessage('modals.main.settings.sections.advanced.offline_mode')}
+        text={variables.getMessage('settings:sections.advanced.offline_mode')}
         element=".other"
       />
       <span className="subtitle">
-        {variables.getMessage('modals.welcome.sections.privacy.offline_mode_description')}
+        {variables.getMessage('welcome:sections.privacy.offline_mode_description')}
       </span>
     </>
   );
@@ -22,7 +22,7 @@ function Links() {
   return (
     <>
       <span className="title">
-        {variables.getMessage('modals.welcome.sections.privacy.links.title')}
+        {variables.getMessage('welcome:sections.privacy.links.title')}
       </span>
       <a
         className="link"
@@ -30,7 +30,7 @@ function Links() {
         target="_blank"
         rel="noopener noreferrer"
       >
-        {variables.getMessage('modals.welcome.sections.privacy.links.privacy_policy')}
+        {variables.getMessage('welcome:sections.privacy.links.privacy_policy')}
         <MdOutlineOpenInNew />
       </a>
 
@@ -40,7 +40,7 @@ function Links() {
         target="_blank"
         rel="noopener noreferrer"
       >
-        {variables.getMessage('modals.welcome.sections.privacy.links.source_code')}
+        {variables.getMessage('welcome:sections.privacy.links.source_code')}
         <MdOutlineOpenInNew />
       </a>
     </>
@@ -51,8 +51,8 @@ function PrivacyOptions() {
   return (
     <Content>
       <Header
-        title={variables.getMessage('modals.welcome.sections.privacy.title')}
-        subtitle={variables.getMessage('modals.welcome.sections.privacy.description')}
+        title={variables.getMessage('welcome:sections.privacy.title')}
+        subtitle={variables.getMessage('welcome:sections.privacy.description')}
       />
       <OfflineMode />
       <Links />
diff --git a/src/features/welcome/components/Sections/StyleSelection.jsx b/src/features/welcome/components/Sections/StyleSelection.jsx
index cff82af0..35f19fa7 100644
--- a/src/features/welcome/components/Sections/StyleSelection.jsx
+++ b/src/features/welcome/components/Sections/StyleSelection.jsx
@@ -21,20 +21,20 @@ const StyleSelection = () => {
     [STYLES.LEGACY]: {
       className: style === STYLES.LEGACY ? 'toggle legacyStyle active' : 'toggle legacyStyle',
       icon: <MdArchive />,
-      text: variables.getMessage('modals.welcome.sections.style.legacy'),
+      text: variables.getMessage('welcome:sections.style.legacy'),
     },
     [STYLES.NEW]: {
       className: style === STYLES.NEW ? 'toggle newStyle active' : 'toggle newStyle',
       icon: <MdOutlineWhatshot />,
-      text: variables.getMessage('modals.welcome.sections.style.modern'),
+      text: variables.getMessage('welcome:sections.style.modern'),
     },
   };
 
   return (
     <Content>
       <Header
-        title={variables.getMessage('modals.welcome.sections.style.title')}
-        subtitle={variables.getMessage('modals.welcome.sections.style.description')}
+        title={variables.getMessage('welcome:sections.style.title')}
+        subtitle={variables.getMessage('welcome:sections.style.description')}
       />
       <div className="themesToggleArea">
         <div className="options">
diff --git a/src/features/welcome/components/Sections/ThemeSelection.jsx b/src/features/welcome/components/Sections/ThemeSelection.jsx
index b5d68671..976e5ccb 100644
--- a/src/features/welcome/components/Sections/ThemeSelection.jsx
+++ b/src/features/welcome/components/Sections/ThemeSelection.jsx
@@ -24,25 +24,25 @@ function ThemeSelection() {
     [THEMES.AUTO]: {
       className: theme === THEMES.AUTO ? 'toggle auto active' : 'toggle auto',
       icon: <MdAutoAwesome />,
-      text: variables.getMessage('modals.main.settings.sections.appearance.theme.auto'),
+      text: variables.getMessage('settings:sections.appearance.theme.auto'),
     },
     [THEMES.LIGHT]: {
       className: theme === THEMES.LIGHT ? 'toggle lightTheme active' : 'toggle lightTheme',
       icon: <MdLightMode />,
-      text: variables.getMessage('modals.main.settings.sections.appearance.theme.light'),
+      text: variables.getMessage('settings:sections.appearance.theme.light'),
     },
     [THEMES.DARK]: {
       className: theme === THEMES.DARK ? 'toggle darkTheme active' : 'toggle darkTheme',
       icon: <MdDarkMode />,
-      text: variables.getMessage('modals.main.settings.sections.appearance.theme.dark'),
+      text: variables.getMessage('settings:sections.appearance.theme.dark'),
     },
   };
 
   return (
     <Content>
       <Header
-        title={variables.getMessage('modals.welcome.sections.theme.title')}
-        subtitle={variables.getMessage('modals.welcome.sections.theme.description')}
+        title={variables.getMessage('welcome:sections.theme.title')}
+        subtitle={variables.getMessage('welcome:sections.theme.description')}
       />
       <div className="themesToggleArea">
         <div
@@ -63,8 +63,8 @@ function ThemeSelection() {
             ))}
         </div>
       </div>
-      <span className="title">{variables.getMessage('modals.welcome.tip')}</span>
-      <span className="subtitle">{variables.getMessage('modals.welcome.sections.theme.tip')}</span>
+      <span className="title">{variables.getMessage('welcome:tip')}</span>
+      <span className="subtitle">{variables.getMessage('welcome:sections.theme.tip')}</span>
     </Content>
   );
 }
diff --git a/src/index.jsx b/src/index.jsx
index a3ef29c1..6e575a22 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -14,13 +14,14 @@ import 'react-toastify/dist/ReactToastify.min.css';
 
 import { createTranslator } from 'lib/translations';
 
-const locale_id = localStorage.getItem('language').replace('_', '-') || defaults.language;
-variables.language = createTranslator(locale_id);
+const locale_id = localStorage.getItem('language')?.replace('_', '-') || defaults.language;
+console.log(locale_id)
+const t = await createTranslator(locale_id);
 variables.locale_id = locale_id;
 document.documentElement.lang = locale_id;
 
-variables.getMessage = (text, optional) =>
-  variables.language.getMessage(variables.locale_id, text, optional || {});
+variables.language = { getMessage: t };
+variables.getMessage = t;
 
 Sentry.init({
   dsn: variables.constants.SENTRY_DSN,
diff --git a/src/lib/translations.js b/src/lib/translations.js
index f12d619e..cb20fa81 100644
--- a/src/lib/translations.js
+++ b/src/lib/translations.js
@@ -1,5 +1,7 @@
 import { I18nLite } from '@eartharoid/i18n';
-import { importJSON } from '@eartharoid/vite-plugin-i18n';
+// import { importJSON } from '@eartharoid/vite-plugin-i18n';
+
+const importJSON = (...modules) => ([modules[0].locale_id, [].concat(...modules.map(mod => mod.json))]);
 
 export const languages = Object.keys(import.meta.glob('i18n/**/*.yml'));
 /**
@@ -20,4 +22,4 @@ export async function createTranslator(locale_id) {
   const i18n = new I18nLite();
   const t = i18n.loadParsed(...loaded).createTranslator();
   return t;
-}
\ No newline at end of file
+}
diff --git a/vite.config.mjs b/vite.config.mjs
index f610c2d1..d17240a2 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -105,8 +105,9 @@ export default defineConfig(({ command, mode }) => {
       inspect(),
       react(),
       I18nPlugin({
+        id_regex: /((?<locale>[a-z0-9-_]+)\/)((_(?<namespace>[a-z0-9-_]+))|[a-z0-9-_]+)\.[a-z]+/i,
         include: './src/i18n/**/*.yml',
-        parser: (file) => YAML.parse(file),
+        parser: YAML.parse,
       }),
       prepareBuilds(),
       progress()