Full implementation & fixes for Splash.patch