Okay, I switched the hockey tape for a much smaller roll since I still would like to have some. Also added some yellow electrical tape for marking purpose. There's are space left so I stuck some hexane tabs inside too. Don't have any cotton nor vaseline, and don't want to buy a lifetime supply of them, so no petro cotton ball for now.

I have a coghlan's tube tent that will go in the backpack, I know it's crappy but don't know anything else that's as compact.