diff --git a/.env b/.env
index fff40b0..777bbc6 100644
--- a/.env
+++ b/.env
@@ -1,2 +1 @@
 VITE_APP_NAME=Audio Splitter
-VITE_OUTPUT_FILE_NAME_TEMPLATE={TITLE}
diff --git a/README.MD b/README.MD
index 9ecb1ce..0ee02a7 100644
--- a/README.MD
+++ b/README.MD
@@ -18,7 +18,7 @@ For information on how to contribute to the development of AudioStreamSplitting,
 
 ### Setup
 
-1. Generate a valid API key for the [AcoustID](https://acoustid.org/) and/or [Shazam](https://rapidapi.com/apidojo/api/shazam) song recognition APIs. While this program can work if you only provide one of the two, it is strongly recommended to have both in order for the song identification to function properly. More song recognition APIs may be supported in the future. For the AcoustID API, you will need to register an application and use the application API key, rather than just the normal user API key.
+1. Generate a valid API key for the [AcoustID](https://acoustid.org/) and/or [Shazam](https://rapidapi.com/apidojo/api/shazam) song recognition APIs. While this program can work if you only provide one of the two, it is strongly recommended to have both in order for the song identification to function properly. More song recognition APIs may be supported in the future. For the AcoustID API, you will need to register an application and use the application API key, rather than just the normal user API key. If you want to submit identified songs to the AcoustID API, you will also need the user API key.
 2. Download the latest release of [`fpcalc`](https://acoustid.org/chromaprint) for your system from [the AcoustID website](https://acoustid.org/chromaprint) if you want to use the AcoustID API. Put it in a location of your choosing and add it to your system PATH.
 3. Download the latest release of [`ffmpeg`](https://ffmpeg.org/download.html) if you want to use the in-app recording feature. Put it in a location of your choosing and add it to your system PATH.
 4. If `ffmpeg` or `fpcalc` were not installed on your system prior to setup, you will probably need to restart your system first before using AudioStreamSplitting.
@@ -88,10 +88,14 @@ The "Advanced" section is where the most important settings are situated. Note t
 
 You need to provide at least one API Key for the song identification to work, but it is strongly recommended to provide as many as possible (as outlined in the [Setup](#setup) section).
 
+The AcoustID API keys are split into two keys: The "AcoustID Application API Key" is the key you receive when registering an application. This key is necessary for any functionality involving AcoustID. The "AcoustID User API Key" is only required if you also want to submit identified songs to AcoustID.
+
 The "Save Directory" setting should be set to the directory you want to save the resulting files into. Make sure that this is an existing directory on your device, as saving files will not work otherwise.
 
 The "Output File Name" setting will control the file name of output files. You can include the placeholders ``{TITLE}``, ``{ARTIST}``, ``{ALBUM}`` and ``{YEAR}``, which will be replaced with the corresponding metadata when saving a song. As an example, saving the song "Thunderstruck" by "2Cellos" with the template ``"{TITLE}_{ARTIST}"`` will result in a file called ``"Thunderstruck_2Cellos.mp3"``. It is strongly recommended to include the ``{TITLE}`` placeholder in the file name to avoid overwriting files.
 
+The "Submit files to APIs on save" setting controls whether files the app identified will also be sent to the AcoustID API (and potentially others in the future) to further improve their database. As far as we can tell, no personally identifying data is submitted, and the data that is submitted is only used to ensure you have access to the API. We kindly ask you to turn this setting on as the AcoustID database depends on user submissions to work as well as it does.
+
 ## License
 
 This software is licensed under the GNU GPLv3 license, as found in the LICENSE.txt file or [on the GNU website](https://www.gnu.org/licenses/gpl-3.0.en.html). Note that this license only applies to the software itself, not to audio files generated by it, as they still belong to the songs' original copyright holders.
diff --git a/src/backend/api/api.yaml b/src/backend/api/api.yaml
index 1f407ed..606f406 100644
--- a/src/backend/api/api.yaml
+++ b/src/backend/api/api.yaml
@@ -106,6 +106,9 @@ paths:
                 nameTemplate:
                   type: string
                   description: The file name template. Defaults to the one specified in .env if not provided.
+                submitSavedFiles:
+                  type: boolean
+                  description: Whether to submit saved files to song recognition APIs.
       responses:
         "200":
           description: Store the segment in the target file.
@@ -116,6 +119,11 @@ paths:
                 properties:
                   success:
                     type: boolean
+                  services:
+                    type: array
+                    description: Services the file was submitted to.
+                    items:
+                      type: string
         "400":
           description: Bad request. Usually means that filePath doesn't point to a valid file, the target directory doesn't exist, or offset/duration are invalid.
 
diff --git a/src/backend/api/app.py b/src/backend/api/app.py
index 4fea234..af8b6f4 100644
--- a/src/backend/api/app.py
+++ b/src/backend/api/app.py
@@ -47,3 +47,13 @@ def internal_error(error):
 def not_found(error):
     log_error(error, "404 not found error")
     return "404 not found"
+
+
+@app.route("/api/pyinstaller")
+def pyinstaller():
+    """Allow know where built app is excecuted
+    and set save directory with that location
+    """
+    import sys
+
+    return os.path.dirname(sys.executable), 200
diff --git a/src/backend/api/audio.py b/src/backend/api/audio.py
index c18674f..1d1952b 100644
--- a/src/backend/api/audio.py
+++ b/src/backend/api/audio.py
@@ -3,11 +3,10 @@
 import wave
 
 from flask import Blueprint, Response, jsonify, request, send_file
-from modules.api_service import ApiService
+from modules.api_service import ApiService, submit_to_services
 from modules.audio_stream_io import read_audio_file_to_numpy, save_numpy_as_audio_file
 from modules.segmentation import Preset, segment_file
 from pathvalidate import sanitize_filename
-from utils.env import get_env
 from utils.file_name_formatter import format_file_name
 
 audio_bp = Blueprint("audio", __name__)
@@ -92,6 +91,8 @@ def store():
     Add the given metadata to this file.
     If the provided file or the target directory does not exist, a 400 error is returned.
 
+    If songs should be submitted to song identification APIs too, this will also be handled here.
+
     :returns: ``"{success: true}"`` if storing the file worked. A 400 error otherwise.
     """
     data = request.json
@@ -105,11 +106,7 @@ def store():
     metadata = data["metadata"]
 
     file_type = "." + (data["fileType"] if "fileType" in data else "mp3")
-    file_name_template = (
-        data["nameTemplate"]
-        if "nameTemplate" in data
-        else get_env("OUTPUT_FILE_NAME_TEMPLATE")
-    )
+    file_name_template = data["nameTemplate"] if "nameTemplate" in data else "{TITLE}"
     target_file_name = sanitize_filename(
         format_file_name(
             file_name_template,
@@ -136,7 +133,14 @@ def store():
         tags=metadata,
         extension=file_type,
     )
-    return jsonify({"success": True})
+
+    submitted_services = []
+    if "submitSavedFiles" in data and data["submitSavedFiles"]:
+        submitted_services = submit_to_services(
+            os.path.join(target_directory, target_file_name) + file_type, metadata
+        )
+
+    return jsonify({"success": True, "services": submitted_services})
 
 
 @audio_bp.route("/check_path", methods=["POST"])
diff --git a/src/backend/api/env.py b/src/backend/api/env.py
index 6b08c08..6c98d45 100644
--- a/src/backend/api/env.py
+++ b/src/backend/api/env.py
@@ -1,22 +1,9 @@
 from flask import Blueprint, jsonify, request
-from utils.env import get_env, set_env
+from utils.env import set_env
 
 env_bp = Blueprint("env", __name__)
 
 
-@env_bp.route("/get", methods=["GET"])
-def get():
-    key = request.args.get("key")
-    if not key:
-        return jsonify({"error": "Key parameter missing"}), 400
-
-    value = get_env(key)
-    if value is None:
-        return jsonify({"error": "Key not found"}), 404
-
-    return jsonify({"value": value})
-
-
 @env_bp.route("/set", methods=["POST"])
 def set():
     data = request.json
diff --git a/src/backend/modules/api_service.py b/src/backend/modules/api_service.py
index 595849b..6bf092e 100644
--- a/src/backend/modules/api_service.py
+++ b/src/backend/modules/api_service.py
@@ -1,10 +1,9 @@
 from enum import Enum
 from typing import Generator
 
+import modules.apis.acoustid
+import modules.apis.shazam
 from acoustid import FingerprintGenerationError, NoBackendError, WebServiceError
-from modules.apis.acoustid import create_fingerprint as create_acoustid_fingerprint
-from modules.apis.acoustid import lookup as acoustid_lookup
-from modules.apis.shazam import lookup as shazam_lookup
 from modules.audio_stream_io import read_audio_file_to_numpy
 from requests import exceptions
 from utils.env import get_env
@@ -60,6 +59,35 @@ class SongOptionResult(Enum):
 """
 
 
+def submit_to_services(file_name, metadata):
+    """Logic to submit a song to song recognition APIs that allow submissions in order to
+    improve their databases.
+
+    Songs with no metadata or an unknown title are not submitted.
+
+    As of current, this only does so with the AcoustID API. If other services that allow
+    submissions are supported by api_service in the future, their module should contain a
+    similar submit() function that should also be called here.
+
+    :param file_name: The name (and absolute path) of the file to submit.
+    :param metadata: The metadata to submit.
+    :returns: A ``list`` of services the song was successfully submitted to. This does not
+        necessarily mean that the submission will be accepted.
+    """
+    successful_submissions = []
+    if "title" not in metadata or metadata["title"] == "unknown":
+        return successful_submissions
+
+    ACOUSTID_API_KEY = get_env("SERVICE_ACOUSTID_API_KEY")
+    ACOUSTID_USER_KEY = get_env("SERVICE_ACOUSTID_USER_KEY")
+    if ACOUSTID_API_KEY is not None and ACOUSTID_USER_KEY is not None:
+        if modules.apis.acoustid.submit(
+            file_name, metadata, ACOUSTID_API_KEY, ACOUSTID_USER_KEY
+        ):
+            successful_submissions.append("AcoustID")
+    return successful_submissions
+
+
 class ApiService:
     """The ``ApiService`` class contains the business logic for retrieving song metadata
     via various song identification APIs.
@@ -393,10 +421,12 @@ def get_song_options(self, offset: float, duration: float, file_path: str):
         # first check using acoustID
         if ACOUSTID_API_KEY is not None:
             try:
-                duration, fingerprint = create_acoustid_fingerprint(
+                duration, fingerprint = modules.apis.acoustid.create_fingerprint(
                     song_data, sample_rate
                 )
-                metadata = acoustid_lookup(fingerprint, duration, ACOUSTID_API_KEY)
+                metadata = modules.apis.acoustid.lookup(
+                    fingerprint, duration, ACOUSTID_API_KEY
+                )
                 if len(metadata) != 0:
                     return self._check_song_extended_or_finished(
                         offset, duration, metadata
@@ -412,8 +442,12 @@ def get_song_options(self, offset: float, duration: float, file_path: str):
         # If sample_rate inexplicably becomes something other than 44100Hz, shazam won't work
         if SHAZAM_API_KEY is not None and sample_rate == SAMPLE_RATE_STANDARD:
             try:
-                metadata_start = shazam_lookup(song_data, SHAZAM_API_KEY, True)
-                metadata_end = shazam_lookup(song_data, SHAZAM_API_KEY, False)
+                metadata_start = modules.apis.shazam.lookup(
+                    song_data, SHAZAM_API_KEY, True
+                )
+                metadata_end = modules.apis.shazam.lookup(
+                    song_data, SHAZAM_API_KEY, False
+                )
                 metadata_start = [metadata_start] if metadata_start is not None else []
                 metadata_end = [metadata_end] if metadata_end is not None else []
 
diff --git a/src/backend/modules/apis/acoustid.py b/src/backend/modules/apis/acoustid.py
index 015290b..1d9cb1e 100644
--- a/src/backend/modules/apis/acoustid.py
+++ b/src/backend/modules/apis/acoustid.py
@@ -12,6 +12,7 @@
 import acoustid
 import utils.list_helper
 from modules.audio_stream_io import save_numpy_as_audio_file
+from utils.logger import log_error
 
 METADATA_ALL = ["tracks", "recordings", "releasegroups"]
 """The metadata to query from the AcoustID API.
@@ -24,6 +25,11 @@
   metadata to make merging matching recordings easier.
 """
 
+titles_identified_by_acoustid = []
+"""A list of all titles that were identified by AcoustID.
+This is used to prevent duplicate submissions to the AcoustID database.
+"""
+
 
 def create_fingerprint(song_data, samplerate):
     """Create a chromaprint/AcoustID fingerprint for the given audio data
@@ -54,6 +60,56 @@ def create_fingerprint(song_data, samplerate):
     return (fingerprint_duration, fingerprint)
 
 
+def submit(file_name: str, metadata: dict, api_key: str, user_key: str):
+    """Submit a fingerprint for the provided file to be added to the AcoustID database.
+
+    If the song was previously identified using AcoustID, it isn't submitted. This is to avoid
+    spamming the AcoustID servers with duplicate submissions.
+
+    This uses the ``pyacoustid`` wrapper. All exceptions raised by ``pyacoustid`` are
+    handled within this function and lead to returning "False".
+
+    :param file_name: The name of the file to submit.
+    :param metadata: The metadata of the song to submit, formatted as a dict.
+    :param api_key: The application API key.
+    :param user_key: The user API key.
+    :returns: boolean indicating whether the submission was successful.
+    """
+    global timestamp_last_acoustid_request
+
+    titles_identified_key = metadata["title"] + "_" + metadata["artist"]
+
+    # avoid submitting titles that have been identified by acoustid - we don't want duplicates
+    if titles_identified_key in titles_identified_by_acoustid:
+        return False
+    titles_identified_by_acoustid.append(titles_identified_key)
+
+    try:
+        duration, fingerprint = acoustid.fingerprint_file(file_name, force_fpcalc=True)
+    except acoustid.FingerprintGenerationError as ex:
+        log_error(ex, "AcoustID fingerprint generation error")
+        return False
+
+    query_params = {
+        "duration": duration,
+        "fingerprint": fingerprint,
+        "track": metadata["title"] if "title" in metadata else None,
+        "artist": metadata["artist"] if "artist" in metadata else None,
+        "album": metadata["album"] if "album" in metadata else None,
+        "albumartist": metadata["albumartist"] if "albumartist" in metadata else None,
+        "year": metadata["year"] if "year" in metadata else None,
+    }
+
+    try:
+        acoustid.submit(api_key, user_key, query_params)
+        return True
+    except acoustid.FingerprintSubmissionError as ex:
+        log_error(ex, "AcoustID submission error")
+    except acoustid.WebServiceError as ex:
+        log_error(ex, "AcoustID submit error")
+    return False
+
+
 def lookup(fingerprint, fingerprint_duration, api_key):
     """Get data about the provided fingerprint from the AcoustID API.
     This uses the ``pyacoustid`` library to make the actual API call, but parsing
@@ -223,12 +279,18 @@ def _get_results_for_recordings(recordings):
     :param results: The list to append the results to.
     :returns: The list with the appended results.
     """
+    global titles_identified_by_acoustid
     results = []
     for recording in recordings:
         # Get the artist if available.
         if "artists" not in recording or "title" not in recording:
             continue
         artist_name = _join_artist_names(recording["artists"])
+
+        titles_identified_key = recording["title"] + "_" + artist_name
+        if titles_identified_key not in titles_identified_by_acoustid:
+            titles_identified_by_acoustid.append(titles_identified_key)
+
         for releasegroup in recording["releasegroups"]:
             results.append(
                 _get_result_for_releasegroup(
diff --git a/src/frontend/auto-imports.d.ts b/src/frontend/auto-imports.d.ts
index c8f8551..8115890 100644
--- a/src/frontend/auto-imports.d.ts
+++ b/src/frontend/auto-imports.d.ts
@@ -84,6 +84,7 @@ declare global {
   const useDateFormat: typeof import('./composables/useDateFormat')['useDateFormat']
   const useDocTitle: typeof import('./composables/useDocTitle')['useDocTitle']
   const useDriver: typeof import('./composables/useDriver')['useDriver']
+  const useEnv: typeof import('./composables/useEnv')['useEnv']
   const useEnvStore: typeof import('./stores/useEnvStore')['useEnvStore']
   const useGet: typeof import('./composables/useGet')['useGet']
   const useGlobalStyleStore: typeof import('./stores/useGloalStyleStore')['useGlobalStyleStore']
@@ -96,6 +97,7 @@ declare global {
   const useRandomColor: typeof import('./composables/useRandomColor')['useRandomColor']
   const useRoute: typeof import('vue-router')['useRoute']
   const useRouter: typeof import('vue-router')['useRouter']
+  const useSaveSetings: typeof import('./composables/useSaveSettings')['useSaveSetings']
   const useSlots: typeof import('vue')['useSlots']
   const useToastStore: typeof import('./stores/useToastStore')['useToastStore']
   const vi: typeof import('vitest')['vi']
@@ -193,7 +195,7 @@ declare module 'vue' {
     readonly useDateFormat: UnwrapRef<typeof import('./composables/useDateFormat')['useDateFormat']>
     readonly useDocTitle: UnwrapRef<typeof import('./composables/useDocTitle')['useDocTitle']>
     readonly useDriver: UnwrapRef<typeof import('./composables/useDriver')['useDriver']>
-    readonly useEnvStore: UnwrapRef<typeof import('./stores/useEnvStore')['useEnvStore']>
+    readonly useEnv: UnwrapRef<typeof import('./composables/useEnv')['useEnv']>
     readonly useGet: UnwrapRef<typeof import('./composables/useGet')['useGet']>
     readonly useGlobalStyleStore: UnwrapRef<typeof import('./stores/useGloalStyleStore')['useGlobalStyleStore']>
     readonly useHash: UnwrapRef<typeof import('./composables/useHash')['useHash']>
@@ -205,6 +207,7 @@ declare module 'vue' {
     readonly useRandomColor: UnwrapRef<typeof import('./composables/useRandomColor')['useRandomColor']>
     readonly useRoute: UnwrapRef<typeof import('vue-router')['useRoute']>
     readonly useRouter: UnwrapRef<typeof import('vue-router')['useRouter']>
+    readonly useSaveSetings: UnwrapRef<typeof import('./composables/useSaveSettings')['useSaveSetings']>
     readonly useSlots: UnwrapRef<typeof import('vue')['useSlots']>
     readonly useToastStore: UnwrapRef<typeof import('./stores/useToastStore')['useToastStore']>
     readonly vi: UnwrapRef<typeof import('vitest')['vi']>
@@ -296,7 +299,7 @@ declare module '@vue/runtime-core' {
     readonly useDateFormat: UnwrapRef<typeof import('./composables/useDateFormat')['useDateFormat']>
     readonly useDocTitle: UnwrapRef<typeof import('./composables/useDocTitle')['useDocTitle']>
     readonly useDriver: UnwrapRef<typeof import('./composables/useDriver')['useDriver']>
-    readonly useEnvStore: UnwrapRef<typeof import('./stores/useEnvStore')['useEnvStore']>
+    readonly useEnv: UnwrapRef<typeof import('./composables/useEnv')['useEnv']>
     readonly useGet: UnwrapRef<typeof import('./composables/useGet')['useGet']>
     readonly useGlobalStyleStore: UnwrapRef<typeof import('./stores/useGloalStyleStore')['useGlobalStyleStore']>
     readonly useHash: UnwrapRef<typeof import('./composables/useHash')['useHash']>
@@ -308,6 +311,7 @@ declare module '@vue/runtime-core' {
     readonly useRandomColor: UnwrapRef<typeof import('./composables/useRandomColor')['useRandomColor']>
     readonly useRoute: UnwrapRef<typeof import('vue-router')['useRoute']>
     readonly useRouter: UnwrapRef<typeof import('vue-router')['useRouter']>
+    readonly useSaveSetings: UnwrapRef<typeof import('./composables/useSaveSettings')['useSaveSetings']>
     readonly useSlots: UnwrapRef<typeof import('vue')['useSlots']>
     readonly useToastStore: UnwrapRef<typeof import('./stores/useToastStore')['useToastStore']>
     readonly vi: UnwrapRef<typeof import('vitest')['vi']>
diff --git a/src/frontend/components.d.ts b/src/frontend/components.d.ts
index f2c03b0..2e18c5b 100644
--- a/src/frontend/components.d.ts
+++ b/src/frontend/components.d.ts
@@ -21,7 +21,6 @@ declare module 'vue' {
     BaseSelect: typeof import('./components/BaseSelect.vue')['default']
     BaseSeparator: typeof import('./components/BaseSeparator.vue')['default']
     BaseSkeleton: typeof import('./components/BaseSkeleton.vue')['default']
-    BaseSlider: typeof import('./components/BaseSlider.vue')['default']
     BaseSwitch: typeof import('./components/BaseSwitch.vue')['default']
     BaseTextArea: typeof import('./components/BaseTextArea.vue')['default']
     ConfirmModal: typeof import('./components/ConfirmModal.vue')['default']
@@ -33,9 +32,8 @@ declare module 'vue' {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     SettingsAdvanced: typeof import('./components/SettingsAdvanced.vue')['default']
-    SettingsAppearance: typeof import('./components/SettingsAppearance.vue')['default']
-    SettingsClear: typeof import('./components/SettingsClear.vue')['default']
     SettingsGeneral: typeof import('./components/SettingsGeneral.vue')['default']
+    SettingsSave: typeof import('./components/SettingsSave.vue')['default']
     SideBar: typeof import('./components/SideBar.vue')['default']
     SideBarRow: typeof import('./components/SideBarRow.vue')['default']
     Toast: typeof import('./components/Toast.vue')['default']
diff --git a/src/frontend/components/BaseSwitch.vue b/src/frontend/components/BaseSwitch.vue
index 7469789..f7f3124 100644
--- a/src/frontend/components/BaseSwitch.vue
+++ b/src/frontend/components/BaseSwitch.vue
@@ -1,19 +1,5 @@
 <script setup lang="ts">
-const props = defineProps<{
-  /**
-   * Hook when button is switched
-   */
-  onSwitch?: () => void
-}>()
-
 const checked = defineModel({ default: false })
-
-function handleSwitch() {
-  if (props.onSwitch)
-    props.onSwitch()
-  else
-    checked.value = !checked.value
-}
 </script>
 
 <template>
@@ -24,7 +10,7 @@ function handleSwitch() {
     :data-state="checked ? 'checked' : 'unchecked'"
     value="on"
     class="h-[24px] w-[44px] inline-flex shrink-0 cursor-pointer items-center border-2 border-transparent rounded-full transition-colors disabled:cursor-not-allowed data-[state=checked]:bg-primary data-[state=unchecked]:bg-input disabled:opacity-50 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-ring focus-visible:ring-offset-background"
-    @click="handleSwitch"
+    @click="checked = !checked"
   >
     <div
       :data-state="checked ? 'checked' : 'unchecked'"
@@ -36,6 +22,6 @@ function handleSwitch() {
 <docs>
    ## Examples
   ```vue
-  <BaseSwitch v-model="flag" :on-switch="() => doSomething()" />
+  <BaseSwitch v-model="isDark" />
   ```
 </docs>
diff --git a/src/frontend/components/CreateProjectModal.vue b/src/frontend/components/CreateProjectModal.vue
index 817ceef..f7082ec 100644
--- a/src/frontend/components/CreateProjectModal.vue
+++ b/src/frontend/components/CreateProjectModal.vue
@@ -50,6 +50,7 @@ onChange(() => {
     file && isFileValid(file.type) && result.push(file)
   }
 
+  driver.value.isActive() && driver.value.moveNext()
   data.value.files = result
 })
 
diff --git a/src/frontend/components/ProjectItem.vue b/src/frontend/components/ProjectItem.vue
index afcb4f6..8db5041 100644
--- a/src/frontend/components/ProjectItem.vue
+++ b/src/frontend/components/ProjectItem.vue
@@ -3,7 +3,6 @@ import WaveSurfer from 'wavesurfer.js'
 import Regions from 'wavesurfer.js/plugins/regions'
 import type { AxiosError } from 'axios'
 import { isAxiosError } from 'axios'
-import { useLocalStorage } from '@vueuse/core'
 import type { Project, ProjectFileSegment } from '../models/types'
 import type { Metadata, PostAudioSplitBodyPresetName } from '../models/api'
 import { getAudioStreamSplittingAPI } from '../models/api'
@@ -37,11 +36,12 @@ const emits = defineEmits<{
   (e: 'changePresetName', presetName: PostAudioSplitBodyPresetName): void
 }>()
 
+const { isDark } = useDarkToggle()
 const { toast } = useToastStore()
 const { t } = useI18n()
 const router = useRouter()
 const hash = useHash(props.file.filePath)
-const saveSettings = useLocalStorage('save-settings', { fileType: 'mp3', shouldAsk: true })
+const saveSettings = useSaveSetings()
 
 const ws = shallowRef<WaveSurfer>()
 const regions = shallowRef<Regions>()
@@ -57,8 +57,8 @@ onMounted(async () => {
 
     ws.value = WaveSurfer.create({
       container: `#waveform_${hash}`,
-      waveColor: 'rgb(173, 250, 29)',
-      progressColor: '#8EAC50',
+      waveColor: isDark.value ? 'hsl(81, 96%, 55%)' : 'hsl(81, 96%, 45%)',
+      progressColor: isDark.value ? 'hsl(79, 36%, 50%)' : 'hsl(79, 36%, 42%)',
       barRadius: 5,
       barWidth: 5,
       barGap: 2,
@@ -159,13 +159,12 @@ function addRegion(segments: ProjectFileSegment[]) {
 
 const isStoring = ref(false)
 const currentStoringIndex = ref(-1)
-const store = useEnvStore()
 async function handleStore(
   { duration, offset, metadata, songIndex, fileType }: { duration: number; offset: number; metadata?: Metadata; songIndex: number; fileType: string },
 
 ) {
   const filePath = props.file.filePath
-  const targetDirectory = store.lsEnv.SAVE_DIRECTORY
+  const targetDirectory = saveSettings.value.saveDirectory
   if (!targetDirectory) {
     toast({ title: t('toast.title.no_save_directory'), content: t('toast.no_save_directory'), variant: 'destructive' })
     return
@@ -177,10 +176,16 @@ async function handleStore(
   const _metadata = metadata ?? { album: '', artist: '', title: 'unknown', year: '0' }
 
   try {
-    await postAudioStore({ filePath, duration, offset, metadata: _metadata, targetDirectory, fileType })
+    const response = await postAudioStore({ filePath, duration, offset, metadata: _metadata, targetDirectory, fileType, submitSavedFiles: saveSettings.value.submitSavedFiles })
+    // TODO CR
+    const services = response.data.services ?? []
+    let _content = t('toast.save_file_success', { target: targetDirectory })
+    if (services)
+      _content = t('toast.save_file_success_with_submit', { target: targetDirectory, services: services.join(', ') })
+
     toast({
       title: `${_metadata.title}.${fileType}`,
-      content: t('toast.save_file_success', { target: targetDirectory }),
+      content: _content,
     })
   }
   catch (e) {
diff --git a/src/frontend/components/SettingsAdvanced.vue b/src/frontend/components/SettingsAdvanced.vue
index 1087082..4e18f98 100644
--- a/src/frontend/components/SettingsAdvanced.vue
+++ b/src/frontend/components/SettingsAdvanced.vue
@@ -1,17 +1,12 @@
 <script setup lang="ts">
-type EnvKey = keyof typeof env.value
+type EnvKey = keyof typeof currentEnv.value
 
 const { t } = useI18n()
-const { defaultEnv, lsEnv } = storeToRefs(useEnvStore())
-
-const env = ref(defaultEnv.value)
-Object.entries(lsEnv.value).forEach(([key, value]) => {
-  if (value)
-    env.value[key as EnvKey] = value
-})
-
 const { toast } = useToastStore()
 
+const currentEnv = useEnv()
+const env = ref({ ...currentEnv.value })
+
 async function setApiKey(key: EnvKey) {
   const value = env.value[key]
 
@@ -22,9 +17,7 @@ async function setApiKey(key: EnvKey) {
 
   try {
     await axios.post('/env/set', { key, value })
-    lsEnv.value[key] = value
-    // TODO Just a workaround. Figure out why useLocalStorage is not working
-    localStorage.setItem('env', JSON.stringify(lsEnv.value))
+    currentEnv.value[key] = value
     toast({ content: t('toast.changed_successfully') })
   }
   catch (e) {
@@ -36,16 +29,22 @@ async function setApiKey(key: EnvKey) {
 <template>
   <div>
     <h2 class="text-3xl">
-      {{ t('settings.advanced') }}
+      {{ t('settings.advanced.index') }}
     </h2>
 
     <BaseSeparator orientation="horizontal" />
 
-    <div class="space-y-5">
-      <div class="flex items-center justify-between">
-        <BaseLabel class="!text-base" for="SERVICE_ACOUSTID_API_KEY">
-          {{ t('settings.acoustid_api_key') }}
-        </BaseLabel>
+    <div class="space-y-6">
+      <div class="flex items-start justify-between">
+        <div class="space-y-1">
+          <BaseLabel class="!text-base" for="SERVICE_ACOUSTID_API_KEY">
+            {{ t('settings.advanced.acoustid_api_key') }}
+          </BaseLabel>
+
+          <p class="text-sm text-muted-foreground">
+            {{ t('settings.advanced.hint.acoustid_api_key') }}
+          </p>
+        </div>
 
         <div class="min-w-400px flex gap-x-3">
           <BaseInput id="SERVICE_ACOUSTID_API_KEY" v-model="env.SERVICE_ACOUSTID_API_KEY" type="password" />
@@ -56,43 +55,39 @@ async function setApiKey(key: EnvKey) {
         </div>
       </div>
 
-      <div class="flex items-center justify-between">
-        <BaseLabel class="!text-base" for="SERVICE_SHAZAM_API_KEY">
-          {{ t('settings.shazam_api_key') }}
-        </BaseLabel>
-
-        <div class="min-w-400px flex gap-x-3">
-          <BaseInput id="SERVICE_SHAZAM_API_KEY" v-model="env.SERVICE_SHAZAM_API_KEY" type="password" />
-
-          <BaseButton @click="setApiKey('SERVICE_SHAZAM_API_KEY')">
-            {{ t('button.set') }}
-          </BaseButton>
+      <div class="flex items-start justify-between">
+        <div class="space-y-1">
+          <BaseLabel class="!text-base" for="SERVICE_ACOUSTID_USER_KEY">
+            {{ t('settings.advanced.acoustid_user_key') }}
+          </BaseLabel>
+          <p class="text-sm text-muted-foreground">
+            {{ t('settings.advanced.hint.acoustid_user_key') }}
+          </p>
         </div>
-      </div>
-
-      <div class="flex items-center justify-between">
-        <BaseLabel class="!text-base" for="OUTPUT_FILE_NAME_TEMPLATE">
-          {{ t('settings.save_directory') }}
-        </BaseLabel>
 
         <div class="min-w-400px flex gap-x-3">
-          <BaseInput id="SAVE_DIRECTORY" v-model="env.SAVE_DIRECTORY" />
+          <BaseInput id="SERVICE_ACOUSTID_USER_KEY" v-model="env.SERVICE_ACOUSTID_USER_KEY" type="password" />
 
-          <BaseButton @click="setApiKey('SAVE_DIRECTORY')">
+          <BaseButton @click="setApiKey('SERVICE_ACOUSTID_USER_KEY')">
             {{ t('button.set') }}
           </BaseButton>
         </div>
       </div>
 
-      <div class="flex items-center justify-between">
-        <BaseLabel class="!text-base" for="OUTPUT_FILE_NAME_TEMPLATE">
-          {{ t('settings.output_file_name') }}
-        </BaseLabel>
+      <div class="flex items-start justify-between">
+        <div class="space-y-1">
+          <BaseLabel class="!text-base" for="SERVICE_SHAZAM_API_KEY">
+            {{ t('settings.advanced.shazam_api_key') }}
+          </BaseLabel>
+          <p class="text-sm text-muted-foreground">
+            {{ t('settings.advanced.hint.shazam_api_key') }}
+          </p>
+        </div>
 
         <div class="min-w-400px flex gap-x-3">
-          <BaseInput id="OUTPUT_FILE_NAME_TEMPLATE" v-model="env.OUTPUT_FILE_NAME_TEMPLATE" />
+          <BaseInput id="SERVICE_SHAZAM_API_KEY" v-model="env.SERVICE_SHAZAM_API_KEY" type="password" />
 
-          <BaseButton @click="setApiKey('OUTPUT_FILE_NAME_TEMPLATE')">
+          <BaseButton @click="setApiKey('SERVICE_SHAZAM_API_KEY')">
             {{ t('button.set') }}
           </BaseButton>
         </div>
diff --git a/src/frontend/components/SettingsAppearance.vue b/src/frontend/components/SettingsAppearance.vue
deleted file mode 100644
index e10c46f..0000000
--- a/src/frontend/components/SettingsAppearance.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<script setup lang="ts">
-const { isDark, toggle } = useDarkToggle()
-const { t } = useI18n()
-
-function handleToggleDark() {
-  if (!document.startViewTransition)
-    toggle()
-
-  document.startViewTransition(() => toggle())
-}
-</script>
-
-<template>
-  <div>
-    <h2 class="text-3xl">
-      {{ t('settings.appearance.index') }}
-    </h2>
-
-    <BaseSeparator orientation="horizontal" />
-
-    <div class="space-y-5">
-      <div class="flex items-center justify-between">
-        <h3>
-          {{ t('settings.appearance.darkmode') }}
-        </h3>
-
-        <BaseSwitch v-model="isDark" :on-switch="handleToggleDark" />
-      </div>
-    </div>
-  </div>
-</template>
-
-<style>
-::view-transition-group(root) {
-  animation-duration: 1s;
-}
-::view-transition-new(root),
-::view-transition-old(root) {
-  mix-blend-mode: normal;
-}
-
-::view-transition-new(root) {
-  animation-name: reveal-light;
-}
-
-::view-transition-old(root),
-.dark::view-transition-old(root) {
-  animation: none;
-}
-.dark::view-transition-new(root) {
-  animation-name: reveal-dark;
-}
-
-@keyframes reveal-dark {
-  from {
-    clip-path: polygon(-30% 0, -30% 0, -15% 100%, -10% 115%);
-  }
-  to {
-    clip-path: polygon(-30% 0, 130% 0, 115% 100%, -10% 115%);
-  }
-}
-
-@keyframes reveal-light {
-  from {
-    clip-path: polygon(130% 0, 130% 0, 115% 100%, 110% 115%);
-  }
-  to {
-    clip-path: polygon(130% 0, -30% 0, -15% 100%, 110% 115%);
-  }
-}
-</style>
diff --git a/src/frontend/components/SettingsGeneral.vue b/src/frontend/components/SettingsGeneral.vue
index aefa421..903dc99 100644
--- a/src/frontend/components/SettingsGeneral.vue
+++ b/src/frontend/components/SettingsGeneral.vue
@@ -1,13 +1,12 @@
 <script setup lang="ts">
-import { useLocalStorage } from '@vueuse/core'
-import { LangMap, SUPPORT_FILE_TYPES } from '../includes/constants'
+import { LangMap } from '../includes/constants'
 
 const { t } = useI18n()
 
 const { currentLocale } = useLocale()
 const localOpts = Object.entries(LangMap).map(([key, value]) => ({ label: value, value: key }))
 
-const saveSettings = useLocalStorage('save-settings', { fileType: 'mp3', shouldAsk: true })
+const { isDark } = useDarkToggle()
 </script>
 
 <template>
@@ -18,9 +17,14 @@ const saveSettings = useLocalStorage('save-settings', { fileType: 'mp3', shouldA
 
     <BaseSeparator orientation="horizontal" />
 
-    <div class="space-y-5">
+    <div class="space-y-6">
       <div class="flex items-center justify-between">
-        <h3>{{ t('settings.general.language') }}</h3>
+        <div class="space-y-1">
+          <h3>{{ t('settings.general.language') }}</h3>
+          <p class="text-sm text-muted-foreground">
+            {{ t('settings.general.hint.language') }}
+          </p>
+        </div>
 
         <BaseSelect
           v-model="currentLocale"
@@ -29,20 +33,15 @@ const saveSettings = useLocalStorage('save-settings', { fileType: 'mp3', shouldA
         />
       </div>
 
-      <div class="space-y-3">
-        <div class="flex items-center justify-between">
-          <h3 :class="{ 'text-muted-foreground': saveSettings.shouldAsk }">
-            {{ t('settings.general.save_file_type') }}
-          </h3>
-
-          <BaseSelect v-model="saveSettings.fileType" class="min-w-100px" :options="SUPPORT_FILE_TYPES.map(t => ({ label: t, value: t }))" :disabled="saveSettings.shouldAsk" />
+      <div class="flex items-center justify-between">
+        <div class="space-y-1">
+          <h3>{{ t('settings.general.darkmode') }}</h3>
+          <p class="text-sm text-muted-foreground">
+            {{ t('settings.general.hint.darkmode') }}
+          </p>
         </div>
 
-        <div class="flex items-center justify-between">
-          <h3>{{ t('settings.general.ask_file_type') }}</h3>
-
-          <BaseSwitch v-model="saveSettings.shouldAsk" />
-        </div>
+        <BaseSwitch v-model="isDark" />
       </div>
     </div>
   </div>
diff --git a/src/frontend/components/SettingsSave.vue b/src/frontend/components/SettingsSave.vue
new file mode 100644
index 0000000..138acdc
--- /dev/null
+++ b/src/frontend/components/SettingsSave.vue
@@ -0,0 +1,83 @@
+<script setup lang="ts">
+import { SUPPORT_FILE_TYPES } from '../includes/constants'
+
+const { t } = useI18n()
+const settings = useSaveSetings()
+</script>
+
+<template>
+  <div>
+    <h2 class="text-3xl">
+      {{ t('settings.save.index') }}
+    </h2>
+
+    <BaseSeparator orientation="horizontal" />
+
+    <div class="space-y-6">
+      <div class="flex items-start justify-between">
+        <div class="space-y-1">
+          <h3 :class="{ 'text-muted-foreground': settings.shouldAsk }">
+            {{ t('settings.save.file_type') }}
+          </h3>
+          <p class="text-sm text-muted-foreground">
+            {{ t('settings.save.hint.file_type') }}
+          </p>
+        </div>
+
+        <BaseSelect
+          v-model="settings.fileType" class="min-w-100px"
+          :options="SUPPORT_FILE_TYPES.map(t => ({ label: t, value: t }))"
+          :disabled="settings.shouldAsk"
+        />
+      </div>
+
+      <div class="flex items-start justify-between">
+        <div class="space-y-1">
+          <h3>{{ t('settings.save.ask_file_type') }}</h3>
+          <p class="text-sm text-muted-foreground">
+            {{ t('settings.save.hint.ask_file_type') }}
+          </p>
+        </div>
+
+        <BaseSwitch v-model="settings.shouldAsk" />
+      </div>
+
+      <div class="flex items-start justify-between">
+        <div class="space-y-1">
+          <h3>{{ t('settings.save.submit_saved_files') }}</h3>
+          <p class="text-sm text-muted-foreground">
+            {{ t('settings.save.hint.submit_saved_files') }}
+          </p>
+        </div>
+
+        <BaseSwitch v-model="settings.submitSavedFiles" />
+      </div>
+
+      <div class="flex items-start justify-between">
+        <div class="space-y-1">
+          <BaseLabel class="!text-base" for="SAVE_DIRECTORY">
+            {{ t('settings.save.save_directory') }}
+          </BaseLabel>
+          <p class="text-sm text-muted-foreground">
+            {{ t('settings.save.hint.save_directory') }}
+          </p>
+        </div>
+
+        <BaseInput id="SAVE_DIRECTORY" v-model="settings.saveDirectory" class="max-w-400px" />
+      </div>
+
+      <div class="flex items-start justify-between">
+        <div class="space-y-1">
+          <BaseLabel class="!text-base" for="OUTPUT_FILE_NAME_TEMPLATE">
+            {{ t('settings.save.output_file_name') }}
+          </BaseLabel>
+          <p class="text-sm text-muted-foreground">
+            {{ t('settings.save.hint.output_file_name') }}
+          </p>
+        </div>
+
+        <BaseInput id="OUTPUT_FILE_NAME_TEMPLATE" v-model="settings.nameTemplate" class="max-w-400px" />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/src/frontend/composables/useEnv.ts b/src/frontend/composables/useEnv.ts
new file mode 100644
index 0000000..077cf86
--- /dev/null
+++ b/src/frontend/composables/useEnv.ts
@@ -0,0 +1,6 @@
+import { useLocalStorage } from '@vueuse/core'
+import { DEFAULT_ENV } from '../includes/constants'
+
+export function useEnv() {
+  return useLocalStorage('env', DEFAULT_ENV)
+}
diff --git a/src/frontend/composables/useSaveSettings.ts b/src/frontend/composables/useSaveSettings.ts
new file mode 100644
index 0000000..32499a5
--- /dev/null
+++ b/src/frontend/composables/useSaveSettings.ts
@@ -0,0 +1,6 @@
+import { useLocalStorage } from '@vueuse/core'
+import { DEFAULT_SAVE_SETTINGS } from '../includes/constants'
+
+export function useSaveSetings() {
+  return useLocalStorage('save-settings', DEFAULT_SAVE_SETTINGS)
+}
diff --git a/src/frontend/includes/constants.ts b/src/frontend/includes/constants.ts
index 6ef696c..64408a4 100644
--- a/src/frontend/includes/constants.ts
+++ b/src/frontend/includes/constants.ts
@@ -8,3 +8,17 @@ export const LangMap: Record<string, string> = {
 export const DEFAULT_TOAST_DURATION = 5000
 
 export const SUPPORT_FILE_TYPES = ['mp3', 'wav']
+
+export const DEFAULT_SAVE_SETTINGS = {
+  fileType: 'mp3',
+  shouldAsk: true,
+  submitSavedFiles: false,
+  saveDirectory: '',
+  nameTemplate: '{TITLE}',
+}
+
+export const DEFAULT_ENV = {
+  SERVICE_ACOUSTID_API_KEY: import.meta.env.VITE_SERVICE_ACOUSTID_API_KEY,
+  SERVICE_ACOUSTID_USER_KEY: import.meta.env.VITE_SERVICE_ACOUSTID_USER_KEY,
+  SERVICE_SHAZAM_API_KEY: import.meta.env.VITE_SERVICE_SHAZAM_API_KEY,
+}
diff --git a/src/frontend/includes/utils.ts b/src/frontend/includes/utils.ts
index 79e5e2c..3d30eff 100644
--- a/src/frontend/includes/utils.ts
+++ b/src/frontend/includes/utils.ts
@@ -3,6 +3,12 @@ export function handleAppInit() {
   loadEnvToBackend()
 
   if (import.meta.env.MODE === 'production') {
+    const settings = useSaveSetings()
+    axios.get('/pyinstaller').then(({ data }) => {
+      if (data && !settings.value.saveDirectory)
+        settings.value.saveDirectory = data
+    })
+
     disableContextMenu()
     disableDevTool()
     disableReload()
diff --git a/src/frontend/locales/de.json b/src/frontend/locales/de.json
index 9c85a91..a626793 100644
--- a/src/frontend/locales/de.json
+++ b/src/frontend/locales/de.json
@@ -38,20 +38,41 @@
   "settings": {
     "general": {
       "index": "Allgemein",
-      "language": "Sprache"
-    },
-    "appearance": {
-      "index": "Aussehen",
+      "language": "Sprache",
+      "hint": {
+        "language": "Anzeigesprache ändern.",
+        "darkmode": "Zwischen dunkler und heller Anzeige wechseln."
+      },
       "darkmode": "Dunkler Modus"
     },
-    "advanced": "Erweitert",
+    "advanced": {
+      "index": "Erweitert",
+      "acoustid_api_key": "AcoustID Anwendungs-API-Key",
+      "acoustid_user_key": "AcoustID Benutzer-API-Key",
+      "shazam_api_key": "Shazam API-Key",
+      "hint": {
+        "acoustid_api_key": "Der AcoustID Anwendungs-API-Key. Um diesen Key zu erhalten, müssen Sie auf der AcoustID-Webseite eine Anwendung registrieren. Dieser Schlüssel ist erforderlich, um AcoustID für die Identifizierung zu verwenden, was stark empfohlen ist.",
+        "acoustid_user_key": "Der AcoustID Benutzer-API-Key. Sie erhalten diesen Key, indem Sie sich auf der AcoustID-Webseite anmelden. Dieser Key wird nur verwendet, falls Sie Metadaten beim Speichern auch an die APIs senden möchten, um diese zu verbessern.",
+        "shazam_api_key": "Der Shazam API-key. Sie benötigen ein RapidAPI-Konto, um diesen zu erhalten."
+      }
+    },
     "download": "Herunterladen",
-    "save_directory": "Dateipfad für gespeicherte Dateien",
-    "output_file_name": "Dateiname für gespeicherte Dateien",
-    "acoustid_api_key": "AcoustID API-Key",
-    "shazam_api_key": "Shazam API-Key",
-    "clear_all_confirm": "Sind Sie sicher, dass Sie alle Projekte löschen wollen? Dies kann nicht rückgängig gemacht werden.",
-    "clear_heading": "Alle Projekte löschen"
+    "save": {
+      "index": "Speichern",
+      "file_type": "Dateityp",
+      "hint": {
+        "file_type": "Dateityp für gespeicherte Dateien.",
+        "ask_file_type": "Beim Speichern immer nach dem Dateityp fragen. Falls diese Option ausgeschaltet ist, wird der in \"Dateityp für gespeicherte Dateien\" gesetzte Dateityp verwendet.",
+        "submit_saved_files": "Erkannte Metadaten auch an API-Anbieter senden, um ihre Datenbank zu verbessen. Hierbei werden persönlich identifizierte Daten nur dazu verwendet, sicherzustellen, dass Sie Zugang zu den APIs haben.",
+        "save_directory": "Der Dateipfad, an dem Dateien gespeichert werden.",
+        "output_file_name": "Die Vorlage, aus der Dateinamen erstellt werden. Verwenden Sie die Platzhalter {'{'}TITLE{'}'},  {'{'}ARTIST{'}'},  {'{'}ALBUM{'}'} and  {'{'}YEAR{'}'}, um die entsprechenden Metadaten an dieser Stelle einzufügen. Es ist empfohlen, den {'{'}TITLE{'}'}-Platzhalter zu verwenden, um gedoppelte Dateinamen zu vermeiden."
+      },
+      "ask_file_type": "Bei jedem Speichern nachfragen",
+      "submit_saved_files": "Gespeicherte Dateien auch an APIs senden",
+      "save_directory": "Dateipfad für gespeicherte Dateien",
+      "output_file_name": "Dateiname für gespeicherte Dateien"
+    }
+
   },
   "dialog": {
     "create_project": {
@@ -101,6 +122,7 @@
     "long_process": "Die Verarbeitung wird eine Weile dauern...",
     "cant_split": "Diese Tondatei konnte nicht aufgeteilt werden.",
     "save_file_success": "Erfolgreich in {target} gespeichert!",
+    "save_file_success_with_submit": "Erfolgreich in {target} gespeichert und an {services} gesendet!",
     "title": {
       "no_save_directory": "Kein Dateipfad gesetzt!"
     },
@@ -145,5 +167,10 @@
       "name_exists_already": "{name} existiert bereits. Bitte geben Sie einen anderen Namen ein.",
       "no_file_uploaded": "Bitte laden Sie mindestens eine Datei hoch, um ein Projekt zu erstellen."
     }
+  },
+  "BE": {
+    "FILE_NOT_EXIST": "Die gewählte Datei existiert nicht!",
+    "TARGET_DIR_NOT_EXIST": "Der Zielordner existiert nicht!",
+    "INVALID_OFFSET_DURATION": "Startzeitpunkt oder Dauer ist nicht valide!"
   }
 }
diff --git a/src/frontend/locales/en.json b/src/frontend/locales/en.json
index f35ecb1..3488ab9 100644
--- a/src/frontend/locales/en.json
+++ b/src/frontend/locales/en.json
@@ -39,21 +39,39 @@
     "general": {
       "index": "General",
       "language": "Language",
-      "save_file_type": "Save file type",
-      "ask_file_type": "Ask me what to do with each save"
-    },
-    "appearance": {
-      "index": "Appearance",
+      "hint": {
+        "language": "Change display language.",
+        "darkmode": "Toggle between dark and light theme."
+      },
       "darkmode": "Dark Mode"
     },
-    "advanced": "Advanced",
+    "advanced": {
+      "index": "Advanced",
+      "acoustid_api_key": "AcoustID Application API Key",
+      "acoustid_user_key": "AcoustID User API Key",
+      "shazam_api_key": "Shazam API Key",
+      "hint": {
+        "acoustid_api_key": "The AcoustID application API key. You need to register an application on the AcoustID website for this. This key is necessary if you wish to use the AcoustID API for identification, which is strongly recommended.",
+        "acoustid_user_key": "The AcoustID user API key. You get this key simply by logging in on the AcoustID website. This key is only used if you choose to submit metadata to the APIs when saving.",
+        "shazam_api_key": "The Shazam API key. You need a RapidAPI account to create this key."
+      }
+    },
     "download": "Download",
-    "save_directory": "Save Directory",
-    "output_file_name": "Output File Name",
-    "acoustid_api_key": "AcoustID API Key",
-    "shazam_api_key": "Shazam API Key",
-    "clear_all_confirm": "Are you sure you want to delete all projects? This cannot be undone.",
-    "clear_heading": "Clear all projects"
+    "save": {
+      "index": "Save",
+      "file_type": "Save file type",
+      "hint": {
+        "file_type": "File type when saving.",
+        "ask_file_type": "Always ask me for the file type when saving. If this is toggled off, the option from the \"Save File Type\" setting will always be used.",
+        "submit_saved_files": "Submit the detected metadata to API providers to improve their database. The only personally identifying information that will be sent with this is used to confirm you have access to the API services.",
+        "save_directory": "Where to save identified songs.",
+        "output_file_name": "The template for file names. You may use the placeholders {'{'}TITLE{'}'}, {'{'}ARTIST{'}'}, {'{'}ALBUM{'}'} and {'{'}YEAR{'}'}, which will be replaced with the corresponding metadata. It is strongly recommended to include the {'{'}TITLE{'}'} placeholder to avoid duplicate file names."
+      },
+      "ask_file_type": "Ask me what to do with each save",
+      "submit_saved_files": "Submit files to APIs when saving",
+      "save_directory": "Save directory",
+      "output_file_name": "Output file name"
+    }
   },
   "dialog": {
     "create_project": {
@@ -103,6 +121,7 @@
     "long_process": "Processing will take a while...",
     "cant_split": "This audio cannot be split",
     "save_file_success": "Has been successfully saved to {target}",
+    "save_file_success_with_submit": "Has been successfully saved to {target} and submitted to {services}",
     "title": {
       "no_save_directory": "No save directory set"
     },
diff --git a/src/frontend/models/api.ts b/src/frontend/models/api.ts
index b303422..b73e7a3 100644
--- a/src/frontend/models/api.ts
+++ b/src/frontend/models/api.ts
@@ -12,6 +12,8 @@ import type {
 
 export interface PostAudioStore200 {
   success?: boolean
+  /** Services the file was submitted to. */
+  services?: string[]
 }
 
 export interface PostAudioStoreBody {
@@ -24,6 +26,8 @@ export interface PostAudioStoreBody {
   fileType?: string
   /** The file name template. Defaults to the one specified in .env if not provided. */
   nameTemplate?: string
+  /** Whether to submit saved files to song recognition APIs. */
+  submitSavedFiles?: boolean
 }
 
 export interface PostAudioGetSegmentBody {
diff --git a/src/frontend/models/env.d.ts b/src/frontend/models/env.d.ts
index 30de383..e4b565b 100644
--- a/src/frontend/models/env.d.ts
+++ b/src/frontend/models/env.d.ts
@@ -3,9 +3,8 @@
 interface ImportMetaEnv {
   readonly VITE_APP_NAME: string
   readonly VITE_SERVICE_ACOUSTID_API_KEY: string
+  readonly VITE_SERVICE_ACOUSTID_USER_KEY: string
   readonly VITE_SERVICE_SHAZAM_API_KEY: string
-  readonly VITE_OUTPUT_FILE_NAME_TEMPLATE: string
-  readonly VITE_SAVE_DIRECTORY: string
 }
 
 interface ImportMeta {
diff --git a/src/frontend/pages/index.vue b/src/frontend/pages/index.vue
index 3be5f4b..af9ee10 100644
--- a/src/frontend/pages/index.vue
+++ b/src/frontend/pages/index.vue
@@ -14,6 +14,7 @@ const { execute } = usePost<Project>({
     createProject(project)
   },
 })
+const { driver, setConfig } = useDriver()
 
 const { open, close } = useModal({
   component: CreateProjectModal,
@@ -27,11 +28,11 @@ const { open, close } = useModal({
       files.forEach(file => formData.append('file', file))
 
       execute(formData)
+      driver.value.destroy()
       close()
     },
   },
 })
-const { driver, setConfig } = useDriver()
 setConfig({
   async onNextClick() {
     if (driver.value.isFirstStep())
@@ -78,9 +79,9 @@ function handleToProject(id: string) {
             id="new_project_btn"
             tabindex="0"
             class="col-span-1 flex-center cursor-pointer border border-border rounded-sm p-3 transition-border-color lg:col-span-3 md:col-span-2 xl:col-span-4 hover:border-accent-foreground"
-            @click="open"
-            @keydown.enter.prevent="open"
-            @keydown.space.prevent="open"
+            @click="async () => await open() && driver.moveNext()"
+            @keydown.enter.prevent="async () => await open() && driver.moveNext()"
+            @keydown.space.prevent="async () => await open() && driver.moveNext()"
           >
             <div class="flex flex-col items-center gap-y-1 font-medium">
               {{ t('button.new_project') }}
diff --git a/src/frontend/pages/settings.vue b/src/frontend/pages/settings.vue
index dc82eed..958bccc 100644
--- a/src/frontend/pages/settings.vue
+++ b/src/frontend/pages/settings.vue
@@ -4,10 +4,10 @@ const { t } = useI18n()
 
 <template>
   <BaseLayout :header="t('sidebar.settings')">
-    <div class="max-w-80% space-y-10">
+    <div class="pb-30 lg:max-w-80% space-y-12">
       <SettingsGeneral />
 
-      <SettingsAppearance />
+      <SettingsSave />
 
       <SettingsAdvanced />
     </div>
diff --git a/src/frontend/stores/useEnvStore.ts b/src/frontend/stores/useEnvStore.ts
deleted file mode 100644
index 7048ccd..0000000
--- a/src/frontend/stores/useEnvStore.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useLocalStorage } from '@vueuse/core'
-
-export const useEnvStore = defineStore('env', () => {
-  const defaultEnv = shallowRef({
-    SERVICE_ACOUSTID_API_KEY: import.meta.env.VITE_SERVICE_ACOUSTID_API_KEY,
-    SERVICE_SHAZAM_API_KEY: import.meta.env.VITE_SERVICE_SHAZAM_API_KEY,
-    OUTPUT_FILE_NAME_TEMPLATE: import.meta.env.VITE_OUTPUT_FILE_NAME_TEMPLATE,
-    SAVE_DIRECTORY: import.meta.env.VITE_SAVE_DIRECTORY,
-  })
-
-  const lsEnv = useLocalStorage('env', defaultEnv, { deep: true })
-
-  return { defaultEnv, lsEnv }
-})
-
-if (import.meta.hot)
-  import.meta.hot.accept(acceptHMRUpdate(useEnvStore, import.meta.hot))