Some updates to tint2 though not using it anymore