EDIT: Updated the file since the 32px tileset had an error and was missing 2 of the portals, also added props as individual files, sorry about that.
This took a lot longer than expected and even if it's mostly another dungeon tileset I'm happy with the results :P.
This is also the first tileset I made with the new dimensions in mind, so it may not be compatible with older tilesets depending on where you assemble the maps, but because of this I also added an extra version with the old size in mind, it's mostly a resized version with a tweaks on a few parts so it would look ok but it may not be perfect, hope that works.