diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index 2808079d..e5bc6999 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -484,10 +484,12 @@ modules:
         # Remove this when/if commited to ES-DE
         - rm -rf /app/share/emulationstation/resources/systems/unix/es_find_rules.xml
         - cp es_find_rules.xml /app/share/emulationstation/resources/systems/unix/
+      
+        - mkdir -p ${FLATPAK_DEST}/retrodeck/
+        - cp es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml
 
-        # Create retrodeck.sh scripts:
-        # sed the es_config to inject the default rom folder
-        
+        - cp retrodeck.sh /app/bin/retrodeck.sh
+        - chmod +x /app/bin/retrodeck.sh
 
     #cleanup: ['*']
     sources:
@@ -495,5 +497,8 @@ modules:
       #  path: retroarch.cfg
       - type: file # Remove this when/if commited to ES-DE
         path: es_find_rules.xml
-      
+      - type: file
+        path: es_settings.xml
+      - type: file
+        path: retrodeck.sh
     # create desktop entry
\ No newline at end of file
diff --git a/retroarch.cfg b/retroarch.cfg
deleted file mode 100644
index e93a40ef..00000000
--- a/retroarch.cfg
+++ /dev/null
@@ -1,710 +0,0 @@
-accessibility_enable = "false"
-accessibility_narrator_speech_speed = "5"
-ai_service_pause = "false"
-ai_service_source_lang = "0"
-all_users_control_menu = "true"
-apply_cheats_after_load = "false"
-apply_cheats_after_toggle = "false"
-assets_directory = "/app/share/libretro/assets"
-audio_block_frames = "0"
-audio_device = ""
-audio_driver = "alsathread"
-audio_dsp_plugin = ""
-audio_enable = "true"
-audio_enable_menu = "false"
-audio_enable_menu_bgm = "false"
-audio_enable_menu_cancel = "false"
-audio_enable_menu_notice = "false"
-audio_enable_menu_ok = "false"
-audio_fastforward_mute = "false"
-audio_latency = "64"
-audio_max_timing_skew = "0.049999"
-audio_mixer_mute_enable = "false"
-audio_mixer_volume = "0.000000"
-audio_mute_enable = "false"
-audio_out_rate = "48000"
-audio_rate_control = "true"
-audio_rate_control_delta = "0.004999"
-audio_resampler = "sinc"
-audio_resampler_quality = "2"
-audio_sync = "true"
-audio_volume = "0.000000"
-auto_overrides_enable = "true"
-auto_remaps_enable = "true"
-auto_screenshot_filename = "true"
-auto_shaders_enable = "true"
-autosave_interval = "10"
-block_sram_overwrite = "false"
-bluetooth_driver = "null"
-builtin_imageviewer_enable = "true"
-builtin_mediaplayer_enable = "true"
-bundle_assets_dst_path = ""
-bundle_assets_dst_path_subdir = ""
-bundle_assets_extract_enable = "false"
-bundle_assets_extract_last_version = "0"
-bundle_assets_extract_version_current = "0"
-bundle_assets_src_path = ""
-cache_directory = "/tmp/cache"
-camera_allow = "false"
-camera_device = ""
-camera_driver = "null"
-cheat_database_path = "/app/share/libretro/database/cht"
-check_firmware_before_loading = "false"
-cheevos_badges_enable = "false"
-cheevos_richpresence_enable = "true"
-cheevos_start_active = "false"
-cheevos_test_unofficial = "false"
-cheevos_token = ""
-cheevos_unlock_sound_enable = "false"
-config_save_on_exit = "false"
-content_database_path = "/app/share/libretro/database/rdb"
-content_favorites_path = "/app/retrodeck/retroarch/.config/content_favorites.lpl"
-content_favorites_size = "200"
-content_history_dir = ""
-content_history_path = "/app/retrodeck/retroarch/.config/content_history.lpl"
-content_history_size = "200"
-content_image_history_path = "/app/retrodeck/retroarch/.config/content_image_history.lpl"
-content_music_history_path = "/app/retrodeck/retroarch/.config/content_music_history.lpl"
-content_runtime_log = "true"
-content_runtime_log_aggregate = "false"
-content_show_add = "true"
-content_show_add_entry = "2"
-content_show_explore = "true"
-content_show_favorites = "true"
-content_show_history = "true"
-content_show_images = "false"
-content_show_music = "false"
-content_show_playlists = "true"
-content_show_settings = "true"
-content_show_settings_password = ""
-content_show_video = "false"
-content_video_history_path = "/app/retrodeck/retroarch/.config/content_video_history.lpl"
-core_assets_directory = "~/roms/downloads"
-core_options_path = ""
-core_set_supports_no_game_enable = "true"
-core_updater_auto_backup = "false"
-core_updater_auto_backup_history_size = "1"
-core_updater_auto_extract_archive = "true"
-core_updater_buildbot_assets_url = "http://buildbot.libretro.com/assets/"
-core_updater_buildbot_cores_url = ""
-core_updater_buildbot_url = "http://buildbot.libretro.com/nightly/linux/armhf/latest/"
-core_updater_show_experimental_cores = "false"
-crt_switch_center_adjust = "0"
-crt_switch_porch_adjust = "0"
-crt_switch_resolution = "0"
-crt_switch_resolution_super = "2560"
-crt_switch_resolution_use_custom_refresh_rate = "false"
-crt_video_refresh_rate = "60.000000"
-current_resolution_id = "0"
-cursor_directory = "/app/share/libretro/database/cursors"
-desktop_menu_enable = "true"
-discord_allow = "false"
-discord_app_id = "475456035851599874"
-driver_switch_enable = "true"
-dynamic_wallpapers_directory = "default"
-emuelec_exit_to_kodi = "false"
-enable_device_vibration = "true"
-fastforward_ratio = "0.000000"
-filter_by_current_core = "false"
-flicker_filter_enable = "false"
-flicker_filter_index = "0"
-fps_update_interval = "256"
-frame_time_counter_reset_after_fastforwarding = "false"
-frame_time_counter_reset_after_load_state = "false"
-frame_time_counter_reset_after_save_state = "false"
-framecount_show = "false"
-frontend_log_level = "1"
-game_specific_options = "true"
-gamma_correction = "0"
-global_core_options = "false"
-history_list_enable = "true"
-input_ai_service = "nul"
-input_ai_service_axis = "nul"
-input_ai_service_btn = "nul"
-input_ai_service_mbtn = "nul"
-input_analog_deadzone = "0.000000"
-input_analog_sensitivity = "1.500000"
-input_audio_mute = "f9"
-input_audio_mute_axis = "nul"
-input_audio_mute_btn = "nul"
-input_audio_mute_mbtn = "nul"
-input_autodetect_enable = "true"
-input_axis_threshold = "0.500000"
-input_bind_hold = "2"
-input_bind_timeout = "5"
-input_cheat_index_minus = "t"
-input_cheat_index_minus_axis = "nul"
-input_cheat_index_minus_btn = "nul"
-input_cheat_index_minus_mbtn = "nul"
-input_cheat_index_plus = "y"
-input_cheat_index_plus_axis = "nul"
-input_cheat_index_plus_btn = "nul"
-input_cheat_index_plus_mbtn = "nul"
-input_cheat_toggle = "u"
-input_cheat_toggle_axis = "nul"
-input_cheat_toggle_btn = "nul"
-input_cheat_toggle_mbtn = "nul"
-input_close_content = "nul"
-input_close_content_axis = "nul"
-input_close_content_btn = "nul"
-input_close_content_mbtn = "nul"
-input_descriptor_hide_unbound = "false"
-input_descriptor_label_show = "true"
-input_desktop_menu_toggle = "f5"
-input_desktop_menu_toggle_axis = "nul"
-input_desktop_menu_toggle_btn = "nul"
-input_desktop_menu_toggle_mbtn = "nul"
-input_device_p1 = "0"
-input_device_p10 = "0"
-input_device_p11 = "0"
-input_device_p12 = "0"
-input_device_p13 = "0"
-input_device_p14 = "0"
-input_device_p15 = "0"
-input_device_p16 = "0"
-input_device_p2 = "0"
-input_device_p3 = "0"
-input_device_p4 = "0"
-input_device_p5 = "0"
-input_device_p6 = "0"
-input_device_p7 = "0"
-input_device_p8 = "0"
-input_device_p9 = "0"
-input_disk_eject_toggle = "nul"
-input_disk_eject_toggle_axis = "nul"
-input_disk_eject_toggle_btn = "nul"
-input_disk_eject_toggle_mbtn = "nul"
-input_disk_next = "nul"
-input_disk_next_axis = "nul"
-input_disk_next_btn = "nul"
-input_disk_next_mbtn = "nul"
-input_disk_prev = "nul"
-input_disk_prev_axis = "nul"
-input_disk_prev_btn = "nul"
-input_disk_prev_mbtn = "nul"
-input_driver = "udev"
-input_duty_cycle = "3"
-input_enable_hotkey = "nul"
-input_enable_hotkey_axis = "nul"
-input_enable_hotkey_btn = "nul"
-input_enable_hotkey_mbtn = "nul"
-input_exit_emulator = "escape"
-input_exit_emulator_axis = "nul"
-input_exit_emulator_btn = "nul"
-input_exit_emulator_mbtn = "nul"
-input_fps_toggle = "f3"
-input_fps_toggle_axis = "nul"
-input_fps_toggle_btn = "nul"
-input_fps_toggle_mbtn = "nul"
-input_frame_advance = "k"
-input_frame_advance_axis = "nul"
-input_frame_advance_btn = "nul"
-input_frame_advance_mbtn = "nul"
-input_game_focus_toggle = "scroll_lock"
-input_game_focus_toggle_axis = "nul"
-input_game_focus_toggle_btn = "nul"
-input_game_focus_toggle_mbtn = "nul"
-input_grab_mouse_toggle = "f11"
-input_grab_mouse_toggle_axis = "nul"
-input_grab_mouse_toggle_btn = "nul"
-input_grab_mouse_toggle_mbtn = "nul"
-input_hold_fast_forward = "l"
-input_hold_fast_forward_axis = "nul"
-input_hold_fast_forward_btn = "nul"
-input_hold_fast_forward_mbtn = "nul"
-input_hold_slowmotion = "e"
-input_hold_slowmotion_axis = "nul"
-input_hold_slowmotion_btn = "nul"
-input_hold_slowmotion_mbtn = "nul"
-input_hotkey_block_delay = "5"
-input_joypad_driver = "udev"
-input_keyboard_layout = ""
-input_libretro_device_p2 = "1"
-input_libretro_device_p3 = "1"
-input_libretro_device_p4 = "1"
-input_libretro_device_p5 = "1"
-input_libretro_device_p6 = "1"
-input_libretro_device_p7 = "1"
-input_libretro_device_p8 = "1"
-input_libretro_device_p9 = "1"
-input_load_state = "f4"
-input_load_state_axis = "nul"
-input_load_state_btn = "nul"
-input_load_state_mbtn = "nul"
-input_max_users = "5"
-input_menu_toggle = "f1"
-input_menu_toggle_axis = "nul"
-input_menu_toggle_btn = "nul"
-input_menu_toggle_gamepad_combo = "2"
-input_menu_toggle_mbtn = "nul"
-input_movie_record_toggle = "o"
-input_movie_record_toggle_axis = "nul"
-input_movie_record_toggle_btn = "nul"
-input_movie_record_toggle_mbtn = "nul"
-input_netplay_game_watch = "i"
-input_netplay_game_watch_axis = "nul"
-input_netplay_game_watch_btn = "nul"
-input_netplay_game_watch_mbtn = "nul"
-input_netplay_host_toggle = "nul"
-input_netplay_host_toggle_axis = "nul"
-input_netplay_host_toggle_btn = "nul"
-input_netplay_host_toggle_mbtn = "nul"
-input_osk_toggle = "f12"
-input_osk_toggle_axis = "nul"
-input_osk_toggle_btn = "nul"
-input_osk_toggle_mbtn = "nul"
-input_pause_toggle = "p"
-input_pause_toggle_axis = "nul"
-input_pause_toggle_btn = "nul"
-input_pause_toggle_mbtn = "nul"
-input_player1_analog_dpad_mode = "1"
-input_player1_a = "x"
-input_player1_b = "z"
-input_player1_y = "a"
-input_player1_x = "s"
-input_player1_start = "enter"
-input_player1_select = "rshift"
-input_player1_l = "q"
-input_player1_r = "w"
-input_player1_left = "left"
-input_player1_right = "right"
-input_player1_up = "up"
-input_player1_down = "down"
-input_poll_type_behavior = "2"
-input_recording_toggle = "nul"
-input_recording_toggle_axis = "nul"
-input_recording_toggle_btn = "nul"
-input_recording_toggle_mbtn = "nul"
-input_remap_binds_enable = "true"
-input_remapping_directory = "~/remappings"
-input_reset = "h"
-input_reset_axis = "nul"
-input_reset_btn = "nul"
-input_reset_mbtn = "nul"
-input_rewind = "r"
-input_rewind_axis = "nul"
-input_rewind_btn = "nul"
-input_rewind_mbtn = "nul"
-input_save_state = "f2"
-input_save_state_axis = "nul"
-input_save_state_btn = "nul"
-input_save_state_mbtn = "nul"
-input_screenshot = "f8"
-input_screenshot_axis = "nul"
-input_screenshot_btn = "nul"
-input_screenshot_mbtn = "nul"
-input_send_debug_info = "f10"
-input_send_debug_info_axis = "nul"
-input_send_debug_info_btn = "nul"
-input_send_debug_info_mbtn = "nul"
-input_sensors_enable = "true"
-input_shader_next = "m"
-input_shader_next_axis = "nul"
-input_shader_next_btn = "nul"
-input_shader_next_mbtn = "nul"
-input_shader_prev = "n"
-input_shader_prev_axis = "nul"
-input_shader_prev_btn = "nul"
-input_shader_prev_mbtn = "nul"
-input_state_slot_decrease = "f6"
-input_state_slot_decrease_axis = "nul"
-input_state_slot_decrease_btn = "nul"
-input_state_slot_decrease_mbtn = "nul"
-input_state_slot_increase = "f7"
-input_state_slot_increase_axis = "nul"
-input_state_slot_increase_btn = "nul"
-input_state_slot_increase_mbtn = "nul"
-input_streaming_toggle = "nul"
-input_streaming_toggle_axis = "nul"
-input_streaming_toggle_btn = "nul"
-input_streaming_toggle_mbtn = "nul"
-input_toggle_fast_forward = "space"
-input_toggle_fast_forward_axis = "nul"
-input_toggle_fast_forward_btn = "nul"
-input_toggle_fast_forward_mbtn = "nul"
-input_toggle_fullscreen = "f"
-input_toggle_fullscreen_axis = "nul"
-input_toggle_fullscreen_btn = "nul"
-input_toggle_fullscreen_mbtn = "nul"
-input_toggle_slowmotion = "nul"
-input_toggle_slowmotion_axis = "nul"
-input_toggle_slowmotion_btn = "nul"
-input_toggle_slowmotion_mbtn = "nul"
-input_turbo_default_button = "0"
-input_turbo_mode = "0"
-input_turbo_period = "6"
-input_volume_down = "subtract"
-input_volume_down_axis = "nul"
-input_volume_down_btn = "nul"
-input_volume_down_mbtn = "nul"
-input_volume_up = "add"
-input_volume_up_axis = "nul"
-input_volume_up_btn = "nul"
-input_volume_up_mbtn = "nul"
-joypad_autoconfig_dir = "/tmp/joypads"
-keyboard_gamepad_enable = "true"
-keyboard_gamepad_mapping_type = "1"
-kiosk_mode_enable = "false"
-kiosk_mode_password = ""
-led_driver = "null"
-libretro_directory = "/app/share/libretro/cores"
-libretro_info_path = "/app/share/libretro/cores"
-libretro_log_level = "1"
-load_dummy_on_core_shutdown = "true"
-location_allow = "false"
-location_driver = "null"
-log_dir = "~/retrodeck/retroarch/logs"
-log_to_file = "false"
-log_to_file_timestamp = "false"
-log_verbosity = "false"
-materialui_auto_rotate_nav_bar = "true"
-materialui_dual_thumbnail_list_view_enable = "true"
-materialui_icons_enable = "true"
-materialui_landscape_layout_optimization = "1"
-materialui_menu_color_theme = "9"
-materialui_menu_transition_animation = "0"
-materialui_playlist_icons_enable = "true"
-materialui_show_nav_bar = "true"
-materialui_thumbnail_background_enable = "true"
-materialui_thumbnail_view_landscape = "2"
-materialui_thumbnail_view_portrait = "1"
-memory_show = "false"
-memory_update_interval = "256"
-menu_battery_level_enable = "true"
-menu_core_enable = "true"
-menu_driver = "ozone"
-menu_dynamic_wallpaper_enable = "false"
-menu_enable_widgets = "true"
-menu_font_color_blue = "255"
-menu_font_color_green = "255"
-menu_font_color_red = "255"
-menu_footer_opacity = "1.000000"
-menu_framebuffer_opacity = "0.899999"
-menu_header_opacity = "1.000000"
-menu_horizontal_animation = "true"
-menu_insert_disk_resume = "true"
-menu_left_thumbnails = "0"
-menu_linear_filter = "false"
-menu_mouse_enable = "false"
-menu_navigation_browser_filter_supported_extensions_enable = "true"
-menu_navigation_wraparound_enable = "true"
-menu_pause_libretro = "true"
-menu_pointer_enable = "false"
-menu_rgui_full_width_layout = "true"
-menu_rgui_shadows = "false"
-menu_savestate_resume = "true"
-menu_scale_factor = "1.000000"
-menu_scroll_fast = "false"
-menu_shader_pipeline = "2"
-menu_show_advanced_settings = "true"
-menu_show_configurations = "true"
-menu_show_core_updater = "false"
-menu_show_dump_disc = "true"
-menu_show_help = "true"
-menu_show_information = "true"
-menu_show_latency = "true"
-menu_show_legacy_thumbnail_updater = "false"
-menu_show_load_content = "true"
-menu_show_load_content_animation = "false"
-menu_show_load_core = "true"
-menu_show_load_disc = "true"
-menu_show_online_updater = "true"
-menu_show_overlays = "true"
-menu_show_quit_retroarch = "true"
-menu_show_reboot = "false"
-menu_show_restart_retroarch = "true"
-menu_show_rewind = "true"
-menu_show_shutdown = "false"
-menu_show_sublabels = "true"
-menu_show_video_layout = "true"
-menu_swap_ok_cancel_buttons = "false"
-menu_throttle_framerate = "true"
-menu_thumbnail_upscale_threshold = "0"
-menu_thumbnails = "3"
-menu_ticker_smooth = "true"
-menu_ticker_speed = "2.000000"
-menu_ticker_type = "1"
-menu_timedate_date_separator = "0"
-menu_timedate_enable = "true"
-menu_timedate_style = "11"
-menu_unified_controls = "false"
-menu_use_preferred_system_color_theme = "false"
-menu_wallpaper = ""
-menu_wallpaper_opacity = "1.000000"
-menu_widget_scale_auto = "false"
-menu_widget_scale_factor = "2.000000"
-menu_widget_scale_factor_windowed = "1.000000"
-menu_xmb_animation_horizontal_highlight = "0"
-menu_xmb_animation_move_up_down = "0"
-menu_xmb_animation_opening_main_menu = "0"
-menu_xmb_thumbnail_scale_factor = "100"
-midi_driver = "alsa"
-midi_input = "Off"
-midi_output = "Off"
-midi_volume = "100"
-netplay_allow_slaves = "true"
-netplay_check_frames = "600"
-netplay_input_latency_frames_min = "0"
-netplay_input_latency_frames_range = "0"
-netplay_nat_traversal = "true"
-netplay_password = ""
-netplay_request_device_p1 = "false"
-netplay_request_device_p10 = "false"
-netplay_request_device_p11 = "false"
-netplay_request_device_p12 = "false"
-netplay_request_device_p13 = "false"
-netplay_request_device_p14 = "false"
-netplay_request_device_p15 = "false"
-netplay_request_device_p16 = "false"
-netplay_request_device_p2 = "false"
-netplay_request_device_p3 = "false"
-netplay_request_device_p4 = "false"
-netplay_request_device_p5 = "false"
-netplay_request_device_p6 = "false"
-netplay_request_device_p7 = "false"
-netplay_request_device_p8 = "false"
-netplay_request_device_p9 = "false"
-netplay_require_slaves = "false"
-netplay_share_analog = "1"
-netplay_share_digital = "1"
-netplay_spectate_password = ""
-netplay_start_as_spectator = "false"
-netplay_stateless_mode = "false"
-network_cmd_enable = "false"
-network_cmd_port = "55355"
-network_on_demand_thumbnails = "false"
-network_remote_base_port = "55400"
-network_remote_enable = "false"
-network_remote_enable_user_p1 = "false"
-network_remote_enable_user_p10 = "false"
-network_remote_enable_user_p11 = "false"
-network_remote_enable_user_p12 = "false"
-network_remote_enable_user_p13 = "false"
-network_remote_enable_user_p14 = "false"
-network_remote_enable_user_p15 = "false"
-network_remote_enable_user_p16 = "false"
-network_remote_enable_user_p2 = "false"
-network_remote_enable_user_p3 = "false"
-network_remote_enable_user_p4 = "false"
-network_remote_enable_user_p5 = "false"
-network_remote_enable_user_p6 = "false"
-network_remote_enable_user_p7 = "false"
-network_remote_enable_user_p8 = "false"
-network_remote_enable_user_p9 = "false"
-notification_show_autoconfig = "false"
-notification_show_cheats_applied = "true"
-notification_show_config_override_load = "false"
-notification_show_fast_forward = "true"
-notification_show_remap_load = "false"
-notification_show_screenshot = "false"
-notification_show_screenshot_duration = "2"
-notification_show_screenshot_flash = "1"
-notification_show_set_initial_disk = "true"
-overlay_directory = "/tmp/overlays"
-ozone_collapse_sidebar = "false"
-ozone_menu_color_theme = "1"
-ozone_scroll_content_metadata = "false"
-ozone_sort_after_truncate_playlist_name = "true"
-ozone_truncate_playlist_name = "true"
-pause_nonactive = "true"
-perfcnt_enable = "false"
-playlist_compression = "false"
-playlist_cores = ""
-playlist_directory = "~/playlists"
-playlist_entry_remove = "false"
-playlist_entry_remove_enable = "1"
-playlist_entry_rename = "false"
-playlist_fuzzy_archive_match = "false"
-playlist_names = "Atari - 2600.lpl;Atari - 5200.lpl;Atari - 7800.lpl;Atari - Jaguar.lpl;Atari - Lynx.lpl;Atari - ST.lpl;Bandai - WonderSwan Color.lpl;Bandai - WonderSwan.lpl;Cave Story.lpl;ChaiLove.lpl;Coleco - ColecoVision.lpl;Commodore - 64 (PP).lpl;Commodore - 64 (Tapes).lpl;Commodore - 64.lpl;Commodore - Amiga.lpl;Commodore - Plus-4.lpl;Commodore - VIC20.lpl;Dinothawr.lpl;DOOM.lpl;DOS.lpl;FBNeo - Arcade Games.lpl;Flashback.lpl;GCE - Vectrex.lpl;Lutro.lpl;Magnavox - Odyssey2.lpl;MAME 2003-Plus.lpl;MAME 2010.lpl;Mattel - Intellivision.lpl;Microsoft - MSX2.lpl;Microsoft - MSX.lpl;NEC - PC Engine SuperGrafx.lpl;NEC - PC Engine - TurboGrafx 16.lpl;Nintendo - Famicom Disk System.lpl;Nintendo - Game Boy Advance (e-Cards).lpl;Nintendo - Game Boy Advance.lpl;Nintendo - Game Boy Color.lpl;Nintendo - Game Boy.lpl;Nintendo - GameCube.lpl;Nintendo - Nintendo 3DS.lpl;Nintendo - Nintendo 64.lpl;Nintendo - Nintendo DS.lpl;Nintendo - Nintendo DS Decrypted.lpl;Nintendo - Nintendo DS (Download Play) (BETA).lpl;Nintendo - Nintendo DSi Decrypted.lpl;Nintendo - Nintendo DSi (DLC).lpl;Nintendo - Nintendo Entertainment System.lpl;Nintendo - Satellaview.lpl;Nintendo - Super Nintendo Entertainment System.lpl;Nintendo - Virtual Boy.lpl;Nintendo - Wii.lpl;Nintendo - Pokemon Mini (PokeMini).lpl;Quake.lpl;ScummVM.lpl;Sega - 32X.lpl;Sega - Dreamcast.lpl;Sega - Game Gear.lpl;Sega - Master System - Mark III.lpl;Sega - Mega Drive - Genesis.lpl;Sega - PICO.lpl;Sega - SG-1000.lpl;Sega - Saturn.lpl;Sinclair - ZX Spectrum +3.lpl;SNK - Neo Geo Pocket Color.lpl;SNK - Neo Geo Pocket.lpl;Sony - PlayStation 2.lpl;Sony - PlayStation Portable.lpl;Sony - PlayStation.lpl;Thomson - MOTO.lpl;TIC-80.lpl;The 3DO Company - 3DO.lpl"
-playlist_portable_paths = "false"
-playlist_show_inline_core_name = "0"
-playlist_show_sublabels = "true"
-playlist_sort_alphabetical = "true"
-playlist_sublabel_last_played_style = "0"
-playlist_sublabel_runtime_type = "0"
-playlist_use_old_format = "false"
-quick_menu_show_add_to_favorites = "true"
-quick_menu_show_cheats = "true"
-quick_menu_show_close_content = "true"
-quick_menu_show_controls = "true"
-quick_menu_show_download_thumbnails = "true"
-quick_menu_show_information = "true"
-quick_menu_show_options = "true"
-quick_menu_show_recording = "true"
-quick_menu_show_reset_core_association = "true"
-quick_menu_show_restart_content = "true"
-quick_menu_show_resume_content = "true"
-quick_menu_show_save_content_dir_overrides = "true"
-quick_menu_show_save_core_overrides = "false"
-quick_menu_show_save_game_overrides = "false"
-quick_menu_show_save_load_state = "true"
-quick_menu_show_set_core_association = "true"
-quick_menu_show_shaders = "true"
-quick_menu_show_start_recording = "true"
-quick_menu_show_start_streaming = "true"
-quick_menu_show_streaming = "true"
-quick_menu_show_take_screenshot = "true"
-quick_menu_show_undo_save_load_state = "false"
-quit_on_close_content = "0"
-quit_press_twice = "true"
-recording_config_directory = ""
-recording_output_directory = "~/roms/screenshots"
-resampler_directory = ""
-rewind_buffer_size = "20971520"
-rewind_buffer_size_step = "10"
-rewind_granularity = "1"
-rgui_aspect_ratio = "0"
-rgui_aspect_ratio_lock = "0"
-rgui_background_filler_thickness_enable = "true"
-rgui_border_filler_enable = "true"
-rgui_border_filler_thickness_enable = "true"
-rgui_browser_directory = "~/roms"
-rgui_config_directory = "/app/retrodeck/retroarch/.config/config"
-rgui_extended_ascii = "false"
-rgui_inline_thumbnails = "false"
-rgui_internal_upscale_level = "0"
-rgui_menu_color_theme = "4"
-rgui_menu_theme_preset = ""
-rgui_particle_effect = "0"
-rgui_particle_effect_speed = "1.000000"
-rgui_show_start_screen = "false"
-rgui_swap_thumbnails = "false"
-rgui_switch_icons = "true"
-rgui_thumbnail_delay = "0"
-rgui_thumbnail_downscaler = "0"
-run_ahead_hide_warnings = "false"
-runtime_log_directory = "default"
-save_file_compression = "false"
-savefile_directory = "~/retrodeck/roms/saves"
-savefiles_in_content_dir = "true"
-savestate_file_compression = "true"
-savestate_thumbnail_enable = "true"
-scan_without_core_match = "false"
-screen_orientation = "0"
-screenshot_directory = "~/roms/screenshots"
-screenshots_in_content_dir = "false"
-settings_show_accessibility = "true"
-settings_show_achievements = "true"
-settings_show_ai_service = "true"
-settings_show_audio = "true"
-settings_show_configuration = "true"
-settings_show_core = "true"
-settings_show_directory = "true"
-settings_show_drivers = "true"
-settings_show_file_browser = "true"
-settings_show_frame_throttle = "true"
-settings_show_input = "true"
-settings_show_latency = "true"
-settings_show_logging = "true"
-settings_show_network = "true"
-settings_show_onscreen_display = "true"
-settings_show_playlists = "true"
-settings_show_power_management = "true"
-settings_show_recording = "true"
-settings_show_saving = "true"
-settings_show_user = "true"
-settings_show_user_interface = "true"
-settings_show_video = "true"
-show_hidden_files = "false"
-slowmotion_ratio = "3.000000"
-soft_filter_enable = "false"
-soft_filter_index = "0"
-sort_savefiles_by_content_enable = "false"
-sort_savefiles_enable = "false"
-sort_savestates_by_content_enable = "false"
-sort_savestates_enable = "false"
-sort_screenshots_by_content_enable = "false"
-statistics_show = "false"
-stdin_cmd_enable = "false"
-streaming_mode = "0"
-suspend_screensaver_enable = "true"
-sustained_performance_mode = "false"
-system_directory = "~/roms/bios"
-systemfiles_in_content_dir = "false"
-threaded_data_runloop_enable = "true"
-thumbnails_directory = "~/thumbnails"
-twitch_stream_key = ""
-ui_companion_enable = "false"
-ui_companion_start_on_boot = "true"
-ui_companion_toggle = "false"
-ui_menubar_enable = "true"
-user_language = "0"
-vibrate_on_keypress = "true"
-video_adaptive_vsync = "false"
-video_allow_rotate = "true"
-video_aspect_ratio = "-1.000000"
-video_aspect_ratio_auto = "true"
-video_black_frame_insertion = "0"
-video_context_driver = ""
-video_crop_overscan = "true"
-video_disable_composition = "false"
-video_driver = "gl"
-video_filter = ""
-video_font_enable = "true"
-video_font_path = "/usr/share/retroarch-assets/xmb/monochrome/font.ttf"
-video_font_size = "32.000000"
-video_force_aspect = "true"
-video_force_srgb_disable = "false"
-video_frame_delay = "0"
-video_fullscreen = "true"
-video_fullscreen_x = "0"
-video_fullscreen_y = "0"
-video_gpu_record = "false"
-video_gpu_screenshot = "true"
-video_hard_sync = "false"
-video_hard_sync_frames = "0"
-video_layout_directory = "/app/retrodeck/retroarch/.config/layouts"
-video_layout_enable = "true"
-video_layout_path = ""
-video_layout_selected_view = "0"
-video_max_swapchain_images = "3"
-video_message_color = "ffff00"
-video_message_pos_x = "0.049999"
-video_message_pos_y = "0.049999"
-video_monitor_index = "0"
-video_msg_bgcolor_blue = "0"
-video_msg_bgcolor_enable = "false"
-video_msg_bgcolor_green = "0"
-video_msg_bgcolor_opacity = "1.000000"
-video_msg_bgcolor_red = "0"
-video_notch_write_over_enable = "false"
-video_oga_vertical_enable = "false"
-video_post_filter_record = "false"
-video_record_config = ""
-video_record_quality = "4"
-video_record_scale_factor = "1"
-video_record_threads = "2"
-video_refresh_rate = "60.000000"
-video_rotation = "0"
-video_scale = "3.000000"
-video_shader_delay = "0"
-video_shader_dir = "/tmp/shaders"
-video_shader_remember_last_dir = "false"
-video_shader_watch_files = "false"
-video_shared_context = "false"
-video_stream_config = ""
-video_stream_port = "56400"
-video_stream_quality = "10"
-video_stream_scale_factor = "1"
-video_stream_url = ""
-video_swap_interval = "1"
-video_threaded = "true"
-video_vsync = "true"
-video_window_opacity = "100"
-video_window_save_positions = "false"
-video_window_show_decorations = "true"
-video_windowed_fullscreen = "false"
-video_windowed_position_height = "720"
-video_windowed_position_width = "1280"
-video_windowed_position_x = "0"
-video_windowed_position_y = "0"
-vrr_runloop_enable = "true"
-wifi_driver = "null"
-xmb_alpha_factor = "75"
-xmb_font = "/usr/share/retroarch-assets/xmb/monochrome/font.ttf"
-xmb_layout = "2"
-xmb_menu_color_theme = "4"
-xmb_shadows_enable = "true"
-xmb_theme = "0"
-xmb_vertical_thumbnails = "false"
-youtube_stream_key = ""
\ No newline at end of file
diff --git a/retroarch.cfg b/retroarch.cfg
new file mode 120000
index 00000000..0461c7b5
--- /dev/null
+++ b/retroarch.cfg
@@ -0,0 +1 @@
+org.libretro.RetroArch/retroarch.cfg
\ No newline at end of file
diff --git a/retrodeck.sh b/retrodeck.sh
new file mode 100644
index 00000000..228e53c3
--- /dev/null
+++ b/retrodeck.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# if we got the es_settings.xml means that it's a clean(-ish)/first run
+if test -f "/app/retrodeck/es_settings.xml"; then
+    mv -f /app/retrodeck/es_settings.xml ~/.emulationstation/es_settings.xml
+fi
+
+emulationstation
\ No newline at end of file