I'd start with a bigger better pack - a college book pack, 2nd hand, for example. Which would have more room for missing items; tools, more water* and warmth
(fleece pullover or rain jackets.) Waterproof box for phone, charger.

Teacher


* hard to include 6 gals of water, but its good to have a way to hold it.