diff --git a/es_systems.cfg b/es_systems.cfg
index 82afd46c..9f69c9a2 100644
--- a/es_systems.cfg
+++ b/es_systems.cfg
@@ -1333,14 +1333,9 @@
 		<platform>psp</platform>
 		<theme>psp</theme>
 		<emulators>
-			<emulator name="PPSSPPSDL">
-				<cores>
-					<core default="true">PPSSPPSDL</core>
-				</cores>
-			</emulator>
 			<emulator name="retroarch">
 				<cores>
-					<core>ppsspp</core>
+					<core default="true">ppsspp</core>
 				</cores>
 			</emulator>
 		</emulators>
@@ -2158,7 +2153,7 @@
 		<platform>imageviewer</platform>
 		<theme>imageviewer</theme>
 	</system>
-		<system>
+	<system>
 		<name>switch</name>
 		<fullname>Nintendo Switch</fullname>
 		<manufacturer>Nintendo</manufacturer>
@@ -2182,4 +2177,42 @@
 			</emulator>
 		</emulators>
 	</system>
+	<system>
+		<name>gc</name>
+		<fullname>Game Cube</fullname>
+		<manufacturer>Nintendo</manufacturer>
+		<release>2001</release>
+		<hardware>console</hardware>
+		<path>~/retrodeck/storage/roms/gc</path>
+		<extension>.elf .iso .gcm .dol .tgc .wbfs .ciso .gcz .wad .ELF .ISO .GCM .DOL .TGC .WBFS .CISO .GCZ .WAD</extension>
+		<command>~/retrodeck/usr/bin/runemu.py --rom %ROM% --platform %SYSTEM% --emulator %EMULATOR% --core %CORE% --controllers "%CONTROLLERSCONFIG%"</command>
+		<platform>gc</platform>
+		<theme>gc</theme>
+		<emulators>
+			<emulator name="retroarch">
+				<cores>
+					<core default="true">dolphin</core>
+				</cores>
+			</emulator>
+		</emulators>
+	</system>
+	<system>
+		<name>wii</name>
+		<fullname>Wii</fullname>
+		<manufacturer>Nintendo</manufacturer>
+		<release>2006</release>
+		<hardware>console</hardware>
+		<path>~/retrodeck/storage/roms/wii</path>
+		<extension>.elf .iso .gcm .dol .tgc .wbfs .ciso .gcz .wad .ELF .ISO .GCM .DOL .TGC .WBFS .CISO .GCZ .WAD</extension>
+		<command>~/retrodeck/usr/bin/runemu.py --rom %ROM% --platform %SYSTEM% --emulator %EMULATOR% --core %CORE% --controllers "%CONTROLLERSCONFIG%"</command>
+		<platform>wii</platform>
+		<theme>wii</theme>
+		<emulators>
+			<emulator name="retroarch">
+				<cores>
+					<core default="true">dolphin</core>
+				</cores>
+			</emulator>
+		</emulators>
+	</system>
 </systemList>
\ No newline at end of file
diff --git a/install-retrodeck.sh b/install-retrodeck.sh
index 5006d98c..e917302a 100755
--- a/install-retrodeck.sh
+++ b/install-retrodeck.sh
@@ -132,6 +132,8 @@ mkdir -p $INSTALL_DIR/roms/uzebox
 mkdir -p $INSTALL_DIR/roms/supervision
 mkdir -p $INSTALL_DIR/roms/doom
 mkdir -p $INSTALL_DIR/roms/switch
+mkdir -p $INSTALL_DIR/roms/wii
+mkdir -p $INSTALL_DIR/roms/gc
 
 # Initializing directories
 mkdir -p $INSTALL_DIR/storage/.config/
diff --git a/storage/.config/retroarch/retroarch.cfg b/storage/.config/retroarch/retroarch.cfg
index 9e8195fa..48a949e7 100644
--- a/storage/.config/retroarch/retroarch.cfg
+++ b/storage/.config/retroarch/retroarch.cfg
@@ -56,11 +56,11 @@ camera_device = ""
 camera_driver = "video4linux2"
 cheat_database_path = "~/.config/retroarch/cheats"
 check_firmware_before_loading = "false"
-cheevos_auto_screenshot = "true"
+cheevos_auto_screenshot = "false"
 cheevos_badges_enable = "false"
 cheevos_challenge_indicators = "false"
 cheevos_custom_host = ""
-cheevos_enable = "true"
+cheevos_enable = "false"
 cheevos_hardcore_mode_enable = "false"
 cheevos_leaderboards_enable = "false"
 cheevos_password = ""
@@ -2802,7 +2802,6 @@ memory_show = "false"
 memory_update_interval = "256"
 menu_battery_level_enable = "true"
 menu_core_enable = "true"
-menu_driver = "ozone"
 menu_dynamic_wallpaper_enable = "true"
 menu_enable_widgets = "true"
 menu_font_color_blue = "255"
@@ -2814,7 +2813,6 @@ 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 = "true"
 menu_navigation_browser_filter_supported_extensions_enable = "true"
 menu_navigation_wraparound_enable = "true"
@@ -3086,7 +3084,7 @@ stdin_cmd_enable = "false"
 streaming_mode = "0"
 suspend_screensaver_enable = "true"
 sustained_performance_mode = "false"
-system_directory = "~/.config/retroarch/system"
+system_directory = "~/retrodeck/roms/bios"
 systemfiles_in_content_dir = "false"
 threaded_data_runloop_enable = "true"
 thumbnails_directory = "~/.config/retroarch/thumbnails"
@@ -3156,7 +3154,7 @@ video_scale_integer = "true"
 video_scale_integer_overscale = "false"
 video_shader_delay = "0"
 video_shader_dir = "/usr/share/libretro/shaders"
-video_shader_enable = "true"
+video_shader_enable = "false"
 video_shader_preset_save_reference_enable = "true"
 video_shader_remember_last_dir = "false"
 video_shader_watch_files = "false"
@@ -3193,3 +3191,4 @@ xmb_shadows_enable = "true"
 xmb_theme = "0"
 xmb_vertical_thumbnails = "false"
 youtube_stream_key = ""
+menu_driver = "ozone"