[TASK] Cleanup $TCA and fix 2 font references