diff --git a/scripts/updatetranslations.js b/scripts/updatetranslations.js
index e0e54624..8127bcea 100644
--- a/scripts/updatetranslations.js
+++ b/scripts/updatetranslations.js
@@ -38,31 +38,30 @@ fs.readdirSync('../src/i18n/locales').forEach((file) => {
   fs.appendFileSync('../src/i18n/locales/' + file, '\n');
 });
 
-
 // do the same with achievements
-fs.readdirSync('../src/i18n/achievements').forEach((file) => {
+fs.readdirSync('../src/i18n/locales/achievements').forEach((file) => {
   if (file === 'en_GB.json') {
     return;
   }
 
-  const en = require('../src/i18n/achievements/en_GB.json');
-  const newdata = merge(en, require('../src/i18n/achievements/' + file));
+  const en = require('../src/i18n/locales/achievements/en_GB.json');
+  const newdata = merge(en, require('../src/i18n/locales/achievements/' + file));
 
   // remove strings not in english file
   compareAndRemoveKeys(newdata, en);
 
   // write new file
-  fs.writeFileSync('../src/i18n/achievements/' + file, JSON.stringify(newdata, null, 2));
+  fs.writeFileSync('../src/i18n/locales/achievements/' + file, JSON.stringify(newdata, null, 2));
 
   // add new line
-  fs.appendFileSync('../src/i18n/achievements/' + file, '\n');
+  fs.appendFileSync('../src/i18n/locales/achievements/' + file, '\n');
 
   // if missing translations from locales/ add them to achievements/
   const locales = fs.readdirSync('../src/i18n/locales');
   locales.forEach((locale) => {
-    if (!fs.existsSync('../src/i18n/achievements/' + locale)) {
-      fs.writeFileSync('../src/i18n/achievements/' + locale, JSON.stringify(en, null, 2));
-      fs.appendFileSync('../src/i18n/achievements/' + locale, '\n');
+    if (!fs.existsSync('../src/i18n/locales/achievements/' + locale)) {
+      fs.writeFileSync('../src/i18n/locales/achievements/' + locale, JSON.stringify(en, null, 2));
+      fs.appendFileSync('../src/i18n/locales/achievements/' + locale, '\n');
     }
   });
-});
\ No newline at end of file
+});
diff --git a/src/features/modals/welcome/Sections/Intro.jsx b/src/features/modals/welcome/Sections/Intro.jsx
index e0b8a520..88abdcb2 100644
--- a/src/features/modals/welcome/Sections/Intro.jsx
+++ b/src/features/modals/welcome/Sections/Intro.jsx
@@ -1,80 +1,89 @@
 import variables from 'config/variables';
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 
 import { Header, Content } from '../components/Layout';
 import { MdOutlineWavingHand, MdOpenInNew } from 'react-icons/md';
 import { FaDiscord, FaGithub } from 'react-icons/fa';
 
+const DISCORD_LINK = 'https://discord.gg/' + variables.constants.DISCORD_SERVER;
+const GITHUB_LINK =
+  'https://github.com/' + variables.constants.ORG_NAME + '/' + variables.constants.REPO_NAME;
+
+function WelcomeNotice({ config }) {
+  const { icon: Icon, title, subtitle, link } = config;
+  return (
+    <div className="welcomeNotice">
+      <div className="icon">
+        <Icon />
+      </div>
+      <div className="text">
+        <span className="title">{title}</span>
+        <span className="subtitle">{subtitle}</span>
+      </div>
+      {link && (
+        <a href={link} target="_blank" rel="noopener noreferrer">
+          <MdOpenInNew />
+          {variables.getMessage('modals.welcome.sections.intro.notices.github_open')}
+        </a>
+      )}
+    </div>
+  );
+}
+
 function Intro() {
-const [welcomeImage, setWelcomeImage] = useState(0);
+  const [welcomeImage, setWelcomeImage] = useState(0);
 
-useEffect(() => {
-    const timer = setInterval(() => {
-      setWelcomeImage(prevWelcomeImage => prevWelcomeImage < 3 ? prevWelcomeImage + 1 : 0);
-    }, 3000);
+  const updateWelcomeImage = useCallback(() => {
+    setWelcomeImage((prevWelcomeImage) => (prevWelcomeImage < 3 ? prevWelcomeImage + 1 : 0));
+  }, []);
 
-    // Cleanup function to clear the interval when the component unmounts
+  const ShareYourMue = (
+    <div className="examples">
+      <img
+        src={`/src/assets/welcome-images/example${welcomeImage + 1}.webp`}
+        alt="Example Mue setup"
+        draggable={false}
+      />
+      <span className="shareYourMue">#shareyourmue</span>
+    </div>
+  );
+
+  useEffect(() => {
+    const timer = setInterval(updateWelcomeImage, 3000);
     return () => clearInterval(timer);
-  }, [welcomeImage]);
+  }, [updateWelcomeImage]);
 
   return (
     <Content>
       <Header title={variables.getMessage('modals.welcome.sections.intro.title')} />
-      <div className="examples">
-        <img
-          src={`/src/assets/welcome-images/example${welcomeImage + 1}.webp`}
-          alt="Example Mue setup"
-          draggable={false}
-        />
-        <span className="shareYourMue">#shareyourmue</span>
-      </div>
-      <div className="welcomeNotice">
-        <div className="icon">
-          <MdOutlineWavingHand />
-        </div>
-        <div className="text">
-          <span className="title">
-            {variables.getMessage('modals.welcome.sections.intro.title')}
-          </span>
-          <span className="subtitle">
-            {variables.getMessage('modals.welcome.sections.intro.description')}
-          </span>
-        </div>
-      </div>
-      <div className="welcomeNotice">
-        <div className="icon">
-          <FaDiscord />
-        </div>
-        <div className="text">
-          <span className="title">
-            {variables.getMessage('modals.welcome.sections.intro.notices.discord_title')}
-          </span>
-          <span className="subtitle">
-            {variables.getMessage('modals.welcome.sections.intro.notices.discord_description')}
-          </span>
-        </div>
-        <a href="https://discord.gg/zv8C9F8" target="_blank" rel="noopener noreferrer">
-          <MdOpenInNew />{' '}
-          {variables.getMessage('modals.welcome.sections.intro.notices.discord_join')}
-        </a>
-      </div>
-      <div className="welcomeNotice">
-        <div className="icon">
-          <FaGithub />
-        </div>
-        <div className="text">
-          <span className="title">
-            {variables.getMessage('modals.welcome.sections.intro.notices.github_title')}
-          </span>
-          <span className="subtitle">
-            {variables.getMessage('modals.welcome.sections.intro.notices.github_description')}
-          </span>
-        </div>
-        <a href="https://github.com/mue/mue" target="_blank" rel="noopener noreferrer">
-          <MdOpenInNew />
-          {variables.getMessage('modals.welcome.sections.intro.notices.github_open')}
-        </a>
-      </div>
+      {ShareYourMue}
+      <WelcomeNotice
+        config={{
+          icon: MdOutlineWavingHand,
+          title: variables.getMessage('modals.welcome.sections.intro.title'),
+          subtitle: variables.getMessage('modals.welcome.sections.intro.description'),
+        }}
+      />
+      <WelcomeNotice
+        config={{
+          icon: FaDiscord,
+          title: variables.getMessage('modals.welcome.sections.intro.notices.discord_title'),
+          subtitle: variables.getMessage(
+            'modals.welcome.sections.intro.notices.discord_description',
+          ),
+          link: DISCORD_LINK,
+        }}
+      />
+      <WelcomeNotice
+        config={{
+          icon: FaGithub,
+          title: variables.getMessage('modals.welcome.sections.intro.notices.github_title'),
+          subtitle: variables.getMessage(
+            'modals.welcome.sections.intro.notices.github_description',
+          ),
+          link: GITHUB_LINK,
+        }}
+      />
     </Content>
   );
 }
diff --git a/src/features/modals/welcome/Welcome.jsx b/src/features/modals/welcome/Welcome.jsx
index 70e6e288..3b875b1c 100644
--- a/src/features/modals/welcome/Welcome.jsx
+++ b/src/features/modals/welcome/Welcome.jsx
@@ -4,7 +4,7 @@ import { MdArrowBackIosNew, MdArrowForwardIos, MdOutlinePreview } from 'react-ic
 
 import EventBus from 'utils/eventbus';
 
-import { ProgressBar, AsideImage, Navigation } from './components/Elements';
+import { ProgressBar, AsideImage } from './components/Elements';
 import { Button } from 'components/Elements';
 import { Wrapper, Panel } from './components/Layout';
 
@@ -52,49 +52,41 @@ function WelcomeModal({ modalClose, modalSkip }) {
     };
   }, [currentTab, finalTab]);
 
