Let me get this clear. You want to make a tileset with both diamondus and carrotus in one? I'm afraid that is pretty impossible.

You see, both tilesets have different colors. If you combine those colors they get ugly, so you can't really combine the tilesets.