Refactor the old macros and add in the text_fade macro