CTF elements overhaul