Reflect changes in TKG repo

Zuen finished gun store.