Latest patch, better CSS