Added in more deco tiles & better handling for them