I also liked "Some booth occupants" for DINER because booths are found in diners.

Some nits to pick:

"Night light" for NEON suggests they are used especially at night, but in reality neon lights are frequently on in the day, viz. Las Vegas and the local pharmacy. The advantage of neon is that it can be seen during the day. Any light, after all, could be called a night light. How about "Gas light" [two words]?

"Ideal for Joshua trees" for ARID uses the adjective, but the noun aridity seems called for.