Fixes & bold username templates WIP