S000: More tiles

Change-Id: I729b3bb5ecfac52d9c52525f0ad3f1e84aae9c24
Merge pull request #43 from autowitch/working

S000: More tiles