... and a bag (gallon ziplock?) to put all your stuff in when you want to use the water bottle!!?? I picture someone in trouble dumping their critical gear in the dirt - at night - when they need to collect water. Oh, which reminds me - some kind of tubing or a bandanna to suck up water from tiny cracks or puddles or morning dew - depending on where you are. Maybe you could tear off some clothing instead.
On a slightly different focus ... since they are so stinkin' cheap today ... and tough ... and relatively small ... I just don't understand the concept of a kit without a PLB.
Of course that doesn't mean you won't have to "survive" until help arrives ... and it increases the need to be "findable".
That said, I like the original kit and the ideas posted. I would tend to carry two large plastic bags - just for flexibility, and I would work hard to make them bright orange (maybe get some through the local highway cleanup folks). Its about being "findable".
To me the light you carry is as much about being findable at night (not leaving it on all the time, but being able to point and wave it when you hear rescuers.
I focus on shelter (usually under-equipped for), warmth, water, basic first aid ... the stuff it takes to hunker down for several days waiting for rescue. A lot depends on the local current weather (night & day), the vegetation (I'd be a mess in a desert - no personal experience there), and the land (water sources).