Revamped to Neon style