diff --git a/functions/post_update.sh b/functions/post_update.sh
index 0f731680..96491f0b 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -638,6 +638,9 @@ post_update() {
     log i "Preparing the shaders folder for MAME..."
     shaders_folder=$rdhome/shaders && log i "Shaders folder set to \"$shaders_folder\""
     conf_write && log i "Done"
+    create_dir "$shaders_folder/mame/bgfx"
+    set_setting_value "$mameconf" "bgfx_path" "$shaders_folder/mame/bgfx/" "mame"
+    cp -fvr "/app/share/mame/bgfx/"* "$shaders_folder/mame/bgfx"
 
     log i "Preparing the cheats for RetroArch..."
     create_dir "$cheats_folder/retroarch"
@@ -658,7 +661,7 @@ post_update() {
     create_dir "$cheats_folder/mame"
     set_setting_value "$mameconf" "cheatpath" "$cheats_folder/mame" "mame"
     unzip -j -o "$config/mame/cheat0264.zip" 'cheat.7z' -d "$cheats_folder/mame" && log i "Cheats for MAME installed"
-    rm -rf /var/data/mame/cheat
+    rm -rf /var/data/mame/cheat    
 
     log i "Preparing the RetroAchievements for Dolphin..."
     cp -vn "$config/dolphin/"* /var/config/dolphin-emu/
diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index fb5e6134..b01aa985 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -916,6 +916,7 @@ prepare_component() {
       cp -fvr "$config/mame/mame.ini" "$mameconf"
       cp -fvr "$config/mame/ui.ini" "$mameuiconf"
       cp -fvr "$config/mame/default.cfg" "$mamedefconf"
+      cp -fvr "/app/share/mame/bgfx/"* "$shaders_folder/mame/bgfx"
 
       sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "$mameconf" # one-off as roms folders are a lot
       set_setting_value "$mameconf" "nvram_directory" "$saves_folder/mame-sa/nvram" "mame"
@@ -924,7 +925,7 @@ prepare_component() {
       set_setting_value "$mameconf" "diff_directory" "$saves_folder/mame-sa/diff" "mame"
       set_setting_value "$mameconf" "samplepath" "$bios_folder/mame-sa/samples" "mame"
       set_setting_value "$mameconf" "cheatpath" "$cheats_folder/mame" "mame"
-      set_setting_value "$mameconf" "bgfx_path" "/app/share/mame/bgfx;$shaders_folder/mame/bgfx/" "mame"
+      set_setting_value "$mameconf" "bgfx_path" "$shaders_folder/mame/bgfx/" "mame"
 
       log i "Placing cheats in \"$cheats_folder/mame\""
       unzip -j -o "$config/mame/cheat0264.zip" 'cheat.7z' -d "$cheats_folder/mame"