-  const changeTab = (minus) => {
-    localStorage.setItem('bgtransition', true);
-    localStorage.removeItem('welcomeTab');
-
-    if (minus) {
-      setCurrentTab(currentTab - 1);
-      setButtonText(variables.getMessage('modals.welcome.buttons.next'));
-      return;
-    }
-
-    if (buttonText === variables.getMessage('modals.welcome.buttons.finish')) {
-      modalClose();
-      return;
-    }
-
-    const newTab = currentTab + 1;
+  const updateTabAndButtonText = (newTab) => {
     setCurrentTab(newTab);
     setButtonText(
       newTab !== finalTab
         ? variables.getMessage('modals.welcome.buttons.next')
         : variables.getMessage('modals.welcome.buttons.finish'),
     );
-  };
-
-  const switchTab = (tab) => {
-    setCurrentTab(tab);
-    setButtonText(
-      tab !== finalTab + 1
-        ? variables.getMessage('modals.welcome.buttons.next')
-        : variables.getMessage('modals.welcome.buttons.finish'),
-    );
 
     localStorage.setItem('bgtransition', true);
     localStorage.removeItem('welcomeTab');
   };
 
+  const goBackward = () => {
+    updateTabAndButtonText(currentTab - 1);
+  };
+
+  const goForward = () => {
+    if (buttonText === variables.getMessage('modals.welcome.buttons.finish')) {
+      modalClose();
+      return;
+    }
+    updateTabAndButtonText(currentTab + 1);
+  };
+
+  const switchToTab = (tab) => {
+    updateTabAndButtonText(tab);
+  };
+
   const Navigation = () => {
     return (
       <div className="welcomeButtons">
         {currentTab !== 0 ? (
           <Button
             type="settings"
-            onClick={() => changeTab(true)}
+            onClick={() => goBackward()}
             icon={<MdArrowBackIosNew />}
             label={variables.getMessage('modals.welcome.buttons.previous')}
           />
@@ -108,7 +100,7 @@ function WelcomeModal({ modalClose, modalSkip }) {
         )}
         <Button
           type="settings"
-          onClick={() => changeTab()}
+          onClick={() => goForward()}
           icon={<MdArrowForwardIos />}
           label={buttonText}
           iconPlacement={'right'}
@@ -120,11 +112,11 @@ function WelcomeModal({ modalClose, modalSkip }) {
   const tabComponents = {
     0: <Intro />,
     1: <ChooseLanguage />,
-    2: <ImportSettings switchTab={switchTab} />,
+    2: <ImportSettings switchTab={switchToTab} />,
     3: <ThemeSelection />,
     4: <StyleSelection />,
     5: <PrivacyOptions />,
-    6: <Final currentTab={currentTab} switchTab={switchTab} />,
+    6: <Final currentTab={currentTab} switchTab={switchToTab} />,
   };
 
   let CurrentTab = tabComponents[currentTab] || <Intro />;
@@ -133,13 +125,13 @@ function WelcomeModal({ modalClose, modalSkip }) {
     <Wrapper>
       <Panel type="aside">
         <AsideImage currentTab={currentTab} />
-        <ProgressBar numberOfTabs={finalTab + 1} currentTab={currentTab} switchTab={switchTab} />
+        <ProgressBar numberOfTabs={finalTab + 1} currentTab={currentTab} switchTab={switchToTab} />
       </Panel>
       <Panel type="content">
         {CurrentTab}
         <Navigation
           currentTab={currentTab}
-          changeTab={changeTab}
+          changeTab={switchToTab}
           buttonText={buttonText}
           modalSkip={modalSkip}
         />
diff --git a/src/features/modals/welcome/components/Elements/Navigation/Navigation.jsx b/src/features/modals/welcome/components/Elements/Navigation/Navigation.jsx
deleted file mode 100644
index 7b27974f..00000000
--- a/src/features/modals/welcome/components/Elements/Navigation/Navigation.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { MdArrowBackIosNew, MdArrowForwardIos, MdOutlinePreview } from 'react-icons/md';
-import { Button } from 'components/Elements';
-import variables from 'config/variables';
-
-function Navigation({ currentTab, changeTab, buttonText, modalSkip }) {
-  return (
-    <div className="welcomeButtons">
-      {currentTab !== 0 ? (
-        <Button
-          type="settings"
-          onClick={() => changeTab(true)}
-          icon={<MdArrowBackIosNew />}
-          label={variables.getMessage('modals.welcome.buttons.previous')}
-        />
-      ) : (
-        <Button
-          type="settings"
-          onClick={() => modalSkip()}
-          icon={<MdOutlinePreview />}
-          label={variables.getMessage('modals.welcome.buttons.preview')}
-        />
-      )}
-      <Button
-        type="settings"
-        onClick={() => changeTab()}
-        icon={<MdArrowForwardIos />}
-        label={buttonText}
-        iconPlacement={'right'}
-      />
-    </div>
-  );
-}
-
-export { Navigation as default, Navigation };
diff --git a/src/features/modals/welcome/components/Elements/Navigation/index.jsx b/src/features/modals/welcome/components/Elements/Navigation/index.jsx
deleted file mode 100644
index 95e14a93..00000000
--- a/src/features/modals/welcome/components/Elements/Navigation/index.jsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from './Navigation';
diff --git a/src/features/modals/welcome/components/Elements/index.jsx b/src/features/modals/welcome/components/Elements/index.jsx
index d5dd5196..5acfbfe6 100644
--- a/src/features/modals/welcome/components/Elements/index.jsx
+++ b/src/features/modals/welcome/components/Elements/index.jsx
@@ -1,3 +1,2 @@
 export * from './ProgressBar';
 export * from './AsideImage';
-export * from './Navigation';
diff --git a/src/i18n/locales/events/en.json b/src/i18n/locales/events/en.json
new file mode 100644
index 00000000..e69de29b