diff --git a/overlays/base/usr/local/bin/ovos-audio-setup b/overlays/base/usr/local/bin/ovos-audio-setup
deleted file mode 100644
index 18f4d396..00000000
--- a/overlays/base/usr/local/bin/ovos-audio-setup
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/bin/bash
-
-# /usr/libexec/autoconfigure-sound
-# This script automatically configures the default soundcard based on the detected hardware.
-# It is triggered by the user, ovos-i2csound or udev rules when a USB soundcard is connected or removed.
-
-# Main Logic
-# 1. If an I2C device file exists, check the platform for Mark 1 soundcard.
-# 2. If a Mark 1 soundcard is detected, set it as the ALSA default card.
-# 3. If no Mark 1 soundcard is detected:
-#    - Check for USB soundcards and set the first one detected as the ALSA default card.
-#    - If no USB soundcard is found, fallback to onboard BCM soundcard.
-# 4. If no soundcard is detected, log an error message.
-
-# I2C_DEVICE_FILE and UDEV_SOUNDCARD_RULE_FILE are used for detecting and configuring soundcards automatically.
-I2C_DEVICE_FILE="/etc/OpenVoiceOS/i2c_platform"
-UDEV_SOUNDCARD_RULE_FILE="/etc/udev/rules.d/99-autoconfigure-sound.rules"
-UDEV_USB_AUTO_VOLUME_RULE_FILE="/etc/udev/rules.d/99-usb-autovolume.rules"
-UDEV_USB_MERGE_SINKS_FILE="/etc/udev/rules.d/99-usb-mergesinks.rules"
-
-# UDEV rule for auto-configuring soundcard when a USB soundcard is added/removed
-# It will trigger the soundcard autoconfigure systemd service instead of running a script directly
-UDEV_SOUNDCARD_RULE='ACTION=="add|remove", SUBSYSTEM=="sound", RUN+="/usr/libexec/soundcard_autoconfigure"'
-
-# UDEV rule for auto setting USB soundcard volume and recreating combined sinks
-# - set default sink volume for that card
-# - recreate combined sinks for output
-UDEV_USB_MERGE_SINKS_RULE='ACTION=="add|remove", SUBSYSTEM=="sound", ENV{ID_BUS}=="usb", RUN+="/usr/libexec/update-audio-sinks"'
-UDEV_USB_AUTO_VOLUME_RULE='ACTION=="add", SUBSYSTEM=="sound", ENV{ID_BUS}=="usb", RUN+="/usr/libexec/usb-autovolume"'
-
-# Service names
-COMBINED_SINKS_SERVICE="combine_sinks.service"
-AUTOCONFIGURE_SERVICE="autoconfigure_soundcard.service"
-
-OVOS_USER="$(getent passwd 1000 | cut -d: -f1)"
-SOUND_SERVER="pipewire"  # TODO support pulseaudio maybe
-
-# Function to disable conflicting services
-# Disables a service if it is active.
-disable_service() {
-    local service_name=$1
-    if systemctl is-active --quiet "$service_name"; then
-        echo "Disabling $service_name..."
-        sudo systemctl stop "$service_name"
-        sudo systemctl disable --now "$service_name"
-        if [ $? -eq 0 ]; then
-            echo "$service_name disabled successfully."
-        else
-            echo "Error: Failed to disable $service_name."
-        fi
-    fi
-}
-
-# Function to print usage instructions
-usage() {
-    echo "Usage: $0 [choice]"
-    echo "Choices:"
-    echo "  1 - Set default soundcard"
-    echo "  2 - Autoconfigure default soundcard"
-    echo "  3 - Enable combined audio sinks"
-    echo "  4 - Revert changes"
-    echo "  5 - Exit"
-    exit 1
-}
-
-# Get the choice from the command-line argument or prompt the user
-if [ $# -gt 0 ]; then
-    choice=$1
-else
-    echo "Audio Setup Options:"
-    echo "1) Manually select default soundcard"
-    echo "2) Autoconfigure default soundcard"
-    echo "3) Enable combined audio sinks"
-    echo "4) Revert changes"
-    echo "5) Exit"
-    read -p "Choose an option: " choice
-fi
-
-# Main logic based on user's choice
-case $choice in
-1)
-    # Choice 1: Set default soundcard
-    disable_service "$COMBINED_SINKS_SERVICE"
-    disable_service "$AUTOCONFIGURE_SERVICE"
-    echo "Available sound cards:"
-    aplay -l
-    read -p "Enter the card number to set as default: " user_card
-    echo "Setting ALSA default card to: $user_card"
-
-    echo "defaults.pcm.card $user_card" > "/home/$OVOS_USER/.asoundrc"
-    echo "defaults.ctl.card $user_card" >> "/home/$OVOS_USER/.asoundrc"
-    chmod 644 /home/$OVOS_USER/.asoundrc
-
-    # Disable autoconfigure udev rule
-    if [ -f "$UDEV_SOUNDCARD_RULE_FILE" ]; then
-        echo "Disabling autoconfigure rule. $UDEV_SOUNDCARD_RULE_FILE"
-        sudo rm "$UDEV_SOUNDCARD_RULE_FILE"
-    fi
-
-    if [ -f "$UDEV_USB_MERGE_SINKS_FILE" ]; then
-      echo "Disabling USB merge sinks rule. $UDEV_USB_MERGE_SINKS_FILE"
-      sudo rm "$UDEV_USB_MERGE_SINKS_FILE"
-    fi
-    if [ -f "$UDEV_USB_AUTO_VOLUME_RULE_FILE" ]; then
-      echo "Disabling USB auto volume rule. $UDEV_USB_AUTO_VOLUME_RULE"
-      sudo rm "$UDEV_USB_AUTO_VOLUME_RULE_FILE"
-    fi
-
-    # Reload udev rules after removing the rule
-    echo "Reloading udev rules to apply changes..."
-    sudo udevadm control --reload
-
-    ;;
-2)
-    # Choice 2: Autoconfigure default soundcard
-    disable_service "$COMBINED_SINKS_SERVICE"
-
-    echo -e "pcm.!default $SOUND_SERVER\nctl.!default $SOUND_SERVER" > /home/$OVOS_USER/.asoundrc
-    chmod 644 /home/$OVOS_USER/.asoundrc
-
-    echo "Enabling $AUTOCONFIGURE_SERVICE..."
-    sudo systemctl enable --now "$AUTOCONFIGURE_SERVICE"
-    if [ $? -eq 0 ]; then
-        echo "$AUTOCONFIGURE_SERVICE enabled successfully."
-    else
-        echo "Error: Failed to enable $AUTOCONFIGURE_SERVICE."
-    fi
-
-    # Enable autoconfigure rule by creating udev rule
-    echo "Creating udev rule for autoconfiguration of new soundcards."
-    echo "$UDEV_SOUNDCARD_RULE" | sudo tee "$UDEV_SOUNDCARD_RULE_FILE" > /dev/null
-    echo "Udev rule created: $UDEV_SOUNDCARD_RULE_FILE"
-    echo "$UDEV_SOUNDCARD_RULE"
-
-    # Disable USB autoconfigure udev rule
-    if [ -f "$UDEV_USB_MERGE_SINKS_FILE" ]; then
-      echo "Disabling USB merge sinks rule. $UDEV_USB_MERGE_SINKS_FILE"
-      sudo rm "$UDEV_USB_MERGE_SINKS_FILE"
-    fi
-
-    echo "Creating udev rule for USB autovolume."
-    echo "$UDEV_USB_AUTO_VOLUME_RULE" | sudo tee "$UDEV_USB_AUTO_VOLUME_RULE_FILE" > /dev/null
-    echo "Udev rule for USB autovolume created: $UDEV_USB_AUTO_VOLUME_RULE_FILE"
-    echo "$UDEV_USB_AUTO_VOLUME_RULE"
-
-    # Reload udev rules to apply the new rule immediately
-    echo "Reloading udev rules to apply changes..."
-    sudo udevadm control --reload
-    ;;
-3)
-    # Choice 3: Enable combined audio sinks
-    disable_service "$AUTOCONFIGURE_SERVICE"
-
-    echo -e "pcm.!default $SOUND_SERVER\nctl.!default $SOUND_SERVER" > /home/$OVOS_USER/.asoundrc
-    chmod 644 /home/$OVOS_USER/.asoundrc
-
-    echo "Enabling $COMBINED_SINKS_SERVICE..."
-    sudo systemctl enable --now "$COMBINED_SINKS_SERVICE"
-    if [ $? -eq 0 ]; then
-        echo "$COMBINED_SINKS_SERVICE enabled successfully."
-    else
-        echo "Error: Failed to enable $COMBINED_SINKS_SERVICE."
-    fi
-
-    # Disable autoconfigure udev rule
-    if [ -f "$UDEV_SOUNDCARD_RULE_FILE" ]; then
-        echo "Disabling soundcard rule. $UDEV_SOUNDCARD_RULE_FILE"
-        sudo rm "$UDEV_SOUNDCARD_RULE_FILE"
-    fi
-
-    # Enable USB autoconfigure udev rule
-    echo "Creating udev rule for USB merge sinks."
-    echo "$UDEV_USB_MERGE_SINKS_RULE" | sudo tee "$UDEV_USB_MERGE_SINKS_FILE" > /dev/null
-    echo "Udev rule for USB merge sinks created: $UDEV_USB_MERGE_SINKS_FILE"
-    echo "$UDEV_USB_MERGE_SINKS_RULE"
-
-    echo "Creating udev rule for USB autovolume."
-    echo "$UDEV_USB_AUTO_VOLUME_RULE" | sudo tee "$UDEV_USB_AUTO_VOLUME_RULE_FILE" > /dev/null
-    echo "Udev rule for USB autovolume created: $UDEV_USB_AUTO_VOLUME_RULE_FILE"
-    echo "$UDEV_USB_AUTO_VOLUME_RULE"
-
-    # Reload udev rules after removing the rule
-    echo "Reloading udev rules to apply changes..."
-    sudo udevadm control --reload
-    ;;
-4)
-    # Choice 4: Reset everything (clean state)
-    echo "Resetting audio configuration..."
-
-    # Stop and disable all related services
-    disable_service "$COMBINED_SINKS_SERVICE"
-    disable_service "$AUTOCONFIGURE_SERVICE"
-
-    echo -e "pcm.!default $SOUND_SERVER\nctl.!default $SOUND_SERVER" > /home/$OVOS_USER/.asoundrc
-    chmod 644 /home/$OVOS_USER/.asoundrc
-
-    # Remove udev rules related to soundcard configuration
-    if [ -f "$UDEV_SOUNDCARD_RULE_FILE" ]; then
-        sudo rm "$UDEV_SOUNDCARD_RULE_FILE"
-        echo "Removed udev soundcard rule"
-    fi
-    if [ -f "$UDEV_USB_MERGE_SINKS_FILE" ]; then
-        sudo rm "$UDEV_USB_MERGE_SINKS_FILE"
-        echo "Removed udev USB merge sinks rule"
-    fi
-    if [ -f "$UDEV_USB_AUTO_VOLUME_RULE_FILE" ]; then
-        sudo rm "$UDEV_USB_AUTO_VOLUME_RULE_FILE"
-        echo "Removed udev USB auto volume rule"
-    fi
-
-    # Reload udev rules after cleanup
-    echo "Reloading udev rules to apply changes..."
-    sudo udevadm control --reload
-    ;;
-
-5)
-    # Exit
-    echo "Exiting audio setup."
-    ;;
-*)
-    # Invalid choice
-    echo "Invalid choice."
-    usage
-    ;;
-esac
-
diff --git a/overlays/base/etc/modules-load.d/i2c.conf b/overlays/base_ovos/etc/modules-load.d/i2c.conf
similarity index 100%
rename from overlays/base/etc/modules-load.d/i2c.conf
rename to overlays/base_ovos/etc/modules-load.d/i2c.conf
diff --git a/overlays/base/etc/systemd/system/i2csound.service b/overlays/base_ovos/etc/systemd/system/i2csound.service
similarity index 100%
rename from overlays/base/etc/systemd/system/i2csound.service
rename to overlays/base_ovos/etc/systemd/system/i2csound.service
diff --git a/overlays/base/usr/libexec/ovos-i2csound b/overlays/base_ovos/usr/libexec/ovos-i2csound
similarity index 100%
rename from overlays/base/usr/libexec/ovos-i2csound
rename to overlays/base_ovos/usr/libexec/ovos-i2csound
diff --git a/overlays/base_ovos/usr/share/alsa-card-profile/mixer/profile-sets/GeneralPlus.conf b/overlays/base_ovos/usr/share/alsa-card-profile/mixer/profile-sets/GeneralPlus.conf
deleted file mode 100644
index b79d4c05..00000000
--- a/overlays/base_ovos/usr/share/alsa-card-profile/mixer/profile-sets/GeneralPlus.conf
+++ /dev/null
@@ -1,484 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-
-; Default profile definitions for the ALSA backend of PulseAudio. This
-; is used as fallback for all cards that have no special mapping
-; assigned (and should be good enough for the vast majority of
-; cards). If you want to assign a different profile set than this one
-; to a device, either set the udev property PULSE_PROFILE_SET for the
-; card, or use the "profile_set" module argument when loading
-; module-alsa-card.
-;
-; So what is this about? Simply, what we do here is map ALSA devices
-; to how they are exposed in PA. We say which ALSA device string to
-; use to open a device, which channel mapping to use then, and which
-; mixer path to use. This is encoded in a 'mapping'. Multiple of these
-; mappings can be bound together in a 'profile' which is then directly
-; exposed in the UI as a card profile. Each mapping assigned to a
-; profile will result in one sink/source to be created if the profile
-; is selected for the card.
-;
-; Additionally, the path set configuration files can describe the
-; decibel values assigned to the steps of the volume elements. This
-; can be used to work around situations when the alsa driver doesn't
-; provide any decibel information, or when the information is
-; incorrect.
-
-
-; [General]
-; auto-profiles = no | yes                  # Instead of defining all profiles manually, autogenerate
-;                                           # them by combining every input mapping with every output mapping.
-;
-; [Mapping id]
-; device-strings = ...                      # ALSA device string. %f will be replaced by the card identifier.
-; channel-map = ...                         # Channel mapping to use for this device
-; description = ...                         # Description for the mapping. Note that it's better to set the description
-;                                           # in the well_known_descriptions table in alsa-mixer.c than with this
-;                                           # option, because the descriptions in alsa-mixer.c are translatable.
-; description-key = ...                     # A custom key for the well_known_descriptions table (by default the mapping
-;                                           # name is used).
-; paths-input = ...                         # A list of mixer paths to use. Every path in this list will be probed.
-;                                           # If multiple are found to be working they will be available as device ports
-; paths-output = ...
-; element-input = ...                       # Instead of configuring a full mixer path simply configure a single
-;                                           # mixer element for volume/mute handling. The value can be an element
-;                                           # name, or name and index separated by a comma.
-; element-output = ...
-; priority = ...
-; direction = any | input | output          # Only useful for?
-;
-; exact-channels = yes | no                 # If no, and the exact number of channels is not supported,
-;                                           # allow device to be opened with another channel count
-; fallback = no | yes                       # This mapping will only be considered if all non-fallback mappings fail
-; intended-roles = ...                      # Set the device.intended_roles property for the sink/source.
-;
-; [Profile id]
-; input-mappings = ...                      # Lists mappings for sources on this profile, those mapping must be
-;                                           # defined in this file too
-; output-mappings = ...                     # Lists mappings for sinks on this profile, those mappings must be
-;                                           # defined in this file too
-; description = ...
-; priority = ...                            # Numeric value to deduce priority for this profile
-; skip-probe = no | yes                     # Skip probing for availability? If this is yes then this profile
-;                                           # will be assumed as working without probing. Makes initialization
-;                                           # a bit faster but only works if the card is really known well.
-;
-; fallback = no | yes                       # This profile will only be considered if all non-fallback profiles fail
-; [DecibelFix element]                      # Decibel fixes can be used to work around missing or incorrect dB
-;                                           # information from alsa. A decibel fix is a table that maps volume steps
-;                                           # to decibel values for one volume element. The "element" part in the
-;                                           # section title is the name of the volume element (or name and index
-;                                           # separated by a comma).
-;                                           #
-;                                           # NOTE: This feature is meant just as a help for figuring out the correct
-;                                           # decibel values. PulseAudio is not the correct place to maintain the
-;                                           # decibel mappings!
-;                                           #
-;                                           # If you need this feature, then you should make sure that when you have
-;                                           # the correct values figured out, the alsa driver developers get informed
-;                                           # too, so that they can fix the driver.
-;
-; db-values = ...                           # The option value consists of pairs of step numbers and decibel values.
-;                                           # The pairs are separated with whitespace, and steps are separated from
-;                                           # the corresponding decibel values with a colon. The values must be in an
-;                                           # increasing order. Here's an example of a valid string:
-;                                           #
-;                                           #     "0:-40.50  1:-38.70  3:-33.00  11:0"
-;                                           #
-;                                           # The lowest step imposes a lower limit for hardware volume and the
-;                                           # highest step correspondingly imposes a higher limit. That means that
-;                                           # that the mixer will never be set outside those values - the rest of the
-;                                           # volume scale is done using software volume.
-;                                           #
-;                                           # As can be seen in the example, you don't need to specify a dB value for
-;                                           # each step. The dB values for skipped steps will be linearly interpolated
-;                                           # using the nearest steps that are given.
-
-[General]
-auto-profiles = yes
-
-[Mapping analog-stereo]
-device-strings = front:%f
-channel-map = left,right
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2
-paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic
-priority = 15
-
-# If everything else fails, try to use hw:0 as a stereo device...
-[Mapping stereo-fallback]
-device-strings = hw:%f
-fallback = yes
-channel-map = front-left,front-right
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2
-paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic
-priority = 1
-
-# ...and if even that fails, try to use hw:0 as a mono device.
-[Mapping mono-fallback]
-device-strings = hw:%f
-fallback = yes
-channel-map = mono
-paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
-paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headset-mic
-priority = 1
-
-[Mapping analog-surround-21]
-device-strings = surround21:%f
-channel-map = front-left,front-right,lfe
-paths-output = analog-output analog-output-lineout analog-output-speaker
-priority = 13
-direction = output
-
-[Mapping analog-surround-40]
-device-strings = surround40:%f
-channel-map = front-left,front-right,rear-left,rear-right
-paths-output = analog-output analog-output-lineout analog-output-speaker
-priority = 12
-direction = output
-
-[Mapping analog-surround-41]
-device-strings = surround41:%f
-channel-map = front-left,front-right,rear-left,rear-right,lfe
-paths-output = analog-output analog-output-lineout analog-output-speaker
-priority = 13
-direction = output
-
-[Mapping analog-surround-50]
-device-strings = surround50:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center
-paths-output = analog-output analog-output-lineout analog-output-speaker
-priority = 12
-direction = output
-
-[Mapping analog-surround-51]
-device-strings = surround51:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-paths-output = analog-output analog-output-lineout analog-output-speaker
-priority = 13
-direction = output
-
-[Mapping analog-surround-71]
-device-strings = surround71:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
-description = Analog Surround 7.1
-paths-output = analog-output analog-output-lineout analog-output-speaker
-priority = 12
-direction = output
-
-[Mapping iec958-stereo]
-device-strings = iec958:%f
-channel-map = left,right
-paths-input = iec958-stereo-input
-paths-output = iec958-stereo-output
-priority = 5
-
-[Mapping iec958-ac3-surround-40]
-device-strings = a52:%f
-channel-map = front-left,front-right,rear-left,rear-right
-paths-output = iec958-stereo-output
-priority = 2
-direction = output
-
-[Mapping iec958-ac3-surround-51]
-device-strings = a52:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-paths-output = iec958-stereo-output
-priority = 3
-direction = output
-
-[Mapping iec958-dts-surround-51]
-device-strings = dca:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-paths-output = iec958-stereo-output
-priority = 3
-direction = output
-
-[Mapping hdmi-stereo]
-description = Digital Stereo (HDMI)
-device-strings = hdmi:%f
-paths-output = hdmi-output-0
-channel-map = left,right
-priority = 9
-direction = output
-
-[Mapping hdmi-surround]
-description = Digital Surround 5.1 (HDMI)
-device-strings = hdmi:%f
-paths-output = hdmi-output-0
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 8
-direction = output
-
-[Mapping hdmi-surround71]
-description = Digital Surround 7.1 (HDMI)
-device-strings = hdmi:%f
-paths-output = hdmi-output-0
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
-priority = 8
-direction = output
-
-[Mapping hdmi-dts-surround]
-description = Digital Surround 5.1 (HDMI/DTS)
-device-strings = dcahdmi:%f
-paths-output = hdmi-output-0
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-stereo-extra1]
-description = Digital Stereo (HDMI 2)
-device-strings = hdmi:%f,1
-paths-output = hdmi-output-1
-channel-map = left,right
-priority = 7
-direction = output
-
-[Mapping hdmi-surround-extra1]
-description = Digital Surround 5.1 (HDMI 2)
-device-strings = hdmi:%f,1
-paths-output = hdmi-output-1
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-surround71-extra1]
-description = Digital Surround 7.1 (HDMI 2)
-device-strings = hdmi:%f,1
-paths-output = hdmi-output-1
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
-priority = 6
-direction = output
-
-[Mapping hdmi-dts-surround-extra1]
-description = Digital Surround 5.1 (HDMI 2/DTS)
-device-strings = dcahdmi:%f,1
-paths-output = hdmi-output-1
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-stereo-extra2]
-description = Digital Stereo (HDMI 3)
-device-strings = hdmi:%f,2
-paths-output = hdmi-output-2
-channel-map = left,right
-priority = 7
-direction = output
-
-[Mapping hdmi-surround-extra2]
-description = Digital Surround 5.1 (HDMI 3)
-device-strings = hdmi:%f,2
-paths-output = hdmi-output-2
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-surround71-extra2]
-description = Digital Surround 7.1 (HDMI 3)
-device-strings = hdmi:%f,2
-paths-output = hdmi-output-2
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
-priority = 6
-direction = output
-
-[Mapping hdmi-dts-surround-extra2]
-description = Digital Surround 5.1 (HDMI 3/DTS)
-device-strings = dcahdmi:%f,2
-paths-output = hdmi-output-2
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-stereo-extra3]
-description = Digital Stereo (HDMI 4)
-device-strings = hdmi:%f,3
-paths-output = hdmi-output-3
-channel-map = left,right
-priority = 7
-direction = output
-
-[Mapping hdmi-surround-extra3]
-description = Digital Surround 5.1 (HDMI 4)
-device-strings = hdmi:%f,3
-paths-output = hdmi-output-3
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-surround71-extra3]
-description = Digital Surround 7.1 (HDMI 4)
-device-strings = hdmi:%f,3
-paths-output = hdmi-output-3
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
-priority = 6
-direction = output
-
-[Mapping hdmi-dts-surround-extra3]
-description = Digital Surround 5.1 (HDMI 4/DTS)
-device-strings = dcahdmi:%f,3
-paths-output = hdmi-output-3
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-stereo-extra4]
-description = Digital Stereo (HDMI 5)
-device-strings = hdmi:%f,4
-paths-output = hdmi-output-4
-channel-map = left,right
-priority = 7
-direction = output
-
-[Mapping hdmi-surround-extra4]
-description = Digital Surround 5.1 (HDMI 5)
-device-strings = hdmi:%f,4
-paths-output = hdmi-output-4
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-surround71-extra4]
-description = Digital Surround 7.1 (HDMI 5)
-device-strings = hdmi:%f,4
-paths-output = hdmi-output-4
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
-priority = 6
-direction = output
-
-[Mapping hdmi-dts-surround-extra4]
-description = Digital Surround 5.1 (HDMI 5/DTS)
-device-strings = dcahdmi:%f,4
-paths-output = hdmi-output-4
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-stereo-extra5]
-description = Digital Stereo (HDMI 6)
-device-strings = hdmi:%f,5
-paths-output = hdmi-output-5
-channel-map = left,right
-priority = 7
-direction = output
-
-[Mapping hdmi-surround-extra5]
-description = Digital Surround 5.1 (HDMI 6)
-device-strings = hdmi:%f,5
-paths-output = hdmi-output-5
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-surround71-extra5]
-description = Digital Surround 7.1 (HDMI 6)
-device-strings = hdmi:%f,5
-paths-output = hdmi-output-5
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
-priority = 6
-direction = output
-
-[Mapping hdmi-dts-surround-extra5]
-description = Digital Surround 5.1 (HDMI 6/DTS)
-device-strings = dcahdmi:%f,5
-paths-output = hdmi-output-5
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-stereo-extra6]
-description = Digital Stereo (HDMI 7)
-device-strings = hdmi:%f,6
-paths-output = hdmi-output-6
-channel-map = left,right
-priority = 7
-direction = output
-
-[Mapping hdmi-surround-extra6]
-description = Digital Surround 5.1 (HDMI 7)
-device-strings = hdmi:%f,6
-paths-output = hdmi-output-6
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-surround71-extra6]
-description = Digital Surround 7.1 (HDMI 7)
-device-strings = hdmi:%f,6
-paths-output = hdmi-output-6
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
-priority = 6
-direction = output
-
-[Mapping hdmi-dts-surround-extra6]
-description = Digital Surround 5.1 (HDMI 7/DTS)
-device-strings = dcahdmi:%f,6
-paths-output = hdmi-output-6
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-stereo-extra7]
-description = Digital Stereo (HDMI 8)
-device-strings = hdmi:%f,7
-paths-output = hdmi-output-7
-channel-map = left,right
-priority = 7
-direction = output
-
-[Mapping hdmi-surround-extra7]
-description = Digital Surround 5.1 (HDMI 8)
-device-strings = hdmi:%f,7
-paths-output = hdmi-output-7
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping hdmi-surround71-extra7]
-description = Digital Surround 7.1 (HDMI 8)
-device-strings = hdmi:%f,7
-paths-output = hdmi-output-7
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
-priority = 6
-direction = output
-
-[Mapping hdmi-dts-surround-extra7]
-description = Digital Surround 5.1 (HDMI 8/DTS)
-device-strings = dcahdmi:%f,7
-paths-output = hdmi-output-7
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
-priority = 6
-direction = output
-
-[Mapping multichannel-output]
-device-strings = hw:%f
-channel-map = left,right,rear-left,rear-right
-exact-channels = false
-fallback = yes
-priority = 1
-direction = output
-
-[Mapping multichannel-input]
-device-strings = hw:%f
-channel-map = left,right,rear-left,rear-right
-exact-channels = false
-fallback = yes
-priority = 1
-direction = input
-
-[Profile analog-stereo+iec958-stereo]
-description = Analog Stereo Duplex + Digital Stereo Output
-input-mappings = analog-stereo
-output-mappings = analog-stereo iec958-stereo
-skip-probe = yes
\ No newline at end of file
diff --git a/overlays/base_ovos/usr/share/alsa-card-profile/mixer/profile-sets/seeed-voicecard-4mic.conf b/overlays/base_ovos/usr/share/alsa-card-profile/mixer/profile-sets/seeed-voicecard-4mic.conf
deleted file mode 100644
index 1c35e171..00000000
--- a/overlays/base_ovos/usr/share/alsa-card-profile/mixer/profile-sets/seeed-voicecard-4mic.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# /usr/share/pulseaudio/alsa-mixer/profile-sets/seeed-voicecard.conf
-
-[General]
-auto-profiles = no
-[Mapping seeed-source]
-device-strings = hw:%f
-channel-map = front-left,front-right,rear-left,rear-right
-exact-channels = false
-fallback = yes
-paths-input = seeed-source
-priority = 3
-direction = input
-
-[Profile input:seeed-source]
-input-mappings = seeed-source
-priority = 5
-skip-probe = yes
diff --git a/overlays/base_ovos/usr/share/alsa-card-profile/mixer/profile-sets/seeed-voicecard-8mic.conf b/overlays/base_ovos/usr/share/alsa-card-profile/mixer/profile-sets/seeed-voicecard-8mic.conf
deleted file mode 100644
index ee69099e..00000000
--- a/overlays/base_ovos/usr/share/alsa-card-profile/mixer/profile-sets/seeed-voicecard-8mic.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# /usr/share/pulseaudio/alsa-mixer/profile-sets/seeed-voiced.conf
-
-[General]
-auto-profiles = no
-[Mapping seeed-8ch]
-device-strings = hw:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
-exact-channels = false
-fallback = yes
-paths-input = seeed-8ch
-priority = 3
-direction = input
-[Mapping seeed-2ch]
-device-strings = hw:%f
-channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
-exact-channels = false
-exact-channels = false
-fallback = yes
-paths-output = seeed-2ch
-direction = output
-priority = 2
-[Profile output:seeed-2ch+input:seeed-8ch]
-output-mappings = seeed-2ch
-input-mappings = seeed-8ch
-priority = 100
-skip-probe = yes
-[Profile output:seeed-2ch]
-output-mappings = seeed-2ch
-priority = 4
-skip-probe = yes
-[Profile input:seeed-8ch]
-input-mappings = seeed-8ch
-priority = 5
-skip-probe = yes
diff --git a/overlays/base_ovos/usr/share/keyrings/lesbonscomptes.gpg b/overlays/base_ovos/usr/share/keyrings/lesbonscomptes.gpg
deleted file mode 100644
index 88b191b7..00000000
Binary files a/overlays/base_ovos/usr/share/keyrings/lesbonscomptes.gpg and /dev/null differ