[+] Fade in code for shape and some cleanup