diff --git a/include/config.hpp b/include/config.hpp
index 8aa695aa..ed2c270f 100644
--- a/include/config.hpp
+++ b/include/config.hpp
@@ -13,7 +13,8 @@ struct EmulatorConfig {
 	static constexpr bool shaderJitDefault = false;
 #endif
 
-	static constexpr bool ubershaderDefault = true;
+	// For now, use specialized shaders by default
+	static constexpr bool ubershaderDefault = false;
 
 	bool shaderJitEnabled = shaderJitDefault;
 	bool discordRpcEnabled = false;
diff --git a/src/core/PICA/shader_gen_glsl.cpp b/src/core/PICA/shader_gen_glsl.cpp
index 0a9c1a5a..95b042f1 100644
--- a/src/core/PICA/shader_gen_glsl.cpp
+++ b/src/core/PICA/shader_gen_glsl.cpp
@@ -165,7 +165,7 @@ std::string FragmentGenerator::generate(const PICARegs& regs, const FragmentConf
 			vec4 tevNextPreviousBuffer = tevBufferColor;	
 
 			vec4 primaryColor = vec4(0.0);
-			vec4 secondaryColor = vec4(0.0);		
+			vec4 secondaryColor = vec4(0.0);
 	)";
 
 	compileLights(ret, config, regs);
diff --git a/src/libretro_core.cpp b/src/libretro_core.cpp
index a6a1ff00..b48e937a 100644
--- a/src/libretro_core.cpp
+++ b/src/libretro_core.cpp
@@ -147,7 +147,7 @@ static void configInit() {
 	static const retro_variable values[] = {
 		{"panda3ds_use_shader_jit", "Enable shader JIT; enabled|disabled"},
 		{"panda3ds_accurate_shader_mul", "Enable accurate shader multiplication; disabled|enabled"},
-		{"panda3ds_use_ubershader", "Use ubershaders (No stutter, maybe slower); enabled|disabled"},
+		{"panda3ds_use_ubershader", "Use ubershaders (No stutter, maybe slower); disabled|enabled"},
 		{"panda3ds_use_vsync", "Enable VSync; enabled|disabled"},
 		{"panda3ds_dsp_emulation", "DSP emulation; Null|HLE|LLE"},
 		{"panda3ds_use_audio", "Enable audio; disabled|enabled"},